diff options
| author | Alan Lau <alanlau@google.com> | 2014-07-30 17:41:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-30 17:41:34 +0000 |
| commit | c788815693191523e6e1dbedc0ff8417d9ee5bfa (patch) | |
| tree | 1ff2eebd6d2ed5ebbbb098234a85f74dbfdc20ce | |
| parent | 0716daabda7c6bd8b97012833ecfd43c9f2d26d7 (diff) | |
| parent | b55853e8a31889e52395ff09d257ee38ae8fb5bc (diff) | |
| download | frameworks_base-c788815693191523e6e1dbedc0ff8417d9ee5bfa.zip frameworks_base-c788815693191523e6e1dbedc0ff8417d9ee5bfa.tar.gz frameworks_base-c788815693191523e6e1dbedc0ff8417d9ee5bfa.tar.bz2 | |
Merge branch 'lmp-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev
| -rw-r--r-- | packages/PrintSpooler/res/values-km-rKH/strings.xml | 2 | ||||
| -rw-r--r-- | packages/PrintSpooler/res/values-my-rMM/strings.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/PrintSpooler/res/values-km-rKH/strings.xml b/packages/PrintSpooler/res/values-km-rKH/strings.xml index bf82957..edda7e9 100644 --- a/packages/PrintSpooler/res/values-km-rKH/strings.xml +++ b/packages/PrintSpooler/res/values-km-rKH/strings.xml @@ -62,7 +62,7 @@ </plurals> <string name="cancel" msgid="4373674107267141885">"បោះបង់"</string> <string name="restart" msgid="2472034227037808749">"ចាប់ផ្ដើមឡើងវិញ"</string> - <string name="no_connection_to_printer" msgid="2159246915977282728">"គ្មានការភ្ជាប់ទៅម៉ាស៊ីនបោះពុម្ព"</string> + <string name="no_connection_to_printer" msgid="2159246915977282728">"គ្មានការភ្ជាប់ទៅម៉ាស៊ីនបោះពុម្ព"</string> <string name="reason_unknown" msgid="5507940196503246139">"មិនស្គាល់"</string> <string name="printer_unavailable" msgid="2434170617003315690">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> – មិនអាចប្រើបាន"</string> <string-array name="color_mode_labels"> diff --git a/packages/PrintSpooler/res/values-my-rMM/strings.xml b/packages/PrintSpooler/res/values-my-rMM/strings.xml index 04da765..8d0320e 100644 --- a/packages/PrintSpooler/res/values-my-rMM/strings.xml +++ b/packages/PrintSpooler/res/values-my-rMM/strings.xml @@ -77,5 +77,5 @@ <string name="print_error_default_message" msgid="8602678405502922346">"ဆော်ရီး၊ အဲဒါ အလုပ်မဖြစ်ခဲ့ပါ။ ထပ် စမ်းပါ။"</string> <string name="print_error_retry" msgid="1426421728784259538">"ထပ်စမ်း"</string> <string name="print_error_printer_unavailable" msgid="8985614415253203381">"ဒီပရင်တာမှာ ယခုအချိန်မှာ မရနိုင်ပါ။"</string> - <string name="print_preparing_preview" msgid="3939930735671364712">"အစမ်းကြည့်ရန် ပြင်ဆင်နေ…"</string> + <string name="print_preparing_preview" msgid="3939930735671364712">"အစမ်းကြည့်ရန် ပြင်ဆင်နေ…"</string> </resources> |