Bug 1038005 - Update en-GB for Gecko 32 - Thunderbird part r=me
authorIan Neal <iann_cvs@blueyonder.co.uk>
Tue, 15 Jul 2014 22:29:58 +0100
changeset 417 d6b2f51953f8d2796ff7b44b32caad734ed917be
parent 416 8b5328790e1a047d6404f34707576b3458d28dad
child 418 a3effdf1510430f8a55bf9ebf42b834965729996
push id83
push userfrancesco.lodolo@mozillaitalia.org
push dateMon, 28 Jul 2014 07:27:19 +0000
reviewersme
bugs1038005
Bug 1038005 - Update en-GB for Gecko 32 - Thunderbird part r=me
chat/conversations.properties
chat/imtooltip.properties
chat/irc.properties
chat/yahoo.properties
mail/chrome/messenger/appleMailImportMsgs.properties
mail/chrome/messenger/charsetTitles.properties
mail/chrome/messenger/chat.properties
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/multimessageview.properties
mail/chrome/overrides/netError.dtd
--- a/chat/conversations.properties
+++ b/chat/conversations.properties
@@ -34,16 +34,20 @@ statusUnknown=Your account is disconnect
 
 accountDisconnected=Your account is disconnected.
 accountReconnected=Your account has been reconnected.
 
 # LOCALIZATION NOTE (autoReply):
 #  %S is replaced by the text of a message that was sent as an automatic reply.
 autoReply=Auto-reply - %S
 
+# LOCALIZATION NOTE (noTopic):
+# Displayed instead of the topic when no topic is set.
+noTopic=No topic message for this room.
+
 # LOCALIZATION NOTE (topicSet):
 #  %1$S is the conversation name, %2$S is the topic.
 topicSet=The topic for %1$S is: %2$S.
 # LOCALIZATION NOTE (topicNotSet):
 #  %S is the conversation name.
 topicNotSet=There is no topic for %S.
 # LOCALIZATION NOTE (topicChanged):
 #  %1$S is the user who changed the topic, %2$S is the new topic.
new file mode 100644
--- /dev/null
+++ b/chat/imtooltip.properties
@@ -0,0 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+buddy.username=Username
+buddy.account=Account
+contact.tags=Tags
--- a/chat/irc.properties
+++ b/chat/irc.properties
@@ -156,18 +156,22 @@ error.nickCollision=Nick already in use,
 error.erroneousNickname=%S is not an allowed nickname.
 error.banned=You are banned from this server.
 error.bannedSoon=You will soon be banned from this server.
 error.mode.wrongUser=You cannot change modes for other users.
 #    %S is the nickname or channel name that isn't available.
 error.noSuchNick=%S is not online.
 error.wasNoSuchNick=There was no nickname: %S
 error.noSuchChannel=There is no channel: %S.
+error.unavailable=%S is temporarily unavailable.
 #    %S is the channel name.
+error.channelBanned=You have been banned from %S.
 error.cannotSendToChannel=You cannot send messages to %S.
+error.channelFull=The channel %S is full.
+error.inviteOnly=You must be invited to join %S.
 error.nonUniqueTarget=%S is not a unique user@host or shortname or you have tried to join too many channels at once.
 error.notChannelOp=You are not a channel operator on %S.
 error.notChannelOwner=You are not a channel owner of %S.
 error.wrongKey=Cannot join %S, invalid channel password.
 error.sendMessageFailed=An error occurred while sending your last message. Please try again once the connection has been reestablished.
 
 # LOCALIZATION NOTE (tooltip.*):
 #    These are the descriptions given in a tooltip with information received
--- a/chat/yahoo.properties
+++ b/chat/yahoo.properties
@@ -20,12 +20,18 @@ options.transferHost=File transfer serve
 options.transferPort=File transfer port
 options.chatEncoding=Encoding
 options.ignoreInvites=Ignore conference invitations
 
 # In this message, %S is replaced with the username of the user who left.
 system.message.conferenceLogoff=%S has left the conference.
 system.message.conferenceLogon=%S has joined the conference.
 
-command.help.invite=/invite &lt;user1&gt;[,&lt;user2&gt;,...] [&lt;invite message&gt;]: invite one or more users into this conference chat.
+# LOCALZIATION NOTE (command.*):
+#   These are the help messages for each command, the %S is the command name
+#   Each command first gives the parameter it accepts and then a description of
+#   the command.
+command.help.invite2=%S &lt;user1&gt;[,&lt;user2&gt;,...] [&lt;invite message&gt;]: invite one or more users into this conference chat.
+command.help.conference=%S: Create a new conference room in which you can later invite other users.
+
 # LOCALIZATION NOTE (command.feedback.invite):
 #   %S is the user, or comma separated list of users, invited to the conference.
 command.feedback.invite=You have invited %S to the conference.
--- a/mail/chrome/messenger/appleMailImportMsgs.properties
+++ b/mail/chrome/messenger/appleMailImportMsgs.properties
@@ -1,32 +1,21 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-
 # Short name of import module
-## @name APPLEMAILIMPORT_NAME
-## @loc None
-2000=Apple Mail
+ApplemailImportName=Apple Mail
 
 # Description of import module
-## @name APPLEMAILIMPORT_DESCRIPTION
-## @loc None
-2001=Import Local Mail from Mac OS X Mail
+ApplemailImportDescription=Import Local Mail from Mac OS X Mail
 
 # Success Message
-# LOCALIZATION NOTE : Do not translate the word "%S" below.
-## @name APPLEMAILIMPORT_MAILBOX_SUCCESS
-## @loc None
-2002=Local messages were successfully imported from %S
+# LOCALIZATION NOTE(ApplemailImportMailboxSuccess): Do not translate the word "%S" below.
+ApplemailImportMailboxSuccess=Local messages were successfully imported from %S
 
 # Error Message
-## @name APPLEMAILIMPORT_MAILBOX_BADPARAM
-## @loc None
-2003=An internal error occurred. Importing failed. Try importing again.
+ApplemailImportMailboxBadparam=An internal error occurred. Importing failed. Try importing again.
 
 # Error message
-# LOCALIZATION NOTE : Do not translate the word "%S" below.
-## @name APPLEMAILIMPORT_MAILBOX_CONVERTERROR
-## @loc None
-2004=An error occurred while importing messages from %S. Messages were not imported. 
+# LOCALIZATION NOTE(ApplemailImportMailboxConverterror): Do not translate the word "%S" below.
+ApplemailImportMailboxConverterror=An error occurred while importing messages from %S. Messages were not imported.
 
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/charsetTitles.properties
@@ -0,0 +1,104 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+## Rule of this file:
+## 1. key should always be in lower case ascii so we can do case insensitive
+##    comparison in the code faster.
+
+## Format of this file:
+## charset_name.title = a_title  -  specifies the human readable title for 
+## this charset
+
+us-ascii.title    = English (US-ASCII)
+iso-8859-1.title    = Western (ISO-8859-1)
+iso-8859-2.title    = Central European (ISO-8859-2)
+iso-8859-3.title    = South European (ISO-8859-3)
+iso-8859-4.title    = Baltic (ISO-8859-4)
+iso-8859-9.title    = Turkish (ISO-8859-9)
+iso-8859-10.title   = Nordic (ISO-8859-10)
+iso-8859-13.title   = Baltic (ISO-8859-13)
+iso-8859-14.title   = Celtic (ISO-8859-14)
+iso-8859-15.title   = Western (ISO-8859-15)
+iso-8859-16.title   = Romanian (ISO-8859-16)
+windows-1250.title  = Central European (Windows-1250)
+windows-1252.title  = Western (Windows-1252)
+windows-1254.title  = Turkish (Windows-1254)
+windows-1257.title  = Baltic (Windows-1257)
+macintosh.title         = Western (MacRoman)
+x-mac-ce.title          = Central European (MacCE)
+x-mac-turkish.title     = Turkish (MacTurkish)
+x-mac-croatian.title    = Croatian (MacCroatian)
+x-mac-romanian.title    = Romanian (MacRomanian)
+x-mac-icelandic.title   = Icelandic (MacIcelandic)
+iso-2022-jp.title = Japanese (ISO-2022-JP)
+shift_jis.title = Japanese (Shift_JIS)
+euc-jp.title = Japanese (EUC-JP)
+big5.title = Chinese Traditional (Big5)
+big5-hkscs.title = Chinese Traditional (Big5-HKSCS)
+x-euc-tw.title = Chinese Traditional (EUC-TW)
+gb2312.title = Chinese Simplified (GB2312)
+hz-gb-2312.title = Chinese Simplified (HZ)
+gbk.title = Chinese Simplified (GBK)
+iso-2022-cn.title = Chinese Simplified (ISO-2022-CN)
+euc-kr.title = Korean (EUC-KR)
+x-johab.title = Korean (JOHAB)
+iso-2022-kr.title = Korean (ISO-2022-KR)
+utf-7.title = Unicode (UTF-7)
+utf-8.title = Unicode (UTF-8)
+utf-16.title = Unicode (UTF-16)
+utf-16le.title = Unicode (UTF-16LE)
+utf-16be.title = Unicode (UTF-16BE)
+iso-8859-5.title = Cyrillic (ISO-8859-5)
+iso-ir-111.title = Cyrillic (ISO-IR-111)
+windows-1251.title = Cyrillic (Windows-1251)
+x-mac-cyrillic.title = Cyrillic (MacCyrillic)
+x-mac-ukrainian.title = Cyrillic/Ukrainian (MacUkrainian)
+koi8-r.title = Cyrillic (KOI8-R)
+koi8-u.title = Cyrillic/Ukrainian (KOI8-U)
+iso-8859-7.title = Greek (ISO-8859-7)
+windows-1253.title = Greek (Windows-1253)
+x-mac-greek.title = Greek (MacGreek)
+windows-1258.title = Vietnamese (Windows-1258)
+x-viet-tcvn5712.title = Vietnamese (TCVN)
+viscii.title = Vietnamese (VISCII)
+x-viet-vps.title = Vietnamese (VPS)
+tis-620.title = Thai (TIS-620)
+iso-8859-11.title = Thai (ISO-8859-11)
+windows-874.title = Thai (Windows-874)
+ibm874.title = Thai (IBM-874)
+armscii-8.title = Armenian (ARMSCII-8)
+iso-8859-6.title = Arabic (ISO-8859-6)
+iso-8859-6-i.title = Arabic (ISO-8859-6-I)
+iso-8859-6-e.title = Arabic (ISO-8859-6-E)
+iso-8859-8.title = Hebrew Visual (ISO-8859-8)
+iso-8859-8-i.title = Hebrew (ISO-8859-8-I)
+iso-8859-8-e.title = Hebrew (ISO-8859-8-E)
+windows-1255.title = Hebrew (Windows-1255)
+windows-1256.title = Arabic (Windows-1256)
+x-user-defined.title = User Defined
+ibm866.title = Cyrillic/Russian (CP-866)
+ibm850.title = Western (IBM-850)
+ibm852.title = Central European (IBM-852)
+ibm855.title = Cyrillic (IBM-855)
+ibm857.title = Turkish (IBM-857)
+ibm862.title = Hebrew (IBM-862)
+gb18030.title = Chinese Simplified (GB18030)
+x-mac-arabic.title = Arabic (MacArabic)
+x-mac-farsi.title = Farsi (MacFarsi)
+x-mac-hebrew.title = Hebrew (MacHebrew)
+x-mac-devanagari.title = Hindi (MacDevanagari)
+x-mac-gujarati.title = Gujarati (MacGujarati)
+x-mac-gurmukhi.title = Gurmukhi (MacGurmukhi)
+
+
+chardet.off.title                           = (Off)
+chardet.universal_charset_detector.title    = Universal
+chardet.ja_parallel_state_machine.title     = Japanese
+chardet.ko_parallel_state_machine.title     = Korean
+chardet.zhtw_parallel_state_machine.title   = Traditional Chinese
+chardet.zhcn_parallel_state_machine.title   = Simplified Chinese
+chardet.zh_parallel_state_machine.title     = Chinese
+chardet.cjk_parallel_state_machine.title    = East Asian
+chardet.ruprob.title                        = Russian
+chardet.ukprob.title                        = Ukrainian
--- a/mail/chrome/messenger/chat.properties
+++ b/mail/chrome/messenger/chat.properties
@@ -63,28 +63,20 @@ userIconFilePickerTitle=Select the new icon…
 chat.isTyping=is typing…
 chat.hasStoppedTyping=has stopped typing.
 # LOCALIZATION NOTE (chat.contactIsTyping, chat.contactHasStoppedTyping):
 #  These strings are displayed in a tooltip when hovering the status type icon.
 #  %S is replaced with the display name of the contact.
 chat.contactIsTyping=%S is typing.
 chat.contactHasStoppedTyping=%S has stopped typing.
 
-noTopic=No topic message for this room.
-
 # LOCALIZATION NOTE (unknownCommand):
 # This is shown when an unknown command (/foo) is attempted. %S is the command.
 unknownCommand=%S is not a supported command. Type /help to see the list of commands.
 
-# LOCALIZATION NOTE (buddytooltip.username, buddytooltip.account):
-# This is for the tooltip that appears when hovering
-# a contact or a conversation in the left pane.
-buddytooltip.username=Username
-buddytooltip.account=Account
-
 # LOCALIZATION NOTE (today, yesterday):
 # These 3 strings are used to display when previous conversations happened.
 # In 'today' and 'yesterday', %S is replaced with the time.
 today=Today %S
 yesterday=Yesterday %S
 # LOCALIZATION NOTE (dateTime):
 # %1$S is the date, %2$S is the date.
 dateTime=%1$S %2$S
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -61,31 +61,34 @@ downloadingMail=Downloading Mail for Off
 sendingUnsent=Sending Unsent Messages
 
 folderExists=A folder with that name already exists. Please enter a different name.
 # LOCALIZATION NOTE(confirmDuplicateFolderRename): %1$S is name of folder being moved, %2$S is parent folder name, %3$S is proposed new folder name
 confirmDuplicateFolderRename=A subfolder with the name '%1$S' already exists in the folder '%2$S'. Would you like to move this folder using the new name '%3$S'?
 folderCreationFailed=The folder could not be created because the folder name you specified contains an unrecognised character. Please enter a different name and try again.
 
 compactingFolder=Compacting folder %S…
-doneCompacting=Done compacting
+# LOCALIZATION NOTE(compactingDone): %1$S is the compaction gain.
+compactingDone=Done compacting (approx. %1$S saved).
 autoCompactAllFoldersTitle=Compact Folders
-autoCompactAllFolders=Do you wish to compact all local and offline folders to save disc space?
+# LOCALIZATION NOTE(autoCompactAllFoldersText): %1$S is the compaction gain.
+autoCompactAllFoldersText=Do you wish to compact all local and offline folders to save disc space? This will save about %1$S.
 autoCompactAlwaysAskCheckbox=Always ask me before compacting folders automatically
-compactNowButton=Compact &Now
+compactNowButton=Co&mpact Now
 
 confirmFolderDeletionForFilter=Deleting the folder '%S' will disable its associated filter(s). Are you sure you want to delete the folder?
 alertFilterChanged=Filters associated with this folder will be updated.
 filterDisabled=The folder '%S' could not be found, so filter(s) associated with this folder will be disabled. Verify that the folder exists, and that filters point to a valid destination folder.
 filterFolderDeniedLocked=The messages could not be filtered to folder '%S' because another operation is in progress.
 parsingFolderFailed=Unable to open the folder %S because it is in use by some other operation. Please wait for that operation to finish and then select the folder again. 
 deletingMsgsFailed=Unable to delete messages in folder %S because it is in use by some other operation. Please wait for that operation to finish and then try again.
 alertFilterCheckbox=Do not warn me again.
 compactFolderDeniedLock=The folder '%S' cannot be compacted because another operation is in progress. Please try again later.
 compactFolderWriteFailed=The folder '%S' could not be compacted because writing to folder failed. Verify that you have enough disc space, and that you have write privileges to the file system, then try again.
+filterFolderHdrAddFailed=The messages could not be filtered to folder '%S' because adding a message to it failed. Verify that the folder is displaying properly or try to repair it from the folder properties.
 filterFolderWriteFailed=The messages could not be filtered to folder '%S' because writing to folder failed. Verify that you have enough disc space, and that you have write privileges to the file system, then try again.
 copyMsgWriteFailed=The messages could not be moved or copied to folder '%S' because writing to folder failed. To gain disc space, from the File menu, first choose Empty Deleted, and then choose Compact Folders, and then try again.
 cantMoveMsgWOBodyOffline=While working offline, you cannot move or copy messages that were not downloaded for offline use. From the Mail window, open the File menu, choose Offline, then choose Work Online, and then try again.
 operationFailedFolderBusy=The operation failed because another operation is using the folder. Please wait for that operation to finish and then try again.
 folderRenameFailed=The folder could not be renamed. Perhaps the folder is being reparsed, or the new name is not a valid folder name.
 # LOCALIZATION NOTE(verboseFolderFormat): %1$S is folder name, %2$S is server name
 verboseFolderFormat=%1$S on %2$S
 # LOCALIZATION NOTE(filterFolderTruncateFailed): %1$S is replaced by the folder name, %2$S is replaced by the brandShortName
@@ -104,18 +107,16 @@ messageExpanded=Expanded
 messageCollapsed=Collapsed
 
 # Used in the SMTP Account Settings panel when a server value has no properties
 smtpServerList-NotSpecified=<not specified>
 smtpServer-ConnectionSecurityType-0=None
 smtpServer-ConnectionSecurityType-1=STARTTLS, if available
 smtpServer-ConnectionSecurityType-2=STARTTLS
 smtpServer-ConnectionSecurityType-3=SSL/TLS
-smtpServer-SecureAuthentication-Type-false=No
-smtpServer-SecureAuthentication-Type-true=Yes
 smtpServers-confirmServerDeletionTitle=Delete Server
 smtpServers-confirmServerDeletion=Are you sure you want to delete the server: \n %S?
 
 # Account Settings - Both Incoming and SMTP server
 authNo=No authentication
 authOld=Password, original method (insecure)
 authPasswordCleartextInsecurely=Password, transmitted insecurely
 authPasswordCleartextViaSSL=Normal password
--- a/mail/chrome/messenger/multimessageview.properties
+++ b/mail/chrome/messenger/multimessageview.properties
@@ -1,19 +1,39 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# LOCALIZATION NOTE (selectedNMessages, acrossNThreads): Semi-colon list of plural forms.
+# LOCALIZATION NOTE (numConversations): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/Localization_and_Plurals
+# The number of conversations (threads or solitary messages) selected. #1 is the
+# number of conversations.
+numConversations=#1 conversation; #1 conversations
+
+# LOCALIZATION NOTE (numMessages): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/Localization_and_Plurals
+# The number of messages in a thread. #1 is the number of messages.
+numMessages=#1 message;#1 messages
+
+# LOCALIZATION NOTE (numUnread): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/Localization_and_Plurals
-# #1 number of threads or solitary messages selected
-# example: 4 conversations
-NConversations=#1 conversation; #1 conversations
+# The number of unread messages in a thread; meant to be appended to
+# "numMessages". #1 is the number of unread messages.
+numUnread=, #1 unread;, #1 unread
 
-numMsgs=#1 message;#1 messages
-countUnread=, #1 unread;, #1 unread
-ignoredCount=#1 ignored;#1 ignored
+# LOCALIZATION NOTE (numIgnored): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/Localization_and_Plurals
+# The number of ignored messages in a thread; meant to be appended to
+# "numMessages". #1 is the number of ignored messages.
+numIgnored=, #1 ignored;, #1 ignored
 
+# LOCALIZATION NOTE (noSubject): What to display for a message if it has no
+# subject.
 noSubject=(no subject)
 
-# thread and multiple message selection summaries
-messagesSize=These messages take up: #1 #2.
-noticeText= (Note: #1 messages are selected, the first #2 are shown)
+# LOCALIZATION NOTE (messagesTotalSize): A message indicating the total size on
+# disk of the selected messages. #1 is the size, e.g. "123 KB".
+messagesTotalSize=These messages take up #1.
+
+# LOCALIZATION NOTE (maxCountExceeded): A message to let the user know that not
+# all of the selected messages were summarized. #1 is the total number of
+# messages selected and #2 is the number of messages actually shown.
+maxCountExceeded= (Note: #1 messages are selected, the first #2 are shown)
--- a/mail/chrome/overrides/netError.dtd
+++ b/mail/chrome/overrides/netError.dtd
@@ -128,20 +128,20 @@
 <ul>
   <li>Check to make sure your system has the Personal Security Manager
     installed.</li>
   <li>This might be due to a non-standard configuration on the server.</li>
 </ul>
 ">
 
 <!ENTITY nssFailure2.title "Secure connection failed">
-<!ENTITY nssFailure2.longDesc "
+<!ENTITY nssFailure2.longDesc2 "
 <ul>
-  <li>The page you are trying to view cannot be shown because the authenticity of the received data could not be verified.</li>
-  <li>Please contact the website owners to inform them of this problem.</li>
+  <li>The page you are trying to view can not be shown because the authenticity of the received data could not be verified.</li>
+  <li>Please contact the web site owners to inform them of this problem.</li>
 </ul>
 ">
 
 <!ENTITY nssBadCert.title "Secure connection failed">
 <!ENTITY nssBadCert.longDesc2 "
 <ul>
   <li>This could be a problem with the server's configuration, or it could be
 someone trying to impersonate the server.</li>