summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2016-03-13 05:46:43 -0700
committerSteve Kondik <steve@cyngn.com>2016-03-13 05:46:43 -0700
commit1129f556e5097e777bd2071890cc622db6a14f5e (patch)
tree691afd4fe7129b438fd2828f8c2203665717d29f /res
parente48ef94fd67a228c3ab402bdbb2b77c8a5440012 (diff)
parentf630789246e5782b05d5f4035d72ffe256e7abae (diff)
downloadandroid_packages_apps_Trebuchet-1129f556e5097e777bd2071890cc622db6a14f5e.tar.gz
android_packages_apps_Trebuchet-1129f556e5097e777bd2071890cc622db6a14f5e.tar.bz2
android_packages_apps_Trebuchet-1129f556e5097e777bd2071890cc622db6a14f5e.zip
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/Launcher3 into HEAD
Android 6.0.1 release 22
Diffstat (limited to 'res')
-rw-r--r--res/values-hr/strings.xml2
-rw-r--r--res/values-uz-rUZ/strings.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 2679570dc..646a67fce 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -67,7 +67,7 @@
<string name="folder_renamed" msgid="1794088362165669656">"Mapa je preimenovana u <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="folder_name_format" msgid="6629239338071103179">"Mapa: <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="widget_button_text" msgid="2880537293434387943">"Widgeti"</string>
- <string name="wallpaper_button_text" msgid="8404103075899945851">"Pozadine"</string>
+ <string name="wallpaper_button_text" msgid="8404103075899945851">"Pozadinske slike"</string>
<string name="settings_button_text" msgid="8119458837558863227">"Postavke"</string>
<string name="allow_rotation_title" msgid="2118706734511831751">"Dopusti rotaciju"</string>
<string name="package_state_unknown" msgid="7592128424511031410">"Nepoznato"</string>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 24e4c4d14..7d748dd9f 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -67,7 +67,7 @@
<string name="folder_renamed" msgid="1794088362165669656">"Jild nomi <xliff:g id="NAME">%1$s</xliff:g>ga o‘zgartirildi"</string>
<string name="folder_name_format" msgid="6629239338071103179">"Jild: <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="widget_button_text" msgid="2880537293434387943">"Vidjetlar"</string>
- <string name="wallpaper_button_text" msgid="8404103075899945851">"Fon rasmlari"</string>
+ <string name="wallpaper_button_text" msgid="8404103075899945851">"Orqa fon rasmlari"</string>
<string name="settings_button_text" msgid="8119458837558863227">"Sozlamalar"</string>
<string name="allow_rotation_title" msgid="2118706734511831751">"Aylanishga ruxsat berish"</string>
<string name="package_state_unknown" msgid="7592128424511031410">"Noma’lum"</string>