diff options
| author | Baligh Uddin <baligh@google.com> | 2014-10-31 17:07:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-31 17:07:17 +0000 |
| commit | 9ce5f3d3da76ad628de1b6c4f155b7b543f35581 (patch) | |
| tree | 94d7f812cb06f99e8d011a8be17e0cfba9b22e35 | |
| parent | 4203242f223084fa8bd4459fa60e95be4dae659e (diff) | |
| parent | 8db41fe7b04e071e08cb11d8367307d5d0ac44fc (diff) | |
| download | frameworks_base-9ce5f3d3da76ad628de1b6c4f155b7b543f35581.zip frameworks_base-9ce5f3d3da76ad628de1b6c4f155b7b543f35581.tar.gz frameworks_base-9ce5f3d3da76ad628de1b6c4f155b7b543f35581.tar.bz2 | |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
| -rw-r--r-- | packages/InputDevices/res/values-hi/strings.xml | 2 | ||||
| -rw-r--r-- | packages/InputDevices/res/values-zh-rCN/strings.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/InputDevices/res/values-hi/strings.xml b/packages/InputDevices/res/values-hi/strings.xml index 77cb8fe..fcd7f84 100644 --- a/packages/InputDevices/res/values-hi/strings.xml +++ b/packages/InputDevices/res/values-hi/strings.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_label" msgid="8016145283189546017">"इनपुट उपकरण"</string> + <string name="app_label" msgid="8016145283189546017">"इनपुट डिवाइस"</string> <string name="keyboard_layouts_label" msgid="6688773268302087545">"Android कीबोर्ड"</string> <string name="keyboard_layout_english_uk_label" msgid="6664258463319999632">"अंग्रेज़ी (यूके)"</string> <string name="keyboard_layout_english_us_label" msgid="8994890249649106291">"अंग्रेज़ी (यूएस)"</string> diff --git a/packages/InputDevices/res/values-zh-rCN/strings.xml b/packages/InputDevices/res/values-zh-rCN/strings.xml index 206f97c..c050ebd 100644 --- a/packages/InputDevices/res/values-zh-rCN/strings.xml +++ b/packages/InputDevices/res/values-zh-rCN/strings.xml @@ -2,7 +2,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="8016145283189546017">"输入设备"</string> - <string name="keyboard_layouts_label" msgid="6688773268302087545">"Android 键盘"</string> + <string name="keyboard_layouts_label" msgid="6688773268302087545">"Android键盘"</string> <string name="keyboard_layout_english_uk_label" msgid="6664258463319999632">"英语（英国）"</string> <string name="keyboard_layout_english_us_label" msgid="8994890249649106291">"英语（美国）"</string> <string name="keyboard_layout_english_us_intl" msgid="3705168594034233583">"英语（美国），国际风格"</string> |