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, 50 insertions, 16 deletions

diff --git a/packages/BackupRestoreConfirmation/res/values-ast-rES/strings.xml b/packages/BackupRestoreConfirmation/res/values-ast-rES/strings.xml
index 1e1bddf..4efd898 100644
--- a/packages/BackupRestoreConfirmation/res/values-ast-rES/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-ast-rES/strings.xml
@@ -16,43 +16,39 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Title of the activity when a full backup has been requested and must be confirmed -->
-  <string name="backup_confirm_title">Copia de seguranza completa</string>
+  <string name="backup_confirm_title">Respaldu completu</string>
   <!-- Title of the activity when a full restore has been requested and must be confirmed -->
   <string name="restore_confirm_title">Restauración completa</string>
   <!-- Text for message to user that a full backup has been requested, and must be confirmed. -->
-  <string name="backup_confirm_text">Solicitóse una copia de seguranza completa de tolos datos nun ordenador coneutáu. ¿Quies permitir la copia de seguranza?\n\nNun permitas la copia de seguranza si nun ficisti tu la solicitú.</string>
+  <string name="backup_confirm_text">Solicitóse un respaldu completu de tolos datos a un ordenador coneutáu. ¿Quies permitilo?\n\nSi nun solicitesti respaldu dalu, nun permitas la operación.</string>
   <!-- Button to allow a requested full backup to occur -->
-  <string name="allow_backup_button_label">Copia de seguranza de datos</string>
+  <string name="allow_backup_button_label">Respaldar los mios datos</string>
   <!-- Button to refuse to allow the requested full backup -->
-  <string name="deny_backup_button_label">Nun facer copia de seguranza</string>
+  <string name="deny_backup_button_label">Nun respaldar</string>
   <!-- Text for message to user that a full restore has been requested, and must be confirmed. -->
-  <string name="restore_confirm_text">Solicitóse una restauración completa de tolos datos dende un ordenador coneutáu. ¿Quies permitir la restauración?\n\nNun tienes de permitir la restauración si nun ficisti tu la solicitú. Van sustituyise los datos actuales del preséu!</string>
   <!-- Button to allow a requested full restore to occur -->
-  <string name="allow_restore_button_label">Restaurar datos</string>
+  <string name="allow_restore_button_label">Restaurar los mios datos</string>
   <!-- Button to refuse to allow the requested full restore -->
   <string name="deny_restore_button_label">Nun restaurar</string>
   <!-- Text for message to user that they must enter their predefined backup password in order to perform this operation. -->
-  <string name="current_password_text">Introduz la contraseña actual de copia de seguranza:</string>
   <!-- Text for message to user that they must enter their device encryption password in order to perform this restore operation. -->
-  <string name="device_encryption_restore_text">Introduz la contraseña de cifráu del preséu.</string>
   <!-- Text for message to user that they must enter their device encryption password in order to perform this backup operation. -->
-  <string name="device_encryption_backup_text">Introduz la contraseña de cifráu del preséu. Esta contraseña va usase pa cifrar el ficheru de copia de seguranza.</string>
   <!-- Text for message to user that they must enter an encryption password to use for the full backup operation. -->
-  <string name="backup_enc_password_text">Introduz la contraseña que quieras usar pa cifrar los datos de la copia de seguranza completa. Si dexes esti campu baleru, va usase la to contraseña de copia de seguridá actual:</string>
+  <string name="backup_enc_password_text">Introduz una contraseña pa usar nel cifráu del respaldu completu. Si se dexa balero, usaráse la contraseña del to respaldu actual:</string>
   <!-- Text for message to user that they may optionally supply an encryption password to use for a full backup operation. -->
-  <string name="backup_enc_password_optional">Si quies cifrar los datos de la copia de seguranza completa, introduz la contraseña a continuación:</string>
+  <string name="backup_enc_password_optional">Si desees cifrar los datos del respaldu completu, introduz embaxo la contraseña:</string>
   <!-- Text for message to user that they must supply an encryption password to use for a full backup operation because their phone is locked. -->
-  <string name="backup_enc_password_required">Como\'l preséu ta cifráu, necesítase cifrar la copia de seguranza. Escribi la contraseña:</string>
+  <string name="backup_enc_password_required">Darréu que\'l preséu ta cifráu, ríquese que cifres el to respaldu. Introduz embaxo una contraseña:</string>
   <!-- Text for message to user when performing a full restore operation, explaining that they must enter the password originally used to encrypt the full backup data. -->
-  <string name="restore_enc_password_text">Si los datos de restauración tán cifraos, introduz la contraseña:</string>
+  <string name="restore_enc_password_text">Si los datos de restauración tán cifraos, introduz embaxo la contraseña:</string>
   <!-- Text of a toast telling the user that a full backup operation has begun -->
-  <string name="toast_backup_started">Aniciando copia de seguranza...</string>
+  <string name="toast_backup_started">Aniciando respaldu...</string>
   <!-- Text of a toast telling the user that a full backup operation has ended -->
-  <string name="toast_backup_ended">Finó la copia de seguridá</string>
+  <string name="toast_backup_ended">Finó\'l respaldu</string>
   <!-- Text of a toast telling the user that a full restore operation has begun -->
   <string name="toast_restore_started">Aniciando restauración...</string>
   <!-- Text of a toast telling the user that a full restore operation has ended -->
   <string name="toast_restore_ended">Finó la restauración</string>
   <!-- Text of a toast telling the user that the operation has timed out -->
-  <string name="toast_timeout">Tiempu d\'espera d\'operación escosáu</string>
+  <string name="toast_timeout">Escosó\'l tiempu d\'operación</string>
 </resources>
diff --git a/packages/BackupRestoreConfirmation/res/values-sr-rCS/strings.xml b/packages/BackupRestoreConfirmation/res/values-sr-rCS/strings.xml
new file mode 100644
index 0000000..803e4a8
--- /dev/null
+++ b/packages/BackupRestoreConfirmation/res/values-sr-rCS/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the activity when a full backup has been requested and must be confirmed -->
+  <!-- Title of the activity when a full restore has been requested and must be confirmed -->
+  <!-- Text for message to user that a full backup has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full backup to occur -->
+  <!-- Button to refuse to allow the requested full backup -->
+  <!-- Text for message to user that a full restore has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full restore to occur -->
+  <!-- Button to refuse to allow the requested full restore -->
+  <!-- Text for message to user that they must enter their predefined backup password in order to perform this operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this restore operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this backup operation. -->
+  <!-- Text for message to user that they must enter an encryption password to use for the full backup operation. -->
+  <!-- Text for message to user that they may optionally supply an encryption password to use for a full backup operation. -->
+  <!-- Text for message to user that they must supply an encryption password to use for a full backup operation because their phone is locked. -->
+  <!-- Text for message to user when performing a full restore operation, explaining that they must enter the password originally used to encrypt the full backup data. -->
+  <!-- Text of a toast telling the user that a full backup operation has begun -->
+  <!-- Text of a toast telling the user that a full backup operation has ended -->
+  <!-- Text of a toast telling the user that a full restore operation has begun -->
+  <!-- Text of a toast telling the user that a full restore operation has ended -->
+  <!-- Text of a toast telling the user that the operation has timed out -->
+</resources>