Merge branch 'cm-13.0' of https://github.com/LineageOS/android_frameworks_base into replicant-6.0HEADreplicant-6.0-0001replicant-6.0

2 files changed, 51 insertions, 8 deletions

diff --git a/packages/InputDevices/res/values-ast-rES/strings.xml b/packages/InputDevices/res/values-ast-rES/strings.xml
index 6870a2a..68d6af6 100644
--- a/packages/InputDevices/res/values-ast-rES/strings.xml
+++ b/packages/InputDevices/res/values-ast-rES/strings.xml
@@ -6,15 +6,15 @@
   <!-- Keyboard layouts label, used to describe the set of all built-in layouts in the UI. [CHAR LIMIT=35] -->
   <string name="keyboard_layouts_label">Tecláu d\'Android</string>
   <!-- UK English keyboard layout label. [CHAR LIMIT=35] -->
-  <string name="keyboard_layout_english_uk_label">Inglés (UK)</string>
+  <string name="keyboard_layout_english_uk_label">Inglés (Reinu Xuníu)</string>
   <!-- US English keyboard layout label. [CHAR LIMIT=35] -->
-  <string name="keyboard_layout_english_us_label">Inglés (US)</string>
+  <string name="keyboard_layout_english_us_label">Inglés (EE.XX)</string>
   <!-- US English (International style) keyboard layout label. [CHAR LIMIT=35] -->
-  <string name="keyboard_layout_english_us_intl">Inglés (US), estilu International</string>
+  <string name="keyboard_layout_english_us_intl">Inglés (EE.XX), estilu Internacional</string>
   <!-- US English (Colemak style) keyboard layout label. [CHAR LIMIT=35] -->
-  <string name="keyboard_layout_english_us_colemak_label">Inglés (US), estilu Colemak</string>
+  <string name="keyboard_layout_english_us_colemak_label">Inglés (EE.XX), estilu Colemak</string>
   <!-- US English (Dvorak style) keyboard layout label. [CHAR LIMIT=35] -->
-  <string name="keyboard_layout_english_us_dvorak_label">Inglés (US), estilu Dvorak</string>
+  <string name="keyboard_layout_english_us_dvorak_label">Inglés (EE.XX), estilu Dvorak</string>
   <!-- German keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_german_label">Alemán</string>
   <!-- French keyboard layout label. [CHAR LIMIT=35] -->
@@ -30,7 +30,7 @@
   <!-- Swiss French keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_swiss_french_label">Francés de Suiza</string>
   <!-- Swiss German keyboard layout label. [CHAR LIMIT=35] -->
-  <string name="keyboard_layout_swiss_german_label">Alemán suizu</string>
+  <string name="keyboard_layout_swiss_german_label">Alemán de Suiza</string>
   <!-- Belgian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_belgian">Belga</string>
   <!-- Bulgarian keyboard layout label. [CHAR LIMIT=35] -->
@@ -38,7 +38,7 @@
   <!-- Italian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_italian">Italianu</string>
   <!-- Danish keyboard layout label. [CHAR LIMIT=35] -->
-  <string name="keyboard_layout_danish">Danés</string>
+  <string name="keyboard_layout_danish">Neerlandés</string>
   <!-- Norwegian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_norwegian">Noruegu</string>
   <!-- Swedish keyboard layout label. [CHAR LIMIT=35] -->
@@ -66,7 +66,7 @@
   <!-- Turkish keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_turkish">Turcu</string>
   <!-- Ukrainian keyboard layout label. [CHAR LIMIT=35] -->
-  <string name="keyboard_layout_ukrainian">Ucrainianu</string>
+  <string name="keyboard_layout_ukrainian">Ucraín</string>
   <!-- Arabic keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_arabic">Árabe</string>
   <!-- Greek keyboard layout label. [CHAR LIMIT=35] -->
diff --git a/packages/InputDevices/res/values-sr-rCS/strings.xml b/packages/InputDevices/res/values-sr-rCS/strings.xml
new file mode 100644
index 0000000..1f992a5
--- /dev/null
+++ b/packages/InputDevices/res/values-sr-rCS/strings.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+  <!-- Keyboard layouts label, used to describe the set of all built-in layouts in the UI. [CHAR LIMIT=35] -->
+  <!-- UK English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (International style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Colemak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Dvorak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Canadian French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian (Mac style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Belgian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Bulgarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Italian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Danish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Norwegian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swedish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Finnish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Croatian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Czech keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Estonian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hungarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Icelandic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Brazilian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Portuguese keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovak keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovenian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Turkish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Ukrainian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Arabic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Greek keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hebrew keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Lithuanian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish (Latin) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Latvian keyboard layout label. [CHAR LIMIT=35] -->
+</resources>