diff options
author | Steve Kondik <steve@cyngn.com> | 2016-03-11 03:47:09 -0800 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-03-11 16:58:39 -0800 |
commit | 0e1dbed9194839a90755670d8fdf9046a75b85f7 (patch) | |
tree | 010372762ddc617295da2862f7d61813da9e3586 /packages/InputDevices | |
parent | 564f10b8f05ddf4d9ea2c0e64f1b113fe6dad4b8 (diff) | |
parent | e342181a4a8d8177b3b87ffe141777565fe98f15 (diff) | |
download | frameworks_base-0e1dbed9194839a90755670d8fdf9046a75b85f7.zip frameworks_base-0e1dbed9194839a90755670d8fdf9046a75b85f7.tar.gz frameworks_base-0e1dbed9194839a90755670d8fdf9046a75b85f7.tar.bz2 |
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/frameworks/base into cm-13.0
Android 6.0.1 release 22
Change-Id: I0d31899b234156a91accb61e0a7fb3d8d16d5062
Diffstat (limited to 'packages/InputDevices')
4 files changed, 2 insertions, 88 deletions
diff --git a/packages/InputDevices/res/values-az-rAZ/strings.xml b/packages/InputDevices/res/values-az-rAZ/strings.xml deleted file mode 100644 index d69059c..0000000 --- a/packages/InputDevices/res/values-az-rAZ/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?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">"Daxiletmə Cihazları"</string> - <string name="keyboard_layouts_label" msgid="6688773268302087545">"Android klaviaturası"</string> - <string name="keyboard_layout_english_uk_label" msgid="6664258463319999632">"İngilis (BK)"</string> - <string name="keyboard_layout_english_us_label" msgid="8994890249649106291">"İngilis (ABŞ)"</string> - <string name="keyboard_layout_english_us_intl" msgid="3705168594034233583">"İngilis (ABŞ), Beynəlxalq üslub"</string> - <string name="keyboard_layout_english_us_colemak_label" msgid="4194969610343455380">"İngilis (ABŞ), Colemak üslubu"</string> - <string name="keyboard_layout_english_us_dvorak_label" msgid="793528923171145202">"İngilis (ABŞ), Dvorak üslubu"</string> - <string name="keyboard_layout_german_label" msgid="8451565865467909999">"Alman"</string> - <string name="keyboard_layout_french_label" msgid="813450119589383723">"Fransız"</string> - <string name="keyboard_layout_french_ca_label" msgid="365352601060604832">"Fransız dili (Kanada)"</string> - <string name="keyboard_layout_russian_label" msgid="8724879775815042968">"Rus"</string> - <string name="keyboard_layout_russian_mac_label" msgid="3795866869038264796">"Rus, Mac üslubu"</string> - <string name="keyboard_layout_spanish_label" msgid="7091555148131908240">"İspan"</string> - <string name="keyboard_layout_swiss_french_label" msgid="4659191025396371684">"İsverçə Fransızı"</string> - <string name="keyboard_layout_swiss_german_label" msgid="2305520941993314258">"İsveçrə Almanı"</string> - <string name="keyboard_layout_belgian" msgid="2011984572838651558">"Belçikalı"</string> - <string name="keyboard_layout_bulgarian" msgid="8951224309972028398">"Bolqar"</string> - <string name="keyboard_layout_italian" msgid="6497079660449781213">"İtalyan"</string> - <string name="keyboard_layout_danish" msgid="8036432066627127851">"Danimarkalı"</string> - <string name="keyboard_layout_norwegian" msgid="9090097917011040937">"Norveçli"</string> - <string name="keyboard_layout_swedish" msgid="732959109088479351">"İsveç"</string> - <string name="keyboard_layout_finnish" msgid="5585659438924315466">"Fin"</string> - <string name="keyboard_layout_croatian" msgid="4172229471079281138">"Xorvat"</string> - <string name="keyboard_layout_czech" msgid="1349256901452975343">"Çex"</string> - <string name="keyboard_layout_estonian" msgid="8775830985185665274">"Eston"</string> - <string name="keyboard_layout_hungarian" msgid="4154963661406035109">"Macar"</string> - <string name="keyboard_layout_icelandic" msgid="5836645650912489642">"İslandiyalı"</string> - <string name="keyboard_layout_brazilian" msgid="5117896443147781939">"Braziliyalı"</string> - <string name="keyboard_layout_portuguese" msgid="2888198587329660305">"Portuqal"</string> - <string name="keyboard_layout_slovak" msgid="2469379934672837296">"Slovak"</string> - <string name="keyboard_layout_slovenian" msgid="1735933028924982368">"Sloven"</string> - <string name="keyboard_layout_turkish" msgid="7736163250907964898">"Türk"</string> - <string name="keyboard_layout_ukrainian" msgid="8176637744389480417">"Ukrayna"</string> - <string name="keyboard_layout_arabic" msgid="5671970465174968712">"Ərəb"</string> - <string name="keyboard_layout_greek" msgid="7289253560162386040">"Yunan"</string> - <string name="keyboard_layout_hebrew" msgid="7241473985890173812">"İvrit"</string> - <string name="keyboard_layout_lithuanian" msgid="6943110873053106534">"Litva"</string> - <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"İspan (Latın)"</string> - <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Latış"</string> -</resources> diff --git a/packages/InputDevices/res/values-pt-rBR/strings.xml b/packages/InputDevices/res/values-pt-rBR/strings.xml deleted file mode 100644 index e9a0a38..0000000 --- a/packages/InputDevices/res/values-pt-rBR/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?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">"Dispositivos de entrada"</string> - <string name="keyboard_layouts_label" msgid="6688773268302087545">"Teclado do Android"</string> - <string name="keyboard_layout_english_uk_label" msgid="6664258463319999632">"Inglês (Reino Unido)"</string> - <string name="keyboard_layout_english_us_label" msgid="8994890249649106291">"Inglês (EUA)"</string> - <string name="keyboard_layout_english_us_intl" msgid="3705168594034233583">"Inglês (EUA), estilo internacional"</string> - <string name="keyboard_layout_english_us_colemak_label" msgid="4194969610343455380">"Inglês (EUA), estilo Colemak"</string> - <string name="keyboard_layout_english_us_dvorak_label" msgid="793528923171145202">"Inglês (EUA), estilo Dvorak"</string> - <string name="keyboard_layout_german_label" msgid="8451565865467909999">"Alemão"</string> - <string name="keyboard_layout_french_label" msgid="813450119589383723">"Francês"</string> - <string name="keyboard_layout_french_ca_label" msgid="365352601060604832">"Francês (Canadá)"</string> - <string name="keyboard_layout_russian_label" msgid="8724879775815042968">"Russo"</string> - <string name="keyboard_layout_russian_mac_label" msgid="3795866869038264796">"Russo, estilo Mac"</string> - <string name="keyboard_layout_spanish_label" msgid="7091555148131908240">"Espanhol"</string> - <string name="keyboard_layout_swiss_french_label" msgid="4659191025396371684">"Francês suíço"</string> - <string name="keyboard_layout_swiss_german_label" msgid="2305520941993314258">"Alemão suíço"</string> - <string name="keyboard_layout_belgian" msgid="2011984572838651558">"Belga"</string> - <string name="keyboard_layout_bulgarian" msgid="8951224309972028398">"Búlgaro"</string> - <string name="keyboard_layout_italian" msgid="6497079660449781213">"Italiano"</string> - <string name="keyboard_layout_danish" msgid="8036432066627127851">"Dinamarquês"</string> - <string name="keyboard_layout_norwegian" msgid="9090097917011040937">"Norueguês"</string> - <string name="keyboard_layout_swedish" msgid="732959109088479351">"Sueco"</string> - <string name="keyboard_layout_finnish" msgid="5585659438924315466">"Finlandês"</string> - <string name="keyboard_layout_croatian" msgid="4172229471079281138">"Croata"</string> - <string name="keyboard_layout_czech" msgid="1349256901452975343">"Tcheco"</string> - <string name="keyboard_layout_estonian" msgid="8775830985185665274">"Estoniano"</string> - <string name="keyboard_layout_hungarian" msgid="4154963661406035109">"Húngaro"</string> - <string name="keyboard_layout_icelandic" msgid="5836645650912489642">"Islandês"</string> - <string name="keyboard_layout_brazilian" msgid="5117896443147781939">"Brasileiro"</string> - <string name="keyboard_layout_portuguese" msgid="2888198587329660305">"Português"</string> - <string name="keyboard_layout_slovak" msgid="2469379934672837296">"Eslovaco"</string> - <string name="keyboard_layout_slovenian" msgid="1735933028924982368">"Esloveno"</string> - <string name="keyboard_layout_turkish" msgid="7736163250907964898">"Turco"</string> - <string name="keyboard_layout_ukrainian" msgid="8176637744389480417">"Ucraniano"</string> - <string name="keyboard_layout_arabic" msgid="5671970465174968712">"Árabe"</string> - <string name="keyboard_layout_greek" msgid="7289253560162386040">"Grego"</string> - <string name="keyboard_layout_hebrew" msgid="7241473985890173812">"Hebraico"</string> - <string name="keyboard_layout_lithuanian" msgid="6943110873053106534">"Lituano"</string> - <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Espanhol (América Latina)"</string> - <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Letão"</string> -</resources> diff --git a/packages/InputDevices/res/values-uk/strings.xml b/packages/InputDevices/res/values-uk/strings.xml index 43a3fe6..d8152d4 100644 --- a/packages/InputDevices/res/values-uk/strings.xml +++ b/packages/InputDevices/res/values-uk/strings.xml @@ -3,7 +3,7 @@ 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_layout_english_uk_label" msgid="6664258463319999632">"англійська (Велика Британія)"</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> <string name="keyboard_layout_english_us_colemak_label" msgid="4194969610343455380">"англійська (США), розкладка Colemak"</string> diff --git a/packages/InputDevices/res/values-uz-rUZ/strings.xml b/packages/InputDevices/res/values-uz-rUZ/strings.xml index 3b6772b..0a99ad3 100644 --- a/packages/InputDevices/res/values-uz-rUZ/strings.xml +++ b/packages/InputDevices/res/values-uz-rUZ/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">"Kiritish qurilmalari"</string> + <string name="app_label" msgid="8016145283189546017">"Kiruvchi qurilmalar"</string> <string name="keyboard_layouts_label" msgid="6688773268302087545">"Android klaviaturasi"</string> <string name="keyboard_layout_english_uk_label" msgid="6664258463319999632">"Inglizcha (BQ)"</string> <string name="keyboard_layout_english_us_label" msgid="8994890249649106291">"Inglizcha (AQSH)"</string> |