diff options
author | Baligh Uddin <baligh@google.com> | 2014-08-25 16:15:58 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-25 16:16:01 +0000 |
commit | aaee5b22d07501ddf5b247c4798b95ace8acc49c (patch) | |
tree | 4e66c4bfc830ee16e7601fd7a6f2e6a96ed61c39 | |
parent | a33054584db6819188c7a5010136a15e3b1c1747 (diff) | |
parent | 53f1b008dfee885287c1dc168a098d767fb699ac (diff) | |
download | frameworks_base-aaee5b22d07501ddf5b247c4798b95ace8acc49c.zip frameworks_base-aaee5b22d07501ddf5b247c4798b95ace8acc49c.tar.gz frameworks_base-aaee5b22d07501ddf5b247c4798b95ace8acc49c.tar.bz2 |
Merge "Import translations. DO NOT MERGE" into lmp-dev
-rw-r--r-- | packages/CaptivePortalLogin/res/values-my-rMM/strings.xml | 2 | ||||
-rw-r--r-- | packages/CaptivePortalLogin/res/values-ru/strings.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/CaptivePortalLogin/res/values-my-rMM/strings.xml b/packages/CaptivePortalLogin/res/values-my-rMM/strings.xml index 603a804..cd90b38 100644 --- a/packages/CaptivePortalLogin/res/values-my-rMM/strings.xml +++ b/packages/CaptivePortalLogin/res/values-my-rMM/strings.xml @@ -3,6 +3,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_name" msgid="5934709770924185752">"CaptivePortalLogin"</string> <string name="action_use_network" msgid="6076184727448466030">"ဒီကွန်ရက်ကို လက်ရှိအတိုင်း သုံးရန်"</string> - <string name="action_do_not_use_network" msgid="4577366536956516683">"ဒီကွန်ရက်ကို မသုံးပါနှင့်"</string> + <string name="action_do_not_use_network" msgid="4577366536956516683">"ဒီကွန်ရက်ကို မသုံးပါနှင့်"</string> <string name="action_bar_label" msgid="2573986763322074279">"ကွန်ရက်သို့ လက်မှတ်ထိုး ဝင်ရန်"</string> </resources> diff --git a/packages/CaptivePortalLogin/res/values-ru/strings.xml b/packages/CaptivePortalLogin/res/values-ru/strings.xml index 6e7a85f..50e392c 100644 --- a/packages/CaptivePortalLogin/res/values-ru/strings.xml +++ b/packages/CaptivePortalLogin/res/values-ru/strings.xml @@ -4,5 +4,5 @@ <string name="app_name" msgid="5934709770924185752">"CaptivePortalLogin"</string> <string name="action_use_network" msgid="6076184727448466030">"Использовать эту сеть"</string> <string name="action_do_not_use_network" msgid="4577366536956516683">"Не использовать эту сеть"</string> - <string name="action_bar_label" msgid="2573986763322074279">"Подключиться к сети"</string> + <string name="action_bar_label" msgid="2573986763322074279">"Регистрация в сети"</string> </resources> |