Skip to content

Commit 9ceaab1

Browse files
authored
Merge pull request #252 from fork-maintainers/upstream-sync3
Sync up to Mozilla's v83.1.0
2 parents 6d5f903 + 0c69f4b commit 9ceaab1

File tree

20 files changed

+658
-26
lines changed

20 files changed

+658
-26
lines changed

app/src/main/java/com/google/android/gms/common/GooglePlayServicesNotAvailableException.java

Lines changed: 0 additions & 12 deletions
This file was deleted.

app/src/main/java/com/google/android/gms/common/GooglePlayServicesRepairableException.java

Lines changed: 0 additions & 10 deletions
This file was deleted.

app/src/main/java/org/mozilla/fenix/library/downloads/DownloadFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class DownloadFragment : LibraryPageFragment<DownloadItem>(), UserInteractionHan
4242
it.value.id.toString(),
4343
it.value.fileName,
4444
it.value.filePath,
45-
it.value.contentLength.toString(),
45+
it.value.contentLength?.toString() ?: "0",
4646
it.value.contentType,
4747
it.value.status
4848
)

app/src/main/res/values-ar/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1285,6 +1285,9 @@
12851285
<string name="etp_panel_off">عُطّلت الحماية في هذا الموقع</string>
12861286
<!-- Header for exceptions list for which sites enhanced tracking protection is always off -->
12871287
<string name="enhanced_tracking_protection_exceptions">عُطّلت الحماية الموسّعة من التعقب لهذه المواقع</string>
1288+
<!-- Content description (not visible, for screen readers etc.): Navigate
1289+
back from ETP details (Ex: Tracking content) -->
1290+
<string name="etp_back_button_content_description">عُد</string>
12881291
<!-- About page Your rights link text -->
12891292
<string name="about_your_rights">حقوقك</string>
12901293
<!-- About page link text to open open source licenses screen -->

app/src/main/res/values-ast/strings.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,9 @@
340340
<!-- Button caption to abort the add-on collection configuration -->
341341
<string name="customize_addon_collection_cancel">Encaboxar</string>
342342

343+
<!-- Toast shown after confirming the custom add-on collection configuration -->
344+
<string name="toast_customize_addon_collection_done">Modificóse la coleición de complementos. L\'aplicación va zarrase p\'aplicar los cambeos…</string>
345+
343346
<!-- Account Preferences -->
344347
<!-- Preference for triggering sync -->
345348
<string name="preferences_sync_now">Sincronizar agora</string>
@@ -726,6 +729,8 @@
726729
<string name="preference_phone_feature_location">Allugamientu</string>
727730
<!-- Preference for altering the notification access for all websites -->
728731
<string name="preference_phone_feature_notification">Avisos</string>
732+
<!-- Preference for altering the persistent storage access for all websites -->
733+
<string name="preference_phone_feature_persistent_storage">Almacenamientu permanente</string>
729734
<!-- Label that indicates that a permission must be asked always -->
730735
<string name="preference_option_phone_feature_ask_to_allow">Entrugar pa permitir</string>
731736
<!-- Label that indicates that a permission must be blocked -->
@@ -1204,6 +1209,9 @@
12041209
<string name="etp_panel_off">DESACTIVÓSE nesti sitiu</string>
12051210
<!-- Header for exceptions list for which sites enhanced tracking protection is always off -->
12061211
<string name="enhanced_tracking_protection_exceptions">La proteición ameyorada escontra\'l rastrexu ta desactivada pa estos sitios web</string>
1212+
<!-- Content description (not visible, for screen readers etc.): Navigate
1213+
back from ETP details (Ex: Tracking content) -->
1214+
<string name="etp_back_button_content_description">Dir p\'atrás</string>
12071215
<!-- About page Your rights link text -->
12081216
<string name="about_your_rights">Los tos drechos</string>
12091217
<!-- About page link text to open open source licenses screen -->

app/src/main/res/values-be/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@
490490

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

495495
<!-- Preference for using the dynamic toolbar -->
496496
<string name="preference_gestures_dynamic_toolbar">Пракруціць, каб схаваць панэль інструментаў</string>

app/src/main/res/values-co/strings.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,9 @@
352352
<!-- Preference for notifications -->
353353
<string name="preferences_notifications">Nutificazioni</string>
354354

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

367+
<!-- Toast shown after confirming the custom add-on collection configuration -->
368+
<string name="toast_customize_addon_collection_done">Cullezzione di moduli addiziunale mudificata. Chjusura di l’appiecazione per piglialla in contu…</string>
369+
364370
<!-- Account Preferences -->
365371
<!-- Preference for triggering sync -->
366372
<string name="preferences_sync_now">Sincrunizà avà</string>
@@ -547,6 +553,8 @@
547553
<!-- Tab Management -->
548554
<!-- Title of preference for tabs management -->
549555
<string name="preferences_tabs">Unghjette</string>
556+
<!-- Title of preference that allows a user to specify the tab view -->
557+
<string name="preferences_tab_view">Vista di l’unghjette</string>
550558
<!-- Option for a list tab view -->
551559
<string name="tab_view_list">Lista</string>
552560
<!-- Option for a grid tab view -->

app/src/main/res/values-cs/strings.xml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,8 @@
220220
<string name="search_suggestions_onboarding_learn_more_link">Zjistit více</string>
221221

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

355+
<!-- Add-on Preferences -->
356+
<!-- Preference to customize the configured AMO (addons.mozilla.org) collection -->
357+
<string name="preferences_customize_amo_collection">Vlastní sbírka doplňků</string>
358+
<!-- Button caption to confirm the add-on collection configuration -->
359+
<string name="customize_addon_collection_ok">OK</string>
360+
<!-- Button caption to abort the add-on collection configuration -->
361+
<string name="customize_addon_collection_cancel">Zrušit</string>
362+
<!-- Hint displayed on input field for custom collection name -->
363+
<string name="customize_addon_collection_hint">Název sbírky</string>
364+
<!-- Hint displayed on input field for custom collection user ID-->
365+
<string name="customize_addon_collection_user_hint">Vlastník sbírky (ID uživatele)</string>
366+
<!-- Toast shown after confirming the custom add-on collection configuration -->
367+
<string name="toast_customize_addon_collection_done">Nastavení sbírky změněno. Pro aplikování změn se nyní aplikace ukončí…</string>
368+
353369
<!-- Account Preferences -->
354370
<!-- Preference for triggering sync -->
355371
<string name="preferences_sync_now">Synchronizovat</string>
@@ -536,6 +552,15 @@
536552
<!-- Recently closed tabs screen message when there are no recently closed tabs -->
537553
<string name="recently_closed_empty_message">Nemáte žádné nedávno zavřené panely</string>
538554

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

622647

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

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

1640+
<!-- Content description radio buttons with a link to more information -->
1641+
<string name="radio_preference_info_content_description">Pro více informací klepněte zde</string>
1642+
16091643
<!-- Deprecated: No Open Tabs Message Header -->
16101644
<string name="no_collections_header1">Uložte si důležité věci do sbírek</string>
16111645
<!-- Deprecated: Label to describe what collections are to a new user without any collections -->

app/src/main/res/values-fr/strings.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,20 @@
351351
<!-- Preference for notifications -->
352352
<string name="preferences_notifications">Notifications</string>
353353

354+
<!-- Add-on Preferences -->
355+
<!-- Preference to customize the configured AMO (addons.mozilla.org) collection -->
356+
<string name="preferences_customize_amo_collection">Collection de modules personnalisée</string>
357+
<!-- Button caption to confirm the add-on collection configuration -->
358+
<string name="customize_addon_collection_ok">OK</string>
359+
<!-- Button caption to abort the add-on collection configuration -->
360+
<string name="customize_addon_collection_cancel">Annuler</string>
361+
<!-- Hint displayed on input field for custom collection name -->
362+
<string name="customize_addon_collection_hint">Nom de la collection</string>
363+
<!-- Hint displayed on input field for custom collection user ID-->
364+
<string name="customize_addon_collection_user_hint">Propriétaire de la collection (identifiant utilisateur)</string>
365+
<!-- Toast shown after confirming the custom add-on collection configuration -->
366+
<string name="toast_customize_addon_collection_done">Collection de modules complémentaires modifiée. Fermeture de l’application pour appliquer les modifications…</string>
367+
354368
<!-- Account Preferences -->
355369
<!-- Preference for triggering sync -->
356370
<string name="preferences_sync_now">Synchroniser maintenant</string>
@@ -541,6 +555,8 @@
541555
<!-- Tab Management -->
542556
<!-- Title of preference for tabs management -->
543557
<string name="preferences_tabs">Onglets</string>
558+
<!-- Title of preference that allows a user to specify the tab view -->
559+
<string name="preferences_tab_view">Affichage des onglets</string>
544560
<!-- Option for a list tab view -->
545561
<string name="tab_view_list">Liste</string>
546562
<!-- Option for a grid tab view -->
@@ -663,6 +679,10 @@
663679
<!-- Text for the button to clear selected history items. The first parameter
664680
is a digit showing the number of items you have selected -->
665681
<string name="history_delete_some">Supprimer %1$d éléments</string>
682+
<!-- Text for the header that groups the history for today -->
683+
<string name="history_today">Aujourd’hui</string>
684+
<!-- Text for the header that groups the history for yesterday -->
685+
<string name="history_yesterday">Hier</string>
666686
<!-- Text for the header that groups the history for last 24 hours -->
667687
<string name="history_24_hours">Dernières 24 heures</string>
668688
<!-- Text for the header that groups the history the past 7 days -->

0 commit comments

Comments
 (0)