diff options
| author | Sameer Padala <sxp@google.com> | 2013-10-07 13:09:34 -0700 |
|---|---|---|
| committer | Baligh Uddin <baligh@google.com> | 2013-10-11 16:58:11 +0000 |
| commit | 1f8c42419304742b20ff88a18f938a88f01b895c (patch) | |
| tree | 557705b97ff719ed9e826691911348df320a8eb8 /res/values/strings.xml | |
| parent | 6d9353a72310f9971599b5ac7ff607ca34ff0814 (diff) | |
| download | android_packages_apps_Snap-1f8c42419304742b20ff88a18f938a88f01b895c.tar.gz android_packages_apps_Snap-1f8c42419304742b20ff88a18f938a88f01b895c.tar.bz2 android_packages_apps_Snap-1f8c42419304742b20ff88a18f938a88f01b895c.zip | |
Fix build break.
ag/369626/ added a cannot_load_image string which was translated in ag/370960/
However, this translation resulted in a duplicate string since this string
already existed in translated versions of filtershow_strings.xml which was
deleted in ag/339346 but the translated versions weren't deleted. Deleting all
the translated versions of that file caused a problem because ag/362583/ added
source code that depended on a setting_wallpaper string which only existed in
the translated string files.
This change deletes the translated filtershow_strings.xml and adds the
untranslated setting_wallpaper string.
Change-Id: I1b8ac8c854c6f06abde9a71db2105c4d2dd44934
(cherry picked from commit 73a18da0f6181d882d04d648ddcbcc82047f5d71)
Diffstat (limited to 'res/values/strings.xml')
| -rw-r--r-- | res/values/strings.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index ae8ac0b05..03b38bc62 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -659,4 +659,6 @@ CHAR LIMIT = NONE] --> <!-- Label for album filmstrip button --> <string name="switch_photo_filmstrip">Filmstrip view</string> -</resources> + <!-- String shown when setting the homepage wallpaper in the background [CHAR LIMIT=NONE] --> + <string name="setting_wallpaper">Setting wallpaper</string> + </resources> |