Bug 1200199 - Update en-GB for Gecko 41 - Thunderbird patch r=me
authorIan Neal <iann_cvs@blueyonder.co.uk>
Mon, 07 Sep 2015 22:39:23 +0100
changeset 528 5121d33843c7a2b468edccde5ed727eb3bffbd01
parent 527 8b9ce9cf9b6d23589cec4fd8c242c0030ae946ac
child 529 1157c8be8b72fdf65b9422f0c9403b69648a4d20
push id88
push userfrancesco.lodolo@mozillaitalia.org
push dateTue, 22 Sep 2015 08:05:08 +0000
reviewersme
bugs1200199
Bug 1200199 - Update en-GB for Gecko 41 - Thunderbird patch r=me
calendar/chrome/calendar/menuOverlay.dtd
calendar/chrome/lightning/lightning-toolbar.dtd
chat/xmpp.properties
mail/chrome/messenger/aboutSupportMail.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/preferences/fonts.dtd
--- a/calendar/chrome/calendar/menuOverlay.dtd
+++ b/calendar/chrome/calendar/menuOverlay.dtd
@@ -30,16 +30,17 @@
 <!ENTITY calendar.removecalendar.accesskey      "R">
 
 
 <!ENTITY calendar.menu.customize.label          "Customise…">
 <!ENTITY calendar.menu.customize.accesskey      "C">
 
 <!ENTITY showUnifinderCmd.label                 "Find Events">
 <!ENTITY showUnifinderCmd.accesskey             "F">
+<!ENTITY showUnifinderCmd.tooltip               "Toggle the find events pane">
 
 <!ENTITY calendar.displaytodos.checkbox.label       "Show Tasks in Calendar">
 <!ENTITY calendar.displaytodos.checkbox.accesskey   "T">
 
 <!ENTITY goTodayCmd.label                       "Today">
 <!ENTITY goTodayCmd.accesskey                   "T">
 
 <!ENTITY showCurrentView.label                  "Current View">
--- a/calendar/chrome/lightning/lightning-toolbar.dtd
+++ b/calendar/chrome/lightning/lightning-toolbar.dtd
@@ -3,32 +3,39 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY lightning.toolbar.calendar.name "Calendar Toolbar">
 <!ENTITY lightning.toolbar.calendar.name.accesskey "C">
 <!ENTITY lightning.toolbar.task.name "Task Toolbar">
 <!ENTITY lightning.toolbar.task.name.accesskey "T">
 
 <!ENTITY lightning.toolbar.sync.label "Synchronise">
+<!ENTITY lightning.toolbar.sync.tooltip "Reload calendars and synchronise changes">
 <!ENTITY lightning.toolbar.delete.label "Delete">
+<!ENTITY lightning.toolbar.delete.tooltip "Delete selected events or tasks">
 <!ENTITY lightning.toolbar.edit.label "Edit">
+<!ENTITY lightning.toolbar.edit.tooltip "Edit selected event or task">
 <!ENTITY lightning.toolbar.gototoday.label "Go to Today">
+<!ENTITY lightning.toolbar.gototoday.tooltip "Go to Today">
 <!ENTITY lightning.toolbar.print.label "Print">
+<!ENTITY lightning.toolbar.print.tooltip "Print events or tasks">
 
 <!-- Mode Toolbar -->
 <!ENTITY lightning.toolbar.calendar.label     "Calendar">
 <!ENTITY lightning.toolbar.calendar.tooltip   "Switch to the calendar tab">
 <!ENTITY lightning.toolbar.calendar.accesskey "C">
 <!ENTITY lightning.toolbar.task.label         "Tasks">
 <!ENTITY lightning.toolbar.task.tooltip       "Switch to the tasks tab">
 <!ENTITY lightning.toolbar.task.accesskey     "T">
 
 <!-- Toolbar write button -->
 <!ENTITY lightning.toolbar.newevent.label     "Event">
+<!ENTITY lightning.toolbar.newevent.tooltip   "Create a new event">
 <!ENTITY lightning.toolbar.newtask.label      "Task">
+<!ENTITY lightning.toolbar.newtask.tooltip    "Create a new task">
 
 <!-- Calendar and Task Mode Toolbar -->
 <!ENTITY lightning.toolbar.day.label                 "Day">
 <!ENTITY lightning.toolbar.day.accesskey             "D">
 <!ENTITY lightning.toolbar.week.label                "Week">
 <!ENTITY lightning.toolbar.week.accesskey            "W">
 <!ENTITY lightning.toolbar.multiweek.label           "Multiweek">
 <!ENTITY lightning.toolbar.multiweek.accesskey       "u">
--- a/chat/xmpp.properties
+++ b/chat/xmpp.properties
@@ -39,22 +39,37 @@ connection.error.failedToGetAResource=Fa
 #   This is displayed in a conversation as an error message when a message
 #   the user has sent wasn't delivered.
 #   %S is replaced by the text of the message that wasn't delivered.
 conversation.error.notDelivered=This message could not be delivered: %S
 #   This is displayed in a conversation as an error message when joining a MUC
 #   fails.
 #   %S is the name of the MUC.
 conversation.error.joinFailed=Could not join: %S
+#   This is displayed in a conversation as an error message when the user is
+#   banned from a room.
+#   %S is the name of the MUC room.
+conversation.error.joinForbidden=Couldn't join %S as you are banned from this room.
 conversation.error.joinFailedNotAuthorized=Registration required: You are not authorised to join this room.
 conversation.error.creationFailedNotAllowed=Access restricted: You are not allowed to create rooms.
 #   This is displayed in a conversation as an error message when remote server
 #   is not found.
 #   %S is the name of MUC room.
 conversation.error.joinFailedRemoteServerNotFound=Could not join the room %S as the server the room is hosted on could not be reached.
+conversation.error.changeTopicFailedNotAuthorized=You are not authorised to set the topic of this room.
+#   This is displayed in a conversation as an error message when the user sends
+#   a message to a room that he is not in.
+#   %1$S is the name of MUC room.
+#   %2$S is the text of the message that wasn't delivered.
+conversation.error.sendFailedAsNotInRoom=Message could not be sent to %1$S as you are no longer in the room: %2$S
+#   This is displayed in a conversation as an error message when the user sends
+#   a message to a room that the recipient is not in.
+#   %1$S is the jid of the recipient.
+#   %2$S is the text of the message that wasn't delivered.
+conversation.error.sendFailedAsRecipientNotInRoom=Message could not be sent to %1$S as the recipient is no longer in the room: %2$S
 #   These are displayed in a conversation as a system error message.
 conversation.error.remoteServerNotFound=Could not reach the recipient's server
 conversation.error.unknownError=Unknown error
 
 # LOCALIZATION NOTE (tooltip.*):
 #   These are the titles of lines of information that will appear in
 #   the tooltip showing details about a contact or conversation.
 # LOCALIZATION NOTE (tooltip.status):
@@ -108,8 +123,14 @@ odnoklassniki.protocolName=Odnoklassniki
 #  configuring a Google Talk account.
 gtalk.usernameHint=email address
 
 # LOCALIZATION NOTE (odnoklassniki.usernameHint):
 #  This is displayed inside the accountUsernameInfoWithDescription
 #  string defined in imAccounts.properties when the user is
 #  configuring a Odnoklassniki account.
 odnoklassniki.usernameHint=Profile ID
+
+# LOCALZIATION NOTE (command.*):
+#  These are the help messages for each command.
+command.join3=%S [&lt;room&gt;[@&lt;server&gt;][/&lt;nick&gt;]] [&lt;password&gt;]: Join a room, optionally providing a different server, or nickname, or the room password.
+command.part2=%S [&lt;message&gt;]: Leave the current room with an optional message.
+command.topic=%S [&lt;new topic&gt;]: Set this room's topic.
--- a/mail/chrome/messenger/aboutSupportMail.dtd
+++ b/mail/chrome/messenger/aboutSupportMail.dtd
@@ -10,10 +10,11 @@
 <!ENTITY aboutSupport.accountsID "ID">
 <!ENTITY aboutSupport.accountsName "Name">
 <!ENTITY aboutSupport.accountsIncomingServer "Incoming server">
 <!ENTITY aboutSupport.accountsOutgoingServers "Outgoing servers">
 <!ENTITY aboutSupport.accountsServerName "Name">
 <!ENTITY aboutSupport.accountsConnSecurity "Connection security">
 <!ENTITY aboutSupport.accountsAuthMethod "Authentication method">
 <!ENTITY aboutSupport.accountsDefault "Default?">
+<!ENTITY aboutSupport.identityName "Identity">
 
 <!ENTITY aboutSupport.sendViaEmail.label "Send via email">
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -141,19 +141,19 @@ serverType-nntp=News Server (NNTP)
 # LOCALIZATION NOTE(serverType-pop3): Do not translate "POP" in the line below
 serverType-pop3=POP Mail Server
 # LOCALIZATION NOTE(serverType-imap): Do not translate "IMAP" in the line below
 serverType-imap=IMAP Mail Server
 serverType-none=Local Mail Store
 # LOCALIZATION NOTE(serverType-movemail): DONT_TRANSLATE
 serverType-movemail=Unix Movemail
 
-sizeColumnTooltip=Click to sort by size
+sizeColumnTooltip2=Sort by size
 sizeColumnHeader=Size
-linesColumnTooltip=Click to sort by lines
+linesColumnTooltip2=Sort by lines
 linesColumnHeader=Lines
 
 # LOCALIZATION NOTE (getMsgButtonTooltip): Do not translate the word "%S" below.
 # Place the word "%S" in your translation where the name of the comma seperated accounts should appear.
 getMsgButtonTooltip=Get new messages for %S
 # Used to separate email addresses in a list.  Note the trailing space ', '
 getMsgButtonTooltip.listSeparator=,\u0020
 
@@ -676,16 +676,17 @@ addonLocalError-2=This add-on could not 
 addonLocalError-3=This add-on could not be installed because it appears to be corrupt.
 addonLocalError-4=#1 could not be installed because #3 cannot modify the needed file.
 addonErrorIncompatible=#1 could not be installed because it is not compatible with #3 #4.
 addonErrorBlocklisted=#1 could not be installed because it has a high risk of causing stability or security problems.
 
 confirmMsgDelete.title=Confirm Deletion
 confirmMsgDelete.collapsed.desc=This will delete messages in collapsed threads. Are you sure you want to continue?
 confirmMsgDelete.deleteNoTrash.desc=This will delete messages immediately, without saving a copy to Deleted. Are you sure you want to continue?
+confirmMsgDelete.deleteFromTrash.desc=This will permanently delete messages from Deleted. Are you sure you want to continue?
 confirmMsgDelete.dontAsk.label=Don't ask me again.
 confirmMsgDelete.delete.label=Delete
 
 mailServerLoginFailedTitle=Login Failed
 # LOCALIZATION NOTE (mailServerLoginFailedTitle): Insert "%S" in your
 # translation where you wish to display the hostname of the server to which
 # login failed.
 mailServerLoginFailed=Login to server %S failed.
--- a/mail/chrome/messenger/preferences/fonts.dtd
+++ b/mail/chrome/messenger/preferences/fonts.dtd
@@ -41,16 +41,17 @@
 <!ENTITY  font.langGroup.bengali                  "Bengali">
 <!ENTITY  font.langGroup.canadian                 "Unified Canadian Syllabary">
 <!ENTITY  font.langGroup.ethiopic                 "Ethiopic">
 <!ENTITY  font.langGroup.georgian                 "Georgian">
 <!ENTITY  font.langGroup.gujarati                 "Gujarati">
 <!ENTITY  font.langGroup.gurmukhi                 "Gurmukhi">
 <!ENTITY  font.langGroup.khmer                    "Khmer">
 <!ENTITY  font.langGroup.malayalam                "Malayalam">
+<!ENTITY  font.langGroup.math                     "Mathematics">
 <!ENTITY  font.langGroup.oriya                    "Oriya">
 <!ENTITY  font.langGroup.telugu                   "Telugu">
 <!ENTITY  font.langGroup.kannada                  "Kannada">
 <!ENTITY  font.langGroup.sinhala                  "Sinhala">
 <!ENTITY  font.langGroup.tibetan                  "Tibetan">
 <!-- Minimum font size -->
 <!ENTITY minSize.label                            "Minimum font size:">
 <!ENTITY minSize.accesskey                        "z">