summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Cerqueira <ricardo@cyngn.com>2015-03-10 12:29:24 (GMT)
committerRicardo Cerqueira <ricardo@cyngn.com>2015-03-10 12:29:24 (GMT)
commit06163d773c2a3e49733a302554f5b07e4b1220d1 (patch)
tree0c98e2050c35b7bb9b8b12beb44ff13c07f6ef97
parent75d5257c7105afdab1dba7b163ea6664159e54f2 (diff)
parenta62f73d7a25899ba8c5c0464476ebbb01d3cddda (diff)
downloadandroid_packages_wallpapers_LivePicker-staging/cm-12.1.zip
android_packages_wallpapers_LivePicker-staging/cm-12.1.tar.gz
android_packages_wallpapers_LivePicker-staging/cm-12.1.tar.bz2
Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.1
Android 5.1.0 release 1
-rw-r--r--res/values-hi/strings.xml2
-rw-r--r--res/values-my-rMM/strings.xml14
-rw-r--r--res/values-uk/strings.xml8
3 files changed, 12 insertions, 12 deletions
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index a1eaab8..b28304b 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -29,5 +29,5 @@
<string name="set_live_wallpaper" msgid="2381437614949033266">"वॉलपेपर सेट करें"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> द्वारा <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
<string name="live_wallpaper_loading" msgid="2488371303130330734">"एनीमेशन वाला वॉलपेपर लोड हो रहा है…"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"रहने दें"</string>
+ <string name="wallpaper_cancel" msgid="7340240618834119228">"रद्द करें"</string>
</resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index bdd28d2..6b6c252 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -19,15 +19,15 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="4119979710394894209">"နောက်ခံပုံအရှင် ရွေးချယ်ခန်း"</string>
+ <string name="application_name" msgid="4119979710394894209">"သက်ရှိနောက်ခံများ ရွေးချယ်နိုင်သော စနစ်"</string>
<string name="live_wallpaper_picker_title" msgid="4811278937634144675">"သက်ရှိနောက်ခံရွေးချယ်ခြင်း"</string>
- <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"နောက်ခံအရှင်များ"</string>
- <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"နောက်ခံပုံအရှင် ကြိုကြည့်မယ်"</string>
+ <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"သက်ရှိ နောက်ခံများ"</string>
+ <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"သက်ရှိနောက်ခံ အစမ်းကြည့်ရှုခြင်း"</string>
<string name="configure_wallpaper" msgid="7396598925806288258">"ဆက်တင်များ"</string>
- <string name="wallpaper_instructions" msgid="4215640646180727542">"နောက်ခံပုံ သတ်မှတ်ပါ"</string>
- <string name="live_wallpaper_empty" msgid="4278728108785853407">"နောက်ခံပုံအရှင်များ မရှိပါ"</string>
+ <string name="wallpaper_instructions" msgid="4215640646180727542">"နောက်ခံအား သတ်မှတ်ရန်"</string>
+ <string name="live_wallpaper_empty" msgid="4278728108785853407">"သက်ရှိနောက်ခံများ မရှိပါ"</string>
<string name="set_live_wallpaper" msgid="2381437614949033266">"နောက်ခံအား သတ်မှတ်ရန်"</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> ကို ရေးသားသူ <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
- <string name="live_wallpaper_loading" msgid="2488371303130330734">"နောက်ခံပုံအရှင်ကို ဆွဲခေါ်နေပါတယ် …"</string>
- <string name="wallpaper_cancel" msgid="7340240618834119228">"ထားတော့"</string>
+ <string name="live_wallpaper_loading" msgid="2488371303130330734">"သက်ရှိ နောက်ခံကို တင်နေပါသည်…"</string>
+ <string name="wallpaper_cancel" msgid="7340240618834119228">"ပယ်ဖျက်သည်"</string>
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index d64aff8..7b69192 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -21,13 +21,13 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="4119979710394894209">"Інстр. виб. анім. фон. мал."</string>
<string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Вибрати анімований фоновий малюнок"</string>
- <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Анімовані фони"</string>
+ <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Анімовані фонові малюнки"</string>
<string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Перегл. анімов. фон. мал."</string>
<string name="configure_wallpaper" msgid="7396598925806288258">"Налаштування"</string>
- <string name="wallpaper_instructions" msgid="4215640646180727542">"Зробити фоном"</string>
+ <string name="wallpaper_instructions" msgid="4215640646180727542">"Устан. фон. мал."</string>
<string name="live_wallpaper_empty" msgid="4278728108785853407">"Нема анім. фон. мал."</string>
- <string name="set_live_wallpaper" msgid="2381437614949033266">"Зробити фоном"</string>
+ <string name="set_live_wallpaper" msgid="2381437614949033266">"Устан. фон. мал."</string>
<string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> автор <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
- <string name="live_wallpaper_loading" msgid="2488371303130330734">"Завантаження…"</string>
+ <string name="live_wallpaper_loading" msgid="2488371303130330734">"Завантаж. анім. фон. мал..."</string>
<string name="wallpaper_cancel" msgid="7340240618834119228">"Скасувати"</string>
</resources>