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

4 files changed, 7 insertions, 3 deletions

diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index b9d280174..6e88fc6d2 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -36,7 +36,7 @@
   <string name="onehand_summary">Navegación web más cenciella con desplazamientos y aiciones rápides</string>
   <!-- Permission check -->
   <string name="permission_not_granted_dialog_title">Permisu non concedíu</string>
-  <string name="permission_not_granted_dialog_message">Nun se concedió\'l permisu d\'escritura nel almacenamientu internu, Nun pue baxase.</string>
+  <string name="permission_not_granted_dialog_message">Nun se concedió\'l permisu d\'escritura nel almacenamientu esternu,.</string>
   <string name="browser_error_title">Fallu del restolador</string>
   <string name="dialog_dismiss">Escartar</string>
   <string name="error_permissions">L\'aplicación nun tien permisos críticos precisos pa executase. Comprueba los tos axustes de permisos, por favor.</string>
diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index afedfc0d6..3153228bc 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -259,6 +259,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>
   <!-- Settings summary -->
   <!-- Settings label -->
   <!-- Settings summary -->
@@ -416,8 +417,11 @@
   <!-- String shown in a progress view while a video is loading, before it starts playing -->
   <!-- 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 -->
   <!-- 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 -->
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 2f6ec56e4..f7a76bee1 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -17,7 +17,7 @@
 -->
 <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">Startscherm</string>
+  <string name="accessibility_button_homescreen">Thuisscherm</string>
   <!-- Context Menu item to open the currently selected link in a new
             incognito window. -->
   <string name="contextmenu_openlink_incognito_newwindow">Openen in nieuw incognitotabblad</string>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index 3d2bddca6..2f5814db4 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -30,7 +30,7 @@
   <string name="pref_interface_title">Arayüz</string>
   <!-- FullScreen -->
   <string name="full_screen_title">Tam ekran</string>
-  <string name="full_screen_summary">Sürükleyici dolaşımı etkinleştir</string>
+  <string name="full_screen_summary">Tam ekran gezinmeyi etkinleştir</string>
   <!-- OneHand -->
   <string name="onehand_title">Tek Elle Gezinme</string>
   <string name="onehand_summary">Kaydırmalar ve çabuk eylemlerle daha kolay web gezinmesi</string>