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

2 files changed, 39 insertions, 18 deletions

diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index 96962dc..ecfc455 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -17,42 +17,24 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Label for this app's shared user ID (and thus for all other
          apps sharing the uid). -->
-  <string name="sharedUserLabel">Aplicaciones básiques d\'Android</string>
   <!-- This is the label for the application that stores contacts data -->
-  <string name="app_label">Información de los contautos</string>
   <!-- What to show in messaging that refers to this provider, e.g. AccountSyncSettings -->
   <string name="provider_label">Contautos</string>
   <!-- Ticker for the notification shown when updating contacts fails because of memory shortage -->
-  <string name="upgrade_out_of_memory_notification_ticker">L\'anovamientu de contautos necesita más memoria.</string>
   <!-- Title for the notification shown when updating contacts fails because of memory shortage -->
-  <string name="upgrade_out_of_memory_notification_title">Anovando almacenamientu pa contautos</string>
   <!-- Text for the notification shown when updating contacts fails because of memory shortage -->
-  <string name="upgrade_out_of_memory_notification_text">Tocar pa completar l\'anovamientu.</string>
   <!-- The name of the default contact directory -->
-  <string name="default_directory">Contautos</string>
   <!-- The name of the invisible local contact directory -->
-  <string name="local_invisible_directory">Otru</string>
   <!-- The prefix string before the number used for the display name for the voicemail table.
          Because of the way this is combined in SQL we can't allow a generic format string.
          The resulting string will be this string with the number appended to the end.
          Note that the trailing space is important, and that to achieve it we have to wrap the
          string in double quotes. -->
-  <string name="voicemail_from_column">"Mensaxe de voz de "</string>
   <!-- Debug tool - title of the dialog which copies the contact database into the external storage. [CHAR LIMIT=NONE] -->
-  <string name="debug_dump_title">Copiar base de datos de contautos</string>
   <!-- Debug tool - message shown to the user on the dialog which sends a copy of  the contact database via email or other apps. [CHAR LIMIT=NONE] -->
-  <string name="debug_dump_database_message">Tas a piques de 1) facer una copia de la to base de datos, qu\'inclúi la información rellacionada colos contautos y el rexistru de llamaes nel almacenamientu internu y a 2) unviala per corréu-e. Nun escaezas desaniciar la copia en cuantes la tengas copiada n\'otru preséu o tengas recibío\'l corréu-e.</string>
   <!-- Debug tool - dialog button- delete file now [CHAR LIMIT=NONE] -->
-  <string name="debug_dump_delete_button">Desaniciar agora</string>
   <!-- Debug tool - dialog button - start copying [CHAR LIMIT=NONE] -->
-  <string name="debug_dump_start_button">Aniciar</string>
   <!-- Debug tool - email subject [CHAR LIMIT=NONE] -->
-  <string name="debug_dump_email_sender_picker">Esbilla un programa pa unviar el ficheru</string>
   <!-- Debug tool - email subject [CHAR LIMIT=NONE] -->
-  <string name="debug_dump_email_subject">Base datos de contautos axuntada</string>
   <!-- Debug tool - email body [CHAR LIMIT=NONE] -->
-  <string name="debug_dump_email_body">La mio base de datos de contautos con tola información de contautos, va axunta a esti mensaxe. Usa esta información con curiáu.</string>
-  <string name="group_title_co_workers">"Compañeros de trabayu"</string>
-  <string name="group_title_family">"Familia"</string>
-  <string name="group_title_friends">"Collacios"</string>
 </resources>
diff --git a/res/values-sr-rCS/strings.xml b/res/values-sr-rCS/strings.xml
new file mode 100644
index 0000000..03e136d
--- /dev/null
+++ b/res/values-sr-rCS/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2009 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 xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Label for this app's shared user ID (and thus for all other
+         apps sharing the uid). -->
+  <!-- This is the label for the application that stores contacts data -->
+  <!-- What to show in messaging that refers to this provider, e.g. AccountSyncSettings -->
+  <!-- Ticker for the notification shown when updating contacts fails because of memory shortage -->
+  <!-- Title for the notification shown when updating contacts fails because of memory shortage -->
+  <!-- Text for the notification shown when updating contacts fails because of memory shortage -->
+  <!-- The name of the default contact directory -->
+  <!-- The name of the invisible local contact directory -->
+  <!-- The prefix string before the number used for the display name for the voicemail table.
+         Because of the way this is combined in SQL we can't allow a generic format string.
+         The resulting string will be this string with the number appended to the end.
+         Note that the trailing space is important, and that to achieve it we have to wrap the
+         string in double quotes. -->
+  <!-- Debug tool - title of the dialog which copies the contact database into the external storage. [CHAR LIMIT=NONE] -->
+  <!-- Debug tool - message shown to the user on the dialog which sends a copy of  the contact database via email or other apps. [CHAR LIMIT=NONE] -->
+  <!-- Debug tool - dialog button- delete file now [CHAR LIMIT=NONE] -->
+  <!-- Debug tool - dialog button - start copying [CHAR LIMIT=NONE] -->
+  <!-- Debug tool - email subject [CHAR LIMIT=NONE] -->
+  <!-- Debug tool - email subject [CHAR LIMIT=NONE] -->
+  <!-- Debug tool - email body [CHAR LIMIT=NONE] -->
+</resources>