diff options
author | Sascha Haeberling <haeberling@google.com> | 2013-10-03 09:51:40 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-03 09:51:40 -0700 |
commit | 8a605fad65487973449f629bcf6e396f2d79ad3c (patch) | |
tree | 7bf66dcaad92d720893a773932e443c81f7db2a9 /res | |
parent | 9a09d511ce26df0bb81a3fc3b61d68356c790860 (diff) | |
parent | 3393a62797fa397823eba720b3f52d39ae065739 (diff) | |
download | android_packages_apps_Snap-8a605fad65487973449f629bcf6e396f2d79ad3c.tar.gz android_packages_apps_Snap-8a605fad65487973449f629bcf6e396f2d79ad3c.tar.bz2 android_packages_apps_Snap-8a605fad65487973449f629bcf6e396f2d79ad3c.zip |
am 3393a627: Merge "Add missing crop message." into gb-ub-photos-carlsbad
* commit '3393a62797fa397823eba720b3f52d39ae065739':
Add missing crop message.
Diffstat (limited to 'res')
-rw-r--r-- | res/values/strings.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index dcbc358a5..7af494a50 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -656,7 +656,8 @@ CHAR LIMIT = NONE] --> <!-- Crop --> <!-- Label for the save button in the crop activity action bar [CHAR LIMIT=20] --> <string name="crop_save">Save</string> - + <!-- String shown when we cannot load the image when starting the activity [CHAR LIMIT=NONE] --> + <string name="cannot_load_image">Cannot load the image!</string> <!-- Label for album filmstrip button --> <string name="switch_photo_filmstrip">Filmstrip view</string> |