Another rund of fixes
authorMarcelo Poli <mpoli@lt24.zzn.com>
Sat, 12 Dec 2009 02:31:46 -0300
changeset 187 720eb1ccc92f939f0a3a4e8b37bc4e8fc1731505
parent 186 f0caead6f82b09e375a72f604ed2531b311e6dd6
child 188 04dbf4b79b622961856e780b93e603629dbc3744
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:47:06 +0000
Another rund of fixes
suite/chrome/common/sidebar/local-panels.dtd
suite/chrome/common/sidebar/preview.dtd
suite/chrome/common/tasksOverlay.dtd
suite/chrome/common/unix/platformCommunicatorOverlay.dtd
suite/chrome/common/utilityOverlay.dtd
suite/chrome/common/win/platformCommunicatorOverlay.dtd
suite/chrome/mailnews/FilterEditor.dtd
suite/chrome/mailnews/FilterListDialog.dtd
suite/chrome/mailnews/SearchDialog.dtd
suite/chrome/mailnews/addressbook/abCardOverlay.dtd
suite/chrome/mailnews/addressbook/abMailListDialog.dtd
suite/chrome/mailnews/addressbook/abMainWindow.dtd
suite/chrome/mailnews/addressbook/addressBook.properties
suite/chrome/mailnews/compose/composeMsgs.properties
suite/chrome/mailnews/compose/messengercompose.dtd
suite/chrome/mailnews/custom.properties
suite/chrome/mailnews/eudoraImportMsgs.properties
suite/chrome/mailnews/filter.properties
suite/chrome/mailnews/folderProps.dtd
suite/chrome/mailnews/folderpane.dtd
suite/chrome/mailnews/imapMsgs.properties
suite/chrome/mailnews/importDialog.dtd
suite/chrome/mailnews/importMsgs.properties
suite/chrome/mailnews/localMsgs.properties
suite/chrome/mailnews/mailOverlay.dtd
suite/chrome/mailnews/mapi/mapi.properties
suite/chrome/mailnews/messenger.dtd
suite/chrome/mailnews/messenger.properties
suite/chrome/mailnews/mime.properties
suite/chrome/mailnews/msgAccountCentral.dtd
suite/chrome/mailnews/msgFolderPickerOverlay.dtd
suite/chrome/mailnews/msgHdrViewOverlay.dtd
suite/chrome/mailnews/msgHdrViewPopup.dtd
suite/chrome/mailnews/msgmdn.properties
suite/chrome/mailnews/news.properties
suite/chrome/mailnews/oeImportMsgs.properties
suite/chrome/mailnews/offline.properties
suite/chrome/mailnews/outlookImportMsgs.properties
suite/chrome/mailnews/pref/AccountManager.dtd
suite/chrome/mailnews/pref/AccountWizard.dtd
suite/chrome/mailnews/pref/am-addressing.dtd
suite/chrome/mailnews/pref/am-advanced.dtd
suite/chrome/mailnews/pref/am-copies.dtd
suite/chrome/mailnews/pref/am-identities-list.dtd
suite/chrome/mailnews/pref/am-identity-edit.dtd
suite/chrome/mailnews/pref/am-main.dtd
suite/chrome/mailnews/pref/am-offline.dtd
suite/chrome/mailnews/pref/am-server-advanced.dtd
suite/chrome/mailnews/pref/am-server-top.dtd
suite/chrome/mailnews/pref/mailPrefsOverlay.dtd
suite/chrome/mailnews/pref/pref-addressing.dtd
suite/chrome/mailnews/pref/pref-directory-add.dtd
suite/chrome/mailnews/pref/pref-directory.dtd
suite/chrome/mailnews/pref/pref-formatting.dtd
suite/chrome/mailnews/pref/pref-junk.dtd
suite/chrome/mailnews/pref/pref-mailnews.dtd
suite/chrome/mailnews/pref/pref-offline.dtd
suite/chrome/mailnews/pref/pref-viewing_messages.dtd
suite/chrome/mailnews/pref/prefs.properties
suite/chrome/mailnews/pref/smtpEditOverlay.dtd
suite/chrome/mailnews/region.properties
suite/chrome/mailnews/search-attributes.properties
suite/chrome/mailnews/search-operators.properties
suite/chrome/mailnews/search.properties
suite/chrome/mailnews/smime/am-smime.dtd
suite/chrome/mailnews/smime/am-smime.properties
suite/chrome/mailnews/smime/msgCompSMIMEOverlay.dtd
suite/chrome/mailnews/smime/msgSecurityInfo.properties
suite/chrome/mailnews/start.dtd
suite/chrome/mailnews/threadpane.dtd
suite/installer/windows/custom.properties
suite/installer/windows/mui.properties
suite/updater/updater.ini
--- a/suite/chrome/common/sidebar/local-panels.dtd
+++ b/suite/chrome/common/sidebar/local-panels.dtd
@@ -32,13 +32,12 @@
    - 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 ***** -->
 
 <!-- extracted from ./local-panels.rdf -->
 
-<!ENTITY sidebar.whats-related.label  "What's Related">
-<!ENTITY sidebar.search.label         "Search">
-<!ENTITY sidebar.client-bookmarks.label     "Bookmarks">
-<!ENTITY sidebar.client-history.label       "History">
-<!ENTITY sidebar.client-addressbook.label   "Address Book">
+<!ENTITY sidebar.search.label         "Buscar">
+<!ENTITY sidebar.client-bookmarks.label     "Marcadores">
+<!ENTITY sidebar.client-history.label       "Historial">
+<!ENTITY sidebar.client-addressbook.label   "Libreta de direcciones">
--- a/suite/chrome/common/sidebar/preview.dtd
+++ b/suite/chrome/common/sidebar/preview.dtd
@@ -30,10 +30,9 @@
    - 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 sidebar.preview.title.label          "Tab Preview">
-<!ENTITY sidebar.preview.close.label          "Close">
+<!ENTITY sidebar.preview.title.label          "Vista previa de la pestaña">
--- a/suite/chrome/common/tasksOverlay.dtd
+++ b/suite/chrome/common/tasksOverlay.dtd
@@ -1,42 +1,46 @@
 <!-- extracted from tasksOverlay.xul -->
-<!ENTITY navigatorCmd.label "Browser">
-<!ENTITY navigatorCmd.accesskey "B">
+<!ENTITY navigatorCmd.label "Navegador">
+<!ENTITY navigatorCmd.accesskey "N">
 <!ENTITY navigatorCmd.commandkey "1">
 <!-- LOCALIZATION NOTE (editorCmd.label): DONT_TRANSLATE -->
 <!ENTITY editorCmd.label					"Composer">
-<!ENTITY editorCmd.accesskey				"c">
+<!ENTITY editorCmd.accesskey				"C">
 <!ENTITY editorCmd.commandkey				"4">
 
-<!ENTITY securityInfoCmd.label					".Security Info">  
-<!ENTITY securityInfoCmd.accesskey				"s">
-<!ENTITY javaConsoleCmd.label					"Java Console">
-<!ENTITY javaConsoleCmd.accesskey				"j">
-
-<!ENTITY errorConsoleCmd.label                                  "Error Console">
-<!ENTITY errorConsoleCmd.accesskey				"C">
+<!ENTITY javaConsoleCmd.label					"Consola de Java">
+<!ENTITY javaConsoleCmd.accesskey				"J">
 
-<!-- LOCALIZATION NOTE (privacyMenu.label): DONT_TRANSLATE -->
-<!ENTITY privacyMenu.label "Privacy &amp; Security">
-<!ENTITY privacyMenu.accesskey "p">
+<!ENTITY errorConsoleCmd.label                                  "Consola de errores">
+<!ENTITY errorConsoleCmd.accesskey				"C">
+<!ENTITY errorConsoleCmd.commandkey				"j">
 
-<!ENTITY taskNavigator.tooltip  "Browser">
+<!ENTITY taskNavigator.tooltip  "Navegador">
 <!ENTITY taskComposer.tooltip  "Composer">
-<!ENTITY taskBar.tooltip  "Status Bar">
 
-<!ENTITY webDevelopment.label "Web Development">
+<!ENTITY webDevelopment.label "Desarrollo Web">
 <!ENTITY webDevelopment.accesskey "W">
 
-<!ENTITY windowMenu.label "Window">
-<!ENTITY windowMenu.accesskey "W">
+<!ENTITY windowMenu.label "Ventana">
+<!ENTITY windowMenu.accesskey "V">
+
+<!ENTITY tasksMenu.label "Herramientas">
+<!ENTITY tasksMenu.accesskey "t"> 
+
+<!ENTITY passwordManagerCmd.label "Administrador de contraseñas">
+<!ENTITY passwordManagerCmd.accesskey "A">
 
-<!ENTITY tasksMenu.label "Tools">
-<!ENTITY tasksMenu.accesskey "T"> 
+<!ENTITY passwordDisplayCmd.label "Administrar contraseñas guardadas">
+<!ENTITY passwordDisplayCmd.accesskey "m">
+
+<!ENTITY passwordExpireCmd.label "Terminar sesión">
+<!ENTITY passwordExpireCmd.accesskey "T">
 
-<!ENTITY downloadManagerCmd.label "Download Manager">
-<!ENTITY downloadManagerCmd.accesskey "D">
+<!ENTITY downloadManagerCmd.label "Administrador de descargas">
+<!ENTITY downloadManagerCmd.accesskey "d">
+<!ENTITY downloadManagerCmd.commandkey "j">
 
-<!ENTITY addonsManagerCmd.label "Add-on Manager">
+<!ENTITY addonsManagerCmd.label "Administrador de agregados">
 <!ENTITY addonsManagerCmd.accesskey "A">
 
-<!ENTITY switchProfileCmd.label "Switch Profile…">
-<!ENTITY switchProfileCmd.accesskey "h">
+<!ENTITY switchProfileCmd.label "Cambiar de perfil…">
+<!ENTITY switchProfileCmd.accesskey "C">
--- a/suite/chrome/common/unix/platformCommunicatorOverlay.dtd
+++ b/suite/chrome/common/unix/platformCommunicatorOverlay.dtd
@@ -1,29 +1,33 @@
 <!-- unix -->
 <!-- LOCALIZATION NOTE : FILE Do not translate all the Cmd.key and accesskey --> 
 
-<!ENTITY closeCmd.label                 "Close">  
+<!ENTITY closeCmd.label                 "Cerrar ">  
 <!ENTITY closeCmd.key                   "W">  
-<!ENTITY closeCmd.accesskey             "c">
+<!ENTITY closeCmd.accesskey             "C">
 
-<!ENTITY quitApplicationCmd.label       "Quit"> 
+<!ENTITY quitApplicationCmd.label       "Salir"> 
 <!ENTITY quitApplicationCmd.key         "Q"> 
-<!ENTITY quitApplicationCmd.accesskey   "q">
+<!ENTITY quitApplicationCmd.accesskey   "S">
 
-<!ENTITY redoCmd.label                  "Redo">  
+<!ENTITY redoCmd.label                  "Rehacer">  
 <!ENTITY redoCmd.key                    "Y">  
-<!ENTITY redoCmd.accesskey              "r">
+<!ENTITY redoCmd.accesskey              "R">
 
 <!ENTITY findTypeTextCmd.key            "/">
 <!ENTITY findTypeLinksCmd.key           "'">
 
 <!ENTITY accel.emacs_conflict           "accel,shift">
 
 <!-- Help viewer -->
-<!ENTITY openHelpCmd.label              "Help Contents">
-<!ENTITY openHelpCmd.accesskey          "H">
+<!ENTITY openHelpCmd.label              "Contenido de la ayuda">
+<!ENTITY openHelpCmd.accesskey          "C">
 <!ENTITY openHelpCmd.key                "VK_F1">
 
 <!-- Key labels, for mousewheel prefs -->
 <!ENTITY ctrlKey.label                  "Ctrl">
 <!ENTITY altKey.label                   "Alt">
-<!ENTITY shiftKey.label                 "Shift">
+<!ENTITY shiftKey.label                 "May">
+
+<!-- Copy Image Location (regression fix for bug 469481) -->
+<!ENTITY copyImageURLCmd.label          "Copiar dirección de la imagen">
+<!ENTITY copyImageURLCmd.accesskey      "i">
--- a/suite/chrome/common/utilityOverlay.dtd
+++ b/suite/chrome/common/utilityOverlay.dtd
@@ -1,95 +1,112 @@
 <!-- these things need to move into utilityOverlay.xul -->
-<!ENTITY  offlineGoOfflineCmd.label                 "Work Offline">
-<!ENTITY  offlineGoOfflineCmd.accesskey             "k">
+<!ENTITY  offlineGoOfflineCmd.label                 "Trabajar sin conexión">
+<!ENTITY  offlineGoOfflineCmd.accesskey             "T">
 
 <!-- LOCALIZATION NOTE : FILE This file contains the global menu items --> 
 
-<!ENTITY fileMenu.label					"File"> 
-<!ENTITY fileMenu.accesskey				"f">
-<!ENTITY newMenu.label						"New">
-<!ENTITY newMenu.accesskey					"N">
-<!ENTITY newBlankPageCmd.label "Composer Page">
+<!ENTITY fileMenu.label					"Archivo"> 
+<!ENTITY fileMenu.accesskey				"A">
+<!ENTITY newMenu.label					"Nuevo">
+<!ENTITY newMenu.accesskey				"N">
+<!ENTITY newBlankPageCmd.label "Página de Composer">
 <!ENTITY newBlankPageCmd.accesskey "P" >
 <!ENTITY newBlankPageCmd.key "n" >
-<!ENTITY newPageFromTemplateCmd.label "Page Using Template">
+<!ENTITY newPageFromTemplateCmd.label "Página que usa plantilla">
 <!ENTITY newPageFromTemplateCmd.accesskey "t">
-<!ENTITY newPageFromDraftCmd.label "Page Using Draft">
-<!ENTITY newPageFromDraftCmd.accesskey "d">
-<!ENTITY newNavigatorCmd.label "Browser Window">
+<!ENTITY newPageFromDraftCmd.label "Página usando borrador">
+<!ENTITY newPageFromDraftCmd.accesskey "P">
+<!ENTITY newNavigatorCmd.label "Ventana del navegador">
 <!ENTITY newNavigatorCmd.key "N">
-<!ENTITY newNavigatorCmd.accesskey "B">
+<!ENTITY newNavigatorCmd.accesskey "V">
 
-<!ENTITY editMenu.label					"Edit"> 
-<!ENTITY editMenu.accesskey				"e"> 
-<!ENTITY undoCmd.label						"Undo">  
+<!ENTITY editMenu.label					"Editar"> 
+<!ENTITY editMenu.accesskey				"E"> 
+<!ENTITY undoCmd.label						"Deshacer">  
 <!ENTITY undoCmd.key						"Z">  
-<!ENTITY undoCmd.accesskey					"U"> 
-<!ENTITY redoCmd.label						"Redo">  
+<!ENTITY undoCmd.accesskey					"D"> 
+<!ENTITY redoCmd.label						"Rehacer">  
 <!ENTITY redoCmd.key						"Y">  
 <!ENTITY redoCmd.accesskey					"R"> 
-<!ENTITY cutCmd.label						"Cut">  
+<!ENTITY cutCmd.label						"Cortar">  
 <!ENTITY cutCmd.key							"X">  
 <!ENTITY cutCmd.accesskey					"t"> 
-<!ENTITY copyCmd.label						"Copy">  
+<!ENTITY copyCmd.label						"Copiar">  
 <!ENTITY copyCmd.key						"C">  
-<!ENTITY copyCmd.accesskey					"c"> 
-<!ENTITY pasteCmd.label						"Paste">  
+<!ENTITY copyCmd.accesskey					"C"> 
+<!ENTITY pasteCmd.label						"Pegar">  
 <!ENTITY pasteCmd.key						"V">  
-<!ENTITY pasteCmd.accesskey					"p"> 
-<!ENTITY deleteCmd.label					"Delete">  
-<!ENTITY deleteCmd.key						"D">  
-<!ENTITY deleteCmd.accesskey				"d"> 
-<!ENTITY selectAllCmd.label					"Select All">  
+<!ENTITY pasteCmd.accesskey					"P"> 
+<!ENTITY deleteCmd.label					"Borrar">  
+<!ENTITY deleteCmd.accesskey				"B"> 
+<!ENTITY selectAllCmd.label					"Seleccionar todo">  
 <!ENTITY selectAllCmd.key					"A">  
-<!ENTITY selectAllCmd.accesskey				"a"> 
-<!ENTITY preferencesCmd.label				"Preferences…">
+<!ENTITY selectAllCmd.accesskey				"S"> 
+<!ENTITY preferencesCmd.label				"Preferencias…">
 <!ENTITY preferencesCmd.key					"E">  
 <!ENTITY preferencesCmd.accesskey			"e"> 
-<!ENTITY findTypeTextCmd.label "Find Text As You Type">
+<!ENTITY findTypeTextCmd.label "Buscar texto mientras se escribe">
 <!ENTITY findTypeTextCmd.accesskey "x">
-<!ENTITY findTypeLinksCmd.label "Find Links As You Type">
-<!ENTITY findTypeLinksCmd.accesskey "k">
+<!ENTITY findTypeLinksCmd.label "Buscar enlaces mientras se escribe">
+<!ENTITY findTypeLinksCmd.accesskey "e">
 
-<!ENTITY viewMenu.label					"View"> 
-<!ENTITY viewMenu.accesskey				"v"> 
-<!ENTITY viewToolbarsMenu.label				"Show/Hide"> 
-<!ENTITY viewToolbarsMenu.accesskey			"w"> 
-<!ENTITY showTaskbarCmd.label					"Status Bar">  
-<!ENTITY showTaskbarCmd.accesskey				"S"> 
+<!ENTITY viewMenu.label					"Ver"> 
+<!ENTITY viewMenu.accesskey				"V"> 
+<!ENTITY viewToolbarsMenu.label				"Mostrar/Ocultar"> 
+<!ENTITY viewToolbarsMenu.accesskey			"M"> 
+<!ENTITY showTaskbarCmd.label					"Barra de estado">  
+<!ENTITY showTaskbarCmd.accesskey				"s"> 
 
-<!ENTITY helpMenu.label					"Help"> 
-<!ENTITY helpMenu.accesskey				"h"> 
+<!ENTITY helpMenu.label					"Ayuda"> 
+<!ENTITY helpMenu.accesskey				"y"> 
 
-<!ENTITY releaseCmd.label				"Release Notes">
+<!ENTITY releaseCmd.label				"Notas de la versión">
 <!ENTITY releaseCmd.accesskey                   "N">
-<!ENTITY updateCmd.label                        "Check for Updates…">
-<!ENTITY updateCmd.accesskey                    "C">
-<!ENTITY aboutCmd.label					"About &brandShortName;">
+<!ENTITY updateCmd.label                        "Buscar actualizaciones…">
+<!ENTITY updateCmd.accesskey                    "c">
+<!ENTITY aboutCmd.label					"Acerca de &brandShortName;">
 <!ENTITY aboutCmd.accesskey				"A">
-<!ENTITY aboutCommPluginsCmd.label			"About Plugins">
+<!ENTITY aboutCommPluginsCmd.label			"Acerca de plugins">
 <!ENTITY aboutCommPluginsCmd.accesskey			"p">
 
-<!ENTITY direct.label                                   "Online (Proxy: None)">
-<!ENTITY direct.accesskey                               "N">
-<!ENTITY manual.label                                   "Online (Proxy: Manual)">
+<!ENTITY direct.label                                   "Conectado (Proxy: ninguno)">
+<!ENTITY direct.accesskey                               "n">
+<!ENTITY manual.label                                   "Conectado (Proxy: manual)">
 <!ENTITY manual.accesskey                               "M">
-<!ENTITY pac.label                                      "Online (Proxy: Auto URL)">
-<!ENTITY pac.accesskey                                  "A">
-<!ENTITY wpad.label                                     "Online (Proxy: Auto Discover)">
+<!ENTITY pac.label                                      "Conectado (Proxy: URL automática)">
+<!ENTITY pac.accesskey                                  "a">
+<!ENTITY wpad.label                                     "Conectado (Proxy: descubierto automáticamente)">
 <!ENTITY wpad.accesskey                                 "D">
-<!ENTITY system.label                                   "Online (Proxy: System Proxy)">
-<!ENTITY system.accesskey                               "S">
+<!ENTITY system.label                                   "Conectado (Proxy: proxy del sistema)">
+<!ENTITY system.accesskey                               "s">
 
-<!ENTITY proxy.label                                    "Proxy Configuration…">
+<!ENTITY proxy.label                                    "Configuración de proxy…">
 <!ENTITY proxy.accesskey                                "C">
 
-<!ENTITY bidiSwitchTextDirectionItem.label        "Switch Text Direction">
-<!ENTITY bidiSwitchTextDirectionItem.accesskey    "w">
+<!ENTITY bidiSwitchTextDirectionItem.label        "Cambiar dirección del texto">
+<!ENTITY bidiSwitchTextDirectionItem.accesskey    "C">
 <!ENTITY bidiSwitchTextDirectionItem.commandkey   "X">
 
+<!ENTITY customizeToolbarContext.label            "Personalizar…">
+<!ENTITY customizeToolbarContext.accesskey        "P">
+
+<!ENTITY customizeToolbar.toolbarmode.label       "Opciones para esta barra de herramientas">
+<!ENTITY customizeToolbar.toolbarmode.accesskey   "t">
+<!ENTITY customizeToolbar.iconsAndText.label      "Iconos y texto">
+<!ENTITY customizeToolbar.iconsAndText.accesskey  "I">
+<!ENTITY customizeToolbar.icons.label             "Iconos">
+<!ENTITY customizeToolbar.icons.accesskey         "o">
+<!ENTITY customizeToolbar.text.label              "Texto">
+<!ENTITY customizeToolbar.text.accesskey          "T">
+<!ENTITY customizeToolbar.useSmallIcons.label     "Usar íconos pequeños">
+<!ENTITY customizeToolbar.useSmallIcons.accesskey "s">
+<!ENTITY customizeToolbar.labelAlignEnd.label     "Mostrar texto debajo del ícono">
+<!ENTITY customizeToolbar.labelAlignEnd.accesskey "b">
+<!ENTITY customizeToolbar.useDefault.label        "Usar opciones predeterminadas">
+<!ENTITY customizeToolbar.useDefault.accesskey    "U">
+
 <!-- Popup Blocked notification menu -->
 <!ENTITY allowPopups.accesskey        "p">
-<!ENTITY showPopupManager.label       "Manage Popups">
-<!ENTITY showPopupManager.accesskey   "M">
-<!ENTITY dontShowMessage.label        "Don't show this message when popups are blocked">
-<!ENTITY dontShowMessage.accesskey    "D">
+<!ENTITY showPopupManager.label       "Administrar ventanas emergentes">
+<!ENTITY showPopupManager.accesskey   "m">
+<!ENTITY dontShowMessage.label        "No mostrar este mensaje cuando las ventanas emergentes están bloqueadas">
+<!ENTITY dontShowMessage.accesskey    "d">
--- a/suite/chrome/common/win/platformCommunicatorOverlay.dtd
+++ b/suite/chrome/common/win/platformCommunicatorOverlay.dtd
@@ -1,33 +1,33 @@
 <!-- win -->
 <!-- LOCALIZATION NOTE : FILE Do not translate "accel" or "shift",
                          You may want to translate the Cmd.key and accesskey --> 
 
-<!ENTITY closeCmd.label                 "Cerrar">  
-<!ENTITY closeCmd.key                   "W">  
-<!ENTITY closeCmd.accesskey             "c">
+<!ENTITY closeCmd.label                 "Cerrar">
+<!ENTITY closeCmd.key                   "W">
+<!ENTITY closeCmd.accesskey             "C">
 
-<!ENTITY quitApplicationCmd.label       "Salir"> 
-<!ENTITY quitApplicationCmd.key         "Q"> 
-<!ENTITY quitApplicationCmd.accesskey   "x">
+<!ENTITY quitApplicationCmd.label       "Salir">
+<!ENTITY quitApplicationCmd.key         "Q">
+<!ENTITY quitApplicationCmd.accesskey   "S">
 
-<!ENTITY redoCmd.label                  "Rehacer">  
-<!ENTITY redoCmd.key                    "Y">  
-<!ENTITY redoCmd.accesskey              "r">
+<!ENTITY redoCmd.label                  "Rehacer">
+<!ENTITY redoCmd.key                    "Y">
+<!ENTITY redoCmd.accesskey              "R">
 
 <!ENTITY findTypeTextCmd.key            "/">
 <!ENTITY findTypeLinksCmd.key           "'">
 
 <!ENTITY accel.emacs_conflict           "accel">
 
 <!-- Help viewer -->
 <!ENTITY openHelpCmd.label              "Contenido de la ayuda">
-<!ENTITY openHelpCmd.accesskey          "H">
+<!ENTITY openHelpCmd.accesskey          "y">
 <!ENTITY openHelpCmd.key                "VK_F1">
 <!ENTITY helpForIEUsers.label           "Para usuarios de Internet Explorer">
 <!ENTITY helpForIEUsers.accesskey       "I">
 
 <!-- Key labels, for mousewheel prefs -->
 <!ENTITY ctrlKey.label                  "Ctrl">
 <!ENTITY altKey.label                   "Alt">
-<!ENTITY shiftKey.label                 "Shift">
+<!ENTITY shiftKey.label                 "May">
 
--- a/suite/chrome/mailnews/FilterEditor.dtd
+++ b/suite/chrome/mailnews/FilterEditor.dtd
@@ -47,52 +47,51 @@
  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 window.title "Filter Rules">
+<!ENTITY window.title "Reglas de filtrado">
 
-<!ENTITY filterName.label "Filter name:">
+<!ENTITY filterName.label "Nombre del filtro">
 <!ENTITY filterName.accesskey "i">
 
-<!ENTITY junk.label "Junk">
-<!ENTITY notJunk.label "Not Junk">
+<!ENTITY junk.label "Basura">
+<!ENTITY notJunk.label "No es basura">
 
-<!ENTITY lowestPriorityCmd.label "Lowest">
-<!ENTITY lowPriorityCmd.label "Low">
+<!ENTITY lowestPriorityCmd.label "La más baja">
+<!ENTITY lowPriorityCmd.label "Baja">
 <!ENTITY normalPriorityCmd.label "Normal">
-<!ENTITY highPriorityCmd.label "High">
-<!ENTITY highestPriorityCmd.label "Highest">
+<!ENTITY highPriorityCmd.label "Alta">
+<!ENTITY highestPriorityCmd.label "La más alta">
 
-<!ENTITY contextDesc.label "Apply filter when:">
-<!ENTITY contextDesc.accesskey "w">
-<!ENTITY contextIncoming.label "Checking Mail">
-<!ENTITY contextManual.label "Manually Run">
-<!ENTITY contextBoth.label "Checking Mail or Manually Run">
+<!ENTITY contextDesc.label "Aplicar el filtro cuando:">
+<!ENTITY contextDesc.accesskey "A">
+<!ENTITY contextIncoming.label "Se busca correo">
+<!ENTITY contextManual.label "se ejecute manualmente">
+<!ENTITY contextBoth.label "se busca correo o se ejecute manualmente">
+<!ENTITY contextPostPlugin.label "se busque correo (después de clasificación)">
+<!ENTITY contextPostPluginBoth.label "se busque correo (después de clasificación) o se ejecute manualmente">
 
-<!ENTITY filterActionDesc.label "Perform these actions:">
-<!ENTITY filterActionDesc.accesskey "P">
-
-<!ENTITY newFolderButton.label "New Folder…">
-<!ENTITY newFolderButton.accesskey "N">
+<!ENTITY filterActionDesc.label "Ejecutar estas acciones:">
+<!ENTITY filterActionDesc.accesskey "E">
 
 <!-- New Style Filter Rule Actions -->
-<!ENTITY moveMessage.label "Move Message to">
-<!ENTITY copyMessage.label "Copy Message to">
-<!ENTITY forwardTo.label "Forward Message to">
-<!ENTITY replyWithTemplate.label "Reply with Template">
-<!ENTITY markMessageRead.label "Mark As Read">
-<!ENTITY markMessageStarred.label "Mark As Flagged">
-<!ENTITY labelMessage.label "Label Message As">
-<!ENTITY setPriority.label "Set Priority to">
-<!ENTITY addTag.label "Tag Message">
-<!ENTITY setJunkScore.label "Set Junk Status to">
-<!ENTITY deleteMessage.label "Delete Message">
-<!ENTITY deleteFromPOP.label "Delete From POP Server">
-<!ENTITY fetchFromPOP.label "Fetch From POP Server">
-<!ENTITY ignoreThread.label "Ignore Thread">
-<!ENTITY ignoreSubthread.label "Ignore Subthread">
-<!ENTITY watchThread.label "Watch Thread">
-<!ENTITY stopExecution.label "Stop Filter Execution">
+<!ENTITY moveMessage.label "Mover mensaje a">
+<!ENTITY copyMessage.label "Copiar mensaje a">
+<!ENTITY forwardTo.label "Reenviar mensaje a">
+<!ENTITY replyWithTemplate.label "Responder con plantilla">
+<!ENTITY markMessageRead.label "Marcar como leído">
+<!ENTITY markMessageStarred.label "Marcar como destacado">
+<!ENTITY labelMessage.label "Etiquetar mensaje como">
+<!ENTITY setPriority.label "Establecer prioridad a">
+<!ENTITY addTag.label "Etiquetar mensaje">
+<!ENTITY setJunkScore.label "Establecer estado de correo basura a">
+<!ENTITY deleteMessage.label "Borrar mensaje">
+<!ENTITY deleteFromPOP.label "Borrar del servidor POP">
+<!ENTITY fetchFromPOP.label "Traer del servidor POP">
+<!ENTITY ignoreThread.label "Ignorar conversación">
+<!ENTITY ignoreSubthread.label "Ignorar subconversación">
+<!ENTITY watchThread.label "Observar conversación">
+<!ENTITY stopExecution.label "Detener ejecución del filtro">
--- a/suite/chrome/mailnews/FilterListDialog.dtd
+++ b/suite/chrome/mailnews/FilterListDialog.dtd
@@ -1,28 +1,26 @@
-<!ENTITY window.title "Message Filters">
-<!ENTITY nameColumn.label "Filter Name">
-<!ENTITY activeColumn.label "Enabled">
-<!ENTITY newButton.label "New…">
+<!ENTITY filterListDialog.title "Filtros de mensaje">
+<!ENTITY nameColumn.label "Nombre del filtro">
+<!ENTITY activeColumn.label "Habilitado">
+<!ENTITY newButton.label "Nuevo…">
 <!ENTITY newButton.accesskey "N">
-<!ENTITY editButton.label "Edit…">
+<!ENTITY editButton.label "Editar…">
 <!ENTITY editButton.accesskey "E">
-<!ENTITY deleteButton.label "Delete">
-<!ENTITY deleteButton.accesskey "t">
-<!ENTITY reorderUpButton.label "Move Up">
-<!ENTITY reorderUpButton.accesskey "U">
-<!ENTITY reorderDownButton.label "Move Down">
-<!ENTITY reorderDownButton.accesskey "D">
-<!ENTITY filterHeader.label "Enabled filters are run automatically in the order shown below.">
-<!ENTITY filtersForPrefix.label "Filters for:">
+<!ENTITY deleteButton.label "Borrar">
+<!ENTITY deleteButton.accesskey "B">
+<!ENTITY reorderUpButton.label "Subir">
+<!ENTITY reorderUpButton.accesskey "S">
+<!ENTITY reorderDownButton.label "Bajar">
+<!ENTITY reorderDownButton.accesskey "B">
+<!ENTITY filterHeader.label "Los filtros activos se ejecutan automáticamente en el orden indicado debajo.">
+<!ENTITY filtersForPrefix.label "Filtros para:">
 <!ENTITY filtersForPrefix.accesskey "F">
-<!ENTITY viewLogButton.label "Filter Log">
-<!ENTITY viewLogButton.accesskey "L">
-<!ENTITY runFilters.label "Run Now">
-<!ENTITY runFilters.accesskey "R">
-<!ENTITY stopFilters.label "Stop">
-<!ENTITY stopFilters.accesskey "S">
-<!ENTITY folderPickerPrefix.label "Run selected filter(s) on:">
+<!ENTITY viewLogButton.label "Registro de filtros">
+<!ENTITY viewLogButton.accesskey "l">
+<!ENTITY runFilters.label "Ejecutar ahora">
+<!ENTITY runFilters.accesskey "r">
+<!ENTITY stopFilters.label "Detener">
+<!ENTITY stopFilters.accesskey "D">
+<!ENTITY folderPickerPrefix.label "Ejecutar los filtros seleccionados en:">
 <!ENTITY folderPickerPrefix.accesskey "c">
-<!ENTITY choosethis.label "choose this folder">
-<!ENTITY choosethisnewsserver.label "choose this news server">
-<!ENTITY helpButton.label "Help">
-<!ENTITY helpButton.accesskey "H">
+<!ENTITY choosethis.label "seleccionar esta carpeta">
+<!ENTITY choosethisnewsserver.label "elegir este servidor de noticias">
--- a/suite/chrome/mailnews/SearchDialog.dtd
+++ b/suite/chrome/mailnews/SearchDialog.dtd
@@ -1,40 +1,36 @@
 
 <!-- for SearchDialog.xul -->
-<!ENTITY searchHeading.label         "Search for messages in:">
-<!ENTITY searchHeading.accesskey     "h">
-<!ENTITY searchSubfolders.label      "Search subfolders">
+<!ENTITY searchHeading.label         "Buscar mensajes en:">
+<!ENTITY searchHeading.accesskey     "B">
+<!ENTITY searchSubfolders.label      "Buscar subcarpetas">
 <!ENTITY searchSubfolders.accesskey  "e">
-<!ENTITY searchLocalSystem.label     "Search local system">
-<!ENTITY searchLocalSystem.accesskey "y">
-<!ENTITY resetButton.label           "Clear">
-<!ENTITY resetButton.accesskey       "C">
-<!ENTITY helpButton.label            "Help">
-<!ENTITY helpButton.accesskey        "l">
-<!ENTITY optionsButton.label         "Options">
-<!ENTITY closeButton.label           "Close">
-<!ENTITY openButton.label            "Open">
-<!ENTITY openButton.accesskey        "n">
-<!ENTITY deleteButton.label          "Delete">
-<!ENTITY deleteButton.accesskey      "D">
-<!ENTITY searchDialogTitle.label     "Search Messages">
-<!ENTITY conditionDesc.label         "Search for messages that match:">
-<!ENTITY conditions.label            "Criteria">
-<!ENTITY results.label               "Results">
-<!ENTITY fileHereMenu.label          "File Here">
-<!ENTITY fileHereMenu.accesskey      "F">
-<!ENTITY fileButton.label            "File">
+<!ENTITY searchLocalSystem.label     "Buscar sistema local">
+<!ENTITY searchLocalSystem.accesskey "B">
+<!ENTITY resetButton.label           "Borrar">
+<!ENTITY resetButton.accesskey       "B">
+<!ENTITY helpButton.label            "Ayuda">
+<!ENTITY helpButton.accesskey        "A">
+<!ENTITY openButton.label            "Abrir">
+<!ENTITY openButton.accesskey        "A">
+<!ENTITY deleteButton.label          "Borrar">
+<!ENTITY deleteButton.accesskey      "B">
+<!ENTITY searchDialogTitle.label     "Buscar mensajes">
+<!ENTITY results.label               "Resultados">
+<!ENTITY fileHereMenu.label          "Archivar aquí">
+<!ENTITY fileHereMenu.accesskey      "A">
+<!ENTITY fileButton.label            "Archivo">
 <!ENTITY fileButton.accesskey        "i">
-<!ENTITY goToFolderButton.label      "Open Message Folder">
+<!ENTITY goToFolderButton.label      "Abrir carpeta de mensajes">
 <!ENTITY goToFolderButton.accesskey  "r">
-<!ENTITY saveAsVFButton.label      "Save as Search Folder">
+<!ENTITY saveAsVFButton.label      "Guardar como carpeta de búsqueda">
 <!ENTITY saveAsVFButton.accesskey  "a">
 
 <!-- for ABSearchDialog.xul -->
-<!ENTITY abSearchHeading.label       "Search in:">
-<!ENTITY abSearchHeading.accesskey   "h">
-<!ENTITY propertiesButton.label      "Properties">
+<!ENTITY abSearchHeading.label       "Buscar en:">
+<!ENTITY abSearchHeading.accesskey   "B">
+<!ENTITY propertiesButton.label      "Propiedades">
 <!ENTITY propertiesButton.accesskey  "P">
-<!ENTITY composeButton.label         "Compose">
+<!ENTITY composeButton.label         "Redactar">
 <!ENTITY composeButton.accesskey     "e">
-<!ENTITY abSearchDialogTitle.label   "Advanced Address Book Search">
+<!ENTITY abSearchDialogTitle.label   "Búsqueda avanzada en la libreta de direcciones">
 
--- a/suite/chrome/mailnews/addressbook/abCardOverlay.dtd
+++ b/suite/chrome/mailnews/addressbook/abCardOverlay.dtd
@@ -17,32 +17,32 @@
  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 of 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"),
+ 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 Contact.tab                     "Contact">
+<!ENTITY Contact.tab                     "Contacto">
 <!ENTITY Contact.accesskey               "C">
-<!ENTITY Name.box                        "Name">
+<!ENTITY Name.box                        "Nombre ">
 
 <!-- LOCALIZATION NOTE:
  NameField1, NameField2, PhoneticField1, PhoneticField2
  those fields are either LN or FN depends on the target country.
  "FirstName" and "LastName" can be swapped for id to change the order
  but they should not be translated (same applied to phonetic id).
  Make sure the translation of label corresponds to the order of id.
 -->
@@ -51,98 +51,125 @@
 <!ENTITY NameField1.id                  "FirstName">
 <!-- LOCALIZATION NOTE (NameField2.id) : DONT_TRANSLATE -->
 <!ENTITY NameField2.id                  "LastName">
 <!-- LOCALIZATION NOTE (PhoneticField1.id) : DONT_TRANSLATE -->
 <!ENTITY PhoneticField1.id              "PhoneticFirstName">
 <!-- LOCALIZATION NOTE (PhoneticField2.id) : DONT_TRANSLATE -->
 <!ENTITY PhoneticField2.id              "PhoneticLastName">
 
-<!ENTITY NameField1.label               "First:">
-<!ENTITY NameField1.accesskey           "F">
-<!ENTITY NameField2.label               "Last:">
-<!ENTITY NameField2.accesskey           "L">
-<!ENTITY PhoneticField1.label           "Phonetic:">
-<!ENTITY PhoneticField2.label           "Phonetic:">
-<!ENTITY DisplayName.label              "Display:">
-<!ENTITY DisplayName.accesskey          "D">
-<!ENTITY NickName.label                 "Nickname:">
-<!ENTITY NickName.accesskey             "N">
+<!ENTITY NameField1.label               "Nombre:">
+<!ENTITY NameField1.accesskey           "N">
+<!ENTITY NameField2.label               "Apellidos:">
+<!ENTITY NameField2.accesskey           "l">
+<!ENTITY PhoneticField1.label           "Nombre fonético:">
+<!ENTITY PhoneticField2.label           "Nombre fonético:">
+<!ENTITY DisplayName.label              "Mostrado:">
+<!ENTITY DisplayName.accesskey          "d">
+<!ENTITY NickName.label                 "Apodo:">
+<!ENTITY NickName.accesskey             "A">
 
-<!ENTITY Internet.box                   "Internet">
-<!ENTITY PrimaryEmail.label             "Email:">
-<!ENTITY PrimaryEmail.accesskey         "E">
-<!ENTITY SecondEmail.label              "Additional Email:">
+<!ENTITY PrimaryEmail.label             "Correo electrónico:">
+<!ENTITY PrimaryEmail.accesskey         "e">
+<!ENTITY SecondEmail.label              "Otro correo electrónico:">
 <!ENTITY SecondEmail.accesskey          "i">
-<!ENTITY PreferMailFormat.label         "Prefers to receive messages formatted as:">
-<!ENTITY PreferMailFormat.accesskey     "r">
-<!ENTITY PlainText.label                "Plain Text">
+<!ENTITY PreferMailFormat.label         "Prefiere recibir el mensaje formateado como:">
+<!ENTITY PreferMailFormat.accesskey     "P">
+<!ENTITY PlainText.label                "Texto sin formato">
 <!ENTITY HTML.label                     "HTML">
-<!ENTITY Unknown.label                  "Unknown">
-<!ENTITY ScreenName.label               "Screen Name:">
-<!ENTITY ScreenName.accesskey           "S">
+<!ENTITY Unknown.label                  "Desconocido">
+<!ENTITY ScreenName.label               "Nombre en pantalla:">
+<!ENTITY ScreenName.accesskey           "N">
 
-<!ENTITY allowRemoteContent.label       "Allow remote images in HTML mail.">
-<!ENTITY allowRemoteContent.accesskey   "w">
+<!ENTITY allowRemoteContent1.label      "Permitir contenido remoto.">
+<!ENTITY allowRemoteContent1.accesskey  "r">
+<!ENTITY allowRemoteContent1.tooltip    "En mensajes HTML es posible
+incrustar contenido de fuentes remotas. Abriendo esos mensajes se abrirá una
+conexión a esa fuente externa. Ésto puede permitir el rastreo del
+mensaje que se está leyendo. Marcando esta caja permitirá ese contenido externo
+incrustado en mensajes HTML de este contacto.">
 
-<!ENTITY Phones.box                     "Phones">
-<!ENTITY WorkPhone.label                "Work:">
-<!ENTITY WorkPhone.accesskey            "k">
-<!ENTITY HomePhone.label                "Home:">
-<!ENTITY HomePhone.accesskey            "o">
+<!ENTITY WorkPhone.label                "Trabajo:">
+<!ENTITY WorkPhone.accesskey            "T">
+<!ENTITY HomePhone.label                "Casa:">
+<!ENTITY HomePhone.accesskey            "C">
 <!ENTITY FaxNumber.label                "Fax:">
 <!ENTITY FaxNumber.accesskey            "x">
-<!ENTITY PagerNumber.label              "Pager:">
-<!ENTITY PagerNumber.accesskey          "P">
-<!ENTITY CellularNumber.label           "Mobile:">
-<!ENTITY CellularNumber.accesskey       "M">
+<!ENTITY PagerNumber.label              "Buscapersonas:">
+<!ENTITY PagerNumber.accesskey          "B">
+<!ENTITY CellularNumber.label           "Teléfono celular:">
+<!ENTITY CellularNumber.accesskey       "T">
 
-<!ENTITY Address.tab                    "Address">
-<!ENTITY Address.accesskey              "A">
-<!ENTITY Home.box                       "Home">
-<!ENTITY HomeAddress.label              "Address:">
-<!ENTITY HomeAddress.accesskey          "d">
+<!ENTITY Home.tab                       "Privado">
+<!ENTITY Home.accesskey                 "P">
+<!ENTITY HomeAddress.label              "Dirección:">
+<!ENTITY HomeAddress.accesskey          "D">
 <!ENTITY HomeAddress2.label             "">
 <!ENTITY HomeAddress2.accesskey         "">
-<!ENTITY HomeCity.label                 "City:">
-<!ENTITY HomeCity.accesskey             "y">
-<!ENTITY HomeState.label                "State/Province:">
-<!ENTITY HomeState.accesskey            "S">
-<!ENTITY HomeZipCode.label              "ZIP/Postal Code:">
-<!ENTITY HomeZipCode.accesskey          "Z">
-<!ENTITY HomeCountry.label              "Country:">
-<!ENTITY HomeCountry.accesskey          "u">
-<!ENTITY HomeWebPage.label              "Web Page:">
-<!ENTITY HomeWebPage.accesskey          "W">
-<!ENTITY Work.box                       "Work">
-<!ENTITY JobTitle.label                 "Title:">
-<!ENTITY JobTitle.accesskey             "e">
-<!ENTITY Department.label               "Department:">
+<!ENTITY HomeCity.label                 "Ciudad:">
+<!ENTITY HomeCity.accesskey             "C">
+<!ENTITY HomeState.label                "Provincia/estado:">
+<!ENTITY HomeState.accesskey            "s">
+<!ENTITY HomeZipCode.label              "Código postal:">
+<!ENTITY HomeZipCode.accesskey          "C">
+<!ENTITY HomeCountry.label              "País:">
+<!ENTITY HomeCountry.accesskey          "P">
+<!ENTITY HomeWebPage.label              "Página web:">
+<!ENTITY HomeWebPage.accesskey          "e">
+<!ENTITY Birthday.label                 "Cumpleaños:">
+<!ENTITY Birthday.accesskey             "C">
+<!ENTITY In.label                       "">
+<!ENTITY Year.emptytext                 "Año">
+<!ENTITY Or.value                       "o">
+<!ENTITY Age.emptytext                  "Edad">
+<!ENTITY YearsOld.label                 "">
+
+<!ENTITY Work.tab                       "Trabajo">
+<!ENTITY Work.accesskey                 "j">
+<!ENTITY JobTitle.label                 "Puesto:">
+<!ENTITY JobTitle.accesskey             "P">
+<!ENTITY Department.label               "Departamento:">
 <!ENTITY Department.accesskey           "m">
-<!ENTITY Company.label                  "Organization:">
+<!ENTITY Company.label                  "Organización:">
 <!ENTITY Company.accesskey              "O">
-<!ENTITY WorkAddress.label              "Address:">
-<!ENTITY WorkAddress.accesskey          "r">
+<!ENTITY WorkAddress.label              "Dirección:">
+<!ENTITY WorkAddress.accesskey          "D">
 <!ENTITY WorkAddress2.label             "">
 <!ENTITY WorkAddress2.accesskey         "">
-<!ENTITY WorkCity.label                 "City:">
-<!ENTITY WorkCity.accesskey             "i">
-<!ENTITY WorkState.label                "State/Province:">
-<!ENTITY WorkState.accesskey            "v">
-<!ENTITY WorkZipCode.label              "ZIP/Postal Code:">
-<!ENTITY WorkZipCode.accesskey          "P">
-<!ENTITY WorkCountry.label              "Country:">
-<!ENTITY WorkCountry.accesskey          "n">
-<!ENTITY WorkWebPage.label              "Web Page:">
-<!ENTITY WorkWebPage.accesskey          "b">
+<!ENTITY WorkCity.label                 "Ciudad:">
+<!ENTITY WorkCity.accesskey             "C">
+<!ENTITY WorkState.label                "Provincia/estado:">
+<!ENTITY WorkState.accesskey            "s">
+<!ENTITY WorkZipCode.label              "Código postal:">
+<!ENTITY WorkZipCode.accesskey          "C">
+<!ENTITY WorkCountry.label              "País:">
+<!ENTITY WorkCountry.accesskey          "P">
+<!ENTITY WorkWebPage.label              "Página web:">
+<!ENTITY WorkWebPage.accesskey          "e">
 
-<!ENTITY Other.tab                      "Other">
+<!ENTITY Other.tab                      "Otros">
 <!ENTITY Other.accesskey                "h">
-<!ENTITY Custom1.label                  "Custom 1:">
+<!ENTITY Custom1.label                  "Personalizado 1:">
 <!ENTITY Custom1.accesskey              "1">
-<!ENTITY Custom2.label                  "Custom 2:">
+<!ENTITY Custom2.label                  "Personalizado 2:">
 <!ENTITY Custom2.accesskey              "2">
-<!ENTITY Custom3.label                  "Custom 3:">
+<!ENTITY Custom3.label                  "Personalizado 3:">
 <!ENTITY Custom3.accesskey              "3">
-<!ENTITY Custom4.label                  "Custom 4:">
+<!ENTITY Custom4.label                  "Personalizado 4:">
 <!ENTITY Custom4.accesskey              "4">
-<!ENTITY Notes.box                      "Notes">
+<!ENTITY Notes.label                    "Notas:">
 <!ENTITY Notes.accesskey                "N">
+
+<!ENTITY Photo.tab                      "Foto">
+<!ENTITY Photo.accesskey                "o">
+<!ENTITY PhotoDesc.label                "Elija uno de los siguientes:">
+<!ENTITY GenericPhoto.label             "Foto genérica">
+<!ENTITY GenericPhoto.accesskey         "g">
+<!ENTITY DefaultPhoto.label             "Predeterminado">
+<!ENTITY PhotoFile.label                "En esta computadora">
+<!ENTITY PhotoFile.accesskey            "n">
+<!ENTITY BrowsePhoto.label              "Examinar">
+<!ENTITY BrowsePhoto.accesskey          "x">
+<!ENTITY PhotoURL.label                 "En la web">
+<!ENTITY PhotoURL.accesskey             "b">
+<!ENTITY PhotoURL.emptytext             "Pegar o escribir la dirección web de una foto">
+<!ENTITY UpdatePhoto.label              "Actualizar">
+<!ENTITY UpdatePhoto.accesskey          "u">
--- a/suite/chrome/mailnews/addressbook/abMailListDialog.dtd
+++ b/suite/chrome/mailnews/addressbook/abMailListDialog.dtd
@@ -32,27 +32,24 @@
  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 ***** -->
 
 <!-- Title -->
-<!ENTITY mailListWindow.title           "Mailing List">
+<!ENTITY mailListWindow.title           "Lista de correo">
 <!-- Labels -->
-<!ENTITY addToAddressBook.label         "Add to: ">
+<!ENTITY addToAddressBook.label         "Agregar a: ">
 
-<!ENTITY ListName.label                 "List Name: ">
-<!ENTITY ListNickName.label             "List Nickname: ">
-<!ENTITY ListDescription.label          "Description: ">
+<!ENTITY ListName.label                 "Nombre de lista: ">
+<!ENTITY ListNickName.label             "Apodo de lista: ">
+<!ENTITY ListDescription.label          "Descripción: ">
 <!-- See bug 58485, when we implement drag and drop, add 'or drag addresses' back in -->
-<!ENTITY AddressTitle.label             "Type email addresses to add them to the mailing list:">
-<!ENTITY RemoveButton.label             "Remove">
-<!ENTITY UpButton.label                 "Move Up">
-<!ENTITY DownButton.label               "Move Down">
+<!ENTITY AddressTitle.label             "Ingrese direcciones de correo electrónico para agregarlas a la lista de correo:">
 
 <!-- Access Keys -->
 <!ENTITY addToAddressBook.accesskey     "A">
-<!ENTITY ListName.accesskey             "L">
-<!ENTITY ListNickName.accesskey         "N">
+<!ENTITY ListName.accesskey             "l">
+<!ENTITY ListNickName.accesskey         "p">
 <!ENTITY ListDescription.accesskey      "e">
 
--- a/suite/chrome/mailnews/addressbook/abMainWindow.dtd
+++ b/suite/chrome/mailnews/addressbook/abMainWindow.dtd
@@ -31,117 +31,108 @@
  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 ***** -->
 
 <!-- Title -->
-<!ENTITY addressbookWindow.title                        "Address Book">
+<!ENTITY addressbookWindow.title                        "Libreta de direcciones">
 
 <!-- Menus:  the . means that the menu item isn't implemented yet -->
 
 <!-- File Menu -->
-<!ENTITY newCard.label                                  "Address Book Card…">
-<!-- LOCALIZATION NOTE (newCard.accesskey) : DONT_TRANSLATE -->  
-<!ENTITY newCard.accesskey                              "C">  
-<!ENTITY newListCmd.label                               "Mailing List…">
+<!ENTITY newContact.label                               "Contacto…">
+<!-- LOCALIZATION NOTE (newContact.accesskey) : DONT_TRANSLATE -->
+<!ENTITY newContact.accesskey                           "C">
+<!ENTITY newListCmd.label                               "Lista de correo…">
 <!-- LOCALIZATION NOTE (newListCmd.accesskey) : DONT_TRANSLATE -->  
 <!ENTITY newListCmd.accesskey                           "L">  
-<!ENTITY newAddressBookCmd.label                        "Address Book…"> 
+<!ENTITY newAddressBookCmd.label                        "Libreta de direcciones…"> 
 <!ENTITY newAddressBookCmd.accesskey                    "o">  
-<!ENTITY renameAddressBookCmd.label                     "Rename Address Book…"> 
-<!ENTITY renameAddressBookCmd.accesskey                 "R">  
-<!ENTITY newLDAPDirectoryCmd.label                      "LDAP Directory…">
+<!ENTITY newLDAPDirectoryCmd.label                      "Directorio LDAP…">
 <!-- LOCALIZATION NOTE (newLDAPDirectoryCmd.accesskey) : DONT_TRANSLATE -->
 <!ENTITY newLDAPDirectoryCmd.accesskey                  "D">
-<!ENTITY newIM.label                                    "IM">
-<!ENTITY printCardViewCmd.label                         "Print Card…">
-<!ENTITY printCardViewCmd.accesskey                     "p">
-<!ENTITY printPreviewCardViewCmd.label                  "Print Preview Card">
-<!ENTITY printPreviewCardViewCmd.accesskey              "v">
+<!ENTITY newIM.label                                    "MI">
+<!ENTITY printContactViewCmd.label                      "Imprimir contacto…">
+<!ENTITY printContactViewCmd.accesskey                  "p">
+<!ENTITY printPreviewContactViewCmd.label               "Imprimir la previsualización del contacto">
+<!ENTITY printPreviewContactViewCmd.accesskey           "v">
 <!-- LOCALIZATION NOTE (printCardViewCmd.key) : DONT_TRANSLATE -->  
-<!ENTITY printCardViewCmd.key                           "P">
-<!ENTITY printAddressBook.label                         "Print Address Book…"> 
-<!ENTITY printAddressBook.accesskey                     "A"> 
-<!ENTITY printPreviewAddressBook.label                  "Print Preview Address Book"> 
-<!ENTITY printPreviewAddressBook.accesskey              "B">
-<!ENTITY printSetupCmd.label                            "Page Setup…">
+<!ENTITY printContactViewCmd.key                        "P">
+<!ENTITY printAddressBook.label                         "Imprimir libreta de direcciones…"> 
+<!ENTITY printAddressBook.accesskey                     "a"> 
+<!ENTITY printPreviewAddressBook.label                  "Vista preliminar de la libreta de direcciones"> 
+<!ENTITY printPreviewAddressBook.accesskey              "b">
+<!ENTITY printSetupCmd.label                            "Configurar página…">
 <!ENTITY printSetupCmd.accesskey                        "u">
 
 <!-- Edit Menu -->
-<!ENTITY deleteAbCmd.label                              "Delete Address Book">  
-<!ENTITY deleteCardCmd.label                            "Delete Card">  
-<!ENTITY deleteCardsCmd.label                           "Delete Selected Cards">  
-<!ENTITY deleteListCmd.label                            "Delete List">
-<!ENTITY deleteListsCmd.label                           "Delete Selected Lists">
-<!ENTITY deleteItemsCmd.label                           "Delete Selected Items">
-<!ENTITY swapFirstNameLastNameCmd.label                 "Swap First/Last Name">
-<!ENTITY swapFirstNameLastNameCmd.accesskey             "w">  
-<!ENTITY propertiesCmd.label                            "Properties…">
+<!ENTITY deleteAbCmd.label                              "Borrar libreta de direcciones">  
+<!ENTITY deleteContactCmd.label                         "Borrar contacto">
+<!ENTITY deleteContactsCmd.label                        "Borrar contactos seleccionados">
+<!ENTITY deleteListCmd.label                            "Borrar lista">
+<!ENTITY deleteListsCmd.label                           "Borrar listas seleccionadas">
+<!ENTITY deleteItemsCmd.label                           "Borrar ítems seleccionados">
+<!ENTITY swapFirstNameLastNameCmd.label                 "Intercambiar nombre y apellidos">
+<!ENTITY swapFirstNameLastNameCmd.accesskey             "I">  
+<!ENTITY propertiesCmd.label                            "Propiedades…">
 <!-- LOCALIZATION NOTE (propertiesCmd.accesskey) : DONT_TRANSLATE -->  
 <!ENTITY propertiesCmd.accesskey                        "i">  
 <!ENTITY propertiesCmd.key                              "i">  
 
 <!-- View Menu -->
-<!ENTITY showAbToolbarCmd.label                         "Address Book Toolbar"> 
+<!ENTITY showAbToolbarCmd.label                         "Barra de herramientas de la libreta de direcciones"> 
 <!ENTITY showAbToolbarCmd.accesskey                     "o">  
 
-<!ENTITY showCardPane.label                             "Card Summary Pane">
-<!ENTITY showCardPane.accesskey                         "C">
+<!ENTITY showCardPane.label                             "Resumen de las tarjetas">
+<!ENTITY showCardPane.accesskey                         "R">
   
-<!ENTITY menu_ShowNameAs.label                          "Show Name As"> 
-<!ENTITY menu_ShowNameAs.accesskey                      "n"> 
-<!ENTITY firstLastCmd.label                             "First Last">  
-<!ENTITY firstLastCmd.accesskey                         "f"> 
-<!ENTITY lastFirstCmd.label                             "Last, First">  
+<!ENTITY menu_ShowNameAs.label                          "Mostrar nombre como"> 
+<!ENTITY menu_ShowNameAs.accesskey                      "s"> 
+<!ENTITY firstLastCmd.label                             "Nombre Apellido">  
+<!ENTITY firstLastCmd.accesskey                         "N"> 
+<!ENTITY lastFirstCmd.label                             "Apellidos, nombre">  
 <!ENTITY lastFirstCmd.accesskey                         "l"> 
-<!ENTITY displayNameCmd.label                           "Display Name">  
+<!ENTITY displayNameCmd.label                           "Nombre mostrado">  
 <!ENTITY displayNameCmd.accesskey                       "d"> 
 
 <!-- Tasks Menu -->
-<!ENTITY importCmd.label                                "Import…">
+<!ENTITY importCmd.label                                "Importar…">
 <!ENTITY importCmd.accesskey                            "I">
-<!ENTITY exportCmd.label                                "Export…">
+<!ENTITY exportCmd.label                                "Exportar…">
 <!ENTITY exportCmd.accesskey                            "E">
-<!ENTITY allowOnlineCheck.label                         "Check online presence (AOL)">
-<!ENTITY allowOnlineCheck.accesskey                     "C">
-
-<!ENTITY stopSearchingCmd.label                         ".Stop Searching"> 
+<!ENTITY allowOnlineCheck.label                         "Verificar presencia (AOL)">
+<!ENTITY allowOnlineCheck.accesskey                     "c">
 
 <!-- Toolbar and Popup items -->  
-<!ENTITY newcardButton.label                            "New Card">  
-<!ENTITY newcardButton.accesskey                        "C">  
-<!ENTITY newlistButton.label                            "New List">  
-<!ENTITY newlistButton.accesskey                        "L">  
-<!ENTITY editButton.label                               "Properties">  
-<!ENTITY editButton.accesskey                           "P">  
-<!ENTITY newmsgButton.label                             "Compose">  
-<!ENTITY newmsgButton.accesskey                         "C">  
-<!ENTITY deleteButton.label                             "Delete">  
-<!ENTITY deleteButton.accesskey                         "D">  
-<!ENTITY newimButton.label                              "Instant Message">  
+<!ENTITY newContactButton.label                         "Nuevo contacto">
+<!ENTITY newContactButton.accesskey                     "c">
+<!ENTITY newlistButton.label                            "Nueva lista">  
+<!ENTITY newlistButton.accesskey                        "l">  
+<!ENTITY editItemButton.label                           "Propiedades">
+<!ENTITY editItemButton.accesskey                       "P">
+<!ENTITY newmsgButton.label                             "Redactar">  
+<!ENTITY newmsgButton.accesskey                         "c">  
+<!ENTITY deleteItemButton.label                         "Borrar">
+<!ENTITY deleteItemButton.accesskey                     "B">
+<!ENTITY newimButton.label                              "IM">  
 <!ENTITY newimButton.accesskey                          "I">  
-<!ENTITY stopButton.label                               ".Stop">  
-<!ENTITY searchButton.label                             ".Search">  
-<!ENTITY showNames.label                                "Show names containing:">  
+<!ENTITY searchNameAndEmail.emptytext                   "Buscar nombre y correo">
 
 <!-- Tooltips -->
-<!ENTITY addressbookToolbar.tooltip                     "Address Book Toolbar">
-<!ENTITY newcardButton.tooltip                          "Create a new address book card"> 
-<!ENTITY newlistButton.tooltip                          "Create a new list"> 
-<!ENTITY editButton.tooltip                             "Edit the selected card"> 
-<!ENTITY newmsgButton.tooltip                           "Send a mail message"> 
-<!ENTITY newIM.tooltip                                  "Send an instant message or chat"> 
-<!ENTITY deleteButton.tooltip                           "Delete selected card or address book"> 
-<!ENTITY stopButton.tooltip                             "Stop the current transfer"> 
-<!ENTITY searchButton.tooltip                           "Search the selected address book"> 
-<!ENTITY throbber.tooltip                               "Go to the &vendorShortName; home page">
-<!ENTITY clearButton.tooltip                            "Clear the search criteria and show all entries">
-<!ENTITY advancedButton.tooltip                         "Advanced address search">
+<!ENTITY addressbookToolbar.tooltip                     "Barra de herramientas de la libreta de direcciones">
+<!ENTITY newContactButton.tooltip                       "Crear un nuevo contacto de libreta de direcciones">
+<!ENTITY newlistButton.tooltip                          "Crear nueva lista"> 
+<!ENTITY editItemButton.tooltip                         "Editar el ítem seleccionado">
+<!ENTITY newmsgButton.tooltip                           "Enviar un mensaje de correo"> 
+<!ENTITY newIM.tooltip                                  "Enviar un mensaje o conversación instantáneos"> 
+<!ENTITY deleteItemButton.tooltip                       "Borrar el ítem seleccionado">
+<!ENTITY throbber.tooltip                               "Ir a la página web de &vendorShortName;">
+<!ENTITY advancedButton.tooltip                         "Búsqueda avanzada de direcciones">
 
 <!-- Status Bar -->  
 <!ENTITY statusText.label                               "">
 
 <!-- LOCALIZATION NOTE (hideSwapFnLnUI) : DONT_TRANSLATE -->
 <!-- Swap FN/LN UI  Set to "false" to show swap fn/ln UI -->
 <!ENTITY  hideSwapFnLnUI                                "true">
--- a/suite/chrome/mailnews/addressbook/addressBook.properties
+++ b/suite/chrome/mailnews/addressbook/addressBook.properties
@@ -35,147 +35,158 @@
 # 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 *****
 
 #
 # The following are used by the Mailing list dialog
 #
-emptyListName=You must enter a list name.
+emptyListName=Debe introducir un nombre de lista.
 lastFirstFormat=%S, %S
 firstLastFormat=%S %S  
 
-newCardTitle=New Card  
+newContactTitle=Nuevo contacto
 # %S will be the card's display name
-newCardTitleWithDisplayName=New Card for %S
-editCardTitle=Edit Card
+newContactTitleWithDisplayName=Nuevo contacto para %S
+editContactTitle=Editar contacto
 # %S will be the card's display name
-editCardTitleWithDisplayName=Edit Card for %S
+editContactTitleWithDisplayName=Editar contacto para %S
 # don't translate vCard
-editVCardTitle=Edit vCard
+editVCardTitle=Editar vCard
 # %S will be the card's display name, don't translate vCard
-editVCardTitleWithDisplayName=Edit vCard for %S
+editVCardTitleWithDisplayName=Editar vCard de %S
 
 ## LOCALIZATION NOTE (cardRequiredDataMissingMessage):  do not localize \n
-cardRequiredDataMissingMessage=You must enter at least one of the following items:\nEmail Address, First Name, Last Name, Display Name, Organization.
-cardRequiredDataMissingTitle=Required Information Missing
-incorrectEmailAddressFormatMessage=The primary e-mail address must be of the form user@host.
-incorrectEmailAddressFormatTitle=Incorrect Email Address Format
+cardRequiredDataMissingMessage=Debe ingresar al menos uno de los siguientes ítems:\nCorreo electrónico, Nombre, Apellidos, Mostrado, Organización.
+cardRequiredDataMissingTitle=Falta información necesaria
+incorrectEmailAddressFormatMessage=La dirección de correo electrónico primaria debe ser de la forma usuario@servidor.
+incorrectEmailAddressFormatTitle=Formato de correo electrónico incorrecto
 
-viewCardTitle=Card for %S
-viewListTitle=Mailing List: %S
-mailListNameExistsTitle=Mailing List Already Exists
-mailListNameExistsMessage=A Mailing List with that name already exists. Please choose a different name.
+viewListTitle=Lista de correo: %S
+mailListNameExistsTitle=Ya existe la lista de correo.
+mailListNameExistsMessage=Ya existe una lista de correo con ese nombre. Por favor, escoja un nombre diferente.
 
 # used in the addressbook
-cannotDeleteTitle=Delete Failed
-confirmDeleteMailingListTitle=Delete Mailing List
-confirmDeleteAddressbookTitle=Delete Address Book
-confirmDeleteAddressbook=Are you sure you want to delete the selected address book?
-confirmDeleteCollectionAddressbook=If this address book is deleted, %S will no longer collect addresses. Are you sure you want to delete the selected address book?
-confirmDeleteMailingList=Are you sure you want to delete the selected mailing list?
-confirmDeleteListsAndCards=Are you sure you want to delete the selected cards and mailing lists?
-confirmDeleteMailingLists=Are you sure you want to delete the selected mailing lists?
+confirmDeleteMailingListTitle=Borrar lista de correos
+confirmDeleteAddressbookTitle=Borrar libreta de direcciones
+confirmDeleteAddressbook=¿Está seguro de querer borrar las libretas de direcciones seleccionadas?
+confirmDeleteCollectionAddressbook=Si esta libreta de direcciones es borrada, %S no podrá guardar más direcciones. ¿Está seguro de querer borrar la libreta de direcciones seleccionada?
+confirmDeleteMailingList=¿Está seguro de que desea borrar la lista de correo seleccionada?
+confirmDeleteListsAndContacts=¿Seguro desea borrar los contactos y listas de correo seleccionados?
+confirmDeleteMailingLists=¿Está seguro de que quiere borrar las listas de correo seleccionadas?
 
-propertyPrimaryEmail=Email
-propertyListName=List Name
-propertySecondaryEmail=Additional Email
-propertyScreenName=Screen Name
-propertyNickname=Nickname
-propertyDisplayName=Display Name
-propertyWork=Work
-propertyHome=Home
+propertyPrimaryEmail=Correo electrónico
+propertyListName=Nombre de la lista
+propertySecondaryEmail=Correo electrónico adicional
+propertyScreenName=Nombre en pantalla
+propertyNickname=Apodo
+propertyDisplayName=Nombre mostrado
+propertyWork=Trabajo
+propertyHome=Casa
 propertyFax=Fax
-propertyCellular=Mobile
-propertyPager=Pager
-propertyCustom1=Custom 1
-propertyCustom2=Custom 2
-propertyCustom3=Custom 3
-propertyCustom4=Custom 4
+propertyCellular=Teléfono celular
+propertyPager=Buscapersonas
+propertyBirthday=Cumpleaños
+propertyCustom1=Personalizado 1
+propertyCustom2=Personalizado 2
+propertyCustom3=Personalizado 3
+propertyCustom4=Personalizado 4
+
+## LOCALIZATION NOTE (dateformat)
+## Only used if the year isn't present and should be in the format used by Date.toLocaleFormat
+## see http://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Global_Objects/Date/toLocaleFormat
+## %B is the month's localized name and %e is the day of the month [1-31]
+## Separators (a space, dash, etc.) can be used
+dateformat=%e de %B
 
 ## LOCALIZATION NOTE (cityAndStateAndZip): 
 ## %1$S is city, %2$S is state, %3$S is zip
-cityAndStateAndZip=%1$S, %2$S %3$S
+cityAndStateAndZip=%1$S, %2$S (%3$S)
 ## LOCALIZATION NOTE (cityAndStateNoZip): 
 ## %1$S is city, %2$S is state
 cityAndStateNoZip=%1$S, %2$S
 ## LOCALIZATION NOTE (cityOrStateAndZip): 
 ## %1$S is city or state, %2$S is zip
 cityOrStateAndZip=%1$S %2$S
 
-cityStateSeparator=,
 stateZipSeparator=
 
-prefixTo=To
+prefixTo=Para
 prefixCc=Cc
-prefixBcc=Bcc
-emptyEmailAddCard=You cannot add a card that has no primary email address
-emptyEmailAddCardTitle=Cannot Add Card
-addressBook=Address Book
+prefixBcc=Cco
+emptyEmailAddCard=No se puede agregar una tarjeta que no tenga dirección primaria de correo electrónico
+emptyEmailAddCardTitle=No se puede agregar la tarjeta
+addressBook=Libreta de direcciones
+
+browsePhoto=Foto de contacto
 
 # mailnews.js
-ldap_2.servers.pab.description=Personal Address Book
-ldap_2.servers.history.description=Collected Addresses
+ldap_2.servers.pab.description=Libreta de direcciones personal
+ldap_2.servers.history.description=Direcciones recopiladas
 ## LOCALIZATION NOTE (ldap_2.servers.oe.description is only used on Windows)
-ldap_2.servers.oe.description=OE Contacts
+ldap_2.servers.oe.description=Contactos de OE
 ## LOCALIZATION NOTE (ldap_2.servers.osx.description is only used on Mac OS X)
-ldap_2.servers.osx.description=Mac OS X Address Book
+ldap_2.servers.osx.description=Libreta de direcciones de Mac OS X
 
 # status bar stuff
-## LOCALIZATION NOTE (totalCardStatus): 
+## LOCALIZATION NOTE (totalContactStatus): 
 ## %1$S is address book name, %2$S is card count
-totalCardStatus=Total Cards in %1$S: %2$S
+totalContactStatus=Contactos totales en %1$S: %2$S
 ## LOCALIZATION NOTE (matchesFound):  do not localize %S
-noMatchFound=No matches found
-matchFound=1 match found
-matchesFound=%S matches found
+noMatchFound=No se han encontrado coincidencias
+matchFound=Se ha encontrado 1 coincidencia
+matchesFound=Se han encontrado %S coincidencias
 
-cardsCopied=%S cards copied
-cardCopied=1 card copied
-cardsMoved=%S cards moved
-cardMoved=1 card moved
+## LOCALIZATION NOTE (contactsCopied): Semi-colon list of plural forms
+## %1$S is the number of contacts that were copied. This should be used multiple
+## times wherever you need it. Do not replace by %S.
+contactsCopied=%1$S contacto copiado;%1$S contactos copiados
+
+## LOCALIZATION NOTE (contactsMoved): Semi-colon list of plural forms
+## %1$S is the number of contacts that were moved. This should be used multiple
+## times wherever you need it. Do not replace by %S.
+contactsMoved=%1$S contacto movido;%1$S contactos movidos
 
 # LDAP directory stuff
-directoriesListItemNone=None
-invalidName=Please enter a valid Name.
-invalidHostname=Please enter a valid Hostname.
-invalidPortNumber=Please enter a valid Port Number.
-invalidResults=Please enter a valid number in the results field.
-abReplicationOfflineWarning=You must be online to perform LDAP replication.
-abReplicationSaveSettings=Settings must be saved before a directory may be downloaded.
+invalidName=Por favor, introduzca un nombre válido.
+invalidHostname=Por favor, introduzca un nombre de servidor válido.
+invalidPortNumber=Por favor, introduzca un número de puerto válido.
+invalidResults=Por favor, introduzca un número válido en el campo de resultados.
+abReplicationOfflineWarning=Tiene que estar conectado para poder realizar una replicación LDAP.
+abReplicationSaveSettings=Las configuraciones deben ser guardadas antes de que un directorio pueda ser descargado.
 
 # For importing / exporting
-ExportAddressBookTitle=Export Address Book
+ExportAddressBookTitle=Exportar libreta de direcciones
 LDIFFiles=LDIF
-CSVFiles=Comma Separated
-TABFiles=Tab Delimited
-failedToExportTitle=Export Failed
-failedToExportMessageNoDeviceSpace=Failed to export addressbook, no space left on device.
-failedToExportMessageFileAccessDenied=Failed to export addressbook, file access denied.
+CSVFiles=Separado por comas
+TABFiles=Delimitado por tabuladores
+failedToExportTitle=No se puede exportar
+failedToExportMessageNoDeviceSpace=No se puede exportar la libreta de direcciones. No queda espacio en el dispositivo.
+failedToExportMessageFileAccessDenied=No se puede exportar la libreta de direcciones, acceso al archivo denegado.
 
 # For getting authDN for replication using dlg box
-AuthDlgTitle=Address Book LDAP Replication
-AuthDlgDesc=To access the directory server, enter your user name and password.
+AuthDlgTitle=Réplica LDAP de libreta de direcciones
+AuthDlgDesc=Para acceder al servidor de directorio, introduzca su usuario y contraseña.
 
 # LOCALIZATION NOTE(joinMeInThisChat)
 # use + for spaces
-joinMeInThisChat=Join+me+in+this+Chat.
+joinMeInThisChat=Únete+a+mí+en+este+chat.
 
 # For printing
-headingHome=Home
-headingWork=Work
-headingOther=Other
-headingPhone=Phone
-headingDescription=Description
-headingAddresses=Addresses
+headingHome=Inicio
+headingWork=Trabajo
+headingOther=Otros
+headingPhone=Teléfono
+headingDescription=Descripción
+headingAddresses=Direcciones
 
 # For address books
-newAddressBookTitle=New Address Book
-renameAddressBookTitle=Address Book Properties
+newAddressBookTitle=Nueva libreta de direcciones
+renameAddressBookTitle=Propiedades de libreta de direcciones
 
 # For corrupt .mab files
-corruptMabFileTitle=Corrupt Address Book File
-corruptMabFileAlert=One of your address book files (%1$S file) could not be read. A new %2$S file will be created and a backup of the old file, called %3$S, will be created in the same directory.
+corruptMabFileTitle=Archivo de libreta de direcciones corrupto
+corruptMabFileAlert=Una de sus libretas de direcciones (archivo %1$S) no se pudo leer. En el mismo directorio se creará un nuevo archivo %2$S y una copia del archivo antiguo, llamada %3$S.
 
 # For locked .mab files
-lockedMabFileTitle=Unable to Load Address Book File
-lockedMabFileAlert=Unable to load address book file %S. It may be read-only, or locked by another application. Please try again later.
+lockedMabFileTitle=No se puede cargar el archivo de libreta de direcciones
+lockedMabFileAlert=No se puede cargar la libreta de direcciones %S. Puede ser de sólo lectura o puede estar bloqueada por otra aplicación. Por favor, intente nuevamente.
--- a/suite/chrome/mailnews/compose/composeMsgs.properties
+++ b/suite/chrome/mailnews/compose/composeMsgs.properties
@@ -33,306 +33,295 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 #
 # The following are used by the compose back end
 #
 ## @name NS_MSG_UNABLE_TO_OPEN_FILE 
-12500=Unable to open the file %P0%.
+12500=No es posible abrir el archivo %P0%.
 
 ## @name NS_MSG_UNABLE_TO_OPEN_TMP_FILE
-12501=Unable to open the temporary file %P0%. Check your 'Temporary Directory' setting.
+12501=No es posible abrir el archivo temporal %P0%. Verifique la configuración de su 'Directorio temporal'.
 
 ## @name NS_MSG_UNABLE_TO_SAVE_TEMPLATE
-12502=Unable to save your message as template.
+12502=No es posible guardar su mensaje como plantilla.
 
 ## @name NS_MSG_UNABLE_TO_SAVE_DRAFT
-12503=Unable to save your message as draft.
+12503=No es posible guardar su mensaje como un borrador.
 
 ## @name NS_MSG_LOAD_ATTACHMNTS
-12504=Loading attachments…
+12504=Cargando adjuntos…
 
 ## @name NS_MSG_LOAD_ATTACHMNT
-12505=Loading attachment…
+12505=Cargando adjunto…
 
 ## @name NS_MSG_COULDNT_OPEN_FCC_FOLDER
-12506=Couldn't open Sent mail folder. Please verify that your Mail preferences are correct.
+12506=No se puede abrir la carpeta de correos enviados. Verifique que sus preferencias de correo sean las correctas.
 
 ## @name NS_MSG_CANT_POST_TO_MULTIPLE_NEWS_HOSTS
-12507=Can't post to multiple news hosts. Try again.
+12507=No es posible publicar en múltiples servidores de noticias. Vuelva a intentarlo.
 
 ## @name NS_MSG_ASSEMB_DONE_MSG
-12508=Assembling message…Done
+12508=Ensamblando el mensaje… Listo
 
 ## @name NS_MSG_ASSEMBLING_MSG
-12509=Assembling message…
+12509=Ensamblando el mensaje…
 
 ## @name NS_MSG_NO_SENDER
-12510=No sender was specified. Please fill in your email address in the Mail & Newsgroups account settings.
+12510=No se especificó remitente. Por favor, complete su dirección de correo electrónico en las preferencias de Correo y Noticias.
 
 ## @name NS_MSG_NO_RECIPIENTS
-12511=No recipients were specified. Please enter a recipient or newsgroup in the addressing area.
+12511=No se especificaron destinatarios. Por favor, ingrese un destinatario o grupo de noticias en el área de dirección.
 
 ## @name NS_MSG_ERROR_WRITING_FILE
-12512=Error writing temporary file.
+12512=Error al escribir el archivo temporal.
 
 ## @name NS_ERROR_SENDING_FROM_COMMAND
-12514=An error occurred while sending mail. The mail server responded:  %s.  Please verify that your email address is correct in your Mail preferences and try again.
+12514=Ocurrió un error mientras se enviaba el correo. El servidor de correo respondió: %s. Por favor, verifique que su dirección de correo electrónico es correcta en las preferencias de correo y vuelva a intentarlo.
 
 ## @name NS_ERROR_SENDING_DATA_COMMAND
-12516=An (SMTP) error occurred while sending mail. The server responded:  %s.
+12516=Ocurrió un error (SMTP) al enviar el correo. El servidor respondió: %s.
 
 ## @name NS_ERROR_SENDING_MESSAGE
-12517=An error occurred while sending mail. The mail server responded:  %s. Please check the message and try again.
+12517=Ocurrió un error al enviar el correo. El servidor de correo respondió: %s. Por favor, compruebe el mensaje y vuelva a intentarlo.
 
 ## @name NS_ERROR_POST_FAILED
-12518=The message could not be posted because connecting to the news server failed. The server may be unavailable or is refusing connections. Please verify that your news server settings are correct and try again, or else contact your network administrator.
+12518=Este mensaje no pudo ser publicado porque falló la conexión con el servidor de noticias. El servidor puede no estar disponible o rechazando conexiones. Por favor, verifique que su configuración del servidor de noticias es correcta y vuelva a intentarlo, o contacte con el administrador de su red.
 
 ## @name NS_ERROR_QUEUED_DELIVERY_FAILED
-12519=An error occurred delivering unsent messages.
+12519=Ocurrió un error al procesar sus mensajes no enviados.
 
 ## @name NS_ERROR_SEND_FAILED
-12520=Sending of message failed.
+12520=Falló el envío del mensaje.
 
 ## @name SMTP_DELIV_MAIL
-12521=Delivering mail…
+12521=Enviando correo…
 
 ## @name SMTP_MESSAGE_SENT_WAITING_MAIL_REPLY
-12522=Mail: Message sent; waiting for reply…
+12522=Mail: mensaje enviado; esperando respuesta…
 
 ## @name SMTP_PROGRESS_MAILSENT
-12523=Mail sent successfully
+12523=Correo enviado con éxito
 
 ## @name NS_ERROR_SMTP_SERVER_ERROR
-12524=An error occurred sending mail: SMTP server error. The server responded:  %s\n Contact your mail administrator for assistance.
+12524=Ocurrió un error enviando el correo: Error de servidor SMTP. El servidor respondió:  %s\n Contacte a su administrador de correo para recibir ayuda.
 
 ## @name NS_MSG_UNABLE_TO_SEND_LATER
-12525=Unable to save your message in order to send it later.
+12525=No es posible guardar su mensaje para poder enviarlo más tarde.
 
 ## @name NS_ERROR_COMMUNICATIONS_ERROR
-12526=A communications error occurred: %d.  Please try again.
+12526=Ocurrió un error de comunicación: %d. Por favor, vuelva a intentarlo.
 
 ## @name NS_ERROR_BUT_DONT_SHOW_ALERT
 12527=THIS IS JUST A PLACEHOLDER.  YOU SHOULD NEVER SEE THIS STRING.
 
 ## @name NS_ERROR_TCP_READ_ERROR
-12528=A network error occurred while receiving data.  (Network Error: %s)  Try connecting again.
+12528=Ocurrió un error de red mientras se recibían los datos. (Error de red: %s) Intente conectarse nuevamente.
 
 ## @name NS_ERROR_COULD_NOT_GET_USERS_MAIL_ADDRESS
-12529=An error occurred sending mail:  the return mail address was invalid.  Please verify that your email address is correct in your Mail preferences and try again.
+12529=Ocurrió un error al enviar el correo: la dirección de correo de respuesta no era válida. Verifique que su dirección de correo electrónico es correcta en sus preferencias de correo y vuelva a intentarlo.
 
 ## @name NS_ERROR_MIME_MPART_ATTACHMENT_ERROR
-12531=Attachment error.
+12531=Error en adjunto.
 
 ## @name NS_MSG_FAILED_COPY_OPERATION
-12532=The message was sent successfully, but could not be copied to your Sent folder.
+12532=El mensaje se envió con éxito, pero no pudo copiarse a la carpeta Enviados.
 
 ## @name NS_MSG_FAILURE_ON_OBJ_EMBED_WHILE_SAVING
-12533=There was a problem including the file %.200s in the message. Would you like to continue saving the message without this file?
+12533=Hubo un problema al incluir el archivo %.200s en el mensaje. ¿Quiere seguir guardando el mensaje sin el archivo?
 
 ## @name NS_MSG_ASSEMBLING_MESSAGE
-12534=Assembling mail information…
+12534=Ensamblando la información de correo…
 
 ## @name NS_MSG_GATHERING_ATTACHMENT
-12535=Attaching %s…
+12535=Adjuntando %s…
 
 ## @name NS_MSG_CREATING_MESSAGE
-12536=Creating mail message…
+12536=Creando mensaje de correo…
 
 ## @name NS_MSG_FAILURE_ON_OBJ_EMBED_WHILE_SENDING
-12537=There was a problem including the file %.200s in the message. Would you like to continue sending the message without this file?
+12537=Hubo un problema al incluir el archivo %.200s en el mensaje. ¿Quiere continuar el envío del mensaje sin este archivo?
 
 ## @name NS_MSG_START_COPY_MESSAGE
-12538=Copying message to %S folder…
+12538=Copiando el mensaje a la carpeta %S…
 
 ## @name NS_MSG_START_COPY_MESSAGE_COMPLETE
-12539=Copy complete.
+12539=Copia completa.
 
 ## @name NS_MSG_START_COPY_MESSAGE_FAILED
-12540=Copy failed.
+12540=Falló la copia.
 
 ## @name NS_MSG_LARGE_MESSAGE_WARNING
-12541=Warning! You are about to send a %d byte message. Are you sure that you want to do this?
-
-noIdentities=You don't have any email identities yet.  Create one with the Account Wizard.
-
-## @name NS_SMTP_PASSWORD_PROMPT1
-12543=Enter your password for %S:
-
-## @name NS_SMTP_PASSWORD_PROMPT2
-12544=Enter your password for %S on %S:
-
-## @name NS_SMTP_CONNECTING_TO_SERVER
-12545=Connecting to server…
+12541=¡Atención! Está a punto de enviar un mensaje de %d bytes. ¿Está seguro de querer hacerlo?
 
 ## @name NS_MSG_SENDING_MESSAGE
-12550=Sending message…
+12550=Conectando con el servidor…
 
 ## @name NS_MSG_POSTING_MESSAGE
-12551=Posting message…
+12551=Enviando el mensaje…
 
 ## @name NS_ERROR_NNTP_NO_CROSS_POSTING
-12554=You can only send a message to one news server at a time.
+12554=Sólo puede enviar un mensaje a un servidor de noticias a la vez.
 
 ## @name NS_MSG_CANCELLING
-12555=Cancelling…
+12555=Cancelando…
 
 ## @name NS_MSG_SEND_ERROR_TITLE
-12556=Send Message Error
+12556=Error de envío de mensaje
 
 ## @name NS_MSG_SENDLATER_ERROR_TITLE
-12557=Send Later Error
+12557=Error de envío diferido
 
 ## @name NS_MSG_SAVE_DRAFT_TITLE
-12558=Save Draft Error
+12558=Error guardando el borrador
 
 ## @name NS_MSG_SAVE_TEMPLATE_TITLE
-12559=Save Template Error
+12559=Error guardando la plantilla
 
 ## @name NS_ERROR_SEND_FAILED_BUT_NNTP_OK
-12560=Your message has been posted to the newsgroup but has not been sent to other recipient.
+12560=Su mensaje ha sido enviado al grupo de noticias pero no ha sido enviado a otros destinatarios.
 
 ## @name NS_MSG_ASK_TO_COMEBACK_TO_COMPOSE
-12561=Would you like to return to the compose window?
+12561=¿Quiere volver a la ventana de redacción?
 
 ## @name NS_MSG_GENERIC_FAILURE_EXPLANATION
-12562=Please verify that your Mail & Newsgroups account settings are correct and try again.
+12562=Verifique que sus configuraciones de cuenta de correo y noticias son correctas y vuelva a intentarlo.
 
 ## @name NS_MSG_ERROR_READING_FILE
-12563=Error reading file.
+12563=Error leyendo archivo.
 
 ## @name NS_FOLLOWUPTO_SENDER
-12564=The author of this message has requested that responses be sent only to the author. If you also want to reply to the newsgroup, add a new row to the addressing area, choose Newsgroup from the recipients list, and enter the name of the newsgroup.
+12564=El autor de este mensaje ha pedido que las respuestas sean enviadas únicamente al autor. Si también quiere responder al grupo de noticias, agregue una nueva fila al área de direcciones, elija Grupo de la lista de encabezados e introduzca el nombre del grupo de noticias.
 
 ## @name NS_MSG_UNDISCLOSED_RECIPIENTS
 ## LOCALIZATION NOTE: this string must be using only US_ASCII characters
-12566=undisclosed-recipients
+12566=destinatarios-no-revelados
 
 ## @name NS_MSG_ERROR_ATTACHING_FILE
-12570=There was an error attaching %S. Please check if you have access to the file.
+12570=Hubo un problema al adjuntar %S. Por favor, compruebe si tiene acceso al archivo.
 
 ## @name NS_MSG_ERROR_DOING_FCC
-12571=There was an error copying the message to the Sent folder. Retry?
+12571=Ocurrió un error al copiar el mensaje a la carpeta Enviados. ¿Reintentar?
 
 ## @name NS_ERROR_SMTP_GREETING
-12572=An error occurred sending mail: The mail server sent an incorrect greeting:  %s.
+12572=Ocurrió un error al enviar el correo: El servidor de correo envió un saludo incorrecto: %s.
 
 ## @name NS_ERROR_SENDING_RCPT_COMMAND
-12575=An error occurred while sending mail. The mail server responded:  %1$s. Please check the message recipient %2$s and try again.
+12575=Ocurrió un error mientras se enviaba el correo: El servidor de correo respondió: %1$s. Revise el destinatario %2$s e inténtelo nuevamente.
 
 ## @name NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER_INSECAUTH
-12579=An error occurred sending mail: Unable to authenticate to SMTP server %S. The server does not support any compatible insecure authentication mechanism but you have chosen insecure authentication. Try switching on secure authentication or contact your service provider.
+12579=Ocurrió un error enviando el correo: No se puede autenticar al servidor SMTP %S. El servidor no soporta ningún mecanismo de autenticación insegura compatible pero usted eligió usar autenticación insegura. Intente cambiar a una autenticación segura o contacte a su proveedor del servicio.
 
 ## @name NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER_SECAUTH
-12580=An error occurred sending mail: Unable to authenticate to SMTP server %S. The server does not support any compatible secure authentication mechanism but you have chosen secure authentication. Try switching off secure authentication or contact your service provider.
+12580=Ocurrió un error enviando el correo: No se puedo autenticar al servidor SMTP %S. El servidor no soporta ningún mecanismo compatible de autenticación segura pero usted eligió usar autenticación segura. Intente deshabilitar la autenticación segura o contacte a su proveedor del servicio.
 
 ## @name NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER_AUTH_NONE
-12581=An error occurred sending mail: Unable to authenticate to SMTP server %S. It does not support authentication (SMTP-AUTH) but you have chosen to use authentication. Uncheck 'Use name and password' for that server or contact your service provider.
+12581=Ocurrió un error enviando el correo: No se puedo autenticar al servidor SMTP %S. No permite el uso de autenticación (SMTP-AUTH) pero usted eligió usar autenticación. Desmarque 'Usar nombre y contraseña' para este servidor o contacte a su proveedor del servicio.
 
 ## @name NS_ERROR_STARTTLS_FAILED_EHLO_STARTTLS
-12582=An error occurred sending mail: Unable to establish a secure link with SMTP server %S using STARTTLS since it doesn't advertise that feature. Switch off STARTTLS for that server or contact your service provider.
+12582=Ocurrió un error enviando el correo: No se pudo establecer una conexión segura con el servidor SMTP %S usando STARTTLS porque no anuncia esa característica. Deshabilite STARTTLS para ese servidor o contacte a su proveedor del servicio.
 
 ## @name NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER
-12583=An error occurred sending mail: Unable to log in to SMTP server %S. The server may be incorrectly configured. Please verify that your SMTP server settings are correct and try again.
+12583=Hubo un error mientras se enviaba el correo: No se pudo ingresar al servidor SMTP %S. El servidor puede estar mal configurado. Verifique que las opciones del servidor SMTP sean correctas e inténtelo nuevamente.
 
 ## @name NS_ERROR_SMTP_PASSWORD_UNDEFINED
-12584=An error occurred sending mail: Could not get password for %S. The message was not sent.
-
-## @name NS_SMTP_PASSWORD_PROMPT_TITLE
-12585=SMTP Server Password Required
+12584=Ocurrió un error enviando el correo: No se pudo obtener la contraseña para %S. El mensaje no fue enviado.
 
 ## @name NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED
-12586=The size of the message you are trying to send exceeds a temporary size limit of the server. The message was not sent; try to reduce the message size or wait some time and try again. The server responded:  %s.
+12586=El tamaño del mensaje que está intentando enviar excede el límite temporal del servidor. El mensaje no fue enviado; intente reducir el tamaño del mensaje o espere y vuelva a intentarlo. El servidor respondió: %s.
 
 ## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1
-12587=The size of the message you are trying to send exceeds the global size limit (%d bytes) of the server. The message was not sent; reduce the message size and try again.
+12587=El tamaño del mensaje que está intentando enviar excede el límite global del servidor (%d bytes). El mensaje no fue enviado; reduzca el tamaño del mensaje e intente nuevamente.
 
 ## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2
-12588=The size of the message you are trying to send exceeds the global size limit of the server. The message was not sent; reduce the message size and try again. The server responded:  %s.
+12588=El tamaño del mensaje que está intentando enviar excede el límite global del servidor. El mensaje no fue enviado; reduzca el tamaño del mensaje e intente nuevamente. El servidor respondió: %s.
 
 ## @name NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_SERVER
-12589=An error occurred sending mail: SMTP server %S is unknown. The server may be incorrectly configured. Please verify that your SMTP server settings are correct and try again.
+12589=Hubo un error mientras se enviaba el correo: El servidor SMTP %S es desconocido. El servidor puede estar mal configurado. Verifique que las opciones de su servidor SMTP sean correctas e inténtelo nuevamente.
 
 ## @name NS_ERROR_SMTP_SEND_FAILED_REFUSED
-12590=The message could not be sent because connecting to SMTP server %S failed. The server may be unavailable or is refusing SMTP connections. Please verify that your SMTP server settings are correct and try again, or contact the server administrator.
+12590=El mensaje no pudo ser enviado porque falló la conexión al servidor SMTP. El servidor puede no estar disponible o está rechazando las conexiones SMTP. Verifique que las opciones de su servidor SMTP sean correctas e intente nuevamente o contacte al administrador del servidor.
 
 ## @name NS_ERROR_SMTP_SEND_FAILED_INTERRUPTED
-12591=The message could not be sent because the connection to SMTP server %S was lost in the middle of the transaction. Try again or contact your network administrator.
+12591=El mensaje no pudo ser enviado porque la conexión al servidor SMTP %S se perdió en medio de la transacción. Intente nuevamente o contacte a su administrador de red.
 
 ## @name NS_ERROR_SMTP_SEND_FAILED_TIMEOUT
-12592=The message could not be sent because the connection to SMTP server %S timed out. Try again or contact your network administrator.
+12592=El mensaje no pudo ser enviado porque se terminó el tiempo para la conexión con el servidor SMTP %S. Inténtelo nuevamente o contacte a su administrador de red.
 
 ## @name NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_REASON
-12593=The message could not be sent using SMTP server %S for an unknown reason. Please verify that your SMTP server settings are correct and try again, or contact your network administrator.
+12593=El mensaje no pudo ser enviado usando el servidor SMTP %S por una razón desconocida. Verifique que las opciones del servidor SMTP sean correctas e intente nuevamente o contacte a su administrador de redes.
 
 ## Strings use for the save message dialog shown when the user close a message compose window
-saveDlogTitle=Save Message
-saveDlogMessage=Message has not been sent. Do you want to save the message in the Drafts folder?
-saveDlogSaveBtn=Save
-saveDlogDontSaveBtn=Don't Save
-saveDlogCancelBtn=Cancel
+saveDlogTitle=Guardar mensaje
+saveDlogMessage=El mensaje no se ha enviado. ¿Desea guardar el mensaje en la carpeta Borradores?
 
 ## generics string
-defaultSubject=(no subject)
-chooseFileToAttach=Attach File(s)
+defaultSubject=(sin asunto)
+chooseFileToAttach=Adjuntar archivo(s)
 
 ##
-windowTitlePrefix=Compose:
+windowTitlePrefix=Redactar:
 
 ## String used by the dialog that ask the user to enter a subject
-sendMsgTitle=Send Message
-subjectDlogMessage=You did not specify a subject for this message. If you would like to provide one, please type it now.
+sendMsgTitle=Enviar mensaje
+subjectDlogMessage=No especificó un asunto para este mensaje. Si quiere proporcionar uno, ingréselo ahora.
 
 ## String used by the dialog that informs the user about the newsgroup recipient
-recipientDlogMessage=This account only supports email recipients. Continuing will ignore newsgroups.
+recipientDlogMessage=Esta cuenta solamente soporta correo. Si continúa, se ignorarán los grupos de noticias.
 
 #String used by the alert that tells the user an e-mail address is invalid
-addressInvalid=%1$S is not a valid e-mail address because it is not of the form user@host. You must correct it before sending the e-mail.
+addressInvalid=%1$S no es una dirección de correo válida porque no tiene la forma usuario@servidor. Debe corregirla antes de enviar el correo electrónico.
 
 ## String used by the dialog that ask the user to attach a web page
-attachButtonLabel=Attach
-chooseFileDialogTitle=Choose File
-## String used by Thunderbird's prompt
-attachPageDlogTitle=Please specify a location to attach
-attachPageDlogMessage=Web Page (URL):
+attachButtonLabel=Adjuntar
+chooseFileDialogTitle=Seleccionar archivo
 
 ## String used for attachment pretty name, when attachment is a message
-messageAttachmentSafeName=Attached Message
+messageAttachmentSafeName=Mensaje adjunto
 ## String used for attachment pretty name, when attachment is message part
-partAttachmentSafeName=Attached Message Part
+partAttachmentSafeName=Parte del mensaje adjunto
 
 ## String used by the Initialization Error dialog
-initErrorDlogTitle=Message Compose
+initErrorDlogTitle=Redacción de mensaje
 ## LOCALIZATION NOTE (initErrorDlogMessage): %1$s will be replaced by the error string.  do not translate \n
-initErrorDlogMessage=An error occurred while creating a message compose window. Please try again.\n%1$s
+initErrorDlogMessage=Ocurrió un error mientras se creaba una ventana de redacción de mensaje. Inténtelo nuevamente.\n%1$s
 
 ## Strings used by Save as Draft/Template dialog
-SaveDialogTitle=Save Message
+SaveDialogTitle=Guardar mensaje
 ## LOCALIZATION NOTE (SaveDialogMsg): %1$S is folder name, %2$S is host name
-SaveDialogMsg=Your message has been saved to the folder %1$S under %2$S.
-CheckMsg=Do not show me this dialog box again.
+SaveDialogMsg=Su mensaje se ha guardado en la carpeta %1$S en %2$S.
+CheckMsg=No mostrar este diálogo nuevamente.
 
 ## Strings used by prompt when Quitting while in progress
-quitComposeWindowTitle=Sending Message
+quitComposeWindowTitle=Enviando mensaje
 ## LOCALIZATION NOTE (quitComposeWindowMessage): don't translate \n
-quitComposeWindowMessage2=%1$S is currently in the process of sending a message.\nWould you like to wait until the message has been sent before quitting or quit now?
-quitComposeWindowQuitButtonLabel2=&Quit
-quitComposeWindowWaitButtonLabel2=&Wait
+quitComposeWindowMessage2=%1$S está en proceso de enviar un mensaje.\n¿Quiere esperar a que el mensaje haya sido enviado antes de salir o salir ahora?
+quitComposeWindowQuitButtonLabel2=&Salir
+quitComposeWindowWaitButtonLabel2=&Esperar
 
 ## Strings used by prompt for Ctrl-Enter check before sending message
-sendMessageCheckWindowTitle=Send Message
-sendMessageCheckLabel=Are you sure you are ready to send this message?
-sendMessageCheckSendButtonLabel=Send
+sendMessageCheckWindowTitle=Enviar mensaje
+sendMessageCheckLabel=¿Está seguro de querer enviar este mensaje?
+sendMessageCheckSendButtonLabel=Enviar
 
 ## reply header in composeMsg
 ## <author> wrote:
-mailnews.reply_header_authorwrote=%s wrote
-mailnews.reply_header_ondate=On %s
+mailnews.reply_header_authorwrote=%s escribió
+mailnews.reply_header_ondate=El %s
 
 ## reply header in composeMsg
 ## user specified 
-mailnews.reply_header_originalmessage=-------- Original Message --------
+mailnews.reply_header_originalmessage=-------- Mensaje original --------
 
 ## Strings used by the rename attachment dialog
-renameAttachmentTitle=Rename Attachment
-renameAttachmentMessage=New attachment name:
+renameAttachmentTitle=Renombrar adjunto
+renameAttachmentMessage=Nuevo nombre del adjunto:
+
+## LOCALIZATION NOTE(smtpEnterPasswordPrompt): Do not translate the
+## word $S. Place the word $S where the host name should appear.
+smtpEnterPasswordPrompt=Ingrese su contraseña para %S:
+## LOCALIZATION NOTE(smtpEnterPasswordPromptWithUsername): Do not translate the
+## words %1$S and %2$S. Place the word %1$S where the host name should appear,
+## and %2$S where the user name should appear.
+smtpEnterPasswordPromptWithUsername=Ingrese la contraseña para %2$S en %1$S:
+smtpEnterPasswordPromptTitle=Contraseña del servidor SMTP requerida
--- a/suite/chrome/mailnews/compose/messengercompose.dtd
+++ b/suite/chrome/mailnews/compose/messengercompose.dtd
@@ -1,229 +1,170 @@
 <!--LOCALIZATION NOTE messengercompose.dtd Main UI for message composition -->
-<!ENTITY msgComposeWindow.title "Compose: (no subject)">
+<!ENTITY msgComposeWindow.title "Redactar: (sin asunto)">
 
-<!ENTITY fromAddr.label "From:">
-<!ENTITY fromAddr.accesskey "r">
-<!ENTITY subject.label  "Subject:">
-<!ENTITY subject.accesskey "S">
-<!ENTITY attachments.label "Attachments:">
-<!ENTITY attachments.accesskey "c">
+<!ENTITY fromAddr.label "De:">
+<!ENTITY fromAddr.accesskey "D">
+<!ENTITY subject.label  "Asunto:">
+<!ENTITY subject.accesskey "s">
+<!ENTITY attachments.label "Adjuntos:">
+<!ENTITY attachments.accesskey "A">
 
 <!-- menu items:  the . means that the menu item isn't implemented yet -->
 
 <!-- File menu items -->
-<!ENTITY newMessage.label "Message">  
+<!ENTITY newMessage.label "Mensaje">  
 <!ENTITY newMessage.accesskey "M">  
-<!ENTITY saveCmd.label "Save">
+<!ENTITY saveCmd.label "Guardar">
 <!ENTITY saveCmd.key "S">
-<!ENTITY saveCmd.accesskey "s">
-<!ENTITY saveAsCmd.label "Save As">
-<!ENTITY saveAsCmd.accesskey "A">
-<!ENTITY saveAsFileCmd.label "File…">
-<!ENTITY saveAsFileCmd.accesskey "F">
-<!ENTITY saveAsDraftCmd.label "Draft">
-<!ENTITY saveAsDraftCmd.accesskey "D">
-<!ENTITY saveAsTemplateCmd.label "Template">
-<!ENTITY saveAsTemplateCmd.accesskey "T">
-<!ENTITY attachMenu.label "Attach">
+<!ENTITY saveCmd.accesskey "G">
+<!ENTITY saveAsCmd.label "Guardar como">
+<!ENTITY saveAsCmd.accesskey "a">
+<!ENTITY saveAsFileCmd.label "Archivo…">
+<!ENTITY saveAsFileCmd.accesskey "A">
+<!ENTITY saveAsDraftCmd.label "Borrador">
+<!ENTITY saveAsDraftCmd.accesskey "d">
+<!ENTITY saveAsTemplateCmd.label "Plantilla">
+<!ENTITY saveAsTemplateCmd.accesskey "t">
+<!ENTITY attachMenu.label "Adjuntar">
 <!ENTITY attachMenu.accesskey "t">
-<!ENTITY attachFileCmd.label "File(s)…">
-<!ENTITY attachFileCmd.key "">
-<!ENTITY attachFileCmd.accesskey "F">
-<!ENTITY attachPageCmd.label "Web Page…">
-<!ENTITY attachPageCmd.accesskey "W">
+<!ENTITY attachFileCmd.label "Archivo(s)…">
+<!ENTITY attachFileCmd.accesskey "A">
+<!ENTITY attachPageCmd.label "Página web…">
+<!ENTITY attachPageCmd.accesskey "w">
 <!--LOCALIZATION NOTE attachVCardCmd.label Don't translate the term 'vCard' -->
-<!ENTITY attachVCardCmd.label "Personal Card (vCard)">
-<!ENTITY attachVCardCmd.accesskey "P">
-<!ENTITY sendNowCmd.label "Send Now">
+<!ENTITY attachVCardCmd.label "Tarjeta personal (vCard)">
+<!ENTITY attachVCardCmd.accesskey "p">
+<!ENTITY sendNowCmd.label "Enviar ahora">
 <!ENTITY sendCmd.keycode "VK_RETURN">
-<!ENTITY sendNowCmd.accesskey "d">
-<!ENTITY sendLaterCmd.label "Send Later">
+<!ENTITY sendNowCmd.accesskey "E">
+<!ENTITY sendLaterCmd.label "Enviar más tarde">
 <!ENTITY sendLaterCmd.keycode "VK_RETURN">
-<!ENTITY sendLaterCmd.accesskey "L">
-<!ENTITY printSetupCmd.label "Page Setup…">
+<!ENTITY sendLaterCmd.accesskey "E">
+<!ENTITY printSetupCmd.label "Configurar página…">
 <!ENTITY printSetupCmd.accesskey "u">
-<!ENTITY printCmd.label "Print…">
+<!ENTITY printCmd.label "Imprimir…">
 <!ENTITY printCmd.key "P">
-<!ENTITY printCmd.accesskey "P">
-<!ENTITY closeCmd.label "Close">
+<!ENTITY printCmd.accesskey "p">
 
 <!-- Edit menu items -->
-<!ENTITY editRewrapCmd.label "Rewrap">
-<!ENTITY editRewrapCmd.accesskey  "w">
-<!ENTITY findCmd.label "Find and Replace…">
+<!ENTITY editRewrapCmd.label "Reajuste de línea">
+<!ENTITY editRewrapCmd.key "R">
+<!ENTITY editRewrapCmd.accesskey  "R">
+<!ENTITY findCmd.label "Buscar y reemplazar…">
 <!ENTITY findCmd.key "F">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findAgainCmd.label "Find Again">
+<!ENTITY findCmd.accesskey "B">
+<!ENTITY findAgainCmd.label "Buscar de nuevo">
 <!ENTITY findAgainCmd.key "G">
-<!ENTITY findAgainCmd.accesskey "g">
+<!ENTITY findAgainCmd.accesskey "B">
 <!ENTITY findAgainCmd.key2 "VK_F3">
-<!ENTITY findPrevCmd.label "Find Previous">
+<!ENTITY findPrevCmd.label "Buscar anterior">
 <!ENTITY findPrevCmd.key "G">
 <!ENTITY findPrevCmd.key2 "VK_F3">
-<!ENTITY findPrevCmd.accesskey "v">
-<!ENTITY accountManagerCmd.label "Mail &amp; Newsgroups Account Settings…">
-<!ENTITY accountManagerCmd.accesskey "m">
+<!ENTITY findPrevCmd.accesskey "B">
+<!ENTITY accountManagerCmd.label "Opciones de cuentas de correo y noticias…">
+<!ENTITY accountManagerCmd.accesskey "O">
 
 <!-- View menu items -->
-<!ENTITY showComposeToolbarCmd.label "Mail Toolbar">
+<!ENTITY showComposeToolbarCmd.label "Barra de herramientas de correo">
 <!ENTITY showComposeToolbarCmd.accesskey "o">
-<!ENTITY showFormatToolbarCmd.label "Formatting Toolbar">
-<!ENTITY showFormatToolbarCmd.accesskey "F">
-<!ENTITY showParagraphMarksCmd.label ".Show Paragraph Marks">
-<!ENTITY pageSourceCmd.label ".Page Source">
-<!ENTITY pageSourceCmd.accesskey "u">
-<!ENTITY pageInfoCmd.label ".Page Info">
-<!ENTITY pageInfoCmd.accesskey "I">
-<!ENTITY dcharMenu.label "Character Set">
-<!ENTITY dcharIso1Cmd.label "Western (ISO-8859-1)">
-<!ENTITY dcharIso2Cmd.label "Central European (ISO-8859-2)">
-<!ENTITY dcharIso3Cmd.label "South European (ISO-8859-3)">
-<!ENTITY dcharIso4Cmd.label "Baltic (ISO-8859-4)">
-<!ENTITY dcharIso9Cmd.label "Turkish (ISO-8859-9)">
-<!ENTITY dcharIso10Cmd.label "Nordic (ISO-8859-10)">
-<!ENTITY dcharIso14Cmd.label "Celtic (ISO-8859-14)">
-<!ENTITY dcharIso15Cmd.label "Western (ISO-8859-15)">
-<!ENTITY dcharJapanCmd.label "Japanese (ISO-2022-JP)">
-<!ENTITY dcharTradChiBigCmd.label "Chinese Traditional (Big5)">
-<!ENTITY dcharSimpChiGbCmd.label "Chinese Simplified (GB2312)">
-<!ENTITY dcharKoreanCmd.label "Korean (EUC-KR)">
-<!ENTITY dcharUtf8Cmd.label "Unicode (UTF-8)">
-<!ENTITY dcharRusCmd.label "Cyrillic (KOI8-R)">
-<!ENTITY dcharUkrCmd.label "Cyrillic/Ukrainian (KOI8-U)">
-<!ENTITY dcharIsoGreekCmd.label "Greek (ISO-8859-7)">
-<!ENTITY dcharVietViCmd.label "Vietnamese (VISCII)">
-<!ENTITY dcharThaiCmd.label "Thai (TIS-620)">
-<!ENTITY dcharArmCmd.label "Armenian (ARMSCII-8)">
-<!ENTITY dcharDEFAULT.label "Set Default Mail Send Character Set">
+<!ENTITY showFormatToolbarCmd.label "Barra de herramientas de formato">
+<!ENTITY showFormatToolbarCmd.accesskey "f">
 
 <!-- Format menu items -->
-<!ENTITY formatMenu.label "Format">
+<!ENTITY formatMenu.label "Formato">
 <!ENTITY formatMenu.accesskey "o">
 
 <!-- Options menu items -->
-<!ENTITY optionsMenu.label "Options">
+<!ENTITY optionsMenu.label "Opciones">
 <!ENTITY optionsMenu.accesskey "p">
 
-<!ENTITY doNotCompleteAddrCmd.label ".Do Not Complete Address">
-<!ENTITY showMatchingAddrCmd.label ".Show Matching Address">
-
-<!ENTITY addSignatureCmd.label ".Add Signature File">
-
-<!ENTITY quoteCmd.label "Quote Message">
-<!ENTITY quoteCmd.accesskey "Q">
-<!ENTITY selectAddressCmd.label "Select Addresses…">
+<!ENTITY quoteCmd.label "Citar mensaje">
+<!ENTITY quoteCmd.accesskey "C">
+<!ENTITY selectAddressCmd.label "Seleccionar direcciones…">
 <!ENTITY selectAddressCmd.key "">
-<!ENTITY selectAddressCmd.accesskey "A">
+<!ENTITY selectAddressCmd.accesskey "a">
 
-<!ENTITY checkSpellingCmd.label "Check Spelling…">
-<!ENTITY checkSpellingCmd.key "K">
-<!ENTITY checkSpellingCmd.accesskey "h">
-<!ENTITY enableInlineSpellChecker.label "Spellcheck As You Type">
-<!ENTITY enableInlineSpellChecker.accesskey "S">
-
-<!ENTITY priorityMenu.label "Priority">
-<!ENTITY priorityMenu.accesskey "p">
-<!ENTITY lowestPriorityCmd.label "Lowest">
-<!ENTITY lowestPriorityCmd.accesskey "l">
-<!ENTITY lowPriorityCmd.label "Low">
-<!ENTITY lowPriorityCmd.accesskey "o">
-<!ENTITY normalPriorityCmd.label "Normal">
-<!ENTITY normalPriorityCmd.accesskey "n">
-<!ENTITY highPriorityCmd.label "High">
-<!ENTITY highPriorityCmd.accesskey "i">
-<!ENTITY highestPriorityCmd.label "Highest">
-<!ENTITY highestPriorityCmd.accesskey "H">
+<!ENTITY checkSpellingCmd2.label "Verificar ortografía…">
+<!ENTITY checkSpellingCmd2.key "p">
+<!ENTITY checkSpellingCmd2.accesskey "V">
+<!ENTITY enableInlineSpellChecker.label "Ortografía mientras tipea">
+<!ENTITY enableInlineSpellChecker.accesskey "s">
 
-<!ENTITY returnReceiptMenu.label "Return Receipt">
-<!ENTITY returnReceiptMenu.accesskey "t">
-<!ENTITY outputFormatMenu.label "Format">
-<!ENTITY outputFormatMenu.accesskey  "f">
-<!ENTITY autoFormatCmd.label "Auto-Detect">
-<!ENTITY autoFormatCmd.accesskey "a">
-<!ENTITY plainTextFormatCmd.label "Plain Text Only">
-<!ENTITY plainTextFormatCmd.accesskey "p">
-<!ENTITY htmlFormatCmd.label "Rich Text (HTML) Only">
-<!ENTITY htmlFormatCmd.accesskey "r">
-<!ENTITY bothFormatCmd.label "Plain and Rich (HTML) Text">
-<!ENTITY bothFormatCmd.accesskey "l">
-
-<!ENTITY UuencodeAttachmentCmd.label "Uuencode instead of MIME for Attachments">
-
+<!ENTITY priorityMenu.label "Prioridad">
+<!ENTITY priorityMenu.accesskey "P">
+<!ENTITY lowestPriorityCmd.label "La más baja">
+<!ENTITY lowestPriorityCmd.accesskey "L">
+<!ENTITY lowPriorityCmd.label "Baja">
+<!ENTITY lowPriorityCmd.accesskey "B">
+<!ENTITY normalPriorityCmd.label "Normal">
+<!ENTITY normalPriorityCmd.accesskey "N">
+<!ENTITY highPriorityCmd.label "Alta">
+<!ENTITY highPriorityCmd.accesskey "A">
+<!ENTITY highestPriorityCmd.label "La más alta">
+<!ENTITY highestPriorityCmd.accesskey "L">
 
-<!ENTITY fileCarbonCopyCmd.label "Send a Copy To">
-<!ENTITY fileCarbonCopyCmd.accesskey "d">
-<!ENTITY fileHereMenu.label "File Here">
+<!ENTITY returnReceiptMenu.label "Acuse de recibo">
+<!ENTITY returnReceiptMenu.accesskey "A">
+<!ENTITY outputFormatMenu.label "Acuse de recibo">
+<!ENTITY outputFormatMenu.accesskey  "A">
+<!ENTITY autoFormatCmd.label "Formato">
+<!ENTITY autoFormatCmd.accesskey "a">
+<!ENTITY plainTextFormatCmd.label "Sólo texto sin formato">
+<!ENTITY plainTextFormatCmd.accesskey "S">
+<!ENTITY htmlFormatCmd.label "Sólo texto enriquecido (HTML)">
+<!ENTITY htmlFormatCmd.accesskey "r">
+<!ENTITY bothFormatCmd.label "Texto simple y texto enriquecido (HTML)">
+<!ENTITY bothFormatCmd.accesskey "L">
 
-<!--LOCALIZATION NOTE Debug Menu Don't translate anything in the Debug menu section -->
-<!-- Debug Menu, imported from editorAppShell.dtd -->
-<!ENTITY debugMenu.label "Debug">
-<!ENTITY outputTextCmd.label "Output Text">
-<!ENTITY outputHTMLCmd.label "Output HTML">
-<!ENTITY insertTextCmd.label "Insert Text">
-<!ENTITY testSelectionCmd.label "Test Selection">
-<!ENTITY testTableLayoutCmd.label "Test Table Layout">
-<!ENTITY testDocumentCmd.label "Test Document">
-<!ENTITY showEmbeddedCmd.label "Show Embedded Objects">
-<!ENTITY dumpContentCmd.label "Dump Content Tree">
-<!ENTITY runUnitTestsCmd.label "Run Unit Tests">
-<!ENTITY startLogCmd.label "Start Log">
-<!ENTITY stopLogCmd.label "Stop Log">
-<!ENTITY runLogCmd.label "Run Log">
+<!ENTITY fileCarbonCopyCmd.label "Enviar una copia a">
+<!ENTITY fileCarbonCopyCmd.accesskey "E">
+<!ENTITY fileHereMenu.label "Archivar aquí">
 
 <!--LOCALIZATION NOTE Toolbar items Don't change any "chrome://" URLs -->
 <!-- Toolbar items -->
-<!ENTITY sendButton.label "Send">
-<!ENTITY quoteButton.label "Quote">
-<!ENTITY addressButton.label "Address">
-<!ENTITY attachButton.label "Attach">
-<!ENTITY spellingButton.label "Spelling">
-<!ENTITY saveButton.label "Save">
-<!ENTITY stopButton.label "Stop">
+<!ENTITY sendButton.label "Enviar">
+<!ENTITY addressButton.label "Dirección">
+<!ENTITY attachButton.label "Adjuntar">
+<!ENTITY spellingButton.label "Ortografía">
+<!ENTITY saveButton.label "Guardar">
+<!ENTITY stopButton.label "Detener">
 
 <!--tooltips-->
 <!-- We already inherit &menuBar.tooltip and &mailToolbar.tooltip from messenger.dtd -->
-<!ENTITY addressBar.tooltip "Address Bar">
-<!ENTITY formatToolbar.tooltip "Formatting Toolbar">
-<!ENTITY sendButton.tooltip "Send this message now"> 
-<!ENTITY sendlaterButton.tooltip "Send this message later"> 
-<!ENTITY quoteButton.tooltip "Quote the previous message"> 
-<!ENTITY addressButton.tooltip "Select a recipient from an Address Book"> 
-<!ENTITY attachButton.tooltip "Include an attachment"> 
-<!ENTITY saveButton.tooltip "Save this message"> 
-<!ENTITY stopButton.tooltip "Stop the current transfer"> 
-
-<!-- Toolbar items, imported from editorAppShell.xul -->
-<!--LOCALIZATION NOTE formatToolbar. Don't change any of these Style Characters -->
-<!ENTITY formatToolbar.boldChar "B">
-<!ENTITY formatToolbar.italicChar "I">
-<!ENTITY formatToolbar.underlineChar "U">
+<!ENTITY addressBar.tooltip "Barra de direcciones">
+<!ENTITY formatToolbar.tooltip "Barra de herramientas de formato">
+<!ENTITY sendButton.tooltip "Enviar este mensaje ahora"> 
+<!ENTITY sendlaterButton.tooltip "Enviar este mensaje más tarde"> 
+<!ENTITY addressButton.tooltip "Seleccionar un destinatario de una libreta de direcciones"> 
+<!ENTITY attachButton.tooltip "Incluir un adjunto"> 
+<!ENTITY saveButton.tooltip "Guardar este mensaje"> 
+<!ENTITY stopButton.tooltip "Detener la transferencia actual"> 
 
 <!-- context menu items -->
-<!ENTITY spellCheckNoSuggestions.label "(No Suggestions Found)">
-<!ENTITY spellCheckIgnoreWord.label "Ignore Word">
+<!ENTITY spellCheckNoSuggestions.label "(No hay sugerencias)">
+<!ENTITY spellCheckIgnoreWord.label "Ignorar palabra">
 <!ENTITY spellCheckIgnoreWord.accesskey "I">
-<!ENTITY spellCheckAddToDictionary.label "Add to Dictionary">
+<!ENTITY spellCheckAddToDictionary.label "Agregar al diccionario">
 <!ENTITY spellCheckAddToDictionary.accesskey "n">
-<!ENTITY undo.label "Undo">
-<!ENTITY undo.accesskey "U">
-<!ENTITY cut.label "Cut">
+<!ENTITY undo.label "Deshacer">
+<!ENTITY undo.accesskey "D">
+<!ENTITY cut.label "Cortar">
 <!ENTITY cut.accesskey "t">
-<!ENTITY copy.label "Copy">
+<!ENTITY copy.label "Copiar">
 <!ENTITY copy.accesskey "C">
-<!ENTITY paste.label "Paste">
+<!ENTITY paste.label "Pegar">
 <!ENTITY paste.accesskey "P">
-<!ENTITY pasteQuote.label "Paste As Quotation">
-<!ENTITY pasteQuote.accesskey "Q">
+<!ENTITY pasteQuote.label "Pegar como cita">
+<!ENTITY pasteQuote.accesskey "P">
 
-<!ENTITY openAttachment.label "Open">
-<!ENTITY openAttachment.accesskey "O">
-<!ENTITY delete.label "Delete">
-<!ENTITY delete.accesskey "D">
-<!ENTITY renameAttachment.label "Rename…">
+<!ENTITY openAttachment.label "Abrir">
+<!ENTITY openAttachment.accesskey "A">
+<!ENTITY delete.label "Borrar">
+<!ENTITY delete.accesskey "B">
+<!ENTITY renameAttachment.label "Renombrar…">
 <!ENTITY renameAttachment.accesskey "R">
-<!ENTITY selectAll.label "Select All">
-<!ENTITY selectAll.accesskey "A">
-<!ENTITY attachFile.label "Attach File(s)…">
-<!ENTITY attachFile.accesskey "F">
-<!ENTITY attachPage.label "Attach Web Page…">
-<!ENTITY attachPage.accesskey "W">
+<!ENTITY selectAll.label "Seleccionar todo">
+<!ENTITY selectAll.accesskey "a">
+<!ENTITY attachFile.label "Adjuntar archivo(s)…">
+<!ENTITY attachFile.accesskey "A">
+<!ENTITY attachPage.label "Adjuntar página web…">
+<!ENTITY attachPage.accesskey "w">
--- a/suite/chrome/mailnews/custom.properties
+++ b/suite/chrome/mailnews/custom.properties
@@ -1,2 +1,1 @@
-headerRemoved=You have removed header from the list. This may require resetting of the search filter criteria.
-colonInHeaderName=The header you entered contains an invalid character, such as ':', a non-printable character, a non-ascii character, or an eight bit ascii character. Please remove the invalid character and try again.
+colonInHeaderName=El encabezado que ha introducido contiene un caracter no válido, tal como ':', un caracter no imprimible, un caracter no-ASCII, o un caracter con el octavo bit activado. Por favor, elimine el caracter no válido y vuelva a intentarlo.
--- a/suite/chrome/mailnews/eudoraImportMsgs.properties
+++ b/suite/chrome/mailnews/eudoraImportMsgs.properties
@@ -42,192 +42,192 @@
 # Short name of import module
 ## @name EUDORAIMPORT_NAME
 ## @loc None
 2000=Eudora
 
 # Description of import module
 ## @name EUDORAIMPORT_DESCRIPTION
 ## @loc None
-2001=Correo y libretas de direcciones de Eudora
+2029=Correo, libretas de direcciones y opciones de Eudora
 
 # Success message
 ## @name EUDORAIMPORT_MAILBOX_SUCCESS
 ## @loc None
 # LOCALIZATION NOTE (2002): In the following sentence,
 # the %S represents a string to be inserted at runtime (the name of the Mailbox), 
 # and the %d is a number (the number of messages imported). Do not translate %d or %S, but
 # instead insert them in your text at the appropriate places.
 
-2002=Bandeja %S, se importaron %d mensajes
+2002=Buzón de correo %S, importados %d mensajes.
 
 # Error message
 ## @name EUDORAIMPORT_MAILBOX_BADPARAM
 ## @loc None
 
-2003=Parámetro incorrecto pasado para importar bandeja.
+2003=Parametro erróneo al importar el buzón de correo.
 
 # Error message
 ## @name EUDORAIMPORT_MAILBOX_BADSOURCEFILE
 ## @loc None
 # LOCALIZATION NOTE (2004): In the following sentence, do not translate the "%S". Instead,
 # place it in your sentence where you wish to display the name of the mailbox.
 
-2004=Error accediendo al archivo de la bandeja %S.
+2004=Error accediendo al archivo del buzón de correo %S.
 
 # Error message
 ## @name EUDORAIMPORT_MAILBOX_CONVERTERROR
 ## @loc None
 # LOCALIZATION NOTE (2005): In the following sentence, do not translate the "%S". Instead,
 # place it in your sentence where you wish to display the name of the mailbox.
 
-2005=Error importando bandeja %S, todos los mensajes pueden no haberse importado desde esta bandeja.
+2005=Error importando buzón de correo %S, algunos mensajes podrían no haberse importado.
 
 # Description
 ## @name EUDORAIMPORT_ACCOUNTNAME
 ## @loc None
 # LOCALIZATION NOTE (2006): Do not translate "Eudora" below.
 
-2006=Opciones de Eudora
+2006=Configuración de Eudora
 
 # Description
 ## @name EUDORAIMPORT_NICKNAMES_NAME
 ## @loc None
 # LOCALIZATION NOTE (2007): Do not translate "Eudora" below.
 
-2007=Eudora Nicknames
+2007=Apodos de Eudora
 
 # Description
 ## @name EUDORAIMPORT_ADDRESS_SUCCESS
 ## @loc None
 # LOCALIZATION NOTE (2008): In the following sentence, do not translate the "%S". Instead,
 # place it in your sentence where you wish to display the name of the address book.
 
 2008=Libreta de direcciones %S importada
 
 # Error message
 ## @name EUDORAIMPORT_ADDRESS_BADPARAM
 ## @loc None
 
-2009=Parámetro erróneo pasado para importar libreta de direcciones.
+2009=Parametro erróneo al importar la libreta de direcciones.
 
 # Error message
 ## @name EUDORAIMPORT_ADDRESS_BADSOURCEFILE
 ## @loc None
 # LOCALIZATION NOTE (2010): In the following sentence, do not translate the "%S". Instead,
 # place it in your sentence where you wish to display the name of the address book.
 
 2010=Error accediendo al archivo de la libreta de direcciones %S.
 
 # Error message
 ## @name EUDORAIMPORT_ADDRESS_CONVERTERROR
 ## @loc None
 # LOCALIZATION NOTE (2011): In the following sentence, do not translate the "%S". Instead,
 # place it in your sentence where you wish to display the name of the address book.
 
-2011=Error importando libreta de direcciones %S, todas las direcciones pueden no haberse importado.
+2011=Error importando libreta de direcciones %S, algunas direcciones podrían no haberse importado
 
 # Description
 ## @name EUDORAIMPORT_ADDRESS_LABEL_HOMEMOBILE
 ## @loc None
 # LOCALIZATION NOTE (2012): In the following sentence, do not translate the "%S". Instead,
 # place it in your sentence where you wish to display the mobile phone number.
 
-2012=Personal Mobile: %S
+2012=Celular personal: %S
 
 # Description
 ## @name EUDORAIMPORT_ADDRESS_LABEL_WORKMOBILE
 ## @loc None
 # LOCALIZATION NOTE (2013): In the following sentence, do not translate the "%S". Instead,
 # place it in your sentence where you wish to display the mobile phone number.
 
-2013=Work Mobile: %S
+2013=Celular del trabajo: %S
 
 # Description
 ## @name EUDORAIMPORT_ADDRESS_LABEL_HOMEFAX
 ## @loc None
 # LOCALIZATION NOTE (2014): In the following sentence, do not translate the "%S". Instead,
 # place it in your sentence where you wish to display the fax phone number.
  
-2014=Home Fax: %S
+2014=Fax del hogar: %S
  
 # Description
 ## @name EUDORAIMPORT_ADDRESS_LABEL_WORKFAX
 ## @loc None
 # LOCALIZATION NOTE (2015): In the following sentence, do not translate the "%S". Instead,
 # place it in your sentence where you wish to display the fax phone number.
 
-2015=Work Fax: %S
+2015=Fax del trabajo: %S
 
 # Description
 ## @name EUDORAIMPORT_ADDRESS_LABEL_OTHEREMAIL
 ## @loc None
 
-2016=Other Email:
+2016=Otro correo electrónico:
 
 # Description
 ## @name EUDORAIMPORT_ADDRESS_LABEL_OTHERPHONE
 ## @loc None
 
-2017=Other Phone:
+2017=Otro teléfono:
 
 # Description
 ## @name EUDORAIMPORT_ADDRESS_LABEL_OTHERWEB
 ## @loc None
 
-2018=Other Web:
+2018=Otro sitio web:
 
 # Description
 ## @name EUDORAIMPORT_FILTERS_WARN_OUTGOING
 ## @loc None
 # LOCALIZATION NOTE (2019): This warning is displayed when one of Eudora's outgoing
 # filters is attempted to be imported.  Outgoing filters are ones which are
 # processed when a message is being sent, and are not supported.
-2019=can't import outgoing filter context
+2019=no se puede importar un filtro de correo saliente
 
 # Description
 ## @name EUDORAIMPORT_FILTERS_WARN_ACTION
 ## @loc None
 # LOCALIZATION NOTE (2020): This warning is displayed if the action cannot be imported.
 # The "action" is what is done to the message if the filter matches, e.g. transfer to
 # a mailbox, change the priority.  The %S will be replaced with the name of the action.
-2020=can't import action "%S"
+2020=no se puede importar la acción "%S"
 
 # Description
 ## @name EUDORAIMPORT_FILTERS_WARN_VERB
 ## @loc None
 # LOCALIZATION NOTE (2021): This warning is displayed if the verb cannot be imported.
 # The "verb" is how filters match the header to the text, e.g. "contains", "is",
 # "begins with".  The %s will be replaced with the name of the verb.
-2021=can't import the "%s" verb
+2021=no se puede importar el verbo "%s"
 
 # Description
 ## @name EUDORAIMPORT_FILTERS_WARN_EMPTY_HEADER
 ## @loc None
 # LOCALIZATION NOTE (2027): This warning is displayed when the name of the header to be
 # filtered against cannot be found.
-2027=header name not found
+2027=nombre del encabezado no encontrado
 
 # Description
 ## @name EUDORAIMPORT_FILTERS_WARN_NEGATE_VERB
 ## @loc None
 # LOCALIZATION NOTE (2023): This warning is displayed when a filter term needs to be
 # negated, but the negative comparison is not supported, e.g. the "starts with" verb has
 # no corresponding "doesn't start with" verb.  The %S will be replaced with the name of
 # the verb.
-2023=can't negate the "%S" verb
+2023=no se puede negar el verbo "%S"
 
 # Description
 ## @name EUDORAIMPORT_FILTERS_WARN_META_HEADER
 ## @loc None
 # LOCALIZATION NOTE (2028): This warning is displayed when one of Eudora's pseudo-headers
 # cannot be supported.  Pseudo-headers are things that can match mutiple headers, e.g.
 # "Any Header", or non-header info, e.g. "Junk Score".  The %S will be replaced with
 # the name of the pseudo-header.
-2028=can't import the %S pseudo-header
+2028=no se puede importar el seudo-encabezado %S
 
 # Description
 ## @name EUDORAIMPORT_FILTERS_WARN_MAILBOX_MISSING
 ## @loc None
 # LOCALIZATION NOTE (2025): This warning is displayed when a filter has an action to
 # transfer the message to a mailbox, but the named mailbox doesn't exist.  The %S will
 # be replaced with the name of the mailbox.
-2025=can't find the mailbox "%S"
+2025=no se puede encontrar la carpeta de correo "%S"
--- a/suite/chrome/mailnews/filter.properties
+++ b/suite/chrome/mailnews/filter.properties
@@ -1,50 +1,58 @@
-mustSelectFolder=You must select a target folder.
-enterValidEmailAddress=Enter a valid e-mail address to forward to.
-pickTemplateToReplyWith=Choose a template to reply with.
-mustEnterName=You must give this filter a name.
-mustSelectAction=You must select at least one filter action.
-cannotHaveDuplicateFilterTitle=Duplicate Filter Name
-cannotHaveDuplicateFilterMessage=The filter name you entered already exists. Please enter a different filter name.
-deleteFilterConfirmation=Are you sure you want to delete the selected filter(s)?
-untitledFilterName=Untitled Filter
-filterListBackUpMsg=Your filters do not work because the msgFilterRules.dat file, which contains your filters, could not be read. A new msgFilterRules.dat file will be created and a backup of the old file, called rulesbackup.dat, will be created in the same directory.
-customHeaderOverflow=You've exceeded the limit of 50 custom headers. Please remove one or more custom headers and try again.
-filterCustomHeaderOverflow=Your filters have exceeded the limit of 50 custom headers. Please edit the msgFilterRules.dat file, which contains your filters, to use fewer custom headers.
-invalidCustomHeader=One of your filters uses a custom header that contains an invalid character, such as ':', a non-printable character, a non-ascii character, or an eight-bit ascii character. Please edit the msgFilterRules.dat file, which contains your filters, to remove invalid characters from your custom headers.
-continueFilterExecution=Applying filter %S failed. Would you like to continue applying filters?
-promptTitle=Running Filters
-promptMsg=You are currently in the process of filtering messages.\nWould you like to continue applying filters?
-stopButtonLabel=Stop
-continueButtonLabel=Continue
-cannotEnableFilter=This filter was probably created by a future version of this software. You cannot enable this filter because we don't know how to apply it.
+mustSelectFolder=Debe seleccionar una carpeta de destino.
+enterValidEmailAddress=Ingrese una dirección válida de correo a quien reenviar.
+pickTemplateToReplyWith=Seleccione una plantilla con la cual responder.
+mustEnterName=Debe dar un nombre al filtro.
+cannotHaveDuplicateFilterTitle=Nombre de filtro duplicado
+cannotHaveDuplicateFilterMessage=El nombre de filtro que ha elegido ya existe. Por favor, elija un nombre distinto.
+deleteFilterConfirmation=¿Está seguro de querer borrar el/los filtro(s) seleccionado(s)?
+untitledFilterName=Filtro sin título
+matchAllFilterName=Match All Messages
+filterListBackUpMsg=Sus filtros no funcionan porque el archivo msgFilterRules.dat, que contiene sus filtros, no se puede leer. Se creará un nuevo archivo msgFilterRules.dat y se hará una copia del antiguo en el mismo directorio, llamado rulesbackup.dat.
+customHeaderOverflow=Ha excedido el límite de 50 encabezados personalizados. Por favor, elimine una o más encabezadoss personalizados y vuelva a intentarlo.
+filterCustomHeaderOverflow=Sus filtros han excedido el límite de 50 encabezados personalizados. Por favor, edite el archivo msgFilterRules.dat, que contiene sus filtros, para utilizar menos encabezados personalizados.
+invalidCustomHeader=Uno de sus fitros utiliza  una encabezado personalizado que contiene un caracter no válido, tal como ':', un caracter no imprimible, un caracter no-ASCII o un caracter con el octavo bit activado. Por favor, edite el archivo msgFilterRules.dat, que contiene sus filtros, para eliminar los caracteres no válidos de sus encabezados personalizados.
+continueFilterExecution=Ha fallado la aplicación del filtro %S. ¿Quiere continuar aplicando filtros?
+promptTitle=Ejecutando filtros
+promptMsg=En este momento está procesando el filtrado de mensajes.\n¿Quiere continuar aplicando filtros?
+stopButtonLabel=Parar
+continueButtonLabel=Continuar
+cannotEnableFilter=Este filtro probablemente ha sido creado por versiones más modernas de Mozilla/Netscape. No puede habilitar este filtro porque esta versión de la aplicación no sabe cómo aplicarlo.
+searchTermsInvalidTitle=Términos de búsqueda no válidos
+searchTermsInvalidMessage=Este filtro no puede guardarse porque algunos términos de búsqueda no son válidos en el contexto actual.
 
 # for junk mail logging / mail filter logging
 # LOCALIZATION NOTE(junkLogDetectStr)
 # %1$S=author, %2$S=subject, %3$S=date
-junkLogDetectStr=Detected junk message from %1$S - %2$S at %3$S
+junkLogDetectStr=Mensaje basura detectado desde %1$S - %2$S en %3$S
 # LOCALIZATION NOTE(logMoveStr)
 # %1$S=message id, %2$S=folder URI
-logMoveStr=moved message id = %1$S to %2$S
+logMoveStr=id de mensaje movido = %1$S a %2$S
 # LOCALIZATION NOTE(logCopyStr)
 # %1$S=message id, %2$S=folder URI
-logCopyStr=copied message id = %1$S to %2$S
+logCopyStr=id de mensaje copiado = %1$S to %2$S
 # LOCALIZATION NOTE(filterLogDetectStr)
 # %1$S=filter name %2$S=author, %3$S=subject, %4$S=date
-filterLogDetectStr=Applied filter "%1$S" to message from %2$S - %3$S at %4$S
-filterAction2=priority changed
-filterAction3=deleted
-filterAction4=marked as read
-filterAction5=thread killed
-filterAction6=thread watched
-filterAction7=flagged
-filterAction8=tagged
-filterAction9=replied
-filterAction10=forwarded
-filterAction11=execution stopped
-filterAction12=deleted from POP3 server
-filterAction13=left on POP3 server
-filterAction14=junk score
-filterAction15=body fetched from POP3 server
-filterAction16=copied to folder
-filterAction17=tagged
-filterAction18=ignored subthread
+filterLogDetectStr=Filtro "%1$S" aplicado al mensaje de %2$S - %3$S en %4$S
+filterMissingCustomAction=Falta acción personalizada
+filterAction2=prioridad cambiada
+filterAction3=borrado
+filterAction4=marcado como leído
+filterAction5=conversación eliminada
+filterAction6=conversación observada
+filterAction7=destacado
+filterAction8=etiquetado
+filterAction9=respondido
+filterAction10=reenviado
+filterAction11=ejecución detenida
+filterAction12=borrado del servidor POP3
+filterAction13=dejado en servidor POP3
+filterAction14=puntaje de basura
+filterAction15=cuerpo descargado de servidor POP3
+filterAction16=copiado a carpeta
+filterAction17=etiquetado
+filterAction18=conversación ignorada
+# LOCALIZATION NOTE(filterAutoNameStr)
+# %1$S=Header or item to match, e.g. "From", "Tag", "Age in days", etc.
+# %2$S=Operator, e.g. "Contains", "is", "is greater than", etc.
+# %3$S=Value, e.g. "Steve Jobs", "Important", "42", etc.
+filterAutoNameStr=%1$S %2$S: %3$S
--- a/suite/chrome/mailnews/folderProps.dtd
+++ b/suite/chrome/mailnews/folderProps.dtd
@@ -33,71 +33,67 @@
    - 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 folderProps.windowtitle.label           "Properties">
+<!ENTITY folderProps.windowtitle.label           "Propiedades">
 
-<!ENTITY generalInfo.label                       "General Information">
-<!ENTITY folderCharsetTab.label                  "Default Character Encoding:">
-<!ENTITY folderCharsetTab.accesskey              "E">
-<!ENTITY folderCharsetOverride.label             "Apply default to all messages in the folder (individual message character encoding settings and auto-detection will be ignored)">
+<!ENTITY generalInfo.label                       "Información general">
+<!ENTITY folderCharsetTab.label                  "Juego de caracteres predeterminado:">
+<!ENTITY folderCharsetTab.accesskey              "e">
+<!ENTITY folderCharsetOverride.label             "Aplicar la configuración predeterminada a todos los mensajes de la carpeta (ignorando la autodetección y la configuración de codificación de caracteres de cada mensaje)">
 <!ENTITY folderCharsetOverride.accesskey         "A">
-<!ENTITY folderRebuildSummaryFile.label          "Rebuild Summary File">
+<!ENTITY folderRebuildSummaryFile.label          "Reconstruir índice">
 <!ENTITY folderRebuildSummaryFile.accesskey      "R">
-<!ENTITY folderRebuildSummaryFileTip.label       "Rebuild Summary File">
+<!ENTITY folderRebuildSummaryFileTip.label       "Reconstruir archivo resumen">
 
-<!ENTITY retention.label "Retention Policy">
-<!ENTITY retentionUseDefault.label "Use server defaults">
-<!ENTITY retentionUseDefault.accesskey "d">
-<!ENTITY days.label "days">
-<!ENTITY daysOld.label "days old">
-<!ENTITY message.label "messages">
-<!ENTITY retentionNotDownloadRead.label "Read messages">
-<!ENTITY retentionNotDownloadRead.accesskey "R">
-<!ENTITY retentionDownloadMsg.label "Messages more than">
-<!ENTITY retentionDownloadMsg.accesskey "e">
-<!ENTITY retentionCleanup.label "Keep:">
-<!ENTITY retentionDeleteMsg.label "Delete messages more than">
+<!ENTITY retention.label "Política de retención">
+<!ENTITY retentionUseAccount.label "Usar mi configuración de cuenta">
+<!ENTITY retentionUseAccount.accesskey "U">
+<!ENTITY daysOld.label "días">
+<!ENTITY message.label "mensajes">
+<!ENTITY retentionCleanup.label "Para recuperar espacio en disco, los mensajes viejos pueden ser borrados permanentemente">
+<!ENTITY retentionCleanupImap.label "Para recuperar espacio en disco, los mensajes viejos pueden ser borrados permanentemente tanto las copias locales como los originales en el servidor remoto.">
+<!ENTITY retentionCleanupPop.label "Para recuperar espacio en disco, los mensajes viejos pueden ser borrados permanentemente incluyendo los originales en el servidor remoto.">
+<!ENTITY retentionDeleteMsg.label "Borrar mensajes de más de">
 <!ENTITY retentionDeleteMsg.accesskey "m">
-<!ENTITY retentionKeepAll.label "All messages">
-<!ENTITY retentionKeepAll.accesskey "A">
-<!ENTITY retentionKeepNew.label "The newest">
-<!ENTITY retentionKeepNew.accesskey "n">
-<!ENTITY retentionKeepUnread.label "Only unread messages">
-<!ENTITY retentionKeepUnread.accesskey "u">
+<!ENTITY retentionKeepAll.label "No borrar ningún mensaje">
+<!ENTITY retentionKeepAll.accesskey "a">
+<!ENTITY retentionKeepRecent.label "Los más nuevos">
+<!ENTITY retentionKeepRecent.accesskey "n">
+<!-- LOCALIZATION NOTE: Unhide with .keepUnreadOnly { display: -moz-box; } -->
+<!ENTITY retentionKeepUnreadHidden.label "Siempre eliminar los mensajes leídos (invalida configuraciones de tiempo)">
+<!ENTITY retentionApplyToFlagged.label "Siempre mantener los mensajes destacados">
+<!ENTITY retentionApplyToFlagged.accesskey "e">
 
-<!ENTITY folderOfflineTab.label                  "Offline">
-<!ENTITY folderCheckForNewMessages.label         "Check this folder for new messages">
+<!ENTITY folderSynchronizationTab.label          "Sincronización">
+<!ENTITY folderCheckForNewMessages.label         "Comprobar esta carpeta en busca de nuevos mensajes">
 <!ENTITY folderCheckForNewMessages.accesskey     "C">
 
-<!ENTITY offlineFolder.check.label               "Select this folder for offline use">
+<!ENTITY offlineFolder.check.label               "Seleccionar esta carpeta para usar sin conexión">
 <!ENTITY offlineFolder.check.accesskey           "S">
-<!ENTITY offlineFolder.button.label              "Download Now">
+<!ENTITY offlineFolder.button.label              "Descargar ahora">
 <!ENTITY offlineFolder.button.accesskey          "D">
 
-<!ENTITY selectofflineNewsgroup.check.label      "Select this newsgroup for offline use">
+<!ENTITY selectofflineNewsgroup.check.label      "Seleccionar este grupo de noticias para usar sin conexión">
 <!ENTITY selectofflineNewsgroup.check.accesskey  "o">
-<!ENTITY UseDefaultofflineNewsgroup.check.label  "Use the default from account settings ">
-<!ENTITY offlineNewsgroup.button.label           "Download Now">
+<!ENTITY offlineNewsgroup.button.label           "Descargar ahora">
 <!ENTITY offlineNewsgroup.button.accesskey       "D">
 
-<!ENTITY folderProps.information.label           "Information:">
-<!ENTITY folderProps.name.label                  "Name:">
+<!ENTITY folderProps.name.label                  "Nombre:">
 <!ENTITY folderProps.name.accesskey              "N">
-<!ENTITY folderProps.location.label              "Location:">
-<!ENTITY folderProps.location.accesskey          "L">
+<!ENTITY folderProps.location.label              "Ubicación:">
+<!ENTITY folderProps.location.accesskey          "U">
 
-<!ENTITY folderSharingTab.label                  "Sharing">
-<!ENTITY privilegesDesc.label                    "Share this and other folders with network users and display and set access privileges">
-<!ENTITY privileges.button.label                 "Privileges…">
+<!ENTITY folderSharingTab.label                  "Compartir">
+<!ENTITY privileges.button.label                 "Privilegios…">
 <!ENTITY privileges.button.accesskey             "P">
-<!ENTITY permissionsDesc.label                   "You have the following permissions:">
-<!ENTITY folderType.label                        "Folder Type:">
+<!ENTITY permissionsDesc.label                   "Tiene los siguientes permisos:">
+<!ENTITY folderType.label                        "Tipo de carpeta:">
 
-<!ENTITY folderQuotaTab.label                    "Quota">
-<!ENTITY folderQuotaRoot.label                   "Quota Root:">
-<!ENTITY folderQuotaUsage.label                  "Usage:">
-<!ENTITY folderQuotaStatus.label                 "Status:">
+<!ENTITY folderQuotaTab.label                    "Cuota">
+<!ENTITY folderQuotaRoot.label                   "Cuota raíz:">
+<!ENTITY folderQuotaUsage.label                  "Uso:">
+<!ENTITY folderQuotaStatus.label                 "Estado:">
--- a/suite/chrome/mailnews/folderpane.dtd
+++ b/suite/chrome/mailnews/folderpane.dtd
@@ -29,15 +29,12 @@
  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 nameColumn.label   "Name"> 
-<!ENTITY unreadColumn.label "Unread"> 
+<!ENTITY nameColumn.label   "Nombre"> 
+<!ENTITY unreadColumn.label "No leído"> 
 <!ENTITY totalColumn.label "Total"> 
-<!ENTITY folderSizeColumn.label "Size"> 
-<!ENTITY accounts.label "Accounts">
-<!-- LOCALIZATION NOTE (accounts.img) : DONT_TRANSLATE -->
-<!ENTITY accounts.img "chrome://messenger/skin/local-mailhost.gif">
+<!ENTITY folderSizeColumn.label "Tamaño"> 
--- a/suite/chrome/mailnews/imapMsgs.properties
+++ b/suite/chrome/mailnews/imapMsgs.properties
@@ -37,415 +37,377 @@
 
 #
 # The following are used by the imap code to display progress/status/error messages
 #
 
 # Status - opening folder
 ## @name IMAP_STATUS_SELECTING_MAILBOX
 ## @loc None
-5000=Opening folder %S…
+5000=Abriendo carpeta…
 
 # Status - create folder
 ## @name IMAP_STATUS_CREATING_MAILBOX
 ## @loc None
-5001=Creating folder…
+5001=Creando carpeta…
 
 # Status - deleting a folder
 ## @name IMAP_STATUS_DELETING_MAILBOX
 ## @loc None
 # LOCALIZATION NOTE (Error 5002): The "%S" below should not be translated.
 # Instead, insert "%S" in your translation where you wish to display the name
 # of the folder being deleted.
-5002=Deleting folder %S…
+5002=Borrando carpeta %S…
 
 # Status - renaming mailbox
 ## @name IMAP_STATUS_RENAMING_MAILBOX
 ## @loc None
 # LOCALIZATION NOTE (Error 5003): The "%S" below should not be translated.
 # Instead, insert "%S" in your translation where you wish to display the name
 # of the folder being renamed.
-5003=Renaming folder %S…
+5003=Renombrando carpeta %S…
 
 # Status - looking for mailboxes
 ## @name IMAP_STATUS_LOOKING_FOR_MAILBOX
 ## @loc None
-5004=Looking for folders…
+5004=Buscando carpetas…
 
 # Status - subscribing to mailbox
 ## @name IMAP_STATUS_SUBSCRIBE_TO_MAILBOX
 ## @loc None
 # LOCALIZATION NOTE (Error 5005): The "%S" below should not be translated.
 # Instead, insert "%S" in your translation where you wish to display the name
 # of the folder being subscribed to.
-5005=Subscribing to folder %S…
+5005=Suscribiéndose a la carpeta %S…
 
 # Status - unsubscribing from mailbox
 ## @name IMAP_STATUS_UNSUBSCRIBE_MAILBOX
 ## @loc None
 # LOCALIZATION NOTE (Error 5005): The "%S" below should not be translated.
 # Instead, insert "%S" in your translation where you wish to display the name
 # of the folder being unsubscribed from.
-5006=Unsubscribing from folder %S…
+5006=Cancelando suscripción a la carpeta %S…
 
 # Status - searching imap folder
 ## @name IMAP_STATUS_SEARCH_MAILBOX
 ## @loc None
-5007=Searching folder…
+5007=Buscando carpeta…
 
 # Status - getting message info
 ## @name IMAP_STATUS_MSG_INFO
 ## @loc None
-5008=Getting message info…
+5008=Obteniendo información del mensaje…
 
 # Status - closing a folder
 ## @name IMAP_STATUS_CLOSE_MAILBOX
 ## @loc None
-5009=Closing folder…
+5009=Cerrando carpeta…
 
 # Status - compacting a folder
 ## @name IMAP_STATUS_EXPUNGING_MAILBOX
 ## @loc None
-5010=Compacting folder…
+5010=Comprimiendo carpeta…
 
 # Status - logging out
 ## @name IMAP_STATUS_LOGGING_OUT
 ## @loc None
-5011=Logging out…
+5011=Cerrando sesión…
 
 # Status - checking server capabilities
 ## @name IMAP_STATUS_CHECK_COMPAT
 ## @loc None
-5012=Checking mail server capabilities…
+5012=Comprobando las características del servidor de correo
 
 # Status - logging on
 ## @name IMAP_STATUS_SENDING_LOGIN
 ## @loc None
-5013=Sending login information…
+5013=Enviando información de conexión…
 
 # Status - auth logon
 ## @name IMAP_STATUS_SENDING_AUTH_LOGIN
 ## @loc None
-5014=Sending secure login information…
+5014=Enviando información de identificación…
 
 ## @name IMAP_DOWNLOADING_MESSAGE
 ## @loc None
-5015=Downloading message…
-
-## @name IMAP_STATUS_GETTING_NAMESPACE
-## @loc None
-# LOCALIZATION NOTE (Error 5020): Do not translate the word "IMAP" below.
-5020=Checking IMAP Namespace…
-
-## @name IMAP_UPGRADE_NO_PERSONAL_NAMESPACE
-## @loc None
-5021="The mail server indicates that you may not have any personal mail folders. Please verify your subscriptions.
-
-## @name IMAP_UPGRADE_PROMPT_USER_2
-## @loc None
-5024=Any folders which are left unsubscribed will not appear in your folder lists, but can be subscribed to later by choosing File / Subscribe.
-
-## @name IMAP_UPGRADE_CUSTOM
-## @loc None
-5026=Please choose which folders you want subscribed in the Subscribe window…
-
-## @name IMAP_UPGRADE_SUCCESSFUL
-## @loc None
-5028=The upgrade was successful.
+5015=Descargando mensaje…
 
 ## @name IMAP_GETTING_ACL_FOR_FOLDER
 ## @loc None
 # LOCALIZATION NOTE (Error 5029): Do not translate the word "ACL" below.
-5029=Getting folder ACL…
+5029=Obteniendo carpeta ACL…
 
 ## @name IMAP_GETTING_SERVER_INFO
 ## @loc None
-5030=Getting Server Configuration Info…
+5030=Obteniendo información sobre el servidor…
 
 ## @name IMAP_GETTING_MAILBOX_INFO
 ## @loc None
-5031=Getting Mailbox Configuration Info…
+5031=Obteniendo información sobre el buzón…
 
 ## @name IMAP_EMPTY_MIME_PART
 ## @loc None
-5032=This body part will be downloaded on demand.
-
-## @name IMAP_UNABLE_TO_SAVE_MESSAGE
-## @loc None
-# LOCALIZATION NOTE (Error 5033): Do not translate the word "IMAP" below.
-5033=IMAP Error: The message could not be saved due to an error.
-
-## @name IMAP_NO_ONLINE_FOLDER
-## @loc None
-# LOCALIZATION NOTE (Error 5034): Do not translate the word "IMAP" below.
-5034=IMAP Error: The online folder information could not be retrieved.
-
-## @name IMAP_LOGIN_FAILED
-## @loc None
-5035=Login to server %S failed.
+5032=Esta parte del cuerpo del mensaje se descargará bajo demanda.
 
 ## @name IMAP_RECEIVING_MESSAGE_HEADERS_OF
 ## @loc None
 # LOCALIZATION NOTE (Error 5036): Do not translate the word "%S" or "%lu" below.
 # Place the word %S in your translation where the name of the server should appear.
 # Place the word %lu where the number of headers should appear.
-5036=%S Downloading message header %lu of %lu
+5036=%S Recibiendo: encabezados de mensajes %lu de %lu
 
 ## @name IMAP_RECEIVING_MESSAGE_FLAGS_OF
 ## @loc None
 # LOCALIZATION NOTE (Error 5037): Do not translate the word "%S" or "%lu" below.
 # Place the word %S in your translation where the name of the server should appear.
 # Place the word %lu where the number of flags should appear.
-5037=%S Downloading message flag %lu of %lu
+5037=%S Recibiendo: marcas en mensajes %lu de %lu
 
 ## @name IMAP_DELETING_MESSAGES
 ## @loc None
-5038=Deleting messages…
+5038=Borrando mensajes…
 
 ## @name IMAP_DELETING_MESSAGE
 ## @loc None
-5039=Deleting message…
+5039=Borrando mensaje…
 
 ## @name IMAP_MOVING_MESSAGES_TO
 ## @loc None
 # LOCALIZATION NOTE (Error 5040): Do not translate the word "%S" below.
 # Place the word %S in your translation where the name of the folder should appear.
-5040=Moving messages to %S…
+5040=Moviendo mensajes a %S…
 
 ## @name IMAP_MOVING_MESSAGE_TO
 ## @loc None
 # LOCALIZATION NOTE (Error 5041): Do not translate the word "%S" below.
 # Place the word %S in your translation where the name of the folder should appear.
-5041=Moving message to %S…
+5041=Moviendo mensaje a %S…
 
 ## @name IMAP_COPYING_MESSAGES_TO
 ## @loc None
 # LOCALIZATION NOTE (Error 5042): Do not translate the word "%S" below.
 # Place the word %S in your translation where the name of the folder should appear.
-5042=Copying messages to %S…
+5042=Copiando mensajes a %S…
 
 ## @name IMAP_COPYING_MESSAGE_TO
 ## @loc None
 # LOCALIZATION NOTE (Error 5043): Do not translate the word "%S" below.
 # Place the word %S in your translation where the name of the folder should appear.
-5043=Copying message to %S…
-
-## @name IMAP_SELECTING_MAILBOX
-## @loc None
-# LOCALIZATION NOTE (Error 5044): Do not translate the word "%S" below.
-# Place the word %S in your translation where the name of the folder should appear.
-5044=Opening folder %S…
+5043=Copiando mensaje a %S…
 
 ## @name IMAP_FOLDER_RECEIVING_MESSAGE_OF
 ## @loc None
 # LOCALIZATION NOTE (Error 5045): Do not translate the word "%S" or "%lu" below.
 # Place the word %S in your translation where the name of the folder should appear.
 # Place the word %lu where the number of headers should appear.
-5045=%S - Downloading message %lu of %lu
+5045=%S - Recibiendo: mensaje %lu de %lu
 
 ## @name IMAP_DISCOVERING_MAILBOX 
 ## @loc None
 # LOCALIZATION NOTE (Error 5046): Do not translate the word "%S" below.
 # Place the word %S in your translation where the name of the folder should appear.
-5046=Found folder: %S
+5046=Encontrada la carpeta: %S
 
 ## @name IMAP_ENTER_PASSWORD_PROMPT
 ## @loc None
 # LOCALIZATION NOTE (Error 5047): Do not translate the word %S below.
 # Place the word "%S" in your translation where the email address
 # or the username should appear
-5047=Enter your password for %S:
+5047=Introduzca su contraseña para %S:
 
 ## @name IMAP_SERVER_NOT_IMAP4
 ## @loc None
 # LOCALIZATION NOTE (Error 5048): Do not translate the word "IMAP4" below.
-5048=Mail server %S is not an IMAP4 mail server.
+5048=El servidor de correo %S no es un servidor de correo IMAP4
 
 ## @name IMAP_SERVER_SAID
 ## @loc None
-5049=The current command did not succeed.  The mail server responded: 
+5049=Error al ejecutar la orden. El servidor de correo ha respondido: 
 
 ## @name IMAP_DONE
 ## @loc None
 5050=
 
 ## @name IMAP_ENTER_PASSWORD_PROMPT_TITLE
 ## @loc None
-5051=Mail Server Password Required
+5051=Es necesaria la contraseña del servidor de correo
 
 ## @name IMAP_UNKNOWN_HOST_ERROR
 ## @loc None
-5052=Failed to connect to server %S.
+5052=No se pudo conectar con el servidor %S
 
 ## @name IMAP_IMAP_CONNECTION_REFUSED_ERROR
 ## @loc None
-5053=Could not connect to mail server %S; the connection was refused.
+5053=La conexión al servidor de correo %S ha sido rechazada.
 
 ## @name IMAP_NET_TIMEOUT_ERROR
 ## @loc None
-5054=Connection to server %S timed out.
-
-## @name IMAP_MOVE_FOLDER_TO_TRASH
-## @loc None
-5055=Are you sure you want to move the selected folder into the Trash?
+5054=La conexión al servidor %S ha superado el tiempo de espera máximo.
 
 # Status - no messages to download 
 ## @name IMAP_NO_NEW_MESSAGES
 ## @loc None
-5056=There are no new messages on the server.
+5056=No hay mensajes nuevos en el servidor.
 
 ## @name IMAP_DEFAULT_ACCOUNT_NAME
 ## @loc None
-5057=Mail for %S
-
-## @name IMAP_DELETE_NO_TRASH
-## @loc None
-5058=Deleting this folder is not undoable and will delete all of the messages it contains, and its sub-folders. Are you sure you still want to delete this folder?
+5057=Correo para %S
 
 ## @name IMAP_EMPTY_TRASH_CONFIRM
 ## @loc None
-5061=Emptying trash will delete %S and all of the messages it contains. Do you want to delete this folder?
+5061=Vaciar la papelera borrará %S y todos los mensajes que contiene. ¿Quiere borrar esta carpeta?
 
 ## @name IMAP_PERSONAL_FILING_CABINET
 ## @loc None
-5062=Personal Filing Cabinet
+5062=Archivador personal
 
 ## @name IMAP_PFC_READ_MAIL
 ## @loc None
-5063=Read Mail
+5063=Correo leído
 
 ## @name IMAP_PFC_SENT_MAIL
 ## @loc None
-5064=Sent Mail
+5064=Correo enviado
 
 ## @name IMAP_SPECIAL_CHAR
 ## @loc None
-5065= The %c character is reserved on this imap server. Please choose another name. 
+5065= El carผter %c está reservado en este servidor IMAP. Por favor, elija otro nombre. 
 
 ## @name IMAP_PERSONAL_SHARED_FOLDER_TYPE_NAME
 ## @loc None
-5066=Personal Folder
+5066=Carpeta personal
 
 ## @name IMAP_PUBLIC_FOLDER_TYPE_NAME
 ## @loc None
-5067=Public Folder
+5067=Carpeta pública
 
 ## @name IMAP_OTHER_USERS_FOLDER_TYPE_NAME
 ## @loc None
-5068=Other User's Folder
+5068=Carpeta de otro usuario
 
 ## @name IMAP_PERSONAL_FOLDER_TYPE_DESCRIPTION
 ## @loc None
-5069=This is a personal mail folder.  It is not shared.
+5069=Esta es una carpeta de correo personal. No está compartida.
 
 ## @name IMAP_PERSONAL_SHARED_FOLDER_TYPE_DESCRIPTION
 ## @loc None
-5070=This is a personal mail folder.  It has been shared.
+5070=Esta es una carpeta de correo personal. Ha sido compartida.
 
 ## @name IMAP_PUBLIC_FOLDER_TYPE_DESCRIPTION
 ## @loc None
-5071=This is a public folder.
+5071=Esta es una carpeta pública.
 
 ## @name IMAP_OTHER_USERS_FOLDER_TYPE_DESCRIPTION
 ## @loc None
-5072=This is a mail folder shared by the user '%S'.
+5072=Esta es una carpeta de correo compartida por el usuario '%S'.
 
 ## @name IMAP_ACL_FULL_RIGHTS
 ## @loc None
-5073=Full Control
+5073=Control total
 
 ## @name IMAP_ACL_LOOKUP_RIGHT
 ## @loc None
-5074=Lookup
+5074=Buscar
 
 ## @name IMAP_ACL_READ_RIGHT
 ## @loc None
-5075=Read
+5075=Leer
 
 ## @name IMAP_ACL_SEEN_RIGHT
 ## @loc None
-5076=Set Read/Unread State
+5076=Cambiar estado Leído/No leído
 
 ## @name IMAP_ACL_WRITE_RIGHT
 ## @loc None
-5077=Write
+5077=Escribir
 
 ## @name IMAP_ACL_INSERT_RIGHT
 ## @loc None
-5078=Insert (Copy Into)
+5078=Insertar (copiar en)
 
 ## @name IMAP_ACL_POST_RIGHT
 ## @loc None
-5079=Post
+5079=Enviar
 
 ## @name IMAP_ACL_CREATE_RIGHT
 ## @loc None
-5080=Create Subfolder
+5080=Crear subcarpeta
 
 ## @name IMAP_ACL_DELETE_RIGHT
 ## @loc None
-5081=Delete Messages
+5081=Borrar mensajes
 
 ## @name IMAP_ACL_ADMINISTER_RIGHT
 ## @loc None
-5082=Administer Folder
-
-## @name IMAP_UNKNOWN_USER
-## @loc None
-5083=Unknown
+5082=Administrar carpeta
 
 ## @name IMAP_SERVER_DOESNT_SUPPORT_ACL
 ## @loc None
-5084=This server does not support shared folders.
+5084=Este servidor no soporta carpetas compartidas.
 
 ## @name IMAP_ACL_EXPUNGE_RIGHT
 ## @loc None
-5085=Expunge
+5085=Borrar
 
 ## @name IMAP_SERVER_DISCONNECTED
 ## @loc None
-5090= Server %S has disconnected. The server may have gone down or there may be a network problem.
-
-## @name IMAP_REDIRECT_LOGIN_FAILED
-## @loc None
-5091=Login failed.
+5090= El servidor %S ha cortado la conexión. Puede que el servidor se haya caído o que haya un problema en la red.
 
 # LOCALIZATION NOTE (autoSubscribeText): %1$S is the imap folder.
-5092=Would you like to subscribe to %1$S?
+5092=¿Quiere suscribirse a %1$S?
 
 ## @name IMAP_SERVER_DROPPED_CONNECTION
 ## @loc None
-5093=Unable to connect to your IMAP server. You may have exceeded the maximum number \
-of connections to this server. If so, use the Advanced IMAP Server Settings dialog to \
-reduce the number of cached connections.
+5093=No es posible conectar a su servidor IMAP. Puede que haya superado el número máximo de conexiones a este servidor. Si es así, utilice el cuadro de diálogo de configuraciones avanzadas del servidor IMAP para reducir el número de conexiones cacheadas.
 
 ## @name IMAP_QUOTA_STATUS_FOLDERNOTOPEN
 ## @loc None
-5095=Quota information is not available because the folder is not open.
+5095=La información de cuota no está disponible porque la carpeta no está abierta.
 
 ## @name IMAP_QUOTA_STATUS_NOTSUPPORTED
 ## @loc None
-5096=This server does not support quotas.
+5096=Este servidor no incluye la característica de cuotas.
 
 ## @name IMAP_QUOTA_STATUS_NOQUOTA
 ## @loc None
-5097=There are no storage quotas on this folder.
+5097=No hay cuotas de almacenamiento en esta carpeta.
 
 # Out of memory
 ## @name IMAP_OUT_OF_MEMORY
 ## @loc None
-5100=Application is out of memory.
+5100=La aplicación se ha quedado sin memoria.
 
 ## @name IMAP_AUTH_SECURE_NOTSUPPORTED
 ## @loc None
-5102=You cannot log in to %S because you have enabled secure authentication and this server does not support it.\n\nTo log in, turn off secure authentication for this account.
+5102=No puede iniciar sesión en %S porque ha activado la identificación segura (cifrada) y este servidor no la permite.\n\nPara iniciar sesión, desactive la identificación segura en esta cuenta.
 
 ## @name IMAP_COPYING_MESSAGE_OF
 ## @loc None
 # LOCALIZATION NOTE (Error 5103): Do not translate the word "%S" below.
 # Place the word %3$S in your translation where the name of the destination folder should appear.
 # Place the word %1$S where the currently copying message should appear.
 # Place the word %2$S where the total number of messages should appear.
-5103=Copying Message %1$S of %2$S to %3$S
+5103=Copiando mensaje %1$S de %2$S a %3$S
+
+## @name IMAP_MOVE_FOLDER_TO_TRASH
+## @loc None
+# LOCALIZATION NOTE (5105): Do not translate the word %S below.
+# "%S" is the the name of the folder.
+5105=¿Seguro desea borrar la carpeta '%S'?
+
+## @name IMAP_DELETE_NO_TRASH
+## @loc None
+# LOCALIZATION NOTE (5106): Do not translate the word %S below.
+# "%S" is the the name of the folder.
+5106=Borrar esta carpeta no se podrá deshacer y borrará todos los mensajes que contenga y sus subcarpetas. ¿Seguro desea borrar la carpeta '%S'?
+
+## @name IMAP_DELETE_FOLDER_DIALOG_TITLE
+## @loc None
+5107=Borrar carpeta
+
+## @name IMAP_DELETE_FOLDER_BUTTON_LABEL
+## @loc None
+5108=&Borrar carpeta
 
 ## @name IMAP_LOGIN_DISABLED
 ## @loc None
-5104=You cannot log in to %S because the server has disabled login. You may need to connect via SSL or TLS. Please check the account settings for your mail server.
+# LOCALIZATION NOTE (5109): %S is the server address
+5109=No puede ingresar a %S porque el servidor no permite autenticación de texto plano sin STARTTLS o SSL/TLS. Intente habilitar la seguridad de la conexión o autenticación segura en las opciones de la cuenta.
--- a/suite/chrome/mailnews/importDialog.dtd
+++ b/suite/chrome/mailnews/importDialog.dtd
@@ -31,41 +31,49 @@
  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 importDialog.windowTitle "Import">
-<!ENTITY importDialog.allTitle    "Import everything">
-<!ENTITY importDialog.mailTitle   "Mail">
-<!ENTITY importDialog.addressbookTitle "Address Books">
-<!ENTITY importDialog.settingsTitle "Settings">
-<!ENTITY importDialog.filtersTitle "Filters">
+<!ENTITY importDialog.windowTitle "Importar">
+<!ENTITY importAll.label          "Importar todo">
+<!ENTITY importAll.accesskey      "I">
+<!ENTITY importMail.label         "Correo">
+<!ENTITY importMail.accesskey     "C">
+<!ENTITY importAddressbook.label  "Libretas de direcciones">
+<!ENTITY importAddressbook.accesskey "L">
+<!ENTITY importSettings.label     "Configuración">
+<!ENTITY importSettings.accesskey "o">
+<!ENTITY importFilters.label      "Filtros">
+<!ENTITY importFilters.accesskey  "F">
 
 <!ENTITY  window.width            "40em">
 <!ENTITY  window.macWidth         "45em">
 
-<!ENTITY importTitle.label        "&brandShortName; Import Wizard">
-<!ENTITY importShortDesc.label    "Import Mail, Address Books, Settings, and Filters from other programs">
+<!ENTITY importTitle.label        "Asistente de &brandShortName;">
+<!ENTITY importShortDesc.label    "Importar correo, libretas de direcciones, configuraciones y filtros de otros programas">
 
-<!ENTITY importDescription1.label "This wizard will import mail messages, address book entries, preferences, and/or filters from other mail programs and common address book formats into &brandShortName;.">
-<!ENTITY importDescription2.label "Once they have been imported, you will be able to access them from within &brandShortName;.">
+<!ENTITY importDescription1.label "Este asistente importará los mensajes de correo, entradas en la libreta de direcciones, preferencias y/o filtros desde otros programas de correo y formatos comunes de libretas de direcciones a &brandShortName;.">
+<!ENTITY importDescription2.label "Cuando hayan sido importados, podrá acceder a ellos desde &brandShortName;.">
 
-<!ENTITY selectDescription.label  "Please select the type of file that you would like to import:">
+<!ENTITY selectDescription.label  "Por favor, seleccione el tipo de archivo que quiere importar:">
+<!ENTITY selectDescription.accesskey "P">
 
-<!ENTITY back.label               "&lt; Back">
-<!ENTITY forward.label            "Next &gt;">
-<!ENTITY finish.label             "Finish">
-<!ENTITY cancel.label             "Cancel">
+<!ENTITY back.label               "&lt; Atrás">
+<!ENTITY forward.label            "Siguiente &gt;">
+<!ENTITY finish.label             "Finalizar">
+<!ENTITY cancel.label             "Cancelar">
 
-<!ENTITY select.label             "or select the type of material to import:">
+<!ENTITY select.label             "o seleccione el tipo de material a importar:">
 
-<!ENTITY title.label              "Title">
-<!ENTITY processing.label         "Importing…">
+<!ENTITY title.label              "Título">
+<!ENTITY processing.label         "Importando…">
 
-<!ENTITY FieldDiscInputText1.label  "Netscape Communicator 4.x has one mailing address for each card, while &brandShortName; has two (Home and Work).">
-<!ENTITY FieldDiscInputText2.label  "Select the category in which you want to store the imported mailing addresses:">
-<!ENTITY FieldDiscWarning.label  "This category will be used for all the entries of the selected address book: ">
-<!ENTITY importDialog.homeTitle  "Home">
-<!ENTITY importDialog.workTitle  "Work">
+<!ENTITY FieldDiscInputText1.label  "Netscape Communicator 4.x tiene una dirección de correo  para cada tarjeta, mientras que  &brandShortName; tiene dos (personal y trabajo).">
+<!ENTITY FieldDiscInputText2.label  "Seleccione la categoría en la que quiere almacenar las direcciones de correo importadas:">
+<!ENTITY FieldDiscWarning.label  "Esta categoría será utilizada para todas las entradas de la libreta de direcciones seleccionada:">
+<!ENTITY importHome.label        "Casa">
+<!ENTITY importHome.accesskey    "C">
+<!ENTITY importWork.label        "Trabajo">
+<!ENTITY importWork.accesskey    "T">
--- a/suite/chrome/mailnews/importMsgs.properties
+++ b/suite/chrome/mailnews/importMsgs.properties
@@ -38,312 +38,317 @@
 #
 # The following are used by the import code to display status/error 
 # and informational messages
 #
 
 # Success message when no address books are found to import
 ## @name IMPORT_NO_ADDRBOOKS
 ## @loc None
-2000=No address books were found to import.
+2000=No se encontraron libretas de direcciones para importar.
 
 # Error: Address book import not intialized		
 ## @name IMPORT_ERROR_AB_NOTINITIALIZED
 ## @loc None
-2001=Unable to import address books: initialization error.
+2001=No se ha podido importar la libreta de direcciones: error de inicialización.
 
 # Error: Unable to create the import thread
 ## @name IMPORT_ERROR_AB_NOTHREAD
 ## @loc None
-2002=Unable to import address books: cannot create import thread.
+2002=Imposible importar la libreta de direcciones: no se pudo crear la conversación de importación
 
 # Error: Unable to create the import thread
 ## @name IMPORT_ERROR_GETABOOK
 ## @loc None
 # LOCALIZATION NOTE (Error 2003): Do not translate the word "%S" below.
-2003=Error importing %S: unable to create address book.
+2003=Error importando %S: no se ha podido crear una libreta de direcciones.
 
 # Success message when no mailboxes are found to import
 ## @name IMPORT_NO_MAILBOXES
 ## @loc None
-2004=No mailboxes were found to import
+2004=No se encontraron buzones a importar
 
 # Error: Mailbox import not intialized		
 ## @name IMPORT_ERROR_MB_NOTINITIALIZED
 ## @loc None
-2005=Unable to import mailboxes, initialization error
+2005=No se han podido importar los buzones. Error de inicialización
 
 # Error: Unable to create the import thread
 ## @name IMPORT_ERROR_MB_NOTHREAD
 ## @loc None
-2006=Unable to import mailboxes, cannot create import thread
+2006=No se han podido importar los buzones. No se pudo crear un hilo de proceso para importar
 
 # Error: Unable to create the proxy object for importing mailboxes
 ## @name IMPORT_ERROR_MB_NOPROXY
 ## @loc None
-2007=Unable to import mailboxes, cannot create proxy object for destination mailboxes
+2007=No se han podido importar los buzones. Fue imposible crear objetos intermedios para los buzones de destino
 
 # Error: Error creating destination mailboxes
 ## @name IMPORT_ERROR_MB_FINDCHILD
 ## @loc None
 # LOCALIZATION NOTE (Error 2008): Do not translate the word "%S" below.
 # Place %S in your translation where the name of the mailbox should appear.
-2008=Error creating destination mailboxes, cannot find mailbox %S
+2008=Error creando buzones de destino. No se pudo encontrar el buzón %S
 
 # Error: Error creating destination mailboxes
 ## @name IMPORT_ERROR_MB_CREATE
 ## @loc None
 # LOCALIZATION NOTE (Error 2009): Do not translate the word "%S" below.
 # Place %S in your translation where the name of the mailbox should appear.
-2009=Error importing mailbox %S, unable to create destination mailbox
+2009=Error importando buzón %S. No se ha podido crear un buzón de destino
 
 # Error: No destination folder to import mailboxes
 ## @name IMPORT_ERROR_MB_NODESTFOLDER
 ## @loc None
-2010=Unable to create folder to import mail into
+2010=No se ha podido crear una carpeta para importar el correo
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC_START
 ## @loc None
-2100=First Name
+2100=Nombres
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2101=Last Name
+2101=Apellido
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2102=Display Name
+2102=Nombre mostrado
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2103=Nickname
+2103=Apodo
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2104=Primary Email
+2104=Dirección de correo electrónico principal
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2105=Secondary Email
+2105=Dirección de correo electrónico secundaria
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2106=Work Phone
+2106=Teléfono (Trabajo)
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2107=Home Phone
+2107=Teléfono particular
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2108=Fax Number
+2108=Fax
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2109=Pager Number
+2109=Buscapersonas
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2110=Mobile Number
+2110=Teléfono móvil
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2111=Home Address
+2111=Dirección personal
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2112=Home Address 2
+2112=Dirección personal 2
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2113=Home City
+2113=Ciudad donde vive
+
+# Description: Address book field name
+## @name IMPORT_FIELD_DESC
+## @loc None
+2114=Provincia
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2114=Home State
+2115=Código postal
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2115=Home ZipCode
+2116=País de residencia
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2116=Home Country
+2117=Dirección de trabajo
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2117=Work Address
+2118=Dirección de trabajo 2
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2118=Work Address 2
+2119=Ciudad (Trabajo)
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2119=Work City
+2120=Provincia (Trabajo)
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2120=Work State
+2121=Código postal (Trabajo)
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2121=Work ZipCode
+2122=País (Trabajo)
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2122=Work Country
+2123=Cargo
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2123=Job Title
+2124=Departamento
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2124=Department
+2125=Compañía
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2125=Organization
+2126=Página web 1
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2126=Web Page 1
+2127=Página web 2
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2127=Web Page 2
+2128=Año de nacimiento
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2128=Birth Year
+2129=Mes de nacimiento
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2129=Birth Month
+2130=Día de nacimiento
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2130=Birth Day
+2131=Personalizado 1
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2131=Custom 1
+2132=Personalizado 2
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2132=Custom 2
+2133=Personalizado 3
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2133=Custom 3
+2134=Personalizado 4
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC
 ## @loc None
-2134=Custom 4
+2135=Notas
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC_END
 ## @loc None
-2135=Notes
+2136=Nombre en pantalla
 
 #Error strings
-ImportAlreadyInProgress=An import operation is currently in progress. Try again when the current import has finished.
+ImportAlreadyInProgress=Operación de importación en curso. Vuelva a intentarlo cuando la operación actual haya terminado.
 
 #Error strings for settings import
-ImportSettingsBadModule=Unable to load settings module
-ImportSettingsNotFound=Unable to find settings.  Check to make sure the application is installed on this machine.
-ImportSettingsFailed=An error occurred while importing settings.  Some, or all, of the settings may not have been imported.
+ImportSettingsBadModule=No se ha podido cargar el módulo de configuración
+ImportSettingsNotFound=No se encontró la configuración. Compruebe que la aplicación esté instalada en la computadora.
+ImportSettingsFailed=Ocurrió un error al importar la configuración. Algunos, o todos, los datos podrían haberse no importado.
 # LOCALIZATION NOTE : Do not translate the word "%S" below.
-ImportSettingsSuccess=Settings were imported from %S
+ImportSettingsSuccess=La configuración fue importada de %S
 
 #Error string for mail import
-ImportMailBadModule=Unable to load mail import module
-ImportMailNotFound=Unable to find mail to import.  Check to make sure the mail application is correctly installed on this machine.
+ImportMailBadModule=No se ha podido cargar el módulo para importar correo
+ImportMailNotFound=No se encontró correo para importar. Compruebe que la aplicación de correo está correctamente instalada en esta computadora.
 # LOCALIZATION NOTE : Do not translate the word "%S" below.
-ImportMailFailed=An error occurred importing mail from %S
+ImportMailFailed=Ocurrió un error al importar correo desde %S
 # LOCALIZATION NOTE : Do not translate the word "%S" below.
-ImportMailSuccess=Mail was successfully imported from %S
+ImportMailSuccess=Se importó exitosamente el correo desde %S
 
 # Error string for address import
-ImportAddressBadModule=Unable to load address book import module.
-ImportAddressNotFound=Unable to find any address books to import.  Check to make sure the selected application or format is correctly installed on this machine.
-ImportEmptyAddressBook=Can't import empty address book %S.
+ImportAddressBadModule=No se ha podido cargar el módulo para importar libretas de direcciones
+ImportAddressNotFound=No se encontró ningún libreta para importar. Compruebe que la aplicación seleccionada está correctamente instalada o que el formato del archivo sea correcto.
+ImportEmptyAddressBook=No se puede importar una libreta de direcciones %S vacía.
 # LOCALIZATION NOTE : Do not translate the word "%S" below.
-ImportAddressFailed=An error occurred importing addresses from %S.
+ImportAddressFailed=Ocurrió un error importando direcciones de %S
 # LOCALIZATION NOTE : Do not translate the word "%S" below.
-ImportAddressSuccess=Addresses successfully imported from %S.
+ImportAddressSuccess=Las direcciones fueron correctamente importadas de %S
 
 # Error string for filters import
-ImportFiltersBadModule=Unable to load filters import module.
+ImportFiltersBadModule=No se puede cargar el módulo de importación de filtros.
 # LOCALIZATION NOTE : The %S will get replaced by the name of the import module.
-ImportFiltersFailed=An error occurred importing filters from %S.
+ImportFiltersFailed=Ocurrió un error al importar filtros desde %S.
 # LOCALIZATION NOTE : The %S will get replaced by the name of the import module.
-ImportFiltersSuccess=Filters successfully imported from %S.
+ImportFiltersSuccess=Filtros exitosamente importados desde %S.
 # LOCALIZATION NOTE : The %S will get replaced by the name of the import module.
-ImportFiltersPartial=Filters partially imported from %S.  Warnings below:
+ImportFiltersPartial=Filtros parcialmente importados desde %S.  Advertencias:
 
 #Progress strings
 # LOCALIZATION NOTE : Do not translate the word "%S" below.
-MailProgressMeterText=Converting mailboxes from %S
+MailProgressMeterText=Convirtiendo buzones de correo de %S
 # LOCALIZATION NOTE : Do not translate the word "%S" below.
-AddrProgressMeterText=Converting address books from %S
+AddrProgressMeterText=Convirtiendo libretas de direcciones de %S
 
 #Import file dialog strings
-ImportSelectSettings=Select Settings File
-ImportSelectMailDir=Select Mail Directory
-ImportSelectAddrDir=Select Address Book Directory
-ImportSelectAddrFile=Select Address Book File
+ImportSelectSettings=Seleccione archivo de configuración
+ImportSelectMailDir=Seleccione el directorio para el correo
+ImportSelectAddrDir=Seleccione el directorio de la libreta de direcciones
+ImportSelectAddrFile=Seleccione el archivo de la libreta de direcciones
 
 # LOCALIZATION NOTE : "Communicator 4.x" is the used for previous versions of Netscape Communicator
 # Please translate using the brandname in respective languages for Netscape Communicator 4 releases.
 # LOCALIZATION NOTE : Please do not translate "*.na2", this represents the extension of the address book 
 # files from the Netscape Communicator 4 releases.
 # Comm4.xTo6.xImport user selection string
 Comm4xImportName=Communicator 4.x
-Comm4xFiles=Communicator Address Book files (*.na2)
+Comm4xFiles=Archivos de libretas de direcciones de Communicator (*.na2)
 
 # Folder Names for imported Mail
-DefaultFolderName=Imported Mail
+DefaultFolderName=Correo importado
 # LOCALIZATION NOTE: Do not translate the word "%S" below.
-ImportModuleFolderName=%S Import
+ImportModuleFolderName=Importar %S
  
 # LOCALIZATION NOTE : "Communicator 4.x" is the used for previous versions of Netscape Communicator
 # Please translate using the brandname in respective languages for Netscape Communicator 4 releases.
 # strings profile dialog that comes up when importing mail from 4.x
-profileTitle=Communicator 4.x profiles
-profileText=Choose the profile that contains the Local Mail you want to import:
+profileTitle=Perfiles de Communicator 4.x
+profileText=Elija el perfil que contiene el correo local a importar:
 
--- a/suite/chrome/mailnews/localMsgs.properties
+++ b/suite/chrome/mailnews/localMsgs.properties
@@ -33,219 +33,204 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 #
 # The following are used by the local mail code to display progress/status/error messages
 #
 
+pop3EnterPasswordPromptTitle=Ingrese su contraseña
+
+# LOCALIZATION NOTE(pop3EnterPasswordPrompt): Do not translate the words "%1$S"
+# and "%2$S" below. Place the word %1$S where the user name should appear, and
+# %2$S where the host name should appear.
+pop3EnterPasswordPrompt=Ingrese la contraseña para %1$S en %2$S:
+
+# LOCALIZATION NOTE(pop3PreviouslyEnteredPasswordIsInvalidPrompt): Do not
+# translate the words "%1$S" and "%2$S" below. Place the word %1$S where the
+# user name should appear, and %2$S where the host name should appear.
+pop3PreviouslyEnteredPasswordIsInvalidPrompt=Ingrese una nueva contraseña para el usuario %1$S en %2$S:
+
 ## @name MK_POP3_OUT_OF_DISK_SPACE
 ## @loc None
--321=There is not enough disk space to download new messages. Try deleting old mail, emptying the Trash folder, and compacting your mail folders, and then try again.
-
-# Out of memory
-## @name LOCAL_OUT_OF_MEMORY
-## @loc None
--1000=Application is out of memory.
+-321=No hay suficiente espacio en disco para descargar nuevos mensajes. Intente borrar el correo antiguo, vaciar la papelera y compactar sus carpetas de correo, antes de volver a intentarlo.
 
 # Status - parsing folder
 ## @name LOCAL_STATUS_SELECTING_MAILBOX
 ## @loc None
 #LOCALIZATION NOTE (4000): Do not translate %s in the following line.
 # Place the word %s where the name of the mailbox should appear
-4000=Building summary file for %S…
+4000=Construyendo archivo de resumen para %S…
 
 # Status - parsing folder
 ## @name LOCAL_STATUS_DOCUMENT_DONE
 ## @loc None
-4001=Done
+4001=Terminado
 
 # Status - receiving message n of m
 ## @name LOCAL_STATUS_RECEIVING_MESSAGE_OF
 ## @loc None
 #LOCALIZATION NOTE (4002): Do not translate %lu in the following line.
 # Place the word %lu where the number of messages should appear.
 # The first %lu will receive the number of messages received so far;
 # the second %lu will receive the total number of messages
-4002=Downloading message %S of %S
+4002=Descargando mensaje %S de %S
 
 # Status - pop3 server error
 ## @name POP3_SERVER_ERROR
 ## @loc None
 #LOCALIZATION NOTE (4003): Do not translate POP3 in the following line.
-4003=An error occurred with the POP3 mail server.
+4003=Ocurrió un error con el servidor de correo POP3.
 
 # Status - pop3 user name failed
 ## @name POP3_USERNAME_FAILURE
 ## @loc None
-4004=Sending of username did not succeed.
+4004=Falló el envío del nombre de usuario.
 
 # Status - password failed
 ## @name POP3_PASSWORD_FAILURE
 ## @loc None
-4005=Sending of password did not succeed.
+4005=Falló el envío de contraseña.
 
 # Status - write error occurred
 ## @name POP3_MESSAGE_WRITE_ERROR
 ## @loc None
-4006=Unable to write the email to the mailbox. Make sure the file system allows you write privileges, and you have enough disk space to copy the mailbox.
+4006=Error al guardar el mensaje en la casilla de correo. Verifique que el sistema de archivos le brinde la autorización para escribir y que tenga suficiente espacio en el disco como para copiar la casilla de correo.
 
 # Status - write error occurred
 ## @name POP3_MESSAGE_FOLDER_BUSY
 ## @loc None
-4029=This folder is being processed. Please wait until processing is complete to get messages.
+4029=Esta carpeta está siendo procesada. Espere hasta que el proceso esté completo para obtener los mensajes.
 
 # Status - connecting to host
 ## @name POP3_CONNECT_HOST_CONTACTED_SENDING_LOGIN_INFORMATION
 ## @loc None
-4007=Connect: Host contacted, sending login information…
+4007=Conexión: Sistema principal contactado, enviando información de conexión…
 
 # Status - no messages to download 
 ## @name POP3_NO_MESSAGES
 ## @loc None
-4008=There are no new messages on the server.
+4008=No hay mensajes nuevos en el servidor.
 
 # Status - messages received after the download
 ## @name POP3_DOWNLOAD_COUNT
 ## @loc None
 #LOCALIZATION NOTE (4009): Do not translate %ld in the following line.
 # Place the word %ld where the number of messages should appear.
 # The first %ld will receive the number of messages received so far;
 # the second %ld will receive the total number of messages
-4009=Received %ld of %ld messages
+4009=Se han recibido %ld mensajes de %ld
 
 # Status - retr failure from the server
 ## @name POP3_RETR_FAILURE
 ## @loc None
 # LOCALIZATION NOTE(4012): Do not translate the word "POP3" below.
-4012=The RETR command did not succeed. Error retrieving a message.
+4012=Falló el comando RETR. Error al recuperar el mensaje.
 
 # Status - password undefined 
 ## @name POP3_PASSWORD_UNDEFINED
 ## @loc None
-4013=Error getting mail password.
+4013=Error al obtener la contraseña de correo.
 
 # Status - username undefined 
 ## @name POP3_USERNAME_UNDEFINED
 ## @loc None
-4014=You have not supplied a username for this server.  Please provide one in the account setup menu and try again.
+4014=No ha especificado un usuario para este servidor. Por favor, ingrese uno en el menú de configuración de la cuenta y vuelva a intentarlo.
 
 # Status - list failure
 ## @name POP3_LIST_FAILURE
 ## @loc None
 # LOCALIZATION NOTE(4015): Do not translate the word "POP3" below.
-4015=The LIST command did not succeed. Error getting the ID and size of a message.
+4015=Falló el comando LIST. Error al obtener el ID y tamaño de un mensaje.
 
 # Status - delete error 
 ## @name POP3_DELE_FAILURE
 ## @loc None
 # LOCALIZATION NOTE(4016): Do not translate the word "POP3" below.
-4016=The DELE command did not succeed. Error marking a message as deleted.
-
-## @name POP3_ENTER_PASSWORD_PROMPT
-## @loc None
-# LOCALIZATION NOTE(4016): Do not translate the word "%1$s@%2$s" below.
-# Place the word "%1$s" and "%2$s" where email account name should appear (i.e. john.smith@example.org)
-4017=Enter your password for %1$s on %2$s:
-
-## @name POP3_PREVIOUSLY_ENTERED_PASSWORD_IS_INVALID_ETC
-## @loc None
-# LOCALIZATION NOTE(4016): Do not translate the word "%s" below. It will receive the message returned by the server.
-# Do not translate "%.100s" and "%.100s". It will receive the email account name.
-4018=Please enter a new password for user %.100s on %.100s:
-
-## @name POP3_NO_ANSWER
-## @loc None
-4019=No Answer
-
-## @name POP3_ENTER_PASSWORD_PROMPT_TITLE
-## @loc None
-4020=Enter your password:
-
-## @name moveFolderToTrash
-## @loc None
-4021=Are you sure you want to move the selected folder into the Trash?
-
-## @name POP3_FOLDER_FOR_TRASH
-## @loc None
-4023=The Trash already contained a folder named %s. The folder which you just deleted can be found in the Trash under the new name %s.
+4016=Falló el comando DELE. Error marcando un mensaje como borrado.
 
 # Status - stat failed
 ## @name POP3_STAT
 ## @loc None
-4024= The STAT command did not succeed. Error getting message number and sizes.
+4024= Falló el comando STAT. Error al obtener el número de mensajes y sus tamaños.
 
 ## @name POP3_SERVER_SAID
 ## @loc None
-4025= Mail server %S responded: 
-
-## @name DELETING_MSGS_STATUS
-## @loc None
-4026=Deleting %S of %S messages
+4025= El servidor de correo %S respondió: 
 
 ## @name COPYING_MSGS_STATUS
 ## @loc None
-4027=Copying %S of %S messages to %S
+4027=Copiando %S de %S mensajes a %S
 
 ## @name MOVING_MSGS_STATUS
 ## @loc None
-4028=Moving %S of %S messages to %S
+4028=Moviendo %S de %S mensajes a %S
 
 # secure authentication failed
 ## @name CANNOT_PROCESS_SECURE_AUTH
 ## @loc None
-4030=Mail server does not support secure authentication.
-
-## @name MOVEMAIL_SPOOL_FILE_LOCKED
-## @loc None
-4032=The mail spool file %S is locked.
+4030=El servidor de correo no soporta autenticación segura.
 
 ## @name MOVEMAIL_CANT_OPEN_SPOOL_FILE
 ## @loc None
-4033=Unable to open mail spool file %S.
+4033=No se puede abrir el archivo de spool de correo %S.
 
 ## @name MOVEMAIL_CANT_CREATE_LOCK
 ## @loc None
-4034=Unable to create lock file %S. For movemail to work, it is necessary to create lock files in the mail spool directory. On many systems, this is best accomplished by making the spool directory be mode 01777.
+4034=No se puede crear el archivo de bloqueo %S. Para que movemail funcione, hay que crear archivos de bloqueo en el directorio de spool de correo. En muchos sistemas, esto se hace fijando el modo 01777 en el directorio spool.
 
 ## @name MOVEMAIL_CANT_DELETE_LOCK
 ## @loc None
-4035=Unable to delete lock file %S.
+4035=No se puede borrar el archivo de bloqueo %S.
 
 ## @name MOVEMAIL_CANT_TRUNCATE_SPOOL_FILE
 ## @loc None
-4036=Unable to truncate spool file %S.
+4036=No se puede truncar el archivo de spool %S.
 
 ## @name MOVEMAIL_SPOOL_FILE_NOT_FOUND
 ## @loc None
-4037=Unable to locate mail spool file.
+4037=No se puede encontrar el archivo de spool de correo.
 
 ## @name POP3_TMP_DOWNLOAD_FAILED
 ## @loc None
-4038=There was an error downloading the following message:   \nFrom: %S\n   Subject: %S\n This message may contain a virus or there is not enough disk space. Skip this message?
+4038=Hubo un error descargando el siguiente mensaje: \nDe: %S\n Asunto: %S\n Este mensaje puede contener un virus o no hay espacio suficiente en disco. ¿Saltear este mensaje?
 
 # Status - the server doesn't support UIDL…
 ## @name POP3_SERVER_DOES_NOT_SUPPORT_UIDL_ETC
 ## @loc None
 # LOCALIZATION NOTE(4010): The following sentence should be translated in this way:
 # Do not translate "POP3"
 # Do not translate "%S". Place %S in your translation where the name of the server should appear.
 # Do not translate "UIDL"
-4040=The POP3 mail server (%S) does not support UIDL or XTND XLST, which are required to implement the ``Leave on Server'', ``Maximum Message Size'' or ``Fetch Headers Only'' options. To download your mail, turn off these options in the Server Settings for your mail server in the Account Settings window.
+4040=El servidor de correo POP3 (%S) no soporta UIDL o XTND XLST, que son requeridos para implementar las opciones de ``Dejar en el servidor'', ``Tamaño máximo de mensaje'' o ``Recuperar solamente encabezados''. Para descargar el correo, desactive estas opciones en la configuración del servidor para su servidor de correo en la ventana de Configuración de cuenta.
 
 # Status - the server doesn't support the top command
 ## @name POP3_SERVER_DOES_NOT_SUPPORT_THE_TOP_COMMAND
 ## @loc None
 # LOCALIZATION NOTE(4011): The following sentence should be translated in this way:
 # Do not translate "POP3"
 # Do not translate "%S". Place %S in your translation where the name of the server should appear.
 # Do not translate "TOP"
-4041=The POP3 mail server (%S) does not support the TOP command. Without server support for this, we cannot implement the ``Maximum Message Size'' or ``Fetch Headers Only'' preference.  This option has been disabled, and messages will be downloaded regardless of their size.
+4041=El servidor de correo POP3 (%S) no soporta el comando TOP. Sin soporte de servidor para ésto, no podemos implementar las preferencias de ``Tamaño máximo de mensaje'' o ``Recuperar solamente encabezados''. Esta opción ha sido deshabilitada y los mensajes se descargarán sin importar su tamaño.
 
 # secure authentication failed and unsure why
 ## @name CANNOT_PROCESS_APOP_AUTH
 ## @loc None
-4042=The mail server does not support secure authentication or you have entered an incorrect password. Please check your password, or turn off secure authentication in the Server Settings for your mail server in the Account Settings window.\n
+4042=El servidor de correo no soporta autenticación segura o ha ingresado una contraseña incorrecta. Verifique su contraseña o desactive la autenticación segura en las opciones de servidor para su servidor de correo en la ventana de Configuración de cuenta.\n
 
 ## @name NS_ERROR_COULD_NOT_CONNECT_VIA_TLS
 ## @loc None
-4043=Unable to establish TLS connection to POP3 server. The server may be down or may be incorrectly configured. Please verify the correct configuration in the Server Settings for your mail server in the Account Settings window and try again.
+4043=No se puede establecer una conexión TLS con el servidor POP3. El servidor puede estar caído o puede estar configurado incorrectamente. Verifique la configuración correcta en las opciones de servidor para su servidor de correo en la ventana de Configuración de cuenta e intente nuevamente.
+
+## @name POP3_MOVE_FOLDER_TO_TRASH
+## @loc None
+# LOCALIZATION NOTE (4044): Do not translate the word %S below.
+# "%S" is the the name of the folder.
+4044=¿Seguro desea borrar la carpeta '%S'?
+
+## @name POP3_DELETE_FOLDER_DIALOG_TITLE
+## @loc None
+4045=Borrar carpeta
+
+## @name POP3_DELETE_FOLDER_BUTTON_LABEL
+## @loc None
+4046=&Borrar carpeta
--- a/suite/chrome/mailnews/mailOverlay.dtd
+++ b/suite/chrome/mailnews/mailOverlay.dtd
@@ -1,8 +1,8 @@
 
 <!ENTITY  newMessageCmd.key               "M">
-<!ENTITY  newMessageCmd.label             "Message">
-<!ENTITY  newMessageCmd.accesskey         "m">
+<!ENTITY  newMessageCmd.label             "Mensaje">
+<!ENTITY  newMessageCmd.accesskey         "M">
  
-<!ENTITY  newCardCmd.label                "Address Book Card…">
-<!ENTITY  newCardCmd.accesskey            "c">
+<!ENTITY  newContactCmd.label             "Contacto…">
+<!ENTITY  newContactCmd.accesskey         "C">
  
--- a/suite/chrome/mailnews/mapi/mapi.properties
+++ b/suite/chrome/mailnews/mapi/mapi.properties
@@ -1,23 +1,9 @@
-# Mail Integration Dialog
-dialogTitle=%S Mail
-dialogText=Do you want to use %S as the default mail application? 
-checkboxText=Do not display this dialog again
-
 # MAPI Messages
-loginText=Please enter your password for %S:
-loginTextwithName=Please enter your username and password 
-loginTitle=%S Mail
-PasswordTitle=%S Mail
-
-# MAPI Error Messages
-errorMessage=%S Mail could not be set as the default mail application because a registry key could not be updated. Verify with your system administrator that you have write access to your system registry, and then try again.
-errorMessageTitle=%S Mail
+loginText=Ingrese su contraseña para %S:
+loginTextwithName=Ingrese su nombre de usuario y contraseña 
+loginTitle=Correo %S
+PasswordTitle=Correo %S
 
 # MAPI Security Messages
-mapiBlindSendWarning=Another application is attempting to send mail using your user profile. Are you sure you want to send mail?
-mapiBlindSendDontShowAgain=Warn me whenever other applications try to send mail from me
-
-#Default Mail Display String
-# localization note, %S is the vendor name
-defaultMailDisplayTitle=%S Mail
-
+mapiBlindSendWarning=Otra aplicación está intentando enviar correo usando su perfil de usuario. ¿Está seguro de querer enviar el correo?
+mapiBlindSendDontShowAgain=Avisarme cuando otras aplicaciones intenten enviar correo en mi nombre
--- a/suite/chrome/mailnews/messenger.dtd
+++ b/suite/chrome/mailnews/messenger.dtd
@@ -32,573 +32,579 @@
  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 messengerWindow.title "Mail &amp; Newsgroups">
+<!ENTITY messengerWindow.title "Correo y noticias">
 <!ENTITY titleModifier.label "&brandShortName;">
 <!ENTITY titleSeparator.label " - ">
 
+<!-- tabmail -->
+<!ENTITY tabmailClose.label "Cerrar pestaña">
+<!ENTITY tabmailClose.tooltip "Cerrar pestaña">
+<!ENTITY tabmailNewButton.tooltip "Duplicar pestaña actual">
+<!ENTITY tabmailCloseButton.tooltip "Cerrar la pestaña actual">
+<!ENTITY tabmailAllTabs.tooltip "Listar todas las pestañas">
+
 <!-- menu items:  the . means that the menu item isn't implemented yet -->
 
 <!-- File menu items -->
-<!ENTITY newMessage.label "New Message">
+<!ENTITY newMessage.label "Nuevo mensaje">
 <!ENTITY newMessage.accesskey "N">
-<!ENTITY newFolderCmd.label "Folder…">
-<!ENTITY newFolderCmd.accesskey "F">
-<!ENTITY newVirtualFolderCmd.label "Saved Search…">
-<!ENTITY newVirtualFolderCmd.accesskey "S">
-<!ENTITY newAccountCmd.label "Account…">
-<!ENTITY newAccountCmd.accesskey "A">
-<!ENTITY openMessageMenu.label "Open">
-<!ENTITY openMessageFileCmd.label "Open File…">
-<!ENTITY openMessageFileCmd.accesskey "O">
-<!ENTITY openAttachmentCmd.label "Attachments">
-<!ENTITY openAttachmentCmd.accesskey "h">
-<!ENTITY saveAsMenu.label "Save As">
-<!ENTITY saveAsMenu.accesskey "S">
-<!ENTITY saveAsFileCmd.label "File">
-<!ENTITY saveAsFileCmd.accesskey "F">
+<!ENTITY newFolderCmd.label "Carpeta…">
+<!ENTITY newFolderCmd.accesskey "C">
+<!ENTITY newVirtualFolderCmd.label "Búsqueda guardada…">
+<!ENTITY newVirtualFolderCmd.accesskey "s">
+<!ENTITY newTabCmd.label "Duplicar pestaña">
+<!ENTITY newTabCmd.accesskey "t">
+<!ENTITY newTabCmd.key "t">
+<!ENTITY closeTabCmd.label "Cerrar pestaña">
+<!ENTITY closeTabCmd.accesskey "e">
+<!ENTITY newAccountCmd.label "Cuenta…">
+<!ENTITY newAccountCmd.accesskey "a">
+<!ENTITY openMessageFileCmd.label "Abrir mensaje guardado…">
+<!ENTITY openMessageFileCmd.accesskey "m">
+<!ENTITY openAttachmentCmd.label "Adjuntos">
+<!ENTITY openAttachmentCmd.accesskey "j">
+<!ENTITY saveAsMenu.label "Guardar como">
+<!ENTITY saveAsMenu.accesskey "m">
+<!ENTITY saveAsFileCmd.label "Archivo">
+<!ENTITY saveAsFileCmd.accesskey "r">
 <!ENTITY saveAsFileCmd.key "s">
-<!ENTITY saveAsTemplateCmd.label "Template">
-<!ENTITY saveAsTemplateCmd.accesskey "T">
-<!ENTITY getNewMsgCmd.label "Get New Messages">
-<!ENTITY getNewMsgCmd.accesskey "G">
-<!ENTITY getNewMsgCmd.key "t">
-<!ENTITY getNewMsgForCmd.label "Get New Messages for">
-<!ENTITY getNewMsgForCmd.accesskey "w">
-<!ENTITY getAllNewMsgCmdPopupMenu.label "All Accounts">
-<!ENTITY getAllNewMsgCmdPopupMenu.accesskey "A">
-<!ENTITY getAllNewMsgCmd.label "Get All New Messages">
-<!ENTITY getAllNewMsgCmd.key "t">
-<!ENTITY getNextNMsgCmd.label "Get Next 500 News Messages">
+<!ENTITY saveAsTemplateCmd.label "Plantilla">
+<!ENTITY saveAsTemplateCmd.accesskey "P">
+<!ENTITY getNewMsgCmd.label "Obtener nuevos mensajes">
+<!ENTITY getNewMsgCmd.accesskey "O">
+<!ENTITY getNewMsgCmd2.key "d">
+<!ENTITY getNewMsgForCmd.label "Recibir mensajes nuevos de">
+<!ENTITY getNewMsgForCmd.accesskey "b">
+<!ENTITY getAllNewMsgCmdPopupMenu.label "todas las cuentas">
+<!ENTITY getAllNewMsgCmdPopupMenu.accesskey "a">
+<!ENTITY getAllNewMsgCmd.label "Recibir todos los mensajes nuevos">
+<!ENTITY getAllNewMsgCmd2.key "d">
+<!ENTITY getNextNMsgCmd.label "Obtener 500 nuevos mensajes">
 <!ENTITY getNextNMsgCmd.accesskey "t">
-<!ENTITY sendUnsentCmd.label "Send Unsent Messages">
-<!ENTITY sendUnsentCmd.accesskey "d">
-<!ENTITY loadFirstDraft.label			"Load First Draft Message">
-<!ENTITY subscribeCmd.label "Subscribe…">
+<!ENTITY sendUnsentCmd.label "Procesar mensajes no enviados">
+<!ENTITY sendUnsentCmd.accesskey "v">
+<!ENTITY subscribeCmd.label "Suscribirse…">
 <!ENTITY subscribeCmd.accesskey "b">
-<!ENTITY renameFolder.label "Rename Folder…">
+<!ENTITY renameFolder.label "Renombrar carpeta">
 <!ENTITY renameFolder.accesskey "R">
-<!ENTITY compactFolders.label "Compact Folders">
-<!ENTITY compactFolder.accesskey		"F">
-<!ENTITY emptyTrashCmd.label "Empty Trash">
-<!ENTITY emptyTrashCmd.accesskey		"y">
-<!ENTITY offlineMenu.label "Offline">
-<!ENTITY offlineMenu.accesskey "l">
-<!ENTITY synchronizeOfflineCmd.label "Download/Sync Now…">
-<!ENTITY synchronizeOfflineCmd.accesskey "S">
-<!ENTITY settingsOfflineCmd.label "Offline Settings…">
+<!ENTITY compactFolders.label "Compactar carpetas">
+<!ENTITY compactFolders.accesskey		"C">
+<!ENTITY emptyTrashCmd.label "Vaciar papelera">
+<!ENTITY emptyTrashCmd.accesskey		"p">
+<!ENTITY offlineMenu.label "Sin conexión">
+<!ENTITY offlineMenu.accesskey "x">
+<!ENTITY synchronizeOfflineCmd.label "Descargar/sincronizar ahora…">
+<!ENTITY synchronizeOfflineCmd.accesskey "s">
+<!ENTITY settingsOfflineCmd.label "Opciones sin conexión…">
 <!ENTITY settingsOfflineCmd.accesskey "e">
-<!ENTITY downloadSelectedCmd.label "Get Selected Messages">
-<!ENTITY downloadSelectedCmd.accesskey "t">
-<!ENTITY downloadFlaggedCmd.label "Get Flagged Messages">
-<!ENTITY downloadFlaggedCmd.accesskey "G">
-<!ENTITY printCmd.label "Print…">
-<!ENTITY printCmd.accesskey "P">
+<!ENTITY downloadSelectedCmd.label "Obtener mensajes seleccionados">
+<!ENTITY downloadSelectedCmd.accesskey "l">
+<!ENTITY downloadFlaggedCmd.label "Obtener mensajes destacados">
+<!ENTITY downloadFlaggedCmd.accesskey "O">
+<!ENTITY printCmd.label "Imprimir…">
+<!ENTITY printCmd.accesskey "I">
 <!ENTITY printCmd.key "p">
-<!ENTITY printPreviewCmd.label "Print Preview">
-<!ENTITY printPreviewCmd.accesskey "v">
-<!ENTITY printPreviewCmd.key "v">
-<!ENTITY printSetupCmd.label "Page Setup…">
+<!ENTITY printPreviewCmd.label "Vista preliminar">
+<!ENTITY printPreviewCmd.accesskey "V">
+<!ENTITY printSetupCmd.label "Configurar página…">
 <!ENTITY printSetupCmd.accesskey "u">
 
 <!-- Edit Menu -->
-<!ENTITY deleteMsgCmd.label "Delete Message">
-<!ENTITY deleteMsgCmd.accesskey "D">
-<!ENTITY undeleteMsgCmd.label "Undelete Message">
-<!ENTITY undeleteMsgCmd.accesskey "d">
-<!ENTITY cancelNewsMsgCmd.label "Cancel Message">
+<!ENTITY deleteMsgCmd.label "Borrar mensaje">
+<!ENTITY deleteMsgCmd.accesskey "r">
+<!ENTITY undeleteMsgCmd.label "Restaurar mensaje">
+<!ENTITY undeleteMsgCmd.accesskey "R">
+<!ENTITY cancelNewsMsgCmd.label "Cancelar mensaje">
 <!ENTITY cancelNewsMsgCmd.accesskey "n">
-<!ENTITY deleteMsgsCmd.label "Delete Selected Messages">
-<!ENTITY deleteMsgsCmd.accesskey "D">
-<!ENTITY undeleteMsgsCmd.label "Undelete Selected Messages">
-<!ENTITY undeleteMsgsCmd.accesskey "d">
-<!ENTITY cancelNewsMsgsCmd.label "Cancel Selected Messages">
+<!ENTITY deleteMsgsCmd.label "Borrar mensajes seleccionados">
+<!ENTITY deleteMsgsCmd.accesskey "B">
+<!ENTITY undeleteMsgsCmd.label "Restaurar mensajes seleccionados">
+<!ENTITY undeleteMsgsCmd.accesskey "R">
+<!ENTITY cancelNewsMsgsCmd.label "Cancelar mensajes seleccionados">
 <!ENTITY cancelNewsMsgsCmd.accesskey "n">
-<!ENTITY deleteFolderCmd.label "Delete Folder">
-<!ENTITY deleteFolderCmd.accesskey "D">
-<!ENTITY unsubscribeNewsgroupCmd.label "Unsubscribe">
-<!ENTITY unsubscribeNewsgroupCmd.accesskey "n">
-<!ENTITY selectMenu.label "Select">
-<!ENTITY selectMenu.accesskey "S">
-<!ENTITY selectThreadCmd.label "Thread">
-<!ENTITY selectThreadCmd.accesskey "T">
+<!ENTITY deleteFolderCmd.label "Borrar carpeta">
+<!ENTITY deleteFolderCmd.accesskey "B">
+<!ENTITY unsubscribeNewsgroupCmd.label "Cancelar suscripción">
+<!ENTITY unsubscribeNewsgroupCmd.accesskey "C">
+<!ENTITY selectMenu.label "Seleccionar">
+<!ENTITY selectMenu.accesskey "l">
+<!ENTITY selectThreadCmd.label "Conversación">
+<!ENTITY selectThreadCmd.accesskey "C">
 <!ENTITY selectThreadCmd.key "a">
-<!ENTITY selectFlaggedCmd.label "Flagged Messages">
-<!ENTITY selectFlaggedCmd.accesskey "F">
-<!ENTITY selectInvertCmd.label ".Invert Selection">
-<!ENTITY selectInvertCmd.accesskey "I">
-<!ENTITY folderPropsCmd.label "Properties…">
-<!ENTITY folderPropsFolderCmd.label "Folder Properties…">
-<!ENTITY folderPropsNewsgroupCmd.label "Newsgroup Properties…">
+<!ENTITY selectFlaggedCmd.label "Mensajes destacados">
+<!ENTITY selectFlaggedCmd.accesskey "s">
+<!ENTITY folderPropsCmd.label "Propiedades…">
+<!ENTITY folderPropsFolderCmd.label "Propiedades de carpeta…">
+<!ENTITY folderPropsNewsgroupCmd.label "Propiedades del grupo…">
 <!ENTITY folderPropsCmd.accesskey "o">
-<!ENTITY accountManagerCmd.label "Mail &amp; Newsgroups Account Settings…">
-<!ENTITY accountManagerCmd.accesskey "M">
-<!ENTITY undoDeleteMsgCmd.label "Undo Delete Message">
-<!ENTITY redoDeleteMsgCmd.label "Redo Delete Message">
-<!ENTITY undoMoveMsgCmd.label "Undo Move Message">
-<!ENTITY redoMoveMsgCmd.label "Redo Move Message">
-<!ENTITY undoCopyMsgCmd.label "Undo Copy Message">
-<!ENTITY redoCopyMsgCmd.label "Redo Copy Message">
-<!ENTITY undoDefaultCmd.label "Undo">
-<!ENTITY redoDefaultCmd.label "Redo">
-<!ENTITY editDraftCmd.label "Edit Draft">
-<!ENTITY editDraftCmd.accesskey "f">
+<!ENTITY accountManagerCmd.label "Configuración de cuentas…">
+<!ENTITY accountManagerCmd.accesskey "f">
+<!ENTITY undoDeleteMsgCmd.label "Deshacer Borrar mensaje">
+<!ENTITY redoDeleteMsgCmd.label "Rehacer Borrar mensaje">
+<!ENTITY undoMoveMsgCmd.label "Deshacer Mover mensaje">
+<!ENTITY redoMoveMsgCmd.label "Rehacer Mover mensaje">
+<!ENTITY undoCopyMsgCmd.label "Deshacer Copiar mensaje">
+<!ENTITY redoCopyMsgCmd.label "Rehacer Copiar mensaje">
+<!ENTITY undoMarkAllCmd.label "Deshacer Marcar todos como leídos">
+<!ENTITY redoMarkAllCmd.label "Rehacer Marcar todos como leídos">
+<!ENTITY undoDefaultCmd.label "Deshacer">
+<!ENTITY redoDefaultCmd.label "Repetir">
 
 <!-- View Menu -->
-<!ENTITY showMessengerToolbarCmd.label		"Mail Toolbar">
+<!ENTITY showMessengerToolbarCmd.label		"Barra de herramientas de correo">
 <!ENTITY showMessengerToolbarCmd.accesskey	"o">
-<!ENTITY customizeToolbar.label                 "Customize…">
-<!ENTITY customizeToolbar.accesskey             "C">
  
 <!-- showSearchToolbarCmd is also used by addressbook -->
-<!ENTITY showSearchToolbarCmd.label		"Search Bar">
+<!ENTITY showSearchToolbarCmd.label		"Barra de búsquedas">
 <!ENTITY showSearchToolbarCmd.accesskey	"e">
 
-<!ENTITY showLocationToolbarCmd.label "Location Toolbar">
-<!ENTITY showLocationToolbarCmd.accesskey "L">
+<!ENTITY showLocationToolbarCmd.label "Barra de navegación">
+<!ENTITY showLocationToolbarCmd.accesskey "B">
 
-<!ENTITY messagePaneLayoutStyle.label "Layout">
-<!ENTITY messagePaneLayoutStyle.accesskey "L">
-<!ENTITY messagePaneClassic.label "Classic View">
-<!ENTITY messagePaneClassic.accesskey "C">
-<!ENTITY messagePaneWide.label "Wide View">
-<!ENTITY messagePaneWide.accesskey "W">
-<!ENTITY messagePaneVertical.label "Vertical View">
+<!ENTITY messagePaneLayoutStyle.label "Disposición">
+<!ENTITY messagePaneLayoutStyle.accesskey "D">
+<!ENTITY messagePaneClassic.label "Vista clásica">
+<!ENTITY messagePaneClassic.accesskey "c">
+<!ENTITY messagePaneWide.label "Vista amplia">
+<!ENTITY messagePaneWide.accesskey "m">
+<!ENTITY messagePaneVertical.label "Vista vertical">
 <!ENTITY messagePaneVertical.accesskey "V">
-<!ENTITY showMessagePaneCmd.label "Message Pane">
-<!ENTITY showMessagePaneCmd.accesskey "M">
-<!ENTITY showFolderPaneCmd.label "Folder Pane">
-<!ENTITY showFolderPaneCmd.accesskey "F">
+<!ENTITY showMessagePaneCmd.label "Vista de mensaje">
+<!ENTITY showMessagePaneCmd.accesskey "m">
+<!ENTITY showThreadPaneCmd.label "Vista de conversaciones">
+<!ENTITY showThreadPaneCmd.accesskey "t">
+<!ENTITY showFolderPaneCmd.label "Panel carpetas">
+<!ENTITY showFolderPaneCmd.accesskey "P">
 
 <!-- sortMenu is also used by addressbook -->
-<!ENTITY sortMenu.label "Sort by">
-<!ENTITY sortMenu.accesskey "t">
+<!ENTITY sortMenu.label "Ordenar por">
+<!ENTITY sortMenu.accesskey "O">
 
-<!ENTITY sortByDateCmd.label "Date">
-<!ENTITY sortByDateCmd.accesskey "e">
-<!ENTITY sortByReceivedCmd.label "Received">
-<!ENTITY sortByReceivedCmd.accesskey "v">
-<!ENTITY sortByFlagCmd.label "Flag">
-<!ENTITY sortByFlagCmd.accesskey "l">
-<!ENTITY sortByPriorityCmd.label "Priority">
+<!ENTITY sortByDateCmd.label "Fecha">
+<!ENTITY sortByDateCmd.accesskey "F">
+<!ENTITY sortByReceivedCmd.label "Recibido">
+<!ENTITY sortByReceivedCmd.accesskey "b">
+<!ENTITY sortByFlagCmd.label "Destacado">
+<!ENTITY sortByFlagCmd.accesskey "D">
+<!ENTITY sortByPriorityCmd.label "Prioridad">
 <!ENTITY sortByPriorityCmd.accesskey "P">
-<!ENTITY sortBySizeCmd.label "Size">
-<!ENTITY sortBySizeCmd.accesskey "z">
-<!ENTITY sortByStatusCmd.label "Status">
-<!ENTITY sortByStatusCmd.accesskey "u">
-<!ENTITY sortByTagsCmd.label "Tags">
-<!ENTITY sortByTagsCmd.accesskey "g">
-<!ENTITY sortByJunkStatusCmd.label "Junk Status">
-<!ENTITY sortByJunkStatusCmd.accesskey "J">
-<!ENTITY sortBySubjectCmd.label "Subject">
-<!ENTITY sortBySubjectCmd.accesskey "S">
-<!ENTITY sortByFromCmd.label "From">
-<!ENTITY sortByFromCmd.accesskey "F">
-<!ENTITY sortByRecipientCmd.label "Recipient">
-<!ENTITY sortByRecipientCmd.accesskey "c">
-<!ENTITY sortByUnreadCmd.label "Read">
-<!ENTITY sortByUnreadCmd.accesskey "R">
-<!ENTITY sortByOrderReceivedCmd.label "Order Received">
+<!ENTITY sortBySizeCmd.label "Tamaño">
+<!ENTITY sortBySizeCmd.accesskey "T">
+<!ENTITY sortByStatusCmd.label "Estado">
+<!ENTITY sortByStatusCmd.accesskey "E">
+<!ENTITY sortByTagsCmd.label "Etiquetas">
+<!ENTITY sortByTagsCmd.accesskey "q">
+<!ENTITY sortByJunkStatusCmd.label "Estado de correo basura">
+<!ENTITY sortByJunkStatusCmd.accesskey "s">
+<!ENTITY sortBySubjectCmd.label "Asunto">
+<!ENTITY sortBySubjectCmd.accesskey "A">
+<!ENTITY sortByFromCmd.label "De">
+<!ENTITY sortByFromCmd.accesskey "e">
+<!ENTITY sortByRecipientCmd.label "Destinatario">
+<!ENTITY sortByRecipientCmd.accesskey "D">
+<!ENTITY sortByUnreadCmd.label "Leídos">
+<!ENTITY sortByUnreadCmd.accesskey "L">
+<!ENTITY sortByOrderReceivedCmd.label "Orden de recepción">
 <!ENTITY sortByOrderReceivedCmd.accesskey "O">
-<!ENTITY sortByAttachmentsCmd.label "Attachments">
-<!ENTITY sortByAttachmentsCmd.accesskey "m">
-<!ENTITY sortAscending.label "Ascending">
+<!ENTITY sortByAttachmentsCmd.label "Adjuntos">
+<!ENTITY sortByAttachmentsCmd.accesskey "j">
+<!ENTITY sortAscending.label "Ascendente">
 <!ENTITY sortAscending.accesskey "A">
-<!ENTITY sortDescending.label "Descending">
+<!ENTITY sortDescending.label "Descendente">
 <!ENTITY sortDescending.accesskey "D">
-<!ENTITY sortThreaded.label "Threaded">
-<!ENTITY sortThreaded.accesskey "T">
-<!ENTITY sortUnthreaded.label "Unthreaded">
-<!ENTITY sortUnthreaded.accesskey "h">
-<!ENTITY groupBySort.label "Grouped By Sort">
-<!ENTITY groupBySort.accesskey "G">
-<!ENTITY msgsMenu.label "Messages">
+<!ENTITY sortThreaded.label "Anidado">
+<!ENTITY sortThreaded.accesskey "A">
+<!ENTITY sortUnthreaded.label "No anidado">
+<!ENTITY sortUnthreaded.accesskey "N">
+<!ENTITY groupBySort.label "Agrupados por orden">
+<!ENTITY groupBySort.accesskey "g">
+<!ENTITY msgsMenu.label "Mensajes">
 <!ENTITY msgsMenu.accesskey "M">
-<!ENTITY threads.label "Threads">
-<!ENTITY threads.accesskey "e">
-<!ENTITY allMsgsCmd.label "All">
-<!ENTITY allMsgsCmd.accesskey "A">
-<!ENTITY expandOrCollapseMenu.label "Expand/Collapse">
-<!ENTITY expandOrCollapseMenu.accesskey "x">
-<!ENTITY expandAllThreadsCmd.label "Expand All Threads">
+<!ENTITY threads.label "Conversaciones">
+<!ENTITY threads.accesskey "v">
+<!ENTITY allMsgsCmd.label "Todo">
+<!ENTITY allMsgsCmd.accesskey "T">
+<!ENTITY expandAllThreadsCmd.label "Expandir todas las conversaciones">
 <!ENTITY expandAllThreadsCmd.accesskey "E">
 <!ENTITY expandAllThreadsCmd.key "*">
-<!ENTITY collapseAllThreadsCmd.label "Collapse All Threads">
+<!ENTITY collapseAllThreadsCmd.label "Contraer todas las conversaciones">
 <!ENTITY collapseAllThreadsCmd.accesskey "C">
 <!ENTITY collapseAllThreadsCmd.key "\">
-<!ENTITY unreadMsgsCmd.label "Unread">
-<!ENTITY unreadMsgsCmd.accesskey "U">
-<!ENTITY threadsWithUnreadCmd.label "Threads with Unread">
-<!ENTITY threadsWithUnreadCmd.accesskey "T">
-<!ENTITY watchedThreadsWithUnreadCmd.label "Watched Threads with Unread">
-<!ENTITY watchedThreadsWithUnreadCmd.accesskey "W">
-<!ENTITY ignoredThreadsCmd.label "Ignored Threads">
-<!ENTITY ignoredThreadsCmd.accesskey "i">  
-<!ENTITY headersMenu.label "Headers">
-<!ENTITY headersMenu.accesskey "H">
-<!ENTITY headersAllCmd.label "All">
-<!ENTITY headersAllCmd.accesskey "A">
+<!ENTITY unreadMsgsCmd.label "No leídos">
+<!ENTITY unreadMsgsCmd.accesskey "N">
+<!ENTITY threadsWithUnreadCmd.label "Conversaciones con no leídos">
+<!ENTITY threadsWithUnreadCmd.accesskey "o">
+<!ENTITY watchedThreadsWithUnreadCmd.label "Conversaciones observadas con no leídos">
+<!ENTITY watchedThreadsWithUnreadCmd.accesskey "v">
+<!ENTITY ignoredThreadsCmd.label "Conversaciones ignoradas">
+<!ENTITY ignoredThreadsCmd.accesskey "i">
+
+<!ENTITY headersMenu.label "Encabezados">
+<!ENTITY headersMenu.accesskey "c">
+<!ENTITY headersAllCmd.label "Todo">
+<!ENTITY headersAllCmd.accesskey "T">
 <!ENTITY headersNormalCmd.label "Normal">
 <!ENTITY headersNormalCmd.accesskey "N">
-<!ENTITY headersBriefCmd.label ".Brief">
-<!ENTITY headersBriefCmd.accesskey "B">
-<!ENTITY bodyMenu.label "Message Body As">
-<!ENTITY bodyMenu.accesskey "B">
-<!ENTITY bodyAllowHTML.label "Original HTML">
+<!ENTITY bodyMenu.label "Cuerpo del mensaje como">
+<!ENTITY bodyMenu.accesskey "u">
+<!ENTITY bodyAllowHTML.label "HTML original">
 <!ENTITY bodyAllowHTML.accesskey "H">
-<!ENTITY bodySanitized.label "Simple HTML">
-<!ENTITY bodySanitized.accesskey "S">
-<!ENTITY bodyAsPlaintext.label "Plain Text">
-<!ENTITY bodyAsPlaintext.accesskey "P">
-<!ENTITY viewAttachmentsInlineCmd.label "Display Attachments Inline">
-<!ENTITY viewAttachmentsInlineCmd.accesskey "A">
-<!ENTITY reloadCmd.label "Reload">
+<!ENTITY bodySanitized.label "HTML simple">
+<!ENTITY bodySanitized.accesskey "s">
+<!ENTITY bodyAsPlaintext.label "Texto sin formato">
+<!ENTITY bodyAsPlaintext.accesskey "T">
+
+<!ENTITY bodyMenuFeed.label "Feed Message Body As">
+<!ENTITY bodyMenuFeed.accesskey "S">
+<!ENTITY viewFeedWebPage.label "Página web">
+<!ENTITY viewFeedWebPage.accesskey "w">
+<!ENTITY viewFeedSummary.label "Resumen">
+<!ENTITY viewFeedSummary.accesskey "m">
+<!ENTITY viewFeedSummaryFeedPropsPref.label "Formato predeterminado">
+<!ENTITY viewFeedSummaryFeedPropsPref.accesskey "d">
+
+<!ENTITY viewAttachmentsInlineCmd.label "Ver adjuntos incorporados">
+<!ENTITY viewAttachmentsInlineCmd.accesskey "a">
+<!ENTITY reloadCmd.label "Recargar">
 <!ENTITY reloadCmd.accesskey "R">
-<!ENTITY stopCmd.label "Stop">
-<!ENTITY stopCmd.accesskey "S">
-<!ENTITY pageSourceCmd.label "Message Source">
-<!ENTITY pageSourceCmd.accesskey "o">
+<!ENTITY stopCmd.label "Detener">
+<!ENTITY stopCmd.accesskey "D">
+<!ENTITY pageSourceCmd.label "Fuente del mensaje">
+<!ENTITY pageSourceCmd.accesskey "u">
 <!ENTITY pageSourceCmd.key "u">
-<!ENTITY translateMenu.label ".Translate">
 
-<!-- Search Menu -->
-<!-- searchMenu is also used by addressbook -->
-<!ENTITY searchMenu.label "Search">
-<!ENTITY searchMenu.accesskey "S">
-
-<!ENTITY findCmd.label "Find in This Message…">
-<!ENTITY findCmd.accesskey "F">
+<!ENTITY findCmd.label "Buscar en este mensaje…">
+<!ENTITY findCmd.accesskey "B">
 <!ENTITY findCmd.key "f">
-<!ENTITY findAgainCmd.label "Find Again">
-<!ENTITY findAgainCmd.accesskey "g">
+<!ENTITY findAgainCmd.label "Repetir la búsqueda">
+<!ENTITY findAgainCmd.accesskey "q">
 <!ENTITY findAgainCmd.key "g">
 <!ENTITY findAgainCmd.key2 "VK_F3">
-<!ENTITY findPrevCmd.label "Find Previous">
-<!ENTITY findPrevCmd.accesskey "v">
+<!ENTITY findPrevCmd.label "Buscar anterior">
+<!ENTITY findPrevCmd.accesskey "e">
 <!ENTITY findPrevCmd.key "g">
 <!ENTITY findPrevCmd.key2 "VK_F3">
-<!-- LOCALIZATION NOTE (searchCurrentCmd.label) : Do not translate "&lt;" and "&gt;" in below line. -->
-<!ENTITY searchCurrentCmd.label ".Search in &lt;current&gt;">
-<!ENTITY searchCurrentCmd.accesskey "">
-<!-- LOCALIZATION NOTE (searchParentCmd.label) : Do not translate "&lt;" and "&gt;" in below line. -->
-<!ENTITY searchParentCmd.label ".Search in &lt;parent&gt;">
-<!ENTITY searchParentCmd.accesskey "">
-<!-- LOCALIZATION NOTE (searchParentParentCmd.label) : Do not translate "&lt;" and "&gt;" in below line. -->
-<!ENTITY searchParentParentCmd.label ".Search in &lt;parent parent&gt;">
-<!ENTITY searchParentParentCmd.accesskey "">
 
 <!-- Go Menu -->
 
-<!ENTITY goMenu.label "Go">
-<!ENTITY goMenu.accesskey "G">
-<!ENTITY firstUnreadMsgCmd.label ".First Unread Message">
-<!ENTITY firstUnreadMsgCmd.accesskey "U">
-<!ENTITY firstFlaggedMsgCmd.label ".First Flagged Message">
-<!ENTITY firstFlaggedMsgCmd.accesskey "F">
-<!ENTITY nextMenu.label "Next">
-<!ENTITY nextMenu.accesskey "N">
-<!ENTITY nextMsgCmd.label "Message">
+<!ENTITY goMenu.label "Ir">
+<!ENTITY goMenu.accesskey "I">
+<!ENTITY nextMenu.label "Siguiente">
+<!ENTITY nextMenu.accesskey "S">
+<!ENTITY nextMsgCmd.label "Mensaje">
 <!ENTITY nextMsgCmd.accesskey "M">
 <!ENTITY nextMsgCmd.key "f">
-<!ENTITY nextUnreadMsgCmd.label "Unread Message">
-<!ENTITY nextUnreadMsgCmd.accesskey "U">
+<!ENTITY nextUnreadMsgCmd.label "Mensaje no leído">
+<!ENTITY nextUnreadMsgCmd.accesskey "n">
 <!ENTITY nextUnreadMsgCmd.key "n">
-<!ENTITY nextFlaggedMsgCmd.label "Flagged Message">
-<!ENTITY nextFlaggedMsgCmd.accesskey "F">
-<!ENTITY nextUnflaggedMsgCmd.label "Unflagged Message">
-<!ENTITY nextUnreadThread.label "Unread Thread">
-<!ENTITY nextUnreadThreadCmd.accesskey "T">
-<!ENTITY nextUnreadThreadCmd.key "t">
-<!ENTITY prevMenu.label "Previous">
-<!ENTITY prevMenu.accesskey "P">
-<!ENTITY prevMsgCmd.label "Message">
+<!ENTITY nextFlaggedMsgCmd.label "Mensaje destacado">
+<!ENTITY nextFlaggedMsgCmd.accesskey "M">
+<!ENTITY nextUnreadThread.label "Conversación no leída">
+<!ENTITY nextUnreadThread.accesskey "c">
+<!ENTITY nextUnreadThread.key "t">
+<!ENTITY prevMenu.label "Anterior">
+<!ENTITY prevMenu.accesskey "A">
+<!ENTITY prevMsgCmd.label "Mensaje">
 <!ENTITY prevMsgCmd.accesskey "M">
 <!ENTITY prevMsgCmd.key "b">
-<!ENTITY prevUnreadMsgCmd.label "Unread Message">
-<!ENTITY prevUnreadMsgCmd.accesskey "U">
+<!ENTITY prevUnreadMsgCmd.label "Mensaje no leído">
+<!ENTITY prevUnreadMsgCmd.accesskey "n">
 <!ENTITY prevUnreadMsgCmd.key "p">
-<!ENTITY goBackCmd.label "Back">
+<!ENTITY goBackCmd.label "Atrás">
+<!ENTITY goBackCmd.accesskey "t">
 <!ENTITY goBackCmd.commandKey "[">
-<!ENTITY goForwardCmd.label "Forward">
+<!ENTITY goForwardCmd.label "Adelante">
+<!ENTITY goForwardCmd.accesskey "A">
 <!ENTITY goForwardCmd.commandKey "]">
-<!ENTITY prevFlaggedMsgCmd.label "Flagged Message">
-<!ENTITY previousFlaggedMsgCmd.accesskey "F">
-<!ENTITY backCmd.label ".Back">
-<!ENTITY backCmd.accesskey "B">
-<!ENTITY forwardCmd.label ".Forward">
-<!ENTITY forwardCmd.accesskey "F">
-<!ENTITY startPageCmd.label "Mail Start Page">
-<!ENTITY startPageCmd.accesskey "S">
-<!ENTITY msgMenu.label "Message">
+<!ENTITY prevFlaggedMsgCmd.label "Mensaje destacado">
+<!ENTITY prevFlaggedMsgCmd.accesskey "M">
+<!ENTITY startPageCmd.label "Página de inicio del correo">
+<!ENTITY startPageCmd.accesskey "i">
+
+<!-- Message Menu -->
+<!ENTITY msgMenu.label "Mensaje">
 <!ENTITY msgMenu.accesskey "M">
-<!ENTITY newMsgCmd.label "New Message">
+<!ENTITY newMsgCmd.label "Nuevo mensaje">
 <!ENTITY newMsgCmd.accesskey "N">
-<!ENTITY newNewMsgCmd.label "Message">
+<!ENTITY newNewMsgCmd.label "Mensaje">
 <!ENTITY newNewMsgCmd.accesskey "M">
-<!ENTITY replyMsgCmd.label "Reply">
+<!ENTITY archiveMsgCmd.label "Archivar">
+<!ENTITY archiveMsgCmd.accesskey "A">
+<!ENTITY archiveMsgCmd.key "a">
+<!ENTITY replyMsgCmd.label "Responder">
 <!ENTITY replyMsgCmd.accesskey "R">
 <!ENTITY replyMsgCmd.key	"r">
-<!ENTITY replySenderCmd.label "Reply to Sender Only">
+<!ENTITY replySenderCmd.label "Responder sólo al remitente">
 <!ENTITY replySenderCmd.accesskey "R">
-<!ENTITY replyNewsgroupCmd.label "Reply to Newsgroup">
-<!ENTITY replyNewsgroupCmd.accesskey	"y">
-<!ENTITY replyToAllMsgCmd.label "Reply to All">
+<!ENTITY replyNewsgroupCmd.label "Responder al grupo de noticias">
+<!ENTITY replyNewsgroupCmd.accesskey	"g">
+<!ENTITY replyToAllMsgCmd.label "Responder a todos">
 <!ENTITY replyToAllMsgCmd.accesskey	"p">
 <!ENTITY replyToAllMsgCmd.key	"r">
-<!ENTITY replyToSenderAndNewsgroupCmd.label "Reply to Sender and Newsgroup">
+<!ENTITY replyToSenderAndNewsgroupCmd.label "Responder al remitente y grupo de noticas">
 <!ENTITY replyToSenderAndNewsgroupCmd.accesskey "p">
-<!ENTITY replyToAllRecipientsCmd.label "Reply to All Recipients">
-<!ENTITY replyToAllRecipientsCmd.accesskey "a">
-<!ENTITY forwardMsgCmd.label "Forward">
-<!ENTITY forwardMsgCmd.accesskey "F">
+<!ENTITY replyToAllRecipientsCmd.label "Responder a todos los destinatarios">
+<!ENTITY replyToAllRecipientsCmd.accesskey "R">
+<!ENTITY forwardMsgCmd.label "Reenviar">
+<!ENTITY forwardMsgCmd.accesskey "v">
 <!ENTITY forwardMsgCmd.key	"l">
-<!ENTITY forwardAsMenu.label "Forward As">
+<!ENTITY forwardAsMenu.label "Reenviar como">
 <!ENTITY forwardAsMenu.accesskey "o">
-<!ENTITY forwardAsInline.label "Inline">
+<!ENTITY forwardAsInline.label "Incorporado">
 <!ENTITY forwardAsInline.accesskey "I">
-<!ENTITY forwardAsAttachmentCmd.label "Attachment">
+<!ENTITY forwardAsAttachmentCmd.label "Adjunto">
 <!ENTITY forwardAsAttachmentCmd.accesskey "A">
-<!ENTITY editMsgAsNewCmd.label "Edit Message As New">
+<!ENTITY editMsgAsNewCmd.label "Editar mensaje como nuevo">
 <!ENTITY editMsgAsNewCmd.accesskey "E">
 <!ENTITY editMsgAsNewCmd.key "e">
-<!ENTITY createFilter.label "Create Filter From Message…">
+<!ENTITY createFilter.label "Crear filtro a partir del mensaje…">
 <!ENTITY createFilter.accesskey "a">
-<!ENTITY moveMsgMenu.label "Move">
-<!ENTITY moveMsgMenu.accesskey "M">
-<!ENTITY copyMessageLocation.label "Copy Message Location">
-<!ENTITY copyMessageLocation.accesskey "M">
-<!ENTITY copyMsgMenu.label "Copy">
-<!ENTITY copyMsgMenu.accesskey "C">
-<!ENTITY moveCopyMsgRecentMenu.label "Recent">
+<!ENTITY moveMsgToMenu.label "Mover a">
+<!ENTITY moveMsgToMenu.accesskey "M">
+<!ENTITY copyMessageLocation.label "Copiar dirección del mensaje">
+<!ENTITY copyMessageLocation.accesskey "m">
+<!ENTITY copyMsgToMenu.label "Copiar a">
+<!ENTITY copyMsgToMenu.accesskey "C">
+<!ENTITY moveCopyMsgRecentMenu.label "Reciente">
 <!ENTITY moveCopyMsgRecentMenu.accesskey "R">
-<!ENTITY killThreadMenu.label "Ignore Thread">
+<!ENTITY killThreadMenu.label "Ignorar conversación">
 <!ENTITY killThreadMenu.accesskey "I">
 <!ENTITY killThreadMenu.key "k">
-<!ENTITY killSubthreadMenu.label "Ignore Subthread">
-<!ENTITY killSubthreadMenu.accesskey "S">
+<!ENTITY killSubthreadMenu.label "Ignorar subconversación">
+<!ENTITY killSubthreadMenu.accesskey "s">
 <!ENTITY killSubthreadMenu.key "k">
-<!ENTITY watchThreadMenu.label "Watch Thread">
-<!ENTITY watchThreadMenu.accesskey "W">
+<!ENTITY watchThreadMenu.label "Observar conversación">
+<!ENTITY watchThreadMenu.accesskey "b">
 <!ENTITY watchThreadMenu.key "w">
-<!ENTITY fileHereMenu.label "File Here">
-<!ENTITY fileHereMenu.accesskey "F">
-<!ENTITY copyHereMenu.label "Copy Here">
+<!ENTITY fileHereMenu.label "Archivar aquí">
+<!ENTITY fileHereMenu.accesskey "A">
+<!ENTITY copyHereMenu.label "Copiar aquí">
 <!ENTITY copyHereMenu.accesskey "C">
-<!ENTITY addSenderToAddressBookCmd.label ".Add Sender to Address Book">
-<!ENTITY addSenderToAddressBookCmd.accesskey "S">
-<!ENTITY addAllToAddressBookCmd.label ".Add All to Address Book">
-<!ENTITY addAllToAddressBookCmd.accesskey "A">
-<!ENTITY tagMenu.label "Tag">
-<!ENTITY tagMenu.accesskey "g">
-<!ENTITY tagCustomize.label "Customize…">
-<!ENTITY tagCustomize.accesskey "C">
+<!ENTITY tagMenu.label "Etiqueta">
+<!ENTITY tagMenu.accesskey "E">
+<!ENTITY tagCustomize.label "Personalizar…">
+<!ENTITY tagCustomize.accesskey "P">
 <!ENTITY tagCmd0.key "0">
 <!ENTITY tagCmd1.key "1">
 <!ENTITY tagCmd2.key "2">
 <!ENTITY tagCmd3.key "3">
 <!ENTITY tagCmd4.key "4">
 <!ENTITY tagCmd5.key "5">
 <!ENTITY tagCmd6.key "6">
 <!ENTITY tagCmd7.key "7">
 <!ENTITY tagCmd8.key "8">
 <!ENTITY tagCmd9.key "9">
-<!ENTITY markMenu.label "Mark">
-<!ENTITY markMenu.accesskey "k">
-<!ENTITY markAsReadCmd.label "As Read">
-<!ENTITY markAsReadCmd.accesskey "R">
+<!ENTITY markMenu.label "Marcar">
+<!ENTITY markMenu.accesskey "c">
+<!ENTITY markAsReadCmd.label "Como leídos">
+<!ENTITY markAsReadCmd.accesskey "l">
 <!ENTITY markAsReadCmd.key "m">
-<!ENTITY markAsUnreadCmd.label "As Unread">
-<!ENTITY markAsUnreadCmd.accesskey "U">
-<!ENTITY markThreadAsReadCmd.label "Thread As Read">
-<!ENTITY markThreadAsReadCmd.accesskey "T">
+<!ENTITY markThreadAsReadCmd.label "Conversación como leída">
+<!ENTITY markThreadAsReadCmd.accesskey "C">
 <!ENTITY markThreadAsReadCmd.key "r">
-<!ENTITY markReadByDateCmd.label "As Read by Date…">
-<!ENTITY markReadByDateCmd.accesskey "D">
+<!ENTITY markReadByDateCmd.label "Como leídos por fecha…">
+<!ENTITY markReadByDateCmd.accesskey "d">
 <!ENTITY markReadByDateCmd.key "c">
-<!ENTITY markAllReadCmd.label "All Read">
-<!ENTITY markAllReadCmd.accesskey "A">
+<!ENTITY markAllReadCmd.label "Todos leídos">
+<!ENTITY markAllReadCmd.accesskey "T">
 <!ENTITY markAllReadCmd.key "c">
-<!ENTITY markFlaggedCmd.label "Flag">
-<!ENTITY markFlaggedCmd.accesskey "F">
+<!ENTITY markFlaggedCmd.label "Destacado">
+<!ENTITY markFlaggedCmd.accesskey "D">
 <!ENTITY markFlaggedCmd.key "i">
-<!ENTITY markAsJunkCmd.label "As Junk">
-<!ENTITY markAsJunkCmd.accesskey "J">
+<!ENTITY markAsJunkCmd.label "Como correo basura">
+<!ENTITY markAsJunkCmd.accesskey "s">
 <!ENTITY markAsJunkCmd.key "j">
-<!ENTITY markAsNotJunkCmd.label "As Not Junk">
-<!ENTITY markAsNotJunkCmd.accesskey "N">
+<!ENTITY markAsNotJunkCmd.label "Como correo normal">
+<!ENTITY markAsNotJunkCmd.accesskey "n">
 <!ENTITY markAsNotJunkCmd.key "j">
-<!ENTITY recalculateJunkScoreCmd.label "Run Junk Mail Controls">
-<!ENTITY recalculateJunkScoreCmd.accesskey "C">
-<!ENTITY markAsShowRemoteCmd.label "Show Remote Content">
+<!ENTITY recalculateJunkScoreCmd.label "Ejecutar controles de correo basura">
+<!ENTITY recalculateJunkScoreCmd.accesskey "c">
+<!ENTITY markAsShowRemoteCmd.label "Mostrar contenido remoto">
 <!ENTITY markAsShowRemoteCmd.accesskey "e">
 <!ENTITY markAsShowRemoteCmd.key "r">
-<!ENTITY markAsNotPhishCmd.label "As Not Scam">
-<!ENTITY markAsNotPhishCmd.accesskey "S">
+<!ENTITY markAsNotPhishCmd.label "No es fraude">
+<!ENTITY markAsNotPhishCmd.accesskey "s">
 <!ENTITY markAsNotPhishCmd.key "p">
-<!ENTITY openMessageWindowCmd.label "Open Message">
-<!ENTITY openMessageWindowCmd.accesskey "O">
+<!ENTITY openMessageWindowCmd.label "Abrir mensaje">
+<!ENTITY openMessageWindowCmd.accesskey "A">
 <!ENTITY openMessageWindowCmd.key "o">
+<!ENTITY openFeedMessage.label "Open Feed Message">
+<!ENTITY openFeedMessage.accesskey "O">
+<!ENTITY openFeedWebPageInWindow.label "Página web en nueva ventana">
+<!ENTITY openFeedWebPageInWindow.accesskey "w">
+<!ENTITY openFeedSummaryInWindow.label "Resumen en nueva ventana">
+<!ENTITY openFeedSummaryInWindow.accesskey "s">
+<!ENTITY openFeedWebPageInMP.label "Intercambiár página web y resumen en la vista de mensaje">
+<!ENTITY openFeedWebPageInMP.accesskey "t">
 
 <!-- Tools Menu -->
-<!ENTITY searchMailCmd.label "Search Messages…">
-<!ENTITY searchMailCmd.accesskey "M">
-<!ENTITY searchMailCmd.key "s">
-<!ENTITY searchAddressesCmd.label "Search Addresses…">
-<!ENTITY searchAddressesCmd.accesskey "S">
-<!ENTITY filtersCmd.label "Message Filters…">
+<!ENTITY searchMailCmd.label "Buscar mensajes…">
+<!ENTITY searchMailCmd.accesskey "B">
+<!ENTITY searchMailCmd.key "f">
+<!ENTITY searchAddressesCmd.label "Buscar direcciones…">
+<!ENTITY searchAddressesCmd.accesskey "s">
+<!ENTITY filtersCmd.label "Filtros de mensaje…">
 <!ENTITY filtersCmd.accesskey "F">
-<!ENTITY filtersApply.label "Run Filters on Folder">
-<!ENTITY filtersApply.accesskey "R">
-<!ENTITY filtersApplyToSelection.label "Run Filters on Selected Messages">
-<!ENTITY filtersApplyToSelection.accesskey "g">
-<!ENTITY filtersApplyToMessage.label "Run Filters on Message">
-<!ENTITY filtersApplyToMessage.accesskey "g">
-<!ENTITY runJunkControls.label "Run Junk Mail Controls on Folder">
+<!ENTITY filtersApply.label "Ejecutar filtros en la carpeta">
+<!ENTITY filtersApply.accesskey "r">
+<!ENTITY filtersApplyToSelection.label "Ejecutar filtros en los mensajes seleccionados">
+<!ENTITY filtersApplyToSelection.accesskey "s">
+<!ENTITY filtersApplyToMessage.label "Ejecutar filtros en el mensaje">
+<!ENTITY filtersApplyToMessage.accesskey "s">
+<!ENTITY runJunkControls.label "Ejecutar controles de correo basura en la carpeta">
 <!ENTITY runJunkControls.accesskey "u">
-<!ENTITY deleteJunk.label "Delete Mail Marked as Junk in Folder">
-<!ENTITY deleteJunk.accesskey "e">
-<!ENTITY importCmd.label "Import…">
-<!ENTITY importCmd.accesskey "I">
+<!ENTITY deleteJunk.label "Borrar mensajes marcados como basura en la carpeta">
+<!ENTITY deleteJunk.accesskey "B">
+<!ENTITY importCmd.label "Importar…">
+<!ENTITY importCmd.accesskey "p">
 
 <!-- Folder Pane -->
-<!ENTITY nameColumn.label "Name">
-<!ENTITY unreadColumn.label "Unread">
+<!ENTITY nameColumn.label "Nombre">
+<!ENTITY unreadColumn.label "No leídos">
 <!ENTITY totalColumn.label "Total">
 
 <!-- Toolbar items -->
-<!ENTITY getMsgButton.label "Get Msgs">
-<!ENTITY newMsgButton.label "Compose">
-<!ENTITY replyButton.label "Reply">
-<!ENTITY replyAllButton.label "Reply All">
-<!ENTITY forwardButton.label "Forward">
-<!ENTITY fileButton.label "File">
-<!ENTITY nextButton.label "Next">
-<!ENTITY goBackButton.label "Go Back">
-<!ENTITY goForwardButton.label "Go Forward">
-<!ENTITY deleteButton.label "Delete">
-<!ENTITY markButton.label "Mark">
-<!ENTITY printButton.label "Print">
-<!ENTITY stopButton.label "Stop">
-<!ENTITY junkButton.label "Junk">
-<!ENTITY notJunkButton.label "Not Junk">
+<!ENTITY getMsgButton.label "Recibir mensajes">
+<!ENTITY newMsgButton.label "Redactar">
+<!ENTITY newHTMLMessageCmd.label "Redactar en HTML">
+<!ENTITY newHTMLMessageCmd.accesskey "H">
+<!ENTITY newPlainTextMessageCmd.label "Redactar en texto plano">
+<!ENTITY newPlainTextMessageCmd.accesskey "p">
+<!ENTITY replyButton.label "Responder">
+<!ENTITY replyAllButton.label "Resp. a todos">
+<!ENTITY forwardButton.label "Reenviar">
+<!ENTITY fileButton.label "Archivo">
+<!ENTITY nextButton.label "Siguiente">
+<!ENTITY goBackButton.label "Atrás">
+<!ENTITY goForwardButton.label "Ir adelante">
+<!ENTITY deleteButton.label "Borrar">
+<!ENTITY undeleteButton.label "Recuperar">
+<!ENTITY markButton.label "Marcar">
+<!ENTITY printButton.label "Imprimir">
+<!ENTITY stopButton.label "Detener">
+<!ENTITY junkButton.label "Basura">
+<!ENTITY notJunkButton.label "No es basura">
 
 <!-- Tooltips -->
-<!ENTITY menuBar.tooltip "Menu Bar">
-<!ENTITY mailToolbar.tooltip "Mail Toolbar">
-<!ENTITY locationToolbar.tooltip "Location Toolbar">
-<!ENTITY advancedButton.tooltip "Advanced message search">
-<!ENTITY getMsgButton.tooltip "Get new messages">
-<!ENTITY newMsgButton.tooltip "Create a new message">
-<!ENTITY replyButton.tooltip "Reply to the message">
-<!ENTITY replyAllButton.tooltip "Reply to sender and all recipients">
-<!ENTITY replyAllButtonNews.tooltip "Reply to sender and newsgroup">
-<!ENTITY forwardButton.tooltip "Forward selected message">
-<!ENTITY fileButton.tooltip "File selected message">
-<!ENTITY nextButton.tooltip "Move to the next unread message">
-<!ENTITY goBackButton.tooltip "Go back one message">
-<!ENTITY goForwardButton.tooltip "Go forward one message">
-<!ENTITY deleteButton.tooltip "Delete selected message or folder">
-<!ENTITY markButton.tooltip "Mark messages">
-<!ENTITY printButton.tooltip "Print this message">
-<!ENTITY stopButton.tooltip "Stop the current transfer">
-<!ENTITY throbber.tooltip "Go to the &vendorShortName; home page">
-<!ENTITY junkButton.tooltip "Mark the selected messages as junk">
-<!ENTITY notJunkButton.tooltip "Mark the selected messages as not junk">
+<!ENTITY menuBar.tooltip "Barra de menú">
+<!ENTITY mailToolbar.tooltip "Barra de herramientas de correo">
+<!ENTITY locationToolbar.tooltip "Barra de navegación">
+<!ENTITY advancedButton.tooltip "Búsqueda avanzada de mensajes">
+<!ENTITY getMsgButton.tooltip "Recibir mensajes nuevos">
+<!ENTITY newMsgButton.tooltip "Crear nuevo mensaje">
+<!ENTITY replyButton.tooltip "Responder al mensaje">
+<!ENTITY replyAllButton.tooltip "Responder al remitente y a todos los destinatarios">
+<!ENTITY replyAllButtonNews.tooltip "Responder al remitente y al grupo de noticias">
+<!ENTITY forwardButton.tooltip "Reenviar mensaje seleccionado">
+<!ENTITY fileButton.tooltip "Archivar mensaje seleccionado">
+<!ENTITY nextButton.tooltip "Ir al siguiente mensaje no leído">
+<!ENTITY goBackButton.tooltip "Retroceder un mensaje">
+<!ENTITY goForwardButton.tooltip "Avanzar un mensaje">
+<!ENTITY deleteButton.tooltip "Borrar el mensaje o la carpeta seleccionados">
+<!ENTITY undeleteButton.tooltip "Recuperar mensaje borrado">
+<!ENTITY markButton.tooltip "Marcar mensajes">
+<!ENTITY printButton.tooltip "Imprimir este mensaje">
+<!ENTITY stopButton.tooltip "Detener la transferencia actual">
+<!ENTITY throbber.tooltip "Ir a la página web de &vendorShortName;">
+<!ENTITY junkButton.tooltip "Marcar los mensajes seleccionados como correo basura">
+<!ENTITY notJunkButton.tooltip "Marcar los mensajes seleccionados como correo normal">
 
 <!-- Statusbar -->
-<!ENTITY  statusText.label "Done">
-<!ENTITY  unreadCountText.label "Unread: ">
-<!ENTITY  totalCountText.label " Total: ">
+<!ENTITY  statusText.label "Terminado">
 
 <!-- Thread Pane Context Menu -->
-<!ENTITY contextOpenNewWindow.label "Open Message in New Window">
-<!ENTITY contextOpenNewWindow.accesskey "W">
-<!ENTITY contextEditAsNew.label "Edit As New…">
+<!ENTITY contextOpenNewWindow.label "Abrir el mensaje en una ventana nueva">
+<!ENTITY contextOpenNewWindow.accesskey "v">
+<!ENTITY contextOpenNewTab.label "Abrir el mensaje en una nueva pestaña">
+<!ENTITY contextOpenNewTab.accesskey "t">
+<!ENTITY contextEditAsNew.label "Editar como nuevo…">
 <!ENTITY contextEditAsNew.accesskey "E">
-<!ENTITY contextReplySender.label "Reply to Sender Only">
-<!ENTITY contextReplySender.accesskey "O">
-<!ENTITY contextReplyNewsgroup.label "Reply to Newsgroup">
-<!ENTITY contextReplyNewsgroup.accesskey "y">
-<!ENTITY contextReplyAll.label "Reply to All">
-<!ENTITY contextReplyAll.accesskey "R">
-<!ENTITY contextReplySenderAndNewsgroup.label "Reply to Sender and Newsgroup">
+<!ENTITY contextArchive.label "Archivar">
+<!ENTITY contextArchive.accesskey "A">
+<!ENTITY contextReplySender.label "Responder sólo al remitente">
+<!ENTITY contextReplySender.accesskey "R">
+<!ENTITY contextReplyNewsgroup.label "Responder al grupo de noticias">
+<!ENTITY contextReplyNewsgroup.accesskey "g">
+<!ENTITY contextReplyAll.label "Responder a todos">
+<!ENTITY contextReplyAll.accesskey "p">
+<!ENTITY contextReplySenderAndNewsgroup.label "Responder al remitente y grupo de noticas">
 <!ENTITY contextReplySenderAndNewsgroup.accesskey "p">
-<!ENTITY contextForward.label "Forward">
-<!ENTITY contextForward.accesskey "F">
-<!ENTITY contextForwardAsAttachment.label "Forward as Attachments">
+<!ENTITY contextForward.label "Reenviar">
+<!ENTITY contextForward.accesskey "v">
+<!ENTITY contextForwardAsAttachment.label "Reenviar como adjunto">
 <!ENTITY contextForwardAsAttachment.accesskey "o">
-<!ENTITY contextMoveMsgMenu.label "Move To">
+<!ENTITY contextMoveMsgMenu.label "Mover a">
 <!ENTITY contextMoveMsgMenu.accesskey "M">
-<!ENTITY contextCopyMsgMenu.label "Copy To">
+<!ENTITY contextCopyMsgMenu.label "Copiar a">
 <!ENTITY contextCopyMsgMenu.accesskey "C">
-<!ENTITY contextMoveCopyMsgRecentMenu.label "Recent">
+<!ENTITY contextMoveCopyMsgRecentMenu.label "Reciente">
 <!ENTITY contextMoveCopyMsgRecentMenu.accesskey "R">
-<!ENTITY contextSaveAs.label "Save As…">
-<!ENTITY contextSaveAs.accesskey "S">
-<!ENTITY contextPrint.label "Print…">
-<!ENTITY contextPrint.accesskey "P">
-<!ENTITY contextPrintPreview.label "Print Preview">
-<!ENTITY contextPrintPreview.accesskey "v">
+<!ENTITY contextSaveAs.label "Guardar como…">
+<!ENTITY contextSaveAs.accesskey "G">
+<!ENTITY contextPrint.label "Imprimir…">
+<!ENTITY contextPrint.accesskey "I">
+<!ENTITY contextPrintPreview.label "Vista preliminar">
+<!ENTITY contextPrintPreview.accesskey "V">
 
 <!-- Folder Pane Context Menu -->
-<!ENTITY folderContextGetMessages.label "Get Messages for Account">
-<!ENTITY folderContextGetMessages.accesskey "G">
-<!ENTITY folderContextOpenNewWindow.label "Open in New Mail Window">
-<!ENTITY folderContextOpenNewWindow.accesskey "W">
-<!ENTITY folderContextRename.label "Rename">
+<!ENTITY folderContextGetMessages.label "Recibir mensajes de la cuenta">
+<!ENTITY folderContextGetMessages.accesskey "j">
+<!ENTITY folderContextOpenNewWindow.label "Abrir">
+<!ENTITY folderContextOpenNewWindow.accesskey "b">
+<!ENTITY folderContextOpenNewTab.label "Abrir en nueva pestaña">
+<!ENTITY folderContextOpenNewTab.accesskey "t">
+<!ENTITY folderContextRename.label "Renombrar">
 <!ENTITY folderContextRename.accesskey "R">
-<!ENTITY folderContextRemove.label "Delete">
-<!ENTITY folderContextRemove.accesskey "D">
-<!ENTITY folderContextCompact.label "Compact This Folder">
-<!ENTITY folderContextCompact.accesskey "F">
-<!ENTITY folderContextEmptyTrash.label "Empty Trash">
-<!ENTITY folderContextEmptyTrash.accesskey "y">
-<!ENTITY folderContextEmptyJunk.label "Empty Junk">
-<!ENTITY folderContextEmptyJunk.accesskey "J">
-<!ENTITY folderContextSendUnsentMessages.label "Send Unsent Messages">
-<!ENTITY folderContextSendUnsentMessages.accesskey "d">
-<!ENTITY folderContextUnsubscribe.label "Unsubscribe">
-<!ENTITY folderContextUnsubscribe.accesskey "U">
-<!ENTITY folderContextMarkNewsgroupRead.label "Mark Newsgroup Read">
-<!ENTITY folderContextMarkNewsgroupRead.accesskey "k">
-<!ENTITY folderContextMarkMailFolderRead.label "Mark Folder Read">
-<!ENTITY folderContextMarkMailFolderRead.accesskey "k">
-<!ENTITY folderContextNew.label "New Subfolder…">
+<!ENTITY folderContextRemove.label "Borrar">
+<!ENTITY folderContextRemove.accesskey "B">
+<!ENTITY folderContextCompact.label "Compactar esta carpeta">
+<!ENTITY folderContextCompact.accesskey "m">
+<!ENTITY folderContextEmptyTrash.label "Vaciar papelera">
+<!ENTITY folderContextEmptyTrash.accesskey "p">
+<!ENTITY folderContextEmptyJunk.label "Vaciar basura">
+<!ENTITY folderContextEmptyJunk.accesskey "V">
+<!ENTITY folderContextSendUnsentMessages.label "Enviar mensajes pendientes…">
+<!ENTITY folderContextSendUnsentMessages.accesskey "n">
+<!ENTITY folderContextUnsubscribe.label "Cancelar suscripción">
+<!ENTITY folderContextUnsubscribe.accesskey "u">
+<!ENTITY folderContextMarkNewsgroupRead.label "Marcar grupo de noticias como leído">
+<!ENTITY folderContextMarkNewsgroupRead.accesskey "g">
+<!ENTITY folderContextMarkMailFolderRead.label "Marcar carpeta como leída">
+<!ENTITY folderContextMarkMailFolderRead.accesskey "l">
+<!ENTITY folderContextNew.label "Nueva subcarpeta…">
 <!ENTITY folderContextNew.accesskey "N">
-<!ENTITY folderContextSubscribe.label "Subscribe…">
+<!ENTITY folderContextSubscribe.label "Suscribirse…">
 <!ENTITY folderContextSubscribe.accesskey "b">
-<!ENTITY folderContextSearchMessages.label "Search Messages…">
-<!ENTITY folderContextSearchMessages.accesskey "S">
-<!ENTITY folderContextProperties.label "Properties…">
-<!ENTITY folderContextProperties.accesskey "P">
-<!ENTITY folderContextSettings.label "Settings…">
+<!ENTITY folderContextSearchMessages.label "Buscar…">
+<!ENTITY folderContextSearchMessages.accesskey "s">
+<!ENTITY folderContextProperties.label "Propiedades…">
+<!ENTITY folderContextProperties.accesskey "o">
+<!ENTITY folderContextSettings.label "Opciones…">
 <!ENTITY folderContextSettings.accesskey "e">
 
-<!-- Search Bar -->
-<!-- also used by addressbook -->
-<!ENTITY SearchSubjectOrFrom.label "Subject or From contains:">
-<!ENTITY SearchSubjectOrFrom.accesskey "S">
-<!ENTITY SearchNameOrEmail.label "Name or Email contains:">
-<!ENTITY SearchNameOrEmail.accesskey "N">
-<!ENTITY advancedButton.label "Advanced…">
+<!-- focusSearchInput.key also used by addressbook -->
+<!ENTITY focusSearchInput.key "k">
+<!ENTITY searchSubjectOrAddress.emptytext "Buscar asunto o dirección">
+<!ENTITY advancedButton.label "Avanzadas…">
 <!ENTITY advancedButton.accesskey "A">
 
-<!ENTITY all.label "All">
-<!ENTITY all.accesskey "A">
+<!ENTITY all.label "Todo">
+<!ENTITY all.accesskey "T">
 
 <!-- Junk Bar -->
-<!ENTITY junkBarMessage.label "&brandShortName; thinks this message is junk.">
-<!ENTITY junkBarButton.label "This is Not Junk">
+<!ENTITY junkBarMessage.label "&brandShortName; piensa que este mensaje es basura.">
+<!ENTITY junkBarButton.label "No es basura">
 <!ENTITY junkInfoButton.label "?">
 
 <!-- Remote Content Bar -->
-<!ENTITY remoteContentMessage.label "To protect your privacy, &brandShortName; has blocked remote content in this message.">
-<!ENTITY loadRemoteContentButton.label "Show Remote Content">
+<!ENTITY remoteContentMessage.label "Para proteger su privacidad, &brandShortName; bloqueó el contenido remoto de este mensaje.">
+<!ENTITY loadRemoteContentButton.label "Mostrar contenido remoto">
 
 <!-- Phishing Bar -->
-<!ENTITY phishingBarMessage.label "&brandShortName; thinks this message might be an email scam.">
-<!ENTITY removePhishingBarButton.label "Not a Scam">
+<!ENTITY phishingBarMessage.label "&brandShortName; piensa que este mensaje puede ser un intento de fraude.">
+<!ENTITY removePhishingBarButton.label "No es fraude">
--- a/suite/chrome/mailnews/messenger.properties
+++ b/suite/chrome/mailnews/messenger.properties
@@ -32,255 +32,252 @@
 # 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 *****
 
-#
 # The following are used by the messenger application
-#
-renameAccount=Rename Account…
-renameNewsAccount=Rename News Account…
-renameFolder=Rename Folder…
-compactFolder=Compact This Folder
-removeAccount=Delete Account…
-removeNewsAccount=Delete News Account…
-removeFolder=Delete Folder
-newFolderMenuItem=Folder…
-newSubfolderMenuItem=Subfolder…
-newFolder=New Folder…
-newSubfolder=New Subfolder…
-folderProperties=Folder Properties
-getNextNMessages=Get Next %S News Messages
-advanceNextPrompt=Advance to next unread message in %S?
-titleNewsPreHost=on
-titleMailPreHost=for
-replyToSender=Reply to Sender
-reply=Reply
-EMLFiles=Mail Files
-OpenEMLFiles=Open Message
+renameFolder=Renombrar carpeta…
+compactFolder=Compactar esta carpeta
+removeAccount=Borrar cuenta…
+removeFolder=Borrar carpeta
+newFolderMenuItem=Carpeta…
+newSubfolderMenuItem=Subcarpeta…
+newFolder=Nueva carpeta…
+newSubfolder=Nueva subcarpeta…
+folderProperties=Propiedades de carpeta
+getMessages=Obtener mensajes
+getMessagesFor=Obtener mensajes para la cuenta
+getNextNMessages=Obtener los siguientes %S mensajes
+advanceNextPrompt=¿Ir al siguiente mensaje no leído en %S?
+titleNewsPreHost=en
+titleMailPreHost=para
+replyToSender=Responder al remitente
+reply=Responder
+EMLFiles=Archivos de correo
+OpenEMLFiles=Abrir mensaje
 # LOCALIZATION NOTE(defaultSaveMessageAsFileName): Do not translate ".eml" 
 # in the line below.  Also, the complete file name should 8.3
-defaultSaveMessageAsFileName=message.eml
-SaveMailAs=Save Message As
-SaveAttachment=Save Attachment
-SaveAllAttachments=Save All Attachments
-LoadingMessageToPrint=Loading message to print…
-MessageLoaded=Message loaded…
-PrintingMessage=Printing message…
-PrintPreviewMessage=Print Previewing message…
-PrintingCard=Printing card…
-PrintPreviewCard=Print Previewing card…
-PrintingAddrBook=Printing AddressBook…
-PrintPreviewAddrBook=Print Previewing AddressBook…
-PrintingComplete=Done.
+defaultSaveMessageAsFileName=mensaje.eml
+SaveMailAs=Guardar mensaje como
+SaveAttachment=Guardar adjunto
+SaveAllAttachments=Guardar todos los adjuntos
+LoadingMessageToPrint=Cargando mensaje a imprimir…
+MessageLoaded=Mensaje cargado…
+PrintingMessage=Imprimiendo mensaje…
+PrintPreviewMessage=Mostrando vista previa de mensaje…
+PrintingContact=Imprimiendo contacto…
+PrintPreviewContact=Mostrando vista previa del contacto…
+PrintingAddrBook=Imprimiendo libreta de direcciones…
+PrintPreviewAddrBook=Mostrando vista previa de la libreta de direcciones…
+PrintingComplete=Terminado.
 PreviewTitle=%S - %S
-LoadingMailMsgForPrint=(Loading content for Printing)
-LoadingMailMsgForPrintPreview=(Loading content for Print Preview)
-saveAttachmentFailed=Unable to save the attachment. Please check your file name and try again later.
-saveMessageFailed=Unable to save the message. Please check your file name and try again later.
-notDownloaded=(Not Downloaded)
-fileExists=%S already exists. Do you want to replace it?
+LoadingMailMsgForPrint=(Cargando contenido para imprimir)
+LoadingMailMsgForPrintPreview=(Cargando contenido para vista previa)
+saveAttachmentFailed=Imposible guardar el adjunto. Por favor, compruebe el nombre del archivo y vuelva a intentar.
+saveMessageFailed=Imposible guardar el mensaje. Por favor, compruebe el nombre del archivo y vuelva a intentar.
+fileExists=%S ya existe. ¿Desea reemplazarlo?
 
-downloadingNewsgroups=Downloading Newsgroups for Offline Use
-downloadingMail=Downloading Mail for Offline Use
-sendingUnsent=Sending Unsent Messages
+downloadingNewsgroups=Descargando grupos de noticias para usar sin conexión
+downloadingMail=Descargando el correo para uso sin conexión
+sendingUnsent=Procesando mensajes no enviados
 
-folderExists=A folder with that name already exists. Please enter a different name.
-folderCreationFailed=The folder could not be created because the folder name you specified contains an unrecognized character. Please enter a different name and try again.
+folderExists=Ya existe una carpeta con ese nombre. Intente un nombre diferente.
+folderCreationFailed=La carpeta no pudo crearse porque el nombre que ha especificado contiene un caracter no reconocido. Intgrese un nombre diferente y vuelva a intentar.
 
-compactingFolder=Compacting folder %S…
-doneCompacting=Done compacting
-autoCompactAllFoldersTitle=Compact Folders
-autoCompactAllFolders=Do you wish to compact all local and offline folders to save disk space?
-autoCompactAllFoldersCheckbox=Do this automatically from now on.
+compactingFolder=Compactando la carpeta %S…
+doneCompacting=Compactado finalizado
+autoCompactAllFoldersTitle=Compactar carpetas
+autoCompactAllFolders=¿Desea compactar todas las carpetas locales y sin conexión para ahorrar espacio en disco?
+autoCompactAlwaysAskCheckbox=Preguntarme siempre antes de compactar carpetas automáticamente
+compactNowButton=Compactar a&hora
 
-confirmFolderDeletionForFilter=Deleting the folder '%S' will disable its associated filter(s). Are you sure you want to delete the folder?
-alertFilterChanged=Filters associated with this folder will be updated.
-filterDisabled=The folder '%S' could not be found, so filter(s) associated with this folder will be disabled. Verify that the folder exists, and that filters point to a valid destination folder.
-filterFolderDeniedLocked=The messages could not be filtered to folder '%S' because another operation is in progress.
-parsingFolderFailed=Unable to open the folder %S because it is in use by some other operation. Please wait for that operation to finish and then select the folder again. 
-deletingMsgsFailed=Unable to delete messages in folder %S because it is in use by some other operation. Please wait for that operation to finish and then try again.
-alertFilterCheckbox=Do not warn me again.
-compactFolderDeniedLock=The folder '%S' cannot be compacted because another operation is in progress. Please try again later.
-compactFolderWriteFailed=The folder '%S' could not be compacted because writing to folder failed. Verify that you have enough disk space, and that you have write privileges to the file system, then try again.
-filterFolderWriteFailed=The messages could not be filtered to folder '%S' because writing to folder failed. Verify that you have enough disk space, and that you have write privileges to the file system, then try again.
-copyMsgWriteFailed=The messages could not be moved or copied to folder '%S' because writing to folder failed. To gain disk space, from the File menu, first choose Empty Trash, and then choose Compact Folders, and then try again.
-cantMoveMsgWOBodyOffline=While working offline, you cannot move or copy messages that were not downloaded for offline use. From the Mail window, open the File menu, choose Offline, then uncheck Work Offline, and then try again.
-operationFailedFolderBusy=The operation failed because an other operation is using the folder. Please wait for that operation to finish and then try again.
-folderRenameFailed=The folder could not be renamed. Perhaps the folder is being reparsed, or the new name is not a valid folder name.
+confirmFolderDeletionForFilter=Al borrar la carpeta '%S' se desactivarán los filtros asociados. ¿Seguro que quiere borrar la carpeta?
+alertFilterChanged=Los filtros asociados con esta carpeta serán actualizados.
+filterDisabled=La carpeta '%S' no se pudo encontrar, por lo que los filtros asociados con esta carpeta serán desactivados. Compruebe que la carpeta existe, y que los filtros apuntan a una carpeta de destino válida.
+filterFolderDeniedLocked=Los mensajes no pudieron ser filtrados a la carpeta '%S' porque hay otra operación en curso.
+parsingFolderFailed=No se pudo abrir la carpeta %S porque ésta está en uso por alguna otra operación. Por favor, espere que termine esa operación y seleccione esa carpeta de nuevo. 
+deletingMsgsFailed=No se pudieron eliminar mensajes en la carpeta %S porque está en uso por alguna otra operación. Por favor, espere que esa operación concluya y vuelva a intentar.
+alertFilterCheckbox=No volver a avisarme.
+compactFolderDeniedLock=La carpeta '%S' no puede ser compactada porque hay otra operación en curso. Por favor, inténtelo más tarde.
+compactFolderWriteFailed=La carpeta '%S' no se pudo compactar porque falló la escritura en la carpeta. Compruebe que tiene suficiente espacio en disco y privilegios de escritura en el directorio, y vuelva a intentar.
+filterFolderWriteFailed=Los mensajes no pudieron ser filtrados a la carpeta '%S' porque falló la escritura a esa carpeta. Compruebe que tiene suficiente espacio en disco y permiso de escritura en el directorio, e inténtelo de nuevo.
+copyMsgWriteFailed=Los mensajes no han podido ser movidos o copiados a la carpeta '%S' porque falló la escritura en esa carpeta. Para conseguir más espacio, desde el menú Archivo, escoja primero Vaciar papelera, y luego escoja Compactar carpetas, y vuelva a intentar.
+cantMoveMsgWOBodyOffline=Cuando se encuentra en modo sin conexión, no puede mover o copiar mensajes que no hayan sido descargados para su uso sin conexión. Desde la ventana de Correo, abra el menú Archivo, escoja Sin conexión, y luego escoja Trabajar con conexión, y vuelva a intentar.
+operationFailedFolderBusy=La operación ha fallado porque otra operación está usando la carpeta. Por favor, espere a que ésta termine e inténtelo de nuevo.
+folderRenameFailed=No se pudo renombrar la carpeta. Tal vez la carpeta está siendo releída, o el nuevo nombre de la carpeta no es válido.
 # LOCALIZATION NOTE(verboseFolderFormat): %1$S is folder name, %2$S is server name
-verboseFolderFormat=%1$S on %2$S
+verboseFolderFormat=%1$S en %2$S
 # LOCALIZATION NOTE(filterFolderTruncateFailed): %1$S is replaced by the folder name, %2$S is replaced by the brandShortName
-filterFolderTruncateFailed=There was an error truncating the Inbox after filtering a message to folder '%1$S'. You may need to shutdown %2$S and delete INBOX.msf.
+filterFolderTruncateFailed=Ha sucedido un error al truncar la bandeja de entrada tras filtrar un mensaje a la carpeta '%1$S'. Puede que necesite cerrar %2$S y borrar INBOX.msf.
 
-mailboxTooLarge=The folder %S is full, and can't hold any more messages. To make room for more messages, delete any old or unwanted mail and compact the folder.
-errorGettingDB=Unable to open the summary file for '%S'. Perhaps there was an error on disk, or the full path is too long.
+mailboxTooLarge=La carpeta %S está llena y no puede contener ningún mensaje más. Para hacer lugar para más mensajes, borre los correos viejos o no deseados y compacte la carpeta.
+errorGettingDB=No se puede abrir el archivo resumen de %S. Quizás hubo un error en disco o la ruta completa es demasiado larga.
 
-defaultServerTag=(Default)
-useDefaultServer=Use default server
+defaultServerTag=(Predeterminado)
 
 # Used in message database list view to provide a text value for graphic based cells.
-messageUnread=Unread
-messageHasFlag=Flagged
-messageHasAttachment=Has Attachment
-messageJunk=Junk
-messageExpanded=Expanded
-messageCollapsed=Collapsed
+messageUnread=No leído
+messageHasFlag=Destacado
+messageHasAttachment=Tiene adjunto
+messageJunk=Basura
+messageExpanded=Expandido
+messageCollapsed=Colapsado
 
 # Used in the SMTP Account Settings panel when a server value has no properties
-smtpServerList-NotSpecified=<not specified>
-smtpServer-SecureConnection-Type_0=No
-smtpServer-SecureConnection-Type_1=STARTTLS, if available
-smtpServer-SecureConnection-Type_2=STARTTLS
-smtpServer-SecureConnection-Type_3=SMTP-over-SSL
+smtpServerList-NotSpecified=<no especificado>
+smtpServer-ConnectionSecurityType-0=Ninguno
+smtpServer-ConnectionSecurityType-1=STARTTLS, si esta disponible
+smtpServer-ConnectionSecurityType-2=STARTTLS
+smtpServer-ConnectionSecurityType-3=SSL/TLS
 smtpServer-SecureAuthentication-Type-false=No
-smtpServer-SecureAuthentication-Type-true=Yes
-smtpServers-confirmServerDeletionTitle=Delete Server
-smtpServers-confirmServerDeletion=Are you sure you want to delete the server: \n %S?
+smtpServer-SecureAuthentication-Type-true=Sí
+smtpServers-confirmServerDeletionTitle=Borrar servidor
+smtpServers-confirmServerDeletion=¿Seguro desea borrar el servidor: \n %S?
 
 # LOCALIZATION NOTE(serverType-nntp): Do not translate "NNTP" in the line below
-serverType-nntp=News Server (NNTP)
+serverType-nntp=Servidor de noticias (NNTP)
 # LOCALIZATION NOTE(serverType-pop3): Do not translate "POP" in the line below
-serverType-pop3=POP Mail Server
+serverType-pop3=Servidor de correo POP
 # LOCALIZATION NOTE(serverType-imap): Do not translate "IMAP" in the line below
-serverType-imap=IMAP Mail Server
-serverType-none=Local Mail Store
+serverType-imap=Servidor de correo IMAP
+serverType-none=Almacén de correo local
 # LOCALIZATION NOTE(serverType-movemail): DONT_TRANSLATE
-serverType-movemail=Unix Movemail
+serverType-movemail=Movemail unix
 
-sizeColumnTooltip=Click to sort by size
-sizeColumnHeader=Size
-linesColumnTooltip=Click to sort by lines
-linesColumnHeader=Lines
+sizeColumnTooltip=Haga clic para ordenar por tamaño
+sizeColumnHeader=Tamaño
+linesColumnTooltip=Haga clic para ordenar por número de líneas
+linesColumnHeader=Líneas
 
 # status feedback stuff
 documentDone=
-documentLoading=Loading Message…
+documentLoading=Cargando mensaje…
 
-unreadMsgStatus=Unread: %S
-selectedMsgStatus=Selected: %S
+unreadMsgStatus=Sin leer: %S
+selectedMsgStatus=Seleccionado: %S
 totalMsgStatus=Total: %S
 
 # localized folder names
 
-localFolders=Local Folders
+localFolders=Carpetas locales
 
 # LOCALIZATION NOTE (inboxFolderName): OK to translate all foldernames, bugzilla #57440 & bugzilla #23625 fixed
-inboxFolderName=Inbox
-trashFolderName=Trash
-sentFolderName=Sent
-draftsFolderName=Drafts
-templatesFolderName=Templates
-outboxFolderName=Outbox
-junkFolderName=Junk
+inboxFolderName=Bandeja de entrada
+trashFolderName=Papelera
+sentFolderName=Enviados
+draftsFolderName=Borradores
+templatesFolderName=Plantillas
+outboxFolderName=Bandeja de salida
+junkFolderName=Basura
+archivesFolderName=Archivados
 
 # Error message for special folder deletion on imap accounts
 # LOCALIZATION NOTE (specialFolderDeletionErr): Do not translate "IMAP" in the line below
-specialFolderDeletionErr=Deletion of special folder %S is not allowed for IMAP accounts.
-specialFolderDeletionErrTitle=Special Folder Deletion
+specialFolderDeletionErr=No se permite borrar la carpeta especial %S en cuentas IMAP
+specialFolderDeletionErrTitle=Borrado de carpeta especial
 
 # "Normal" priority is often blank,
 # depending on the consumers of these strings
-priorityLowest=Lowest
-priorityLow=Low
+priorityLowest=La más baja
+priorityLow=Baja
 priorityNormal=Normal
-priorityHigh=High
-priorityHighest=Highest
+priorityHigh=Alta
+priorityHighest=La más alta
 
 #Group by date thread pane titles
-today=Today
-yesterday=Yesterday
-lastWeek=Last Week
-twoWeeksAgo=Two Weeks Ago
-older=Old Mail
+today=Hoy
+yesterday=Ayer
+lastWeek=La semana pasada
+twoWeeksAgo=Hace dos semanas
+older=Correo antiguo
 
 #Grouped By Tags
-untaggedMessages=Untagged Messages
+untaggedMessages=Mensajes sin etiqueta
 
 # Grouped by status
-messagesWithNoStatus=No Status
+messagesWithNoStatus=Sin estado
 
 #Grouped by priority
-noPriority=No Priority
+noPriority=Sin prioridad
 
 #Grouped by has attachments
-noAttachments=No Attachments
-attachments=Attachments
+noAttachments=Sin adjuntos
+attachments=Adjuntos
 
 #Grouped by flagged
-notFlagged=Not Flagged
-groupFlagged=Flagged
+notFlagged=No destacado
+groupFlagged=Destacado
 
 # defaults descriptions for tag prefs listed in mailnews.js
 # (we keep the .labels. names for backwards compatibility)
-mailnews.tags.remove=Remove All Tags
-mailnews.labels.description.1=Important
-mailnews.labels.description.2=Work
+mailnews.tags.remove=Eliminar todas las etiquetas
+mailnews.labels.description.1=Importante
+mailnews.labels.description.2=Trabajo
 mailnews.labels.description.3=Personal
-mailnews.labels.description.4=To Do
-mailnews.labels.description.5=Later
+mailnews.labels.description.4=Por hacer
+mailnews.labels.description.5=Más tarde
 
 # Format definition tag menu texts.
 # This is necessary in order to get the accesskeys to be the on the first
 # character of the menu text instead of after the menu text.
 # If a key definition exists for the tag at index n, that key's key will be
 # taken as the accesskey, eg.
 #   <key id="key_tag3" key="&tagCmd3.key;" oncommand="ToggleMessageTagKey(3);"/>
 # makes the third tag have the accesskey &tagCmd3.key;.
 # In the menuitem's label, this accesskey appears at %1$S below; %2$S will be
 # replaced by the tag label.
 mailnews.tags.format=%1$S %2$S
 
-replied=Replied
-forwarded=Forwarded
-new=New
-read=Read
-flagged=Flagged
+replied=Respondido
+forwarded=Reenviado
+new=Nuevo
+read=Leído
+flagged=Destacado
 
 # for junk status picker in search and mail views
-junk=Junk
+junk=Basura
 
 # for junk score origin picker in search and mail views
 junkScoreOriginPlugin=Plugin
-junkScoreOriginFilter=Filter
-junkScoreOriginWhitelist=Whitelist
-junkScoreOriginUser=User
-junkScoreOriginImapFlag=IMAP Flag
+junkScoreOriginFilter=Filtro
+junkScoreOriginWhitelist=Lista blanca
+junkScoreOriginUser=Usuario
+junkScoreOriginImapFlag=Bandera IMAP
 
 # for the has attachment picker in search and mail views
-hasAttachments=Has Attachments
+hasAttachments=Tiene adjuntos
 
 # for the Tag picker in search and mail views.
-tag=Tag
+tag=Etiquetas
 
 # mailnews.js
 mailnews.send_default_charset=ISO-8859-1
 mailnews.view_default_charset=ISO-8859-1
 
 # generate display names in last first order
 # valid mail.addr_book.displayName.lastnamefirst are: true or false
-mail.addr_book.displayName.lastnamefirst=false
+mail.addr_book.displayName.lastnamefirst=falso
 
 # the format for "mail.addr_book.quicksearchquery.format" is:
 # @V == the escaped value typed in the quick search bar in the addressbook
 #
 # note, changing this might require a change to SearchNameOrEmail.label
 # in messenger.dtd
 #
 # LOCALIZATION NOTE - please add phonetic names as below when "mail.addr_book.show_phonetic_fields" is true
 # "?(or(PrimaryEmail,c,@V)(DisplayName,c,@V)(FirstName,c,@V)(LastName,c,@V)(PhoneticFirstName,c,@V)(PhoneticLastName,c,@V))"
 #
 mail.addr_book.quicksearchquery.format=?(or(PrimaryEmail,c,@V)(DisplayName,c,@V)(FirstName,c,@V)(LastName,c,@V))
 
 # valid mail.addr_book.show_phonetic_fields are: true or false
-mail.addr_book.show_phonetic_fields=false
+mail.addr_book.show_phonetic_fields=falso
 
 # valid format options are:
 # 1: yyyy/mm/dd
 # 2: yyyy/dd/mm
 # 3: mm/dd/yyyy
 # 4: mm/yyyy/dd
 # 5: dd/mm/yyyy
 # 6: dd/yyyy/mm
@@ -291,127 +288,151 @@ mail.addr_book.show_phonetic_fields=fals
 #
 mailnews.search_date_format=0
 # separator for search date (e.g. "/", "-"), or empty when search_date_format is zero
 mailnews.search_date_separator=
 # leading zeros for day and month values, not used if mailnews.search_date_format is not zero
 mailnews.search_date_leading_zeros=true
 
 # offline msg 
-nocachedbodybody=The body of this message has not been downloaded from \
-the server for reading offline. To read this message, \
-you must reconnect to the network, choose Offline from \
-the File menu and then uncheck Work Offline.\
-In the future, you can select which messages or folders to read offline. To do \
-this, choose Offline from the file menu and then select Synchronize. You can \
-adjust the Disk Space preference to prevent the downloading of large messages.
+nocachedbodybody=El cuerpo de este mensaje no se ha descargado desde el servidor para leerlo sin conexión. Para leer este mensaje, debe volver a conectarse, elegir Sin conexión en el menú Archivo y luego elegir Trabajar con conexión. En el futuro, puede seleccionar qué mensajes o carpetas leer sin conexión. Para ello, elija Sin conexión en el menú Archivo y luego Sincronizar. Puede ajustar las preferencias de espacio en disco para evitar descargar mensajes largos.
 
 # accountCentral
 mailnews.account_central_page.url=chrome://messenger/content/msgAccountCentral.xul
 # LOCALIZATION NOTE(acctCentralTitleFormat): %1$S is brand, %2$S is account type, %3$S is account name
 acctCentralTitleFormat=%1$S %2$S - %3$S
-mailAcctType=Mail
-newsAcctType=News
+mailAcctType=Correo
+newsAcctType=Noticias
 
 # LOCALIZATION NOTE(nocachedbodytitle): Do not translate "<TITLE>" or "</TITLE>" in the line below
-nocachedbodytitle=<TITLE>Go Online to View This Message</TITLE>\n
+nocachedbodytitle=<TITLE>Pasar a modo con conexión para ver este mensaje</TITLE>
 
 # mailWindowOverlay.js
-confirmUnsubscribeTitle=Confirm Unsubscribe
-confirmUnsubscribeText=Are you sure you want to unsubscribe from %S?
-cannotHaveTwoFilterRulesDialogs=Filter Rules Dialog
-cannotHaveTwoFilterRulesText=The filter cannot be created because the Filter Rules dialog is already in use. Please close the dialog and try again.
+confirmUnsubscribeTitle=Confirmar la cancelación de la suscripción
+confirmUnsubscribeText=¿Está seguro de querer cancelar la suscripción a %S?
 
 # msgHdrViewOverlay.js
-deleteAttachments=The following attachments will be permanently deleted from this message:\n%S\nThis action cannot be undone. Do you wish to continue?
-detachAttachments=The following attachments have been successfully saved and will now be permanently deleted from this message:\n%S\nThis action cannot be undone. Do you wish to continue?
-deleteAttachmentFailure=Failed to delete the selected attachments.
-# LOCALIZATION NOTE(attachmentDeletePrefix): Do not translate until foreign language attachment names are fixed
-attachmentDeletePrefix=Deleted: %S
+deleteAttachments=Los siguientes adjuntos serán permanentemente borrados de este mensaje:\n%S\nEsta acción no puede deshacerse. ¿Desea continuar?
+detachAttachments=Los siguientes adjuntos han sido guardados exitosamente y ahora serán permanentemente borrados de este mensaje:\n%S\nEsta acción no puede deshacerse. ¿Desea continuar?
+deleteAttachmentFailure=Falló el borrado de los adjuntos seleccionados.
 
 # 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
 
 # Connection Error Messages
-101=Unknown Error 
-102=Failed to connect to server %S.
-103=Could not connect to server %S; the connection was refused.
-104=Connection to server %S timed out.
-
-recipientSearchCriteria=Subject or Recipient contains:
-fromSearchCriteria=Subject or From contains:
+101=Error desconocido 
+102=Falló la conexión con el servidor %S.
+103=No se pudo conectar con el servidor %S; la conexión fue rechazada.
+104=El tiempo de espera para el servidor se ha agotado.
 
 # LOCALIZATION NOTE(biffNotification): %1$S is the number of new messages  
-biffNotification_message=has %1$S new message
-biffNotification_messages=has %1$S new messages
+biffNotification_message=tiene %1$S mensaje nuevo
+biffNotification_messages=tiene %1$S mensajes nuevos
+
+# LOCALIZATION NOTE(macBiffNotification is Mac only):
+#  %1$S is the number of new messages
+#  %2$S is a list of names and/or email addresses separated by biffNotification_separator
+#  %3$S is the number of new messages not displayed in the biff alert
+macBiffNotification_message=%1$S nuevo mensaje de %2$S.
+macBiffNotification_messages=%1$S nuevos mensajes de %2$S.
+macBiffNotification_messages_extra=%1$S nuevos mensajes de %2$S y %3$S más.
+# Used to separate names/email addresses in a list.  Note the trailing space ', '
+macBiffNotification_separator=,\u0020
 
 # For the Quota tab in the mail folder properties dialog
-quotaUsedFree=%S of %S KB used
-quotaPercentUsed=%S%% full
+quotaUsedFree=%S de %S KB usados
+quotaPercentUsed=%S%% lleno
 
 # for message views
-confirmViewDeleteTitle=Confirm
-confirmViewDeleteMessage=Are you sure you want to delete this view?
+confirmViewDeleteTitle=Confirmar
+confirmViewDeleteMessage=¿Está seguro de querer borrar esta vista?
 
 # for virtual folders
-confirmSavedSearchDeleteMessage=Are you sure you want to delete this saved search?
+confirmSavedSearchDeleteMessage=¿Está seguro de querer borrar esta búsqueda guardada?
 
 ## @name ENTER_PASSWORD_PROMPT
 ## @loc None
 # LOCALIZATION NOTE (passwordPrompt): Do not translate the word %S below.
 # Place the word "%S" in your translation where the email address
 # or the username should appear
-passwordPrompt=Enter your password for %1$S on %2$S:
+passwordPrompt=Ingrese su contraseña para %1$S en %2$S:
 
 ## @name ENTER_PASSWORD_PROMPT_TITLE
 ## @loc None
-passwordTitle=Mail Server Password Required
+passwordTitle=Contraseña para el servidor de correo requerida
 
 # for checking if the user really wants to open lots of messages
-openWindowWarningTitle=Confirm
-openWindowWarningText=Opening %S messages may be slow.  Continue?
+openWindowWarningTitle=Confirmar
+openWindowWarningText=Abrir %S mensajes puede resultar lento. ¿Continuar?
 
 # for warning the user that a tag he's trying to create already exists
-tagExists=A tag with that name already exists!
+tagExists=Ya existe una etiqueta con ese nombre.
 
 # for checking if the user really wants to delete the adaptive filter training set
-confirmResetJunkTrainingTitle=Confirm
-confirmResetJunkTrainingText=Are you sure you want to reset the adaptive filter training data?
+confirmResetJunkTrainingTitle=Confirmar
+confirmResetJunkTrainingText=¿Está seguro de querer reiniciar los datos de entrenamiento del filtro adaptivo?
 
 # for the virtual folder list dialog title
 # %S is the name of the saved search folder
-editVirtualFolderPropertiesTitle=Edit Saved Search Properties for %S
+editVirtualFolderPropertiesTitle=Editar las propiedades de la búsqueda %S
 
 #alert to inform the user to choose one or more folders to search for a saved search folder
-alertNoSearchFoldersSelected=You must choose at least one folder to search for the saved search folder.
+alertNoSearchFoldersSelected=Debe elegir al menos una carpeta en la que buscar para guardar la búsqueda:
 
 # These two are displayed in the message and folder pane windows
 # LOCALIZATION NOTE(????ByteAbbreviation): Do not translate %d below, it is the size of the message/folder
 kiloByteAbbreviation=%dKB
 megaByteAbbreviation=%dMB
 
 # Error message if message for a message id wasn't found
-errorOpenMessageForMessageIdTitle=Error opening message-id
-errorOpenMessageForMessageIdMessage=Message for message-id %S not found
+errorOpenMessageForMessageIdTitle=Error abriendo message-id
+errorOpenMessageForMessageIdMessage=Mensaje para message-id %S no encontrado
 
 # Warnings to alert users about phishing urls
-confirmPhishingTitle=Email Scam Alert
+confirmPhishingTitle=Alerta de estafa por correo electrónico
 #LOCALIZATION NOTE %1$S is the brand name, %2$S is the host name of the url being visited
-confirmPhishingUrl1=%1$S thinks this site is suspicious! It may be trying to impersonate the web page you want to visit. Most legitimate sites use names instead of numbers. Are you sure you want to visit %2$S?
-confirmPhishingUrl2=%1$S thinks this site is suspicious! It may be trying to impersonate the web page you want to visit. Are you sure you want to visit %2$S?
+confirmPhishingUrl1=¡%1$S piensa que este sitio es sospechoso! Puede estar intentando imitar la página web que este intentando visitar. La mayoría de lo sitios legítimos usan nombres en lugar de números. ¿Está seguro de querer visitar %2$S?
+confirmPhishingUrl2=¡%1$S piensa que este sitio es sospechoso! Puede estar intentando imitar la página web que quiere visitar. ¿Está seguro que quiere visitar la página %2$S?
 
 #LOCALIZATION NOTE %1$S is the e-mail address of the person we will allow remote content for
-alwaysLoadRemoteContentForSender=Click here to always load remote content from %1$S.
+alwaysLoadRemoteContentForSender=Haga clic aquí si siempre quiere cargar el contenido remoto de %1$S.
+
+# Strings for growl notifications on Mac OS X
+growlNotification=Correo nuevo
 
 # mailCommands.js
-emptyJunkTitle=Confirm
-emptyJunkMessage=Are you sure you want to permanently delete all messages and subfolders in the Junk folder?
-emptyJunkDontAsk=Don't ask me again.
-emptyTrashTitle=Confirm
-emptyTrashMessage=Are you sure you want to permanently delete all messages and subfolders in the Trash folder?
-emptyTrashDontAsk=Don't ask me again.
+emptyJunkTitle=Confirmar
+emptyJunkMessage=¿Está seguro de querer borrar todos los mensajes y subcarpetas de la carpeta Basura de forma permanente?
+emptyJunkDontAsk=No preguntar nuevamente.
+emptyTrashTitle=Confirmar
+emptyTrashMessage=¿Está seguro de querer borrar todos los mensajes y subcarpetas de la Papelera de forma permanente?
+emptyTrashDontAsk=No preguntar nuevamente.
 
 # junkCommands.js
-junkAnalysisPercentComplete=Junk analysis %S complete
-processingJunkMessages=Processing Junk Messages
+junkAnalysisPercentComplete=Análisis de basura %S completo
+processingJunkMessages=Procesando mensajes basura
+
+# tabmail: warning when closing multiple tabs (as in browser)
+tabs.closeWarningTitle=Confirmar cierre
+tabs.closeWarning=Esta ventana de mensaje tiene %S pestañas abiertas. ¿Desea cerrarla con todas sus pestañas?
+tabs.closeButton=Cerrar todas las pestañas
+tabs.closeWarningPromptMe=Preguntarme cuando cierre múltiples pestañas de mensaje.
+
+# Messenger bootstrapping messages
+fileNotFoundTitle = Archivo no encontrado
+#LOCALIZATION NOTE(fileNotFoundMsg): %S is the filename
+fileNotFoundMsg = El archivo %S no existe.
+
+applyToCollapsedMsgsTitle=Confirmar borrado de mensajes en conversaciones colapsadas
+applyToCollapsedMsgs=Advertencia - ésto borrará mensajes en conversaciones colapsadas
+applyToCollapsedAlwaysAskCheckbox=Preguntarme antes de borrar mensajes en conversaciones colapsadas
+applyNowButton=Aplicar
+
+mailServerLoginFailedTitle=Ingreso fallido
+# LOCALIZATION NOTE (mailServerLoginFailedTitle): Insert "%S" in your
+# translation where you wish to display the hostname of the server to which
+# login failed.
+mailServerLoginFailed=La identificación con el servidor %S es incorrecta
+mailServerLoginFailedRetryButton=&Reintentar
+mailServerLoginFailedEnterNewPasswordButton=Ingr&ese nueva contraseña
--- a/suite/chrome/mailnews/mime.properties
+++ b/suite/chrome/mailnews/mime.properties
@@ -33,32 +33,16 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 #
 # The following are used by libmime to emit header display in HTML
 #
 
-# Out of memory
-## @name MIME_OUT_OF_MEMORY
-## @loc None
--1000=Application is out of memory.
-
-# Can't open a temp file
-## @name MIME_UNABLE_TO_OPEN_TMP_FILE
-## @loc None
-# LOCALIZATION NOTE (-1001): Do not translate "\n%.200s.\n\n" below. It will display the name of the temporary directory
--1001=Unable to open the temporary file\n%.200s.\n\n\Check your `Temporary Directory' setting and try again.
-
-# Can't write temp file
-## @name MIME_ERROR_WRITING_FILE
-## @loc None
--1002=Error writing temporary file.
-
 # Mail subject
 ## @name MIME_MHTML_SUBJECT
 ## @loc None
 1000=Subject
 
 # Resent-Comments
 ## @name MIME_MHTML_RESENT_COMMENTS
 ## @loc 
@@ -136,127 +120,41 @@ 1014=Newsgroups
 ## @loc 
 1015=Followup-To
 
 # References
 ## @name MIME_MHTML_REFERENCES
 ## @loc 
 1016=References
 
-# Name
-## @name MIME_MHTML_NAME
-## @loc 
-1017=Name
-
-# Type
-## @name MIME_MHTML_TYPE
-## @loc 
-1018=Type
-
-# Encoding
-## @name MIME_MHTML_ENCODING
-## @loc 
-1019=Encoding
-
-# Description
-## @name MIME_MHTML_DESCRIPTION
-## @loc 
-1020=Description
-
 # Message ID
 ## @name MIME_MHTML_MESSAGE_ID
 ## @loc 
 1021=Message-ID
 
-# Resent Message ID
-## @name MIME_MHTML_RESENT_MESSAGE_ID
-## @loc 
-1022=Resent-Message-ID
-
 # BCC
 ## @name MIME_MHTML_BCC
 ## @loc 
 1023=BCC
 
-# Download Status
-## @name MIME_MHTML_DOWNLOAD_STATUS_HEADER
-## @loc 
-1024=Download Status
-
-# Download status not downloaded
-## @name MIME_MHTML_DOWNLOAD_STATUS_NOT_DOWNLOADED
-## @loc 
-1025=Not Downloaded Inline
-
 # Link to doc
 ## @name MIME_MSG_LINK_TO_DOCUMENT
 ## @loc 
 1026=Link to Document
 
 # Get Doc info
 ## @name MIME_MSG_DOCUMENT_INFO
 ## @loc 
 1027=<B>Document Info:</B>
 
 # Msg Attachment
 ## @name MIME_MSG_ATTACHMENT
 ## @loc 
 1028=Attachment
 
-# Forwarded Msg Attachment
-## @name MIME_FORWARDED_MESSAGE_ATTACHMENT
-## @loc 
-# LOCALIZATION NOTE (1029): DONT_TRANSLATE.
-1029=forward.msg
-
-# Mouseover text
-## @name MIME_MSG_ADDBOOK_MOUSEOVER_TEXT
-## @loc 
-# LOCALIZATION NOTE (1030): Do not translate "%s" below. Place "%s" where you wish to appear a name to be
-# added to the address book.
-1030=Add %s to your Address Book
-
-# XSender Internal
-## @name MIME_MSG_XSENDER_INTERNAL
-## @loc
-# LOCALIZATION NOTE (1031): Only translate the word "Internal in the line below".
-1031=<B><FONT COLOR=\042#808080\042>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Internal</FONT></B>
-
-# User wrote
-## @name MIME_MSG_X_USER_WROTE
-## @loc 
-# LOCALIZATION NOTE (1032): Do not translate "%s" below.
-# Place the first %s where you wish the name of the message to appear
-# Place the second %s where you wish the name of the user to appear
-# Do not translate "<P>"
-1032=In message %s %s wrote:<P>
-
-# Msg user wrote
-## @name MIME_MSG_USER_WROTE
-## @loc 
-# LOCALIZATION NOTE (1033): Do not translate "%s" below.
-# Place the %s where you wish the name of the user to appear
-# Do not translate "<P>"
-1033=%s wrote:<P>
-
-# No Headers
-## @name MIME_MSG_NO_HEADERS
-## @loc 
-1034=(no headers)
-
-# No Headers
-## @name MIME_MSG_SHOW_ATTACHMENT_PANE
-## @loc 
-1035=Toggle Attachment Pane
-
-# Part not downloaded
-## @name MIME_MSG_NOT_DOWNLOADED
-## @loc 
-1036=(Not Downloaded)
-
 # Partial Message Format 1
 ## @name MIME_MSG_PARTIAL_FMT_1
 ## @loc
 # LOCALIZATION NOTE (1037): In the following line, translate only the word, "Truncated!".
 1037=<P><CENTER><TABLE BORDER CELLSPACING=5 CELLPADDING=10 WIDTH="80%%"><TR><TD ALIGN=CENTER><FONT SIZE="+1"><B>Truncated!</B></FONT><HR>
 
 # Partial Message Format 2
 ## @name MIME_MSG_PARTIAL_FMT_2
@@ -283,25 +181,25 @@ 1040=Part %s
 # default forwarded message prefix
 ## @name MIME_FORWARDED_MESSAGE_USER_WROTE
 ## @loc 
 1041=-------- Original Message --------
 
 # Partial Message Format2 1
 ## @name MIME_MSG_PARTIAL_FMT2_1
 ## @loc
-# LOCALIZATION NOTE (1037): In the following line, translate only the words, "Not Downloaded".
+# LOCALIZATION NOTE (1042): In the following line, translate only the words, "Not Downloaded".
 1042=<P><CENTER><TABLE BORDER CELLSPACING=5 CELLPADDING=10 WIDTH="80%%"><TR><TD ALIGN=CENTER><FONT SIZE="+1"><B>Not Downloaded</B></FONT><HR>
 
 # Partial Message Format2 2
 ## @name MIME_MSG_PARTIAL_FMT2_2
 ## @loc
-# LOCALIZATION NOTE (1038): Translate the following two lines as a single sentence. In the middle of the two sections
+# LOCALIZATION NOTE (1043): Translate the following two lines as a single sentence. In the middle of the two sections
 # there will be a URL. You may translate the text in any order you wish, but the html tags must stay in the same locations.
 # In particular, the "<B>" tag must begin the first section, which must end with the "<A HREF=" tag. Do not translate the html tag,"<P>"
 1043=<B>Only the headers for this message were downloaded from the mail server.<P>Click <A HREF="
 
 # Partial Message Format2 3
-## @name MIME_MSG_PARTIAL_FMT_3
+## @name MIME_MSG_PARTIAL_FMT2_3
 ## @loc
-# LOCALIZATION NOTE (1039): This section must begin with the ">" sign and end with the tags,"</B></TD></TR></TABLE></CENTER>"
+# LOCALIZATION NOTE (1044): This section must begin with the ">" sign and end with the tags,"</B></TD></TR></TABLE></CENTER>"
 # Do not translate "</A>" tag.
 1044=">here</A> to download the rest of the message.</B></TD></TR></TABLE></CENTER>
--- a/suite/chrome/mailnews/msgAccountCentral.dtd
+++ b/suite/chrome/mailnews/msgAccountCentral.dtd
@@ -32,29 +32,29 @@
  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 emailSectionHdr.label        "Email"> 
-<!ENTITY readMsgsLink.label           "Read messages"> 
-<!ENTITY composeMsgLink.label         "Compose a new message"> 
+<!ENTITY emailSectionHdr.label        "Correo electrónico"> 
+<!ENTITY readMsgsLink.label           "Leer mensajes"> 
+<!ENTITY composeMsgLink.label         "Redactar un mensaje nuevo"> 
 
-<!ENTITY newsSectionHdr.label         "Newsgroups"> 
-<!ENTITY subscribeNewsLink.label      "Manage newsgroup subscriptions"> 
+<!ENTITY newsSectionHdr.label         "Grupos de noticias"> 
+<!ENTITY subscribeNewsLink.label      "Administrar suscripciones a grupos de noticias"> 
 
-<!ENTITY accountsSectionHdr.label     "Accounts"> 
-<!ENTITY subscribeImapFolders.label   "Manage folder subscriptions"> 
-<!ENTITY settingsLink.label           "View settings for this account"> 
-<!ENTITY newAcctLink.label            "Create a new account"> 
+<!ENTITY accountsSectionHdr.label     "Cuentas"> 
+<!ENTITY subscribeImapFolders.label   "Administrar suscripciones a carpetas"> 
+<!ENTITY settingsLink.label           "Ver configuración de esta cuenta"> 
+<!ENTITY newAcctLink.label            "Crear una cuenta nueva"> 
 
-<!ENTITY advFeaturesSectionHdr.label  "Advanced Features"> 
-<!ENTITY searchMsgsLink.label         "Search messages"> 
-<!ENTITY filtersLink.label            "Manage message filters">
-<!ENTITY junkSettings.label           "Junk mail settings">
-<!ENTITY offlineLink.label            "Offline settings">
+<!ENTITY advFeaturesSectionHdr.label  "Funciones avanzadas"> 
+<!ENTITY searchMsgsLink.label         "Buscar mensajes"> 
+<!ENTITY filtersLink.label            "Administrar filtros de mensaje">
+<!ENTITY junkSettings.label           "Configuración de correo basura">
+<!ENTITY offlineLink.label            "Configuración sin conexión">
 
-<!ENTITY rssSectionHdr.label          "RSS News &amp; Blogs"> 
-<!ENTITY subscibeRSS.label            "Manage subscriptions"> 
+<!ENTITY feedsSectionHdr.label        "Canales">
+<!ENTITY subscribeFeeds.label         "Administrar suscripciones">
 
--- a/suite/chrome/mailnews/msgFolderPickerOverlay.dtd
+++ b/suite/chrome/mailnews/msgFolderPickerOverlay.dtd
@@ -31,19 +31,10 @@
  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 ***** -->
 
 <!-- Labels -->
-<!ENTITY subscribechoosethis.label			"choose this news server">
-<!ENTITY subscribeclickhere.label			"click here to choose a news server">
-<!ENTITY newfolderchoosethis.label			"choose this for the parent">
-<!ENTITY newfolderclickhere.label			"Click here to select">
-<!ENTITY renamefolderchoosethis.label			"choose this folder">
-<!ENTITY renamefolderclickhere.label			"click here to choose a folder">
-<!ENTITY filemessageschoosethis.label			"choose this folder">
-<!ENTITY filemessagesclickhere.label			"click here to choose a folder">
-<!ENTITY chooseaccountclickhere.label			"Click here to select an account">
-<!ENTITY choosefolderclickhere.label			"Click here to select a folder">
-<!ENTITY chooseserverToDeferTo.label      "click here to select an account to use for storing messages">
+<!ENTITY newfolderchoosethis.label			"seleccionar ésta para el nivel superior">
+<!ENTITY filemessageschoosethis.label			"seleccionar esta carpeta">
--- a/suite/chrome/mailnews/msgHdrViewOverlay.dtd
+++ b/suite/chrome/mailnews/msgHdrViewOverlay.dtd
@@ -30,48 +30,50 @@
  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 toField.label "To: ">
-<!ENTITY fromField.label "From: ">
-<!ENTITY senderField.label "Sender: ">
-<!ENTITY organizationField.label "Organization: ">
-<!ENTITY replyToField.label "Reply-To: ">
+<!ENTITY toField.label "Para: ">
+<!ENTITY fromField.label "De: ">
+<!ENTITY senderField.label "Remitente: ">
+<!ENTITY organizationField.label "Organización: ">
+<!ENTITY replyToField.label "Responder a: ">
 
-<!ENTITY subjectField.label "Subject: ">
+<!ENTITY subjectField.label "Asunto: ">
 <!--# LOCALIZATION NOTE (ccField.label): DONT_TRANSLATE -->
 <!ENTITY ccField.label "Cc: ">
-<!ENTITY bccField.label "Bcc: ">
-<!ENTITY newsgroupsField.label "Newsgroups: ">
+<!ENTITY bccField.label "Cco: ">
+<!ENTITY newsgroupsField.label "Grupo de noticias: ">
 <!ENTITY followupToField.label "Followup-To: ">
 
-<!ENTITY tagsHdr.label "Tags: ">
-<!ENTITY dateField.label "Date: ">
-<!ENTITY userAgentField.label "User-Agent: ">
-<!ENTITY referencesField.label "References: ">
+<!ENTITY tagsHdr.label "Etiquetas: ">
+<!ENTITY dateField.label "Fecha: ">
+<!ENTITY userAgentField.label "Cliente correo: ">
+<!ENTITY referencesField.label "Referencias: ">
 <!ENTITY messageIdField.label "Message-ID: ">
-<!ENTITY inReplyToField.label "In-Reply-To: ">
-<!ENTITY originalWebsite.label "Website: ">
+<!ENTITY inReplyToField.label "En-respuesta-a: ">
+<!ENTITY originalWebsite.label "Sitio web: ">
 
-<!ENTITY editMessage.label "Edit Draft…">
+<!ENTITY editMessage.label                 "Editar borrador…">
+<!ENTITY editMessage.accesskey             "E">
 
-<!ENTITY attachmentsTree.label             "Attachments:">
-<!ENTITY openAttachmentCmd.label           "Open">
-<!ENTITY openAttachmentCmd.accesskey       "O">
-<!ENTITY viewAttachmentCmd.label           "View Source">
+<!ENTITY attachmentsTree.label             "Adjuntos:">
+<!ENTITY attachmentsTree.accesskey         "A">
+<!ENTITY openAttachmentCmd.label           "Abrir">
+<!ENTITY openAttachmentCmd.accesskey       "A">
+<!ENTITY viewAttachmentCmd.label           "Ver código fuente">
 <!ENTITY viewAttachmentCmd.accesskey       "V">
-<!ENTITY saveAsAttachmentCmd.label         "Save As…">
-<!ENTITY saveAsAttachmentCmd.accesskey     "A">
-<!ENTITY detachAttachmentCmd.label         "Detach…">
-<!ENTITY detachAttachmentCmd.accesskey     "h">
-<!ENTITY deleteAttachmentCmd.label         "Delete">
-<!ENTITY deleteAttachmentCmd.accesskey     "t">
-<!ENTITY saveAllAttachmentsCmd.label       "Save All…">
-<!ENTITY saveAllAttachmentsCmd.accesskey   "S">
-<!ENTITY detachAllAttachmentsCmd.label     "Detach All…">
+<!ENTITY saveAsAttachmentCmd.label         "Guardar como…">
+<!ENTITY saveAsAttachmentCmd.accesskey     "a">
+<!ENTITY detachAttachmentCmd.label         "Despegar…">
+<!ENTITY detachAttachmentCmd.accesskey     "D">
+<!ENTITY deleteAttachmentCmd.label         "Borrar">
+<!ENTITY deleteAttachmentCmd.accesskey     "B">
+<!ENTITY saveAllAttachmentsCmd.label       "Guardar todo…">
+<!ENTITY saveAllAttachmentsCmd.accesskey   "G">
+<!ENTITY detachAllAttachmentsCmd.label     "Despegar todo…">
 <!ENTITY detachAllAttachmentsCmd.accesskey "D">
-<!ENTITY deleteAllAttachmentsCmd.label     "Delete All…">
-<!ENTITY deleteAllAttachmentsCmd.accesskey "e">
+<!ENTITY deleteAllAttachmentsCmd.label     "Borrar todo…">
+<!ENTITY deleteAllAttachmentsCmd.accesskey "B">
--- a/suite/chrome/mailnews/msgHdrViewPopup.dtd
+++ b/suite/chrome/mailnews/msgHdrViewPopup.dtd
@@ -31,21 +31,21 @@
  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 ***** -->
 
 <!-- Message Header View Popup -->
-<!ENTITY AddToAddressBook.label            "Add To Address Book…">
-<!ENTITY AddToAddressBook.accesskey        "B">
-<!ENTITY SendMailTo.label                  "Compose Mail To…">
+<!ENTITY AddToAddressBook.label            "Agregar a la libreta de direcciones…">
+<!ENTITY AddToAddressBook.accesskey        "b">
+<!ENTITY SendMailTo.label                  "Redactar mensaje a…">
 <!ENTITY SendMailTo.accesskey              "s">
-<!ENTITY CopyEmailAddress.label            "Copy Email Address">
+<!ENTITY CopyEmailAddress.label            "Copiar dirección de correo electrónico">
 <!ENTITY CopyEmailAddress.accesskey        "C">
-<!ENTITY CreateFilterFrom.label            "Create Filter From…">
-<!ENTITY CreateFilterFrom.accesskey        "F">
-<!ENTITY BlockAddress.label                "Block Address">
-<!ENTITY BlockAddress.accesskey            "A">
-<!ENTITY CopyMessageId.label               "Copy Message-ID">
-<!ENTITY OpenMessageForMsgId.label         "Open Message For ID">
-<!ENTITY OpenBrowserWithMsgId.label        "Open Browser With Message-ID">
+<!ENTITY CreateFilterFrom.label            "Crear filtro desde…">
+<!ENTITY CreateFilterFrom.accesskey        "f">
+<!ENTITY copyLinkCmd.label                 "Copiar dirección del enlace">
+<!ENTITY copyLinkCmd.accesskey             "C">
+<!ENTITY CopyMessageId.label               "Copiar ID del mensaje">
+<!ENTITY OpenMessageForMsgId.label         "Abrir mensaje para ID">
+<!ENTITY OpenBrowserWithMsgId.label        "Abrir navegador con ID del mensaje">
--- a/suite/chrome/mailnews/msgmdn.properties
+++ b/suite/chrome/mailnews/msgmdn.properties
@@ -30,23 +30,25 @@
 #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 *****
 ## Msg Mdn Report strings
-MsgMdnDisplayed=Note: This Return Receipt only acknowledges that the message was displayed on the recipient's computer. There is no guarantee that the recipient has read or understood the message contents.
-MsgMdnDispatched=The message was either printed, faxed, or forwarded without being displayed to the recipient. There is no guarantee that the recipient will read the message at a later time.
-MsgMdnProcessed=The message was processed by the recipient's mail client without being displayed. There is no guarantee that the message will be read at a later time.
-MsgMdnDeleted=The message has been deleted. The person you sent it to may or may not have seen it. They might undelete it at a later time and read it.
-MsgMdnDenied=The recipient of the message does not wish to send a return receipt back to you.
-MsgMdnFailed=A failure occurred. A proper return receipt could not be generated or sent to you.
-MsgMdnWishToSend=The sender of this message has asked to be notified when you read this message.\nDo you wish to notify the sender?
+MsgMdnDisplayed=Nota: Este acuse de recibo sólo acredita que el mensaje se mostró en la computadora del destinatario. No hay garantía de que el destinatario haya leído o comprendido el contenido del mensaje.
+MsgMdnDispatched=El mensaje fue impreso, enviado por fax o reenviado sin ser mostrado al destinatario. No hay garantía de que el destinatario leerá el mensaje posteriormente.
+MsgMdnProcessed=El mensaje fue procesado por el cliente de correo del destinatario sin ser mostrado. No hay garantía de que el mensaje será leído con posterioridad.
+MsgMdnDeleted=El mensaje ha sido borrado. La persona a quien lo envió puede no haberlo visto. Pero podrá restaurarlo posteriormente y leerlo.
+MsgMdnDenied=El destinatario del mensaje no desea enviarle el acuse de recibo.
+MsgMdnFailed=Ha ocurrido un fallo. No se ha podido generar o enviar un acuse de recibo apropiado.
+MsgMdnWishToSend=El emisor de este mensaje ha solicitado ser notificado cuando sea leído\n\n¿Desea notificar al emisor?
+MsgMdnIgnoreRequest=Ignorar pedido
+MsgMdnSendReceipt=Enviar acuse
 # LOCALIZATION NOTE : Do not translate the word "%S" below.
-MsgMdnMsgSentTo=This is a Return Receipt for the mail that you sent to %S.
-MdnDisplayedReceipt=Return Receipt (displayed)
-MdnDispatchedReceipt=Return Receipt (dispatched)
-MdnProcessedReceipt=Return Receipt (processed)
-MdnDeletedReceipt=Return Receipt (deleted)
-MdnDeniedReceipt=Return Receipt (denied)
-MdnFailedReceipt=Return Receipt (failed)
+MsgMdnMsgSentTo=Este es un acuse de recibo para el mensaje que usted envió a %S.
+MdnDisplayedReceipt=Acuse de recibo (mostrado)
+MdnDispatchedReceipt=Acuse de recibo (enviado)
+MdnProcessedReceipt=Acuse de recibo (procesado)
+MdnDeletedReceipt=Acuse de recibo (borrado)
+MdnDeniedReceipt=Acuse de recibo (denegado)
+MdnFailedReceipt=Acuse de recibo (fallo)
--- a/suite/chrome/mailnews/news.properties
+++ b/suite/chrome/mailnews/news.properties
@@ -30,60 +30,61 @@
 # 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 *****
-downloadHeadersTitlePrefix=Download Headers
-downloadHeadersInfoText=There are %S new message headers to download for this newsgroup.
-htmlNewsErrorTitle=Error!
+downloadHeadersTitlePrefix=Descargar encabezados
+downloadHeadersInfoText=Hay %S nuevos encabezados de mensajes para descargar en este grupo de noticias.
+htmlNewsErrorTitle=¡Error!
 # LOCALIZATION NOTE ( htmlNewsError ): In the following item, translate only "Error!" and "newsgroup server responded:"
-htmlNewsError=<H1>Error!</H1>newsgroup server responded: 
+htmlNewsError=<H1>¡Error!</H1>El servidor de noticias respondió: 
 # LOCALIZATION NOTE ( articleExpired ): In the following item, translate only "Perhaps the article has expired"
-articleExpired=<B><P>Perhaps the article has expired</P></B>
-removeExpiredArtLinkText=Click here to remove all expired articles
-cancelDisallowed=This message does not appear to be from you.  You may only cancel your own posts, not those made by others.
-cancelConfirm=Are you sure you want to cancel this message?
-messageCancelled=Message cancelled.
-enterUsername=Please enter a username for news server access:
-enterPassword=Please enter a password for news server access:
-enterPasswordTitle=News Server Password Required
-okButtonText=Download
+articleExpired=<B><P>Tal vez el artículo haya expirado</P></B>
+removeExpiredArtLinkText=Haga clic aquí para eliminar todos los artículos expirados
+cancelDisallowed=Parece que este mensaje no es suyo. Sólo se pueden cancelar mensajes propios, no los de otras personas.
+cancelConfirm=¿Desea cancelar este mensaje?
+messageCancelled=Mensaje cancelado.
+enterUsername=Ingrese un nombre de usuario para el acceso al servidor de noticias:
+enterUsernameTitle=Nombre de usuario de servidor de noticias requerido
+saveUsername=Usar el administrador de contraseñas para recordar este valor.
+enterPassword=Ingrese una contraseña para el acceso al servidor de noticias:
+enterPasswordTitle=Contraseña para el servidor de noticias requerida
+okButtonText=Descargar
 
-noNewMessages=There are no new messages on the server.
-downloadingHeaders=Downloading %S of %S headers
-downloadingFilterHeaders=Getting headers for filters: %S (%S/%S)
-downloadingArticles=Downloading articles %S-%S
-bytesReceived=Downloading newsgroups: %S received (%SKB read at %SKB/sec)
-checkingForNewNews=Checking newsgroup %S of %S on %S for new messages
-downloadingArticlesForOffline=Downloading articles %S-%S in %S
+noNewMessages=No hay mensajes nuevos en el servidor.
+newNewsgroupHeaders=Descargando %S de %S encabezados en %S
+newNewsgroupFilteringHeaders=Obteniendo encabezados para filtros: %S (%S/%S) en %S
+downloadingArticles=Descargando artículos %S-%S
+bytesReceived=Descargando grupos de noticias: %S recibidos (%SKB leídos a %SKB/seg)
+downloadingArticlesForOffline=Descargando los artículos %S-%S en %S
 
-onlyCancelOneMessage=You can only cancel one article at a time.
+onlyCancelOneMessage=Sólo puede cancelar un artículo por vez.
 
 # LOCALIZATION NOTE (autoUnsubscribeText): %1$S is the newsgroup and %2$S is the newsgroup-server it is being removed from.
-autoUnsubscribeText=The newsgroup %1$S does not appear to exist on the host %2$S.  Would you like to unsubscribe from it?
+autoUnsubscribeText=Pareciera que el grupo %1$S no existe en el servidor %2$S. ¿Desea desuscribirse?
 
 # LOCALIZATION NOTE (autoSubscribeText): %1$S is the newsgroup.
-autoSubscribeText=Would you like to subscribe to %1$S?
+autoSubscribeText=¿Quiere suscribirse a %1$S?
 
 # LOCALIZATION NOTE (Error -304): In the following item, don't translate "NNTP"
 # Error - server error
 ## @name NNTP_ERROR_MESSAGE
 ## @loc None
--304=A News (NNTP) error occurred:  
+-304=Se ha producido un error en el servidor de noticias (NNTP):  
 
 # Error - newsgroup scan error
 ## @name NNTP_NEWSGROUP_SCAN_ERROR
 ## @loc None
--305=A News error occurred.  The scan of all newsgroups is incomplete.  Try to View All Newsgroups again
+-305=Se ha producido un error en el servidor de noticias. La exploración de los grupos de noticias es incompleta. Intente visualizar todos los grupos de noticias nuevamente
 
 # Error - NNTP authinfo failure
 ## @name NNTP_AUTH_FAILED
 ## @loc None
--260=An authorization error occurred.  Please try entering your name and/or password again.
+-260=Se ha producido un error de autorización. Vuelva a ingresar su nombre y/o contraseña.
 
 # Error - TCP error
 ## @name TCP_ERROR
 ## @loc None
--206=A communications error occurred.  Try connecting again.  TCP Error:
+-206=Se ha producido un error de comunicaciones. Vuelva a intentar la conexión. Error de TCP:
--- a/suite/chrome/mailnews/oeImportMsgs.properties
+++ b/suite/chrome/mailnews/oeImportMsgs.properties
@@ -43,67 +43,67 @@
 ## @name OEIMPORT_NAME
 ## @loc None
 ## LOCALIZATION NOTE (2000): DONT_TRANSLATE
 2000=Outlook Express
 
 # Description of import module
 ## @name OEIMPORT_DESCRIPTION
 ## @loc None
-## LOCALIZATION NOTE (2001): In this item, don't translate "Outlook Express"
-2001=Outlook Express mail and address books
+## LOCALIZATION NOTE (2011): In this item, don't translate "Outlook Express"
+2011=Correo, libretas de direcciones y opciones de Outlook Express
 
 # Success message
 ## @name OEIMPORT_MAILBOX_SUCCESS
 ## @loc None
 ## LOCALIZATION NOTE (2002): In this item, don't translate "%S" or "%d"
 ## The variable %S will contain the name of the Mailbox
 ## The variable %d will contain the number of messages
 
-2002=Mailbox %S, imported %d messages
+2002=Bandeja %S, se importaron %d mensajes
 
 # Error message
 ## @name OEIMPORT_MAILBOX_BADPARAM
 ## @loc None
-2003=Bad parameter passed to import mailbox.
+2003=Parámetro incorrecto pasado para importar bandeja.
 
 # Error message
 ## @name OEIMPORT_MAILBOX_BADSOURCEFILE
 ## @loc None
 ## LOCALIZATION NOTE (2004): In this item, don't translate "%S"
 ## The variable %S will contain the name of the Mailbox
-2004=Error accessing file for mailbox %S.
+2004=Error accediendo al archivo de la bandeja %S.
 
 # Error message
 ## @name OEIMPORT_MAILBOX_CONVERTERROR
 ## @loc None
 ## LOCALIZATION NOTE (2005): In this item, don't translate "%S"
 ## The variable %S will contain the name of the Mailbox
-2005=Error importing mailbox %S, all messages may not be imported from this mailbox.
+2005=Error importando bandeja %S, puede que no se hayan importado todos los mensajes de esta bandeja.
 
 # Default name of imported addressbook
 ## @name OEIMPORT_DEFAULT_NAME
 ## @loc None
-2006=Outlook Express Address Book
+2006=Libreta de direcciones de Outlook Express
 
 # Autofind description
 ## @name OEIMPORT_AUTOFIND
 ## @loc None
-2007=Outlook Express address book (windows address book)
+2007=Libreta de direcciones de Outlook Express (Libreta de direcciones de Windows)
 
 # Description
 ## @name OEIMPORT_ADDRESS_SUCCESS
 ## @loc None
 ## LOCALIZATION NOTE (2006): In this item, don't translate "%S"
 ## The variable %S will receive the name of the address book
-2008=Imported address book %S
+2008=Se ha importado la libreta de direcciones %S
 
 # Error message
 ## @name OEIMPORT_ADDRESS_CONVERTERROR
 ## @loc None
 ## LOCALIZATION NOTE (2009): In this item, don't translate "%S"
 ## The variable %S will receive the name of the address book
-2009=Error importing address book %S, all addresses may not have been imported.
+2009=Error importando libreta de direcciones %S, algunas direcciones podrían no haberse importado.
 
 # Error message
 ## @name OEIMPORT_ADDRESS_BADPARAM
 ## @loc None
-2010=Bad parameter passed to import addressbook.
+2010=Parámetro incorrecto al importar la libreta de direcciones.
--- a/suite/chrome/mailnews/offline.properties
+++ b/suite/chrome/mailnews/offline.properties
@@ -35,51 +35,49 @@
 # ***** END LICENSE BLOCK *****
 
 #   LOCALIZATION NOTE :
 #   do not localize "\n".  use "\n" to make the text fit nicely in the dialog.
 
 # 
 # Download Messages Prompt
 #
-downloadMessagesWindowTitle=Work Offline 
+downloadMessagesWindowTitle=Trabajar sin conexión 
 
 #   LOCALIZATION NOTE :
 #   do not localize "\n".  use "\n" to make the text fit nicely in the dialog.
-downloadMessagesLabel=Do you want to download messages \nfor offline use before you go offline?\n\n
+downloadMessagesLabel=¿Quiere descargar los mensajes para poder\nverlos cuando este desconectado antes de desconectarse?\n\n
 
 downloadMessagesCheckboxLabel=Always ask me when I go offline
-downloadMessagesDownloadButtonLabel=Download
-downloadMessagesNoDownloadButtonLabel=Don't Download
-downloadMessagesCancelButtonLabel=Cancel
+downloadMessagesDownloadButtonLabel=Descargar
+downloadMessagesNoDownloadButtonLabel=No descargar
+downloadMessagesCancelButtonLabel=Cancelar
 
 # 
 # Send Messages Prompt
 #
-sendMessagesWindowTitle=Work Online 
+sendMessagesWindowTitle=Trabajar con conexión 
 
-sendMessagesLabel2=Would you like to send your unsent messages now?
+sendMessagesLabel2=¿Quiere enviar ahora los mensajes que no hayan sido enviados?
 sendMessagesCheckboxLabel=Always ask me when I go online
-sendMessagesSendButtonLabel=Send
-sendMessagesNoSendButtonLabel=Don't Send
-sendMessagesCancelButtonLabel=Cancel
+sendMessagesSendButtonLabel=Enviar
+sendMessagesNoSendButtonLabel=No enviar
+sendMessagesCancelButtonLabel=Cancelar
 
 #
 # GetMessages Offline Prompt 
 #
-getMessagesOfflineWindowTitle=Get Messages 
+getMessagesOfflineWindowTitle=Cancelar 
 
 #   LOCALIZATION NOTE :
 #   do not localize "\n".  use "\n" to make the text fit nicely in the dialog.
-getMessagesOfflineLabel=You are currently offline. Would you like \nto go online to get your new messages?\n\n
-getMessagesOfflineGoButtonLabel=Go online
-getMessagesOfflineCancelButtonLabel=Cancel
+getMessagesOfflineLabel=Cancelar
+getMessagesOfflineGoButtonLabel=Conectarse
 
 # 
 # Send Messages Offline Prompt
 #
-sendMessagesOfflineWindowTitle=Send Messages 
+sendMessagesOfflineWindowTitle=Enviar mensajes 
 
 #   LOCALIZATION NOTE :
 #   do not localize "\n".  use "\n" to make the text fit nicely in the dialog.
-sendMessagesOfflineLabel=You are currently offline. Would you like \nto go online and send your unsent messages?\n\n
-sendMessagesOfflineGoButtonLabel=Go online
-sendMessagesOfflineCancelButtonLabel=Cancel
+sendMessagesOfflineLabel=Actualmente está desconectado. ¿Quiere conectarse \npara enviar los mensajes que no hayan sido enviados?\n\n
+sendMessagesOfflineGoButtonLabel=Conectarse
--- a/suite/chrome/mailnews/outlookImportMsgs.properties
+++ b/suite/chrome/mailnews/outlookImportMsgs.properties
@@ -43,67 +43,67 @@
 ## @name OUTLOOKIMPORT_NAME
 ## @loc None
 ## LOCALIZATION NOTE (2000): DONT_TRANSLATE
 2000=Outlook
 
 # Description of import module
 ## @name OUTLOOKIMPORT_DESCRIPTION
 ## @loc None
-## LOCALIZATION NOTE (2001): In this item, don't translate "Outlook"
-2001=Outlook mail and address books
+## LOCALIZATION NOTE (2010): In this item, don't translate "Outlook"
+2010=Correo, libretas de direcciones y opciones de Outlook
 
 # Success message
 ## @name OUTLOOKIMPORT_MAILBOX_SUCCESS
 ## @loc None
 ## LOCALIZATION NOTE (2002): In this item, don't translate "%S" or "%d"
 ## The variable %S will receive the name of the mailbox
 ## The variable %d will receive the number of messages
-2002=Mailbox %S, imported %d messages
+2002=Bandeja %S, importados %d mensajes
 
 # Error message
 ## @name OUTLOOKIMPORT_MAILBOX_BADPARAM
 ## @loc None
-2003=Bad parameter passed to import mailbox.
+2003=Parámetro incorrecto pasado para importar bandeja.
 
 # Error message
 ## @name OUTLOOKIMPORT_MAILBOX_CONVERTERROR
 ## @loc None
 ## LOCALIZATION NOTE (2004): In this item, don't translate "%S"
 ## The variable %S will receive the name of the mailbox
-2004=Error importing mailbox %S, all messages may not be imported from this mailbox.
+2004=Error importando bandeja %S, puede que no se hayan importado todos los mensajes de esta bandeja.
 
 # Address book name
 ## @name OUTLOOKIMPORT_ADDRNAME
 ## @loc None
 ## LOCALIZATION NOTE (2005): In this item, don't translate "Outlook"
-2005=Outlook address books
+2005=Libretas de direcciones de Outlook
 
 # Description
 ## @name OUTLOOKIMPORT_ADDRESS_SUCCESS
 ## @loc None
 ## LOCALIZATION NOTE (2006): In this item, don't translate "%S"
 ## The variable %S will receive the name of the address book
-2006=Imported address book %S
+2006=Libreta de direcciones %S importada
 
 # Error message
 ## @name OUTLOOKIMPORT_ADDRESS_BADPARAM
 ## @loc None
-2007=Bad parameter passed to import address book.
+2007=Parámetro erróneo pasado para importar libreta de direcciones.
 
 # Error message
 ## @name OUTLOOKIMPORT_ADDRESS_BADSOURCEFILE
 ## @loc None
 ## LOCALIZATION NOTE (2008): In this item, don't translate "%S"
 ## The variable %S will receive the name of the address book
-2008=Error accessing file for address book %S.
+2008=Error accediendo al archivo de la libreta de direcciones %S.
 
 # Error message
 ## @name OUTLOOKIMPORT_ADDRESS_CONVERTERROR
 ## @loc None
 ## LOCALIZATION NOTE (2009): In this item, don't translate "%S"
 ## The variable %S will receive the name of the address book
-2009=Error importing address book %S, all addresses may not have been imported.
+2009=Error importando libreta de direcciones %S, algunas direcciones podrían no haberse importado.
 
 
 
 
 
--- a/suite/chrome/mailnews/pref/AccountManager.dtd
+++ b/suite/chrome/mailnews/pref/AccountManager.dtd
@@ -1,24 +1,22 @@
 <!-- extracted from AccountManager.xul -->
 
-<!ENTITY accountManagerTitle.label "Mail &amp; Newsgroups Account Settings">
+<!ENTITY accountManagerTitle.label "Configuración de cuentas de Correo y Grupos de noticias">
 
-<!ENTITY addAccountButton.label "Add Account…">
+<!ENTITY addAccountButton.label "Añadir cuenta…">
 <!ENTITY addAccountButton.accesskey "A">
-<!ENTITY setDefaultButton.label "Set as Default">
+<!ENTITY setDefaultButton.label "Definir como predeterminada">
 <!ENTITY setDefaultButton.accesskey "f">
-<!ENTITY duplicateButton.label "Duplicate">
-<!ENTITY removeButton.label "Remove Account">
-<!ENTITY removeButton.accesskey "R">
-
-<!ENTITY duplicate.label "Duplicate">
+<!ENTITY removeButton.label "Eliminar cuenta">
+<!ENTITY removeButton.accesskey "r">
 
 <!-- AccountManager.xul -->
 <!-- LOCALIZATION NOTE : this is part of an inline-style attribute on the account
      setting dialog, which specifies the width and height in em units of the dialog.
      Localizers ONLY can increase these widths if they are having difficulty getting
-     panel content to fit. 1em = the width of the letter 'm' in the selected font.
+     panel content to fit.
+     1ch = The width of the "0" (ZERO, U+0030) glyph for the current font.
+     1em = The height of the font.
      XUL/FE DEVELOPERS: DO NOT MODIFY THIS VALUE. It represents the correct size of
      this window for en-US. -->
-<!ENTITY accountManager.size "width: 55em; height: 50em;">
-<!ENTITY macAccountManager.size "width: 60em; height: 50em;">
-<!ENTITY accountTree.width   "width: 17em;">
+<!ENTITY accountManager.size "width: 97ch; height: 49em;">
+<!ENTITY accountTree.width "width: 31ch;">
--- a/suite/chrome/mailnews/pref/AccountWizard.dtd
+++ b/suite/chrome/mailnews/pref/AccountWizard.dtd
@@ -1,123 +1,111 @@
 <!-- Entities for AccountWizard -->
 
-<!ENTITY windowTitle.label "Account Wizard">
-<!ENTITY accountWizard.size "width: 40em; height: 38em;">
+<!ENTITY windowTitle.label "Asistente de cuentas">
+<!ENTITY accountWizard.size "width: 42em; height: 38em;">
 
 <!-- Entities for Account Type page -->
 
-<!ENTITY accountSetupInfo.label "In order to receive messages, you first need to set up a Mail or Newsgroup account.">
-<!ENTITY accountTypeTitle.label "New Account Setup">
-<!ENTITY accountTypeDesc.label "This Wizard will collect the information necessary to set up a Mail or Newsgroup account. If you do not know the information requested, please contact your System Administrator or Internet Service Provider.">
-<!ENTITY accountTypeDirections.label "Select the type of account you would like to set up:">
-<!ENTITY accountTypeMail.label "Email account">
-<!ENTITY accountTypeMail.accesskey "m">
-<!ENTITY accountTypeNews.label "Newsgroup account">
-<!ENTITY accountTypeNews.accesskey "w">
+<!ENTITY accountSetupInfo.label "Para poder recibir mensajes, primero tiene que configurar una cuenta de correo o noticias.">
+<!ENTITY accountTypeTitle.label "Configuración de nueva cuenta">
+<!ENTITY accountTypeDesc.label "Este asistente recogerá la información necesaria para configurar una cuenta de correo o noticias. Si desconoce la información que se le pide, por favor póngase en contacto con el administrador del sistema o su proveedor de Internet.">
+<!ENTITY accountTypeDirections.label "Seleccione el tipo de cuenta que quiere configurar:">
+<!ENTITY accountTypeMail.label "Cuenta de correo electrónico">
+<!ENTITY accountTypeMail.accesskey "e">
+<!ENTITY accountTypeNews.label "Cuenta de noticias">
+<!ENTITY accountTypeNews.accesskey "n">
 
 <!-- Entities for Identity page -->
 
-<!ENTITY identityTitle.label "Identity">
-<!ENTITY identityDesc.label "Each account has an identity, which is the information that identifies you to others when they receive your messages.">
+<!ENTITY identityTitle.label "Identidad">
+<!ENTITY identityDesc.label "Cada cuenta tiene una identidad, que es la información que le identifica a usted ante otros cuando ellos reciben sus mensajes.">
 
 <!-- LOCALIZATION NOTE (fullnameDesc.label) : do not translate two of "&quot;" in below line -->
-<!ENTITY fullnameDesc.label "Enter the name you would like to appear in the &quot;From&quot; field of your outgoing messages">
+<!ENTITY fullnameDesc.label "Introduzca el nombre que quiere que aparezca en el campo &quot;De&quot; al enviar mensajes">
 <!-- LOCALIZATION NOTE (fullnameExample.label) : use following directions for below line
-	1, do not translate two of "&quot;"
-	2, Use localized full name instead of "John Smith"
+  1, do not translate two of "&quot;"
+  2, Use localized full name instead of "John Smith"
 -->
-<!ENTITY fullnameExample.label "(for example, &quot;John Smith&quot;).">
-<!ENTITY fullnameLabel.label "Your Name:">
-<!ENTITY fullnameLabel.accesskey "Y">
+<!ENTITY fullnameExample.label "(por ejemplo, &quot;José Pérez&quot;).">
+<!ENTITY fullnameLabel.label "Su nombre:">
+<!ENTITY fullnameLabel.accesskey "S">
 
-<!ENTITY emailLabel.label "Email Address:">
-<!ENTITY emailLabel.accesskey "E">
-<!ENTITY emailDesc.label "Enter your email address; this is the address others will use to send email to you">
-<!-- LOCALIZATION NOTE (emailExample.label) : do not translate "user@example.net" in below line -->
-<!ENTITY emailExample.label "(for example: user@example.net).">
+<!ENTITY emailLabel.label "Dirección de correo electrónico:">
+<!ENTITY emailLabel.accesskey "e">
 
 <!-- Entities for Server page -->
 
-<!ENTITY serverTitle.label "Server Information">
-<!ENTITY incomingServerTitle.label "Incoming Server">
-<!ENTITY incomingServerTypeDesc.label "Select the type of incoming server you are using.">
-<!ENTITY incomingServerTypeLabel.label "Server Type:">
+<!ENTITY serverTitle.label "Información de servidor">
+<!ENTITY incomingServerTypeDesc.label "Seleccione el tipo de servidor entrante que está utilizando.">
 <!-- LOCALIZATION NOTE (incomingServerNameDesc.label) : Do not translate "&quot;pop.example.net&quot;" in below line -->
-<!ENTITY incomingServerNameDesc.label "Enter the name of your incoming server (for example, &quot;mail.example.net&quot;).">
-<!ENTITY incomingServerLabel.label "Incoming Server:">
-<!ENTITY incomingServerLabel.accesskey "S">
+<!ENTITY incomingServerNameDesc.label "Introduzca el nombre de su servidor entrante (por ejemplo, &quot;mail.ejemplo.net&quot;).">
+<!ENTITY incomingServerLabel.label "Nombre del servidor:">
+<!ENTITY incomingServerLabel.accesskey "s">
 <!-- LOCALIZATION NOTE (newsServerNameDesc.label) : Do not translate "NNTP" or the "&quot;" entities in below line -->
-<!ENTITY newsServerNameDesc.label "Enter the name of your news server (NNTP) (for example, &quot;news.example.net&quot;).">
-<!-- LOCALIZATION NOTE (smtpServerTitle.label) : Do not translate "SMTP" in below line -->
-<!ENTITY smtpServerTitle.label "Outgoing Server (SMTP)">
+<!ENTITY newsServerNameDesc.label "Introduzca el nombre de su servidor de noticias (NNTP) (por ejemplo, &quot;news.ejemplo.net&quot;).">
 <!-- LOCALIZATION NOTE (smtpServerDesc.label) : Do not translate "SMTP" and "&quot;smtp.example.net&quot;" in below line -->
-<!ENTITY smtpServerDesc.label "Enter the name of your outgoing server (SMTP) (for example, &quot;smtp.example.net&quot;).">
-<!ENTITY smtpServerLabel.label "Outgoing Server:">
-<!ENTITY smtpServerLabel.accesskey "O">
-<!ENTITY newsServerLabel.label "Newsgroup Server:">
-<!ENTITY newsServerLabel.accesskey "w">
+<!ENTITY smtpServerDesc.label "Introduzca el nombre de su servidor saliente (SMTP) (por ejemplo, &quot;smtp.ejemplo.net&quot;).">
+<!ENTITY smtpServerLabel.label "Servidor de correo saliente:">
+<!ENTITY smtpServerLabel.accesskey "o">
+<!ENTITY newsServerLabel.label "Servidor de noticias">
+<!ENTITY newsServerLabel.accesskey "n">
 <!-- LOCALIZATION NOTE (imapType.label) : Do not translate "IMAP" in below line -->
 <!ENTITY imapType.label "IMAP">
 <!ENTITY imapType.accesskey "I">
 <!-- LOCALIZATION NOTE (popType.label) : Do not translate "POP" in below line -->
 <!ENTITY popType.label "POP">
 <!ENTITY popType.accesskey "P">
-<!ENTITY nntpType.label "News Server">
 
-<!-- for when the user has an SMTP server pre-configured -->
-<!-- LOCALIZATION NOTE (currentSmtpBefore.label) : Do not translate "SMTP" and "&quot;" in
-     this variable. Also, translate currentSmtpBefore.label and currentSmtpAfter.label as a single sentence,
-	  inserting text after the "&quot;" entity in currentSmtpAfter.label, if required grammatically
+<!-- LOCALIZATION NOTE (haveSmtp1.prefix and haveSmtp1.suffix2) : Do not translate "SMTP" and "&quot;" in
+     these variables. Also, translate haveSmtp1.prefix and haveSmtp1.suffix2 as a single sentence, inserting
+     text after the "&quot;" entity in haveSmtp1.suffix2, if required grammatically.
 -->
-<!-- LOCALIZATION NOTE (haveSmtp1.prefix and haveSmtp1.suffix) : Do not translate "SMTP" and "&quot;" in
-     these variables. Also, translate haveSmtp1.prefix and haveSmtp1.suffix as a single sentence, inserting
-     text after the "&quot;" entity in haveSmtp1.suffix, if required grammatically.
--->
-<!ENTITY haveSmtp1.prefix "Your existing outgoing server (SMTP), &quot;">
-<!ENTITY haveSmtp1.suffix "&quot;, will be used. You can modify outgoing server settings by choosing Mail &amp; Newsgroups Account Settings from the Edit menu.">
+<!ENTITY haveSmtp1.prefix "Su servidor saliente (SMTP) existente, &quot;">
+<!ENTITY haveSmtp1.suffix2 "&quot;, será el usado. Puede modificar la configuración del servidor saliente eligiendo Configuración de cuentas de correo y noticias del menú Editar.">
 
 <!-- Entities for Login page -->
 
-<!ENTITY loginTitle.label "User Names">
-<!ENTITY usernameDesc.label "Enter the incoming user name given to you by your email provider ">
+<!ENTITY loginTitle.label "Nombres de usuario">
+<!ENTITY usernameDesc.label "Introduzca el nombre de usuario entrante facilitado por su proveedor de correo electrónico">
 <!-- LOCALIZATION NOTE (usernameExample.label) : do not translate "&quot;jsmith&quot;" in below line -->
-<!ENTITY usernameExample.label "(for example, &quot;jsmith&quot;).">
-<!ENTITY usernameLabel.label "Incoming User Name:">
-<!ENTITY usernameLabel.accesskey "I">
-<!ENTITY usernameSmtpDesc.label "Enter the outgoing user name given to you by your email provider (this is typically the same as your incoming user name).">
-<!ENTITY usernameSmtpLabel.label "Outgoing User Name:">
-<!ENTITY usernameSmtpLabel.accesskey "O">
-<!-- LOCALIZATION NOTE (haveSmtp2.prefix and haveSmtp2.suffix) : Do not translate "SMTP" and "&quot;" in
-     these variables. Also, translate haveSmtp2.prefix and haveSmtp2.suffix as a single sentence, inserting
-     text after the "&quot;" entity in haveSmtp2.suffix, if required grammatically.
+<!ENTITY usernameExample.label "(por ejemplo, &quot;jperez&quot;).">
+<!ENTITY usernameLabel.label "Nombre de usuario entrante:">
+<!ENTITY usernameLabel.accesskey "i">
+<!ENTITY usernameSmtpDesc.label "Introduzca el nombre de usuario saliente facilitado por su proveedor de correo electrónico (normalmente es el mismo que el entrante).">
+<!ENTITY usernameSmtpLabel.label "Nombre de usuario saliente:">
+<!ENTITY usernameSmtpLabel.accesskey "o">
+<!-- LOCALIZATION NOTE (haveSmtp2.prefix and haveSmtp2.suffix2) : Do not translate "SMTP" and "&quot;" in
+     these variables. Also, translate haveSmtp2.prefix and haveSmtp2.suffix2 as a single sentence, inserting
+     text after the "&quot;" entity in haveSmtp2.suffix2, if required grammatically.
 -->
-<!ENTITY haveSmtp2.prefix "Your existing outgoing (SMTP) username, &quot;">
-<!ENTITY haveSmtp2.suffix "&quot;, will be used. You can modify outgoing server settings by choosing Mail &amp; Newsgroups Account Settings from the Edit menu.">
-<!-- LOCALIZATION NOTE (haveSmtp3.prefix and haveSmtp3.suffix) : Do not translate "SMTP" and "&quot;" in
-     these variables. Also, translate haveSmtp3.prefix and haveSmtp3.suffix as a single sentence, inserting
-     text after the "&quot;" entity in haveSmtp3.suffix, if required grammatically.
+<!ENTITY haveSmtp2.prefix "Su nombre de usuario saliente (SMTP) existente, &quot;">
+<!ENTITY haveSmtp2.suffix2 "&quot;, será el usado. Puede modificar la configuración del servidor saliente eligiendo Configuración de cuentas de correo y noticias del menú Editar.">
+<!-- LOCALIZATION NOTE (haveSmtp3.prefix and haveSmtp3.suffix2) : Do not translate "SMTP" and "&quot;" in
+     these variables. Also, translate haveSmtp3.prefix and haveSmtp3.suffix2 as a single sentence, inserting
+     text after the "&quot;" entity in haveSmtp3.suffix2, if required grammatically.
 -->
-<!ENTITY haveSmtp3.prefix "Your outgoing (SMTP) server, &quot;">
-<!ENTITY haveSmtp3.suffix "&quot;, is identical to your incoming server, your incoming user name will be used to access it. You can modify outgoing server settings by choosing Mail &amp; Newsgroups Account Settings from the Edit menu.">
+<!ENTITY haveSmtp3.prefix "Su servidor saliente (SMTP), &quot;">
+<!ENTITY haveSmtp3.suffix2 "&quot; es igual al servidor entrante, se usará el mismo nombre de usuario para acceder a él. Puede modificar la configuración del servidor saliente eligiendo Configuración de cuentas de correo y noticias del menú Editar.">
 
 <!-- Entities for Account name page -->
 
-<!ENTITY accnameTitle.label "Account Name">
+<!ENTITY accnameTitle.label "Nombre de la cuenta">
 <!-- LOCALIZATION NOTE (accnameDesc.label) : do not translate any "&quot;" in below line -->
-<!ENTITY accnameDesc.label "Enter the name by which you would like to refer to this account (for example, &quot;Work Account&quot;, &quot;Home Account&quot; or &quot;News Account&quot;).">
-<!ENTITY accnameExample.label "For example, Work Account, Home Account or News Account">
-<!ENTITY accnameLabel.label "Account Name:">
-<!ENTITY accnameLabel.accesskey "A">
+<!ENTITY accnameDesc.label "Introduzca el nombre por el que desea referirse a esta cuenta (por ejemplo, &quot;Cuenta del trabajo&quot;, &quot;Cuenta de casa&quot; o &quot;Cuenta de noticias&quot;).">
+<!ENTITY accnameLabel.label "Nombre de cuenta:">
+<!ENTITY accnameLabel.accesskey "N">
 
 <!-- Entities for Done (Congratulations) page -->
 
-<!ENTITY completionTitle.label "Congratulations!">
-<!ENTITY completionText.label "Please verify that the information below is correct.">
-<!ENTITY serverTypePrefix.label "Incoming Server Type:">
-<!ENTITY serverNamePrefix.label "Incoming Server Name:">
-<!ENTITY smtpServerNamePrefix.label "Outgoing Server Name (SMTP):">
-<!ENTITY newsServerNamePrefix.label "News Server Name (NNTP):">
-<!ENTITY downloadOnLogin.label "Download messages now">
-<!ENTITY deferStorageDesc.label "Check this checkbox to store mail for this account in the Local Folders Global Inbox. Otherwise the account appears as a top-level account and its mail is stored in its own directory.">
-<!ENTITY deferStorage.label "Use Global Inbox (store mail in Local Folders)">
-<!ENTITY clickFinish.label "Click Finish to save these settings and exit the Account Wizard.">
-<!ENTITY clickFinish.labelMac "Click Done to save these settings and exit the Account Wizard.">
+<!ENTITY completionTitle.label "¡Felicitaciones!">
+<!ENTITY completionText.label "Por favor, compruebe que la siguiente información sea correcta.">
+<!ENTITY serverTypePrefix.label "Tipo de servidor entrante:">
+<!ENTITY serverNamePrefix.label "Nombre del servidor entrante:">
+<!ENTITY smtpServerNamePrefix.label "Nombre del servidor de correo saliente (SMTP):">
+<!ENTITY newsServerNamePrefix.label "Nombre del servidor de noticias (NNTP):">
+<!ENTITY downloadOnLogin.label "Descargar mensajes ahora">
+<!ENTITY downloadOnLogin.accesskey "D">
+<!ENTITY deferStorageDesc.label "Desmarque esta casilla para guardar el correo de esta cuenta en su propio directorio. Esto hará que esta cuenta aparezca como una cuenta del nivel principal. Si no, formará parte de la cuenta de la bandeja de entrada global en las carpetas locales.">
+<!ENTITY deferStorage.label "Usar la bandeja de entrada global (almacenar en las carpetas locales)">
+<!ENTITY deferStorage.accesskey "g">
+<!ENTITY clickFinish.label "Haga clic en Finalizar para guardar estas configuraciones y salir del asistente de cuentas.">
+<!ENTITY clickFinish.labelMac "Haga clic en Listo para guardar estas configuraciones y salir del asistente de cuentas.">
--- a/suite/chrome/mailnews/pref/am-addressing.dtd
+++ b/suite/chrome/mailnews/pref/am-addressing.dtd
@@ -1,34 +1,39 @@
 <!-- extracted from am-addressing.xul -->
 
-<!ENTITY addressing.label          "Composition &amp; Addressing">
-<!ENTITY addressingGroupTitle.label "Addressing">
-<!ENTITY autocompleteToMyDomain.label     "Automatically append my domain to addresses">
+<!ENTITY addressing.label          "Redacción y direcciones">
+<!ENTITY addressingGroupTitle.label "Direcciones">
+<!ENTITY autocompleteToMyDomain.label     "Añadir mi dominio a las direcciones automáticamente">
 <!ENTITY autocompleteToMyDomain.accesskey "o">
-<!ENTITY addressingText.label      "When looking up addresses:">
+<!ENTITY addressingText.label      "Cuando se busquen direcciones:">
 <!-- LOCALIZATION NOTE (override.label) : do not translate "LDAP" in below line -->
-<!ENTITY useGlobal.label           "Use my global LDAP server preferences for this account">
+<!ENTITY useGlobal.label           "Utilizar mis preferencias de servidor LDAP globales para esta cuenta">
 <!ENTITY useGlobal.accesskey       "U">
-<!ENTITY editDirectories.label     "Edit Directories…">
+<!ENTITY editDirectories.label     "Editar directorios…">
 <!ENTITY editDirectories.accesskey "E">
 <!-- LOCALIZATION NOTE (directories.label) : do not translate "LDAP" in below line -->
-<!ENTITY directories.label         "Use a different LDAP server:">
-<!ENTITY directories.accesskey     "d">
+<!ENTITY directories.label         "Utilizar un servidor LDAP diferente:">
+<!ENTITY directories.accesskey     "D">
+<!ENTITY directoriesNone.label     "Ninguno">
 
 <!-- am-addressing.xul -->
 
-<!ENTITY compositionGroupTitle.label "Composition">
+<!ENTITY compositionGroupTitle.label "Redacción">
 <!-- LOCALIZATION NOTE (useHtml.label) : do not translate "html" in below line -->
-<!ENTITY useHtml.label                        "Compose messages in HTML format">
-<!ENTITY useHtml.accesskey                    "C">
-<!ENTITY autoQuote.label                      "Automatically quote the original message when replying">
-<!ENTITY autoQuote.accesskey                  "m">
+<!ENTITY useHtml.label                        "Redactar mensajes en formato HTML">
+<!ENTITY useHtml.accesskey                    "R">
+<!ENTITY autoQuote.label                      "Citar automáticamente el mensaje original al responder">
+<!ENTITY autoQuote.accesskey                  "C">
 <!-- LOCALIZATION NOTE (then.label): This will concatenate with the 4 strings that follow. -->
-<!ENTITY then.label                           "Then,">
-<!ENTITY then.accesskey                       "T">
-<!ENTITY aboveQuote.label                     "start my reply above the quote">
-<!ENTITY belowQuote.label                     "start my reply below the quote">
-<!ENTITY selectAndQuote.label                 "select the quote">
-<!ENTITY place.label                          "and place my signature">
-<!ENTITY place.accesskey                      "s">
-<!ENTITY belowText.label                      "below the quote (recommended)">
-<!ENTITY aboveText.label                      "below my reply (above the quote)">
+<!ENTITY then.label                           "Entonces,">
+<!ENTITY then.accesskey                       "t">
+<!ENTITY aboveQuote.label                     "comenzar mi respuesta sobre el texto citado">
+<!ENTITY belowQuote.label                     "comenzar mi respuesta bajo el texto citado">
+<!ENTITY selectAndQuote.label                 "seleccionar el texto citado">
+<!ENTITY place.label                          "y poner mi firma">
+<!ENTITY place.accesskey                      "p">
+<!ENTITY belowText.label                      "bajo el texto citado (recomendado)">
+<!ENTITY aboveText.label                      "bajo mi respuesta (sobre el texto citado)">
+<!ENTITY includeSigOnReply.label              "Incluir firmas en las respuestas">
+<!ENTITY includeSigOnReply.accesskey          "s">
+<!ENTITY includeSigOnForward.label            "Incluir firmas en los reenvíos">
+<!ENTITY includeSigOnForward.accesskey        "I">
--- a/suite/chrome/mailnews/pref/am-advanced.dtd
+++ b/suite/chrome/mailnews/pref/am-advanced.dtd
@@ -1,20 +1,20 @@
 <!-- LOCALIZATION NOTE (smtpServer.label): do not translate "SMTP" in below line -->
-<!ENTITY smtpServer.label "Outgoing Server (SMTP) Settings">
+<!ENTITY smtpServer.label "Configuración del servidor saliente (SMTP)">
 <!-- LOCALIZATION NOTE (smtpDesc.label): do not translate "SMTP" in below line -->
-<!ENTITY smtpDesc.label "Although you can specify more than one outgoing server (SMTP), this is only recommended for advanced users. Setting up multiple SMTP servers can cause errors when sending messages.">
+<!ENTITY smtpDesc.label "Aunque puede especificar más de un servidor saliente (SMTP), ésto sólo es recomendado para usuarios avanzados. Configurando múltiples servidores SMTP puede causar errores al enviar mensajes.">
 
-<!ENTITY smtpListAdd.label  "Add…">
-<!ENTITY smtpListAdd.accesskey  "d">
-<!ENTITY smtpListEdit.label "Edit…">
+<!ENTITY smtpListAdd.label  "Agregar…">
+<!ENTITY smtpListAdd.accesskey  "A">
+<!ENTITY smtpListEdit.label "Editar…">
 <!ENTITY smtpListEdit.accesskey "E">
-<!ENTITY smtpListDelete.label "Remove">
+<!ENTITY smtpListDelete.label "Eliminar">
 <!ENTITY smtpListDelete.accesskey "m">
-<!ENTITY smtpListSetDefault.label "Set Default">
+<!ENTITY smtpListSetDefault.label "Configurar predeterminado">
 <!ENTITY smtpListSetDefault.accesskey "t">
 
-<!ENTITY serverDescription.label "Description: ">
-<!ENTITY serverName.label "Server Name: ">
-<!ENTITY serverPort.label "Port: ">
-<!ENTITY userName.label   "User Name: ">
-<!ENTITY useSecureConnection.label   "Secure Connection: ">
-<!ENTITY useSecureAuthentication.label   "Secure Authentication: ">
+<!ENTITY serverDescription.label "Descripción: ">
+<!ENTITY serverName.label "Nombre del servidor: ">
+<!ENTITY serverPort.label "Puerto: ">
+<!ENTITY userName.label   "Nombre de usuario: ">
+<!ENTITY connectionSecurity.label "Conexión segura: ">
+<!ENTITY useSecureAuthentication.label   "Autenticación segura: ">
--- a/suite/chrome/mailnews/pref/am-copies.dtd
+++ b/suite/chrome/mailnews/pref/am-copies.dtd
@@ -1,35 +1,37 @@
 <!-- extracted from am-copies.xul -->
 
-<!ENTITY copyAndFolderTitle.label "Copies &amp; Folders">
-<!ENTITY sendingPrefix.label "When sending messages, automatically: ">
-<!ENTITY fccMailFolder.label "Place a copy in:">
-<!ENTITY fccMailFolder.accesskey "P">
-<!ENTITY fccReplyFollowsParent.label "Place replies in the folder of the message being replied to">
+<!ENTITY copyAndFolderTitle.label "Copias y carpetas">
+<!ENTITY sendingPrefix.label "Al enviar mensajes, automáticamente: ">
+<!ENTITY fccMailFolder.label "Dejar una copia en:">
+<!ENTITY fccMailFolder.accesskey "p">
+<!ENTITY fccReplyFollowsParent.label "Dejar las respuestas en la carpeta del mensaje al que se está respondiendo">
 <!ENTITY fccReplyFollowsParent.accesskey "c">
-<!ENTITY chooseFolderButton.label "Choose Folder…">
 <!-- LOCALIZATION NOTE (bccAddress.label): do not translate "Bcc" in below line -->
-<!ENTITY bccAddress.label "Bcc these email addresses:">
-<!ENTITY bccAddress.accesskey "B">
-<!ENTITY specialFolderTitle.label "Special Folders">
-<!ENTITY draftMailFolder.label "Keep message drafts in:">
-<!ENTITY templateMailFolder.label "Keep message templates in:">
-<!ENTITY saveMessageDlg.label "Show confirmation dialog when messages are saved">
-<!ENTITY saveMessageDlg.accesskey "w">
+<!ENTITY bccAddress.label "Cco a estas direcciones:">
+<!ENTITY bccAddress.accesskey "C">
+<!ENTITY saveMessageDlg.label "Mostrar diálogo de confirmación cuando se guarden los mensajes">
+<!ENTITY saveMessageDlg.accesskey "M">
 <!-- LOCALIZATION NOTE (sentFolderOn.label): OK to translate this, bug #57440 -->
-<!ENTITY sentFolderOn.label "&quot;Sent&quot; Folder on:">
-<!ENTITY sentFolderOn.accesskey "S">
-<!ENTITY sentInOtherFolder.label "Other:">
+<!ENTITY sentFolderOn.label "Carpeta &quot;Enviados&quot; en:">
+<!ENTITY sentFolderOn.accesskey "s">
+<!ENTITY sentInOtherFolder.label "Otra carpeta:">
 <!ENTITY sentInOtherFolder.accesskey "O">
 <!-- LOCALIZATION NOTE (draftsFolderOn.label): OK to translate this, bug #57440 -->
-<!ENTITY draftsFolderOn.label "&quot;Drafts&quot; Folder on:">
-<!ENTITY draftsFolderOn.accesskey "D">
-<!ENTITY draftInOtherFolder.label "Other:">
+<!ENTITY draftsFolderOn.label "Carpeta &quot;Borradores&quot; en:">
+<!ENTITY draftsFolderOn.accesskey "d">
+<!ENTITY draftInOtherFolder.label "Otra carpeta:">
 <!ENTITY draftInOtherFolder.accesskey "t">
+<!-- LOCALIZATION NOTE (archivesFolderOn.label): OK to translate this, bug #57440 -->
+<!ENTITY archivesFolderOn.label "Carpeta de &quot;Archivos&quot;:">
+<!ENTITY archivesFolderOn.accesskey "A">
+<!ENTITY archiveInOtherFolder.label "Otra carpeta:">
+<!ENTITY archiveInOtherFolder.accesskey "d">
 <!-- LOCALIZATION NOTE (templatesFolderOn.label): OK to translate this, bug #57440 -->
-<!ENTITY templatesFolderOn.label "&quot;Templates&quot; Folder on:">
-<!ENTITY templatesFolderOn.accesskey "m">
-<!ENTITY templateInOtherFolder.label "Other:">
+<!ENTITY templatesFolderOn.label "Carpeta &quot;Plantillas&quot; en:">
+<!ENTITY templatesFolderOn.accesskey "C">
+<!ENTITY templateInOtherFolder.label "Otra carpeta:">
 <!ENTITY templateInOtherFolder.accesskey "e">
-<!ENTITY specialFoldersTitle.label "Drafts and Templates">
-<!ENTITY keepDrafts.label "Keep message drafts in:">
-<!ENTITY keepTempltes.label "Keep message templates in:">
+<!ENTITY specialFoldersTitle.label "Borradores, Archivos y Plantillas">
+<!ENTITY keepDrafts.label "Mantener los borradores de mensajes en:">
+<!ENTITY keepArchives.label "Guardar archivos de mensajes en:">
+<!ENTITY keepTempltes.label "Mantener las plantillas de mensajes en:">
--- a/suite/chrome/mailnews/pref/am-identities-list.dtd
+++ b/suite/chrome/mailnews/pref/am-identities-list.dtd
@@ -1,8 +1,7 @@
-<!ENTITY identitiesListTitle.label "Identities Associated With This Account">
-<!ENTITY identitiesListDesc.label "Multiple Identities Support">
-<!ENTITY identitiesListAdd.label  "Add…">
+<!ENTITY identitiesListDesc.label "Soporte para múltiples identidades">
+<!ENTITY identitiesListAdd.label  "Agregar…">
 <!ENTITY identitiesListAdd.accesskey  "A">
-<!ENTITY identitiesListEdit.label "Edit…">
+<!ENTITY identitiesListEdit.label "Editar…">
 <!ENTITY identitiesListEdit.accesskey "E">
-<!ENTITY identitiesListDelete.label "Delete">
-<!ENTITY identitiesListDelete.accesskey "D">
+<!ENTITY identitiesListDelete.label "Borrar">
+<!ENTITY identitiesListDelete.accesskey "B">
--- a/suite/chrome/mailnews/pref/am-identity-edit.dtd
+++ b/suite/chrome/mailnews/pref/am-identity-edit.dtd
@@ -1,6 +1,7 @@
-<!ENTITY identityTitle.label "Identity Settings">
-<!ENTITY identityListDesc.label "Configure the settings for this identity:">
+<!ENTITY identityDialog.style "width: 67ch;">
+<!ENTITY identityTitle.label "Configuración de la identidad">
+<!ENTITY identityListDesc.label "Establecer la configuración para esta identidad:">
 
-<!ENTITY settingsTab.label       "Settings">
-<!ENTITY copiesFoldersTab.label "Copies &amp; Folders">
-<!ENTITY addressingTab.label    "Composition &amp; Addressing">
+<!ENTITY settingsTab.label       "Opciones">
+<!ENTITY copiesFoldersTab.label "Copias y carpetas">
+<!ENTITY addressingTab.label    "Redacción y direcciones">
--- a/suite/chrome/mailnews/pref/am-main.dtd
+++ b/suite/chrome/mailnews/pref/am-main.dtd
@@ -1,35 +1,37 @@
 <!-- extracted from am-main.xul -->
 
-<!ENTITY accountTitle.label "Account Settings">
-<!ENTITY accountName.label "Account Name:">
+<!ENTITY accountTitle.label "Configuración de cuenta">
+<!ENTITY accountName.label "Nombre de la cuenta:">
 <!ENTITY accountName.accesskey "N">
-<!ENTITY accountNameDesc.label "The account name is used to identify each account">
-<!ENTITY identityTitle.label "Default Identity">
-<!ENTITY identityDesc.label "Each account has an identity, which is the information that other people see when they read your messages.">
-<!ENTITY name.label "Your Name:">
-<!ENTITY name.accesskey "Y">
-<!ENTITY email.label "Email Address:">
-<!ENTITY email.accesskey "E">
-<!ENTITY replyTo.label "Reply-to Address:">
+<!ENTITY identityTitle.label "Identidad">
+<!ENTITY identityDesc.label "Cada cuenta tiene una identidad, que es la información que otras personas verán al leer sus mensajes.">
+<!ENTITY name.label "Su nombre:">
+<!ENTITY name.accesskey "b">
+<!ENTITY email.label "Dirección de correo electrónico:">
+<!ENTITY email.accesskey "e">
+<!ENTITY replyTo.label "Dirección de respuesta:">
 <!ENTITY replyTo.accesskey "s">
-<!ENTITY organization.label "Organization:">
+<!ENTITY organization.label "Organización:">
 <!ENTITY organization.accesskey "O">
-<!ENTITY signature.label "Attach this signature:">
-<!ENTITY signature.accesskey "t">
-<!ENTITY edit.label "Edit…">
-<!ENTITY choose.label "Choose…">
-<!ENTITY choose.accesskey "C">
-<!ENTITY editVCard.label "Edit Card…">
+<!ENTITY signatureText.label "Texto de la firma:">
+<!ENTITY signatureText.accesskey "x">
+<!ENTITY signatureHtml.label "Usar HTML (ej.: &lt;b&gt;negrita&lt;/b&gt;)">
+<!ENTITY signatureHtml.accesskey "L">
+<!ENTITY signatureFile.label "Adjuntar la firma desde un archivo (texto, HTML o imagen):">
+<!ENTITY signatureFile.accesskey "t">
+<!ENTITY choose.label "Seleccionar…">
+<!ENTITY choose.accesskey "c">
+<!ENTITY editVCard.label "Editar tarjeta…">
 <!ENTITY editVCard.accesskey "d">
 <!-- LOCALIZATION NOTE (attachVCard.label) : do not translate "vCard" in below line -->
-<!ENTITY attachVCard.label "Attach my vCard to messages">
-<!ENTITY attachVCard.accesskey "v">
+<!ENTITY attachVCard.label "Adjuntar mi tarjeta en los mensajes.">
+<!ENTITY attachVCard.accesskey "t">
 
-<!ENTITY manageIdentities.label "Manage Identities…">
-<!ENTITY manageIdentities.accesskey "M">
+<!ENTITY manageIdentities.label "Administrar identidades…">
+<!ENTITY manageIdentities.accesskey "m">
 
 <!-- LOCALIZATION NOTE (smtpName.label) : do not translate "SMTP" in below line -->
-<!ENTITY smtpName.label "Outgoing Server (SMTP):">
-<!ENTITY smtpName.accesskey "u">
-<!ENTITY smtpDefaultServer.label "Use Default Server">
+<!ENTITY smtpName.label "Servidor saliente (SMTP):">
+<!ENTITY smtpName.accesskey "v">
+<!ENTITY smtpDefaultServer.label "Usar servidor predeterminado">
 
--- a/suite/chrome/mailnews/pref/am-offline.dtd
+++ b/suite/chrome/mailnews/pref/am-offline.dtd
@@ -1,34 +1,54 @@
-<!ENTITY doNotDownloadPop3Movemail.label "To save disk space, do not download:">
-<!ENTITY doNotDownload.label "To save disk space, do not download for offline use:">
-<!ENTITY offlineNewFolder.label "When I create new folders, select them for offline use">
-<!ENTITY offlineNewFolder.accesskey "c">
-<!ENTITY offlineNotDownload.label "Messages larger than">
+<!ENTITY doNotDownloadPop3Movemail.label "Para ahorrar espacio en disco, no descargar:">
+<!ENTITY doNotDownloadNntp.label "Para ahorrar espacio en disco, no descargar para su uso sin conexión:">
+<!ENTITY doNotDownloadImap.label "Para ahorrar espacio en disco, la descarga de mensajes del servidor manteniendo copias locales para usar sin conexión puede ser restringida por antigüedad o tamaño.">
+<!ENTITY allFoldersOffline.label "Mantener mensajes para esta cuenta en esta computadora">
+<!ENTITY allFoldersOffline.accesskey "o">
+<!ENTITY offlineNotDownload.label "Mensajes de tamaño superior a">
 <!ENTITY offlineNotDownload.accesskey "M">
+<!ENTITY autosyncNotDownload.label "No descargar mensajes más grandes que">
+<!ENTITY autosyncNotDownload.accesskey "m">
 <!ENTITY kb.label "KB">
-<!ENTITY days.label "days">
-<!ENTITY daysOld.label "days old">
-<!ENTITY message.label "messages">
-<!ENTITY nntpNotDownloadRead.label "Read messages">
-<!ENTITY nntpNotDownloadRead.accesskey "d">
-<!ENTITY nntpDownloadMsg.label "Messages more than">
+<!ENTITY daysOld.label "días de antigüedad">
+<!ENTITY message.label "mensajes">
+<!ENTITY nntpNotDownloadRead.label "Mensajes leídos">
+<!ENTITY nntpNotDownloadRead.accesskey "l">
+<!ENTITY nntpDownloadMsg.label "Mensajes de más de">
 <!ENTITY nntpDownloadMsg.accesskey "e">
-<!ENTITY retentionCleanup.label "To recover disk space, old messages can be permanently deleted">
-<!ENTITY retentionKeepMsg.label "Delete messages more than">
-<!ENTITY retentionKeepMsg.accesskey "t">
-<!ENTITY retentionKeepAll.label "Don't delete any messages">
-<!ENTITY retentionKeepAll.accesskey "n">
-<!ENTITY retentionKeepNew.label "Delete all but the last">
-<!ENTITY retentionKeepNew.accesskey "b">
-<!ENTITY retentionKeepUnread.label "Always delete read messages">
-<!ENTITY retentionKeepUnread.accesskey "w">
-<!ENTITY nntpRemoveBody.label "Only message bodies less than">
-<!ENTITY nntpRemoveBody.accesskey "O">
-<!ENTITY offlineSelectNntp.label "Select newsgroups for offline use…">
+<!ENTITY retentionCleanup.label "Para recuperar espacio en disco, los mensajes viejos pueden ser borrados permanentemente.">
+<!ENTITY retentionCleanupImap.label "Para recuperar espacio en disco, los mensajes viejos pueden ser borrados permanentemente, tanto las copias locales como sus originales en el servidor.">
+<!ENTITY retentionCleanupPop.label "Para recuperar espacio en disco, los mensajes viejos pueden ser borrados permanentemente, incluyendo los originales en el servidor.">
+<!ENTITY retentionKeepMsg.label "Borrar mensajes de más de">
+<!ENTITY retentionKeepMsg.accesskey "B">
+<!ENTITY retentionKeepAll.label "No borrar ningún mensaje">
+<!ENTITY retentionKeepAll.accesskey "N">
+<!ENTITY retentionKeepRecent.label "Borrar todos excepto los más recientes">
+<!ENTITY retentionKeepRecent.accesskey "B">
+<!-- LOCALIZATION NOTE: Unhide with .keepUnreadOnly { display: -moz-box; } -->
+<!ENTITY retentionKeepUnreadHidden.label "Siempre eliminar los mensajes leídos (invalida configuraciones de tiempo)">
+<!ENTITY retentionApplyToFlagged.label "Siempre guardar los mensajes etiquetados">
+<!ENTITY retentionApplyToFlagged.accesskey "e">
+<!ENTITY nntpRemoveMsgBody.label "Eliminar cuerpos de los mensajes de más de">
+<!ENTITY nntpRemoveMsgBody.accesskey "o">
+<!ENTITY offlineSelectNntp.label "Seleccionar grupos de noticias para su uso sin conexión…">
 <!ENTITY offlineSelectNntp.accesskey "S">
-<!ENTITY offlineSelectImap.label "Select folders for offline use…">
-<!ENTITY offlineSelectImap.accesskey "S">
-<!ENTITY offlineDesc.label "You can download your messages locally so that they are available when you are working offline.">
-<!ENTITY makeInboxMsgsAvailable.label "Make the messages in my Inbox available when I am working offline">
-<!ENTITY makeInboxMsgsAvailable.accesskey "k">
-<!ENTITY offlineGroupTitle.label "Offline">
-<!ENTITY diskspaceGroupTitle.label "Disk Space">
+<!ENTITY offlineImapAdvancedOffline.label "Avanzadas…">
+<!ENTITY offlineImapAdvancedOffline.accesskey "A">
+<!ENTITY syncGroupTitle.label "Sincronización de mensajes">
+<!ENTITY diskspaceGroupTitle.label "Espacio en disco">
+
+<!-- LOCALIZATION NOTE: (ageAutosyncBefore.label, ageAutosyncMiddle.label, ageAutosyncAfter.label):
+  The entities ageAutosyncBefore.label, ageAutosyncMiddle.label, and ageAutosyncAfter.label appear
+  on a single line within the scope of useAutosync.ByAge as follows:
+
+  &ageAutosyncBefore.label [textbox for autosync value] &ageAutosyncMiddle.label; [dropdown for autosync interval] &ageAutosyncAfter.label;
+-->
+<!ENTITY allAutosync.label               "Sincronizar todos los mensajes localmente sin importar la antigüedad">
+<!ENTITY allAutosync.accesskey           "c">
+<!ENTITY ageAutosyncBefore.label         "Sincronizar los más recientes">
+<!ENTITY ageAutosync.accesskey           "z">
+<!ENTITY ageAutosyncMiddle.label         "">
+<!ENTITY dayAgeInterval.label            "Días">
+<!ENTITY weekAgeInterval.label           "Semanas">
+<!ENTITY monthAgeInterval.label          "Meses">
+<!ENTITY yearAgeInterval.label           "Años">
+<!ENTITY ageAutosyncAfter.label          "">
--- a/suite/chrome/mailnews/pref/am-server-advanced.dtd
+++ b/suite/chrome/mailnews/pref/am-server-advanced.dtd
@@ -1,33 +1,31 @@
-<!ENTITY serverAdvanced.label "Advanced Account Settings">
+<!ENTITY serverAdvanced.label "Configuración avanzada de cuentas">
 <!-- LOCALIZATION NOTE (serverDirectory.label): DONT_TRANSLATE "IMAP" -->
-<!ENTITY imapAdvanced.label "Advanced IMAP Server Settings">
-<!ENTITY serverDirectory.label "IMAP server directory:">
-<!ENTITY serverDirectory.accesskey "d">
-<!ENTITY usingSubscription.label "Show only subscribed folders">
-<!ENTITY usingSubscription.accesskey "w">
-<!ENTITY dualUseFolders.label "Server supports folders that contain sub-folders and messages">
-<!ENTITY dualUseFolders.accesskey "f">
-<!ENTITY useIdle.label "Use IDLE command if the server supports it">
+<!ENTITY serverDirectory.label "Directorio del servidor IMAP:">
+<!ENTITY serverDirectory.accesskey "D">
+<!ENTITY usingSubscription.label "Mostrar sólo las carpetas suscriptas">
+<!ENTITY usingSubscription.accesskey "u">
+<!ENTITY dualUseFolders.label "El servidor soporta carpetas que contengan subcarpetas y mensajes">
+<!ENTITY dualUseFolders.accesskey "E">
+<!ENTITY useIdle.label "Usar comando IDLE si el servidor lo soporta">
 <!ENTITY useIdle.accesskey "I">
-<!ENTITY maximumConnectionsNumber.label "Maximum number of server connections to cache">
-<!ENTITY maximumConnectionsNumber.accesskey "M">
+<!ENTITY maximumConnectionsNumber.label "Número máximo de conexiones del servidor a caché">
+<!ENTITY maximumConnectionsNumber.accesskey "m">
 <!-- LOCALIZATION NOTE (namespaceDesc.label): DONT_TRANSLATE "IMAP" -->
-<!ENTITY namespaceDesc.label "These preferences specify the namespaces on your IMAP server">
-<!ENTITY personalNamespace.label "Personal namespace:">
-<!ENTITY personalNamespace.accesskey "P">
-<!ENTITY publicNamespace.label "Public (shared):">
-<!ENTITY publicNamespace.accesskey "u">
-<!ENTITY otherUsersNamespace.label "Other Users:">
+<!ENTITY namespaceDesc.label "Estas preferencias especifican los espacios de nombres en su servidor IMAP">
+<!ENTITY personalNamespace.label "Espacio de nombres personal:">
+<!ENTITY personalNamespace.accesskey "p">
+<!ENTITY publicNamespace.label "Público (compartido):">
+<!ENTITY publicNamespace.accesskey "b">
+<!ENTITY otherUsersNamespace.label "Otros usuarios:">
 <!ENTITY otherUsersNamespace.accesskey "O">
-<!ENTITY overrideNamespaces.label "Allow server to override these namespaces">
-<!ENTITY overrideNamespaces.accesskey "A">
-<!ENTITY pop3Desc.label "When downloading pop mail for this server, use the following folder for new mail:" >
-<!ENTITY folderStorage.label "Where to store mail">
-<!ENTITY globalInbox.label "Global Inbox (Local Folders Account)">
-<!ENTITY globalInbox.accesskey "G">
-<!ENTITY accountDirectory.label "Inbox for this server's account">
-<!ENTITY accountDirectory.accesskey "S">
-<!ENTITY deferToServer.label "Inbox for different account">
-<!ENTITY deferToServer.accesskey "D">
-<!ENTITY deferGetNewMail.label "Include this server when getting new mail">
+<!ENTITY overrideNamespaces.label "Permitir que el servidor reemplace estos espacios de nombres">
+<!ENTITY overrideNamespaces.accesskey "a">
+<!ENTITY pop3Desc.label "Al descargar el correo pop de este servidor, usar la siguiente carpeta para correo nuevo:" >
+<!ENTITY globalInbox.label "Bandeja de entrada global (Carpetas locales)">
+<!ENTITY globalInbox.accesskey "g">
+<!ENTITY accountDirectory.label "Bandeja de entrada para la cuenta de este servidor">
+<!ENTITY accountDirectory.accesskey "s">
+<!ENTITY deferToServer.label "Bandeja de entrada para una cuenta diferente">
+<!ENTITY deferToServer.accesskey "d">
+<!ENTITY deferGetNewMail.label "Incluir este servidor al recibir correo nuevo">
 <!ENTITY deferGetNewMail.accesskey "I">
--- a/suite/chrome/mailnews/pref/am-server-top.dtd
+++ b/suite/chrome/mailnews/pref/am-server-top.dtd
@@ -1,94 +1,78 @@
 <!-- extracted from am-server-top.xul -->
 
-<!ENTITY securitySettings.label "Security Settings">
-<!ENTITY serverSettings.label "Server Settings">
-<!-- LOCALIZATION NOTE (popServer.label) : do not translate "POP" in below line -->
-<!ENTITY popServer.label "POP Mail Server">
-<!-- LOCALIZATION NOTE (imapServer.label) : do not translate "IMAP" in below line -->
-<!ENTITY imapServer.label "IMAP Mail Server">
-<!-- LOCALIZATION NOTE (newsServer.label) : do not translate "NNTP" in below line -->
-<!ENTITY newsServer.label "News Server (NNTP)">
-<!ENTITY webmail.label "WebMail account">
-<!ENTITY serverType.label "Server Type:">
-<!ENTITY serverName.label "Server Name:">
-<!ENTITY serverName.accesskey "S">
-<!ENTITY userName.label "User Name:">
+<!ENTITY securitySettings.label "Opciones de seguridad">
+<!ENTITY serverSettings.label "Configuración del servidor">
+<!ENTITY serverType.label "Tipo de servidor:">
+<!ENTITY serverName.label "Nombre del servidor:">
+<!ENTITY serverName.accesskey "s">
+<!ENTITY userName.label "Nombre de usuario:">
 <!ENTITY userName.accesskey "N">
-<!ENTITY port.label "Port:">
+<!ENTITY port.label "Puerto:">
 <!ENTITY port.accesskey "P">
-<!ENTITY serverPortDefault.label "Default:">
-<!ENTITY savePassword.label "Save password">
+<!ENTITY serverPortDefault.label "Predeterminado:">
 <!-- LOCALIZATION NOTE (biffStart.label) : translate below 2 line with grammer dependency
         For example, in Japanese cases:
                 biffStart.label "every"
                 biffEnd.label   "minutes for new messages Check"
 -->
-<!ENTITY biffStart.label "Check for new messages every ">
-<!ENTITY biffStart.accesskey "y">
-<!ENTITY biffEnd.label "minutes">
-<!ENTITY isSecure.label "Use secure connection (SSL)">
-<!ENTITY isSecure.accesskey "U">
-<!ENTITY socketType.label "Use secure connection:">
-<!ENTITY neverSecure.label "Never">
-<!ENTITY neverSecure.accesskey "N">
-<!ENTITY sometimesSecure.label "TLS, if available">
-<!ENTITY sometimesSecure.accesskey "a">
-<!ENTITY alwaysSecure.label "TLS">
-<!ENTITY alwaysSecure.accesskey "T">
-<!ENTITY alwaysSSL.label "SSL">
-<!ENTITY alwaysSSL.accesskey "L">
-<!ENTITY useSecAuth.label "Use secure authentication">
+<!ENTITY biffStart.label "Buscar nuevos mensajes cada ">
+<!ENTITY biffStart.accesskey "B">
+<!ENTITY biffEnd.label "minutos">
+<!ENTITY connectionSecurity.label "Seguridad de la conexión:">
+<!ENTITY connectionSecurity.accesskey "u">
+<!ENTITY connectionSecurityType-0.label "Ninguna">
+<!ENTITY connectionSecurityType-1.label "STARTTLS, si está disponible">
+<!ENTITY connectionSecurityType-2.label "STARTTLS">
+<!ENTITY connectionSecurityType-3.label "SSL/TLS">
+<!ENTITY useSecAuth.label "Usar autenticación segura">
 <!ENTITY useSecAuth.accesskey "i">
-<!ENTITY leaveOnServer.label "Leave messages on server">
-<!ENTITY leaveOnServer.accesskey "g">
-<!ENTITY headersOnly.label "Fetch headers only">
-<!ENTITY headersOnly.accesskey "f">
-<!ENTITY deleteByAgeFromServer.label "For at most">
+<!ENTITY leaveOnServer.label "Dejar los mensajes en el servidor.">
+<!ENTITY leaveOnServer.accesskey "D">
+<!ENTITY headersOnly.label "Descargar sólo los encabezados">
+<!ENTITY headersOnly.accesskey "e">
+<!ENTITY deleteByAgeFromServer.label "Por al menos">
 <!ENTITY deleteByAgeFromServer.accesskey "o">
-<!ENTITY daysEnd.label "days">
-<!ENTITY deleteOnServer2.label "Until I delete them">
-<!ENTITY deleteOnServer2.accesskey "d">
-<!ENTITY downloadOnBiff.label "Automatically download new messages">
+<!ENTITY daysEnd.label "días">
+<!ENTITY deleteOnServer2.label "Hasta que los borre">
+<!ENTITY deleteOnServer2.accesskey "H">
+<!ENTITY downloadOnBiff.label "Descargar automáticamente los mensajes nuevos">
 <!ENTITY downloadOnBiff.accesskey "m">
-<!ENTITY hostname.label "Server Hostname">
-<!ENTITY username.label "Your Login Name">
-<!-- LOCALIZATION NOTE (popServerTitle.label) : do not translate "POP" in below line -->
-<!ENTITY popServerTitle.label "POP Server Information">
-<!ENTITY deleteMessagePrefix.label "When I delete a message:">
-<!ENTITY modelMoveToTrash.label "Move it to this folder:">
+<!ENTITY username.label "Su nombre de usuario">
+<!ENTITY deleteMessagePrefix.label "Cuando borre un mensaje:">
+<!ENTITY modelMoveToTrash.label "Moverlo a esta carpeta:">
 <!ENTITY modelMoveToTrash.accesskey "o">
-<!ENTITY modelMarkDeleted.label "Just mark it as deleted">
-<!ENTITY modelMarkDeleted.accesskey "k">
-<!ENTITY modelDeleteImmediately.label "Remove it immediately">
+<!ENTITY modelMarkDeleted.label "Marcarlo como borrado">
+<!ENTITY modelMarkDeleted.accesskey "M">
+<!ENTITY modelDeleteImmediately.label "Eliminarlo inmediatamente">
 <!ENTITY modelDeleteImmediately.accesskey "d">
 <!-- LOCALIZATION NOTE (expungeOnExit.label) : do not translate two of "&quot;" in below line -->
 <!ENTITY expungeOnExit.label "Clean up (&quot;Expunge&quot;) Inbox on Exit">
-<!ENTITY expungeOnExit.accesskey "E">
-<!ENTITY emptyTrashOnExit.label "Empty Trash on Exit">
-<!ENTITY emptyTrashOnExit.accesskey "x">
-<!ENTITY loginAtStartup.label "Check for new messages at startup"> 
+<!ENTITY expungeOnExit.accesskey "e">
+<!ENTITY emptyTrashOnExit.label "Vaciar la papelera al salir">
+<!ENTITY emptyTrashOnExit.accesskey "V">
+<!ENTITY loginAtStartup.label "Comprobar si hay mensajes nuevos al iniciar"> 
 <!ENTITY loginAtStartup.accesskey "C">
 <!-- LOCALIZATION NOTE (maxMessagesStart.label) : translate below 2 lines with grammar dependency 
     maxMessengerStart.label will be followed by maxMessagesEnd.label with the number
 	 of messages between them
 -->
-<!ENTITY maxMessagesStart.label "Ask me before downloading more than">
+<!ENTITY maxMessagesStart.label "Preguntarme antes de descargar más de">
 <!ENTITY maxMessagesStart.accesskey "m">
 <!-- LOCALIZATION NOTE (maxMessagesEnd.label) : see note for maxMessagesStart.label -->
-<!ENTITY maxMessagesEnd.label "messages">
-<!ENTITY alwaysAuthenticate.label "Always request authentication when connecting to this server">
-<!ENTITY alwaysAuthenticate.accesskey "w">
-<!ENTITY newsrcFilePath.label "newsrc file:">
-<!ENTITY localPath.label "Local directory:">
-<!ENTITY abbreviate.label "Show newsgroup names in the Mail Folder pane as:">
-<!ENTITY abbreviateOn.label "Full names (For example, 'netscape.public.mozilla.mail-news')">
-<!ENTITY abbreviateOff.label "Abbreviate names (For example, 'n.p.m.mail-news')">
-<!ENTITY advancedButton.label "Advanced…">
-<!ENTITY serverDefaultCharset.label "Default Character Encoding:">
+<!ENTITY maxMessagesEnd.label "mensajes">
+<!ENTITY alwaysAuthenticate.label "Siempre solicitar autenticación cuando se conecte con este servidor">
+<!ENTITY alwaysAuthenticate.accesskey "S">
+<!ENTITY newsrcFilePath.label "archivo newsrc:">
+<!ENTITY localPath.label "Directorio local:">
+<!ENTITY abbreviate.label "Mostrar nombres de los grupos de noticias en la vista de carpeta de correo como:">
+<!ENTITY abbreviateOn.label "Nombres completos (Por ejemplo, 'netscape.public.mozilla.mail-news')">
+<!ENTITY abbreviateOff.label "Nombres abreviados (Por ejemplo,'n.p.m.mail-news')">
+<!ENTITY advancedButton.label "Avanzadas…">
+<!ENTITY serverDefaultCharset.label "Codificación de caracteres predeterminada:">
 <!ENTITY advancedButton.accesskey "v">
-<!ENTITY localFolderPicker.label "Select Local Directory">
-<!ENTITY browseFolder.label "Browse…">
-<!ENTITY browseFolder.accesskey "B">
-<!ENTITY newsrcPicker.label "Select newsrc File">
-<!ENTITY browseNewsrc.label "Browse…">
-<!ENTITY browseNewsrc.accesskey "e">
+<!ENTITY localFolderPicker.label "Seleccione directorio local">
+<!ENTITY browseFolder.label "Examinar…">
+<!ENTITY browseFolder.accesskey "E">
+<!ENTITY newsrcPicker.label "Seleccionar archivo newsrc">
+<!ENTITY browseNewsrc.label "Examinar…">
+<!ENTITY browseNewsrc.accesskey "E">
--- a/suite/chrome/mailnews/pref/mailPrefsOverlay.dtd
+++ b/suite/chrome/mailnews/pref/mailPrefsOverlay.dtd
@@ -1,24 +1,21 @@
 <!-- These are added to the Advanced - Scripts & Plugins panel -->
-<!ENTITY enbJsCheckMailNews.label         "Mail &amp; Newsgroups">
-<!ENTITY enbJsCheckMailNews.accesskey     "M">
-<!ENTITY enbPluginCheckMailNews.label     "Mail &amp; Newsgroups">
+<!ENTITY enbPluginCheckMailNews.label     "Correo y noticias">
 <!ENTITY enbPluginCheckMailNews.accesskey "a">
 
 <!-- These are added to the Window menu -->
-<!ENTITY mail.label                       "Mail &amp; Newsgroups">
-<!ENTITY mail.accesskey                   "M">
-<!ENTITY addressbook.label                "Address Book">
-<!ENTITY addressbook.accesskey            "A">
+<!ENTITY mail.label                       "Correo y noticias">
+<!ENTITY mail.accesskey                   "C">
+<!ENTITY addressbook.label                "Libreta de direcciones">
+<!ENTITY addressbook.accesskey            "d">
 
 <!-- These are added to Preferences dialog -->
-<!ENTITY viewingMessages.label            "Message Display">
-<!ENTITY notifications.label              "Notifications">
-<!ENTITY address.label                    "Addressing">
-<!ENTITY composingMessages.label          "Composition">
-<!ENTITY format.label                     "Send Format">
-<!ENTITY return.label                     "Return Receipts">
-<!ENTITY disk.label                       "Disk Space">
-<!ENTITY junk.label                       "Junk Mail">
+<!ENTITY viewingMessages.label            "Vista de Mensajes">
+<!ENTITY notifications.label              "Notificaciones">
+<!ENTITY address.label                    "Direcciones">
+<!ENTITY composingMessages.label          "Redacción">
+<!ENTITY format.label                     "Formato de envío">
+<!ENTITY return.label                     "Acuses de recibo">
+<!ENTITY junk.label                       "Correo basura">
 <!ENTITY tags.label                       "Tags">
-<!ENTITY characterEncoding.label          "Character Encoding">
-<!ENTITY offline.label                    "Offline &amp; Disk Space">
+<!ENTITY characterEncoding.label          "Codificación de caracteres">
+<!ENTITY networkStorage.label             "Red y almacenamiento">
--- a/suite/chrome/mailnews/pref/pref-addressing.dtd
+++ b/suite/chrome/mailnews/pref/pref-addressing.dtd
@@ -30,27 +30,26 @@
  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 pref.addressing.title                 "Addressing">
-<!ENTITY emailCollectiontitle.label            "Email Address Collection">
-<!ENTITY emailCollectionPicker.label           "Add email addresses to my:">
-<!ENTITY emailCollectionPicker.accesskey       "m">
-<!ENTITY emailCollectiontext.label             "Email addresses from outgoing messages can be automatically added to a local address book.">
+<!ENTITY pref.addressing.title                 "Direcciones">
+<!ENTITY emailCollectiontitle.label            "Colección de cuentas de correo">
+<!ENTITY emailCollectionPicker.label           "Agregar dirección de correo a:">
+<!ENTITY emailCollectionPicker.accesskey       "c">
+<!ENTITY emailCollectiontext.label             "Las direcciones de correo de los mensajes que llegan pueden agregarse automáticamente a la libreta de direcciones local.">
 
 <!-- Autocompletion -->
-<!ENTITY addressingTitle.label                 "Address Autocompletion">
-<!ENTITY highlightNonMatches.label             "Highlight addresses that do not autocomplete">
+<!ENTITY addressingTitle.label                 "Autocompletar direcciones">
+<!ENTITY highlightNonMatches.label             "Remarcar direcciones que no se completan automáticamente">
 <!ENTITY highlightNonMatches.accesskey         "a">
-<!ENTITY addressingEnable.label                "Local Address Books">
+<!ENTITY addressingEnable.label                "Libretas de direcciones locales">
 <!ENTITY addressingEnable.accesskey            "L">
-<!ENTITY autocompleteText.label                "When addressing messages, look for matching entries in:">
-<!ENTITY directories.label                     "Directory Server:">
-<!ENTITY directories.accesskey                 "D">
-<!ENTITY editDirectories.label                 "Edit Directories…">
+<!ENTITY autocompleteText.label                "Al escribir una dirección, buscar coincidencias en:">
+<!ENTITY directories.label                     "Servidor de directorios:">
+<!ENTITY directories.accesskey                 "d">
+<!ENTITY directoriesNone.label                 "Ninguno">
+<!ENTITY editDirectories.label                 "Editar directorios…">
 <!ENTITY editDirectories.accesskey             "E">
-<!ENTITY matchText.label                       "If there is a match in your local address books:">
-<!ENTITY skipDirectory.label                   "Do not search in the directory">
--- a/suite/chrome/mailnews/pref/pref-directory-add.dtd
+++ b/suite/chrome/mailnews/pref/pref-directory-add.dtd
@@ -30,46 +30,50 @@
  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 newDirectoryTitle.label           "Directory Server Properties">
-<!ENTITY directoryName.label               "Name: ">
-<!ENTITY directoryName.accesskey           "n">
-<!ENTITY directoryHostname.label           "Hostname: ">
+<!ENTITY newDirectoryTitle.label           "Propiedades del servidor de directorios">
+<!ENTITY directoryName.label               "Nombre: ">
+<!ENTITY directoryName.accesskey           "N">
+<!ENTITY directoryHostname.label           "Servidor: ">
 <!ENTITY directoryHostname.accesskey       "o">
-<!ENTITY directoryBaseDN.label             "Base DN: ">
+<!ENTITY directoryBaseDN.label             "DN base: ">
 <!ENTITY directoryBaseDN.accesskey         "b">
-<!ENTITY findButton.label                  "Find">
-<!ENTITY findButton.accesskey              "f">
-<!ENTITY directorySecure.label             "Use secure connection (SSL)">
+<!ENTITY findButton.label                  "Buscar">
+<!ENTITY findButton.accesskey              "B">
+<!ENTITY directorySecure.label             "Usar conexión segura (SSL)">
 <!ENTITY directorySecure.accesskey         "U">
 <!ENTITY directoryLogin.label              "Bind DN: ">
 <!ENTITY directoryLogin.accesskey          "i">
-<!ENTITY advancedOptionsButton.label       "Advanced Options">
-<!ENTITY advancedOptionsButton.accesskey   "a">
 <!ENTITY General.tab                       "General">
-<!ENTITY Offline.tab                       "Offline">
-<!ENTITY Advanced.tab                      "Advanced">
-<!ENTITY advancedOptionsTitle.label        "Advanced Options">
-<!ENTITY portNumber.label                  "Port number: ">
+<!ENTITY Offline.tab                       "Sin conexión">
+<!ENTITY Advanced.tab                      "Avanzadas">
+<!ENTITY portNumber.label                  "Número de puerto: ">
 <!ENTITY portNumber.accesskey              "p">
-<!ENTITY searchFilter.label                "Search filter: ">
-<!ENTITY searchFilter.accesskey            "f">
-<!ENTITY scope.label                       "Scope: ">
+<!ENTITY searchFilter.label                "Filtro de búsqueda: ">
+<!ENTITY searchFilter.accesskey            "F">
+<!ENTITY scope.label                       "Alcance: ">
 <!ENTITY scope.accesskey                   "c">
-<!ENTITY scopeOneLevel.label               "One Level">
-<!ENTITY scopeOneLevel.accesskey           "L">
+<!ENTITY scopeOneLevel.label               "Un nivel">
+<!ENTITY scopeOneLevel.accesskey           "l">
 <!ENTITY scopeSubtree.label                "Subtree">
 <!ENTITY scopeSubtree.accesskey            "S">
-<!ENTITY return.label                      "Don't return more than">
+<!ENTITY return.label                      "No devolver más que">
 <!ENTITY return.accesskey                  "r">
-<!ENTITY results.label                     "results">
-<!ENTITY offlineText.label                 "You can download a local copy of this directory so that it is available for use when you are working offline.">
+<!ENTITY results.label                     "resultados">
+<!ENTITY offlineText.label                 "Puede descargar una copia local de este directorio para que esté disponible para su uso cuando esté desconectado.">
+<!ENTITY saslMechanism.label               "Método de ingreso: ">
+<!ENTITY saslMechanism.accesskey           "M">
+<!ENTITY saslOff.label                     "Simple">
+<!ENTITY saslOff.accesskey		   "l">
+<!ENTITY saslGSSAPI.label                  "Kerberos (GSSAPI)">
+<!ENTITY saslGSSAPI.accesskey		   "K">
+
 <!-- Localization note: this is here because the width of the dialog 
      is determined by the width of the base DN box; and that is likely
      to vary somewhat with the language.
 -->
 <!ENTITY newDirectoryWidth                 "36em">
--- a/suite/chrome/mailnews/pref/pref-directory.dtd
+++ b/suite/chrome/mailnews/pref/pref-directory.dtd
@@ -31,23 +31,20 @@
  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 ***** -->
 
 <!-- LOCALIZATION NOTE (window.title) : do not translate "LDAP" in below line -->
-<!ENTITY pref.ldap.window.title    "LDAP Directory Servers">
-<!ENTITY directory.label           "Add a directory">
+<!ENTITY pref.ldap.window.title    "Servidores de directorio LDAP">
 <!-- LOCALIZATION NOTE (directories.label) : do not translate "LDAP" in below line -->
-<!ENTITY directories.label         "LDAP Directory Server:">
+<!ENTITY directories.label         "Servidor de directorio LDAP:">
 <!-- LOCALIZATION NOTE (directoriesText.label) : do not translate "LDAP" in below line -->
-<!ENTITY directoriesText.label     "Select an LDAP Directory Server:">
+<!ENTITY directoriesText.label     "Selecionar un servidor de directorio LDAP:">
 <!ENTITY directoriesText.accesskey "S">
-<!-- LOCALIZATION NOTE (autocomplete.title) : do not translate "LDAP" in below line -->
-<!ENTITY autocomplete.title        "LDAP Directory Server">
-<!ENTITY addDirectory.label        "Add">
-<!ENTITY addDirectory.accesskey    "a">
-<!ENTITY editDirectory.label       "Edit">
-<!ENTITY editDirectory.accesskey   "e">
-<!ENTITY deleteDirectory.label     "Delete">
+<!ENTITY addDirectory.label        "Agregar">
+<!ENTITY addDirectory.accesskey    "A">
+<!ENTITY editDirectory.label       "Editar">
+<!ENTITY editDirectory.accesskey   "E">
+<!ENTITY deleteDirectory.label     "Borrar">
 <!ENTITY deleteDirectory.accesskey "d">
--- a/suite/chrome/mailnews/pref/pref-formatting.dtd
+++ b/suite/chrome/mailnews/pref/pref-formatting.dtd
@@ -15,65 +15,59 @@
  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):
+   Ian Neal <iann_bugzilla@blueyonder.co.uk>
 
  Alternatively, the contents of this file may be used under the terms of
  either of 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 pref.formatting.title        "Send Format">
-<!ENTITY sendMail.label               "Send Format">
-<!ENTITY sendMaildesc.label           "When sending formatted (HTML) messages and one or more recipients are not listed as being able to receive HTML:">
-<!ENTITY askMe.label                  "Ask me what to do (Mail prompts you to choose a format)">
-<!ENTITY askMe.accesskey              "k">
-<!ENTITY convertPlain.label           "Convert the message to plain text (some formatting may be lost)">
-<!ENTITY convertPlain.accesskey       "c">
-<!ENTITY sendHTML.label               "Send the message as formatted text (HTML) anyway (some mail programs may not be able to display it)">
+<!ENTITY pref.formatting.title        "Formato de envío">
+<!ENTITY sendMaildesc.label           "Al enviar mensajes con formato (HTML) y uno o más destinatarios no están listados como capaces de recibir HTML:">
+<!ENTITY askMe.label                  "Preguntarme qué hacer (Mail le pide elegir un formato)">
+<!ENTITY askMe.accesskey              "P">
+<!ENTITY convertPlain.label           "Convertir el mensaje a texto plano (se puede perder algún formato)">
+<!ENTITY convertPlain.accesskey       "C">
+<!ENTITY sendHTML.label               "Enviar el mensaje como texto con formato (HTML) de cualquier manera (algunos programas de correo no podrán mostrarlo)">
 <!ENTITY sendHTML.accesskey           "s">
-<!ENTITY sendBoth.label               "Send the message in both plain text and HTML (larger message size)">
-<!ENTITY sendBoth.accesskey           "e">
-<!ENTITY override.label               "You can override these settings for individual messages by using the Options menu while composing a message.">
-<!ENTITY receiveHTML.label            "If you know a particular recipient can receive HTML mail, uncheck the 'Send email as plain text (no HTML)' checkbox on the recipient's Address Book card.">
+<!ENTITY sendBoth.label               "Enviar el mensaje tanto en texto plano como en HTML (el mensaje tendrá más tamaño)">
+<!ENTITY sendBoth.accesskey           "n">
+<!ENTITY override.label               "Puede anular esta opción para mensajes individuales desde el menú Opciones mientras escribe el mensaje.">
 
 <!-- Html and Plain Text Domains  -->
-<!ENTITY domain.title                 "HTML and Plain Text Domains">
-<!ENTITY domaindesc.label             "When you send a message to an address with one of the domain names listed below, Mail automatically sends the message in the preferred format (formatted text or plain text).">
-<!ENTITY HTMLdomaintitle.label        "HTML Domains">
+<!ENTITY domain.title                 "Dominios HTML y texto plano">
+<!ENTITY domaindesc.label             "Cuando envíe un mensaje a una dirección de alguno de los dominios listados debajo, Mail enviará automáticamente el mensaje en el formato preferido (texto con formato o texto plano).">
+<!ENTITY HTMLdomaintitle.label        "Dominios HTML">
 <!ENTITY HTMLdomaintitle.accesskey    "M">
-<!ENTITY PlainTexttitle.label         "Plain Text Domains">
-<!ENTITY PlainTexttitle.accesskey     "p">
-<!ENTITY AddButton.label              "Add…">
-<!ENTITY AddHtmlDomain.accesskey      "a">
-<!ENTITY AddPlainText.accesskey       "d">
-<!ENTITY DeleteButton.label           "Delete">
-<!ENTITY DeleteHtmlDomain.accesskey   "l">
-<!ENTITY DeletePlainText.accesskey    "t">
+<!ENTITY PlainTexttitle.label         "Dominios de texto plano">
+<!ENTITY PlainTexttitle.accesskey     "t">
+<!ENTITY AddButton.label              "Agregar…">
+<!ENTITY AddHtmlDomain.accesskey      "A">
+<!ENTITY AddPlainText.accesskey       "g">
+<!ENTITY DeleteButton.label           "Borrar">
+<!ENTITY DeleteHtmlDomain.accesskey   "B">
+<!ENTITY DeletePlainText.accesskey    "r">
 
-<!-- Add HTML Domain Name -->
-<!ENTITY add.htmltitle                "Add HTML Domain Name">
-<!ENTITY add.htmldomain               "HTML Domain Name:">
-<!ENTITY add.htmldomain.accesskey     "d">
-<!ENTITY add.plaintexttitle           "Add Plain Text Domain Name">
-<!ENTITY add.plaintextdomain          "Plain Text Domain Name:">
-<!ENTITY add.plaintext.accesskey      "d">
+<!-- Add Domain Name -->
+<!ENTITY add.htmltitle                "Agregar un nombre de dominio HTML">
+<!ENTITY add.htmldomain               "Agregar un nombre de dominio HTML">
+<!ENTITY add.plaintexttitle           "Nombre de dominio HTML:">
+<!ENTITY add.plaintextdomain          "Nombre de dominio de texto plano:">
 
+<!ENTITY domainnameError.title        "Error en el nombre de dominio">
 <!-- LOCALIZATION NOTE: do not translate @string@ -->
-<!ENTITY domainnameError.title        "Domain Name Error">
-<!ENTITY duplicationError.label       "The domain name @string@ already exists in this list.">
-
-<!-- LOCALIZATION NOTE: do not translate @string@ -->
-<!ENTITY dualEntryError.label         "A domain name cannot appear in both the HTML and Plain Text lists. The domain name @string@ already exists.">
+<!ENTITY invalidEntryError.label      "El nombre de dominio @string@ no es válido y será ignorado. Los nombres de dominio válidos deben incluír al menos un '.' y caracteres a ambos lados del mismo.">
--- a/suite/chrome/mailnews/pref/pref-junk.dtd
+++ b/suite/chrome/mailnews/pref/pref-junk.dtd
@@ -29,32 +29,44 @@
    - 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 LGPL or the GPL. 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 pref.junk.title "Junk Mail">
-<!ENTITY junkSettings.caption "Global Junk Mail Settings">
-<!ENTITY junkMail.intro "Goto Account Settings to configure account specific junk mail settings.">
+<!ENTITY pref.junk.title "Basura y correo sospechoso">
+<!ENTITY junkSettings.caption "Opciones globales de correo basura">
+<!ENTITY junkMail.intro "Vaya a Opciones de cuenta para configurar opciones de correo basura específicas para esta cuenta.">
 
 <!-- Junk Mail Controls -->
-<!ENTITY manualMark.label               "When I mark messages as junk:">
-<!ENTITY manualMark.accesskey           "W">
-<!ENTITY manualMarkModeMove.label       "Move them to the account's &quot;Junk&quot; folder">
+<!ENTITY manualMark.label               "Cuando marque mensajes como basura:">
+<!ENTITY manualMark.accesskey           "C">
+<!ENTITY manualMarkModeMove.label       "Moverlos a la carpeta &quot;Basura&quot; de la cuenta">
 <!ENTITY manualMarkModeMove.accesskey   "M">
-<!ENTITY manualMarkModeDelete.label     "Delete them">
-<!ENTITY manualMarkModeDelete.accesskey "D">
+<!ENTITY manualMarkModeDelete.label     "Borrarlos">
+<!ENTITY manualMarkModeDelete.accesskey "B">
 
-<!ENTITY markAsRead.intro               "Mark messages as read:">
-<!ENTITY autoMarkAsRead.label           "When &brandShortName; determines that they are junk">
+<!ENTITY markAsRead.intro               "Marcar mensajes como leídos:">
+<!ENTITY autoMarkAsRead.label           "Cuando &brandShortName; determine que son basura">
 <!ENTITY autoMarkAsRead.accesskey       "u">
-<!ENTITY manualMarkAsRead.label         "When I manually mark them as junk">
-<!ENTITY manualMarkAsRead.accesskey     "k">
+<!ENTITY manualMarkAsRead.label         "Cuando los marque manualmente como basura">
+<!ENTITY manualMarkAsRead.accesskey     "C">
+
+<!ENTITY enableJunkLogging.label        "Habilitar el registro del filtro basura">
+<!ENTITY enableJunkLogging.accesskey    "e">
+<!ENTITY openJunkLog.label              "Mostrar el registro">
+<!ENTITY openJunkLog.accesskey          "s">
+<!ENTITY resetTrainingData.label        "Reiniciar datos de entrenamiento">
+<!ENTITY resetTrainingData.accesskey    "t">
 
-<!ENTITY enableJunkLogging.label        "Enable junk filter logging">
-<!ENTITY enableJunkLogging.accesskey    "E">
-<!ENTITY openJunkLog.label              "Show log">
-<!ENTITY openJunkLog.accesskey          "S">
-<!ENTITY resetTrainingData.label        "Reset training data">
-<!ENTITY resetTrainingData.accesskey    "t">
+<!ENTITY pref.suspectMail.caption       "Correo sospechoso">
+
+<!-- Phishing Detector -->
+<!ENTITY pref.phishing.caption            "Fraudes de correo">
+<!ENTITY enablePhishingDetector.label     "Avisarme si el mensaje que estoy leyendo se sospecha que puede ser una estafa">
+<!ENTITY enablePhishingDetector.accesskey "t">
+
+<!-- Anti Virus -->
+<!ENTITY pref.antivirus.caption           "Antivirus">
+<!ENTITY antiVirus.label                  "Permitir a los clientes antivirus que verifiquen los mensajes entrantes más fácilmente">
+<!ENTITY antiVirus.accesskey              "a">
--- a/suite/chrome/mailnews/pref/pref-mailnews.dtd
+++ b/suite/chrome/mailnews/pref/pref-mailnews.dtd
@@ -30,45 +30,34 @@
  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 pref.mailnews.title              "Mail &amp; Newsgroups">
-<!ENTITY generalSettings.caption          "General Settings">
-<!ENTITY confirmMove.label                "Confirm when moving folders to the Trash">
+<!ENTITY pref.mailnews.title              "Correo y noticias">
+<!ENTITY generalSettings.caption          "Opciones generales">
+<!ENTITY confirmMove.label                "Confirmar al mover carpetas a la Papelera">
 <!ENTITY confirmMove.accesskey            "C">
-<!ENTITY useMessenger.label               "Use Mail from MAPI-based applications">
-<!ENTITY useMessenger.accesskey           "U">
-<!ENTITY autounzip.label                  "Automatically expand zip files when saving attachments">
-<!ENTITY autounzip.accesskey              "A">
-<!ENTITY preserveThreading.label          "Preserve threading when sorting messages">
-<!ENTITY preserveThreading.accesskey      "v">
-
-<!ENTITY defaultMailSettings.description  "Make &brandShortName; the default application for:">
-<!ENTITY setDefaultMail.label             "Mail">
-<!ENTITY setDefaultMail.accesskey         "M">
-<!ENTITY setDefaultNews.label             "News">
-<!ENTITY setDefaultNews.accesskey         "N">
+<!ENTITY preserveThreading.label          "Mantener el hilo de los mensajes cuando se ordenan">
+<!ENTITY preserveThreading.accesskey      "M">
+<!ENTITY mailBiffOnNewWindow.label        "Solamente buscar correo nuevo al abrir la ventana de Correo y Noticias">
+<!ENTITY mailBiffOnNewWindow.accesskey    "o">
 
-<!ENTITY messengerStartPage.caption       "Mail Start Page">
-<!ENTITY enableStartPage.label            "When Mail launches, show the Start Page in the message area">
-<!ENTITY enableStartPage.accesskey        "W">
-<!ENTITY location.label                   "Location:">
-<!ENTITY location.accesskey               "L">
-<!ENTITY useDefault.label                 "Restore Default">
-<!ENTITY useDefault.accesskey             "D">
-<!ENTITY rememberLastMsg.label            "Remember the last selected message">
-<!ENTITY rememberLastMsg.accesskey        "e">
-<!ENTITY toolbarIntro.caption             "Select the buttons you want to see in the toolbar">
-<!ENTITY fileButton.label                 "File">
-<!ENTITY fileButton.accesskey             "F">
-<!ENTITY nextButton.label                 "Next">
-<!ENTITY nextButton.accesskey             "x">
-<!ENTITY junkMailButton.label             "Junk">
-<!ENTITY junkMailButton.accesskey         "J">
-<!ENTITY printButton.label                "Print">
-<!ENTITY printButton.accesskey            "P">
-<!ENTITY stopButton.label                 "Stop">
-<!ENTITY stopButton.accesskey             "S">
+<!ENTITY defaultMailSettings.description  "Hacer que &brandShortName; sea la aplicación predeterminada para:">
+<!ENTITY setDefaultMail.label             "Correo">
+<!ENTITY setDefaultMail.accesskey         "C">
+<!ENTITY setDefaultNews.label             "Noticias">
+<!ENTITY setDefaultNews.accesskey         "N">
+<!ENTITY setDefaultFeed.label             "Canales">
+<!ENTITY setDefaultFeed.accesskey         "e">
+
+<!ENTITY messengerStartPage.caption       "Página de inicio del correo">
+<!ENTITY enableStartPage.label            "Al iniciar Mail, mostrar la página de inicio en el área de mensajes">
+<!ENTITY enableStartPage.accesskey        "A">
+<!ENTITY location.label                   "Ubicación:">
+<!ENTITY location.accesskey               "U">
+<!ENTITY useDefault.label                 "Restaurar predeterminados">
+<!ENTITY useDefault.accesskey             "d">
+<!ENTITY rememberLastMsg.label            "Recordar el último mensaje seleccionado">
+<!ENTITY rememberLastMsg.accesskey        "R">
--- a/suite/chrome/mailnews/pref/pref-offline.dtd
+++ b/suite/chrome/mailnews/pref/pref-offline.dtd
@@ -1,30 +1,34 @@
 <!-- extracted from content/pref-offline.xul -->
 
 <!--LOCALIZATION NOTE : FILE The 'Offline' preferences dialog -->
-<!ENTITY pref.offline.title               "Offline &amp; Disk Space">
-<!ENTITY pref.offline.caption             "Offline">
-<!ENTITY textStartUp                      "When starting up:">
-<!ENTITY textStartUp.accesskey            "W">
-<!ENTITY menuitemRememberPrevState        "Remember previous online state">
-<!ENTITY menuitemAskMe                    "Ask me for online state at startup">
-<!ENTITY menuitemAlwaysOnline             "Always start up online">
-<!ENTITY menuitemAlwaysOffline            "Always start up offline">
-<!ENTITY menuitemAutomatic                "Detect automatically (if available)">
-<!ENTITY textGoingOnline                  "Send unsent messages when going online?">
-<!ENTITY radioAutoSend                    "Yes">
-<!ENTITY radioAutoSend.accesskey          "Y">
+<!ENTITY pref.network.title               "Red y almacenamiento">
+<!ENTITY pref.offline.caption             "Sin conexión">
+<!ENTITY textStartUp                      "Al iniciar:">
+<!ENTITY textStartUp.accesskey            "w">
+<!ENTITY menuitemRememberPrevState        "Recordar el estado anterior de la conexión">
+<!ENTITY menuitemAskMe                    "Preguntarme el estado al iniciar">
+<!ENTITY menuitemAlwaysOnline             "Siempre iniciar conectado">
+<!ENTITY menuitemAlwaysOffline            "Siempre iniciar sin conexión">
+<!ENTITY menuitemAutomatic                "Detectar automáticamente (si está disponible)">
+<!ENTITY textGoingOnline                  "¿Enviar mensajes pendientes al conectarse?">
+<!ENTITY radioAutoSend                    "Sí">
+<!ENTITY radioAutoSend.accesskey          "y">
 <!ENTITY radioNotSend                     "No">
 <!ENTITY radioNotSend.accesskey           "N">
-<!ENTITY radioAskUnsent                   "Ask me">
+<!ENTITY radioAskUnsent                   "Preguntarme">
 <!ENTITY radioAskUnsent.accesskey         "s">
 <!ENTITY textGoingOffline                 "Download messages for offline use when going offline?">
-<!ENTITY radioAutoDownload                "Yes">
+<!ENTITY radioAutoDownload                "Sí">
 <!ENTITY radioAutoDownload.accesskey      "e">
 <!ENTITY radioNotDownload                 "No">
 <!ENTITY radioNotDownload.accesskey       "o">
-<!ENTITY radioAskDownload                 "Ask me">
+<!ENTITY radioAskDownload                 "Preguntarme">
 <!ENTITY radioAskDownload.accesskey       "k">
-<!ENTITY Diskspace                        "Disk Space">
-<!ENTITY offlineCompact.label             "Compact folders when it will save over">
+<!ENTITY mailConnections.caption          "Conexiones de correo">
+<!ENTITY mailnewsTimeout.label            "Tiempo de conexión excedido:">
+<!ENTITY mailnewsTimeout.accesskey        "m">
+<!ENTITY mailnewsTimeoutSeconds.label     "segundos">
+<!ENTITY Diskspace                        "Espacio en disco">
+<!ENTITY offlineCompact.label             "Compactar carpetas cuando se ahorrará más de">
 <!ENTITY offlineCompact.accesskey         "C">
 <!ENTITY kb.label                         "KB">
--- a/suite/chrome/mailnews/pref/pref-viewing_messages.dtd
+++ b/suite/chrome/mailnews/pref/pref-viewing_messages.dtd
@@ -31,53 +31,53 @@
  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 pref.viewing.messages.title      "Message Display">
-<!ENTITY style.label                      "Style:">
-<!ENTITY style.accesskey                  "S">
+<!ENTITY pref.viewing.messages.title      "Vista de Mensajes">
+<!ENTITY style.label                      "Estilo:">
+<!ENTITY style.accesskey                  "s">
 <!ENTITY regular.label                    "Regular">
-<!ENTITY bold.label                       "Bold">
-<!ENTITY italic.label                     "Italic">
-<!ENTITY boldItalic.label                 "Bold Italic">
-<!ENTITY size.label                       "Size:">
-<!ENTITY size.accesskey                   "z">
-<!ENTITY bigger.label                     "Bigger">
-<!ENTITY smaller.label                    "Smaller">
+<!ENTITY bold.label                       "Negrita">
+<!ENTITY italic.label                     "Itálica">
+<!ENTITY boldItalic.label                 "Negrita itálica">
+<!ENTITY size.label                       "Tamaño:">
+<!ENTITY size.accesskey                   "T">
+<!ENTITY bigger.label                     "Más grande">
+<!ENTITY smaller.label                    "Más chico">
 <!ENTITY color.label                      "Color:">
 <!ENTITY color.accesskey                  "C">
-<!ENTITY displayPlainText.caption         "Plain text messages">
+<!ENTITY displayPlainText.caption         "Mensajes en texto plano">
 <!ENTITY fontPlainText.label              "Font:">
 <!ENTITY fontPlainText.accesskey          "F">
-<!ENTITY displayQuoted.label              "Settings for quoted messages:">
-<!ENTITY readingMessagesHeader.label      "For incoming messages">
-<!ENTITY messageWrapping.label            "Message Wrapping">
-<!ENTITY wrapInMsg.label                  "Wrap text to fit window width">
-<!ENTITY wrapInMsg.accesskey              "W">
+<!ENTITY displayQuoted.label              "Opciones para mensajes citados:">
+<!ENTITY wrapInMsg.label                  "Ajustar texto al ancho de la ventana">
+<!ENTITY wrapInMsg.accesskey              "A">
 <!-- LOCALIZATION NOTE : (convertEmoticons.label) 'Emoticons' are also known as 'Smileys', e.g. :-)   -->
-<!ENTITY convertEmoticons.label           "Display emoticons as graphics">
-<!ENTITY convertEmoticons.accesskey       "D">
+<!ENTITY convertEmoticons.label           "Mostrar emoticones como gráficos">
+<!ENTITY convertEmoticons.accesskey       "M">
 <!ENTITY generalMessageDisplay.caption    "General">
-<!ENTITY autoMarkAsRead.label             "Automatically mark messages as read">
-<!ENTITY autoMarkAsRead.accesskey         "A">
-<!ENTITY markAsReadNoDelay.label          "Immediately on display">
+<!ENTITY autoMarkAsRead.label             "Marcar mensajes como leídos automáticamente">
+<!ENTITY autoMarkAsRead.accesskey         "a">
+<!ENTITY markAsReadNoDelay.label          "Inmediatamente al mostrarlo">
 <!ENTITY markAsReadNoDelay.accesskey      "m">
 <!-- LOCALIZATION NOTE (markAsReadDelay.label): This will concatenate to
      "After displaying for [___] seconds",
      using (markAsReadDelay.label) and a number (secondsLabel.label). -->
-<!ENTITY markAsReadDelay.label            "After displaying for">
+<!ENTITY markAsReadDelay.label            "Después de mostrarlo por">
 <!ENTITY markAsReadDelay.accesskey        "t">
-<!ENTITY secondsLabel.label               "seconds">
+<!ENTITY secondsLabel.label               "segundos">
 
-<!ENTITY openingMessages.label            "When opening messages, display them in:">
-<!ENTITY newWindowRadio.label             "A new message window">
+<!ENTITY openingMessages.label            "Al abrir mensajes, mostrarlos en:">
+<!ENTITY newWindowRadio.label             "Una nueva ventana de mensaje">
 <!ENTITY newWindowRadio.accesskey         "n">
-<!ENTITY existingWindowRadio.label        "An existing message window">
+<!ENTITY existingWindowRadio.label        "Una ventana de mensaje existente">
 <!ENTITY existingWindowRadio.accesskey    "e">
-<!ENTITY disableContent.label             "Block images and other content from remote sources">
+<!ENTITY disableContent.label             "Bloquear imágenes y otros contenidos de fuentes remotas">
 <!ENTITY disableContent.accesskey         "B">
-<!ENTITY showCondensedAddresses.label     "Show only display name for people in my address book">
+<!ENTITY showCondensedAddresses.label     "Mostrar solamente el nombre para las personas de mi libreta de direcciones">
 <!ENTITY showCondensedAddresses.accesskey "o">
+<!ENTITY closeMsgWindowOnDelete.label     "Cerrar la ventana del mensaje al borrarlo">
+<!ENTITY closeMsgWindowOnDelete.accesskey "l">
--- a/suite/chrome/mailnews/pref/prefs.properties
+++ b/suite/chrome/mailnews/pref/prefs.properties
@@ -34,65 +34,61 @@
 # 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 *****
 
 #
 # The following are used by the Account Wizard
 #
-enterAccountName=Please enter a name for this account.
-enterUserName=Please enter a username.
-enterName=Please enter your name.
-enterValidEmail=Please enter a valid email address.
-accountExists=A mail or newsgroup account with the same user name and server name already exists. Click Back and enter a different server name, or click Cancel.
-modifiedAccountExists=An account with that user name and server name already exists. Please enter a different user name and/or server name.
-userNameChanged=Your User Name has been updated. You may also need to update your Email Address and/or User Name associated with this account.
-serverNameChanged=The server name setting has changed. Please verify that any folders used by filters exist on the new server.
+enterValidEmail=Por favor, ingrese una dirección de correo electrónico válida.
+accountExists=Ya existe una cuenta de correo o noticias con el mismo nombre de usuario y servidor. Pulse Atrás e introduzca un nombre de servidor diferente o pulse Cancelar.
+modifiedAccountExists=Ya existe una cuenta con ese nombre de usuario y servidor. Ingrese un nombre de usuario y/o servidor diferente.
+userNameChanged=Su nombre de usuario ha sido actualizado. Puede que también necesite actualizar su dirección de correo y/o el nombre de usuario asociado a esta cuenta.
+serverNameChanged=Ha cambiado el nombre del servidor en la configuración. Verifique que las carpetas utilizadas por los filtros existen en el nuevo servidor.
 # if the user chooses to cancel the wizard when no accounts are there throw a message
 # LOCALIZATION NOTE (cancelWizard) 
 # do not localize "\n\n"
-cancelWizard=Are you sure you want to exit the Account Wizard?\n\nIf you exit, any information you have entered will be lost and the account will not be created.
-accountWizard=Account Wizard
-WizardExit=Exit
-WizardContinue=Cancel
+cancelWizard=¿Está seguro de querer salir del asistente para cuentas?\n\nSi sale, cualquier información ingresada se perderá y no se creará la cuenta.
+accountWizard=Asistente para cuentas
+WizardExit=Salir
+WizardContinue=Cancelar
 # when the wizard already has a domain (Should we say something different?)
-enterValidEmailPrefix=Please enter a valid email address.
-enterValidHostname=Please enter a valid hostname.
-failedRemoveAccount=Failed to remove this account.
-failedDuplicateAccount=Failed to duplicate this account.
+enterValidHostname=Ingrese un nombre de servidor válido.
+failedRemoveAccount=Falló la eliminación de la cuenta.
+failedDuplicateAccount=Falló la duplicación de la cuenta.
 #LOCALIZATION NOTE: confirmRemoveAccount: %S is the account pretty name
-confirmRemoveAccount=Are you sure you want to remove the account "%S"?
-confirmRemoveAccountTitle=Remove Account
+confirmRemoveAccount=¿Está seguro de querer eliminar la cuenta "%S"?
+confirmRemoveAccountTitle=Eliminar cuenta
 #LOCALIZATION NOTE: accountName: %1$S is server name, %2$S is user name
 accountName=%1$S - %2$S
 
-confirmDeferAccount=If you store this account's new mail in a different account's Inbox, you will no longer be able to access already downloaded e-mail for this account. If you have mail in this account, please copy it to another account first. If you have filters that filter mail into this account, you should disable them or change the destination folder. If any accounts have special folders in this account (Sent, Drafts, Templates), you should change them to be in another account. Do you still want to store this account's e-mail in a different account?
+confirmDeferAccount=Si guarda el nuevo correo de esta cuenta en la bandeja de entrada de una cuenta diferente, no podrá acceder los correos electrónicos ya descargados de esta cuenta. Si tiene coreo en esta cuenta, cópielo a otra cuenta primero. Si tiene filtros de correo en esta cuenta, debería deshabilitarlos o cambiar la carpeta de destino. Si cualquier cuenta tiene carpetas especiales en esta cuenta (Enviados, Borradores, Plantillas), debería cambiarlas para que estén en otra cuenta. ¿Aún desea cambiar guardar los correos electrónicos de esta cuenta en una cuenta diferente?
 confirmDeferAccountTitle=Defer Account?
 
-directoryUsedByOtherServer=This directory is already used by another server. Please pick a different directory.
+directoryUsedByOtherAccount=Este directorio ya está en uso por la cuenta %S. Elija un directorio distinto.
 #Provide default example values for sample email address
-exampleEmailUserName=user
-exampleEmailDomain=example.net
-emailFieldText=Email Address:
+exampleEmailUserName=usuario
+exampleEmailDomain=ejemplo.net
+emailFieldText=Dirección de correo electrónico:
 #LOCALIZATION NOTE: defaultEmailText: %1$S is user name, %2$S is domain
-defaultEmailText=Enter your email address. This is the address others will use to send email to you (for example, "%1$S@%2$S"). 
+defaultEmailText=Ingrese su dirección de correo electrónico. Es la dirección que utilizarán los demás para enviarle correos (por ejemplo, "%1$S@%2$S"). 
 #LOCALIZATION NOTE: customizedEmailText: %1$S is provider, %2$S is email username, %3$S is sample email, %4$S is sample username
-customizedEmailText=Enter your %1$S %2$S (for example, if your %1$S email address is "%3$S", your %2$S is "%4$S"). 
+customizedEmailText=Ingrese su %2$S de %1$S (por ejemplo, si su dirección de correo electrónico en %1$S es "%3$S", su %2$S es "%4$S"). 
 
 # account manager stuff
-prefPanel-server=Server Settings
-prefPanel-copies=Copies & Folders
-prefPanel-offline-and-diskspace=Offline & Disk Space
-prefPanel-diskspace=Disk Space
-prefPanel-addressing=Composition & Addressing
-prefPanel-junk=Junk Settings
+prefPanel-server=Configuración del servidor
+prefPanel-copies=Copias y carpetas
+prefPanel-synchronization=Sincronización y almacenamiento
+prefPanel-diskspace=Espacio en disco
+prefPanel-addressing=Redacción y direcciones
+prefPanel-junk=Opciones de correo basura
 ## LOCALIZATION NOTE (prefPanel-smtp): Don't translate "SMTP"
-prefPanel-smtp=Outgoing Server (SMTP)
+prefPanel-smtp=Servidor saliente (SMTP)
 
 # account manager multiple identity support
 #LOCALIZATION NOTE: accountName: %1$S 
-identity-list-title=Identities for %1$S
+identity-list-title=Identidades para %1$S
 
-identity-edit-req=You must specify a valid email address for this identity.
-identity-edit-req-title=Error Creating Identity
+identity-edit-req=Debe especificar una dirección de correo válida para esta identidad.
+identity-edit-req-title=Error al crear la identidad
 
-choosefile=Choose a file
+choosefile=Error al crear la identidad
--- a/suite/chrome/mailnews/pref/smtpEditOverlay.dtd
+++ b/suite/chrome/mailnews/pref/smtpEditOverlay.dtd
@@ -1,25 +1,22 @@
-<!ENTITY settings.caption "Settings">
-<!ENTITY security.caption "Security and Authentication">
-<!ENTITY serverName.label "Server Name:">
-<!ENTITY serverName.accesskey "S">
-<!ENTITY serverDescription.label "Description:">
+<!ENTITY settings.caption "Configuración">
+<!ENTITY security.caption "Seguridad y autenticación">
+<!ENTITY serverName.label "Nombre del servidor:">
+<!ENTITY serverName.accesskey "s">
+<!ENTITY serverDescription.label "Descripción:">
 <!ENTITY serverDescription.accesskey "D">
-<!ENTITY serverPort.label "Port:">
+<!ENTITY serverPort.label "Puerto:">
 <!ENTITY serverPort.accesskey "P">
-<!ENTITY alwaysUseUsername.label "Use name and password">
+<!ENTITY alwaysUseUsername.label "Usar nombre y contraseña">
 <!ENTITY alwaysUseUsername.accesskey "U">
-<!ENTITY userName.label "User Name:">
+<!ENTITY userName.label "Nombre de usuario:">
 <!ENTITY userName.accesskey "m">
-<!ENTITY useSecAuth.label "Use secure authentication">
+<!ENTITY useSecAuth.label "Usar autenticación segura">
 <!ENTITY useSecAuth.accesskey "i">
-<!ENTITY isSecure.label "Use secure connection:">
-<!ENTITY neverSecure.label "No">
-<!ENTITY neverSecure.accesskey "N">
-<!ENTITY sometimesSTARTTLS.label "STARTTLS, if available">
-<!ENTITY sometimesSTARTTLS.accesskey "a">
-<!ENTITY alwaysSTARTTLS.label "STARTTLS">
-<!ENTITY alwaysSTARTTLS.accesskey "T">
-<!ENTITY alwaysSMTPOverSSL.label "SMTP-over-SSL">
-<!ENTITY alwaysSMTPOverSSL.accesskey "L">
-<!ENTITY smtpEditTitle.label "SMTP Server">
-<!ENTITY serverPortDefault.label "Default:">
+<!ENTITY connectionSecurity.label "Seguridad de la conexión:">
+<!ENTITY connectionSecurity.accesskey "n">
+<!ENTITY connectionSecurityType-0.label "Nada">
+<!ENTITY connectionSecurityType-1.label "Ninguna">
+<!ENTITY connectionSecurityType-2.label "STARTTLS, si está disponible">
+<!ENTITY connectionSecurityType-3.label "SSL/TLS">
+<!ENTITY smtpEditTitle.label "Servidor SMTP">
+<!ENTITY serverPortDefault.label "Predeterminado:">
--- a/suite/chrome/mailnews/region.properties
+++ b/suite/chrome/mailnews/region.properties
@@ -11,8 +11,11 @@ addressbook.throbber.url=http://www.seam
 # @A1 == address, part 1
 # @A2 == address, part 2
 # @CI == city
 # @ST == state
 # @ZI == zip code
 # @CO == country
 mail.addr_book.mapit_url.format=http://maps.google.com/maps?q=@A1%20@A2%20@CI%20@ST%20@ZI%20@CO
 mailnews.messageid_browser.url=http://groups.google.com/groups?selm=%mid&rnum=1
+# Recognize non-standard versions of "Re:" in subjects from localized versions of MS Outlook et al.
+# Specify a comma-separated list without spaces. For example: mailnews.localizedRe=AW,SV
+mailnews.localizedRe=
--- a/suite/chrome/mailnews/search-attributes.properties
+++ b/suite/chrome/mailnews/search-attributes.properties
@@ -1,57 +1,42 @@
 #these need to match nsMsgSearchAttrib interface in nsMsgSearchCore.idl
-0=Subject
-1=From
-2=Body
-3=Date
-4=Priority
-5=Status
-6=To
-7=Cc
-8=To or Cc
-# 9 not visible
-9=Location
-# 10 not visible
-10=Message Key
-11=Age In Days
-# 12 not visible
-12=Folder Info
-13=Size (KB)
-# 14 not visible
-14=AnyText
-15=Tags
+#and nsMsgSearchAttribMap in nsMsgSearchAdapter.cpp
+Subject=Asunto
+From=Remitente
+Body=Cuerpo
+Date=Fecha
+Priority=Prioridad
+Status=Estado
+To=Para
+Cc=Cc
+ToOrCc=Para o CC
+AgeInDays=Antigüedad en días
+SizeKB=Tamaño (KB)
+Tags=Etiquetas
 # for AB and LDAP
-16=Any Name
-17=Display Name
-18=Nickname
-19=Screen Name
-20=Email
-21=Additional Email
-22=Any Number
-23=Work Phone
-24=Home Phone
-25=Fax
-26=Pager
-27=Mobile
-28=City
-29=Street
-30=Title
-31=Organization
-32=Department
-33=reserved for AB
-34=reserved for AB
-35=reserved for AB
-36=reserved for AB
-37=reserved for AB
-38=reserved for AB
-39=reserved for AB
-40=reserved for AB
-41=reserved for AB
-42=reserved for AB
-43=reserved for AB
-44=Junk Score Origin
-45=Junk Percent
-46=Attachment Status
-47=Junk Status 
-48=Label
-# don't use above 49
-49=Customize…
+AnyName=Cualquier nombre
+DisplayName=Nombre mostrado
+Nickname=Nick
+ScreenName=Nombre en pantalla
+Email=Correo electrónico
+AdditionalEmail=Correo electrónico adicional
+AnyNumber=Cualquier número
+WorkPhone=Teléfono del trabajo
+HomePhone=Teléfono particular
+Fax=Fax
+Pager=Buscapersonas
+Mobile=Celular
+City=Ciudad
+Street=Calle
+Title=Título
+Organization=Organización
+Department=Departamento
+# more mailnews
+FromToCcOrBcc=De, Para, CC o CCO
+JunkScoreOrigin=Origen del puntaje de basura
+JunkPercent=Porcentaje de basura
+AttachmentStatus=Estado del adjunto
+JunkStatus=Estado de correo basura
+Label=Etiqueta
+Customize=Personalizar…
+MissingCustomTerm=Término personalizado faltante
+
--- a/suite/chrome/mailnews/search-operators.properties
+++ b/suite/chrome/mailnews/search-operators.properties
@@ -1,25 +1,27 @@
-0=contains
-1=doesn't contain
-2=is
-3=isn't
-4=is empty
+0=contiene
+1=no contiene
+2=es
+3=no es
+4=está vacío
 
-5=is before
-6=is after
+5=es anterior a
+6=es posterior a
     
-7=is higher than
-8=is lower than
+7=es mayor que
+8=es menor que
 
-9=begins with
-10=ends with
+9=comienza con
+10=finaliza con
 
-11=sounds like
+11=suena como
 12=LdapDwim
 
-13=is greater than
-14=is less than
+13=es mayor que
+14=es menor que
 
-15=NameCompletion
-16=is in my address book
-17=isn't in my address book
-
+15=CompletarNombre
+16=está en mi libreta de direcciones
+17=no está en mi libreta de direcciones
+18=no está vacío
+19=coincidencias
+20=no hay coincidencias
--- a/suite/chrome/mailnews/search.properties
+++ b/suite/chrome/mailnews/search.properties
@@ -1,28 +1,24 @@
 # search and filter strings
-
-searchCustomize="Customize Headers.."
-
+#
 # these are the fields that get inserted in the search line
 # for "and" searches, this looks like:
 #
 # searchAnd0 <attribute> searchAnd1 <operator> searchAnd2 <value> searchAnd4
 #
 # for example, in english this looks like:
 # and the [Sender ] [doesn't contain] [John]
 #
 # TODO: need to special-case the first line (filterindex==0)
-#
 
 # filter stuff
+searchingMessage=Buscando…
+searchSuccessMessage=Se ha encontrado 1 coincidencia
+searchSuccessMessages=Se han encontrado %S coincidencias
+searchFailureMessage=No se han encontrado coincidencias
+labelForStopButton=Detener
+labelForSearchButton=Buscar
+labelForStopButton.accesskey=D
+labelForSearchButton.accesskey=s
 
-searchingMessage=Searching…
-searchSuccessMessage=1 match found
-searchSuccessMessages=%S matches found
-searchFailureMessage=No matches found
-labelForStopButton=Stop
-labelForSearchButton=Search
-labelForStopButton.accesskey=S
-labelForSearchButton.accesskey=S
-
-moreButtonTooltipText=Add a new rule
-lessButtonTooltipText=Remove this rule
+moreButtonTooltipText=Agregar una nueva regla
+lessButtonTooltipText=Eliminar esta regla
--- a/suite/chrome/mailnews/smime/am-smime.dtd
+++ b/suite/chrome/mailnews/smime/am-smime.dtd
@@ -1,24 +1,28 @@
-<!ENTITY securityTitle.label "Security">
-<!ENTITY securityTab.label "Security">
-<!ENTITY securityHeading.label "To send and receive signed or encrypted messages, you should specify both a digital signing certificate and an encryption certificate.">
-<!ENTITY encryptionGroupTitle.label "Encryption">
-<!ENTITY encryptionChoiceLabel.label "Default encryption setting when sending messages:">
-<!ENTITY neverEncrypt.label "Never (do not use encryption)">
+<!ENTITY securityTitle.label "Seguridad">
+<!ENTITY securityTab.label "Seguridad">
+<!ENTITY securityHeading.label "Para enviar y recibir mensajes firmados o cifrados, debe especificar tanto un certificado de firma digital como un certificado de cifrado.">
+<!ENTITY encryptionGroupTitle.label "Cifrado">
+<!ENTITY encryptionChoiceLabel.label "Cifrado predeterminado al enviar mensajes:">
+<!ENTITY neverEncrypt.label "Nunca (no usar cifrado)">
 <!ENTITY neverEncrypt.accesskey "N">
-<!ENTITY alwaysEncryptMessage.label "Required (can't send message unless all recipients have certificates)">
+<!ENTITY alwaysEncryptMessage.label "Requerido (no se puede enviar el mensaje a menos que todos los destinatarios tengan certificados)">
 <!ENTITY alwaysEncryptMessage.accesskey "u">
-<!ENTITY encryptionCert.message "Use this certificate to encrypt &amp; decrypt messages sent to you:">
-<!ENTITY encryptionCert.notselected "No certificate set">
-<!ENTITY digitalSign.certificate.button "Select…">
+<!ENTITY encryptionCert.message "Usar este certificado para cifrar y descifrar mensajes que le sean enviados:">
+<!ENTITY digitalSign.certificate.button "Seleccionar…">
 <!ENTITY digitalSign.certificate.accesskey "S">
-<!ENTITY digitalSign.certificate_clear.button "Clear">
+<!ENTITY digitalSign.certificate_clear.button "Borrar">
 <!ENTITY digitalSign.certificate_clear.accesskey "C">
-<!ENTITY encryption.certificate.button "Select…">
+<!ENTITY encryption.certificate.button "Seleccionar…">
 <!ENTITY encryption.certificate.accesskey "t">
-<!ENTITY encryption.certificate_clear.button "Clear">
+<!ENTITY encryption.certificate_clear.button "Borrar">
 <!ENTITY encryption.certificate_clear.accesskey "e">
-<!ENTITY signingGroupTitle.label "Digital Signing">
-<!ENTITY signMessage.label "Digitally sign messages (by default)">
-<!ENTITY signMessage.accesskey "D">
-<!ENTITY signingCert.message "Use this certificate to digitally sign messages you send:">
-<!ENTITY signingCert.notselected "No certificate set">
+<!ENTITY signingGroupTitle.label "Firma digital">
+<!ENTITY signMessage.label "Firmar los mensajes digitalmente (por defecto)">
+<!ENTITY signMessage.accesskey "d">
+<!ENTITY signingCert.message "Usar este certificado para firmar digitalmente los mensajes que envíe:">
+
+<!ENTITY certificates.label "Certificados">
+<!ENTITY manageCerts.label "Administrar certificados…">
+<!ENTITY manageCerts.accesskey "m">
+<!ENTITY manageDevices.label "Administrar dispositivos de seguridad…">
+<!ENTITY manageDevices.accesskey "g">
--- a/suite/chrome/mailnews/smime/am-smime.properties
+++ b/suite/chrome/mailnews/smime/am-smime.properties
@@ -1,20 +1,19 @@
 ## S/MIME error strings.
 ## Note to localization: %S is a placeholder
-NoSenderSigningCert=You specified that this message should be digitally signed, but the application either failed to find the signing certificate specified in your Mail & Newsgroup Account Settings, or the certificate has expired.
-NoSenderEncryptionCert=You specified encryption for this message, but the application either failed to find the encryption certificate specified in your Mail & Newsgroup Account Settings, or the certificate has expired.
-MissingRecipientEncryptionCert=You specified encryption for this message, but the application failed to find an encryption certificate for %S.
-SignNoSenderEncryptionCert=You specified that this message should be digitally signed, but the application either failed to find an encryption certificate to include in the signed message, or the certificate has expired.
-ErrorCanNotEncrypt=Unable to encrypt message. Please check that you have a valid email certificate for each recipient. Please check that the certificates specified in Mail & Newsgroups Account Settings for this mail account are valid and trusted.
-ErrorCanNotSign=Unable to sign message. Please check that the certificates specified in Mail & Newsgroups Account Settings for this mail account are valid and trusted
+NoSenderSigningCert=Ha especificado que este mensaje debería ser firmado digitalmente, pero la aplicación o no encontró certificado para firmar especificado en sus preferencias de cuenta de correo y noticias o el certificado ha expirado.
+NoSenderEncryptionCert=Ha especificado cifrar este mensaje, pero la aplicación no pudo encontrar el certificado de cifrado especificado en las preferencias de correo y noticias o el certificado ha expirado.
+MissingRecipientEncryptionCert=Ha especificado cifrar este mensaje, pero la aplicación no pudo encontrar un certificado de cifrado para %S.
+ErrorCanNotEncrypt=No se pudo cifrar el mensaje. Verifique que tiene un certificado de correo válido para cada recipiente y que los certificados especificados en las preferencias de cuenta de correo y noticias son válidos y de confianza.
+ErrorCanNotSign=No se pudo firmar el mensaje. Verifique que los certificados especificados en las preferencias de cuentas de correo y noticias son válidos y de confianza
 
 ## Strings used for in the prefs.
-prefPanel-smime=Security
-NoSigningCert=Certificate Manager can't locate a valid certificate that can be used to digitally sign your messages.
-NoEncryptionCert=Certificate Manager can't locate a valid certificate that other people can use to send you encrypted email messages.
+prefPanel-smime=Seguridad
+NoSigningCert=El administrador de certificados no puede encontrar un certificado válido que pueda ser utilizado para firmar digitalmente sus mensajes.
+NoEncryptionCert=El administrador de certificados no puede encontrar un certificado válido que otras personas puedan usar para enviarle mensajes cifrados.
 
-encryption_needCertWantSame=You should also specify a certificate for other people to use when they send you encrypted messages. Do you want to use the same certificate to encrypt & decrypt messages sent to you?
-encryption_wantSame=Do you want to use the same certificate to encrypt & decrypt messages sent to you?
-encryption_needCertWantToSelect=You should also specify a certificate for other people to use when they send you encrypted messages. Do you want to configure an encryption certificate now?
-signing_needCertWantSame=You should also specify a certificate to use for digitally signing your messages. Do you want to use the same certificate to digitally sign your messages?
-signing_wantSame=Do you want to use the same certificate to digitally sign your messages?
-signing_needCertWantToSelect=You should also specify a certificate to use for digitally signing your messages. Do you want to configure a certificate for digitally signing messages now?
+encryption_needCertWantSame=Debería especificar también un certificado para que lo usen otras personas cuando le envíen mensajes cifrados. ¿Quiere utilizar el mismo certificado para cifrar y descrifrar mensajes que le lleguen?
+encryption_wantSame=¿Quiere utilizar el mismo certificado para cifrar y descifrar mensajes que le lleguen?
+encryption_needCertWantToSelect=Debería especificar también un certificado para que lo usen otras personas cuando le envíen mensajes cifrados. ¿Quiere configurar ahora un certificado de cifrado?
+signing_needCertWantSame=Debería especificar también un certificado para firmar digitalmente sus mensajes. ¿Quiere utilizar el mismo certificado para firmar digitalmente sus mensajes?
+signing_wantSame=¿Quiere utilizar el mismo certificado para firmar digitalmente sus mensajes?
+signing_needCertWantToSelect=Debería especificar también un certificado para firmar digitalmente sus mensajes. ¿Quiere configurar ahora un certificado para firmar digitalmente sus mensajes?
--- a/suite/chrome/mailnews/smime/msgCompSMIMEOverlay.dtd
+++ b/suite/chrome/mailnews/smime/msgCompSMIMEOverlay.dtd
@@ -1,25 +1,22 @@
 <!--LOCALIZATION NOTE msgCompSMIMEOverlay.dtd UI for s/mime hooks in message composition -->
 
-<!ENTITY securityMenu.label "Security">
+<!ENTITY securityMenu.label "Seguridad">
 <!ENTITY securityMenu.accesskey "e">
 
-<!ENTITY menu_securityEncryptIfPossible.label "Encrypt if Possible">
-<!ENTITY menu_securityEncryptIfPossible.accesskey "P">
+<!ENTITY menu_securityEncryptRequire.label "Cifrar este mensaje">
+<!ENTITY menu_securityEncryptRequire.accesskey "e">
 
-<!ENTITY menu_securityEncryptRequire.label "Encrypt This Message">
-<!ENTITY menu_securityEncryptRequire.accesskey "E">
-
-<!ENTITY menu_securityNoEncryption.label "Do Not Encrypt This Message">
+<!ENTITY menu_securityNoEncryption.label "No cifrar este mensaje">
 <!ENTITY menu_securityNoEncryption.accesskey "N">
 
-<!ENTITY menu_securitySign.label "Digitally Sign This Message">
-<!ENTITY menu_securitySign.accesskey "S">
+<!ENTITY menu_securitySign.label "Firmar digitalmente este mensaje">
+<!ENTITY menu_securitySign.accesskey "s">
 
-<!ENTITY menu_securityStatus.label "View Security Info">
-<!ENTITY menu_securityStatus.accesskey "I">
+<!ENTITY menu_securityStatus.label "Ver información de seguridad">
+<!ENTITY menu_securityStatus.accesskey "i">
 
-<!ENTITY securityButton.label "Security">
-<!ENTITY securityButton.tooltip "View or change security settings">
+<!ENTITY securityButton.label "Seguridad">
+<!ENTITY securityButton.tooltip "Ver o cambiar las opciones de seguridad">
 
-<!ENTITY menu_viewSecurityStatus.label "Message Security Info">
+<!ENTITY menu_viewSecurityStatus.label "Información de seguridad del mensaje">
 <!ENTITY menu_viewSecurityStatus.accesskey "I">
--- a/suite/chrome/mailnews/smime/msgSecurityInfo.properties
+++ b/suite/chrome/mailnews/smime/msgSecurityInfo.properties
@@ -1,71 +1,40 @@
 ## Signature Information strings
-SINoneLabel=Message Has No Digital Signature
-SINone=This message does not include the sender's digital signature. The absence of a digital signature means that the message could have been sent by someone pretending to have this email address. It is also possible that the message has been altered while in transit over the network. However, it is unlikely that either event has occurred. 
+SINoneLabel=El mensaje no tiene firma digital
+SINone=Este mensaje no incluye la firma digital del remitente. La ausencia de una firma digital significa que el mensaje pudo haber sido enviado por alguien que finge tener esta dirección de correo electrónico. También es posible que el mensaje haya sido alterado mientras circulaba por la red. Sin embargo, es poco probable que haya ocurrido alguno de estos eventos. 
 
-SIValidLabel=Message Is Signed
-SIValid=This message includes a valid digital signature. The message has not been altered since it was sent.
+SIValidLabel=El mensaje está firmado
+SIValid=Este mensaje incluye una firma digital válida. El mensaje no ha sido alterado desde que fue enviado.
 
-SIInvalidLabel=Digital Signature Is Not Valid
-SIInvalidHeader=This message includes a digital signature, but the signature is invalid.
+SIInvalidLabel=La firma digital no es válida
+SIInvalidHeader=Este mensaje incluye una firma digital, pero la firma no es válida.
 
-SIContentAltered=The signature does not match the message content correctly. The message appears to have been altered after the sender signed it. You should not trust the validity of this message until you verify its contents with the sender.
-SIExpired=The certificate used to signed the message appears to have expired. Make sure your computer's clock is set correctly.
-SIRevoked=The certificate used to sign the message has been revoked. You should not trust the validity of this message until you verify its contents with the sender.
-SINotYetValid=The certificate used to sign the message appears not be valid yet. Make sure your computer's clock is set correctly.
-SIUnknownCA=The certificate used to sign the message was issued by an unknown certificate authority.
-SIUntrustedCA=The certificate used to sign the message was issued by a certificate authority that you do not trust for issuing this kind of certificate.
-SIExpiredCA=The certificate used to sign the message was issued by a certificate authority whose own certificate has expired. Make sure your computer's clock is set correctly.
-SIRevokedCA=The certificate used to sign the message was issued by a certificate authority whose own certificate has been revoked. You should not trust the validity of this message until you verify its contents with the sender.
-SINotYetValidCA=The certificate used to sign the message was issued by a certificate authority whose own certificate is not yet valid. Make sure your computer's clock is set correctly.
+SIContentAltered=La firma no coincide correctamente con el contenido del mensaje. El mensaje parece haber sido alterado después que el remitente lo firmara. No debería confiar en la validez de este mensaje hasta que verifique su contenido con el remitente.
+SIExpired=El certificado usado para firmar el mensaje parece haber expirado. Asegúrese que la fecha de su computadora sea la correcta.
+SIRevoked=El certificado usado para firmar el mensaje ha sido revocado. No debería confiar en la validez de este mensaje hasta que verifique su contenido con el remitente.
+SINotYetValid=El certificado utilizado para firmar el mensaje parece que aún no es válido. Asegúrese que la fecha de su computadora sea la correcta.
+SIUnknownCA=El certificado utilizado para firmar el mensaje fue emitido por una autoridad certificadora desconocida.
+SIUntrustedCA=El certificado utilizado para firmar el mensaje fue emitido por una autoridad certificadora en la que no confía para emitir este tipo de certificado.
+SIExpiredCA=El certificado utilizado para firmar el mensaje fue emitido por una autoridad certificadora cuyo propio certificado ha expirado. Asegúrese que la fecha de su computadora esté correcta.
+SIRevokedCA=El certificado utilizado para firmar este mensaje fue emitido por una autoridad certificadora cuyo propio certificado ha sido revocado. No debería confiar en la validez de este mensaje hasta que verifique su contenido con el remitente.
+SINotYetValidCA=El certificado usado para firmar este mensaje fue emitido por una autoridad certificadora cuyo propio certificado aún no es válido. Asegúrese que la fecha de su computadora esté correcta.
 SIInvalidCipher=The message was signed using an encryption strength that this version of your software does not support.
-SIClueless=There are unknown problems with this digital signature. You should not trust the validity of this message until you verify its contents with the sender.
+SIClueless=Hay un problema desconocido con esta firma digital. No debería confiar en la validez de este mensaje hasta que verifique su contenido con el remitente.
 
-SIPartiallyValidLabel=Message is signed
-SIPartiallyValidHeader=Although the digital signature is valid, it is unknown whether sender and signer are the same person.
+SIPartiallyValidLabel=El mensaje está firmado
+SIPartiallyValidHeader=Aunque la firma digital es válida, se desconoce si el remitente y el firmante son la misma persona.
 
-SIHeaderMismatch=The email address listed in the signer's certificate is different from the email address that was used to send this message. Please look at the details of the signature certificate to learn who signed the message.
-SICertWithoutAddress=The certificate used to sign the message does not contain an email address. Please look at the details of the signature certificate to learn who signed the message.
+SIHeaderMismatch=La dirección de correo indicada en el certificado del firmante es diferente de la dirección de correo que se ha usado para enviar este mensaje. Verifique los detalles del certificado de la firma para saber quién firmó el mensaje.
+SICertWithoutAddress=El certificado utilizado para firmar el mensaje no contiene una dirección de correo electrónico. Verifique los detalles del certificado usado para la firma para saber quién firmó el mensaje.
 
 ## Encryption Information strings
-EINoneLabel=Message Not Encrypted
-EINone=This message was not encrypted before it was sent. Information sent over the Internet without encryption can be seen by other people while in transit.
-
-EIValidLabel=Message Is Encrypted
-EIValid=This message was encrypted before it was sent to you. Encryption makes it very difficult for other people to view information while it is traveling over the network.
-
-EIInvalidLabel=Message Cannot Be Decrypted
-EIInvalidHeader=This message was encrypted before it was sent to you, but it cannot be decrypted.
+EINoneLabel=Mensaje no cifrado
+EINone=Este mensaje no fue cifrado antes de ser enviado. La información que se envía a Internet sin cifrar puede ser vista por otras personas mientras llega a su destino.
 
-EIContentAltered=The message contents appear to have been altered during transmission.
-EINoDecryptCert=The certificate used to encrypt the message cannot be found.
-EIPasswordError=You did not enter your Master Password correctly.
-EIInvalidCipher=The message was encrypted using an encryption strength that this version of your software does not support.
-EIClueless=There are unknown problems with this encrypted message.
-
-
-## Signing Power Information string
-SPCanLabel=Message Can Be Sign