[l10n-gl] copying files from the repository l10n-central to l10n-mozilla-aurora for tb_aurora
authorEnrique Estévez Fernández <eu@keko.me>
Wed, 28 Sep 2011 19:43:26 +0200
changeset 125 1e330a249c053cbf8b01771a6a9b293110b5ca87
parent 124 d61ca54b15349af6296df4765e72c5935dd4f129
child 126 bc823ea66b779a8f1d357c2462198383f82d6307
push id28
push usereu@keko.me
push dateWed, 28 Sep 2011 17:43:51 +0000
[l10n-gl] copying files from the repository l10n-central to l10n-mozilla-aurora for tb_aurora
editor/ui/chrome/composer/editorOverlay.dtd
editor/ui/chrome/dialogs/EditorImageProperties.dtd
mail/chrome/messenger/AccountWizard.dtd
mail/chrome/messenger/addressbook/abDirTreeOverlay.dtd
mail/chrome/messenger/addressbook/abMainWindow.dtd
mail/chrome/messenger/am-main.dtd
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/messengercompose/composeMsgs.properties
mail/chrome/messenger/messengercompose/messengercompose.dtd
mail/chrome/messenger/msgHdrViewOverlay.dtd
mail/chrome/messenger/multimessageview.dtd
mail/chrome/messenger/preferences/advanced.dtd
mail/chrome/messenger/telemetry.properties
mail/feedback/main.dtd
mail/feedback/main.properties
mail/installer/custom.properties
--- a/editor/ui/chrome/composer/editorOverlay.dtd
+++ b/editor/ui/chrome/composer/editorOverlay.dtd
@@ -63,21 +63,16 @@
 
 <!ENTITY publishCmd.label "Publicar">
 <!ENTITY publishCmd.accesskey "b">
 <!ENTITY publishCmd.key "S">
 <!ENTITY publishAsCmd.label "Publicar como…">
 <!ENTITY publishAsCmd.accesskey "b">
 <!ENTITY saveAsChangeEncodingCmd.label "Gardar e modificar a codificación de caracteres">
 <!ENTITY saveAsChangeEncodingCmd.accesskey "m">
-<!ENTITY printSetupCmd.label "Configuración da páxina…">
-<!ENTITY printSetupCmd.accesskey "u">
-<!ENTITY printCmd.label "Imprimir…">
-<!ENTITY printCmd.accesskey "I">
-<!ENTITY printCmd.key "P">
 
 <!-- Edit menu items -->
 <!ENTITY editMenu.label "Editar">
 <!ENTITY editMenu.accesskey "E">
 <!ENTITY pasteNoFormatting.label "Pegar sen formato">
 <!ENTITY pasteNoFormatting.accesskey "r">
 <!ENTITY pasteNoFormatting.key "V">
 <!ENTITY pasteAs.label "Pegar como">
--- a/editor/ui/chrome/dialogs/EditorImageProperties.dtd
+++ b/editor/ui/chrome/dialogs/EditorImageProperties.dtd
@@ -96,15 +96,18 @@
 <!ENTITY topBottomEditField.label "Parte superior e inferior:">
 <!ENTITY topBottomEditField.accessKey "s">
 <!ENTITY borderEditField.label "Bordo sólido:">
 <!ENTITY borderEditField.accessKey "B">
 
 <!-- These controls are in the Link Box -->
 <!ENTITY showImageLinkBorder.label "Mostrar bordo arredor da imaxe ligada">
 <!ENTITY showImageLinkBorder.accessKey "M">
+<!ENTITY LinkAdvancedEditButton.label "Edición avanzada da ligazón…">
+<!ENTITY LinkAdvancedEditButton.accessKey "l">
+<!ENTITY LinkAdvancedEditButton.tooltip "Engade ou modifica atributos HTML, atributos de estilo, e JavaScript">
 
 <!-- These tabs are currently used in the image input dialog -->
 <!ENTITY imageInputTab.label "Formulario">
 <!ENTITY imageLocationTab.label "Localización">
 <!ENTITY imageDimensionsTab.label "Dimensións">
 <!ENTITY imageAppearanceTab.label "Aparencia">
 <!ENTITY imageLinkTab.label "Ligazón">
--- a/mail/chrome/messenger/AccountWizard.dtd
+++ b/mail/chrome/messenger/AccountWizard.dtd
@@ -1,18 +1,18 @@
 <!-- Entities for AccountWizard -->
 
 <!ENTITY windowTitle.label "Asistente de contas">
 <!ENTITY accountWizard.size "width: 45em; height: 38em;">
 
 <!-- Entities for Account Type page -->
 
-<!ENTITY accountSetupInfo.label "Para poder recibir mensaxes, primeiro ten que configurar unha conta de correo ou de grupo de noticias.">
+<!ENTITY accountSetupInfo2.label "Para poder recibir mensaxes, primeiro ten que configurar unha conta.">
 <!ENTITY accountTypeTitle.label "Configuración de nova conta">
-<!ENTITY accountTypeDesc.label "Este asistente recompila información necesaria para configurar unha conta de correo ou de grupo de noticias. Se descoñece parte da información contacte co administrador do sistema ou co fornecedor do servizo de Internet.">
+<!ENTITY accountTypeDesc2.label "Este asistente recompila información necesaria para configurar unha conta. Se descoñece parte da información contacte co administrador do sistema ou co fornecedor do servizo de Internet.">
 <!ENTITY accountTypeDirections.label "Seleccione o tipo de conta que desexa configurar:">
 <!ENTITY accountTypeMail.label "Conta de correo">
 <!ENTITY accountTypeMail.accesskey "c">
 <!ENTITY accountTypeNews.label "Conta de grupo de noticias">
 <!ENTITY accountTypeNews.accesskey "n">
 
 <!-- Entities for Identity page -->
 
deleted file mode 100644
--- a/mail/chrome/messenger/addressbook/abDirTreeOverlay.dtd
+++ /dev/null
@@ -1,37 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is Mozilla Communicator client code, released
- March 31, 1998.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corporation.
- Portions created by the Initial Developer are Copyright (C) 1998-1999
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
-
- Alternatively, the contents of this file may be used under the terms of
- either the GNU General Public License Version 2 or later (the "GPL"), or
- the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL or the LGPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** -->
-<!ENTITY dirTreeHeader.label               "Axendas de enderezos">  
--- a/mail/chrome/messenger/addressbook/abMainWindow.dtd
+++ b/mail/chrome/messenger/addressbook/abMainWindow.dtd
@@ -74,16 +74,18 @@
 <!ENTITY propertiesCmd.accesskey                        "p">
 <!ENTITY propertiesCmd.key                              "i">
 
 <!-- View Menu -->
 <!ENTITY viewMenu.label                                 "Ver">
 <!ENTITY viewMenu.accesskey                             "V">
 <!ENTITY viewToolbarsMenu.label                         "Barras de ferramentas">
 <!ENTITY viewToolbarsMenu.accesskey                     "t"> 
+<!ENTITY menubarCmd.label                               "Barra de menú">
+<!ENTITY menubarCmd.accesskey                           "m">
 <!ENTITY showAbToolbarCmd.label                         "Barra da axenda de enderezos">
 <!ENTITY showAbToolbarCmd.accesskey                     "o">
 <!ENTITY showTaskbarCmd.label                           "Barra de estado">
 <!ENTITY showTaskbarCmd.accesskey                       "d">
 <!ENTITY customizeToolbar.label                         "Personalizar…">
 <!ENTITY customizeToolbar.accesskey                     "z">
 <!ENTITY showContactPane.label                          "Panel resumo do contacto">
 <!ENTITY showContactPane.accesskey                      "c">
--- a/mail/chrome/messenger/am-main.dtd
+++ b/mail/chrome/messenger/am-main.dtd
@@ -6,16 +6,17 @@
 <!ENTITY identityTitle.label "Identidade predefinida">
 <!ENTITY identityDesc.label "Cada conta dispón dunha identidade que é a información que ven as persoas cando len as súas mensaxes.">
 <!ENTITY name.label "O seu nome:">
 <!ENTITY name.accesskey "u">
 <!ENTITY email.label "Enderezo de correo:">
 <!ENTITY email.accesskey "z">
 <!ENTITY replyTo.label "Enderezo de resposta:">
 <!ENTITY replyTo.accesskey "r">
+<!ENTITY replyTo.placeholder "Os destinatarios responderán a estoutro enderezo">
 <!ENTITY organization.label "Organización">
 <!ENTITY organization.accesskey "g">
 <!ENTITY signatureText.label "Texto da sinatura:">
 <!ENTITY signatureText.accesskey "x">
 <!ENTITY signatureHtml.label "Usar HTML (p.ex., &lt;b&gt;negra&lt;/b&gt;)">
 <!ENTITY signatureHtml.accesskey "L">
 <!ENTITY signatureFile.label "Anexar a sinatura desde un ficheiro (texto, HTML, ou imaxe):">
 <!ENTITY signatureFile.accesskey "t">
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -117,16 +117,18 @@
 <!ENTITY undoMarkAllCmd.label "Desfacer Marcar todo como lido">
 <!ENTITY redoMarkAllCmd.label "Refacer Marcar todo como lido">
 <!ENTITY undoDefaultCmd.label "Desfacer">
 <!ENTITY undoDefaultCmd.accesskey "D">
 <!ENTITY redoDefaultCmd.label "Refacer">
 <!ENTITY redoDefaultCmd.accesskey "R">
 
 <!-- View Menu -->
+<!ENTITY menubarCmd.label "Barra de menú">
+<!ENTITY menubarCmd.accesskey "m">
 <!ENTITY showMessengerToolbarCmd.label "Barra de ferramentas do correo">
 <!ENTITY showMessengerToolbarCmd.accesskey "B">
 <!ENTITY customizeToolbar.label "Personalizar…">
 <!ENTITY customizeToolbar.accesskey "z">
 
 <!ENTITY messagePaneLayoutStyle.label "Deseño">
 <!ENTITY messagePaneLayoutStyle.accesskey "D">
 <!ENTITY messagePaneClassic.label "Visualización clásica">
@@ -267,16 +269,18 @@ you can use these alternative items. Oth
 <!ENTITY fullZoomToggleCmd.label        "Ampliar só o texto">
 <!ENTITY fullZoomToggleCmd.accesskey    "t">
 <!ENTITY fullZoom.label                 "Zoom">
 <!ENTITY fullZoom.accesskey             "Z">
 
 <!ENTITY pageSourceCmd.label "Código fonte da mensaxe">
 <!ENTITY pageSourceCmd.accesskey "d">
 <!ENTITY pageSourceCmd.key "u">
+<!ENTITY getNewMessagesCmd.key "y">
+<!ENTITY getAllNewMessagesCmd.key "Y">
 
 <!-- Search Menu -->
 <!ENTITY findMenu.label "Localizar">
 <!ENTITY findMenu.accesskey "L">
 <!ENTITY findCmd.label "Localizar nesta mensaxe…">
 <!ENTITY findCmd.accesskey "n">
 <!ENTITY findCmd.key "f">
 <!ENTITY findAgainCmd.label "Localizar de novo">
@@ -496,22 +500,24 @@ you can use these alternative items. Oth
 <!ENTITY replyListButton.label "Responder á lista">
 <!ENTITY forwardButton.label "Reencamiñar">
 <!ENTITY fileButton.label "Ficheiro">
 <!ENTITY archiveButton.label "Arquivar">
 <!ENTITY nextButton.label "Seguinte">
 <!ENTITY previousButton.label "Anterior">
 <!ENTITY backButton1.label "Atrás">
 <!ENTITY goForwardButton1.label "Adiante">
+<!ENTITY deleteItem.title "Borrar">
 <!ENTITY deleteButton.label "Borrar">
 <!ENTITY undeleteButton.label "Desfacer Eliminar">
 <!ENTITY markButton.label "Marcar">
 <!ENTITY printButton.label "Imprimir">
 <!ENTITY stopButton.label "Deter">
 <!ENTITY throbberItem.title "Indicador de actividade">
+<!ENTITY junkItem.title "Correo lixo">
 <!ENTITY junkButton.label "Correo lixo">
 <!ENTITY notJunkButton.label "Non é lixo">
 <!ENTITY addressBookButton.label "Axenda de enderezos">
 <!ENTITY glodaSearch.title "Busca global">
 <!ENTITY searchItem.title "Busca rápida">
 <!ENTITY mailViewsToolbarItem.title "Visualizacións das mensaxes">
 <!ENTITY folderLocationToolbarItem.title "Localización do cartafol">
 <!ENTITY tagButton.label "Etiqueta">
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -354,21 +354,16 @@ attachmentCountSingle=1 anexo:
 # size of all attachments when none of the attachments' sizes can be detected.
 attachmentSizeUnknown=tamaño descoñecido
 
 # LOCALIZATION NOTE (attachmentSizeAtLeast): The string to show for the total
 # size of all attachments when at least one (but not all) of the attachments'
 # sizes can't be detected. %1$S is the formatted size.
 attachmentSizeAtLeast=polo menos %1$S
 
-# LOCALIZATION NOTE (attachmentNameAndSize): This is the format for a single
-# item in the attachment list. %1$S is the attachment's filename, and %2$S is
-# the attachment's size
-attachmentNameAndSize=%1$S (%2$S)
-
 # This is the format for prepending accesskeys to the
 # each of the attachments in the file|attachments menu:
 #   ie: 1 file.txt
 #       2 another file.txt
 attachmentDisplayNameFormat=%S %S
 
 # This is the heading for the attachment summary when printing an email
 attachmentsPrintHeader=Anexos:
@@ -694,8 +689,30 @@ update.resumeButton.accesskey=d
 update.openUpdateUI.applyButton.label=Aplicar actualización…
 update.openUpdateUI.applyButton.accesskey=A
 update.restart.applyButton.label=Aplicar actualización
 update.restart.applyButton.accesskey=A
 update.openUpdateUI.upgradeButton.label=Anovar agora…
 update.openUpdateUI.upgradeButton.accesskey=v
 update.restart.upgradeButton.label=Anovar agora
 update.restart.upgradeButton.accesskey=v
+
+# missing plugin installer
+missingpluginsMessage.title=Precísanse engadidos adicionais para mostrar todos os elementos desta páxina.
+missingpluginsMessage.button.label=Instalar os engadidos necesarios…
+missingpluginsMessage.button.accesskey=I
+outdatedpluginsMessage.title=Algúns dos engadidos que usa esta páxina están desactualizados.
+outdatedpluginsMessage.updateButton.label=Actualizar engadidos…
+outdatedpluginsMessage.updateButton.accesskey=u
+blockedpluginsMessage.title=Por motivos de seguranza bloqueáronse algúns engadidos requiridos por esta páxina.
+blockedpluginsMessage.infoButton.label=Detalles…
+blockedpluginsMessage.infoButton.accesskey=D
+blockedpluginsMessage.searchButton.label=Actualizar engadidos…
+blockedpluginsMessage.searchButton.accesskey=u
+crashedpluginsMessage.title=Fallou o engadido %S.
+crashedpluginsMessage.reloadButton.label=Recargar a páxina
+crashedpluginsMessage.reloadButton.accesskey=R
+crashedpluginsMessage.submitButton.label=Enviar un informe de falla
+crashedpluginsMessage.submitButton.accesskey=E
+crashedpluginsMessage.learnMore=Obter máis información…
+carbonFailurePluginsMessage.message=Esta páxina necesita usar un engadido que só se pode executar en modo 32-bits.restartButton.label=Reiniciar en modo 32-bits
+carbonFailurePluginsMessage.restartButton.label=Reiniciar en modo 32-bits
+carbonFailurePluginsMessage.restartButton.accesskey=R
--- a/mail/chrome/messenger/messengercompose/composeMsgs.properties
+++ b/mail/chrome/messenger/messengercompose/composeMsgs.properties
@@ -298,21 +298,16 @@ messageAttachmentSafeName=Mensaxe anexad
 ## String used for attachment pretty name, when attachment is message part
 partAttachmentSafeName=Parte da mensaxe anexada
 
 # LOCALIZATION NOTE (attachmentCount): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/Localization_and_Plurals
 # #1 number of attachments
 attachmentCount=#1 anexo;#1 anexos
 
-# LOCALIZATION NOTE (attachmentNameAndSize): This is the format for a single
-# item in the attachment list. %1$S is the attachment's filename, and %2$S is
-# the attachment's size
-attachmentNameAndSize=%1$S (%2$S)
-
 ## String used by the Initialization Error dialog
 initErrorDlogTitle=Edición da mensaxe
 initErrorDlgMessage=Produciuse un erro ao crear a xanela de edición da mensaxe. Tente de novo.
 
 ## String used if a file to attach does not exist when passed as
 ## a command line argument
 errorFileAttachTitle=Anexar ficheiro
 ## LOCALIZATION NOTE (errorFileAttachMessage): %1$S will be replaced by the non-existent file name. Do not translate
--- a/mail/chrome/messenger/messengercompose/messengercompose.dtd
+++ b/mail/chrome/messenger/messengercompose/messengercompose.dtd
@@ -87,16 +87,18 @@
 <!ENTITY findPrevCmd.key2 "VK_F3">
 <!ENTITY findPrevCmd.accesskey "a"> 
 
 <!-- View Menu -->
 <!ENTITY viewMenu.label "Ver"> 
 <!ENTITY viewMenu.accesskey "V">
 <!ENTITY viewToolbarsMenuNew.label "Barras de ferramentas"> 
 <!ENTITY viewToolbarsMenuNew.accesskey "B"> 
+<!ENTITY menubarCmd.label "Barra de menú">
+<!ENTITY menubarCmd.accesskey "m">
 <!ENTITY showCompositionToolbarCmd.label "Barra de ferramentas do Composer">
 <!ENTITY showCompositionToolbarCmd.accesskey "C">
 <!ENTITY showFormattingBarCmd.label "Barra de formatado">
 <!ENTITY showFormattingBarCmd.accesskey "o">
 <!ENTITY showTaskbarCmd.label "Barra de estado">
 <!ENTITY showTaskbarCmd.accesskey "d">
 <!ENTITY customizeToolbar.label "Personalizar…">
 <!ENTITY customizeToolbar.accesskey "s">
--- a/mail/chrome/messenger/msgHdrViewOverlay.dtd
+++ b/mail/chrome/messenger/msgHdrViewOverlay.dtd
@@ -30,80 +30,79 @@
  use your version of this file under the terms of the MPL, indicate your
  decision by deleting the provisions above and replace them with the notice
  and other provisions required by the GPL or the LGPL. If you do not delete
  the provisions above, a recipient may use your version of this file under
  the terms of any one of the MPL, the GPL or the LGPL.
 
  ***** END LICENSE BLOCK ***** -->
 
-<!ENTITY toField2.label "Para: ">
-<!ENTITY fromField2.label "De: ">
-<!ENTITY senderField2.label "Remitente: ">
-<!ENTITY organizationField2.label "Organización: ">
-<!ENTITY replyToField2.label "Responder a: ">
+<!ENTITY toField3.label "Para ">
+<!ENTITY fromField3.label "De ">
+<!ENTITY senderField3.label "Remitente ">
+<!ENTITY organizationField3.label "Organización ">
+<!ENTITY replyToField3.label "Responder a ">
 
-<!ENTITY subjectField2.label "Asunto: ">
-<!--# LOCALIZATION NOTE (ccField2.label): DONT_TRANSLATE -->
-<!ENTITY ccField2.label "CC: ">
-<!ENTITY bccField2.label "CCO: ">
-<!ENTITY newsgroupsField2.label "Grupos de noticias: ">
-<!ENTITY followupToField2.label "Seguimento a: ">
-<!ENTITY tagsHdr2.label "Etiquetas: ">
-<!ENTITY dateField2.label "Data: ">
-<!ENTITY userAgentField2.label "user-agent ">
-<!ENTITY referencesField2.label "Referencias: ">
-<!ENTITY messageIdField2.label "ID da mensaxe ">
-<!ENTITY inReplyToField2.label "En resposta a: ">
-<!ENTITY originalWebsite2.label "Sitio web: ">
+<!ENTITY subjectField3.label "Asunto ">
+<!ENTITY ccField3.label "CC ">
+<!ENTITY bccField3.label "CCO ">
+<!ENTITY newsgroupsField3.label "Grupos de noticias ">
+<!ENTITY followupToField3.label "Seguimento a ">
+<!ENTITY tagsHdr3.label "Etiquetas ">
+<!ENTITY dateField3.label "Data ">
+<!ENTITY userAgentField3.label "User gent ">
+<!ENTITY referencesField3.label "Referencias ">
+<!ENTITY messageIdField3.label "ID da mensaxe ">
+<!ENTITY inReplyToField3.label "En resposta a ">
+<!ENTITY originalWebsite3.label "Sitio web ">
 
 <!ENTITY editMessageDescription.label "Isto é un borrador">
 <!ENTITY editMessageButton.label "Editar…">
-<!ENTITY hdrArchiveButton.label "arquivar">
-<!ENTITY hdrArchiveButton.tooltip "arquivar esta mensaxe">
-<!ENTITY hdrSmartReplyButton.label "resposta intelixente">
-<!ENTITY hdrReplyButton.label "responder">
-<!ENTITY hdrReplyButton.tooltip "responder a esta mensaxe">
-<!ENTITY hdrReplyAllButton.label "responder a todos">
-<!ENTITY hdrReplyAllButton.tooltip "responder ao remitente e a todos os destinatarios">
-<!ENTITY hdrReplyListButton.label "responder á lista">
-<!ENTITY hdrReplyListButton.tooltip "responder á lista de correo">
-<!ENTITY hdrForwardButton.label "reencamiñar">
-<!ENTITY hdrForwardButton.tooltip "reencamiñar esta mensaxe">
-<!ENTITY hdrJunkButton.label "lixo">
-<!ENTITY hdrJunkButton.tooltip "marcar esta mensaxe como lixo">
-<!ENTITY hdrTrashButton.label "eliminar">
-<!ENTITY hdrTrashButton.tooltip "eliminar esta mensaxe">
+<!ENTITY hdrArchiveButton1.label "Arquivar">
+<!ENTITY hdrArchiveButton1.tooltip "Arquivar esta mensaxe">
+<!ENTITY hdrSmartReplyButton1.label "Resposta intelixente">
+<!ENTITY hdrReplyButton1.label "Responder">
+<!ENTITY hdrReplyButton1.tooltip "Responder a esta mensaxe">
+<!ENTITY hdrReplyAllButton1.label "Responder a todos">
+<!ENTITY hdrReplyAllButton1.tooltip "Responder ao remitente e a todos os destinatarios">
+<!ENTITY hdrReplyListButton1.label "Responder á lista">
+<!ENTITY hdrReplyListButton1.tooltip "Responder á lista de correo">
+<!ENTITY hdrForwardButton1.label "Reencamiñar">
+<!ENTITY hdrForwardButton1.tooltip "Reencamiñar esta mensaxe">
+<!ENTITY hdrJunkButton1.label "Lixo">
+<!ENTITY hdrJunkButton1.tooltip "Marcar esta mensaxe como lixo">
+<!ENTITY hdrTrashButton1.label "Eliminar">
+<!ENTITY hdrTrashButton1.tooltip "Eliminar esta mensaxe">
 
 <!ENTITY hdrViewToolbarShowFull.label "Mostrar iconas e texto">
 <!ENTITY hdrViewToolbarShowFull.accesskey "M">
 <!ENTITY hdrViewToolbarShowIcons.label "Mostrar só as iconas">
 <!ENTITY hdrViewToolbarShowIcons.accesskey "i">
 <!ENTITY hdrViewToolbarShowText.label "Mostrar só o texto">
 <!ENTITY hdrViewToolbarShowText.accesskey "t">
 <!ENTITY hdrViewToolbarAlwaysReplySender.label "Mostrar sempre Responder ao remitente">
 <!ENTITY hdrViewToolbarAlwaysReplySender.accesskey "R">
 
-<!ENTITY otherActionsButton.label "outras accións">
-<!ENTITY otherActionsOpenConversation.label "abrir na conversación">
-<!ENTITY otherActionsOpenConversation.accesskey "c">
-<!ENTITY otherActionsOpenInNewWindow.label "abrir nunha nova xanela">
-<!ENTITY otherActionsOpenInNewWindow.accesskey "x">
-<!ENTITY otherActionsOpenInNewTab.label "abrir nunha nova lapela">
-<!ENTITY otherActionsOpenInNewTab.accesskey "h">
-<!ENTITY markAsReadMenuItem.label "marcar como lido">
-<!ENTITY markAsReadMenuItem.accesskey "l">
-<!ENTITY markAsUnreadMenuItem.label "marcar como non lido">
-<!ENTITY markAsUnreadMenuItem.accesskey "n">
-<!ENTITY saveAsMenuItem.label "gardar como…">
-<!ENTITY saveAsMenuItem.accesskey "g">
-<!ENTITY viewSourceMenuItem.label "ver fonte…">
-<!ENTITY viewSourceMenuItem.accesskey "v">
-<!ENTITY otherActionsPrint.label "imprimir…">
-<!ENTITY otherActionsPrint.accesskey "p">
+<!ENTITY otherActionsButton1.label "Outras accións">
+<!ENTITY otherActionsOpenConversation1.label "Abrir na conversación">
+<!ENTITY otherActionsOpenConversation1.accesskey "c">
+<!ENTITY otherActionsOpenInNewWindow1.label "Abrir nunha nova xanela">
+<!ENTITY otherActionsOpenInNewWindow1.accesskey "x">
+<!ENTITY otherActionsOpenInNewTab1.label "Abrir nunha nova lapela">
+<!ENTITY otherActionsOpenInNewTab1.accesskey "h">
+<!ENTITY markAsReadMenuItem1.label "Marcar como lido">
+<!ENTITY markAsReadMenuItem1.accesskey "l">
+<!ENTITY markAsUnreadMenuItem1.label "Marcar como non lido">
+<!ENTITY markAsUnreadMenuItem1.accesskey "n">
+<!ENTITY saveAsMenuItem1.label "Gardar como…">
+<!ENTITY saveAsMenuItem1.accesskey "G">
+<!ENTITY viewSourceMenuItem1.label "Ver fonte…">
+<!ENTITY viewSourceMenuItem1.accesskey "V">
+<!ENTITY otherActionsPrint1.label "Imprimir…">
+<!ENTITY otherActionsPrint1.accesskey "p">
 
 <!-- Attachment context menu items -->
 <!ENTITY openAttachmentCmd.label    "Abrir">
 <!ENTITY openAttachmentCmd.accesskey    "b">
 <!ENTITY saveAsAttachmentCmd.label    "Gardar como…">
 <!ENTITY saveAsAttachmentCmd.accesskey    "a">
 <!ENTITY detachAttachmentCmd.label    "Desanexar…">
 <!ENTITY detachAttachmentCmd.accesskey    "x">
@@ -114,35 +113,19 @@
 <!ENTITY saveAllAttachmentsCmd.label    "Gardar todo…">
 <!ENTITY saveAllAttachmentsCmd.accesskey    "G">
 <!ENTITY detachAllAttachmentsCmd.label    "Desanexar todo…">
 <!ENTITY detachAllAttachmentsCmd.accesskey    "D">
 <!ENTITY deleteAllAttachmentsCmd.label    "Borrar todo…">
 <!ENTITY deleteAllAttachmentsCmd.accesskey    "r">
 
 <!-- Attachment toolbar items -->
-<!ENTITY saveAttachmentButton.label       "gardar">
-<!ENTITY saveAttachmentButton.tooltip     "gardar o ficheiro anexado">
-<!ENTITY saveAllAttachmentsButton.label   "gardar todo">
-<!ENTITY saveAllAttachmentsButton.tooltip "gardar todos os ficheiros anexados">
-<!ENTITY openAttachmentMenuItem.label     "abrir">
-<!ENTITY openAttachmentMenuItem.accesskey    "b">
-<!ENTITY saveAsAttachmentMenuItem.label    "gardar como…">
-<!ENTITY saveAsAttachmentMenuItem.accesskey    "g">
-<!ENTITY detachAttachmentMenuItem.label    "desanexar…">
-<!ENTITY detachAttachmentMenuItem.accesskey    "d">
-<!ENTITY deleteAttachmentMenuItem.label    "borrar">
-<!ENTITY deleteAttachmentMenuItem.accesskey    "o">
-<!ENTITY openAllAttachmentsMenuItem.label    "abrir todo…">
-<!ENTITY openAllAttachmentsMenuItem.accesskey    "t">
-<!ENTITY saveAllAttachmentsMenuItem.label    "gardar todo…">
-<!ENTITY saveAllAttachmentsMenuItem.accesskey    "g">
-<!ENTITY detachAllAttachmentsMenuItem.label    "desanexar todo…">
-<!ENTITY detachAllAttachmentsMenuItem.accesskey    "d">
-<!ENTITY deleteAllAttachmentsMenuItem.label    "borrar todo…">
-<!ENTITY deleteAllAttachmentsMenuItem.accesskey    "o">
+<!ENTITY saveAttachmentButton1.label       "Gardar">
+<!ENTITY saveAttachmentButton1.tooltip     "Gardar o ficheiro anexado">
+<!ENTITY saveAllAttachmentsButton1.label   "Gardar todo">
+<!ENTITY saveAllAttachmentsButton1.tooltip "Gardar todos os ficheiros anexados">
 
 <!ENTITY copyLinkCmd.label        "Copiar a localización da ligazón">
 <!ENTITY copyLinkCmd.accesskey    "C">
 
 <!ENTITY CopyMessageId.label "Copiar o ID da mensaxe">
 <!ENTITY OpenMessageForMsgId.label "Abrir mensaxe por ID">
 <!ENTITY OpenBrowserWithMsgId.label "Abrir navegador co ID da mensaxe">
--- a/mail/chrome/messenger/multimessageview.dtd
+++ b/mail/chrome/messenger/multimessageview.dtd
@@ -1,4 +1,4 @@
 <!ENTITY window.title             "Resumo das mensaxes">
 <!ENTITY selectedmessages.label   "Mensaxes seleccionadas">
-<!ENTITY archive.label            "arquivar">
-<!ENTITY delete.label             "eliminar">
+<!ENTITY archiveButton.label      "Arquivar">
+<!ENTITY deleteButton.label       "Eliminar">
--- a/mail/chrome/messenger/preferences/advanced.dtd
+++ b/mail/chrome/messenger/preferences/advanced.dtd
@@ -1,16 +1,19 @@
 <!ENTITY itemGeneral.label       "Xeral">
 <!ENTITY itemDisplay.label       "Lectura e visualización">
 <!ENTITY itemUpdate.label        "Actualizar">
 <!ENTITY itemNetworking.label    "Rede e espazo no disco">
 <!ENTITY itemCertificates.label  "Certificados">
 
 <!-- General Settings -->
 
+<!ENTITY submitTelemetry.label         "Enviar os datos de rendemento">
+<!ENTITY submitTelemetry.accesskey     "t">
+<!ENTITY telemetryInfoLink.label       "Máis información sobre Telemetry">
 <!ENTITY enableGlodaSearch.label       "Activar indexador de mensaxes">
 <!ENTITY enableGlodaSearch.accesskey   "i">
 <!ENTITY systemIntegration.label       "Integración co sistema">
 <!ENTITY alwaysCheckDefault.label      "Sempre comprobar se &brandShortName; é o navegador predefinido no inicio">
 <!ENTITY alwaysCheckDefault.accesskey  "a">
 <!ENTITY searchIntegration.label       "Permitir que &searchIntegration.engineName; busque nas mensaxes">
 <!ENTITY searchIntegration.accesskey   "P">
 <!ENTITY checkNow.label                "Comprobar agora">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/telemetry.properties
@@ -0,0 +1,9 @@
+# Telemetry prompt
+# LOCALIZATION NOTE (telemetryText): %1$S will be replaced by brandFullName,
+# and %2$S by the value of the toolkit.telemetry.server_owner preference.
+telemetryText = Desexa axudar a mellorar %1$S informando de forma automática do uso de memoria, do rendemento e a capacidade de resposta a %2$S?
+telemetryLinkLabel = Obter máis información
+telemetryYesButtonLabel = Si
+telemetryYesButtonAccessKey = S
+telemetryNoButtonLabel = Non
+telemetryNoButtonAccessKey = N
new file mode 100644
--- /dev/null
+++ b/mail/feedback/main.dtd
@@ -0,0 +1,36 @@
+<!ENTITY testpilot.brand.label                          "Test Pilot">
+<!-- browser window: menu and status bar -->
+<!ENTITY testpilot.settings.label                       "Configuración">
+<!ENTITY testpilot.settings.dataSubmission.label        "Datos enviados">
+<!ENTITY testpilot.settings.notifications.label         "Notificacións">
+<!ENTITY testpilot.settings.notifyWhen.label            "Avisarme cando…">
+<!ENTITY testpilot.settings.readyToSubmit.label         "Un estudio estea preparado para enviarse">
+<!ENTITY testpilot.settings.newStudy.label              "Haxa un novo estudio">
+<!ENTITY testpilot.settings.hasNewResults.label         "Un estudio teña novos resultados">
+<!ENTITY testpilot.settings.alwaysSubmitData.shortLabel "Sempre enviar os meus datos (sen preguntarme)">
+<!ENTITY testpilot.allYourStudies.label                 "Todos os seus estudios de usuario…">
+<!ENTITY testpilot.about.label                          "Sobre o Test Pilot">
+
+<!-- all studies window -->
+<!ENTITY testpilot.studiesWindow.title                  "Os seus estudios de Test Pilot">
+<!ENTITY testpilot.studiesWindow.currentStudies.label   "Estudios actuais">
+<!ENTITY testpilot.studiesWindow.finishedStudies.label  "Estudios rematados">
+<!ENTITY testpilot.studiesWindow.studyFindings.label    "Resultados do estudio">
+<!ENTITY testpilot.studiesWindow.settings.label         "Configuración">
+<!ENTITY testpilot.studiesWindow.stillLoadingMessage    "Cargando, agarde…">
+
+<!-- raw data dialog -->
+<!ENTITY testpilot.rawDataWindow.title                  "Test Pilot: Datos en bruto">
+
+<!-- notification -->
+<!ENTITY testpilot.notification.close.tooltip           "Pechar">
+
+<!-- Firefox 4 beta version UI -->
+<!ENTITY testpilot.enable.label                         "Activar estudios de usuario">
+<!ENTITY testpilot.feedbackbutton.label                 "Opinión">
+<!ENTITY testpilot.happy.label                          "Gústame Firefox porque…">
+<!ENTITY testpilot.sad.label                            "Non me gusta Firefox porque…">
+<!ENTITY testpilot.happy.thunderbirdLabel               "Gústame Thunderbird porque…">
+<!ENTITY testpilot.sad.thunderbirdLabel                 "Non me gusta Thunderbird porque…">
+<!ENTITY testpilot.broken.label                         "Informe de un sitio web que non traballa…">
+<!ENTITY testpilot.idea.label                           "Envía unha suxestión…">
new file mode 100644
--- /dev/null
+++ b/mail/feedback/main.properties
@@ -0,0 +1,115 @@
+# description for add-on manager
+extensions.tbtestpilot@labs.mozilla.com.description = Axude a que o Thunderbird sexa mellor realizando os estudios de usuario.
+
+# common
+testpilot.fullBrandName = Mozilla Labs Test Pilot
+testpilot.moreInfo = Máis información
+testpilot.submit = Enviar
+testpilot.takeSurvey = Realizar a enquisa
+
+# Feedback button menu
+testpilot.turnOn = Activar estudios de usuario
+testpilot.turnOff = Desactivar estudios de usuario
+
+# studies window
+testpilot.studiesWindow.noStudies = Agora estamos traballando nun novo estudio; avisámolo tan pronto haxa un! Estea atento!
+testpilot.studiesWindow.uploading = Subindo…
+testpilot.studiesWindow.unableToReachServer = Foi imposíbel contactar con Mozilla; tente de novo máis tarde.
+testpilot.studiesWindow.thanksForContributing = Grazas por colaborar!
+testpilot.studiesWindow.finishedOn = Finalizou o %S
+testpilot.studiesWindow.canceledStudy = (Cancelou este estudio)
+testpilot.studiesWindow.missedStudy = (Non se realizou este estudio)
+testpilot.studiesWindow.willStart = Iniciarei o %S
+testpilot.studiesWindow.gatheringData = Actualmente conseguindo datos.
+testpilot.studiesWindow.willFinish = Finalizarei o %S
+testpilot.studiesWindow.proposeStudy = Propón o teu propio estudio
+
+# for pages
+testpilot.page.commentsAndDiscussions = Comentarios e discusións »
+testpilot.page.proposeATest = Propoña un Test »
+testpilot.page.testpilotOnTwitter = @MozTestPilot no Twitter »
+
+# status page
+testpilot.statusPage.uploadingData = Subindo datos agora…
+testpilot.statusPage.uploadErrorMsg = Vaites! Produciuse un erro ao conectarse cos servidores de Mozilla. Quizais fallou a súa conexión de rede?
+testpilot.statusPage.willRetry = Test Pilot tentarao de novo automaticamente, polo tanto, agora pode pechar está páxina.
+testpilot.statusPage.endedAlready = (Xa rematou e non debería ver esta páxina)
+testpilot.statusPage.todayAt =  hoxe, ás %S
+testpilot.statusPage.endOn = en %S
+# LOCALIZATION NOTE (numExtensions): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 = number of extensions
+# example: "2 extensions"
+testpilot.statusPage.numExtensions = #1 extensión;#1 extensións
+testpilot.statusPage.recursEveryNumberOfDays = Este test repítese cada %S días. Cada vez completa:
+testpilot.statusPage.askMeBeforeSubmitData = Preguntarme se quero enviar os meus datos.
+testpilot.statusPage.alwaysSubmitData = Sempre enviar os meus datos e non preguntarme por elo.
+testpilot.statusPage.neverSubmitData = Nunca enviar os meus datos e non preguntarme por elo.
+testpilot.statusPage.loading = Cargando, agarde un momento…
+
+# quit page
+testpilot.quitPage.aboutToQuit = Está a punto de saír do estudio "%S".
+testpilot.quitPage.optionalMessage = (Opcional) Se ten un minuto, contenos porque escolleu saír do estudio.
+testpilot.quitPage.reason = Razón:
+testpilot.quitPage.recurringStudy = Este é un estudio recorrente. Normalmente informarémolo da próxima vez que realicemos o estudio. Se non quere volver a saber sobre este estudio marque a caixa de abaixo:
+testpilot.quitPage.quitForever = Saír deste estudio recorrente.
+testpilot.quitPage.quitStudy = Saír do estudio »
+
+# welcome page
+testpilot.welcomePage.thankYou = Grazas por unirse ao equipo de Test Pilot!
+testpilot.welcomePage.gettingStarted = Iniciarse
+testpilot.welcomePage.pleaseTake = Realice a
+testpilot.welcomePage.backgroundSurvey = Enquisa de Pilot en segundo plano
+testpilot.welcomePage.clickToOpenStudiesWindow = Prema aquí para ver que estudios se están executando actualmente.
+testpilot.welcomePage.testpilotAddon = Complemento Test Pilot
+testpilot.welcomePage.iconExplanation = « busque esta icona abaixo á dereita da xanela do correo.
+testpilot.welcomePage.iconExplanation2 = « busque esta icona no menú Ferramentas.
+testpilot.welcomePage.moreIconExplanation = Pode premer nel para ir ao menú principal de Test Pilot.
+testpilot.welcomePage.moreIconExplanation2 = Use o submenú para ver que estudios de Test Pilot se están executando no computador e estabeleza as súas preferencias.
+testpilot.welcomePage.notificationInfo = A icona mostrará un aviso cando un estudio precise da súa atención.
+testpilot.welcomePage.notificationInfo2 = Aparecerá a icona e unha notificación cando un estudio precise da súa atención.
+testpilot.welcomePage.privacyPolicy = Política de privacidade
+testpilot.welcomePage.legalNotices = Avisos legais
+
+# survey page
+testpilot.surveyPage.saveAnswers = Gardar respostas
+testpilot.surveyPage.submitAnswers = Enviar respostas
+testpilot.surveyPage.changeAnswers = Cambiar respostas
+testpilot.surveyPage.loading = Cargando, agarde un momento…
+testpilot.surveyPage.thankYouForFinishingSurvey = Grazas por rematar a enquisa. Subiranse as súas respostas xunto co seguinte conxunto de datos experimentais.
+testpilot.surveyPage.reviewOrChangeYourAnswers = Se quixera revisar ou cambiar a súas respostas, pode facelo en calquera momento usando o botón de abaixo.
+
+# modules/task.js
+testpilot.finishedTask.finishedStudy = Excelente! Rematou o estudio "%S"!
+testpilot.finishedTask.allRelatedDataDeleted = Elimináronse do seu computador todos os datos relacionados con este estudio.
+
+# modules/setup.js
+testpilot.notification.update = Actualizar…
+testpilot.notification.thankYouForUploadingData = Grazas!
+testpilot.notification.thankYouForUploadingData.message = Grazas por enviar os seus datos.
+testpilot.notification.readyToSubmit = Preparado para enviar
+testpilot.notification.readyToSubmit.message = O estudio "%S" de Test Pilot rematou de recoller datos e está preparado para envialos.
+testpilot.notification.newTestPilotStudy = Novo estudio de Test Pilot
+testpilot.notification.newTestPilotStudy.pre.message = Está a punto de comezar o estudio "%S" de Test Pilot.
+testpilot.notification.newTestPilotSurvey = Nova enquisa de Test Pilot
+testpilot.notification.newTestPilotSurvey.message = A enquisa "%S" de Test Pilot está dispoñíbel.
+testpilot.notification.newTestPilotResults = Novos resultados do Test Pilot
+testpilot.notification.newTestPilotResults.message = Están dispoñíbeis novos resultados para o estudio "%S" de Test Pilot.
+testpilot.notification.autoUploadedData = Grazas!
+testpilot.notification.autoUploadedData.message = Rematouse o estudio "%S" de Test Pilot e enviáronse os seus datos!
+testpilot.notification.extensionUpdate = Actualizar extensión
+testpilot.notification.extensionUpdate.message = Un dos estudios require unha versión máis recente de Test Pilot. Pode obter a última versión usando a xanela de Complementos.
+
+# modules/setup.js - doorhanger notification buttons
+testpilot.notification.cancelLabel = Cancelar o estudio
+testpilot.notification.alwaysSubmitLabel = Non preguntar, enviar sempre
+testpilot.notification.dontShowNewLabel = Non avisarme de novos estudios
+testpilot.notification.seeAllStudiesLabel = Ver todos os estudios de usuario
+testpilot.notification.seeYourData = Ver os seus datos
+
+# modules/notifications.js - doorhanger notification button shortcut keys
+testpilot.notification.accessKey.submit = E
+testpilot.notification.accessKey.moreInfo = M
+testpilot.notification.accessKey.allStudies = T
+testpilot.notification.accessKey.alwaysSubmit = S
+testpilot.notification.accessKey.cancel = C
--- a/mail/installer/custom.properties
+++ b/mail/installer/custom.properties
@@ -48,17 +48,16 @@
 # being used as an accesskey.
 
 # You can use \n to create a newline in the string but only when the string
 # from en-US contains a \n.
 
 REG_APP_DESC=$BrandShortName é un completo aplicativo de correo electrónico coas mellores funcionalidades. $BrandShortName é compatíbel cos protocolos IMAP e POP, así como co correo en formato HTML. Controis de correo lixo incorporados, agregador de fontes RSS, busca rápida potente, verificación ortográfica ao escribir, caixa de entrada global e filtraxe avanzada de mensaxes complementan o conxunto de novas funcionalidades de $BrandShortName.
 CONTEXT_OPTIONS=&Opcións de $BrandShortName
 CONTEXT_SAFE_MODE=&Modo de seguranza de $BrandShortName
-SAFE_MODE=Modo de seguranza
 OPTIONS_PAGE_TITLE=Tipo de configuración
 OPTIONS_PAGE_SUBTITLE=Escoller opcións de configuración
 OPTIONS_MAKE_DEFAULT=&Usar $BrandShortName como aplicativo de correo predefinido
 SHORTCUTS_PAGE_TITLE=Configurar atallos
 SHORTCUTS_PAGE_SUBTITLE=Crear iconas de programa
 SUMMARY_PAGE_TITLE=Resumo
 SUMMARY_PAGE_SUBTITLE=Preparado para iniciar a instalación do $BrandShortName
 SUMMARY_INSTALLED_TO=$BrandShortName instalarase na seguinte localización: