diff options
author | Yuli Huang <yuli@google.com> | 2012-04-29 21:31:21 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-29 21:31:21 -0700 |
commit | af0974f574d007a90ed7a319a78605a09f01570a (patch) | |
tree | 1b893ac0776144adb86a84673199ba3ebad5a0fa | |
parent | c0609cac6ce969c573431fdbaf431dbd04b953e5 (diff) | |
parent | d88996f5f73b45a7116cb45e83af187d7425281b (diff) | |
download | android_packages_apps_Snap-af0974f574d007a90ed7a319a78605a09f01570a.tar.gz android_packages_apps_Snap-af0974f574d007a90ed7a319a78605a09f01570a.tar.bz2 android_packages_apps_Snap-af0974f574d007a90ed7a319a78605a09f01570a.zip |
Merge "Make 'Edit' behave more consistent with 'Crop'. DO NOT MERGE." into jb-dev
-rw-r--r-- | res/values/photoeditor_strings.xml | 13 | ||||
-rw-r--r-- | res/values/strings.xml | 5 |
2 files changed, 8 insertions, 10 deletions
diff --git a/res/values/photoeditor_strings.xml b/res/values/photoeditor_strings.xml index b282a45b7..2305e0b3d 100644 --- a/res/values/photoeditor_strings.xml +++ b/res/values/photoeditor_strings.xml @@ -19,16 +19,13 @@ <string name="photoeditor_name">Photo Studio</string> <!-- Toast shown when selected photo could not be loaded. [CHAR LIMIT=40] --> - <string name="loading_failure">Photo cannot be loaded</string> + <string name="loading_failure">Couldn\'t load the photo</string> <!-- Toast shown when edited photo could not be saved. [CHAR LIMIT=40] --> - <string name="saving_failure">Photo cannot be saved</string> + <string name="saving_failure">Couldn\'t save edited photo</string> - <!-- Toast shown when edited photo is successfully saved under %s album [CHAR LIMIT=40] --> - <string name="photo_saved">Photo saved to <xliff:g id="album_name">%s</xliff:g> album</string> - - <!-- Album name where edited photo will be saved in the storage. [CHAR LIMIT=12] --> - <string name="edited_photo_bucket_name">Edited</string> + <!-- Toast shown when edited photo is successfully saved under %s folder [CHAR LIMIT=40] --> + <string name="photo_saved">Edited photo saved to <xliff:g id="folder_name">%s</xliff:g></string> <!-- Dialog message prompted when the user is abandoning unsaved changes. [CHAR LIMIT=40] --> <string name="save_photo">Save edited photo?</string> @@ -133,7 +130,7 @@ <string name="flip_tooltip">Drag photo to flip it</string> <!-- Tool-tip toast shown when the user chooses to remove red eyes. [CHAR LIMIT=40] --> - <string name="redeye_tooltip">Tap to remove red eyes</string> + <string name="redeye_tooltip">Tap on red eyes to remove them</string> <!-- Tool-tip toast shown when the user chooses to rotate photo. [CHAR LIMIT=40] --> <string name="rotate_tooltip">Drag photo to rotate it</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index e8bf0f49a..3bff3ba5f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -230,8 +230,9 @@ <string name="appwidget_empty_text">No photos.</string> <!-- Toast message shown when the cropped image has been saved in the - download folder [CHAR LIMIT=50]--> - <string name="crop_saved">Cropped image saved to Downloads.</string> + %s folder (string: folder_download) [CHAR LIMIT=50]--> + <string name="crop_saved"> + Cropped image saved to <xliff:g id="folder_name">%s</xliff:g>.</string> <!-- Toast message shown when the cropped image is not saved [CHAR LIMIT=50]--> |