Merge remote-tracking branch 'lineageos/cm-13.0' into replicant-6.0replicant-6.0-0003

4 files changed, 59 insertions, 38 deletions

diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index 3153228bc..7f7752484 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -23,12 +23,9 @@
   <!-- Name of menu item of a new incognito tab.  Also used in the
          title bar when displaying a new tab [CHAR LIMIT=30] -->
   <!-- Name of tab containing bookmarks -->
-  <string name="tab_bookmarks">Marcadores</string>
   <!-- Name of tab containing the user's most visited websites, organized by number of visits -->
   <!-- Name of tab containing the user's complete history, organized by time of last visit -->
-  <string name="tab_history">Historial</string>
   <!-- Name of tab containing the user's saved pages, organized by time created [CHAR LIMIT=20] -->
-  <string name="tab_snapshots">Páxines guardaes</string>
   <!-- Toast shown when a history item's star is clicked, converting it to a bookmark -->
   <!-- Toast shown when a history item's star is clicked off, removing its bookmark -->
   <!-- Sign-in dialog -->
@@ -40,7 +37,6 @@
   <!-- The name of the add bookmark page activity.-->
   <!-- The name of the bookmarks and history search suggestion source.  -->
   <!-- Label for a cancel button.  It is used for multiple cancel buttons in different contexts -->
-  <string name="cancel">Encaboxar</string>
   <!-- Label for a confirm button.  Used in multiple contexts. -->
   <string name="ok">ACEUTAR</string>
   <!-- Displayed on the title bar while the page is loading -->
@@ -66,15 +62,17 @@
   <!-- Message in an SSL Error dialog -->
   <!-- Message in an SSL Error dialog -->
   <!-- Message in an SSL Error dialog -->
+  <string name="ssl_unknown">Fallu de certificáu desconocíu</string>
   <!-- Toast informing the user that loading has stopped for the current page. -->
+  <string name="stopping">Parando\u2026</string>
   <!-- Menu item to stop the current page from loading. -->
+  <string name="stop">Parar</string>
   <!-- Menu item to reload or refresh the current page. -->
   <!-- Menu item to go back to the previous page -->
   <!-- Menu item to go to the next page (only useful if the user has previously hit back.) -->
   <!-- Button label to confirm saving a bookmark. -->
   <string name="save">ACEUTAR</string>
   <!-- Button label to cancel saving a bookmark. -->
-  <string name="do_not_save">Encaboxar</string>
   <!-- Field label in Bookmark dialog box: refers to URL of the page to bookmark -->
   <!-- Field label in Bookmark dialog box: refers to the account to save the bookmark to -->
   <!-- Field label in Bookmark dialog box: refers to the folder in which to save the bookmark -->
@@ -85,15 +83,14 @@
   <!-- Label stating that the currently open folder has no subfolders
          in the add bookmark dialog [CHAR-LIMIT=none]-->
   <!-- Menu item to use the top level bookmarks folder to save a bookmark in. [CHAR-LIMIT=30]-->
-  <string name="add_to_bookmarks_menu_option">Marcadores</string>
   <!-- Menu item to save the newly created bookmark to the home screen. [CHAR-LIMIT=30]-->
+  <string name="add_to_homescreen_menu_option">Pantalla d\'aniciu</string>
   <!-- Menu item to open a picker to determine which folder to save a bookmark in. [CHAR-LIMIT=30]-->
   <!-- Field label in Bookmark dialog box: title that the user wishes to use for the bookmark -->
   <!-- Initial value in Location field in Bookmark dialog box -->
   <!-- Menu item that opens a dialog to save a bookmark for the current page [CHAR LIMIT=30] -->
   <!-- Title of the dialog to bookmark a page -->
   <!-- Option on bookmark dialog to remove the bookmark [CHAR LIMIT=30] -->
-  <string name="remove">Desaniciar</string>
   <!-- Menu item on the bookmarks page, to edit an existing bookmark -->
   <!-- Context menu item to create a shortcut to the bookmark on the desktop [CHAR LIMIT=50] -->
   <!-- Context menu item to open the currently highlighted bookmark -->
@@ -103,7 +100,6 @@
   <!-- Context menu item for setting the bookmark/history item as the homepage -->
   <!-- Toast informing the user that their action to save a bookmark has succeeded -->
   <!-- Toast informing the user that their action to save a bookmark did not succeed -->
-  <string name="bookmark_not_saved">Nun pue guardase\'l marcador.</string>
   <!-- Toast confirming that the homepage has been set -->
   <!-- Error that appears in the title of Bookmark dialog when user selects OK with empty Name field -->
   <!-- Error that appears in the title of Bookmark dialog when user selects OK with empty Location field -->
@@ -130,12 +126,9 @@
   <!-- Menu item to close all other tabs [CHAR LIMIT=40] -->
   <!-- Menu item to open the bookmarks page. This is a shorter version that
             is displayed with an icon -->
-  <string name="bookmarks">Marcadores</string>
   <!-- Secondary name for the Activity "BrowserBookmarksPage" -->
-  <string name="shortcut_bookmark">Marcador</string>
   <!-- Title for the activity asking the user to select a bookmark [CHAR LIMIT=50] -->
   <!-- Menu item to display the History of previously visited pages -->
-  <string name="history">Historial</string>
   <!-- Menu item for viewing downloads from the browser -->
   <!-- Context menu item for copying the url of the current page from the
             title bar -->
@@ -159,7 +152,6 @@
   <!-- Context Menu item to copy the url of the selected link to the
             clipboard -->
   <!-- Context Menu item to save the image to external storage -->
-  <string name="contextmenu_download_image">Guardar imaxe</string>
   <!-- Context Menu item to view the image by itself in the browser -->
   <!-- Context Menu item to set the image as the home screen wallpaper -->
   <!-- Context Menu item to open the dialer app with the selected phone number
@@ -177,29 +169,44 @@
   <!-- Part of a sentence that says "Replace <url of existing bookmark> with
             <url of new bookmark>?" -->
   <!-- Title displayed when the bookmarks page is shown -->
-  <string name="browser_bookmarks_page_bookmarks_text">Marcadores</string>
   <!-- Settings screen strings -->
   <!-- Menu item to open the Settings screen -->
-  <string name="menu_preferences">Axustes</string>
   <!-- Settings screen, section title -->
   <!-- Settings label [CHAR LIMIT=45]-->
   <!-- Settings label -->
-  <string name="pref_content_load_images">Cargar imáxenes</string>
   <!-- Settings label -->
   <!-- Settings label [CHAR LIMIT=30] -->
   <!-- Settings label -->
   <!-- Settings label -->
   <!-- Settings label -->
   <!-- Plugin options -->
+  <string-array name="pref_content_plugins_choices">
+    <item>Always on</item>
+    <item>On demand</item>
+    <item>Non</item>
+  </string-array>
   <!-- Settings summary [CHAR LIMIT=50]-->
   <!-- Settings label [CHAR LIMIT=50] -->
   <!-- Settings label -->
   <!-- Settings summary -->
   <!-- Settings button label that to pick what to set the homepage to [CHAR LIMIT=40] -->
+  <string-array name="pref_homepage_choices">
+    <!-- Setting choice to set the homepage to the current page [CHAR LIMIT=40] -->
+    <item>Current page</item>
+    <!-- Setting choice to set the homepage to a blank page [CHAR LIMIT=40] -->
+    <item>Páxina balera</item>
+    <!-- Setting choice to set the homepage to the default page [CHAR LIMIT=40] -->
+    <item>Default page</item>
+    <!-- Setting choice to set the homepage to the "Most Visited" homepage feature, which is a list of most visited sites [CHAR LIMIT=40] -->
+    <item>Most visited sites</item>
+    <!-- Setting choice to set the homepage to a user entered URL [CHAR LIMIT=40] -->
+    <item>Other</item>
+  </string-array>
   <!-- Settings label -->
   <!-- Settings summary -->
   <!-- Settings screen & section title for "General settings". These include things like
          configuring bookmark syncing to Google servers and form auto fill settings. [CHAR-LIMIT=32] -->
+  <string name="pref_general_title">Xeneral</string>
   <!-- Settings category for sync under general settings. This includes bookmark sync with Chrome [CHAR-LIMIT=50] -->
   <!-- Settings category for autofill under general. [CHAR-LIMIT=50] -->
   <!-- Checkbox setting for enabling/disabling the form AutoFill feature [CHAR-LIMIT=32] -->
@@ -221,13 +228,13 @@
   <!-- String for the second line of the user's address in the AutoFill profile editor. [CHAR-LIMIT=32] -->
   <!-- String to suggest to the user the kind of data to be used for the second line of the address. CHAR-LIMIT=64] -->
   <!-- String for the user's city or town in the AutoFill profile editor. [CHAR-LIMIT=32] -->
+  <string name="autofill_profile_editor_city">Llugar:</string>
   <!-- String for the user's state or province or region in the AutoFill profile editor. [CHAR-LIMIT=32] -->
   <!-- String for the user's zip code in the AutoFill profile editor. [CHAR-LIMIT=32] -->
   <!-- String for the user's country in the AutoFill profile editor. [CHAR-LIMIT=32] -->
   <!-- String for the user's phone number in the AutoFill profile editor. [CHAR-LIMIT=32] -->
   <!-- String to display in an error tooltip to inform the user the phone number they provided is not valid. [CHAR-LIMIT=32] -->
   <!-- Button text to save the AutoFill profile [CHAR-LIMIT=20] -->
-  <string name="autofill_profile_editor_save_profile">Guardar</string>
   <!-- Toast message displayed when the profile has been successfully saved [CHAR-LIMIT=none] -->
   <!-- Toast message displayed when the profile has been successfully deleted [CHAR-LIMIT=none] -->
   <!-- Button text to delete all the AutoFill profile data [CHAR-LIMIT=20] -->
@@ -239,13 +246,14 @@
   <!-- Settings screen, section title [CHAR-LIMIT=50] -->
   <string name="pref_privacy_security_title">Privacidá y seguranza</string>
   <!-- Settings label -->
+  <string name="pref_privacy_clear_cache">Llimpiar caché</string>
   <!-- Settings summary -->
   <!-- Confirmation dialog message -->
+  <string name="pref_privacy_clear_cache_dlg">¿Desaniciar el conteníu na caché y bases de datos llocales?</string>
   <!-- Cookie settings category [CHAR-LIMIT=50] -->
   <!-- Settings label -->
   <!-- Settings summary -->
   <!-- Confirmation dialog message -->
-  <string name="pref_privacy_clear_cookies_dlg">¿Desaniciar toles cookies?</string>
   <!-- Settings label -->
   <!-- Settings summary -->
   <!-- Confirmation dialog message -->
@@ -259,7 +267,7 @@
   <!-- Location settings category [CHAR-LIMIT=50] -->
   <string name="pref_privacy_location_title">Allugamientu</string>
   <!-- Settings label -->
-  <string name="pref_privacy_enable_geolocation">Habilitar allugamientu</string>
+  <string name="pref_privacy_enable_geolocation">Activar allugamientu</string>
   <!-- Settings summary -->
   <!-- Settings label -->
   <!-- Settings summary -->
@@ -270,18 +278,11 @@
   <!-- Settings label -->
   <!-- Settings summary -->
   <!-- Settings label -->
+  <string name="pref_security_show_security_warning">Amosar alvertencies de seguranza</string>
   <!-- Settings summmary -->
   <!-- Settings label -->
-  <string name="pref_security_accept_cookies">Aceutar cookies</string>
   <!-- Settings summary -->
   <!-- Settings text size options; appear in Text size dialog box [CHAR LIMIT=30] -->
-  <string-array name="pref_text_size_choices">
-    <item>Tiny</item>
-    <item>Small</item>
-    <item>Normal</item>
-    <item>Large</item>
-    <item>Huge</item>
-  </string-array>
   <!-- Label for minimum font size [CHAR LIMIT=30] -->
   <!-- Label for the current minimum font size value [CHAR LIMIT=6] -->
   <!-- Label for text scaling (percent) [CHAR LIMIT=30] -->
@@ -306,6 +307,7 @@
   <string name="pref_extras_website_settings_summary">Axustes avanzaos pa sitios web individuales</string>
   <!-- Settings category label [CHAR-LIMIT=50] -->
   <!-- Settings label -->
+  <string name="pref_extras_reset_default">Reafitar</string>
   <!-- Settings summary -->
   <!-- Confirmation dialog message -->
   <!-- Title for a group of settings -->
@@ -328,7 +330,6 @@
   <!-- Dialog box title -->
   <!-- Do not translate. Actual encoding values. Must be valid text encodings understandable from WebKit. -->
   <!-- Title for accessibility settings [CHAR LIMIT=25] -->
-  <string name="pref_accessibility_title">Accesibilidá</string>
   <!-- Font size settings category under accessibility settings [CHAR LIMIT=50] -->
   <!-- Title for lab settings [CHAR LIMIT=25] -->
   <!-- Title for lab quick controls feature [CHAR LIMIT=40] -->
@@ -340,11 +341,21 @@
   <!-- Title for bandwidth management preference [CHAR LIMIT=25] -->
   <!-- Title for search preloading [CHAR LIMIT=40] -->
   <!-- Search preloading options [CHAR LIMIT=20] -->
+  <string-array name="pref_data_preload_choices">
+    <item>Never</item>
+    <item>Namái na Wi-Fi</item>
+    <item>Siempres</item>
+  </string-array>
   <!-- Do not translate -->
   <!-- Summary for search preloading [CHAR LIMIT=80] -->
   <!-- Title of dialog for search preloading [CHAR LIMIT=40] -->
   <!-- Title for link prefetching [CHAR LIMIT=40] -->
   <!-- Link prefetching options [CHAR LIMIT=20] -->
+  <string-array name="pref_link_prefetch_choices">
+    <item>Never</item>
+    <item>Only on Wi-Fi</item>
+    <item>Siempres</item>
+  </string-array>
   <!-- Do not translate -->
   <!-- Summary for link prefetching [CHAR LIMIT=80] -->
   <!-- Title of dialog for link prefetching [CHAR LIMIT=40] -->
@@ -392,7 +403,6 @@
             external storage is busy so they cannot download anything [CHAR LIMIT=25] -->
   <!-- Title for a dialog informing the user that the SD card used for
             external storage is busy so they cannot download anything -->
-  <string name="download_sdcard_busy_dlg_title" product="default">Tarxeta SD non disponible</string>
   <!-- Message for a dialog informing the user that the SD card used for
             external storage is busy so they cannot download anything.  Informs
             the user how to enable SD card storage [CHAR LIMIT=NONE] -->
@@ -403,6 +413,7 @@
   <!-- Message in the list of items which have received download requests
             telling their status.  This message states that the download has not
             yet begun -->
+  <string name="download_pending">Aniciando descarga\u2026</string>
   <!-- Do not translate.  Testing only -->
   <!-- The default homepage. -->
   <!-- Bookmarks -->
@@ -412,24 +423,22 @@
   <!-- Used as a status bar notification when the browser is running out of space trying to allocate or increase the database quota for an HTML5 databae or application cache. -->
   <!-- Used in the Browser Settings -->
   <!-- Confirmation dialog when the user ask to clear all data for an origin -->
-  <string name="webstorage_clear_data_dialog_cancel_button">Encaboxar</string>
   <!-- Strings used in the summary of origins -->
   <!-- String shown in a progress view while a video is loading, before it starts playing -->
+  <string name="loading_video">Cargando\'l videu\u2026</string>
   <!-- Geolocation -->
   <!-- Permissions prompt -->
   <string name="geolocation_permissions_prompt_message"><xliff:g id="website origin" example="maps.google.com">%s</xliff:g> quier saber el to allugamientu</string>
   <!-- Permissions prompt toast -->
+  <string name="geolocation_permissions_prompt_toast_allowed">Esti sitiu pue acceder al to allugamientu. Camuda esto n\'Axustes &gt; Avanzao &gt; Sitiu web.</string>
+  <string name="geolocation_permissions_prompt_toast_disallowed">Esti sitiu nun pue acceder al to allugamientu. Camuda esto n\'Axustes &gt; Avanzao &gt; Sitiu web.</string>
   <!-- Settings -> Advanced -> Website settings -> <origin> -->
-  <string name="geolocation_settings_page_summary_allowed">Esti sitiu pue acceder anguaño a la to llocalización.</string>
   <string name="geolocation_settings_page_summary_not_allowed">Anguaño esti sitiu nun pue acceder al to allugamietu</string>
   <!-- Settings page dialog -->
-  <string name="geolocation_settings_page_dialog_cancel_button">Encaboxar</string>
   <!-- Label for the menu item in the website settings activity used to clear data stored by all websites -->
-  <string name="website_settings_clear_all_dialog_cancel_button">Encaboxar</string>
   <!-- Text in the progress dialog when we are setting an image as the home screen wallpaper. -->
   <!-- The default state to the "up to parent folder" button in the bookmarks UI. This
          is displayed when the user is at the highest level and cannot go up [CHAR LIMIT=16] -->
-  <string name="defaultBookmarksUpButton">Marcadores</string>
   <!-- The string that is displayed when there are no bookmarks to display.
          This is centered in the middle of the screen [CHAR LIMIT=NONE] -->
   <!-- The folder name for the special "Other Bookmarks" folder created by Chrome [CHAR LIMIT=24] -->
@@ -445,8 +454,8 @@
   <!-- Sync bookmarks wizard option to go to the next screen [CHAR-LIMIT=30] -->
   <!-- Sync bookmarks wizard option to go to the previous screen [CHAR-LIMIT=30] -->
   <!-- Sync bookmarks wizard option to cancel sync setup [CHAR-LIMIT=30] -->
-  <string name="import_bookmarks_wizard_cancel">Encaboxar</string>
   <!-- Sync bookmarks wizard option to finish sync setup [CHAR-LIMIT=30] -->
+  <string name="import_bookmarks_wizard_done">Fecho</string>
   <!-- Button allowing users to import all of their existing bookmarks into an account when setting up syncing with their bookmarks stored in Google Chrome [CHAR-LIMIT=64] -->
   <!-- Button allowing users to import all of their existing bookmarks into an account when setting up syncing with their bookmarks stored in Google Chrome [CHAR-LIMIT=64] -->
   <!-- Url Selection Action Mode -->
@@ -473,7 +482,6 @@
   <!-- Content description for search button [CHAR LIMIT=NONE] -->
   <!-- Content description for voice search button [CHAR LIMIT=NONE] -->
   <!-- Content description for bookmarks button [CHAR LIMIT=NONE] -->
-  <string name="accessibility_button_bookmarks">Marcadores</string>
   <!-- Content description for close tab button [CHAR LIMIT=NONE] -->
   <!-- Content description for new tab button [CHAR LIMIT=NONE] -->
   <!-- Content description for new incognito tab button [CHAR LIMIT=NONE] -->
@@ -482,7 +490,6 @@
   <!-- Content description for go button [CHAR LIMIT=NONE] -->
   <!-- Content description for tab switcher button [CHAR LIMIT=NONE] -->
   <!-- Content description for overflow menu button [CHAR LIMIT=NONE] -->
-  <string name="accessibility_button_more">Más opciones</string>
   <!-- Content description for incognito state [CHAR LIMIT=NONE] -->
   <!-- Content description for frozen state [CHAR LIMIT=NONE] -->
   <!-- Content description for tab switcher transition [CHAR LIMIT=NONE] -->
diff --git a/res/values-en-rGB/cm_strings.xml b/res/values-en-rGB/cm_strings.xml
index 6b4951ca6..458fbd561 100644
--- a/res/values-en-rGB/cm_strings.xml
+++ b/res/values-en-rGB/cm_strings.xml
@@ -32,7 +32,7 @@
   <string name="full_screen_title">Fullscreen</string>
   <string name="full_screen_summary">Enable immersive navigation</string>
   <!-- OneHand -->
-  <string name="onehand_title">OneHand Navigation</string>
+  <string name="onehand_title">One Hand Navigation</string>
   <string name="onehand_summary">Easier web navigation with swipes and quick actions</string>
   <!-- Permission check -->
   <string name="permission_not_granted_dialog_title">Permission not granted</string>
diff --git a/res/values-gd-rGB/cm_strings.xml b/res/values-gd-rGB/cm_strings.xml
index 7c903a604..703412556 100644
--- a/res/values-gd-rGB/cm_strings.xml
+++ b/res/values-gd-rGB/cm_strings.xml
@@ -17,13 +17,27 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Content description for home screen button [CHAR LIMIT=NONE] -->
+  <string name="accessibility_button_homescreen">An sgrìn dachaidh</string>
   <!-- Context Menu item to open the currently selected link in a new
             incognito window. -->
+  <string name="contextmenu_openlink_incognito_newwindow">Fosgail ann an taba incognito ùr</string>
   <!-- Context Menu item to open the currently selected link in a new
          background window. [CHAR LIMIT=50] -->
+  <string name="contextmenu_openlink_incognito_newwindow_background">Fosgail ann an taba incognito ùr sa chùlaibh</string>
   <!-- User agent label -->
+  <string name="pref_content_ua">Àidseant-cleachdaiche</string>
   <!-- Interface preferences -->
+  <string name="pref_interface_title">Eadar-aghaidh</string>
   <!-- FullScreen -->
+  <string name="full_screen_title">Làn-sgrìn</string>
+  <string name="full_screen_summary">Cuir an comas an t-seòladaireachd làn-tumaidh</string>
   <!-- OneHand -->
+  <string name="onehand_title">Seòladaireachd aon-làmhach</string>
+  <string name="onehand_summary">Seòladaireachd nas fhasa air an lìon le grad-shlaighdeadh is grad-ghnìomhan</string>
   <!-- Permission check -->
+  <string name="permission_not_granted_dialog_title">Cha deach cead a thoirt</string>
+  <string name="permission_not_granted_dialog_message">Cha deach cead a thoirt airson sgrìobhadh air an stòras air an taobh a-muigh. Cha ghabh a luchdadh a-nuas.</string>
+  <string name="browser_error_title">Mearachd a’ bhrabhsair</string>
+  <string name="dialog_dismiss">Leig seachad</string>
+  <string name="error_permissions">Chan eil ceadan gu leòr aig an aplacaid is cha ruith e. Thoir sùil air roghainnean nan ceadan.</string>
 </resources>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index 5c50b4140..260eb5322 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -23,7 +23,7 @@
   <string name="contextmenu_openlink_incognito_newwindow">Abrir num novo separador anónimo</string>
   <!-- Context Menu item to open the currently selected link in a new
          background window. [CHAR LIMIT=50] -->
-  <string name="contextmenu_openlink_incognito_newwindow_background">Abrir num novo separador incógnito em segundo plano</string>
+  <string name="contextmenu_openlink_incognito_newwindow_background">Abrir num novo separador anónimo em segundo plano</string>
   <!-- User agent label -->
   <string name="pref_content_ua">Modo de navegação</string>
   <!-- Interface preferences -->