Skip to content

Commit

Permalink
Merge pull request #252 from fork-maintainers/upstream-sync3
Browse files Browse the repository at this point in the history
Sync up to Mozilla's v83.1.0
  • Loading branch information
interfect authored Nov 29, 2020
2 parents 6d5f903 + 0c69f4b commit 9ceaab1
Show file tree
Hide file tree
Showing 20 changed files with 658 additions and 26 deletions.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class DownloadFragment : LibraryPageFragment<DownloadItem>(), UserInteractionHan
it.value.id.toString(),
it.value.fileName,
it.value.filePath,
it.value.contentLength.toString(),
it.value.contentLength?.toString() ?: "0",
it.value.contentType,
it.value.status
)
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1285,6 +1285,9 @@
<string name="etp_panel_off">عُطّلت الحماية في هذا الموقع</string>
<!-- Header for exceptions list for which sites enhanced tracking protection is always off -->
<string name="enhanced_tracking_protection_exceptions">عُطّلت الحماية الموسّعة من التعقب لهذه المواقع</string>
<!-- Content description (not visible, for screen readers etc.): Navigate
back from ETP details (Ex: Tracking content) -->
<string name="etp_back_button_content_description">عُد</string>
<!-- About page Your rights link text -->
<string name="about_your_rights">حقوقك</string>
<!-- About page link text to open open source licenses screen -->
Expand Down
8 changes: 8 additions & 0 deletions app/src/main/res/values-ast/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,9 @@
<!-- Button caption to abort the add-on collection configuration -->
<string name="customize_addon_collection_cancel">Encaboxar</string>

<!-- Toast shown after confirming the custom add-on collection configuration -->
<string name="toast_customize_addon_collection_done">Modificóse la coleición de complementos. L\'aplicación va zarrase p\'aplicar los cambeos…</string>

<!-- Account Preferences -->
<!-- Preference for triggering sync -->
<string name="preferences_sync_now">Sincronizar agora</string>
Expand Down Expand Up @@ -726,6 +729,8 @@
<string name="preference_phone_feature_location">Allugamientu</string>
<!-- Preference for altering the notification access for all websites -->
<string name="preference_phone_feature_notification">Avisos</string>
<!-- Preference for altering the persistent storage access for all websites -->
<string name="preference_phone_feature_persistent_storage">Almacenamientu permanente</string>
<!-- Label that indicates that a permission must be asked always -->
<string name="preference_option_phone_feature_ask_to_allow">Entrugar pa permitir</string>
<!-- Label that indicates that a permission must be blocked -->
Expand Down Expand Up @@ -1204,6 +1209,9 @@
<string name="etp_panel_off">DESACTIVÓSE nesti sitiu</string>
<!-- Header for exceptions list for which sites enhanced tracking protection is always off -->
<string name="enhanced_tracking_protection_exceptions">La proteición ameyorada escontra\'l rastrexu ta desactivada pa estos sitios web</string>
<!-- Content description (not visible, for screen readers etc.): Navigate
back from ETP details (Ex: Tracking content) -->
<string name="etp_back_button_content_description">Dir p\'atrás</string>
<!-- About page Your rights link text -->
<string name="about_your_rights">Los tos drechos</string>
<!-- About page link text to open open source licenses screen -->
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-be/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@

<!-- Gestures Preferences-->
<!-- Preferences for using pull to refresh in a webpage -->
<string name="preference_gestures_website_pull_to_refresh">Пацягніце, каб абнавіць</string>
<string name="preference_gestures_website_pull_to_refresh">Пацягнуць, каб абнавіць</string>

<!-- Preference for using the dynamic toolbar -->
<string name="preference_gestures_dynamic_toolbar">Пракруціць, каб схаваць панэль інструментаў</string>
Expand Down
8 changes: 8 additions & 0 deletions app/src/main/res/values-co/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,9 @@
<!-- Preference for notifications -->
<string name="preferences_notifications">Nutificazioni</string>

<!-- Add-on Preferences -->
<!-- Preference to customize the configured AMO (addons.mozilla.org) collection -->
<string name="preferences_customize_amo_collection">Cullezzione persunalizata di moduli addiziunale</string>
<!-- Button caption to confirm the add-on collection configuration -->
<string name="customize_addon_collection_ok">Vai</string>
<!-- Button caption to abort the add-on collection configuration -->
Expand All @@ -361,6 +364,9 @@
<!-- Hint displayed on input field for custom collection user ID-->
<string name="customize_addon_collection_user_hint">Prupietariu di a cullezzione (Id. d’utilizatore)</string>

<!-- Toast shown after confirming the custom add-on collection configuration -->
<string name="toast_customize_addon_collection_done">Cullezzione di moduli addiziunale mudificata. Chjusura di l’appiecazione per piglialla in contu…</string>

<!-- Account Preferences -->
<!-- Preference for triggering sync -->
<string name="preferences_sync_now">Sincrunizà avà</string>
Expand Down Expand Up @@ -547,6 +553,8 @@
<!-- Tab Management -->
<!-- Title of preference for tabs management -->
<string name="preferences_tabs">Unghjette</string>
<!-- Title of preference that allows a user to specify the tab view -->
<string name="preferences_tab_view">Vista di l’unghjette</string>
<!-- Option for a list tab view -->
<string name="tab_view_list">Lista</string>
<!-- Option for a grid tab view -->
Expand Down
34 changes: 34 additions & 0 deletions app/src/main/res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,8 @@
<string name="search_suggestions_onboarding_learn_more_link">Zjistit více</string>

<!-- Search Widget -->
<!-- Content description for searching with a widget. Firefox is intentionally hardcoded.-->
<string name="search_widget_content_description">Otevřít nový panel Firefoxu</string>
<!-- Text preview for smaller sized widgets -->
<string name="search_widget_text_short">Vyhledávání</string>
<!-- Text preview for larger sized widgets -->
Expand Down Expand Up @@ -350,6 +352,20 @@
<!-- Preference for notifications -->
<string name="preferences_notifications">Oznámení</string>

<!-- Add-on Preferences -->
<!-- Preference to customize the configured AMO (addons.mozilla.org) collection -->
<string name="preferences_customize_amo_collection">Vlastní sbírka doplňků</string>
<!-- Button caption to confirm the add-on collection configuration -->
<string name="customize_addon_collection_ok">OK</string>
<!-- Button caption to abort the add-on collection configuration -->
<string name="customize_addon_collection_cancel">Zrušit</string>
<!-- Hint displayed on input field for custom collection name -->
<string name="customize_addon_collection_hint">Název sbírky</string>
<!-- Hint displayed on input field for custom collection user ID-->
<string name="customize_addon_collection_user_hint">Vlastník sbírky (ID uživatele)</string>
<!-- Toast shown after confirming the custom add-on collection configuration -->
<string name="toast_customize_addon_collection_done">Nastavení sbírky změněno. Pro aplikování změn se nyní aplikace ukončí…</string>

<!-- Account Preferences -->
<!-- Preference for triggering sync -->
<string name="preferences_sync_now">Synchronizovat</string>
Expand Down Expand Up @@ -536,6 +552,15 @@
<!-- Recently closed tabs screen message when there are no recently closed tabs -->
<string name="recently_closed_empty_message">Nemáte žádné nedávno zavřené panely</string>

<!-- Tab Management -->
<!-- Title of preference for tabs management -->
<string name="preferences_tabs">Panely</string>
<!-- Title of preference that allows a user to specify the tab view -->
<string name="preferences_tab_view">Zobrazení panelů</string>
<!-- Option for a list tab view -->
<string name="tab_view_list">Seznam</string>
<!-- Option for a grid tab view -->
<string name="tab_view_grid">Mřížka</string>
<!-- Title of preference that allows a user to auto close tabs after a specified amount of time -->
<string name="preferences_close_tabs">Zavírat panely</string>
<!-- Option for auto closing tabs that will never auto close tabs, always allows user to manually close tabs -->
Expand Down Expand Up @@ -620,6 +645,8 @@
<string name="collection_open_tabs">Otevřít panely</string>


<!-- Hint for adding name of a collection -->
<string name="collection_name_hint">Název sbírky</string>
<!-- Text for the menu button to remove a top site -->
<string name="remove_top_site">Odebrat</string>

Expand Down Expand Up @@ -658,6 +685,10 @@
<!-- Text for the button to clear selected history items. The first parameter
is a digit showing the number of items you have selected -->
<string name="history_delete_some">Položek ke smazání: %1$d</string>
<!-- Text for the header that groups the history for today -->
<string name="history_today">Dnes</string>
<!-- Text for the header that groups the history for yesterday -->
<string name="history_yesterday">Včera</string>
<!-- Text for the header that groups the history for last 24 hours -->
<string name="history_24_hours">Posledních 24 hodin</string>
<!-- Text for the header that groups the history the past 7 days -->
Expand Down Expand Up @@ -1606,6 +1637,9 @@
The first parameter is the name of the app (e.g. Firefox Preview) -->
<string name="onboarding_firefox_account_header">Využijte aplikaci %s naplno.</string>

<!-- Content description radio buttons with a link to more information -->
<string name="radio_preference_info_content_description">Pro více informací klepněte zde</string>

<!-- Deprecated: No Open Tabs Message Header -->
<string name="no_collections_header1">Uložte si důležité věci do sbírek</string>
<!-- Deprecated: Label to describe what collections are to a new user without any collections -->
Expand Down
20 changes: 20 additions & 0 deletions app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,20 @@
<!-- Preference for notifications -->
<string name="preferences_notifications">Notifications</string>

<!-- Add-on Preferences -->
<!-- Preference to customize the configured AMO (addons.mozilla.org) collection -->
<string name="preferences_customize_amo_collection">Collection de modules personnalisée</string>
<!-- Button caption to confirm the add-on collection configuration -->
<string name="customize_addon_collection_ok">OK</string>
<!-- Button caption to abort the add-on collection configuration -->
<string name="customize_addon_collection_cancel">Annuler</string>
<!-- Hint displayed on input field for custom collection name -->
<string name="customize_addon_collection_hint">Nom de la collection</string>
<!-- Hint displayed on input field for custom collection user ID-->
<string name="customize_addon_collection_user_hint">Propriétaire de la collection (identifiant utilisateur)</string>
<!-- Toast shown after confirming the custom add-on collection configuration -->
<string name="toast_customize_addon_collection_done">Collection de modules complémentaires modifiée. Fermeture de l’application pour appliquer les modifications…</string>

<!-- Account Preferences -->
<!-- Preference for triggering sync -->
<string name="preferences_sync_now">Synchroniser maintenant</string>
Expand Down Expand Up @@ -541,6 +555,8 @@
<!-- Tab Management -->
<!-- Title of preference for tabs management -->
<string name="preferences_tabs">Onglets</string>
<!-- Title of preference that allows a user to specify the tab view -->
<string name="preferences_tab_view">Affichage des onglets</string>
<!-- Option for a list tab view -->
<string name="tab_view_list">Liste</string>
<!-- Option for a grid tab view -->
Expand Down Expand Up @@ -663,6 +679,10 @@
<!-- Text for the button to clear selected history items. The first parameter
is a digit showing the number of items you have selected -->
<string name="history_delete_some">Supprimer %1$d éléments</string>
<!-- Text for the header that groups the history for today -->
<string name="history_today">Aujourd’hui</string>
<!-- Text for the header that groups the history for yesterday -->
<string name="history_yesterday">Hier</string>
<!-- Text for the header that groups the history for last 24 hours -->
<string name="history_24_hours">Dernières 24 heures</string>
<!-- Text for the header that groups the history the past 7 days -->
Expand Down
Loading

0 comments on commit 9ceaab1

Please sign in to comment.