Gallery: Fix translatability of CAF additions to filtershowstaging/lineage-15.1

Change-Id: Ibcb2dfaf98ae367461365187c9549e544d119e90

7 files changed, 162 insertions, 126 deletions

diff --git a/res/layout/filtershow_crop_button.xml b/res/layout/filtershow_crop_button.xml
index b42d6b656..22c467ea6 100644
--- a/res/layout/filtershow_crop_button.xml
+++ b/res/layout/filtershow_crop_button.xml
@@ -24,4 +24,4 @@
     android:background="@drawable/filtershow_button_background"
     android:scaleType="centerInside"
     android:visibility="gone"
-    android:text="@string/aspectNone_effect" />
\ No newline at end of file
+    android:text="@string/aspectFree_effect" />
diff --git a/res/layout/filtershow_history_panel.xml b/res/layout/filtershow_history_panel.xml
index 392e39cbe..992d05a85 100644
--- a/res/layout/filtershow_history_panel.xml
+++ b/res/layout/filtershow_history_panel.xml
@@ -53,7 +53,7 @@
                 android:id="@+id/resetOperationsButton"
                 style="@style/FilterShowHistoryButton"
                 android:gravity="center"
-                android:text="@string/reset" />
+                android:text="@string/back_to_original" />
 
         <Button
                 android:id="@+id/saveOperationsButton"
diff --git a/res/menu/filtershow_activity_menu.xml b/res/menu/filtershow_activity_menu.xml
index 7fde667ab..e99826edd 100644
--- a/res/menu/filtershow_activity_menu.xml
+++ b/res/menu/filtershow_activity_menu.xml
@@ -16,7 +16,7 @@
 <!--         android:title="@string/filtershow_redo"/> -->
     <item
         android:id="@+id/resetHistoryButton"
-        android:title="@string/reset"/>
+        android:title="@string/back_to_original"/>
 <!--     <item -->
 <!--         android:id="@+id/showImageStateButton" -->
 <!--         android:showAsAction="never" -->
diff --git a/res/menu/filtershow_menu_crop.xml b/res/menu/filtershow_menu_crop.xml
index f8ba3df42..94b06be5a 100644
--- a/res/menu/filtershow_menu_crop.xml
+++ b/res/menu/filtershow_menu_crop.xml
@@ -26,7 +26,7 @@
             android:title="@string/aspect9to16_effect"/>
         <item
             android:id="@+id/crop_menu_none"
-            android:title="@string/aspectNone_effect"/>
+            android:title="@string/aspectFree_effect"/>
         <item
             android:id="@+id/crop_menu_original"
             android:title="@string/aspectOriginal_effect"/>
diff --git a/res/values/codeaurora_filtershow_strings.xml b/res/values/codeaurora_filtershow_strings.xml
new file mode 100644
index 000000000..2244a874e
--- /dev/null
+++ b/res/values/codeaurora_filtershow_strings.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!--  Text for filters that apply a frame to a picture [CHAR LIMIT=20] -->
+    <string name="frame">Frame <xliff:g id="number" example="1">%d</xliff:g></string>
+
+    <!--  String displayed when exiting with unsaved changes [CHAR LIMIT=NONE] -->
+    <string name="discard_message">Discard the changes you\'ve made to this image?</string>
+    <!--  String displayed when exiting with unsaved changes [CHAR LIMIT=NONE] -->
+    <string name="discard_title">Discard changes?</string>
+    <!--  String displayed when discard editor [CHAR LIMIT=NONE] -->
+    <string name="discard">Discard</string>
+
+    <!--  Text for the history panel reset button [CHAR LIMIT=20]-->
+    <string name="back_to_original">Back to original</string>
+
+    <!--  Label for the aspect None effect [CHAR LIMIT=15] -->
+    <string name="aspectFree_effect">Free</string>
+
+    <!--  Filters buttons -->
+
+    <!--  True Effect button -->
+    <string name="trueScanner" translatable="false">TrueScanner</string>
+    <!--  HazeBuster button -->
+    <string name="hazeBuster" translatable="false">HazeBuster</string>
+    <!--  SeeStraight button -->
+    <string name="seeStraight" translatable="false">SeeStraight</string>
+
+    <!--  Label for the "refocus" dual camera effect  [CHAR LIMIT=15] -->
+    <string name="focus">Focus</string>
+    <!--  Label for the "fusion" dual camera effect  [CHAR LIMIT=15] -->
+    <string name="fusion">Fusion</string>
+    <!--  Label for the "sketch" dual camera effect  [CHAR LIMIT=15] -->
+    <string name="sketch">Sketch</string>
+    <!--  Label for the "halo" dual camera effect  [CHAR LIMIT=15] -->
+    <string name="halo">Halo</string>
+    <!--  Label for the "zoom" dual camera effect  [CHAR LIMIT=15] -->
+    <string name="zoom">Zoom</string>
+    <!--  Label for the "motion" dual camera effect  [CHAR LIMIT=15] -->
+    <string name="motion">Motion</string>
+    <!--  Label for the "bw" dual camera effect  [CHAR LIMIT=15] -->
+    <string name="bw">B/W</string>
+    <!--  Label for the "blackboard" dual camera effect  [CHAR LIMIT=15] -->
+    <string name="blackboard">Blackboard</string>
+    <!--  Label for the "whiteboard" dual camera effect  [CHAR LIMIT=15] -->
+    <string name="whiteboard">Whiteboard</string>
+    <!--  Label for the "posterize" dual camera effect  [CHAR LIMIT=15] -->
+    <string name="posterize">Posterize</string>
+    <!--  Label for the "negative" dual camera effect  [CHAR LIMIT=15] -->
+    <string name="dc_negative">Negative</string>
+    <!--  Label for the "blur" true portrait effect  [CHAR LIMIT=15] -->
+    <string name="blur">Blur</string>
+    <!--  Label for the "motion blur" true portrait effect  [CHAR LIMIT=15] -->
+    <string name="motion_blur">Motion blur</string>
+
+    <string name="fusion_pick_point">Pick segment</string>
+    <string name="fusion_pick_underlay">Pick underlay</string>
+    <string name="dual_camera_effects">Dual camera effects</string>
+    <string name="dual_camera_effects_intro">Allows you to apply background effects, such as "Motion" and "Sketch". You can also merge two photos together for interesting effects. This feature works best when you have a short distance your camera and the main subject of you picture.</string>
+    <string name="dualcam_no_segment_toast">No segment found at this point</string>
+    <string name="dualcam_filter_not_supported">Dual camera filters not supported for this image</string>
+    <string name="trueportrait_intro">Allows you to enhance photos of people. You can apply effects to the background, such as "Blur" and "Sketch". You can also merge two photos together to create interesting backgrounds for your portrait photos.</string>
+    <string name="trueportrait_no_face">TruePortrait effects cannot be applied to this photo. Face not detected.</string>
+    <string name="trueportrait_edit_intro">With the touch-up tool, you can edit the foreground and the background. You can use your finger to paint in any areas of the foreground or background that were missed.</string>
+    <string name="trueportrait_edit_foreground_toast">Use your finger to paint in any areas of the foreground that were missed.</string>
+    <string name="trueportrait_edit_background_toast">Use your finger to paint in any areas of the background that were missed.</string>
+    <string name="trueportrait_edit_help">To zoom, use two fingers to pinch. You can also drag with two fingers to re-position the image. This can make it easier to fix any problematic areas.</string>
+    <string name="trueportrait_fusion_intro">Your foreground person can be copied and pasted onto any photo in your Gallery. You can try using different background photos to create new and interesting portraits.</string>
+    <string name="dualcam_fusion_intro">Your foreground can be copied and pasted onto any photo in your Gallery.\n\nYou can try using different background photos to create new and interesting portraits.</string>
+    <string name="do_not_show_again">Do not show again</string>
+    <string name="trueportrait_touch_up">Touch up</string>
+    <string name="fusion_pick_background">Select background photo</string>
+
+    <string name="color">Color</string>
+    <string name="ok_continue">Continue</string>
+    <string name="frames">Frames</string>
+    <string name="beautify">Beautify</string>
+    <string name="dualcam">Dual camera</string>
+    <string name="trueportrait" translatable="false">TruePortrait</string>
+    <string name="foreground">Foreground</string>
+    <string name="background">Background</string>
+    <string name="brush_size">Brush Size</string>
+
+    <string name="pref_dualcam_intro_show_key" translatable="false">pref_dualcam_intro_show_key</string>
+    <string name="pref_trueportrait_intro_show_key" translatable="false">pref_trueportrait_intro_show_key</string>
+    <string name="pref_trueportrait_edit_intro_show_key" translatable="false">pref_trueportrait_edit_intro_show_key</string>
+    <string name="pref_trueportrait_fusion_intro_show_key" translatable="false">pref_trueportrait_fusion_intro_show_key</string>
+    <string name="pref_trueportrait_fusion_underlay_key" translatable="false">pref_trueportrait_fusion_underlay_key</string>
+    <string name="pref_dualcam_fusion_underlay_key" translatable="false">pref_dualcam_fusion_underlay_key</string>
+    <string name="pref_dualcam_fusion_intro_show_key" translatable="false">pref_trueportrait_fusion_intro_show_key</string>
+
+    <!--Filtershow dialog -->
+    <string name="filtershow_dialog_title">Custom filter</string>
+    <string name="filtershow_dialog_content">Allows you to create a photo filter.\n\nSelect a photo you like and use it as a filter for other photos</string>
+    <string name="filtershow_dialog_original_photo">Original photo</string>
+    <string name="filtershow_dialog_apply_photo">Colors to apply</string>
+    <string name="filtershow_dialog_checkbox">Do not show again</string>
+    <string name="pref_filtergenerator_intro_show_key" translatable="false">pref_filtergenerator_intro_show_key</string>
+    <string name="filtershow_preset_title">Custom</string>
+    <string name="filtershow_preset_rename">Rename</string>
+    <string name="delete_before_exit">Delete filter?</string>
+    <string name="rename_before_exit">Rename filter</string>
+    <string name="filter_name">Filter name</string>
+    <string name="filter_name_notification">Name cannot be empty.</string>
+    <string name="filter_name_duplicate">Name already exists, please enter a different one.</string>
+    <string name="watermark_location">Location</string>
+    <string name="watermark_time">Time</string>
+    <string name="watermark_weather">Weather</string>
+    <string name="watermark_emotions">Emotions</string>
+    <string name="watermark_food">Food</string>
+    <string name="location_pin" translatable="false">LOCATION_PIN</string>
+    <string name="location_city" translatable="false">LOCATION_CITY</string>
+    <string name="location_hello" translatable="false">LOCATION_HELLO</string>
+    <string name="location_stamp" translatable="false">LOCATION_STAMP</string>
+    <string name="time_hourglass" translatable="false">TIME_HOURGLASS</string>
+    <string name="time_timestamp" translatable="false">TIME_TIMESTAMP</string>
+    <string name="time_sunrise" translatable="false">TIME_SUNRISE</string>
+    <string name="time_calendar" translatable="false">TIME_CALENDAR</string>
+    <string name="weather_rain" translatable="false">WEATHER_RAIN</string>
+    <string name="weather_snow" translatable="false">WEATHER_SNOW</string>
+    <string name="weather_sun" translatable="false">WEATHER_SUN</string>
+    <string name="weather_artistic_sun" translatable="false">WEATHER_ARTISTIC_SUN</string>
+    <string name="emotion_party" translatable="false">EMOTION_PARTY</string>
+    <string name="emotion_peace" translatable="false">EMOTION_PEACE</string>
+    <string name="emotion_cry" translatable="false">EMOTION_CRY</string>
+    <string name="emotion_happy" translatable="false">EMOTION_HAPPY</string>
+    <string name="food_fork_knife" translatable="false">FOOD_FORK_KNIFE</string>
+    <string name="food_tea_time" translatable="false">FOOD_TEA_TIME</string>
+    <string name="food_cheers" translatable="false">FOOD_CHEERS</string>
+    <string name="food_yum" translatable="false">FOOD_YUM</string>
+
+    <!--Filtershow Toast -->
+    <string name="no_faces_found">No faces found</string>
+    <string name="image_size_too_small">Image size too small</string>
+    <string name="not_support_gif">Gif files are not supported, please choose another photo</string>
+</resources>
diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml
index de1928067..98f32ebda 100644
--- a/res/values/filtershow_strings.xml
+++ b/res/values/filtershow_strings.xml
@@ -35,7 +35,7 @@
     <!--  Text to label an image as "original" [CHAR LIMIT=20] -->
     <string name="original">Original</string>
     <!--  Text for filters that apply a border to a picture [CHAR LIMIT=20] -->
-    <string name="borders" msgid="4461692156695893616">Frame</string>
+    <string name="borders" msgid="4461692156695893616">Borders</string>
     <!-- Text for the custom border filter [CHAR LIMIT=20] -->
     <string name="custom_border">Custom</string>
 
@@ -73,13 +73,11 @@
     <!--  Exit Dialog -->
 
     <!--  String displayed when exiting with unsaved changes [CHAR LIMIT=NONE] -->
-    <string name="unsaved">Discard the changes you\'ve made to this image?</string>
+    <string name="unsaved">There are unsaved changes to this image.</string>
     <!--  String displayed when exiting with unsaved changes [CHAR LIMIT=NONE] -->
-    <string name="save_before_exit">Discard changes?</string>
+    <string name="save_before_exit">Do you want to save before exiting?</string>
     <!--  String displayed when saving and exiting editor [CHAR LIMIT=NONE] -->
     <string name="save_and_exit">Save and Exit</string>
-    <!--  String displayed when discard editor [CHAR LIMIT=NONE] -->
-    <string name="discard">Discard</string>
     <!--  String displayed when saving and exiting editor [CHAR LIMIT=NONE] -->
     <string name="save_and_processing">Processing full resolution image...</string>
     <!--  String displayed when exiting editor[CHAR LIMIT=NONE] -->
@@ -90,7 +88,7 @@
     <!--  Text for the history panel title [CHAR LIMIT=50] -->
     <string name="history">History</string>
     <!--  Text for the history panel reset button [CHAR LIMIT=20]-->
-    <string name="reset">Back to original</string>
+    <string name="reset">Reset</string>
     <!--  Text for the original image[CHAR LIMIT=20]-->
     <string name="history_original">@string/original</string>
 
@@ -124,7 +122,7 @@
     <!--  Label for the aspect 1:1 effect [CHAR LIMIT=15] -->
     <string name="aspect9to16_effect">16:9</string>
     <!--  Label for the aspect None effect [CHAR LIMIT=15] -->
-    <string name="aspectNone_effect">Free</string>
+    <string name="aspectNone_effect">None</string>
     <!--  Label for the aspect None effect [CHAR LIMIT=15] -->
     <string name="aspectOriginal_effect">@string/original</string>
     <!-- Label for when the aspect ratio is fixed to a value [CHAR LIMIT=15] -->
@@ -134,12 +132,6 @@
 
     <!--  Filters buttons -->
 
-    <!--  True Effect button -->
-    <string name="trueScanner">True Scanner</string>
-    <!--  HazeBuster button -->
-    <string name="hazeBuster">Haze Buster</string>
-    <!--  SeeStraight button -->
-    <string name="seeStraight">See Straight</string>
     <!--  Label for the image exposure (brightness) filter button [CHAR LIMIT=10] -->
     <string name="exposure" msgid="1229093066434614811">Exposure</string>
     <!--  Label for the image sharpness (clarity, distinctness) filter button [CHAR LIMIT=10] -->
@@ -200,32 +192,6 @@
     <string name="downsample">Downsample</string>
     <!--  Label for the "neutral density graduated filter" filter effect  [CHAR LIMIT=15] -->
     <string name="grad">Graduated</string>
-    <!--  Label for the "refocus" dual camera effect  [CHAR LIMIT=15] -->
-    <string name="focus">Focus</string>
-    <!--  Label for the "fusion" dual camera effect  [CHAR LIMIT=15] -->
-    <string name="fusion">Fusion</string>
-    <!--  Label for the "sketch" dual camera effect  [CHAR LIMIT=15] -->
-    <string name="sketch">Sketch</string>
-    <!--  Label for the "halo" dual camera effect  [CHAR LIMIT=15] -->
-    <string name="halo">Halo</string>
-    <!--  Label for the "zoom" dual camera effect  [CHAR LIMIT=15] -->
-    <string name="zoom">Zoom</string>
-    <!--  Label for the "motion" dual camera effect  [CHAR LIMIT=15] -->
-    <string name="motion">Motion</string>
-    <!--  Label for the "bw" dual camera effect  [CHAR LIMIT=15] -->
-    <string name="bw">B/W</string>
-    <!--  Label for the "blackboard" dual camera effect  [CHAR LIMIT=15] -->
-    <string name="blackboard">Blackboard</string>
-    <!--  Label for the "whiteboard" dual camera effect  [CHAR LIMIT=15] -->
-    <string name="whiteboard">Whiteboard</string>
-    <!--  Label for the "posterize" dual camera effect  [CHAR LIMIT=15] -->
-    <string name="posterize">Posterize</string>
-    <!--  Label for the "negative" dual camera effect  [CHAR LIMIT=15] -->
-    <string name="dc_negative">Negative</string>
-    <!--  Label for the "blur" true portrait effect  [CHAR LIMIT=15] -->
-    <string name="blur">Blur</string>
-    <!--  Label for the "motion blur" true portrait effect  [CHAR LIMIT=15] -->
-    <string name="motion_blur">Motion Blur</string>
     <!--  Label for the Brightness effect  [CHAR LIMIT=20] -->
     <string name="editor_grad_brightness">Brightness</string>
     <!--  Label for the Contrast filter effect  [CHAR LIMIT=20] -->
@@ -362,84 +328,4 @@
     <!-- Label for exif tags in the information panel [CHAR LIMIT=50] -->
     <string name="filtershow_exif_copyright">Copyright</string>
 
-    <string name="fusion_pick_point">Pick Segment</string>
-    <string name="fusion_pick_underlay">Pick Underlay</string>
-    <string name="dual_camera_effects">Dual Camera Effects</string>
-    <string name="dual_camera_effects_intro">Allows you to apply background effects, such as "Motion" and "Sketch". You can also merge two photos together for interesting effects. This feature works best when you have a short distance your camera and the main subject of you picture.</string>
-    <string name="dualcam_no_segment_toast">No segment found at this point</string>
-    <string name="dualcam_filter_not_supported">Dual camera filters not supported for this image</string>
-    <string name="trueportrait_intro">Allows you to enhance photos of people. You can apply effects to the background, such as \"blur\" and \"sketch\". You can also merge two photos together to create interesting backgrounds for your portrait photos.</string>
-    <string name="trueportrait_no_face">True Portrait effects cannot be applied to this photo. Face not detected.</string>
-    <string name="trueportrait_edit_intro">With the Touch-Up tool, you can edit the foreground and the background. You can user your finger to paint in any areas of the foreground or background that were missed.</string>
-    <string name="trueportrait_edit_foreground_toast">Use your finger to paint in any areas of the foreground that were missed.</string>
-    <string name="trueportrait_edit_background_toast">Use your finger to paint in any areas of the background that were missed.</string>
-    <string name="trueportrait_edit_help">To zoom, use two fingers to pinch open or closed. You can also drag with two fingers to re-position the image. This can make it easier to fix any problem areas.</string>
-    <string name="trueportrait_fusion_intro">Your foreground person can be copied and pasted onto any photo in your Gallery. You can try using different background photos to create new and interesting portraits.</string>
-    <string name="dualcam_fusion_intro">Your foreground can be copied and pasted onto any photo in your Gallery. \n\nYou can try using different background photos to create new and interesting portraits.</string>
-    <string name="do_not_show_again">Do not show again</string>
-    <string name="trueportrait_touch_up">Touch Up</string>
-    <string name="fusion_pick_background">Select Background Photo</string>
-
-    <string name="color">Color</string>
-    <string name="ok_continue">Continue</string>
-    <string name="frames">Frames</string>
-    <string name="beautify">Beautify</string>
-    <string name="dualcam">Dual Camera</string>
-    <string name="trueportrait">True Portrait</string>
-    <string name="foreground">Foreground</string>
-    <string name="background">Background</string>
-    <string name="brush_size">Brush Size</string>
-
-    <string name="pref_dualcam_intro_show_key" translatable="false">pref_dualcam_intro_show_key</string>
-    <string name="pref_trueportrait_intro_show_key" translatable="false">pref_trueportrait_intro_show_key</string>
-    <string name="pref_trueportrait_edit_intro_show_key" translatable="false">pref_trueportrait_edit_intro_show_key</string>
-    <string name="pref_trueportrait_fusion_intro_show_key" translatable="false">pref_trueportrait_fusion_intro_show_key</string>
-    <string name="pref_trueportrait_fusion_underlay_key" translatable="false">pref_trueportrait_fusion_underlay_key</string>
-    <string name="pref_dualcam_fusion_underlay_key" translatable="false">pref_dualcam_fusion_underlay_key</string>
-    <string name="pref_dualcam_fusion_intro_show_key" translatable="false">pref_trueportrait_fusion_intro_show_key</string>
-
-    <!--Filtershow dialog -->
-    <string name="filtershow_dialog_title">Custom Filter</string>
-    <string name="filtershow_dialog_content">Allows you to create a photo filter.\n\nSelect a photo you like and use it as a filter for other photos</string>
-    <string name="filtershow_dialog_original_photo">Original Photo</string>
-    <string name="filtershow_dialog_apply_photo">Colors to Apply</string>
-    <string name="filtershow_dialog_checkbox">Do not show again</string>
-    <string name="pref_filtergenerator_intro_show_key" translatable="false">pref_filtergenerator_intro_show_key</string>
-    <string name="filtershow_preset_title">Custom</string>
-    <string name="filtershow_preset_rename">Rename</string>
-    <string name="delete_before_exit">Delete Filter?</string>
-    <string name="rename_before_exit">Rename Filter</string>
-    <string name="filter_name">Filter name</string>
-    <string name="filter_name_notification">Name cannot be NULL.</string>
-    <string name="filter_name_duplicate">Name already existed, please input another one.</string>
-    <string name="watermark_location">Location</string>
-    <string name="watermark_time">Time</string>
-    <string name="watermark_weather">Weather</string>
-    <string name="watermark_emotions">Emotions</string>
-    <string name="watermark_food">Food</string>
-    <string name="location_pin">LOCATION_PIN</string>
-    <string name="location_city">LOCATION_CITY</string>
-    <string name="location_hello">LOCATION_HELLO</string>
-    <string name="location_stamp">LOCATION_STAMP</string>
-    <string name="time_hourglass">TIME_HOURGLASS</string>
-    <string name="time_timestamp">TIME_TIMESTAMP</string>
-    <string name="time_sunrise">TIME_SUNRISE</string>
-    <string name="time_calendar">TIME_CALENDAR</string>
-    <string name="weather_rain">WEATHER_RAIN</string>
-    <string name="weather_snow">WEATHER_SNOW</string>
-    <string name="weather_sun">WEATHER_SUN</string>
-    <string name="weather_artistic_sun">WEATHER_ARTISTIC_SUN</string>
-    <string name="emotion_party">EMOTION_PARTY</string>
-    <string name="emotion_peace">EMOTION_PEACE</string>
-    <string name="emotion_cry">EMOTION_CRY</string>
-    <string name="emotion_happy">EMOTION_HAPPY</string>
-    <string name="food_fork_knife">FOOD_FORK_KNIFE</string>
-    <string name="food_tea_time">FOOD_TEA_TIME</string>
-    <string name="food_cheers">FOOD_CHEERS</string>
-    <string name="food_yum">FOOD_YUM</string>
-
-    <!--Filtershow Toast -->
-    <string name="no_faces_found">No Faces Found</string>
-    <string name="image_size_too_small">Image size too small</string>
-    <string name="not_support_gif">do not support gif extension, please pick again</string>
 </resources>
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 0e790979e..b58f3070a 100755
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -1278,7 +1278,7 @@ public class FilterShowActivity extends AbstractPermissionActivity implements On
 
         for (int i = 0; i < borders.size(); i++) {
             FilterRepresentation filter = borders.get(i);
-            filter.setName(getString(R.string.borders) + "" + i);
+            filter.setName(getString(R.string.frame, i));
             if (i == 0) {
                 filter.setName(getString(R.string.none));
             }
@@ -2494,8 +2494,8 @@ public class FilterShowActivity extends AbstractPermissionActivity implements On
 
     private void createBackDialog() {
         mBackAlertDialogBuilder = new AlertDialog.Builder(this);
-        mBackAlertDialogBuilder.setMessage(R.string.unsaved).setTitle(
-                R.string.save_before_exit);
+        mBackAlertDialogBuilder.setMessage(R.string.discard_message).setTitle(
+                R.string.discard_title);
         mBackAlertDialogBuilder.setPositiveButton(mPopUpText,
                 new DialogInterface.OnClickListener() {
             @Override