Skip to content

Commit ff84ebd

Browse files
dandarnelldandarnell
authored
Merge pull request #105 from thunderbird/update
Update messages
2 parents e132f43 + 6727571 commit ff84ebd

5 files changed

Lines changed: 100 additions & 27 deletions

File tree

‎_data/comm.json‎

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4694,16 +4694,6 @@
46944694
"watchThreadMenu.key",
46954695
"tagMenu.label",
46964696
"tagMenu.accesskey",
4697-
"tagCmd0.key",
4698-
"tagCmd1.key",
4699-
"tagCmd2.key",
4700-
"tagCmd3.key",
4701-
"tagCmd4.key",
4702-
"tagCmd5.key",
4703-
"tagCmd6.key",
4704-
"tagCmd7.key",
4705-
"tagCmd8.key",
4706-
"tagCmd9.key",
47074697
"markMenu.label",
47084698
"markMenu.accesskey",
47094699
"toggleReadCmd.key",
@@ -4864,10 +4854,6 @@
48644854
"appmenuNewMsgCmd.label",
48654855
"appmenuNewContactCmd.label",
48664856
"appmenuToolbarLayout.label",
4867-
"addNewTag.label",
4868-
"addNewTag.accesskey",
4869-
"manageTags.label",
4870-
"manageTags.accesskey",
48714857
"folderNameColumn.label",
48724858
"folderUnreadColumn.label",
48734859
"folderTotalColumn.label",
@@ -5083,7 +5069,6 @@
50835069
"markFolderRead",
50845070
"markNewsgroupRead",
50855071
"folderProperties",
5086-
"newTag",
50875072
"advanceNextPrompt",
50885073
"titleNewsPreHost",
50895074
"replyToSender",
@@ -5172,13 +5157,6 @@
51725157
"templatesFolderName",
51735158
"outboxFolderName",
51745159
"archivesFolderName",
5175-
"mailnews.tags.remove",
5176-
"mailnews.labels.description.1",
5177-
"mailnews.labels.description.2",
5178-
"mailnews.labels.description.3",
5179-
"mailnews.labels.description.4",
5180-
"mailnews.labels.description.5",
5181-
"mailnews.tags.format",
51825160
"mailnews.search_date_format",
51835161
"mailnews.search_date_separator",
51845162
"mailnews.search_date_leading_zeros",
@@ -5250,8 +5228,6 @@
52505228
"confirmSavedSearchDeleteMessage",
52515229
"passwordPrompt",
52525230
"passwordTitle",
5253-
"tagExists",
5254-
"editTagTitle",
52555231
"editVirtualFolderPropertiesTitle",
52565232
"alertNoSearchFoldersSelected",
52575233
"byteAbbreviation2",
@@ -8568,7 +8544,11 @@
85688544
"gloda-indexing-status-exact",
85698545
"gloda-indexing-folder-status-exact",
85708546
"gloda-indexed-folder",
8571-
"gloda-indexed-folder-status"
8547+
"gloda-indexed-folder-status",
8548+
"extension-send-activity-live",
8549+
"extension-send-activity-progress",
8550+
"extension-send-activity-event",
8551+
"extension-send-activity-event-status"
85728552
],
85738553
"mail/messenger/activityFeedback.ftl": [
85748554
"looking-for-messages-account",
@@ -9174,6 +9154,8 @@
91749154
"webext-perms-description-messagesDelete",
91759155
"webext-perms-description-messagesRead2",
91769156
"webext-perms-description-messagesUpdate",
9157+
"webext-perms-description-messages-send",
9158+
"webext-perms-description-messages-save",
91779159
"webext-perms-description-messagesTags",
91789160
"webext-perms-description-messagesTagsList",
91799161
"webext-perms-description-sensitiveDataUpload",
@@ -9806,7 +9788,21 @@
98069788
"ignored-subtheads-feedback",
98079789
"attachment-view-attachment-count",
98089790
"allow-remote-content-resource.label",
9809-
"remote-content-option-allow-all.label"
9791+
"remote-content-option-allow-all.label",
9792+
"tags-label-1",
9793+
"tags-label-2",
9794+
"tags-label-3",
9795+
"tags-label-4",
9796+
"tags-label-5",
9797+
"tags-add-new.label",
9798+
"tags-add-new.accesskey",
9799+
"tags-manage.label",
9800+
"tags-manage.accesskey",
9801+
"tags-remove-all.label",
9802+
"tags-remove-all.accesskey",
9803+
"tags-format-with-accesskey.label",
9804+
"tags-format-with-accesskey.accesskey",
9805+
"tags-format-without-accesskey.label"
98109806
],
98119807
"mail/messenger/messengercompose/messengercompose.ftl": [
98129808
"compose-send-format-menu.label",
@@ -11204,10 +11200,12 @@
1120411200
],
1120511201
"mail/messenger/preferences/new-tag.ftl": [
1120611202
"tag-dialog-title",
11203+
"tag-edit-dialog-title",
1120711204
"tag-name-label.value",
1120811205
"tag-name-label.accesskey",
1120911206
"tag-color-label.value",
11210-
"tag-color-label.accesskey"
11207+
"tag-color-label.accesskey",
11208+
"tag-already-exists"
1121111209
],
1121211210
"mail/messenger/preferences/notifications.ftl": [
1121311211
"notifications-dialog-title",

‎mail/messenger/activity.ftl‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,3 +69,47 @@ gloda-indexed-folder-status =
6969
[one] { $count } second elapsed
7070
*[other] { $count } seconds elapsed
7171
}
72+
# Display line of the live Activity Manager process shown while a WebExtension
73+
# is actively sending messages via messages.sendMessage(). The running count is
74+
# shown in the status line below.
75+
# Variables:
76+
# $extensionName (String) - the extension's name
77+
extension-send-activity-live = Extension “{ $extensionName }” is sending unattended messages.
78+
# Status line shown under extension-send-activity-live, updated after every send.
79+
# Variables:
80+
# $count (Number) - number of messages sent so far in this batch
81+
extension-send-activity-progress =
82+
{ $count ->
83+
[one] { $count } message sent
84+
*[other] { $count } messages sent
85+
}
86+
# Permanent Activity Manager entry written when the live send process is
87+
# finalized, 10 seconds after the last send in a batch. The count and elapsed
88+
# time are carried in the status line below (extension-send-activity-event-status).
89+
# Variables:
90+
# $extensionName (String) - the extension's name
91+
# $count (Number) - number of messages sent in this batch
92+
extension-send-activity-event =
93+
{ $count ->
94+
[one] Extension “{ $extensionName }” sent an unattended message
95+
*[other] Extension “{ $extensionName }” sent multiple unattended messages
96+
}
97+
# Status line shown under extension-send-activity-event. Reports how many
98+
# messages were sent and the wall-clock time between the first and last send in
99+
# the batch (rounded to whole seconds, at least one).
100+
# Variables:
101+
# $count (Number) - number of messages sent in this batch
102+
# $seconds (Number) - elapsed seconds between the first and last send
103+
extension-send-activity-event-status =
104+
{ $count ->
105+
[one]
106+
{ $seconds ->
107+
[one] { $count } message in { $seconds } second
108+
*[other] { $count } message in { $seconds } seconds
109+
}
110+
*[other]
111+
{ $seconds ->
112+
[one] { $count } messages in { $seconds } second
113+
*[other] { $count } messages in { $seconds } seconds
114+
}
115+
}

‎mail/messenger/extensionPermissions.ftl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ webext-perms-description-messagesMove = Copy or move your email messages (includ
3030
webext-perms-description-messagesDelete = Permanently delete your email messages
3131
webext-perms-description-messagesRead2 = Read your email messages
3232
webext-perms-description-messagesUpdate = Change properties and tags of your email messages
33+
webext-perms-description-messages-send = Programmatically send email messages in bulk on your behalf, without any visual feedback. Use the Activity Manager to review the add-on’s send history.
34+
webext-perms-description-messages-save = Save email messages as drafts or templates programmatically, without your interaction
3335
webext-perms-description-messagesTags = Create, modify and delete message tags
3436
webext-perms-description-messagesTagsList = List message tags
3537
webext-perms-description-sensitiveDataUpload = Transfer sensitive user data (if access has been granted) to a remote server for further processing

‎mail/messenger/messenger.ftl‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -711,6 +711,33 @@ remote-content-option-allow-all =
711711
*[other] Allow remote content from all { $count } origins listed above
712712
}
713713
714+
## Tags
715+
716+
tags-label-1 = Important
717+
tags-label-2 = Work
718+
tags-label-3 = Personal
719+
tags-label-4 = To Do
720+
tags-label-5 = Later
721+
tags-add-new =
722+
.label = New Tag…
723+
.accesskey = N
724+
tags-manage =
725+
.label = Manage Tags…
726+
.accesskey = M
727+
tags-remove-all =
728+
.label = Remove All Tags
729+
.accesskey = 0
730+
# Variables:
731+
# $accesskey (String) - The single-digit keyboard shortcut (1-9) assigned to the tag.
732+
# $name (String) - The default or user-defined name of the tag (e.g., Important, Work).
733+
tags-format-with-accesskey =
734+
.label = { $accesskey } { $name }
735+
.accesskey = { $accesskey }
736+
# Variables:
737+
# $name (String) - The default or user-defined name of the tag.
738+
tags-format-without-accesskey =
739+
.label = { $name }
740+
714741
## OAuth2 loopback listener response page.
715742

716743
oauth2-loopback-success = You can close this window.

‎mail/messenger/preferences/new-tag.ftl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
44

55
tag-dialog-title = New Tag
6+
tag-edit-dialog-title = Edit Tag
67
tag-name-label =
78
.value = Tag Name:
89
.accesskey = T
910
tag-color-label =
1011
.value = Color:
1112
.accesskey = C
13+
tag-already-exists = A tag with that name already exists.

0 commit comments

Comments
 (0)