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, 26 insertions, 4 deletions

diff --git a/packages/Shell/res/values-ast-rES/strings.xml b/packages/Shell/res/values-ast-rES/strings.xml
index 829ce93..1a77d2c 100644
--- a/packages/Shell/res/values-ast-rES/strings.xml
+++ b/packages/Shell/res/values-ast-rES/strings.xml
@@ -17,13 +17,11 @@
 <resources>
   <string name="app_label">Shell</string>
   <!-- Title of notification indicating a bugreport has been successfully captured. [CHAR LIMIT=50] -->
-  <string name="bugreport_finished_title">Informe de fallu capturáu</string>
+  <string name="bugreport_finished_title">Capturóse l\'informe de fallu</string>
   <!-- Text of notification indicating that swipe left will share the captured bugreport. [CHAR LIMIT=100] -->
-  <string name="bugreport_finished_text" product="watch">Esliza a esquierda pa compartir l\'informe de fallu</string>
   <!-- Text of notification indicating that touching will share the captured bugreport. [CHAR LIMIT=100] -->
-  <string name="bugreport_finished_text" product="default">Toca pa compartir l\'informe de fallu</string>
   <!-- Body of dialog informing user about contents of a bugreport. [CHAR LIMIT=NONE] -->
-  <string name="bugreport_confirm">Los informes de fallos contienen datos de los distintos ficheros de rexistru del sistema, incluyida información personal y privada. Comparte los informes de fallos namái con aplicaciones y usuarios nos que confíes.</string>
+  <string name="bugreport_confirm">Los informes de fallu contienen datos de dellos ficheros de rexistru del sistema, incluyendo información personal y privada. Comparti los informes de fallu namái con aplicaciones y usuarios nos que t\'enfotes.</string>
   <!-- Checkbox that indicates this dialog should be shown again when the next bugreport is taken. [CHAR LIMIT=50] -->
   <string name="bugreport_confirm_repeat">Amosar esti mensaxe la próxima vegada</string>
   <!-- Title for documents backend that offers bugreports. -->
diff --git a/packages/Shell/res/values-sr-rCS/strings.xml b/packages/Shell/res/values-sr-rCS/strings.xml
new file mode 100644
index 0000000..a4de2af
--- /dev/null
+++ b/packages/Shell/res/values-sr-rCS/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+  <!-- Title of notification indicating a bugreport has been successfully captured. [CHAR LIMIT=50] -->
+  <!-- Text of notification indicating that swipe left will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Text of notification indicating that touching will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Body of dialog informing user about contents of a bugreport. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox that indicates this dialog should be shown again when the next bugreport is taken. [CHAR LIMIT=50] -->
+  <!-- Title for documents backend that offers bugreports. -->
+</resources>