am 11a21df4: Merge "Fixed apply bar text. Moved strings to xml." into gb-ub-photos-arches
* commit '11a21df4be6984a180e27b9915a9d6af7e7ef359':
Fixed apply bar text. Moved strings to xml.
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 0c9ceb8..7417374 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -187,6 +187,7 @@
android:layout_gravity="center"
android:layout_weight="1"
android:background="@android:color/transparent"
+ android:textAllCaps="true"
android:gravity="center"
android:text="@string/apply_effect"
android:textSize="24dip" />
diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml
index e953fa0..e5d8b3f3 100644
--- a/res/values/filtershow_strings.xml
+++ b/res/values/filtershow_strings.xml
@@ -83,8 +83,16 @@
<string name="curvesRGB">Curves</string>
<!-- Label for the vignette filter button [CHAR LIMIT=15] -->
<string name="vignette">Vignette</string>
- <!-- Name for the photo effect that removes redeye. [CHAR LIMIT=15] -->
+ <!-- Label for the photo effect that removes redeye. [CHAR LIMIT=15] -->
<string name="redeye">Red Eye</string>
+ <!-- Label for the straighten effect [CHAR LIMIT=15] -->
+ <string name="straighten" msgid="5217801513491493491">Straighten</string>
+ <!-- Label for the crop effect [CHAR LIMIT=15] -->
+ <string name="crop" msgid="5584000454518174632">Crop</string>
+ <!-- Label for the rotate effect [CHAR LIMIT=15] -->
+ <string name="rotate" msgid="460017689320955494">Rotate</string>
+ <!-- Label for the flip effect [CHAR LIMIT=15] -->
+ <string name="flip" msgid="2357692401826287480">Flip</string>
<!-- Labels for the curves tool -->
@@ -97,4 +105,4 @@
<!-- Label for the curves tool, Blue color channel [CHAR LIMIT=10] -->
<string name="curves_channel_blue">Blue</string>
-</resources>
\ No newline at end of file
+</resources>