Skip to content

Commit

Permalink
Merge pull request #28 from thunderbird/update
Browse files Browse the repository at this point in the history
Update messages
  • Loading branch information
jfx2006 authored Oct 10, 2024
2 parents d367e58 + f2a9f43 commit 1f4fe9b
Show file tree
Hide file tree
Showing 6 changed files with 133 additions and 1 deletion.
1 change: 1 addition & 0 deletions _data/comm-beta.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
"calendar-event-listing-interval-next-31-days",
"calendar-event-listing-interval-next-6-months",
"calendar-event-listing-interval-next-12-months",
"calendar-event-listing-interval-future",
"calendar-event-listing-interval-all",
"calendar-event-listing-interval-selected-day",
"calendar-event-listing-interval-today"
Expand Down
36 changes: 35 additions & 1 deletion _data/comm.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
"calendar-event-listing-interval-next-31-days",
"calendar-event-listing-interval-next-6-months",
"calendar-event-listing-interval-next-12-months",
"calendar-event-listing-interval-future",
"calendar-event-listing-interval-all",
"calendar-event-listing-interval-selected-day",
"calendar-event-listing-interval-today"
Expand Down Expand Up @@ -9297,6 +9298,7 @@
"appmenu-tools-panel",
"appmenu-tools-import",
"appmenu-tools-export",
"appmenu-export-for-mobile",
"appmenu-tools-message-search",
"appmenu-tools-message-filters",
"appmenu-tools-download-manager",
Expand Down Expand Up @@ -9420,6 +9422,7 @@
"toolbar-context-menu-menu-bar",
"menu-tools-settings",
"menu-addons-and-themes",
"menu-export-for-mobile",
"menu-help-help-title",
"menu-help-get-help",
"menu-help-get-release-help",
Expand Down Expand Up @@ -10867,6 +10870,8 @@
"category-calendar",
"pane-sync-title",
"category-sync",
"pane-qr-export-title",
"category-qr-export",
"general-language-and-appearance-header",
"general-incoming-mail-header",
"general-files-and-attachment-header",
Expand Down Expand Up @@ -11199,7 +11204,36 @@
"synced-acount-item-filters",
"synced-acount-item-keys",
"sync-disconnected-text",
"sync-disconnected-turn-on-sync"
"sync-disconnected-turn-on-sync",
"qr-export-pane-header",
"qr-export-description",
"qr-export-get-app",
"qr-export-create",
"qr-export-select-accounts",
"qr-export-no-accounts",
"qr-export-accounts-legend",
"qr-export-select-all-accounts",
"qr-export-security-legend",
"qr-export-include-passwords",
"qr-export-security-hint",
"qr-export-security-warning",
"qr-export-start-export",
"qr-export-scan-progress",
"qr-export-scan-description",
"qr-export-scan-step1",
"qr-export-scan-step2",
"qr-export-scan-step3",
"qr-export-scan-step4-revision",
"qr-export-back",
"qr-export-next",
"qr-export-done",
"qr-export-summary-description",
"qr-export-summary-title",
"qr-export-summary-qr-count",
"qr-export-summary-accounts",
"qr-export-summary-passwords-included",
"qr-export-summary-passwords-excluded",
"qr-export-more-accounts"
],
"mail/messenger/preferences/receipts.ftl": [
"receipts-dialog-title",
Expand Down
3 changes: 3 additions & 0 deletions calendar/calendar/calendar-event-listing.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ calendar-event-listing-interval-next-6-months =
calendar-event-listing-interval-next-12-months =
.label = Events in the Next 12 Months
calendar-event-listing-interval-future =
.label = All Future Events
calendar-event-listing-interval-all =
.label = All Events
Expand Down
4 changes: 4 additions & 0 deletions mail/messenger/appmenu.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,10 @@ appmenu-tools-export =
.label = Export
.accesskey = E
appmenu-export-for-mobile =
.label = Export for Mobile
.accesskey = p
appmenu-tools-message-search =
.label = Search Messages
.accesskey = S
Expand Down
4 changes: 4 additions & 0 deletions mail/messenger/menubar.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ menu-addons-and-themes =
.label = Add-ons and Themes
.accesskey = A
menu-export-for-mobile =
.label = Export for Mobile…
.accesskey = p
## Help Menu

menu-help-help-title =
Expand Down
86 changes: 86 additions & 0 deletions mail/messenger/preferences/preferences.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ pane-sync-title = Sync
category-sync =
.tooltiptext = Sync
pane-qr-export-title = Export for Mobile
category-qr-export =
.tooltiptext = Export for Mobile
general-language-and-appearance-header = Language & Appearance
general-incoming-mail-header = Incoming Mails
Expand Down Expand Up @@ -1073,3 +1077,85 @@ synced-acount-item-keys = OpenPGP - S/MIME
sync-disconnected-text = Synchronize your email accounts, address books, calendars, and identities across all your devices.
sync-disconnected-turn-on-sync = Turn on Syncing…
## Mobile QR Export Pane

qr-export-pane-header = Export accounts to { -brand-product-name } Mobile
qr-export-description = Quickly transfer your account settings from desktop to mobile by generating a QR code. Select which accounts to include, decide if you want to transfer your password, and scan the code with your mobile device. Fast, secure, and simple.
qr-export-get-app = Don’t have { -brand-product-name } on mobile yet? <a data-l10n-name="app-link">Get it on Google Play</a>
qr-export-create = Create a QR code to export your accounts
qr-export-select-accounts = Select which accounts to export:
qr-export-no-accounts = Not seeing all your accounts? Some accounts may be disabled because they are not supported by { -brand-product-name } for Android. <a data-l10n-name="account-support-link">Support</a>
qr-export-accounts-legend = Email accounts
qr-export-select-all-accounts = Select all
qr-export-security-legend = Security
qr-export-include-passwords = Include all accounts passwords
qr-export-security-hint = By scanning the following QR codes, your account settings—including your email and password—will be transferred securely. We do not collect, store, or share any of this data during the process. The transfer occurs directly between your devices.
qr-export-security-warning = For your security, please ensure you are in a private setting and only scan QR codes from trusted sources.
qr-export-start-export = Export
# Variables:
# $count (Number) - Total number of QR codes to step through.
# $step (Number) - Current step number of the QR code displayed.
qr-export-scan-progress = { $count ->
[one] { $step } of { $count } QR code
*[other] { $step } of { $count } QR codes
}
# Variables:
# $count (Number) - Total number of QR codes to step through.
qr-export-scan-description = { $count ->
[one] Scan QR code with { -brand-product-name } on your mobile device
*[other] Scan QR codes with { -brand-product-name } on your mobile device
}
qr-export-scan-step1 = Open { -brand-product-name } on your mobile device
qr-export-scan-step2 = Go to settings
# The strong label should match https://hosted.weblate.org/translate/tb-android/settings-import/en/?checksum=bd1817a6fc9f758b&sort_by=-priority,position#translations
qr-export-scan-step3 = Select <strong>Import settings</strong>
# The strong label should match https://hosted.weblate.org/translate/tb-android/settings-import/en/?checksum=0db0b6c1d176a59b&sort_by=-priority,position#translations
qr-export-scan-step4-revision = Tap <strong>Scan QR code</strong> and hold your phone over this code
qr-export-back = Back
qr-export-next = Next
qr-export-done = Done
qr-export-summary-description = Accounts exported. Continue on your mobile device.
qr-export-summary-title = Export summary:
# Variables:
# $count (Number) - Total number of QR codes shown to the user.
qr-export-summary-qr-count = { $count ->
[one] { $count } QR code generated
*[other] { $count } QR codes generated
}
# Variables:
# $count (Number) - Number of accounts included in the export.
qr-export-summary-accounts = { $count ->
[one] { $count } account exported:
*[other] { $count } accounts exported:
}
qr-export-summary-passwords-included = Passwords included
qr-export-summary-passwords-excluded = Passwords excluded
qr-export-more-accounts = Export more accounts

0 comments on commit 1f4fe9b

Please sign in to comment.