Partial fix
authorMarcelo Poli <mpoli@lt24.zzn.com>
Sat, 17 Mar 2012 16:22:36 -0300
changeset 985 5bcd260c372376c15bc3d6cea5724c24bbeb5868
parent 984 7937b46c38e1d75ae17f76a6748dc99c40d6552e
child 986 de76d07241408d8a0ad928bf44b266a47c920835
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:47:06 +0000
Partial fix
browser/chrome/browser/aboutHome.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/debugger.dtd
browser/chrome/browser/devtools/debugger.properties
browser/updater/updater.ini
chat/accounts.properties
chat/commands.properties
chat/conversations.properties
chat/facebook.properties
chat/irc.properties
chat/status.properties
chat/twitter.properties
chat/xmpp.properties
dom/chrome/dom/dom.properties
editor/ui/chrome/composer/editor.properties
mail/chrome/messenger/addbuddy.dtd
mail/chrome/messenger/am-im.dtd
mail/chrome/messenger/chat.dtd
mail/chrome/messenger/chat.properties
mail/chrome/messenger/cloudfile/Dropbox/management.dtd
mail/chrome/messenger/cloudfile/YouSendit/management.dtd
mail/chrome/messenger/cloudfile/YouSendit/settings.dtd
mail/chrome/messenger/cloudfile/addAccountDialog.dtd
mail/chrome/messenger/cloudfile/management.dtd
mail/chrome/messenger/imAccountWizard.dtd
mail/chrome/messenger/imAccounts.dtd
mail/chrome/messenger/imAccounts.properties
mail/chrome/messenger/joinChat.dtd
mail/chrome/messenger/preferences/applications.properties
mail/chrome/messenger/preferences/chat.dtd
mobile/android/base/android_strings.dtd
mobile/android/chrome/browser.properties
toolkit/chrome/global/aboutSupport.dtd
toolkit/chrome/global/aboutSupport.properties
toolkit/chrome/global/resetProfile.dtd
toolkit/chrome/global/viewSource.dtd
--- a/browser/chrome/browser/aboutHome.dtd
+++ b/browser/chrome/browser/aboutHome.dtd
@@ -1,24 +1,27 @@
-<!ENTITY % brandDTD
-    SYSTEM "chrome://branding/locale/brand.dtd">
-  %brandDTD;
+<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
+%brandDTD;
+<!ENTITY % syncBrandDTD SYSTEM "chrome://browser/locale/syncBrand.dtd">
+%syncBrandDTD;
 
 <!-- These strings are used in the about:home page -->
 
 <!ENTITY abouthome.pageTitle "Página de inicio de &brandFullName;">
 
 <!ENTITY abouthome.searchEngineButton.label "Buscar">
 
-<!ENTITY abouthome.aboutMozilla "Acerca de Mozilla">
-
 <!-- LOCALIZATION NOTE (abouthome.defaultSnippet1.v1):
      text in <a/> will be linked to the Firefox features page on mozilla.com
 -->
 <!ENTITY abouthome.defaultSnippet1.v1 "¡Gracias por elegir Firefox! Para sacar el mayor provecho de su navegador, conozca más sobre las <a>últimas características</a>.">
 <!-- LOCALIZATION NOTE (abouthome.defaultSnippet2.v1):
      text in <a/> will be linked to the featured add-ons on addons.mozilla.org
 -->
 <!ENTITY abouthome.defaultSnippet2.v1 "Es fácil personalizar su Firefox exactamente de la forma en que lo desee. <a>Hay miles de complementos para elegir</a>.">
 
-<!ENTITY abouthome.syncSetup.label   "Configurar Sync">
-<!ENTITY abouthome.pairDevice.label  "Asociar un dispositivo">
+<!ENTITY abouthome.bookmarksButton.label "Marcadores">
+<!ENTITY abouthome.historyButton.label   "Historial">
+<!ENTITY abouthome.settingsButton.label  "Configuración">
+<!ENTITY abouthome.addonsButton.label    "Complementos">
+<!ENTITY abouthome.appsButton.label      "Marketplace">
+<!ENTITY abouthome.downloadsButton.label "Descargas">
 
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -109,17 +109,16 @@ can reach it easily. -->
 <!ENTITY backCmd.label "Atrás">
 <!ENTITY backCmd.accesskey "A">
 <!ENTITY backButton.tooltip "Retroceder una página">
 <!ENTITY forwardCmd.label "Adelante">
 <!ENTITY forwardCmd.accesskey "d">
 <!ENTITY forwardButton.tooltip "Avanzar una página">
 <!ENTITY backForwardButtonMenu.tooltip "Botón derecho o descolgar para mostrar historial">
 <!ENTITY backForwardButtonMenuMac.tooltip "Descolgar para mostrar historial">
-
 <!ENTITY reloadCmd.label "Recargar">
 <!ENTITY reloadCmd.accesskey "R">
 <!ENTITY reloadButton.tooltip "Recargar la página actual">
 <!ENTITY stopCmd.label "Detener">
 <!ENTITY stopCmd.accesskey "t">
 <!ENTITY stopCmd.macCommandKey ".">
 <!ENTITY stopButton.tooltip "Detener la carga de la página">
 <!ENTITY goEndCap.tooltip "Ir a la dirección de la barra de direcciones">
@@ -209,20 +208,27 @@ can reach it easily. -->
   -  "Scratchpad" in your locale. You should feel free to find a close
   -  approximation to it or choose a word (or words) that means
   -  "simple discardable text editor". -->
 <!ENTITY scratchpad.label             "Borrador">
 <!ENTITY scratchpad.accesskey         "B">
 <!ENTITY scratchpad.keycode           "VK_F4">
 <!ENTITY scratchpad.keytext           "F4">
 
-<!ENTITY inspectPanelTitle.label      "HTML">
-<!ENTITY inspectButton.label          "Inspeccionar">
-<!ENTITY inspectButton.accesskey      "I">
 <!ENTITY inspectCloseButton.tooltiptext "Cerrar Inspector">
+
+<!ENTITY inspectorHTMLCopyInner.label       "Copiar InnerHTML">
+<!ENTITY inspectorHTMLCopyInner.accesskey   "I">
+
+<!ENTITY inspectorHTMLCopyOuter.label       "Copiar OuterHTML">
+<!ENTITY inspectorHTMLCopyOuter.accesskey   "O">
+
+<!ENTITY inspectorHTMLDelete.label          "Borrar nodo">
+<!ENTITY inspectorHTMLDelete.accesskey      "n">
+
 <!-- LOCALIZATION NOTE (inspect3DViewButton.label): This button shows an
   -  alternate view for the Inspector, creating a 3D visualization of the
   -  webpage. -->
 <!ENTITY inspect3DViewButton.label     "Vista 3D">
 <!ENTITY inspect3DViewButton.accesskey "V">
 
 <!ENTITY inspectStyleButton.label     "Estilo">
 <!ENTITY inspectStyleButton.accesskey "s">
@@ -384,17 +390,16 @@ can reach it easily. -->
 <!ENTITY viewVideoCmd.label           "Ver video">
 <!ENTITY viewVideoCmd.accesskey       "i">
 <!ENTITY viewBGImageCmd.label "Ver imagen de fondo">
 <!ENTITY viewBGImageCmd.accesskey "f">
 <!ENTITY setDesktopBackgroundCmd.label "Poner como fondo del escritorio…">
 <!ENTITY setDesktopBackgroundCmd.accesskey "s">
 <!ENTITY bookmarkPageCmd2.label       "Marcar esta página">
 <!ENTITY bookmarkPageCmd2.accesskey   "M">
-
 <!ENTITY bookmarkThisLinkCmd.label      "Marcar este enlace">
 <!ENTITY bookmarkThisLinkCmd.accesskey  "l">
 <!ENTITY bookmarkThisFrameCmd.label      "Marcar este marco…">
 <!ENTITY bookmarkThisFrameCmd.accesskey  "r">
 <!ENTITY sendPageCmd.label "Enviar página…">
 <!ENTITY sendPageCmd.accesskey "E">
 <!ENTITY savePageCmd.label "Guardar página como…">
 <!ENTITY savePageCmd.accesskey "a">
@@ -432,32 +437,44 @@ can reach it easily. -->
 <!ENTITY copyAudioURLCmd.label        "Copiar dirección del audio">
 <!ENTITY copyAudioURLCmd.accesskey    "o">
 <!ENTITY copyEmailCmd.label "Copiar dirección de correo electrónico">
 <!ENTITY copyEmailCmd.accesskey "e">
 <!ENTITY thisFrameMenu.label "Este marco">
 <!ENTITY thisFrameMenu.accesskey "c">
 
 <!-- Media (video/audio) controls -->
+<!-- LOCALIZATION NOTE: The access keys for "Play" and
+"Pause" are the same because the two context-menu
+items are mutually exclusive. -->
 <!ENTITY mediaPlay.label             "Reproducir">
 <!ENTITY mediaPlay.accesskey         "p">
 <!ENTITY mediaPause.label            "Pausa">
 <!ENTITY mediaPause.accesskey        "P">
+<!-- LOCALIZATION NOTE: The access keys for "Mute" and
+"Unmute" are the same because the two context-menu
+items are mutually exclusive. -->
 <!ENTITY mediaMute.label             "Mudo">
 <!ENTITY mediaMute.accesskey         "M">
 <!ENTITY mediaUnmute.label           "Unmute">
 <!ENTITY mediaUnmute.accesskey       "m">
+<!-- LOCALIZATION NOTE: The access keys for "Show Controls" and
+"Hide Controls" are the same because the two context-menu
+items are mutually exclusive. -->
 <!ENTITY mediaShowControls.label     "Mostrar controles">
 <!ENTITY mediaShowControls.accesskey "c">
 <!ENTITY mediaHideControls.label     "Ocultar controles">
 <!ENTITY mediaHideControls.accesskey "c">
 <!ENTITY videoFullScreen.label       "Pantalla completa">
 <!ENTITY videoFullScreen.accesskey   "n">
 <!ENTITY videoSaveImage.label        "Guardar captura como…">
 <!ENTITY videoSaveImage.accesskey    "G">
+<!-- LOCALIZATION NOTE: The access keys for "Show Statistics" and
+"Hide Statistics" are the same because the two context-menu
+items are mutually exclusive. -->
 <!ENTITY videoShowStats.label        "Mostrar estadísticas">
 <!ENTITY videoShowStats.accesskey    "t">
 <!ENTITY videoHideStats.label        "Ocultar estadisticas">
 <!ENTITY videoHideStats.accesskey    "t">
 
 <!-- LOCALIZATION NOTE :
 fullZoomEnlargeCmd.commandkey3, fullZoomReduceCmd.commandkey2 and
 fullZoomResetCmd.commandkey2 are alternative acceleration keys for zoom.
@@ -583,8 +600,21 @@ The word "toolbar" is appended automatic
 <!ENTITY syncSetup.label              "Configurar &syncBrand.shortName.label;…">
 <!ENTITY syncSetup.accesskey          "Y">
 <!ENTITY syncSyncNowItem.label        "Sincronizar ahora">
 <!ENTITY syncSyncNowItem.accesskey    "S">
 <!ENTITY syncToolbarButton.label      "Sincronizar">
 
 <!ENTITY addonBarCloseButton.tooltip  "Cerrar barra de complementos">
 <!ENTITY toggleAddonBarCmd.key        "/">
+
+<!-- LOCALIZATION NOTE (htmlPanel.label): This is a label for a button that
+activates the Web Developer->Inspect UI's HTML Tree Panel. -->
+<!ENTITY htmlPanel.label              "HTML">
+
+<!-- LOCALIZATION NOTE (htmlPanel.tooltiptext): The text that appears when a user
+hovers over the HTML panel's toolbar button. -->
+<!ENTITY htmlPanel.tooltiptext        "Panel HTML">
+
+<!-- LOCALIZATION NOTE (htmlPanel.accesskey): The key bound to the HTML panel's
+toolbar button -->
+<!ENTITY htmlPanel.accesskey          "H">
+
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -320,17 +320,44 @@ browser.menu.showCharacterEncoding=false
 syncPromoNotification.bookmarks.description=Puede acceder a sus marcadores en todos sus dispositivos con %S.\u0020
 # LOCALIZATION NOTE (syncPromoNotification.passwords.label): This appears in
 # the remember password panel.  %S will be replaced by syncBrandShortName.
 # The final space separates this text from the Learn More link.
 syncPromoNotification.passwords.description=Puede acceder a sus contraseñas en todos sus dispositivos con %S.\u0020
 syncPromoNotification.learnMoreLinkText=Conocer más
 
 # Telemetry prompt
-# LOCALIZATION NOTE (telemetryPrompt): %1$S will be replaced by brandFullName,
-# and %2$S by the value of the toolkit.telemetry.server_owner preference.
+# LOCALIZATION NOTE (telemetryOptInPrompt): %1$S will be replaced by
+# brandFullName, and %2$S by the value of the toolkit.telemetry.server_owner
+# preference.
 telemetryPrompt = ¿Desea ayudar a mejorar %1$S permitiendo que automáticamente se envíe un informe con el rendimiento, características de hardware, uso de funciones y personalización del navegador a %2$S?
 telemetryLinkLabel = Conocer más
 telemetryYesButtonLabel2 = Sí, quiero ayudar
 telemetryYesButtonAccessKey = S
 telemetryNoButtonLabel = No
 telemetryNoButtonAccessKey = N
 
+# Webapps notification popup
+webapps.install = Instalar
+webapps.install.accesskey = I
+#LOCALIZATION NOTE (webapps.requestInstall) %1$S is the web app name, %2$S is the site from which the web app is installed
+webapps.requestInstall = ¿Desea instalar "%1$S" desde este sitio (%2$S)?
+
+# Keyword.URL reset prompt
+# LOCALIZATION NOTE (keywordPrompt.message):
+#  - %1$S is brandShortName
+#  - %2$S is a host name (e.g. "somewebsearch.com") from the current value of keyword.URL
+#  - %3$S is the name of the default search engine (e.g. "Google")
+keywordPrompt.message = %1$S está usando '%2$S' para las búsquedas desde la barra de direcciones. ¿Desea restaurar el buscador predeterminado (%3$S)?
+
+# LOCALIZATION NOTE (keywordPrompt.yesButton): %1$S is the name of the default search engine
+keywordPrompt.yesButton = Sí, usar %1$S
+keywordPrompt.yesButton.accessKey = S
+
+# LOCALIZATION NOTE (keywordPrompt.noButton): %1$S is a host name (e.g. "somewebsearch.com") from the current value of keyword.URL
+keywordPrompt.noButton = No, continuar usando '%1$S'
+keywordPrompt.noButton.accessKey  = N
+
+# Telemetry opt-out prompt for Aurora and Nightly
+# LOCALIZATION NOTE (telemetryOptOutPrompt): %1$S and %3$S will be replaced by
+# brandFullName, and %2$S by the value of the toolkit.telemetry.server_owner preference.
+telemetryOptOutPrompt = %1$S envía información acerca del rendimiento, hardware, uso y personalizaciones hacia %2$S para ayudar a mejorar %3$S.
+
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -0,0 +1,34 @@
+<!-- LOCALIZATION NOTE : FILE This file contains the Script Debugger strings -->
+<!-- LOCALIZATION NOTE : FILE Do not translate commandkey -->
+
+<!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
+  - keep it in English, or another language commonly spoken among web developers.
+  - You want to make that choice consistent across the developer tools.
+  - A good criteria is the language in which you'd find the best
+  - documentation on web development on the web. -->
+
+<!-- LOCALIZATION NOTE (debuggerMenu.label): This is the label for the
+  -  application menu item that opens the debugger UI. -->
+<!ENTITY debuggerMenu.label          "Script Debugger">
+
+<!-- LOCALIZATION NOTE (debuggerMenu.commandkey): This is the command key that
+  -  launches the debugger UI. Do not translate this one! -->
+<!ENTITY debuggerMenu.commandkey     "S">
+
+<!-- LOCALIZATION NOTE (debuggerUI.closeButton): This is the label for the
+  -  button that closes the debugger UI. -->
+<!ENTITY debuggerUI.closeButton      "Crrar">
+
+<!-- LOCALIZATION NOTE (debuggerUI.stackTitle): This is the label for the
+  -  widget that displays the call stack frames in the debugger. -->
+<!ENTITY debuggerUI.stackTitle       "Call stack">
+
+<!-- LOCALIZATION NOTE (debuggerUI.scriptTitle): This is the label for the
+  -  widget that displays the source code for the script that is currently
+  -  being inspected in the debugger. -->
+<!ENTITY debuggerUI.scriptTitle      "Script">
+
+<!-- LOCALIZATION NOTE (debuggerUI.propertiesTitle): This is the label for the
+  -  widget that displays the variables in the various available scopes in the
+  -  debugger. -->
+<!ENTITY debuggerUI.propertiesTitle  "Scope variables">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -0,0 +1,54 @@
+# LOCALIZATION NOTE These strings are used inside the Script Debugger
+# which is available from the Web Developer sub-menu -> 'Script Debugger'.
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
+
+# LOCALIZATION NOTE (pauseLabel): The label that is displayed on the pause
+# button when the debugger is in a running state.
+pauseLabel=Pausa
+
+# LOCALIZATION NOTE (resumeLabel): The label that is displayed on the pause
+# button when the debugger is in a paused state.
+resumeLabel=Continuar
+
+# LOCALIZATION NOTE (pausedState): The label that is displayed when the
+# debugger is in a paused state.
+pausedState=Pausado
+
+# LOCALIZATION NOTE (runningState): The label that is displayed when the
+# debugger is in a running state.
+runningState=Ejecutando
+
+# LOCALIZATION NOTE (localScope): The label that is displayed in the variables
+# pane as a header on the local scope container.
+localScope=Local
+
+# LOCALIZATION NOTE (globalScope): The label that is displayed in the variables
+# pane as a header on the globel scope container.
+globalScope=Global
+
+# LOCALIZATION NOTE (localScope): The label that is displayed in the variables
+# pane as a header on the container for identifiers in a with block.
+withScope=Bloque With
+
+# LOCALIZATION NOTE (closureScope): The label that is displayed in the variables
+# pane as a header on container for identifiers in a closure scope.
+closureScope=Closure
+
+# LOCALIZATION NOTE (emptyText): The text that is displayed in the stack frames
+# list when there are no frames to display.
+emptyText=Vacío
+
+# LOCALIZATION NOTE (loadingText): The text that is displayed in the script
+# editor when the laoding process has started but there is no file to display
+# yet.
+loadingText=Cargando\u2026
+
+# LOCALIZATION NOTE (loadingError):
+# This is the error message that is displayed on failed attempts to load an
+# external resource file.
+# %1$S=URL, %2$S=status code
+loadingError=Error cargando %1$S: %2$S
--- a/browser/updater/updater.ini
+++ b/browser/updater/updater.ini
@@ -1,4 +1,6 @@
 ; This file is in the UTF-8 encoding
 [Strings]
 TitleText=Actualización de %MOZ_APP_DISPLAYNAME%
 InfoText=%MOZ_APP_DISPLAYNAME% está instalando sus actualizaciones y se iniciará en unos instantes…
+MozillaMaintenanceDescription=El servicio de mantenimiento de Mozilla Maintenance asegura que tiene la última y más segura versión de Mozilla Firefox en su computadora. Mantener Firefox actualizado es muy importante para su seguridad en línea y Mozilla recomienda encarecidamente que mantenga este servicio habilitado.
+
new file mode 100644
--- /dev/null
+++ b/chat/accounts.properties
@@ -0,0 +1,5 @@
+# LOCALIZATION NOTE (passwordPromptTitle, passwordPromptText):
+# %S is replaced with the name of the account
+passwordPromptTitle=Contraseña para %S
+passwordPromptText=Ingrese la contraseña de %S para conectarse.
+passwordPromptSaveCheckbox=Usar el administrador de contraseñas para recordar ésta.
new file mode 100644
--- /dev/null
+++ b/chat/commands.properties
@@ -0,0 +1,23 @@
+# LOCALIZATION NOTE (commands):
+#  %S is a comma separated list of command names.
+commands=Comandos: %S.\nUse /help &lt;comando&gt; para más información.
+# LOCALIZATION NOTE (noCommand, noHelp):
+#  %S is the command name the user typed.
+noCommand=No hay comando'%S'.
+noHelp=No hay mensaje de ayuda para el comando '%S', perdón!
+
+sayHelpString=say &lt;mensaje&gt;: envía un mensaje sin procesar comandos.
+rawHelpString=raw &lt;mensaje&gt;: send a message without escaping HTML entities.
+helpHelpString=help &lt;nombre&gt;: muestra el mensaje de ayuda para &lt;nombre&gt; de comando o la lista de posibles comandos cuando se usa sin parámetros.
+
+# LOCALIZATION NOTE (statusCommand):
+#  %1$S is replaced with a status command name
+#   (one of "back", "away", "busy", "dnd", or "offline").
+#  %2$S is replaced with the localized version of that status type
+#   (one of the 5 strings below).
+statusCommand=%1$S &lt;status message&gt;: set the status to %2$S with an optional status message.
+back=disponible
+away=away
+busy=no disponible
+dnd=no disponible
+offline=desconectado
new file mode 100644
--- /dev/null
+++ b/chat/conversations.properties
@@ -0,0 +1,41 @@
+# LOCALIZATION NOTE (targetChanged):
+#  %1$S is the new conversation title (display name of the new target),
+#  %2$S is the protocol name used for the new target.
+targetChanged=La conversación continuará con %1$S, usando %2$S.
+
+# LOCALIZATION NOTE (statusChanged):
+#  %1$S is the display name of the contact.
+#  %2$S is the new status type (a value from status.properties).
+statusChanged=%1$S es ahora %2$S.
+# LOCALIZATION NOTE (statusChangedWithStatusText):
+#  %1$S is the display name of the contact.
+#  %2$S is the new status type (a value from status.properties).
+#  %3$S is the status text (eg. "I'm currently away from the computer").
+statusChangedWithStatusText=%1$S es ahora %2$S: %3$S.
+# LOCALIZATION NOTE (statusChangedFromUnknown[WithStatusText]):
+#  special case of the previous 2 strings for when the status was
+#  previously unknown. These 2 strings should not mislead the user
+#  into thinking the person's status has just changed.
+statusChangedFromUnknown=%1$S es %2$S.
+statusChangedFromUnknownWithStatusText=%1$S es %2$S: %3$S.
+
+# LOCALIZATION NOTE (statusUnknown):
+#  %S is the display name of the contact.
+statusUnknown=Su cuenta está desconectada (the status of %S is no longer known).
+accountDisconnected=Su cuenta está desconectada.
+
+# LOCALIZATION NOTE (autoReply):
+#  %S is replaced by the text of a message that was sent as an automatic reply.
+autoReply=Auto respuesta - %S
+
+# LOCALIZATION NOTE (messenger.conversations.selections.ellipsis):
+#  ellipsis is used when copying a part of a message to show that the message was cut
+messenger.conversations.selections.ellipsis=[…]
+
+# LOCALIZATION NOTE (messenger.conversations.selections.{system,content,action}MessagesTemplate):
+#  These 3 templates are used to format selected messages before copying them.
+#  Do not translate the texts between % characters, but feel free to adjust
+#  whitespace and separators to make them fit your locale.
+messenger.conversations.selections.systemMessagesTemplate=%time% - %message%
+messenger.conversations.selections.contentMessagesTemplate=%time% - %sender%: %message%
+messenger.conversations.selections.actionMessagesTemplate=%time% * %sender% %message%
new file mode 100644
--- /dev/null
+++ b/chat/facebook.properties
@@ -0,0 +1,1 @@
+connection.error.useUsernameNotEmailAddress=Utilice su nombre de usuario de Facebook, no la dirección de correo electrónico
new file mode 100644
--- /dev/null
+++ b/chat/irc.properties
@@ -0,0 +1,147 @@
+# LOCALIZATION NOTE (connection.error.*):
+#   These will show in the account manager if the account is
+#   disconnected because of an error.
+connection.error.lost=Conexión con el servidor perdida
+connection.error.timeOut=La conexión tardó demasiado tiempo
+connection.error.certError=Error de certificación al conectarse al servidor
+
+# LOCALIZATION NOTE (joinChat.*):
+#   These show up on the join chat menu. An underscore is for the access key.
+joinChat.channel=_Canal
+joinChat.password=C_ontraseña
+
+# LOCALIZATION NOTE (options.*):
+#   These are the protocol specific options shown in the account manager and
+#   account wizard windows.
+options.server=Servidor
+options.port=Puerto
+options.ssl=Usar SSL
+options.encoding=Codificación de caracteres
+options.quitMessage=Quit message
+options.partMessage=Part message
+options.showServerTab=Mostrar mensajes desde el servidor
+
+# LOCALIZATION NOTE (ctcp.ping): Semi-colon list of plural forms.
+#  See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+#   %1$S is the nickname of the user who was pinged.
+#   #2 is the delay (in seconds).
+ctcp.ping=Ping reply from %1$S in #2 second.;Ping reply from %1$S in #2 seconds.
+# LOCALIZATION NOTE (ctcp.version):
+#   %1$S is the nickname of the user whose version was requested.
+#   %2$S is the version response from the client.
+ctcp.version=%1$S está usando "%2$S"
+# LOCALIZATION NOTE (ctcp.time):
+#   %1$S is the nickname of the user whose time was requested.
+#   %2$S is the time response.
+ctcp.time=The time for %1$S is %2$S.
+
+# 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.action=%S &lt;action to perform&gt;: Perform an action.
+command.ctcp=%S &lt;nick&gt; &lt;msg&gt;: Sends a CTCP message to the nick.
+command.chanserv=%S &lt;comando&gt;: Envía un comando a ChanServ.
+command.deop=%S &lt;nick1&gt;[,&lt;nick2&gt;]*: Remove channel operator status from someone. You must be a channel operator to do this.
+command.devoice=%S &lt;nick1&gt;[,&lt;nick2&gt;]*: Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this.
+command.invite=%S &lt;nick&gt; [&lt;room&gt;]: Invite someone to join you in the specified channel, or the current channel.
+command.join=%S &lt;room1&gt;[,&lt;room2&gt;]* [&lt;key1&gt;[,&lt;key2&gt;]*]: Enter one or more channels, optionally providing a channel key for each if needed.
+command.kick=%S &lt;nick&gt; [&lt;message&gt;]: Remove someone from a channel. You must be a channel operator to do this.
+command.list=%S: Display a list of chat rooms on the network. Warning, some servers may disconnect you upon doing this.
+command.memoserv=%S &lt;comando&gt;: Envía un comando a MemoServ.
+command.mode=%S (&lt;nick&gt;|&lt;channel&gt;) (+|-)&lt;new mode&gt;: Set or unset a channel or user mode.
+command.msg=%S &lt;nick&gt; &lt;message&gt;: Send a private message to a user (as opposed to a channel).
+command.nick=%S &lt;new nickname&gt;: Change your nickname.
+command.nickserv=%S &lt;comando&gt;: Envía un comando a NickServ.
+command.notice=%S &lt;target&gt; &lt;message&gt;: Send a notice to a user or channel.
+command.op=%S &lt;nick1&gt;[,&lt;nick2&gt;]*: Grant channel operator status to someone. You must be a channel operator to do this.
+command.operserv=%S &lt;comando&gt;: Envía un comando a OperServ.
+command.part=%S [mensaje]: Deja el canal actual con un mensaje opcional.
+command.ping=%S [&lt;nick&gt;]: Asks how much lag a user (or the server if no user specified) has.
+command.quit=%S &lt;mensaje&gt;: Desconecta del servidor con un mensaje opcional.
+command.quote=%S &lt;command&gt;: Send a raw command to the server.
+command.time=%S: Displays the current local time at the IRC server.
+command.topic=%S [&lt;new topic&gt;]: View or change the channel topic.
+command.umode=%S (+|-)&lt;new mode&gt;: Set or unset a user mode.
+command.version=%S &lt;nick&gt;: Request the version of a user's client.
+command.voice=%S &lt;nick1&gt;[,&lt;nick2&gt;]*: Grant channel voice status to someone. You must be a channel operator to do this.
+command.wallops=%S &lt;message&gt;: If you don't know what this is, you probably can't use it (sends a command to all connected with the +w flag and all operators on the server.
+command.whowas=%S &lt;nick&gt;: Get information on a user that has logged off.
+
+# LOCALIZATION NOTE (message.*):
+#    These are shown as system messages in the conversation.
+#    %1$S is the nick and %2$S is the nick and host of the user who joined.
+message.join=%1$S [%2$S] entered the room.
+#    %1$S is the nick of who kicked you.
+#    %2$S is message.kicked.reason, if a kick message was given.
+message.kicked.you=Ha sido expulsado por %1$S%2$S.
+#    %1$S is the nick that is kicked, %2$S the nick of the person who kicked
+#    %1$S. %3$S is message.kicked.reason, if a kick message was given.
+message.kicked=%1$S ha sido expulsado por %2$S%3$S.
+#    %S is the kick message
+message.kicked.reason=: %S
+#    %1$S is the nickname of the user whose mode was changed, %2$S is the new
+#    mode and %3$S is who set the mode.
+message.mode=mode (%1$S %2$S) by %3$S.
+#    %1$S is the old nick and %2$S is the new nick.
+message.nick=%1$S ahora es conocido por %2$S.
+#    %S is your new nick.
+message.nick.you=Ahora es conocido como %S.
+#    The paramter is the message.parted.reason, if a part message is given.
+message.parted.you=You have left the room (Part%1$S).
+#    %1$S is the user's nick, %2$S is message.parted.reason, if a part message is given.
+message.parted=%1$S has left the room (Part%2$S).
+#    %S is the part message supplied by the user.
+message.parted.reason=: %S
+#    %1$S is the user's nick, %2$S is message.quit2 if a quit message is given.
+message.quit=%1$S has left the room (Quit%2$S).
+#    The paramter is the quit message given by the user.
+message.quit2=: %S
+#    %1$S is the user who changed the topic, %2$S is the new topic.
+message.topicChanged=%1$S has changed the topic to: %2$S.
+#    %1$S is the user who cleared the topic.
+message.topicCleared=%1$S has cleared the topic.
+#    %1$S is the conversation name, %2$S is the topic.
+message.topic=The topic for %1$S is: %2$S.
+#    %S is the conversation name.
+message.topicRemoved=The topic for %S was removed.
+#    %1$S is the nickname of the invited user, %2$S is the conversation name
+#    they were invited to.
+message.invited=%1$S was successfully invited to %2$S.
+#    %S is the nickname of the user who was summoned.
+message.summoned=%S was summoned.
+
+# LOCALIZATION NOTE (error.*):
+#    These are shown as error messages in the conversation.
+#    %S is the channel name.
+error.noChannel=There is no channel: %S.
+error.tooManyChannels=Cannot join %S; you've joined too many channels.
+#    %1$S is your new nick, %2$S is the kill message from the server.
+error.nickCollision=Nick already in use, changing nick to %1$S [%2$S].
+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.
+
+# LOCALIZATION NOTE (tooltip.*):
+#    These are the descriptions given in a tooltip with information received
+#    from a whois response.
+#    The human readable ("realname") description of the user.
+tooltip.realname=Nombre
+#    The username and hostname that the user connects from (usually based on the
+#    reverse DNS of the user's IP, but often mangled by the server to
+#    protect users).
+tooltip.connectedFrom=Connected from
+# The away message of the user
+tooltip.away=Away
+tooltip.ircOp=Operador de IRC
+tooltip.channels=Actualmente en
+tooltip.server=Conectado a
+#    %1$S is the server name, %2$S is the server location.
+tooltip.serverValue=%1$S (%2$S)
+tooltip.idleTime=Inactivo por
+
+# LOCALIZATION NOTE (gtalk.usernameHint):
+#  This is displayed inside the accountUsernameInfoWithDescription
+#  string defined in imAccounts.properties when the user is
+#  configuring an IRC account.
+usernameHint=y servidor
new file mode 100644
--- /dev/null
+++ b/chat/status.properties
@@ -0,0 +1,14 @@
+availableStatusType=Disponible
+awayStatusType=Away
+unavailableStatusType=No disponible
+offlineStatusType=No conectado
+invisibleStatusType=Invisible
+idleStatusType=Idle
+mobileStatusType=Móvil
+# LOCALIZATION NOTE (unknownStatusType):
+# the status of a buddy is unknown when it's in the list of a disconnected account
+unknownStatusType=Desconocido
+
+# LOCALIZATION NOTE (messenger.status.defaultIdleAwayMessage):
+#  This will be the away message put automatically when the user is idle.
+messenger.status.defaultIdleAwayMessage=I am currently away from the computer.
new file mode 100644
--- /dev/null
+++ b/chat/twitter.properties
@@ -0,0 +1,101 @@
+# LOCALIZATION NOTE (error.*):
+#   These are errors that will be shown to the user in conversation.
+error.tooLong=Status is over 140 characters.
+# LOCALIZATION NOTE (error.general, error.retweet, error.delete):
+#   %1$S will be either the error string returned by the twitter server,
+#   in English, inside parenthesis, or the empty string if we have no specific
+#   message for the error.
+#   %2$S is the message that caused the error.
+error.general=Ocurrió un error %1$S al enviar: %2$S
+error.retweet=Ocurrió un error %1$S al retwitear: %2$S
+error.delete=Ocurrió un error %1$S al borrar: %2$S
+
+# LOCALIZATION NOTE (timeline):
+#   This is the title of the conversation tab, %S will be replaced by
+#   @<username>.
+timeline=%S timeline
+
+# LOCALIZATION NOTE (action.*):
+#  This will be an action in the context menu of displayed tweets.
+action.copyLink=Copy Link to Tweet
+action.retweet=Retweet
+action.reply=Responder
+action.delete=Borrar
+# LOCALIZATION NOTE (action.follow, action.stopFollowing):
+#  %S will be replaced by the screen name of a twitter user.
+action.follow=Seguir a %S
+action.stopFollowing=Dejar de seguir a %S
+
+# LOCALIZATION NOTE (event.follow, event.unfollow, event.followed):
+#  This will be displayed in system messages inside the timeline conversation.
+#  %S will be replaced by the screen name of a twitter user.
+event.follow=Ahora está siguiendo a %S.
+event.unfollow=No está siguiendo más a %S.
+event.followed=%S ahora lo está siguiendo.
+# LOCALIZATION NOTE (event.deleted):
+#  %S will be replaced by the text of the deleted tweet.
+event.deleted=Ha borrado este tweet: "%S".
+
+# LOCALIZATION NOTE (replyingToStatusText):
+#  This will be visible in the status bar of the conversation window
+#  while the user is typing a reply to a tweet.
+#  %S will be replaced by the text of the tweet the user is replying to.
+replyingToStatusText=En respuesta a: %S
+
+# LOCALIZATION NOTE (connection.*):
+#   These will be displayed in the account manager in order to show the progress
+#   of the connection.
+#   (These will be displayed in account.connection.progress from
+#    accounts.properties, which adds … at the end, so do not include
+#    periods at the end of these messages.)
+connection.initAuth=Iniciando proceso de autenticación
+connection.requestAuth=Esperando su autorización
+connection.requestAccess=Finalizando autenticación
+connection.requestTimelines=Requesting user timelines
+# LOCALIZATION NOTE (connection.error.*):
+#   These will show in the account manager if an error occurs during the
+#   connection attempt.
+connection.error.userMismatch=Username mismatch.
+connection.error.failedToken=Failed to get request token.
+connection.error.authCancelled=Canceló el proceso de autorización.
+connection.error.authFailed=Failed to get authorization.
+connection.error.noNetwork=No hay conexión de red disponible.
+
+# LOCALIZATION NOTE (authPrompt):
+#   This is the prompt in the browser window that pops up to authorize us
+#   to use a Twitter account. It is shown in the title bar of the authorization
+#   window.
+authPrompt=Give permission to use your Twitter account
+
+# LOCALIZATION NOTE (options.*):
+#   These are the protocol specific options shown in the account manager and
+#   account wizard windows.
+options.track=Tracked keywords
+
+# LOCALIZATION NOTE (tooltip.*):
+#   These are the Twitter information that will appear in the tooltip
+#   for each participant on the home timeline.
+# LOCALIZATION NOTE (tooltip.created_at): the date the user joined.
+tooltip.created_at=Usuario desde
+tooltip.location=Location
+tooltip.lang=Idioma
+tooltip.time_zone=Huso horario
+tooltip.url=Homepage
+# LOCALIZATION NOTE (tooltip.protected):
+#  whether the user's tweets are publicly visible.
+tooltip.protected=Tweets protegidos
+# LOCALIZATION NOTE (tooltip.following):
+#  whether you are subscribed to the user's tweets.
+tooltip.following=Actualmente siguiendo
+tooltip.description=Descripción
+# LOCALIZATION NOTE (tooltip.*_count):
+#  Please see the right side of the official Twitter website UI.
+tooltip.friends_count=Siguiendo
+tooltip.statuses_count=Tweets
+tooltip.followers_count=Seguidores
+tooltip.listed_count=Listed
+
+# LOCALIZATION NOTE (yes, no):
+#  These are used to turn true/false values into a yes/no response.
+yes=Sí
+no=No
new file mode 100644
--- /dev/null
+++ b/chat/xmpp.properties
@@ -0,0 +1,72 @@
+# LOCALIZATION NOTE (connection.*)
+#   These will be displayed in the account manager in order to show the progress
+#   of the connection.
+#   (These will be displayed in account.connection.progress from
+#    accounts.properties, which adds … at the end, so do not include
+#    periods at the end of these messages.)
+connection.initializingStream=Initializing stream
+connection.initializingEncryption=Inicializando cifrado
+connection.authenticating=Autenticando
+connection.gettingResource=Getting resource
+connection.downloadingRoster=Descargando lista de contactos
+
+# LOCALIZATION NOTE (connection.error.*)
+#   These will show in the account manager if an error occurs during the
+#   connection attempt.
+connection.error.failedToCreateASocket=Failed to create a socket (Are you offline?)
+connection.error.serverClosedConnection=El servidor cerró la conexión
+connection.error.resetByPeer=Connection reset by peer
+connection.error.timedOut=The connection timed out
+connection.error.receivedUnexpectedData=Se recibieron datos inesperados
+connection.error.incorrectResponse=Se recibió una respuesta incorrecta
+connection.error.startTLSRequired=El servidor requiere cifrado pero está deshabilitado
+connection.error.startTLSNotSupported=El servidor no soporta cifrado pero la configuración lo requiere
+connection.error.failedToStartTLS=Failed to start encryption
+connection.error.noAuthMec=No authentication mechanism offered by the server
+connection.error.noCompatibleAuthMec=None of the authentication mechanisms offered by the server are supported
+connection.error.notSendingPasswordInClear=The server only supports authentication by sending the password in cleartext
+connection.error.authenticationFailure=Authentication failure
+connection.error.notAuthorized=No autorizado (¿Ingresó la contraseña incorrecta?)
+connection.error.failedToGetAResource=Failed to get a resource
+
+# 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):
+#   %S will be replaced by the XMPP resource identifier
+tooltip.status=Status (%S)
+tooltip.statusNoResource=Estado
+tooltip.subscription=Suscripción
+
+# LOCALIZATION NOTE (chatRoomField.*):
+#   These are the name of fields displayed in the 'Join Chat' dialog
+#   for XMPP accounts.
+#   The _ character won't be displayed; it indicates the next
+#   character of the string should be used as the access key for this
+#   field.
+chatRoomField.room=_Room
+chatRoomField.server=_Servidor
+chatRoomField.nick=_Nick
+chatRoomField.password=_Contraseña
+
+# LOCALIZATION NOTE
+#  Buddies that aren't in any group on the server will appear in this group.
+#  Try to use the same translation as for defaultGroup in instantbird.properties
+defaultGroup=Contactos
+
+# LOCALIZATION NOTE (options.*):
+#   These are the protocol specific options shown in the account manager and
+#   account wizard windows.
+options.resource=Resource
+options.connectionSecurity=Seguridad de la conexión
+options.connectionSecurity.requireEncryption=Requiere cifrado
+options.connectionSecurity.opportunisticTLS=Usar cifrado si está disponible
+options.connectionSecurity.allowUnencryptedAuth=Permitir enviar la contraseña sin cifrar
+options.connectServer=Servidor
+options.connectPort=Puerto
+
+# LOCALIZATION NOTE (gtalk.usernameHint):
+#  This is displayed inside the accountUsernameInfoWithDescription
+#  string defined in imAccounts.properties when the user is
+#  configuring a Google Talk account.
+gtalk.usernameHint=correo electrónico
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -111,17 +111,16 @@ IsEqualNodeWarning=El uso de attributes'
 TextContentWarning=El uso de attributes' textContent attribute es obsoleto. Use value en su lugar.
 EnablePrivilegeWarning=El uso de enablePrivilege es obsoleto.  Use código que se ejecute con el sistea principal (ej. una extensión) en su lugar.
 PositionWarning=El uso del atributo de posición de progreso de eventos de XMLHttpRequest es obsoleto.
 TotalSizeWarning=El usoe del atributo totalSize de progreso de eventos de XMLHttpRequest es obsoleto.
 nsIJSONDecodeDeprecatedWarning=nsIJSON.decode es obsoleto.  Use JSON.parse en su lugar.
 nsIJSONEncodeDeprecatedWarning=nsIJSON.encode es obsoleto.  Use JSON.stringify en su lugar.
 nsIDOMWindowInternalWarning=El uso de nsIDOMWindowInternal es obsoleto. Use nsIDOMWindow en su lugar.
 InputEncodingWarning=El uso de inputEncoding es obsoleto.
-GlobalStorageWarning=El uso de globalStorage es obsoleto. Use localStorage en su lugar.
 # LOCALIZATION NOTE: Do not translate "MozBeforePaint" and "mozRequestAnimationFrame"
 MozBeforePaintWarning=Los eventos MozBeforePaint no están más soportados. A mozRequestAnimationFrame se le debe pasar un argumento callback no nulo.
 FullScreenDeniedDisabled=El pedido de pantalla completa fue denegado porque la API de pantalla completa fue deshabilitada por una preferencia del usuario.
 FullScreenDeniedFocusedPlugin=El pedido de pantalla completa fue denegado porque un plugin en ventana tiene el foco.
 FullScreenDeniedHidden=El pedido de pantalla completa fue denegado porque el documento ya no es visible.
 FullScreenDeniedIframeDisallowed=El pedido de pantalla completa fue denegado porque al menos uno de los documentos que contienen iframes no tiene un atributo "mozallowfullscreen".
 FullScreenDeniedNotInputDriven=Request for full-screen was denied because Element.mozRequestFullScreen() was not called from inside a short running user-generated event handler.
 FullScreenDeniedNotInDocument=El pedido de pantalla completa fue denegado porque el elemento solicitante ya no está en su documento.
--- a/editor/ui/chrome/composer/editor.properties
+++ b/editor/ui/chrome/composer/editor.properties
@@ -107,16 +107,17 @@ Style_A=A, B, C…
 Style_a=a, b, c…
 Pixels=píxeles
 Percent=porcentaje
 PercentOfCell=% de la celda
 PercentOfWindow=% de la ventana
 PercentOfTable=% de la tabla
 #LOCALIZATION NOTE (untitledTitle): %S is the window #.  No plural handling needed.
 untitledTitle=sin título-%S
+untitledDefaultFilename=sin_titulo
 ShowToolbar=Mostrar barra de herramientas
 HideToolbar=Ocultar barra de herramientas
 ImapError=No es posible cargar la imagen
 ImapCheck=Por favor, seleccione una nueva ubicación (URL) y vuelva a intentarlo.
 SaveToUseRelativeUrl=Las URLs relativas sólo se pueden utilizar en páginas que han sido guardadas
 NoNamedAnchorsOrHeadings=(No existen encabezados o enlaces internos con nombre en esta página)
 TextColor=Color del texto
 HighlightColor=Color de texto resaltado
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/addbuddy.dtd
@@ -0,0 +1,3 @@
+<!ENTITY addBuddyWindow.title           "Agregar contacto">
+<!ENTITY name.label                     "Usuario">
+<!ENTITY account.label                  "Cuenta">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/am-im.dtd
@@ -0,0 +1,12 @@
+<!ENTITY accountWindow.title           "Propiedades de ceunta">
+<!ENTITY accountWindow.width           "300">
+<!ENTITY account.general               "General">
+<!ENTITY account.advanced              "Opciones avanzadas">
+<!ENTITY account.name                  "Usuario:">
+<!ENTITY account.password              "Contraseña:">
+<!ENTITY account.alias                 "Alias:">
+<!ENTITY account.newMailNotification   "Notify on new Mail">
+<!ENTITY account.autojoin              "Auto-Joined Channels:">
+<!ENTITY account.proxySettings.caption "Configuración de proxy:">
+<!ENTITY account.proxySettings.change.label     "Cambiar…">
+<!ENTITY account.proxySettings.change.accessKey "C">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/chat.dtd
@@ -0,0 +1,51 @@
+<!ENTITY onlineContactsHeader.label    "Online Contacts">
+<!ENTITY offlineContactsHeader.label   "Offline Contacts">
+<!ENTITY conversationsHeader.label     "Conversaciones">
+<!ENTITY searchResultConversation.label "Resultado de búsqueda">
+<!ENTITY chat.noConv.title             "Conversations will be displayed here.">
+<!ENTITY chat.noConv.description       "Use the contact list in the left panel to start a conversation.">
+<!ENTITY chat.noPreviousConv.description       "&brandShortName; currently doesn't have any previous conversations stored for this contact.">
+<!ENTITY chat.noAccount.title             "You haven't set up a chat account yet.">
+<!ENTITY chat.noAccount.description       "Let &brandShortName; guide you through the process of setting up your chat account.">
+<!ENTITY chat.accountWizard.button       "Get started">
+<!ENTITY chat.noConnectedAccount.title             "Your chat accounts are not connected.">
+<!ENTITY chat.noConnectedAccount.description       "You can connect them from the 'Chat status' dialog:">
+<!ENTITY chat.showAccountManager.button       "Show chat status">
+
+<!ENTITY chat.participants             "Participantes:">
+<!ENTITY chat.previousConversations    "Conversaciones previas:">
+<!ENTITY chat.ongoingConversation      "Ongoing conversation">
+
+<!ENTITY openConversationCmd.label     "Iniciar conversación">
+<!ENTITY openConversationCmd.accesskey "c">
+<!ENTITY closeConversationCmd.label    "Cerrar conversación">
+<!ENTITY closeConversationCmd.accesskey "C">
+<!ENTITY aliasCmd.label                "Renombrar">
+<!ENTITY aliasCmd.accesskey            "R">
+<!ENTITY deleteCmd.label               "Eliminar contacto">
+<!ENTITY deleteCmd.accesskey           "E">
+
+<!ENTITY openConversationButton.tooltip  "Iniciar conversación">
+<!ENTITY closeConversationButton.tooltip "Cerrar conversación">
+
+<!ENTITY addBuddyButton.label          "Agregar contacto">
+<!ENTITY joinChatButton.label          "Join Chat">
+<!ENTITY chatAccountsButton.label      "Mostrar cuenta">
+
+<!-- LOCALIZATION NOTE (searchAllChatMessages.label.base):
+     This is the base of the empty text for the chat search box.  We replace
+     #1 with the contents of the appropriate search.keyLabel.* value for the
+     platform (defined in messenger/messenger.dtd).
+     The goal is to convey to the user that typing in the box will allow them
+     to search for conversations and that there is a hotkey they can press
+     to get to the box faster.  If the global indexer is disabled, the search
+     box will be collapsed and the user will never see this message.
+     -->
+<!ENTITY searchAllChatMessages.label.base "Buscar todas las conversaciones… #1">
+
+<!ENTITY status.available          "Disponible">
+<!ENTITY status.unavailable        "No disponible">
+<!ENTITY status.offline            "Sin conexión">
+
+<!ENTITY openLinkCmd.label            "Abrir enlace…">
+<!ENTITY openLinkCmd.accesskey        "e">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/chat.properties
@@ -0,0 +1,86 @@
+chatTabTitle=Chat
+goBackToCurrentConversation.button=Volver a la conversación actual
+# LOCALIZATION NOTE (startAConversationWith.button):
+#  %S is replaced with the display name of a contact.
+startAConversationWith.button=Iniciar una conversación con %S
+
+# LOCALIZATION NOTE (defaultGroup):
+#  this is used in the addBuddies dialog if the list of existing groups is empty
+defaultGroup=Contactos
+
+# LOCALIZATION NOTE (buddy.authRequest.label):
+# This string appears in a notification bar at the
+# top of the Contacts window when someone added the user to his/her
+# contact list, to request the permission from the user to share
+# status information with this potential new contact.
+# %S is replaced with the user name of the potential new contact.
+buddy.authRequest.label=%S wants to chat with you
+buddy.authRequest.allow.label=Permitir
+buddy.authRequest.allow.accesskey=P
+buddy.authRequest.deny.label=Denegar
+buddy.authRequest.deny.accesskey=D
+
+# LOCALIZATION NOTE (buddy.deletePrompt.title):
+# %S here will be replaced by the alias (or username) of a buddy about
+# to be removed from the buddy list.
+buddy.deletePrompt.title=¿Borrar %S?
+
+# LOCALIZATION NOTE (buddy.deletePrompt.message):
+# %1$S will be replaced by the name of a buddy (either the alias
+# followed by the username between parenthesis if an alias is set, or
+# only the username otherwise).
+# %2$S will be the name of the protocol on which this buddy is removed
+# (for example: AIM, MSN, Google Talk).
+#
+# Please find a wording that will keep the username as close as
+# possible to the beginning of the string, because this is the
+# important information that an user should see when looking quickly
+# at this prompt.
+buddy.deletePrompt.message=%1$S will be permanently removed from your %2$S buddy list if you continue.
+
+# LOCALIZATION NOTE (buddy.deletePrompt.displayName):
+# This is used to format the display name inserted in buddy.deletePrompt.message
+# %1$S is the alias, %2$S is the username.
+buddy.deletePrompt.displayName=%1$S (%2$S)
+
+# LOCALIZATION NOTE (buddy.deletePrompt.button):
+# the & symbol indicates the position of the character that should be
+# used as the accesskey for this button.
+buddy.deletePrompt.button=&Borrar
+
+displayNameEmptyText=Display Name
+userIconFilePickerTitle=Seleccionar el nuevo ícono…
+
+# LOCALIZATION NOTE (chat.isTyping, chat.hasStoppedTyping):
+# The contact display name is displayed with a big font on a first
+# line and these two strings are displayed on a second line with a
+# smaller font. Please try to find a wording that make this look
+# almost like a sentence.
+chat.isTyping=está escribiendo…
+chat.hasStoppedTyping=ha dejado de escribir.
+# 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 está escribiendo.
+chat.contactHasStoppedTyping=%S ha dejado de escribir.
+
+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 no es un comando soportado. Ingrese /help para ver una lista de comandos.
+
+# 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=Usuario
+buddytooltip.account=Cuenta
+
+# 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=Hoy %S
+yesterday=Ayer %S
+# LOCALIZATION NOTE (dateTime):
+# %1$S is the date, %2$S is the date.
+dateTime=%1$S %2$S
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/cloudfile/Dropbox/management.dtd
@@ -0,0 +1,4 @@
+<!-- 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/.  -->
+<!ENTITY dropboxMgmt.viewSettings "Ver configuración de mi cuenta en dropbox.com">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/cloudfile/YouSendit/management.dtd
@@ -0,0 +1,4 @@
+<!-- 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/.  -->
+<!ENTITY youSendItMgmt.viewSettings "Ver configuración de mi cuenta en yousendit.com">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/cloudfile/YouSendit/settings.dtd
@@ -0,0 +1,5 @@
+<!-- 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/.  -->
+<!ENTITY youSendItSettings.username "Nombre de usuario:">
+<!ENTITY youSendItSettings.needAnAccount "¿Necesita una cuenta?">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/cloudfile/addAccountDialog.dtd
@@ -0,0 +1,12 @@
+<!-- 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/.  -->
+<!ENTITY addAccountDialog.title   "Configurar Filelink">
+<!ENTITY addAccountDialog.menuTitle "Seleccione un servicio de almacenamiento en línea">
+<!ENTITY addAccountDialog.style "width: 40em; min-height: 20em;">
+<!ENTITY addAccountDialog.accountName.label "Nombre de cuenta:">
+<!ENTITY addAccountDialog.noAccountText "We're sorry, but the current version of &brandShortName; only allows one account from each online storage service.">
+<!ENTITY addAccountDialog.createAccountText "This feature allows you to send large attachments using one of several online storage services. You can either connect to an existing account, or sign up for a new account.">
+<!ENTITY addAccountDialog.authorizing "Verificando autorización...">
+<!ENTITY addAccountDialog.error "An error occurred while setting up the account!">
+<!ENTITY addAccountDialog.acceptButton.label "Configurar cuenta">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/cloudfile/management.dtd
@@ -0,0 +1,8 @@
+<!-- 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/.  -->
+<!ENTITY cloudfileMgmt.privacyPolicy "Política de privacidad">
+<!ENTITY cloudfileMgmt.termsOfService "Términos del servicio">
+<!ENTITY cloudfileMgmt.usedSpace "Espacio usado:">
+<!ENTITY cloudfileMgmt.unusedSpace "Espacio sin usar:">
+<!ENTITY cloudfileMgmt.upgradeOffer "Obtener más espacio">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/imAccountWizard.dtd
@@ -0,0 +1,28 @@
+<!ENTITY windowTitle.label            "Chat Account Wizard">
+
+<!ENTITY accountProtocolTitle.label   "Chat network">
+<!ENTITY accountProtocolInfo.label    "Please choose the network of your chat account.">
+<!ENTITY accountProtocolField.label   "Network:">
+<!ENTITY accountProtocolGetMore.label "Get more…">
+
+<!ENTITY accountUsernameTitle.label   "Username">
+<!ENTITY accountUsernameDuplicate.label "This account is already configured!">
+
+<!ENTITY accountPasswordTitle.label   "Password">
+<!ENTITY accountPasswordInfo.label    "Please enter your password in the box below.">
+<!ENTITY accountPasswordField.label   "Password:">
+<!ENTITY accountPasswordManager.label "The password entered here will be stored in the Password Manager. Leave this box empty if you want to be prompted for your password each time this account is connected.">
+
+<!ENTITY accountAdvancedTitle.label   "Advanced Options">
+<!ENTITY accountAdvancedInfo.label    "Feel free to skip this step if you want to.">
+<!ENTITY accountAdvanced.newMailNotification.label   "Notify on new Mail">
+<!ENTITY accountAliasGroupbox.caption "Local Alias">
+<!ENTITY accountAliasField.label      "Alias:">
+<!ENTITY accountAliasInfo.label       "This will only be displayed in your conversations when you talk, remote contacts won't see it.">
+<!ENTITY accountProxySettings.caption "Proxy Settings">
+<!ENTITY accountProxySettings.change.label     "Change…">
+<!ENTITY accountProxySettings.change.accessKey "C">
+
+<!ENTITY accountSummaryTitle.label   "Summary">
+<!ENTITY accountSummaryInfo.label    "A summary of the information you entered is displayed below. Please check it before the account is created.">
+<!ENTITY accountSummary.connectNow.label "Connect this account now.">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/imAccounts.dtd
@@ -0,0 +1,26 @@
+<!ENTITY accountsWindow.title                "Instant messaging status">
+<!ENTITY accountsWindow.style                "width: 28em; height: 19em;">
+<!ENTITY accountManager.newAccount.label     "Cuenta nueva">
+<!ENTITY accountManager.newAccount.accesskey "n">
+<!ENTITY accountManager.close.label          "Cerrar">
+<!ENTITY accountManager.close.accesskey      "C">
+<!-- This should match account.commandkey in instantbird.dtd -->
+<!ENTITY accountManager.close.commandkey     "a">
+<!-- This title must be short, displayed with a big font size -->
+<!ENTITY accountManager.noAccount.title      "No hay cuentas configuradas">
+<!ENTITY accountManager.noAccount.description "Click on the &accountManager.newAccount.label; button to let &brandShortName; guide you through the process of configuring one.">
+<!ENTITY account.autoSignOn.label     "Sign-on at startup">
+<!ENTITY account.autoSignOn.accesskey "S">
+<!ENTITY account.connect.label        "Conectar">
+<!ENTITY account.connect.accesskey    "o">
+<!ENTITY account.disconnect.label     "Desconectar">
+<!ENTITY account.disconnect.accesskey "D">
+<!ENTITY account.edit.label           "Propiedades">
+<!ENTITY account.edit.accesskey       "P">
+<!ENTITY account.moveup.label         "Mover arriba">
+<!ENTITY account.movedown.label       "Mover abajo">
+<!ENTITY account.cancelReconnection.label         "Cancelar reconección">
+<!ENTITY account.cancelReconnection.accesskey     "a">
+<!ENTITY account.connecting           "Conectando…">
+<!ENTITY account.disconnecting        "Desconectando…">
+<!ENTITY account.disconnected         "No conectado">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/imAccounts.properties
@@ -0,0 +1,59 @@
+# LOCALIZATION NOTE (protoOptions):
+# %S is replaced by the name of a protocol
+protoOptions=Opciones de %S
+accountUsername=Nombre de usuario:
+# LOCALIZATION NOTE (accountColon):
+# This string is used to append a colon after the label of each
+# option. It's localizable so that the typography can be adapted.
+accountColon=%S:
+# LOCALIZATION NOTE (accountUsernameInfo):
+# %S is replaced by the name of a protocol
+accountUsernameInfo=Ingrese el nombre de usuario de su cuenta de %S.
+# LOCALIZATION NOTE (accountUsernameInfoWithDescription):
+# %1$S is a hint for the expected format of the username
+# %2$S is the name of a protocol
+accountUsernameInfoWithDescription=Please enter the username (%1$S) for your %2$S account.
+
+# LOCALIZATION NOTE (account.connection.error):
+# %S is the error message.
+account.connection.error=Error: %S
+# LOCALIZATION NOTE (account.connection.errorUnknownPrpl)
+# %S is the id (not very user friendly; hence the quotes) of the missing plugin.
+account.connection.errorUnknownPrpl=No '%S' protocol plugin.
+account.connection.errorEnteringPasswordRequired=Se necesita ingresar una contraseña para conectar a esta cuenta.
+account.connection.errorCrashedAccount=A crash occurred while connecting this account.
+# LOCALIZATION NOTE (account.connection.progress):
+# %S is a message indicating progress of the connection process
+account.connection.progress=Conectando: %S…
+account.connecting=Conectando…
+account.connectedForSeconds=Conectado por unos pocos segundos.
+# LOCALIZATION NOTE (account.connectedFor{Double,Single},
+#                    account.reconnectIn{Double,Single}):
+# Each pair of %S is a number followed by a unit. The units are
+# already localized in a downloads.properties file of the toolkit.
+account.connectedForDouble=Conectado por %1$S %2$S, %3$S %4$S.
+account.connectedForSingle=Conectado por cerca de %1$S %2$S.
+account.reconnectInDouble=Reconexión en %1$S %2$S, %3$S %4$S.
+account.reconnectInSingle=Reconexión en %1$S %2$S.
+
+requestAuthorizeTitle=Authorization request
+# LOCALIZATION NOTE (requestAuthorizeAllow, requestAuthorizeDeny):
+# the & symbol indicates the position of the character that should be
+# used as the accesskey for this button.
+requestAuthorizeAllow=&Permitir
+requestAuthorizeDeny=&Denegar
+# LOCALIZATION NOTE (requestAuthorizeText):
+# %S is a contact username.
+requestAuthorizeText=%S added you to his/her buddy list, do you want to allow him/her to see you?
+
+accountsManager.notification.button.accessKey=C
+accountsManager.notification.button.label=Conectar ahora
+accountsManager.notification.userDisabled.label=Ha deshabilitado las conexiones automáticas.
+accountsManager.notification.safeMode.label=Automatic Connection Settings have been ignored because the application is currently running in Safe-Mode.
+accountsManager.notification.startOffline.label=Automatic Connection Settings have been ignored because the application was started in Offline Mode.
+accountsManager.notification.crash.label=The last run exited unexpectedly while connecting. Automatic Connections have been disabled to give you an opportunity to Edit your Settings.
+# LOCALIZATION NOTE (accountsManager.notification.singleCrash.label): Semi-colon list of plural forms.
+#  See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+#  #1 is the number of accounts that are suspected to have caused a crash.
+accountsManager.notification.singleCrash.label=A previous run exited unexpectedly while connecting a new or edited account. It has not been connected so that you can Edit its Settings.;A previous run exited unexpectedly while connecting #1 new or edited accounts. They have not been connected so that you can Edit their Settings.
+accountsManager.notification.other.label=La conexión automática ha sido deshabilitada.
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/joinChat.dtd
@@ -0,0 +1,6 @@
+<!ENTITY joinChatWindow.title           "Join chat">
+<!ENTITY name.label                     "Room">
+<!ENTITY optional.label                 "(opcional)">
+<!ENTITY account.label                  "Cuenta">
+<!ENTITY autojoin.label                 "Auto-join this Chat Room">
+<!ENTITY autojoin.accesskey             "A">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/preferences/applications.properties
@@ -0,0 +1,3 @@
+# LOCALIZATION NOTE (dialog_removeAccount):
+# %S will be replaced with the user-defined name of a storage account.
+dialog_removeAccount=¿Está seguro de quere borrar la cuenta "%S"?
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/preferences/chat.dtd
@@ -0,0 +1,20 @@
+<!ENTITY  startupAction.label         "Al iniciar &brandShortName;:">
+<!ENTITY  startupAction.accesskey     "A">
+<!ENTITY  startupOffline.label        "Mantener mis cuentas de chat desconectadas">
+<!ENTITY  startupConnectAuto.label    "Conectar mis cuentas de chat automáticamente">
+
+<!-- LOCALIZATION NOTE: reportIdleAfter.label is displayed first, then
+there's a field where the user can enter a number, and itemTime is
+displayed at the end of the line. The translations of the
+reportIdleAfter.label and idleTime parts don't have to mean the exact
+same thing as in English; please try instead to translate the whole
+sentence. -->
+<!ENTITY  reportIdleAfter.label         "Let my contacts know that I am Idle after">
+<!ENTITY  reportIdleAfter.accesskey     "I">
+<!ENTITY  idleTime                      "minutos de inactividad">
+
+<!ENTITY  andSetStatusToAway.label      "and set my status to Away with this status message:">
+<!ENTITY  andSetStatusToAway.accesskey  "A">
+
+<!ENTITY  sendTyping.label              "Send typing notifications in conversations">
+<!ENTITY  sendTyping.accesskey          "t">
--- a/mobile/android/base/android_strings.dtd
+++ b/mobile/android/base/android_strings.dtd
@@ -22,19 +22,23 @@
 
 <!ENTITY  launcher_shortcuts_title "Aplicaciones web de &brandShortName;">
 <!ENTITY  launcher_shortcuts_empty "No se encontraron aplicaciones web">
 
 <!ENTITY choose_file "Elegir archivo">
 
 <!ENTITY awesomebar_default_text "Enter Search or Address">
 
+<!ENTITY remote_tabs "Pestañas sincronizadas">
+<!ENTITY remote_tabs_show_all "Mostrar todas las pestañas">
+
 <!ENTITY bookmark "Marcador">
 <!ENTITY bookmark_added "Marcador agregado">
 <!ENTITY bookmark_removed "Marcador eliminado">
+<!ENTITY bookmark_updated "Marcador actualizado">
 
 <!ENTITY history_today_section "Hoy">
 <!ENTITY history_yesterday_section "Ayer">
 <!ENTITY history_week_section "Hace 7 días">
 <!ENTITY history_older_section "Hace más de 7 días">
 
 <!ENTITY reload "Recargar">
 <!ENTITY forward "Adelante">
@@ -74,22 +78,29 @@
 
 <!ENTITY quit "Salir">
 
 <!ENTITY addons "Complementos">
 <!ENTITY downloads "Descargas">
 <!ENTITY char_encoding "Codificación de caracteres">
 
 <!ENTITY share "Compartir">
+<!ENTITY share_title "Compartir vía">
 <!ENTITY save_as_pdf "Guardar como PDF">
 
 <!ENTITY contextmenu_open_new_tab "Abrir en pestaña nueva">
 <!ENTITY contextmenu_remove_bookmark "Eliminar">
 <!ENTITY contextmenu_add_to_launcher "Agregar a pantalla de inicio">
 <!ENTITY contextmenu_share "Compartir">
+<!ENTITY contextmenu_edit_bookmark "Editar">
+
+<!ENTITY bookmark_edit_title "Editar marcador">
+<!ENTITY bookmark_edit_name "Nombre">
+<!ENTITY bookmark_edit_location "Dirección">
+<!ENTITY bookmark_edit_keyword "Palabra clave">
 
 <!ENTITY site_settings_title        "Borrar configuración del sitio">
 <!ENTITY site_settings_cancel       "Cancelar">
 <!ENTITY site_settings_clear        "Borrar">
 <!ENTITY site_settings_no_settings  "No hay configuración que borrar.">
 
 <!ENTITY masterpassword_create_title "Crear contraseña maestra">
 <!ENTITY masterpassword_remove_title "Eliminar contraseña maestra">
--- a/mobile/android/chrome/browser.properties
+++ b/mobile/android/chrome/browser.properties
@@ -17,16 +17,32 @@ alertDownloadsSize=Descarga demasiado gr
 alertDownloadsNoSpace=No hay espacio suficiente
 alertDownloadsToast=Descarga iniciada…
 
 alertFullScreenToast=Presioná ATRAS para dejar el modo de pantalla completa
 
 downloadCancelPromptTitle=Cancelar descarga
 downloadCancelPromptMessage=¿Querés cancelar esta descarga?
 
+# LOCALIZATION NOTE (addonError-1, addonError-2, addonError-3, addonError-4):
+# #1 is the add-on name, #2 is the add-on host, #3 is the application name
+addonError-1=El complemento no pudo descargase por una falla en la conexión a #2.
+addonError-2=El complemento de #2 no pudo instalarse porque no coincide con lo que esperaba #3.
+addonError-3=El complemento descargado desde #2 no pudo instalarse porque parece estar corrupto.
+addonError-4=#1 no pudo instalarse porque #3 no puede modificar el archivo necesario.
+
+# LOCALIZATION NOTE (addonLocalError-1, addonLocalError-2, addonLocalError-3, addonLocalError-4, addonErrorIncompatible, addonErrorBlocklisted):
+# #1 is the add-on name, #3 is the application name, #4 is the application version
+addonLocalError-1=Este complemento no pudo instalarse por un error en el sistema de archivos.
+addonLocalError-2=Este complemento no pudo instalarse porque no coincide con lo que esperaba #3.
+addonLocalError-3=Este complemento no pudo instalarse porque parece estar corrupto.
+addonLocalError-4=#1 no pudo instalarse porque #3 no puede modificar el archivo necesario.
+addonErrorIncompatible=#1 no pudo instalarse porque no es compatible con #3 #4.
+addonErrorBlocklisted=#1 no pudo instalarse porque tiene un riesgo alto de cuasar problemas de estabilidad o seguridad.
+
 # Notifications
 notificationRestart.normal=Reiniciar para completar los cambios.
 notificationRestart.update=Complementos actualizados. Reiniciar para completar los cambios.
 notificationRestart.blocked=Complementos inseguros instalados. Reiniciar para deshabilitarlos.
 notificationRestart.button=Reiniciar
 
 # Popup Blocker
 popupWarning=%S evitó que este sitio abra una ventana emergente.
@@ -35,17 +51,18 @@ popupButtonAllowOnce=Mostrar
 popupButtonAlwaysAllow2=Siempre mostrar
 popupButtonNeverWarn2=Nunca mostrar
 
 # LOCALIZATION NOTE (blockPopups.label): Label that will be used in
 # site settings dialog.
 blockPopups.label=Bloquear emergentes
 
 # Telemetry
-telemetry.optin.message=¿Querés ayudar a %S enviando información anónima de uso a Mozilla?
+telemetry.optin.message2=¿Enviás información a %1$S para que podamos mejorar %2$S?
+telemetry.optin.learnMore=Conocer más
 telemetry.optin.yes=Sí
 telemetry.optin.no=No
 
 # XPInstall
 xpinstallPromptWarning2=%S evitó que este sitio (%S) te pida instalar software en tu dispositivo.
 xpinstallPromptAllowButton=Permitir
 xpinstallDisabledMessageLocked=La instalación de software ha sido deshabilitada por el administrador de tu sistema.
 xpinstallDisabledMessage2=La instalación de software está actualmente deshabilitada. Presioná Habilitar e intentá nuevamente.
@@ -177,19 +194,22 @@ intl.charsetmenu.browser.static=iso-8859
 #Application Menu
 appMenu.more=Más
 
 #Text Selection
 selectionHelper.textCopied=Texto copiado al portapapeles
 
 # Context menu
 contextmenu.openInNewTab=Abrir enlace en nueva pestaña
+contextmenu.shareLink=Compartir enlace
+contextmenu.bookmarkLink=Marcar enlace
 contextmenu.changeInputMethod=Seleccionar método de entrada
 contextmenu.fullScreen=Pantalla completa
 contextmenu.saveImage=Guardar imagen
+contextmenu.addSearchEngine=Agregar buscador
 
 contextmenu.copy=Copiar
 contextmenu.copyAll=Copiar todo
 contextmenu.selectAll=Seleccionar todo
 contextmenu.paste=Pegar
 
 # Select UI
 selectHelper.closeMultipleSelectDialog=Listo
--- a/toolkit/chrome/global/aboutSupport.dtd
+++ b/toolkit/chrome/global/aboutSupport.dtd
@@ -11,35 +11,45 @@
 <!ENTITY aboutSupport.extensionName "Nombre">
 <!ENTITY aboutSupport.extensionEnabled "Habilitada">
 <!ENTITY aboutSupport.extensionVersion "Versión">
 <!ENTITY aboutSupport.extensionId "ID">
 
 <!ENTITY aboutSupport.appBasicsTitle "Esenciales de la aplicación">
 <!ENTITY aboutSupport.appBasicsName "Nombre">
 <!ENTITY aboutSupport.appBasicsVersion "Versión">
+
 <!ENTITY aboutSupport.appBasicsProfileDir "Directorio de perfil">
+<!-- LOCALIZATION NOTE (aboutSupport.appBasicsProfileDirWinMac):
+This is the Windows- and Mac-specific variant of aboutSupport.appBasicsProfileDir.
+Windows/Mac use the term "Folder" instead of "Directory" -->
+<!ENTITY aboutSupport.appBasicsProfileDirWinMac "Carpeta de perfil">
+
 <!ENTITY aboutSupport.appBasicsEnabledPlugins "Plugins habilitados">
 <!ENTITY aboutSupport.appBasicsBuildConfig "Configuración de compilación">
 <!ENTITY aboutSupport.appBasicsUserAgent "Agente de usuario">
 <!ENTITY aboutSupport.appBasicsCrashIDs "Informes de fallos">
 <!ENTITY aboutSupport.appBasicsMemoryUse "Uso de memoria">
 
 <!ENTITY aboutSupport.showDir.label "Abrir directorio">
-
 <!-- LOCALIZATION NOTE (aboutSupport.showMac.label): This is the Mac-specific
 variant of aboutSupport.showDir.label.  This allows us to use the preferred
 "Finder" terminology on Mac. -->
 <!ENTITY aboutSupport.showMac.label "Mostrar en Finder">
 <!-- LOCALIZATION NOTE (aboutSupport.showWin.label): This is the Windows-specific
 variant of aboutSupport.showDir.label. -->
 <!ENTITY aboutSupport.showWin.label "Mostrar carpeta">
 
 <!ENTITY aboutSupport.modifiedKeyPrefsTitle "Preferencias importantes modificadas">
 <!ENTITY aboutSupport.modifiedPrefsName "Nombre">
 <!ENTITY aboutSupport.modifiedPrefsValue "Valor">
 
 <!ENTITY aboutSupport.graphicsTitle "Gráficos">
 
+<!ENTITY aboutSupport.jsTitle "JavaScript">
+<!ENTITY aboutSupport.jsIncrementalGC "GC Incremental">
+
+<!ENTITY aboutSupport.libraryVersionsTitle "Versiones de libs">
+
 <!ENTITY aboutSupport.installationHistoryTitle "Historial de instalación">
 <!ENTITY aboutSupport.updateHistoryTitle "Historial de actualizaciones">
 
 <!ENTITY aboutSupport.copyToClipboard.label "Copiar todo al portapapeles">
--- a/toolkit/chrome/global/aboutSupport.properties
+++ b/toolkit/chrome/global/aboutSupport.properties
@@ -35,8 +35,12 @@ adapterDescription2 = Descripción del adaptador (GPU #2)
 adapterVendorID2 = ID de fabricante (GPU #2) 
 adapterDeviceID2 = ID de dispositivo (GPU #2)
 adapterDrivers2 = Drivers del adaptador (GPU #2)
 adapterRAM2 = RAM del adaptador (GPU #2)
 driverVersion2 = Versión del driver (GPU #2)
 driverDate2 = Fecha del driver (GPU #2)
 isGPU2Active = GPU #2 Activa
 webglRenderer = Procesador WebGL
+
+minLibVersions = Versión mínima esperada
+loadedLibVersions = Versión en uso
+
new file mode 100644
--- /dev/null
+++ b/toolkit/chrome/global/resetProfile.dtd
@@ -0,0 +1,13 @@
+<!-- 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/.  -->
+
+<!ENTITY resetProfile.dialog.title        "Restablecer &brandShortName;">
+<!ENTITY resetProfile.dialog.description  "¿Está seguro de querer restablecer &brandShortName; a su estado inicial?">
+<!ENTITY resetProfile.dialog.items.label  "Se preservará lo siguiente:">
+<!ENTITY resetProfile.dialog.footer.label "&brandShortName; se reiniciará y todo el resto será eliminado.">
+<!ENTITY resetProfile.dialog.button.label "Restablecer &brandShortName;">
+
+<!ENTITY resetProfile.title               "Restablecer &brandShortName; a su estado original">
+<!ENTITY resetProfile.description         "Si está teniendo problemas graves que no puede resolver, puede arrancar de cero solamente manteniendo su información esencial.">
+<!ENTITY resetProfile.button.label        "Restablecer &brandShortName;">
--- a/toolkit/chrome/global/viewSource.dtd
+++ b/toolkit/chrome/global/viewSource.dtd
@@ -18,30 +18,30 @@
 <!ENTITY printPreviewCmd.label "Vista previa">
 <!ENTITY printPreviewCmd.accesskey "V">
 <!ENTITY printCmd.label "Imprimir…">
 <!ENTITY printCmd.accesskey "p">
 <!ENTITY printCmd.commandkey "P">
 <!ENTITY closeCmd.label "Cerrar">
 <!ENTITY closeCmd.accesskey "C">
 <!ENTITY closeCmd.commandkey "W">
-
-<!-- LOCALIZATION NOTE :
-textEnlarge.commandkey3, textReduce.commandkey2 and
-textReset.commandkey2 are alternative acceleration keys for zoom.
-If shift key is needed with your locale popular keyboard for them,
-you can use these alternative items. Otherwise, their values should be empty.  -->
-
-<!ENTITY textEnlarge.commandkey "+">
-<!ENTITY textEnlarge.commandkey2 "=">
-<!ENTITY textEnlarge.commandkey3 "">
-<!ENTITY textReduce.commandkey "-">
-<!ENTITY textReduce.commandkey2 "">
-<!ENTITY textReset.commandkey "0">
-<!ENTITY textReset.commandkey2 "">
+
+<!-- LOCALIZATION NOTE :
+textEnlarge.commandkey3, textReduce.commandkey2 and
+textReset.commandkey2 are alternative acceleration keys for zoom.
+If shift key is needed with your locale popular keyboard for them,
+you can use these alternative items. Otherwise, their values should be empty.  -->
+
+<!ENTITY textEnlarge.commandkey "+">
+<!ENTITY textEnlarge.commandkey2 "=">
+<!ENTITY textEnlarge.commandkey3 "">
+<!ENTITY textReduce.commandkey "-">
+<!ENTITY textReduce.commandkey2 "">
+<!ENTITY textReset.commandkey "0">
+<!ENTITY textReset.commandkey2 "">
 
 <!ENTITY goToLineCmd.label "Ir a línea…">
 <!ENTITY goToLineCmd.accesskey "I">
 <!ENTITY goToLineCmd.commandkey "l">
 
 <!ENTITY viewMenu.label "Ver">
 <!ENTITY viewMenu.accesskey "V">
 <!ENTITY reloadCmd.label "Recargar">
@@ -62,14 +62,20 @@ you can use these alternative items. Oth
 
 <!ENTITY findOnCmd.label "Buscar en esta página…">
 <!ENTITY findOnCmd.accesskey "B">
 <!ENTITY findOnCmd.commandkey "f">
 <!ENTITY findAgainCmd.label "Buscar de nuevo">
 <!ENTITY findAgainCmd.accesskey "n">
 <!ENTITY findAgainCmd.commandkey "g">
 <!ENTITY findAgainCmd.commandkey2 "VK_F3">
-<!ENTITY backCmd.label "Atrás">
-<!ENTITY backCmd.accesskey "A">
-<!ENTITY forwardCmd.label "Adelante">
-<!ENTITY forwardCmd.accesskey "d">
-<!ENTITY goBackCmd.commandKey "[">
-<!ENTITY goForwardCmd.commandKey "]">
+<!ENTITY backCmd.label "Atrás">
+<!ENTITY backCmd.accesskey "A">
+<!ENTITY forwardCmd.label "Adelante">
+<!ENTITY forwardCmd.accesskey "d">
+<!ENTITY goBackCmd.commandKey "[">
+<!ENTITY goForwardCmd.commandKey "]">
+
+<!ENTITY copyLinkCmd.label "Copiar dirección del enlace">
+<!ENTITY copyLinkCmd.accesskey "l">
+<!ENTITY copyEmailCmd.label "Copiar dirección de correo electrónico">
+<!ENTITY copyEmailCmd.accesskey "e">
+