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, 97 insertions, 71 deletions

diff --git a/packages/PrintSpooler/res/values-ast-rES/strings.xml b/packages/PrintSpooler/res/values-ast-rES/strings.xml
index a6e8a9d..0003f13 100644
--- a/packages/PrintSpooler/res/values-ast-rES/strings.xml
+++ b/packages/PrintSpooler/res/values-ast-rES/strings.xml
@@ -16,7 +16,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Title of the PrintSpooler application. [CHAR LIMIT=50] -->
-  <string name="app_label">Cola d\'impresión</string>
   <!-- Label of the print dialog's button for more print options. [CHAR LIMIT=25] -->
   <string name="more_options_button">Más opciones</string>
   <!-- Label of the destination widget. [CHAR LIMIT=20] -->
@@ -26,58 +25,39 @@
   <!-- Label of the copies count for the print options summary. [CHAR LIMIT=20] -->
   <string name="label_copies_summary">Copies:</string>
   <!-- Label of the paper size widget. [CHAR LIMIT=20] -->
-  <string name="label_paper_size">Tamañu papel</string>
   <!-- Label of the paper size for the print options summary. [CHAR LIMIT=20] -->
-  <string name="label_paper_size_summary">Tamañu papel:</string>
   <!-- Label of the color mode widget. [CHAR LIMIT=20] -->
   <string name="label_color">Color</string>
   <!-- Label of the printer mode to print on both sides of paper. [CHAR LIMIT=20] -->
-  <string name="label_duplex">Dambos llaos</string>
   <!-- Label of the orientation widget. [CHAR LIMIT=20] -->
-  <string name="label_orientation">Orientación</string>
   <!-- Label of the page selection widget. [CHAR LIMIT=20] -->
   <string name="label_pages">Páxines</string>
   <!-- Template for the all pages option in the page selection widget. [CHAR LIMIT=20] -->
-  <string name="template_all_pages">Too <xliff:g id="page_count" example="100">%1$s</xliff:g></string>
   <!-- Template for the page range option in the page selection widget. [CHAR LIMIT=20] -->
   <string name="template_page_range">Rangu de <xliff:g id="page_count" example="100">%1$s</xliff:g></string>
   <!-- Page range exmple used as a hint of how to specify such. [CHAR LIMIT=20] -->
-  <string name="pages_range_example">ex. 1—5,8,11—13</string>
   <!-- Title for the pring preview button .[CHAR LIMIT=30] -->
-  <string name="print_preview">Previsualizar impresión</string>
   <!-- Title for the pring preview button if there is no PDF viewer isntalled. [CHAR LIMIT=50] -->
-  <string name="install_for_print_preview">Instalar visor PDF pa previsualizar</string>
   <!-- Title of the message that the printing application crashed. [CHAR LIMIT=50] -->
-  <string name="printing_app_crashed">Falló l\'aplicación d\'impresión</string>
   <!-- Title for the temporary dialog show while an app is generating a print job. [CHAR LIMIT=30] -->
-  <string name="generating_print_job">Xenerando trabayu d\'impresión</string>
+  <string name="generating_print_job">Xenerando trabayu d\'imprentación</string>
   <!-- Title for the save as PDF option in the printer list. [CHAR LIMIT=30] -->
   <string name="save_as_pdf">Guardar como PDF</string>
   <!-- Title for the open all printers UI option in the printer list. [CHAR LIMIT=30] -->
   <string name="all_printers">Toles imprentadores&#8230;</string>
   <!-- Title for the print dialog announced to the user for accessibility. Not shown in the UI. [CHAR LIMIT=none] -->
-  <string name="print_dialog">Cuadru de diálogu d\'impresión</string>
+  <string name="print_dialog">Diálogu d\'imprentación</string>
   <!-- Template for the message that shows the current page out of the total number of pages [CHAR LIMIT=none] -->
-  <string name="current_page_template"><xliff:g id="current_page">%1$d</xliff:g>
-        /<xliff:g id="page_count">%2$d</xliff:g></string>
   <!-- Description of the current page - spoken to the user [CHAR LIMIT=none] -->
-  <string name="page_description_template">Páxina <xliff:g id="current_page" example="1">%1$d</xliff:g>
-        de <xliff:g id="page_count" example="100">%2$d</xliff:g></string>
   <!-- Template for the message to announce the print options summary - spoken to the user. [CHAR LIMIT=none] -->
-  <string name="summary_template">Resume, copies <xliff:g id="copies" example="1">%1$s</xliff:g>,
-        tamañu papel <xliff:g id="paper_size" example="A4">%2$s</xliff:g></string>
   <!-- Description for the handle to expand all print options - spoken to the user. [CHAR LIMIT=none] -->
-  <string name="expand_handle">Remanar espansión</string>
   <!-- Description for the handle to collapse all print options - spoken to the user. [CHAR LIMIT=none] -->
-  <string name="collapse_handle">Remanar contraición</string>
   <!-- Description for the print button - spoken to the user. [CHAR LIMIT=none] -->
   <string name="print_button">Imprentar</string>
   <!-- Description for the save to PDF button - spoken to the user. [CHAR LIMIT=none] -->
-  <string name="savetopdf_button">Guardar a PDF</string>
+  <string name="savetopdf_button">Guardar en PDF</string>
   <!-- Message to announce print options are expanded - spoken to the user. [CHAR LIMIT=none] -->
-  <string name="print_options_expanded">Opciones d\'imprentación espandíes</string>
   <!-- Message to announce print options are collapsed - spoken to the user. [CHAR LIMIT=none] -->
-  <string name="print_options_collapsed">Opciones d\'imprentación contrayíes</string>
   <!-- Select printer activity -->
   <!-- Title for the share action bar menu item. [CHAR LIMIT=20] -->
   <string name="search">Guetar</string>
@@ -86,75 +66,33 @@
   <!-- Title of the button to install a print service. [CHAR LIMIT=25] -->
   <string name="add_print_service_label">Amestar serviciu</string>
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
-  <string name="print_search_box_shown_utterance">Cuadru de gueta visible</string>
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
-  <string name="print_search_box_hidden_utterance">Cuadru de gueta anubríu</string>
   <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
-  <string name="print_add_printer">Amestar imprentadora</string>
   <!-- Title of the menu item to select a printer. [CHAR LIMIT=25] -->
-  <string name="print_select_printer">Esbillar imprentadora</string>
   <!-- Title of the menu item to forget a printer. [CHAR LIMIT=25] -->
-  <string name="print_forget_printer">Esborrar imprentadora</string>
+  <string name="print_forget_printer">Escacer imprentadora</string>
   <!-- Utterance to announce a change in the number of matches during a search. This is spoken to a blind user. [CHAR LIMIT=none] -->
-  <plurals name="print_search_result_count_utterance">
-    <item quantity="one">Atopóse <xliff:g id="count" example="1">%1$s</xliff:g> imprentadora</item>
-    <item quantity="other">Atopáronse <xliff:g id="count" example="2">%1$s</xliff:g> imprentadores</item>
-  </plurals>
   <!-- Add printer dialog  -->
   <!-- Title for the alert dialog for selecting a print service. [CHAR LIMIT=50] -->
-  <string name="choose_print_service">Elexir serviciu d\'impresión</string>
   <!-- Title for the prompt shown as a placeholder if no printers are found while not searching. [CHAR LIMIT=50] -->
-  <string name="print_searching_for_printers">Guetando imprentadores</string>
   <!-- Title for the prompt shown as a placeholder if there are no printers while searching. [CHAR LIMIT=50] -->
-  <string name="print_no_printers">Nun s\'atoparon imprentadores</string>
   <!-- Notifications -->
   <!-- Template for the notification label for a printing print job. [CHAR LIMIT=25] -->
-  <string name="printing_notification_title_template">Imprentando <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g></string>
   <!-- Template for the notification label for a cancelling print job. [CHAR LIMIT=25] -->
   <string name="cancelling_notification_title_template">Encaboxando <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g></string>
   <!-- Template for the notification label for a failed print job. [CHAR LIMIT=25] -->
-  <string name="failed_notification_title_template">Fallu d\'imprentadora <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g></string>
   <!-- Template for the notification label for a blocked print job. [CHAR LIMIT=25] -->
-  <string name="blocked_notification_title_template">La imprentadora bloquió <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g></string>
   <!-- Template for the notification label for a composite (multiple items) print jobs notification. [CHAR LIMIT=25] -->
-  <plurals name="composite_notification_title_template">
-    <item quantity="one"><xliff:g id="print_job_name" example="foo.jpg">%1$d</xliff:g> trabayu d\'impresión</item>
-    <item quantity="other"><xliff:g id="print_job_name" example="foo.jpg">%1$d</xliff:g> trabayos d\'impresión</item>
-  </plurals>
   <!-- Label for the notification button for cancelling a print job. [CHAR LIMIT=25] -->
   <string name="cancel">Encaboxar</string>
   <!-- Label for the notification button for restarting a filed print job. [CHAR LIMIT=25] -->
-  <string name="restart">Reaniciar</string>
   <!-- Message that there is no connection to a printer. [CHAR LIMIT=40] -->
-  <string name="no_connection_to_printer">Nun hai conexón cola imprentadora</string>
   <!-- Label for an unknown reason for failed or blocked print job. [CHAR LIMIT=25] -->
-  <string name="reason_unknown">desconocíu</string>
   <!-- Label for a printer that is not available. [CHAR LIMIT=25] -->
-  <string name="printer_unavailable"><xliff:g id="print_job_name" example="Canon-123GHT">%1$s</xliff:g> – non disponible</string>
   <!-- Arrays -->
   <!-- Color mode labels. -->
-  <string-array name="color_mode_labels">
-    <!-- Color mode label: Monochrome color scheme, e.g. one color is used. [CHAR LIMIT=20] -->
-    <item>Blancu y prietu</item>
-    <!-- Color mode label: Color color scheme, e.g. many colors are used. [CHAR LIMIT=20] -->
-    <item>Color</item>
-  </string-array>
   <!-- Duplex mode labels. -->
-  <string-array name="duplex_mode_labels">
-    <!-- Duplex mode label: No duplex supported. [CHAR LIMIT=20] -->
-    <item>Nengún</item>
-    <!-- Duplex mode label: Turn page sideways along the long edge like a book. [CHAR LIMIT=20] -->
-    <item>Borde llargu</item>
-    <!-- Duplex mode label: Turn page upwards along the short edge like a notepad. [CHAR LIMIT=20] -->
-    <item>Borde curtiu</item>
-  </string-array>
   <!-- Orientation labels. -->
-  <string-array name="orientation_labels">
-    <!-- Orientation label: Portrait page orientation. [CHAR LIMIT=30] -->
-    <item>Retratu</item>
-    <!-- Orientation label: Landscape page orientation [CHAR LIMIT=30] -->
-    <item>Paisaxe</item>
-  </string-array>
   <!-- Permissions -->
   <!-- Title of an application permission, listed so the user can choose whether they want
          to allow the application to do this. -->
@@ -166,14 +104,9 @@
          want to allow the application to do this. -->
   <!-- Error messages -->
   <!-- Message for an error when trying to print to a PDF file. [CHAR LIMIT=50] -->
-  <string name="print_write_error_message">Nun pudo escribise nel ficheru</string>
   <!-- Default message for an error while generating a print job. [CHAR LIMIT=50] -->
-  <string name="print_error_default_message">Nun funcionó. Inténtalo otra vegada.</string>
   <!-- Label for the retry button in the error message. [CHAR LIMIT=50] -->
-  <string name="print_error_retry">Repitir</string>
   <!-- Message for the currently selected printer being unavailable. [CHAR LIMIT=100] -->
-  <string name="print_error_printer_unavailable">La imprentadora nun ta disponible agora.</string>
   <!-- Long running operations -->
   <!-- Message long running operation when preparing print preview. [CHAR LIMIT=50] -->
-  <string name="print_preparing_preview">Preparando previsualización\u2026</string>
 </resources>
diff --git a/packages/PrintSpooler/res/values-sr-rCS/strings.xml b/packages/PrintSpooler/res/values-sr-rCS/strings.xml
new file mode 100644
index 0000000..52d0bc0
--- /dev/null
+++ b/packages/PrintSpooler/res/values-sr-rCS/strings.xml
@@ -0,0 +1,93 @@
+<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the PrintSpooler application. [CHAR LIMIT=50] -->
+  <!-- Label of the print dialog's button for more print options. [CHAR LIMIT=25] -->
+  <!-- Label of the destination widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size widget. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the color mode widget. [CHAR LIMIT=20] -->
+  <!-- Label of the printer mode to print on both sides of paper. [CHAR LIMIT=20] -->
+  <!-- Label of the orientation widget. [CHAR LIMIT=20] -->
+  <!-- Label of the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the all pages option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the page range option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Page range exmple used as a hint of how to specify such. [CHAR LIMIT=20] -->
+  <!-- Title for the pring preview button .[CHAR LIMIT=30] -->
+  <!-- Title for the pring preview button if there is no PDF viewer isntalled. [CHAR LIMIT=50] -->
+  <!-- Title of the message that the printing application crashed. [CHAR LIMIT=50] -->
+  <!-- Title for the temporary dialog show while an app is generating a print job. [CHAR LIMIT=30] -->
+  <!-- Title for the save as PDF option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the open all printers UI option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the print dialog announced to the user for accessibility. Not shown in the UI. [CHAR LIMIT=none] -->
+  <!-- Template for the message that shows the current page out of the total number of pages [CHAR LIMIT=none] -->
+  <!-- Description of the current page - spoken to the user [CHAR LIMIT=none] -->
+  <!-- Template for the message to announce the print options summary - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to expand all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to collapse all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the print button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the save to PDF button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are expanded - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are collapsed - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Select printer activity -->
+  <!-- Title for the share action bar menu item. [CHAR LIMIT=20] -->
+  <!-- Title for the select printer activity. [CHAR LIMIT=30] -->
+  <!-- Title of the button to install a print service. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to select a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to forget a printer. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce a change in the number of matches during a search. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Add printer dialog  -->
+  <!-- Title for the alert dialog for selecting a print service. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if no printers are found while not searching. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if there are no printers while searching. [CHAR LIMIT=50] -->
+  <!-- Notifications -->
+  <!-- Template for the notification label for a printing print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a cancelling print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a failed print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a blocked print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a composite (multiple items) print jobs notification. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for cancelling a print job. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for restarting a filed print job. [CHAR LIMIT=25] -->
+  <!-- Message that there is no connection to a printer. [CHAR LIMIT=40] -->
+  <!-- Label for an unknown reason for failed or blocked print job. [CHAR LIMIT=25] -->
+  <!-- Label for a printer that is not available. [CHAR LIMIT=25] -->
+  <!-- Arrays -->
+  <!-- Color mode labels. -->
+  <!-- Duplex mode labels. -->
+  <!-- Orientation labels. -->
+  <!-- Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+         they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they
+         want to allow the application to do this. -->
+  <!-- Error messages -->
+  <!-- Message for an error when trying to print to a PDF file. [CHAR LIMIT=50] -->
+  <!-- Default message for an error while generating a print job. [CHAR LIMIT=50] -->
+  <!-- Label for the retry button in the error message. [CHAR LIMIT=50] -->
+  <!-- Message for the currently selected printer being unavailable. [CHAR LIMIT=100] -->
+  <!-- Long running operations -->
+  <!-- Message long running operation when preparing print preview. [CHAR LIMIT=50] -->
+</resources>