diff options
| author | Geoff Mendal <mendal@google.com> | 2015-02-12 23:00:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-12 23:00:46 +0000 |
| commit | 7c958e2df0375761a1851cd02ca3aac3ee95f1c5 (patch) | |
| tree | 21a0bfced680f10df4f48cb225a785009d657e2c | |
| parent | dc43cc88f02bde0917525e9fe274453bc000eb0a (diff) | |
| parent | 899b20e3742d2dec311456780ec5bb600cd5276b (diff) | |
| download | frameworks_base-7c958e2df0375761a1851cd02ca3aac3ee95f1c5.zip frameworks_base-7c958e2df0375761a1851cd02ca3aac3ee95f1c5.tar.gz frameworks_base-7c958e2df0375761a1851cd02ca3aac3ee95f1c5.tar.bz2 | |
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
| -rw-r--r-- | packages/InputDevices/res/values-de/strings.xml | 2 | ||||
| -rw-r--r-- | packages/InputDevices/res/values-hi/strings.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/InputDevices/res/values-de/strings.xml b/packages/InputDevices/res/values-de/strings.xml index 04c19e3..40722f6 100644 --- a/packages/InputDevices/res/values-de/strings.xml +++ b/packages/InputDevices/res/values-de/strings.xml @@ -3,7 +3,7 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="8016145283189546017">"Eingabegeräte"</string> <string name="keyboard_layouts_label" msgid="6688773268302087545">"Android-Tastatur"</string> - <string name="keyboard_layout_english_uk_label" msgid="6664258463319999632">"Englisch (Großbritannien)"</string> + <string name="keyboard_layout_english_uk_label" msgid="6664258463319999632">"Englisch (Vereinigtes Königreich)"</string> <string name="keyboard_layout_english_us_label" msgid="8994890249649106291">"Englisch (USA)"</string> <string name="keyboard_layout_english_us_intl" msgid="3705168594034233583">"Englisch (USA), international"</string> <string name="keyboard_layout_english_us_colemak_label" msgid="4194969610343455380">"Englisch (USA), Colemak"</string> 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> |