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

3 files changed, 18 insertions, 4 deletions

diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index 105673221..658bbfbaa 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -39,5 +39,5 @@
   <string name="permission_not_granted_dialog_message">No se concedió el permiso para escribir en almacenamiento externo. No se puede descargar la actualización.</string>
   <string name="browser_error_title">Error del navegador</string>
   <string name="dialog_dismiss">Descartar</string>
-  <string name="error_permissions">La aplicación no tiene los permisos críticos necesarios para que funcione. Comprueba la configuración de permisos.</string>
+  <string name="error_permissions">La aplicación no tiene los permisos críticos necesarios para funcionar. Comprueba la configuración de permisos.</string>
 </resources>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index 7c903a604..05b9d536c 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/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">Domovská obrazovka</string>
   <!-- Context Menu item to open the currently selected link in a new
             incognito window. -->
+  <string name="contextmenu_openlink_incognito_newwindow">Otvoriť na novej anonymnej karte</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">Otvoriť na novej anonymnej karte na pozadí</string>
   <!-- User agent label -->
+  <string name="pref_content_ua">Užívateľský agent</string>
   <!-- Interface preferences -->
+  <string name="pref_interface_title">Rozhranie</string>
   <!-- FullScreen -->
+  <string name="full_screen_title">Celá obrazovka</string>
+  <string name="full_screen_summary">Navigácia na celej obrazovce</string>
   <!-- OneHand -->
+  <string name="onehand_title">Navigácia jednou rukou</string>
+  <string name="onehand_summary">Ľahšia webová navigácia s gestami a skratkami</string>
   <!-- Permission check -->
+  <string name="permission_not_granted_dialog_title">Povolenie neudelené</string>
+  <string name="permission_not_granted_dialog_message">Povolenie pre zápis na externé úložisko nebolo udelené. Nemôžem stiahnuť.</string>
+  <string name="browser_error_title">Chyba prehliadača</string>
+  <string name="dialog_dismiss">Zamietnuť</string>
+  <string name="error_permissions">Aplikácia nemá kritické povolenia potrebné na spustenie. Skontrolujte nastavenia povolení.</string>
 </resources>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 186e76c9f..84865fbb5 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -30,14 +30,14 @@
   <string name="pref_interface_title">介面</string>
   <!-- FullScreen -->
   <string name="full_screen_title">全螢幕</string>
-  <string name="full_screen_summary">啟用全螢幕導航功能</string>
+  <string name="full_screen_summary">啟用全螢幕導覽功能</string>
   <!-- OneHand -->
-  <string name="onehand_title">OneHand 導航</string>
+  <string name="onehand_title">單手導覽</string>
   <string name="onehand_summary">透過滑動與快速操作來更方便地瀏覽網頁</string>
   <!-- Permission check -->
   <string name="permission_not_granted_dialog_title">未授予權限</string>
   <string name="permission_not_granted_dialog_message">未授予寫入外部儲存空間的權限，無法下載。</string>
   <string name="browser_error_title">瀏覽器錯誤</string>
   <string name="dialog_dismiss">忽略</string>
-  <string name="error_permissions">應用程式沒有運行所需的關鍵權限，請檢查權限設定。</string>
+  <string name="error_permissions">此應用程式沒有取得執行所需的權限。請檢查權限設定。</string>
 </resources>