Merge branch 'main' into FNXOSS-40

mozilla-mobile · Feb 22, 2023 · 4bd132f · 4bd132f
2 parents c93ce31 + 89683c1
commit 4bd132f
Show file tree

Hide file tree

Showing 147 changed files with 2,755 additions and 404 deletions.
diff --git a/.github/workflows/ac-sync-strings.yml b/.github/workflows/ac-sync-strings.yml
@@ -46,6 +46,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           path: beta
           branch: automation/uplift-ac-strings-${{ steps.discover-beta-version.outputs.beta_version }}
+          author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
           commit-message: "Uplift AC strings from ${{ github.ref_name }} to ${{ steps.env-variables.outputs.beta_branch }}"
           title: "Uplift AC strings from ${{ github.ref_name }} to ${{ steps.env-variables.outputs.beta_branch }}"
           body: "This (automated) PR uplifts strings from `${{ github.ref_name }}` to `${{ steps.env-variables.outputs.beta_branch }}`"
diff --git a/.github/workflows/fenix-sync-strings.yml b/.github/workflows/fenix-sync-strings.yml
@@ -46,6 +46,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           path: beta
           branch: automation/uplift-fenix-strings-${{ steps.discover-beta-version.outputs.beta_version }}
+          author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
           commit-message: "Uplift Fenix strings from ${{ github.ref_name }} to ${{ steps.env-variables.outputs.beta_branch }}"
           title: "Uplift Fenix strings from ${{ github.ref_name }} to ${{ steps.env-variables.outputs.beta_branch }}"
           body: "This (automated) PR uplifts strings from `${{ github.ref_name }}` to `${{ steps.env-variables.outputs.beta_branch }}`"
diff --git a/.github/workflows/focus-sync-strings.yml b/.github/workflows/focus-sync-strings.yml
@@ -46,6 +46,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           path: beta
           branch: automation/uplift-focus-strings-${{ steps.discover-beta-version.outputs.beta_version }}
+          author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
           commit-message: "Uplift Focus strings from ${{ github.ref_name }} to ${{ steps.env-variables.outputs.beta_branch }}"
           title: "Uplift Focus strings from ${{ github.ref_name }} to ${{ steps.env-variables.outputs.beta_branch }}"
           body: "This (automated) PR uplifts strings from `${{ github.ref_name }}` to `${{ steps.env-variables.outputs.beta_branch }}`"
diff --git a/android-components/components/browser/errorpages/src/main/res/values-cak/strings.xml b/android-components/components/browser/errorpages/src/main/res/values-cak/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
 
     <!-- The button that appears at the bottom of an error page. -->
     <string name="mozac_browser_errorpages_page_refresh">Titojtob\'ëx chik</string>
@@ -38,6 +38,9 @@
     <!-- The text shown inside the advanced options button used to bypass the invalid SSL certificate. It's only shown if the user has expanded the advanced options. -->
     <string name="mozac_browser_errorpages_security_bad_cert_accept_temporary">Tak\'ulu\' ri K\'ayewal chuqa\' Tinsamajij el</string>
 
+    <!-- The text shown inside the advanced button used to expand the advanced options. It's only shown when a website uses HSTS. -->
+    <string name="mozac_browser_errorpages_security_bad_hsts_cert_advanced">Q\'axinäq…</string>
+
     <!-- The document title and heading of the error page shown when the user's network connection is interrupted while connecting to a website. -->
     <string name="mozac_browser_errorpages_net_interrupt_title">Xq\'at ri okem</string>
 

diff --git a/android-components/components/browser/errorpages/src/main/res/values-ka/strings.xml b/android-components/components/browser/errorpages/src/main/res/values-ka/strings.xml
@@ -21,18 +21,16 @@
     <string name="mozac_browser_errorpages_security_bad_cert_title">უსაფრთხო დაკავშირება ვერ მოხერხდა</string>
     <!-- The error message shown when a website sends has an invalid or expired SSL certificate. -->
     <string name="mozac_browser_errorpages_security_bad_cert_message"><![CDATA[<ul>
-        <li>ეს შესაძლოა, საიტის გაუმართაობის ბრალი იყოს, ან
-ვინმე მის შეცვლას ცდილობდეს.</li>
-        <li>თუ ამ საიტს მანამდე წარმატებით უკავშირდებოდით, ხარვეზი შესაძლოა
-დროებითი იყოს და მოგვიანებით შეგიძლიათ კვლავ სცადოთ.</li>
+        <li>ამას შესაძლოა, საიტის გაუმართაობა ან სხვა საიტად გასაღების მცდელობა იწვევდეს.</li>
+        <li>თუ აღნიშნულ საიტს მანამდე წარმატებით უკავშირდებოდით, ხარვეზი შეიძლება დროებითია და მოგვიანებით შეგიძლიათ, კვლავ სცადოთ.</li>
       </ul>]]></string>
 
     <!-- The text shown inside the advanced button used to expand the advanced options. It's only shown when a website has an invalid SSL certificate. -->
     <string name="mozac_browser_errorpages_security_bad_cert_advanced">დამატებით…</string>
     <!-- The advanced certificate information shown when a website sends has an invalid SSL certificate. The %1$s will be replaced by the app name and %2$s will be replaced by website URL. It's only shown when a website has an invalid SSL certificate. -->
-    <string name="mozac_browser_errorpages_security_bad_cert_techInfo"><![CDATA[<label>ვიღაც შესაძლოა ამ საიტის სხვა საიტად გასაღებას ცდილობდეს და სჯობს აღარ განაგრძოთ.</label>
+    <string name="mozac_browser_errorpages_security_bad_cert_techInfo"><![CDATA[<label>შესაძლოა, ვიღაც ამ საიტის სხვა საიტად გასაღებას ცდილობდეს და ჯობია, აღარ განაგრძოთ.</label>
         <br><br>
-        <label>ვებსაიტები საკუთარ ნამდვილობას სერტიფიკატებით ადასტურებს. %1$s არ ენდობა <b>%2$s</b>-ს, რადგან მისი უსაფრთხოების სერტიფიკატის გამომშვები უცნობია, შეიძლება თავადვე აქვთ ხელმოწერილი ან სერვერი სწორად არ აგზავნის შუალედურ სერტიფიკატებს.</label>]]></string>
+        <label>ვებსაიტები საკუთარ ნამდვილობას სერტიფიკატებით ადასტურებს. %1$s არ ენდობა <b>%2$s</b>-ს, რადგან მისი უსაფრთხოების სერტიფიკატის გამომცემი უცნობია, შეიძლება თავადვე აქვთ ხელმოწერილი ან სერვერი სათანადოდ არ აგზავნის შუალედურ სერტიფიკატებს.</label>]]></string>
     <!-- The text shown inside the advanced options button used to go back. It's only shown if the user has expanded the advanced options. -->
     <string name="mozac_browser_errorpages_security_bad_cert_back">უკან დაბრუნება (სასურველია)</string>
     <!-- The text shown inside the advanced options button used to bypass the invalid SSL certificate. It's only shown if the user has expanded the advanced options. -->

diff --git a/android-components/components/feature/addons/src/main/res/values-be/strings.xml b/android-components/components/feature/addons/src/main/res/values-be/strings.xml
@@ -40,6 +40,8 @@
     <string name="mozac_feature_addons_permissions_clipboard_write_description">Змяшчаць дадзеныя ў буфер абмену</string>
     <!-- Description for declarativeNetRequest permission. -->
     <string name="mozac_feature_addons_permissions_declarative_net_request_description">Блакаваць змесціва на любой старонцы</string>
+    <!-- Description for declarativeNetRequestFeedback permission. -->
+    <string name="mozac_feature_addons_permissions_declarative_net_request_feedback_description">Бачыць вашу гісторыю аглядання</string>
     <!-- Description for downloads permission. -->
     <string name="mozac_feature_addons_permissions_downloads_description">Сцягванне файлаў, прагляд і змяненне гісторыі сцягванняў браўзера</string>
     <!-- Description for downloads_open permission. -->

diff --git a/android-components/components/feature/addons/src/main/res/values-co/strings.xml b/android-components/components/feature/addons/src/main/res/values-co/strings.xml
@@ -40,6 +40,8 @@
     <string name="mozac_feature_addons_permissions_clipboard_write_description">Aghjunghje dati in u preme’papei</string>
     <!-- Description for declarativeNetRequest permission. -->
     <string name="mozac_feature_addons_permissions_declarative_net_request_description">Bluccà u cuntenutu nant’à qualsiasi pagina</string>
+    <!-- Description for declarativeNetRequestFeedback permission. -->
+    <string name="mozac_feature_addons_permissions_declarative_net_request_feedback_description">Leghje a vostra cronolugia di navigazione</string>
     <!-- Description for downloads permission. -->
     <string name="mozac_feature_addons_permissions_downloads_description">Scaricà schedarii, è leghje è mudificà a cronolugia di i scaricamenti di u navigatore</string>
     <!-- Description for downloads_open permission. -->

diff --git a/android-components/components/feature/addons/src/main/res/values-cy/strings.xml b/android-components/components/feature/addons/src/main/res/values-cy/strings.xml
@@ -40,6 +40,8 @@
     <string name="mozac_feature_addons_permissions_clipboard_write_description">Mewnbynnu data i’r clipfwrdd</string>
     <!-- Description for declarativeNetRequest permission. -->
     <string name="mozac_feature_addons_permissions_declarative_net_request_description">Rhwystro cynnwys ar unrhyw dudalen</string>
+    <!-- Description for declarativeNetRequestFeedback permission. -->
+    <string name="mozac_feature_addons_permissions_declarative_net_request_feedback_description">Darllen eich hanes pori</string>
     <!-- Description for downloads permission. -->
     <string name="mozac_feature_addons_permissions_downloads_description">Llwytho ffeiliau i lawr a darllen a newid hanes llwytho i lawr y porwr</string>
     <!-- Description for downloads_open permission. -->

diff --git a/android-components/components/feature/addons/src/main/res/values-de/strings.xml b/android-components/components/feature/addons/src/main/res/values-de/strings.xml
@@ -40,6 +40,8 @@
     <string name="mozac_feature_addons_permissions_clipboard_write_description">Daten in die Zwischenablage schreiben</string>
     <!-- Description for declarativeNetRequest permission. -->
     <string name="mozac_feature_addons_permissions_declarative_net_request_description">Inhalte auf jeder Seite blockieren</string>
+    <!-- Description for declarativeNetRequestFeedback permission. -->
+    <string name="mozac_feature_addons_permissions_declarative_net_request_feedback_description">Lesen Sie Ihre Surf-Chronik</string>
     <!-- Description for downloads permission. -->
     <string name="mozac_feature_addons_permissions_downloads_description">Dateien herunterladen und die Download-Chronik lesen und verändern</string>
     <!-- Description for downloads_open permission. -->

diff --git a/android-components/components/feature/addons/src/main/res/values-dsb/strings.xml b/android-components/components/feature/addons/src/main/res/values-dsb/strings.xml
@@ -40,6 +40,8 @@
     <string name="mozac_feature_addons_permissions_clipboard_write_description">Daty do mjazywótkłada kopěrowaś</string>
     <!-- Description for declarativeNetRequest permission. -->
     <string name="mozac_feature_addons_permissions_declarative_net_request_description">Wopśimjeśe na kuždem boku blokěrowaś</string>
+    <!-- Description for declarativeNetRequestFeedback permission. -->
+    <string name="mozac_feature_addons_permissions_declarative_net_request_feedback_description">Cytajśo swóju pśeglědowańsku historiju</string>
     <!-- Description for downloads permission. -->
     <string name="mozac_feature_addons_permissions_downloads_description">Ześěgniśo dataje a cytajśo a změńśo ześěgnjeńsku historiju swójogo wobglědowaka</string>
     <!-- Description for downloads_open permission. -->

diff --git a/android-components/components/feature/addons/src/main/res/values-en-rCA/strings.xml b/android-components/components/feature/addons/src/main/res/values-en-rCA/strings.xml
@@ -40,6 +40,8 @@
     <string name="mozac_feature_addons_permissions_clipboard_write_description">Input data to the clipboard</string>
     <!-- Description for declarativeNetRequest permission. -->
     <string name="mozac_feature_addons_permissions_declarative_net_request_description">Block content on any page</string>
+    <!-- Description for declarativeNetRequestFeedback permission. -->
+    <string name="mozac_feature_addons_permissions_declarative_net_request_feedback_description">Read your browsing history</string>
     <!-- Description for downloads permission. -->
     <string name="mozac_feature_addons_permissions_downloads_description">Download files and read and modify the browser’s download history</string>
     <!-- Description for downloads_open permission. -->

diff --git a/android-components/components/feature/addons/src/main/res/values-en-rGB/strings.xml b/android-components/components/feature/addons/src/main/res/values-en-rGB/strings.xml
@@ -40,6 +40,8 @@
     <string name="mozac_feature_addons_permissions_clipboard_write_description">Input data to the clipboard</string>
     <!-- Description for declarativeNetRequest permission. -->
     <string name="mozac_feature_addons_permissions_declarative_net_request_description">Block content on any page</string>
+    <!-- Description for declarativeNetRequestFeedback permission. -->
+    <string name="mozac_feature_addons_permissions_declarative_net_request_feedback_description">Read your browsing history</string>
     <!-- Description for downloads permission. -->
     <string name="mozac_feature_addons_permissions_downloads_description">Download files and read and modify the browser’s download history</string>
     <!-- Description for downloads_open permission. -->

diff --git a/android-components/components/feature/addons/src/main/res/values-es-rAR/strings.xml b/android-components/components/feature/addons/src/main/res/values-es-rAR/strings.xml
@@ -40,6 +40,8 @@
     <string name="mozac_feature_addons_permissions_clipboard_write_description">Ingresar datos al portapapeles</string>
     <!-- Description for declarativeNetRequest permission. -->
     <string name="mozac_feature_addons_permissions_declarative_net_request_description">Bloquear contenido en cualquier página</string>
+    <!-- Description for declarativeNetRequestFeedback permission. -->
+    <string name="mozac_feature_addons_permissions_declarative_net_request_feedback_description">Leer historial de navegación</string>
     <!-- Description for downloads permission. -->
     <string name="mozac_feature_addons_permissions_downloads_description">Descargar archivos y leer o modificar el historial de descargas del navegador</string>
     <!-- Description for downloads_open permission. -->

diff --git a/android-components/components/feature/addons/src/main/res/values-es-rCL/strings.xml b/android-components/components/feature/addons/src/main/res/values-es-rCL/strings.xml
@@ -40,6 +40,8 @@
     <string name="mozac_feature_addons_permissions_clipboard_write_description">Enviar datos al portapapeles</string>
     <!-- Description for declarativeNetRequest permission. -->
     <string name="mozac_feature_addons_permissions_declarative_net_request_description">Bloquear contenido en cualquier página</string>
+    <!-- Description for declarativeNetRequestFeedback permission. -->
+    <string name="mozac_feature_addons_permissions_declarative_net_request_feedback_description">Lee tu historial de navegación</string>
     <!-- Description for downloads permission. -->
     <string name="mozac_feature_addons_permissions_downloads_description">Descargar archivos y leer y modificar el historial de descargas del navegador</string>
     <!-- Description for downloads_open permission. -->

diff --git a/android-components/components/feature/addons/src/main/res/values-es-rES/strings.xml b/android-components/components/feature/addons/src/main/res/values-es-rES/strings.xml
@@ -40,6 +40,8 @@
     <string name="mozac_feature_addons_permissions_clipboard_write_description">Introducir datos en el portapapeles</string>
     <!-- Description for declarativeNetRequest permission. -->
     <string name="mozac_feature_addons_permissions_declarative_net_request_description">Bloquear contenido en cualquier página</string>
+    <!-- Description for declarativeNetRequestFeedback permission. -->
+    <string name="mozac_feature_addons_permissions_declarative_net_request_feedback_description">Leer historial de navegación</string>
     <!-- Description for downloads permission. -->
     <string name="mozac_feature_addons_permissions_downloads_description">Descargar archivos y leer y modificar el historial de descargas del navegador</string>
     <!-- Description for downloads_open permission. -->

diff --git a/android-components/components/feature/addons/src/main/res/values-es-rMX/strings.xml b/android-components/components/feature/addons/src/main/res/values-es-rMX/strings.xml
@@ -40,6 +40,8 @@
     <string name="mozac_feature_addons_permissions_clipboard_write_description">Ingresar datos en el portapapeles</string>
     <!-- Description for declarativeNetRequest permission. -->
     <string name="mozac_feature_addons_permissions_declarative_net_request_description">Bloquear contenido en cualquier página</string>
+    <!-- Description for declarativeNetRequestFeedback permission. -->
+    <string name="mozac_feature_addons_permissions_declarative_net_request_feedback_description">Lee tu historial de navegación</string>
     <!-- Description for downloads permission. -->
     <string name="mozac_feature_addons_permissions_downloads_description">Descargar archivos y leer y modificar el historial de descargas del navegador</string>
     <!-- Description for downloads_open permission. -->

diff --git a/android-components/components/feature/addons/src/main/res/values-es/strings.xml b/android-components/components/feature/addons/src/main/res/values-es/strings.xml
@@ -40,6 +40,8 @@
     <string name="mozac_feature_addons_permissions_clipboard_write_description">Introducir datos en el portapapeles</string>
     <!-- Description for declarativeNetRequest permission. -->
     <string name="mozac_feature_addons_permissions_declarative_net_request_description">Bloquear contenido en cualquier página</string>
+    <!-- Description for declarativeNetRequestFeedback permission. -->
+    <string name="mozac_feature_addons_permissions_declarative_net_request_feedback_description">Leer historial de navegación</string>
     <!-- Description for downloads permission. -->
     <string name="mozac_feature_addons_permissions_downloads_description">Descargar archivos y leer y modificar el historial de descargas del navegador</string>
     <!-- Description for downloads_open permission. -->

diff --git a/android-components/components/feature/addons/src/main/res/values-fi/strings.xml b/android-components/components/feature/addons/src/main/res/values-fi/strings.xml
@@ -40,6 +40,8 @@
     <string name="mozac_feature_addons_permissions_clipboard_write_description">Kirjoita tietoja leikepöydälle</string>
     <!-- Description for declarativeNetRequest permission. -->
     <string name="mozac_feature_addons_permissions_declarative_net_request_description">Estä sisältö millä tahansa sivulla</string>
+    <!-- Description for declarativeNetRequestFeedback permission. -->
+    <string name="mozac_feature_addons_permissions_declarative_net_request_feedback_description">Lue selaushistoriaasi</string>
     <!-- Description for downloads permission. -->
     <string name="mozac_feature_addons_permissions_downloads_description">Lataa tiedostoja sekä lue ja muokkaa selaimen lataushistoriaa</string>
     <!-- Description for downloads_open permission. -->

diff --git a/android-components/components/feature/addons/src/main/res/values-fr/strings.xml b/android-components/components/feature/addons/src/main/res/values-fr/strings.xml
@@ -40,6 +40,8 @@
     <string name="mozac_feature_addons_permissions_clipboard_write_description">Ajouter des données dans le presse-papiers</string>
     <!-- Description for declarativeNetRequest permission. -->
     <string name="mozac_feature_addons_permissions_declarative_net_request_description">Bloquer du contenu sur n’importe quelle page</string>
+    <!-- Description for declarativeNetRequestFeedback permission. -->
+    <string name="mozac_feature_addons_permissions_declarative_net_request_feedback_description">Lire votre historique de navigation</string>
     <!-- Description for downloads permission. -->
     <string name="mozac_feature_addons_permissions_downloads_description">Télécharger des fichiers, et consulter et modifier l’historique des téléchargements du navigateur</string>
     <!-- Description for downloads_open permission. -->

diff --git a/android-components/components/feature/addons/src/main/res/values-fur/strings.xml b/android-components/components/feature/addons/src/main/res/values-fur/strings.xml
@@ -40,6 +40,8 @@
     <string name="mozac_feature_addons_permissions_clipboard_write_description">Meti dâts tes notis</string>
     <!-- Description for declarativeNetRequest permission. -->
     <string name="mozac_feature_addons_permissions_declarative_net_request_description">Blocâ i contignûts in cualsisei pagjine</string>
+    <!-- Description for declarativeNetRequestFeedback permission. -->
+    <string name="mozac_feature_addons_permissions_declarative_net_request_feedback_description">Lei la tô cronologjie di navigazion</string>
     <!-- Description for downloads permission. -->
     <string name="mozac_feature_addons_permissions_downloads_description">Discjariâ files, lei e modificâ la cronologjie dai discjamâts dal navigadôr</string>
     <!-- Description for downloads_open permission. -->