Migrating central to aurora for 15
authorMarcelo Poli <mpoli@lt24.zzn.com>
Tue, 05 Jun 2012 21:58:18 -0300
changeset 1093 35d6f29142a48b3b7b531de96de308923941ecfe
parent 1031 1ff5ff935cfe03c5f1e2d3e169d9eca744c2bedf
child 1094 ed222a56130a9cce0969fd8f6835a6fca4d09233
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:47:06 +0000
Migrating central to aurora for 15
browser/branding/official/brand.dtd
browser/branding/official/brand.properties
browser/chrome/browser/aboutCertError.dtd
browser/chrome/browser/aboutDialog.dtd
browser/chrome/browser/aboutHome.dtd
browser/chrome/browser/aboutPrivateBrowsing.dtd
browser/chrome/browser/aboutRobots.dtd
browser/chrome/browser/aboutSessionRestore.dtd
browser/chrome/browser/aboutSyncTabs.dtd
browser/chrome/browser/baseMenuOverlay.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/debugger.dtd
browser/chrome/browser/devtools/debugger.properties
browser/chrome/browser/devtools/gcli.properties
browser/chrome/browser/devtools/gclicommands.properties
browser/chrome/browser/devtools/inspector.properties
browser/chrome/browser/devtools/layoutview.dtd
browser/chrome/browser/devtools/responsiveUI.properties
browser/chrome/browser/devtools/scratchpad.dtd
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/sourceeditor.dtd
browser/chrome/browser/devtools/sourceeditor.properties
browser/chrome/browser/devtools/styleeditor.dtd
browser/chrome/browser/devtools/styleeditor.properties
browser/chrome/browser/devtools/styleinspector.dtd
browser/chrome/browser/devtools/styleinspector.properties
browser/chrome/browser/devtools/tilt.properties
browser/chrome/browser/devtools/webConsole.dtd
browser/chrome/browser/devtools/webconsole.properties
browser/chrome/browser/engineManager.dtd
browser/chrome/browser/engineManager.properties
browser/chrome/browser/feeds/subscribe.dtd
browser/chrome/browser/feeds/subscribe.properties
browser/chrome/browser/migration/migration.dtd
browser/chrome/browser/migration/migration.properties
browser/chrome/browser/newTab.dtd
browser/chrome/browser/newTab.properties
browser/chrome/browser/openLocation.dtd
browser/chrome/browser/openLocation.properties
browser/chrome/browser/pageInfo.dtd
browser/chrome/browser/pageInfo.properties
browser/chrome/browser/places/bookmarkProperties.properties
browser/chrome/browser/places/editBookmarkOverlay.dtd
browser/chrome/browser/places/moveBookmarks.dtd
browser/chrome/browser/places/places.dtd
browser/chrome/browser/places/places.properties
browser/chrome/browser/preferences/aboutPermissions.dtd
browser/chrome/browser/preferences/aboutPermissions.properties
browser/chrome/browser/preferences/advanced-scripts.dtd
browser/chrome/browser/preferences/advanced.dtd
browser/chrome/browser/preferences/applicationManager.dtd
browser/chrome/browser/preferences/applicationManager.properties
browser/chrome/browser/preferences/applications.dtd
browser/chrome/browser/preferences/colors.dtd
browser/chrome/browser/preferences/connection.dtd
browser/chrome/browser/preferences/content.dtd
browser/chrome/browser/preferences/cookies.dtd
browser/chrome/browser/preferences/fonts.dtd
browser/chrome/browser/preferences/languages.dtd
browser/chrome/browser/preferences/main.dtd
browser/chrome/browser/preferences/permissions.dtd
browser/chrome/browser/preferences/preferences.dtd
browser/chrome/browser/preferences/preferences.properties
browser/chrome/browser/preferences/privacy.dtd
browser/chrome/browser/preferences/security.dtd
browser/chrome/browser/preferences/selectBookmark.dtd
browser/chrome/browser/preferences/sync.dtd
browser/chrome/browser/preferences/tabs.dtd
browser/chrome/browser/quitDialog.properties
browser/chrome/browser/safeMode.dtd
browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
browser/chrome/browser/safebrowsing/report-phishing.dtd
browser/chrome/browser/sanitize.dtd
browser/chrome/browser/search.properties
browser/chrome/browser/searchbar.dtd
browser/chrome/browser/setDesktopBackground.dtd
browser/chrome/browser/shellservice.properties
browser/chrome/browser/syncBrand.dtd
browser/chrome/browser/syncGenericChange.properties
browser/chrome/browser/syncKey.dtd
browser/chrome/browser/syncProgress.dtd
browser/chrome/browser/syncQuota.dtd
browser/chrome/browser/syncQuota.properties
browser/chrome/browser/syncSetup.dtd
browser/chrome/browser/syncSetup.properties
browser/chrome/browser/tabbrowser.dtd
browser/chrome/browser/tabbrowser.properties
browser/chrome/browser/tabview.properties
browser/chrome/browser/taskbar.properties
browser/chrome/overrides/appstrings.properties
browser/chrome/overrides/netError.dtd
browser/chrome/overrides/settingsChange.dtd
browser/crashreporter/crashreporter-override.ini
browser/feedback/main.dtd
browser/feedback/main.properties
browser/installer/custom.properties
browser/installer/mui.properties
browser/installer/override.properties
browser/pdfviewer/viewer.properties
browser/profile/chrome/userChrome-example.css
browser/profile/chrome/userContent-example.css
browser/updater/updater.ini
browser/webapp-uninstaller/webapp-uninstaller.properties
browser/webapprt/webapp.properties
chat/accounts.properties
chat/commands.properties
chat/conversations.properties
chat/facebook.properties
chat/irc.properties
chat/status.properties
chat/twitter.properties
chat/xmpp.properties
dom/chrome/accessibility/AccessFu.properties
dom/chrome/accessibility/mac/accessible.properties
dom/chrome/accessibility/unix/accessible.properties
dom/chrome/accessibility/win/accessible.properties
dom/chrome/appstrings.properties
dom/chrome/charsetTitles.properties
dom/chrome/dom/dom.properties
dom/chrome/global-strres.properties
dom/chrome/global.dtd
dom/chrome/layout/HtmlForm.properties
dom/chrome/layout/MediaDocument.properties
dom/chrome/layout/css.properties
dom/chrome/layout/htmlparser.properties
dom/chrome/layout/layout_errors.properties
dom/chrome/layout/printing.properties
dom/chrome/layout/xbl.properties
dom/chrome/layout/xmlparser.properties
dom/chrome/layout/xul.properties
dom/chrome/netError.dtd
dom/chrome/netErrorApp.dtd
dom/chrome/nsWebBrowserPersist.properties
dom/chrome/plugins.properties
dom/chrome/security/caps.properties
dom/chrome/svg/svg.properties
dom/chrome/xml/prettyprint.dtd
dom/chrome/xslt/xslt.properties
editor/ui/chrome/composer/editingOverlay.dtd
editor/ui/chrome/composer/editor.dtd
editor/ui/chrome/composer/editor.properties
editor/ui/chrome/composer/editorOverlay.dtd
editor/ui/chrome/composer/editorPrefsOverlay.dtd
editor/ui/chrome/composer/editorSmileyOverlay.dtd
editor/ui/chrome/composer/pref-composer.dtd
editor/ui/chrome/composer/pref-editing.dtd
editor/ui/chrome/composer/pref-toolbars.dtd
editor/ui/chrome/dialogs/EdAdvancedEdit.dtd
editor/ui/chrome/dialogs/EdColorPicker.dtd
editor/ui/chrome/dialogs/EdConvertToTable.dtd
editor/ui/chrome/dialogs/EdDialogOverlay.dtd
editor/ui/chrome/dialogs/EdLinkChecker.dtd
editor/ui/chrome/dialogs/EdNamedAnchorProperties.dtd
editor/ui/chrome/dialogs/EditConflict.dtd
editor/ui/chrome/dialogs/EditorButtonProperties.dtd
editor/ui/chrome/dialogs/EditorColorProperties.dtd
editor/ui/chrome/dialogs/EditorFieldSetProperties.dtd
editor/ui/chrome/dialogs/EditorFormProperties.dtd
editor/ui/chrome/dialogs/EditorHLineProperties.dtd
editor/ui/chrome/dialogs/EditorImageProperties.dtd
editor/ui/chrome/dialogs/EditorInputProperties.dtd
editor/ui/chrome/dialogs/EditorInsertChars.dtd
editor/ui/chrome/dialogs/EditorInsertSource.dtd
editor/ui/chrome/dialogs/EditorInsertTOC.dtd
editor/ui/chrome/dialogs/EditorInsertTable.dtd
editor/ui/chrome/dialogs/EditorLabelProperties.dtd
editor/ui/chrome/dialogs/EditorLinkProperties.dtd
editor/ui/chrome/dialogs/EditorListProperties.dtd
editor/ui/chrome/dialogs/EditorPageProperties.dtd
editor/ui/chrome/dialogs/EditorPersonalDictionary.dtd
editor/ui/chrome/dialogs/EditorPublish.dtd
editor/ui/chrome/dialogs/EditorPublishProgress.dtd
editor/ui/chrome/dialogs/EditorReplace.dtd
editor/ui/chrome/dialogs/EditorSaveAsCharset.dtd
editor/ui/chrome/dialogs/EditorSelectProperties.dtd
editor/ui/chrome/dialogs/EditorSnapToGrid.dtd
editor/ui/chrome/dialogs/EditorSpellCheck.dtd
editor/ui/chrome/dialogs/EditorTableProperties.dtd
editor/ui/chrome/dialogs/EditorTextAreaProperties.dtd
editor/ui/chrome/region/region.properties
embedding/android/android_strings.dtd
mail/all-l10n.js
mail/chrome/communicator/utilityOverlay.dtd
mail/chrome/messenger-mapi/mapi.properties
mail/chrome/messenger-newsblog/am-newsblog.dtd
mail/chrome/messenger-newsblog/feed-subscriptions.dtd
mail/chrome/messenger-newsblog/newsblog.properties
mail/chrome/messenger-smime/certFetchingStatus.dtd
mail/chrome/messenger-smime/msgCompSMIMEOverlay.dtd
mail/chrome/messenger-smime/msgCompSMIMEOverlay.properties
mail/chrome/messenger-smime/msgCompSecurityInfo.dtd
mail/chrome/messenger-smime/msgCompSecurityInfo.properties
mail/chrome/messenger-smime/msgReadSMIMEOverlay.dtd
mail/chrome/messenger-smime/msgReadSMIMEOverlay.properties
mail/chrome/messenger-smime/msgReadSecurityInfo.dtd
mail/chrome/messenger-smime/msgSecurityInfo.properties
mail/chrome/messenger/AccountManager.dtd
mail/chrome/messenger/AccountWizard.dtd
mail/chrome/messenger/CustomHeaders.dtd
mail/chrome/messenger/FilterEditor.dtd
mail/chrome/messenger/FilterListDialog.dtd
mail/chrome/messenger/SearchDialog.dtd
mail/chrome/messenger/aboutRights.properties
mail/chrome/messenger/aboutSupportMail.dtd
mail/chrome/messenger/aboutSupportMail.properties
mail/chrome/messenger/accountCreation.dtd
mail/chrome/messenger/accountCreation.properties
mail/chrome/messenger/accountCreationModel.properties
mail/chrome/messenger/accountCreationUtil.properties
mail/chrome/messenger/activity.dtd
mail/chrome/messenger/activity.properties
mail/chrome/messenger/addbuddy.dtd
mail/chrome/messenger/addressbook/abAddressBookNameDialog.dtd
mail/chrome/messenger/addressbook/abCardOverlay.dtd
mail/chrome/messenger/addressbook/abCardViewOverlay.dtd
mail/chrome/messenger/addressbook/abContactsPanel.dtd
mail/chrome/messenger/addressbook/abMailListDialog.dtd
mail/chrome/messenger/addressbook/abMainWindow.dtd
mail/chrome/messenger/addressbook/abNewCardDialog.dtd
mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd
mail/chrome/messenger/addressbook/addressBook.properties
mail/chrome/messenger/addressbook/ldapAutoCompErrs.properties
mail/chrome/messenger/addressbook/pref-directory-add.dtd
mail/chrome/messenger/addressbook/pref-directory.dtd
mail/chrome/messenger/addressbook/replicationProgress.properties
mail/chrome/messenger/am-addressing.dtd
mail/chrome/messenger/am-advanced.dtd
mail/chrome/messenger/am-archiveoptions.dtd
mail/chrome/messenger/am-copies.dtd
mail/chrome/messenger/am-identities-list.dtd
mail/chrome/messenger/am-identity-edit.dtd
mail/chrome/messenger/am-im.dtd
mail/chrome/messenger/am-junk.dtd
mail/chrome/messenger/am-main.dtd
mail/chrome/messenger/am-mdn.dtd
mail/chrome/messenger/am-mdn.properties
mail/chrome/messenger/am-offline.dtd
mail/chrome/messenger/am-server-advanced.dtd
mail/chrome/messenger/am-server-top.dtd
mail/chrome/messenger/am-serverwithnoidentities.dtd
mail/chrome/messenger/am-smime.dtd
mail/chrome/messenger/am-smime.properties
mail/chrome/messenger/appleMailImportMsgs.properties
mail/chrome/messenger/baseMenuOverlay.dtd
mail/chrome/messenger/chat.dtd
mail/chrome/messenger/chat.properties
mail/chrome/messenger/cloudfile/UbuntuOne/management.dtd
mail/chrome/messenger/cloudfile/UbuntuOne/settings.dtd
mail/chrome/messenger/cloudfile/addAccountDialog.dtd
mail/chrome/messenger/configEditorOverlay.dtd
mail/chrome/messenger/custom.properties
mail/chrome/messenger/customizeToolbarOverlay.dtd
mail/chrome/messenger/downloadheaders.dtd
mail/chrome/messenger/downloadsOverlay.dtd
mail/chrome/messenger/editContactOverlay.dtd
mail/chrome/messenger/editContactOverlay.properties
mail/chrome/messenger/eudoraImportMsgs.properties
mail/chrome/messenger/filter.properties
mail/chrome/messenger/folderProps.dtd
mail/chrome/messenger/folderpane.dtd
mail/chrome/messenger/gloda.properties
mail/chrome/messenger/glodaComplete.properties
mail/chrome/messenger/glodaFacetView.dtd
mail/chrome/messenger/glodaFacetView.properties
mail/chrome/messenger/imAccountWizard.dtd
mail/chrome/messenger/imAccounts.dtd
mail/chrome/messenger/imAccounts.properties
mail/chrome/messenger/imapMsgs.properties
mail/chrome/messenger/importDialog.dtd
mail/chrome/messenger/importMsgs.properties
mail/chrome/messenger/joinChat.dtd
mail/chrome/messenger/junkMailInfo.dtd
mail/chrome/messenger/localMsgs.properties
mail/chrome/messenger/mailEditorOverlay.dtd
mail/chrome/messenger/mailOverlay.dtd
mail/chrome/messenger/mailViewList.dtd
mail/chrome/messenger/mailViewSetup.dtd
mail/chrome/messenger/mailviews.properties
mail/chrome/messenger/markByDate.dtd
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/messengercompose/addressingWidgetOverlay.dtd
mail/chrome/messenger/messengercompose/askSendFormat.dtd
mail/chrome/messenger/messengercompose/askSendFormat.properties
mail/chrome/messenger/messengercompose/composeMsgs.properties
mail/chrome/messenger/messengercompose/mailComposeEditorOverlay.dtd
mail/chrome/messenger/messengercompose/messengercompose.dtd
mail/chrome/messenger/messengercompose/sendProgress.dtd
mail/chrome/messenger/messengercompose/sendProgress.properties
mail/chrome/messenger/migration/migration.dtd
mail/chrome/messenger/migration/migration.properties
mail/chrome/messenger/mime.properties
mail/chrome/messenger/mimeheader.properties
mail/chrome/messenger/msgAccountCentral.dtd
mail/chrome/messenger/msgFolderPickerOverlay.dtd
mail/chrome/messenger/msgHdrViewOverlay.dtd
mail/chrome/messenger/msgSynchronize.dtd
mail/chrome/messenger/msgViewPickerOverlay.dtd
mail/chrome/messenger/msgmdn.properties
mail/chrome/messenger/multimessageview.dtd
mail/chrome/messenger/multimessageview.properties
mail/chrome/messenger/newFolderDialog.dtd
mail/chrome/messenger/newTagDialog.dtd
mail/chrome/messenger/newmailaccount/accountProvisioner.dtd
mail/chrome/messenger/newmailaccount/accountProvisioner.properties
mail/chrome/messenger/news.properties
mail/chrome/messenger/oeImportMsgs.properties
mail/chrome/messenger/offline.properties
mail/chrome/messenger/offlineStartup.properties
mail/chrome/messenger/outlookImportMsgs.properties
mail/chrome/messenger/preferences/advanced.dtd
mail/chrome/messenger/preferences/applicationManager.dtd
mail/chrome/messenger/preferences/applicationManager.properties
mail/chrome/messenger/preferences/applications.dtd
mail/chrome/messenger/preferences/applications.properties
mail/chrome/messenger/preferences/attachmentReminder.dtd
mail/chrome/messenger/preferences/chat.dtd
mail/chrome/messenger/preferences/compose.dtd
mail/chrome/messenger/preferences/connection.dtd
mail/chrome/messenger/preferences/cookies.dtd
mail/chrome/messenger/preferences/display.dtd
mail/chrome/messenger/preferences/fonts.dtd
mail/chrome/messenger/preferences/general.dtd
mail/chrome/messenger/preferences/junkLog.dtd
mail/chrome/messenger/preferences/notifications.dtd
mail/chrome/messenger/preferences/offline.dtd
mail/chrome/messenger/preferences/permissions.dtd
mail/chrome/messenger/preferences/preferences.dtd
mail/chrome/messenger/preferences/preferences.properties
mail/chrome/messenger/preferences/receipts.dtd
mail/chrome/messenger/preferences/security.dtd
mail/chrome/messenger/preferences/sendoptions.dtd
mail/chrome/messenger/prefs.properties
mail/chrome/messenger/quickFilterBar.dtd
mail/chrome/messenger/renameFolderDialog.dtd
mail/chrome/messenger/safeMode.dtd
mail/chrome/messenger/search-attributes.properties
mail/chrome/messenger/search-operators.properties
mail/chrome/messenger/search.properties
mail/chrome/messenger/searchIntegrationDefault.dtd
mail/chrome/messenger/searchIntegrationMac.dtd
mail/chrome/messenger/searchIntegrationWin.dtd
mail/chrome/messenger/searchTermOverlay.dtd
mail/chrome/messenger/shutdownWindow.properties
mail/chrome/messenger/smime.properties
mail/chrome/messenger/smtpEditOverlay.dtd
mail/chrome/messenger/subscribe.dtd
mail/chrome/messenger/subscribe.properties
mail/chrome/messenger/systemIntegrationDialog.dtd
mail/chrome/messenger/tabmail.dtd
mail/chrome/messenger/taskbar.properties
mail/chrome/messenger/telemetry.properties
mail/chrome/messenger/templateUtils.properties
mail/chrome/messenger/textImportMsgs.properties
mail/chrome/messenger/vCardImportMsgs.properties
mail/chrome/messenger/viewLog.dtd
mail/chrome/messenger/virtualFolderListDialog.dtd
mail/chrome/messenger/virtualFolderProperties.dtd
mail/chrome/messenger/wmImportMsgs.properties
mail/chrome/mozldap/ldap.properties
mail/chrome/overrides/netError.dtd
mail/chrome/overrides/settingsChange.dtd
mail/defines.inc
mail/feedback/main.dtd
mail/feedback/main.properties
mail/installer/custom.properties
mail/installer/mui.properties
mail/installer/override.properties
mail/updater/updater.ini
mobile/android/base/android_strings.dtd
mobile/android/base/sync_strings.dtd
mobile/android/chrome/aboutAddons.dtd
mobile/android/chrome/aboutAddons.properties
mobile/android/chrome/aboutApps.dtd
mobile/android/chrome/aboutApps.properties
mobile/android/chrome/aboutCertError.dtd
mobile/android/chrome/aboutDownloads.dtd
mobile/android/chrome/aboutDownloads.properties
mobile/android/chrome/aboutHome.dtd
mobile/android/chrome/browser.properties
mobile/android/chrome/checkbox.dtd
mobile/android/chrome/config.dtd
mobile/android/chrome/config.properties
mobile/android/chrome/feedback.dtd
mobile/android/chrome/localepicker.properties
mobile/android/chrome/notification.dtd
mobile/android/chrome/phishing.dtd
mobile/android/chrome/prompt.dtd
mobile/android/chrome/sync.dtd
mobile/android/chrome/sync.properties
mobile/overrides/appstrings.properties
mobile/overrides/netError.dtd
mobile/overrides/passwordmgr.properties
mobile/xul/chrome/aboutCertError.dtd
mobile/xul/chrome/aboutHome.dtd
mobile/xul/chrome/browser.dtd
mobile/xul/chrome/browser.properties
mobile/xul/chrome/checkbox.dtd
mobile/xul/chrome/config.dtd
mobile/xul/chrome/feedback.dtd
mobile/xul/chrome/localepicker.properties
mobile/xul/chrome/notification.dtd
mobile/xul/chrome/phishing.dtd
mobile/xul/chrome/preferences.dtd
mobile/xul/chrome/prompt.dtd
mobile/xul/chrome/sync.dtd
mobile/xul/chrome/sync.properties
mobile/xul/chrome/webapps.dtd
mobile/xul/crashreporter/crashreporter-override.ini
mobile/xul/updater/updater.ini
netwerk/necko.properties
security/manager/chrome/pipnss/nsserrors.properties
security/manager/chrome/pipnss/pipnss.properties
security/manager/chrome/pipnss/security.properties
services/sync/errors.properties
services/sync/sync.properties
toolkit/chrome/alerts/notificationNames.properties
toolkit/chrome/autoconfig/autoconfig.properties
toolkit/chrome/cookie/cookieAcceptDialog.dtd
toolkit/chrome/cookie/cookieAcceptDialog.properties
toolkit/chrome/global-platform/mac/intl.properties
toolkit/chrome/global-platform/mac/platformKeys.properties
toolkit/chrome/global-platform/unix/intl.properties
toolkit/chrome/global-platform/unix/platformKeys.properties
toolkit/chrome/global-platform/win/intl.properties
toolkit/chrome/global-platform/win/platformKeys.properties
toolkit/chrome/global-region/region.properties
toolkit/chrome/global/aboutAbout.dtd
toolkit/chrome/global/aboutRights.properties
toolkit/chrome/global/aboutSupport.dtd
toolkit/chrome/global/aboutSupport.properties
toolkit/chrome/global/actions.dtd
toolkit/chrome/global/appPicker.dtd
toolkit/chrome/global/browser.properties
toolkit/chrome/global/charsetOverlay.dtd
toolkit/chrome/global/commonDialog.dtd
toolkit/chrome/global/commonDialogs.properties
toolkit/chrome/global/config.dtd
toolkit/chrome/global/config.properties
toolkit/chrome/global/console.dtd
toolkit/chrome/global/console.properties
toolkit/chrome/global/contentAreaCommands.properties
toolkit/chrome/global/customizeCharset.dtd
toolkit/chrome/global/customizeToolbar.properties
toolkit/chrome/global/dateFormat.properties
toolkit/chrome/global/datetimepicker.dtd
toolkit/chrome/global/dialog.properties
toolkit/chrome/global/dialogOverlay.dtd
toolkit/chrome/global/downloadProgress.properties
toolkit/chrome/global/editMenuOverlay.dtd
toolkit/chrome/global/filefield.properties
toolkit/chrome/global/filepicker.dtd
toolkit/chrome/global/filepicker.properties
toolkit/chrome/global/findbar.dtd
toolkit/chrome/global/findbar.properties
toolkit/chrome/global/finddialog.dtd
toolkit/chrome/global/finddialog.properties
toolkit/chrome/global/globalKeys.dtd
toolkit/chrome/global/headsUpDisplay.properties
toolkit/chrome/global/intl.css
toolkit/chrome/global/intl.properties
toolkit/chrome/global/keys.properties
toolkit/chrome/global/languageNames.properties
toolkit/chrome/global/mozilla.dtd
toolkit/chrome/global/notification.dtd
toolkit/chrome/global/nsTreeSorting.properties
toolkit/chrome/global/preferences.dtd
toolkit/chrome/global/printPageSetup.dtd
toolkit/chrome/global/printPreview.dtd
toolkit/chrome/global/printProgress.dtd
toolkit/chrome/global/printdialog.dtd
toolkit/chrome/global/printdialog.properties
toolkit/chrome/global/printjoboptions.dtd
toolkit/chrome/global/regionNames.properties
toolkit/chrome/global/resetProfile.dtd
toolkit/chrome/global/textcontext.dtd
toolkit/chrome/global/tree.dtd
toolkit/chrome/global/videocontrols.dtd
toolkit/chrome/global/viewSource.dtd
toolkit/chrome/global/viewSource.properties
toolkit/chrome/global/wizard.dtd
toolkit/chrome/global/wizard.properties
toolkit/chrome/global/xpinstall/xpinstall.properties
toolkit/chrome/mozapps/downloads/downloads.dtd
toolkit/chrome/mozapps/downloads/downloads.properties
toolkit/chrome/mozapps/downloads/settingsChange.dtd
toolkit/chrome/mozapps/downloads/unknownContentType.dtd
toolkit/chrome/mozapps/downloads/unknownContentType.properties
toolkit/chrome/mozapps/extensions/about.dtd
toolkit/chrome/mozapps/extensions/blocklist.dtd
toolkit/chrome/mozapps/extensions/extensions.dtd
toolkit/chrome/mozapps/extensions/newaddon.dtd
toolkit/chrome/mozapps/extensions/newaddon.properties
toolkit/chrome/mozapps/extensions/selectAddons.dtd
toolkit/chrome/mozapps/extensions/selectAddons.properties
toolkit/chrome/mozapps/extensions/update.dtd
toolkit/chrome/mozapps/extensions/update.properties
toolkit/chrome/mozapps/extensions/xpinstallConfirm.dtd
toolkit/chrome/mozapps/extensions/xpinstallConfirm.properties
toolkit/chrome/mozapps/handling/handling.dtd
toolkit/chrome/mozapps/handling/handling.properties
toolkit/chrome/mozapps/help/help-toc.rdf
toolkit/chrome/mozapps/help/help.dtd
toolkit/chrome/mozapps/help/help.properties
toolkit/chrome/mozapps/help/welcome.xhtml
toolkit/chrome/mozapps/plugins/plugins.dtd
toolkit/chrome/mozapps/preferences/changemp.dtd
toolkit/chrome/mozapps/preferences/ocsp.dtd
toolkit/chrome/mozapps/preferences/preferences.properties
toolkit/chrome/mozapps/preferences/removemp.dtd
toolkit/chrome/mozapps/profile/createProfileWizard.dtd
toolkit/chrome/mozapps/profile/profileSelection.dtd
toolkit/chrome/mozapps/profile/profileSelection.properties
toolkit/chrome/mozapps/update/history.dtd
toolkit/chrome/mozapps/update/updates.properties
toolkit/chrome/passwordmgr/passwordManager.dtd
toolkit/chrome/passwordmgr/passwordmgr.properties
toolkit/chrome/places/places.properties
toolkit/chrome/search/search.properties
--- a/browser/branding/official/brand.dtd
+++ b/browser/branding/official/brand.dtd
@@ -1,5 +1,9 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY  brandShortName        "Firefox">
 <!ENTITY  brandFullName         "Mozilla Firefox">            
 <!ENTITY  vendorShortName       "Mozilla">
 <!ENTITY  trademarkInfo.part1   "Firefox y los logos de Firefox son marcas registradas de Mozilla Foundation.">
 
--- a/browser/branding/official/brand.properties
+++ b/browser/branding/official/brand.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 brandShortName=Firefox
 brandFullName=Mozilla Firefox
 vendorShortName=Mozilla
 
 homePageSingleStartMain=Inicio de Firefox, una página de inicio rápida con búsqueda integrada
 homePageImport=Importar la página de inicio de %S
 
 homePageMigrationPageTitle=Selección de página de inicio
--- a/browser/chrome/browser/aboutCertError.dtd
+++ b/browser/chrome/browser/aboutCertError.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY % brandDTD
     SYSTEM "chrome://branding/locale/brand.dtd">
   %brandDTD;
 
 <!-- These strings are used by Firefox's custom about:certerror page,
 a replacement for the standard security certificate errors produced
 by NSS/PSM via netError.xhtml. -->
 
--- a/browser/chrome/browser/aboutDialog.dtd
+++ b/browser/chrome/browser/aboutDialog.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY aboutDialog.title "Acerca de &brandFullName;">
 
 <!-- LOCALIZATION NOTE (warningDesc.version): This is a warning about the experimental nature of Nightly and Aurora builds. It is only shown in those versions. -->
 <!ENTITY warningDesc.version        "&brandShortName; es experimental y puede ser inestable.">
 <!-- LOCALIZATION NOTE (warningDesc.telemetryDesc): This is a notification that Nightly/Aurora builds automatically send Telemetry data back to Mozilla. It is only shown in those versions. "It" refers to brandShortName. -->
 <!ENTITY warningDesc.telemetryDesc  "Envía automáticamente información acerca del rendimiento, hardware, uso y personalizaciones de vuelta a &vendorShortName; para ayudar a mejorar a &brandShortName;.">
 
 <!-- LOCALIZATION NOTE (community.exp.*) This paragraph is shown in "experimental" builds, i.e. Nightly and Aurora builds, instead of the other "community.*" strings below. -->
@@ -65,15 +69,17 @@
 <!-- LOCALIZATION NOTE (update.downloading.start,update.downloading.end): update.downloading.start and 
      update.downloading.end all go into one line, with the amount downloaded inserted in between. As this
      is all in one line, try to make the localized text short (see bug 596813 for screenshots). The — is
      the "em dash" (long dash).
      example: Downloading update — 111 KB of 13 MB -->
 <!ENTITY update.downloading.start   "Descargando actualización — ">
 <!ENTITY update.downloading.end     "">
 
+<!ENTITY update.applying            "Aplicando actualización…">
+
 <!-- LOCALIZATION NOTE (channel.description.start,channel.description.end): channel.description.start and
      channel.description.end create one sentence, with the current channel label inserted in between.
      example: You are currently on the _Stable_ update channel. -->
 <!ENTITY channel.description.start  "Está actualmente en el canal de actualización ">
 <!ENTITY channel.description.end    ". ">
  
 
--- a/browser/chrome/browser/aboutHome.dtd
+++ b/browser/chrome/browser/aboutHome.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 %brandDTD;
 <!ENTITY % syncBrandDTD SYSTEM "chrome://browser/locale/syncBrand.dtd">
 %syncBrandDTD;
 
 <!-- These strings are used in the about:home page -->
 
 <!ENTITY abouthome.pageTitle "Página de inicio de &brandFullName;">
--- a/browser/chrome/browser/aboutPrivateBrowsing.dtd
+++ b/browser/chrome/browser/aboutPrivateBrowsing.dtd
@@ -1,16 +1,19 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY privatebrowsingpage.title                  "Navegación privada">
 <!ENTITY privatebrowsingpage.title.normal          "¿Desea comenzar la navegación privada?">
 
 <!ENTITY privatebrowsingpage.issueDesc                 "&brandShortName; no recordará ningún historial para esta sesión.">
 <!ENTITY privatebrowsingpage.issueDesc.normal          "&brandShortName; no está actualmente en modo de navegación privada.">
 
-<!ENTITY privatebrowsingpage.description               "En una sesión de navegación privada, &brandShortName; no guarda los historiales de navegación, e búsqueda o descarga, así como tampoco la información ingresada en formularios, las cookies ni los archivos temporales de
-Internet. Sin embargo se preservan los archivos que usted decida descargar y los marcadores que cree.">
+<!ENTITY privatebrowsingpage.description               "En una sesión de navegación privada, &brandShortName; no guardará el historial de navegación, búsqueda, descargas, formularios, cookies o archivos temporales de internet.  Sin embargo, los archivos que descargue o los marcadores que cree serán preservados.">
 
 <!-- LOCALIZATION NOTE (privatebrowsingpage.clearRecentHistoryBefore): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (privatebrowsingpage.clearRecentHistoryAfter): include a starting space as needed -->
 <!ENTITY privatebrowsingpage.clearRecentHistoryBefore  "Puede querer comenzar también ">
 <!ENTITY privatebrowsingpage.clearRecentHistoryInner   "borrando el historial reciente">
 <!ENTITY privatebrowsingpage.clearRecentHistoryAfter   ".">
 
 <!ENTITY privatebrowsingpage.startPrivateBrowsing.label "Iniciar navegación privada">
--- a/browser/chrome/browser/aboutRobots.dtd
+++ b/browser/chrome/browser/aboutRobots.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!-- These strings are used in the about:robots page, which ties in with the
      robots theme used in the Firefox 3 Beta 2/3 first run pages...
          https://www.mozilla.com/en-US/firefox/3.0b2/firstrun/
          https://www.mozilla.com/en-US/firefox/3.0b3/firstrun/
      They're just meant to be fun and whimsical, with references to some geeky
      but well-known robots in movies and books. Be creative with translations! -->
 
 <!-- Nonsense line from the movie "The Day The Earth Stood Still". No translation needed. -->
--- a/browser/chrome/browser/aboutSessionRestore.dtd
+++ b/browser/chrome/browser/aboutSessionRestore.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY restorepage.tabtitle       "Restaurar sesión previa">
 <!-- LOCALIZATION NOTE: The title is intended to be apologetic and disarming, expressing dismay
      and regret that we are unable to restore the session for the user -->
 <!ENTITY restorepage.errorTitle     "Bueno, esto es vergonzoso.">
 <!ENTITY restorepage.problemDesc    "&brandShortName; tiene problemas recuperando sus ventanas y pestañas. Ésto es causado usualmente por una página web abierta recientemente.">
 <!ENTITY restorepage.tryThis        "Puede intentar:">
 <!ENTITY restorepage.restoreSome    "Eliminar una o más pestañas que piense que puedan estar causando el problema">
 <!ENTITY restorepage.startNew       "Iniciar una sesión de navegación completamente nueva">
--- a/browser/chrome/browser/aboutSyncTabs.dtd
+++ b/browser/chrome/browser/aboutSyncTabs.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!-- LOCALIZATION NOTE (tabs.otherComputers.label): Keep this in sync with syncTabsMenu.label from browser.dtd -->
 <!ENTITY tabs.otherComputers.label "Pestañas de otras computadoras">
 
 <!ENTITY tabs.searchText.label "Ingresar para buscar pestañas…">
 
 <!-- LOCALIZATION NOTE (tabs.context.openTab.accesskey, tabs.context.openMultipleTabs.accesskey):
      Only one of these will show at a time (based on selection), so reusing accesskey is ok. -->
 <!ENTITY tabs.context.openTab.label "Abrir esta pestaña">
--- a/browser/chrome/browser/baseMenuOverlay.dtd
+++ b/browser/chrome/browser/baseMenuOverlay.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY minimizeWindow.key "m">
 <!ENTITY minimizeWindow.label "Minimizar">
 <!ENTITY bringAllToFront.label "Traer todo al frente">
 <!ENTITY zoomWindow.label "Zoom">
 <!ENTITY windowMenu.label "Ventana">
 
 <!ENTITY helpMenu.label "Ayuda">
 <!ENTITY helpMenu.accesskey "y">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!-- LOCALIZATION NOTE : FILE This file contains the browser main menu items -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkeys --> 
 
 <!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
 <!ENTITY mainWindow.title "&brandFullName;">
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE -->
 <!ENTITY mainWindow.titlemodifier "&brandFullName;">
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
@@ -72,30 +76,42 @@ can reach it easily. -->
 <!ENTITY addonBarCmd.accesskey "B">
 
 <!ENTITY pageSourceCmd.label "Código fuente">
 <!ENTITY pageSourceCmd.accesskey "o">
 <!ENTITY pageSourceCmd.commandkey "u">
 <!ENTITY pageInfoCmd.label "Información de la página">
 <!ENTITY pageInfoCmd.accesskey "I">
 <!ENTITY pageInfoCmd.commandkey "i">
+<!-- LOCALIZATION NOTE (enterFullScreenCmd.label, exitFullScreenCmd.label):
+These should match what Safari and other Apple applications use on OS X Lion. -->
+<!ENTITY enterFullScreenCmd.label "Pasar a pantalla completa">
+<!ENTITY enterFullScreenCmd.accesskey "l">
+<!ENTITY exitFullScreenCmd.label "Salir de pantalla completa">
+<!ENTITY exitFullScreenCmd.accesskey "l">
 <!ENTITY fullScreenCmd.label "Pantalla completa">
 <!ENTITY fullScreenCmd.accesskey "l">
 <!ENTITY fullScreenCmd.macCommandKey "f">
 <!ENTITY showAllTabsCmd.label "Mostrar todas las pestañas">
 <!ENTITY showAllTabsCmd.accesskey "a">
 
 <!ENTITY fullScreenMinimize.tooltip "Minimizar">
 <!ENTITY fullScreenRestore.tooltip "Restaurar">
 <!ENTITY fullScreenClose.tooltip "Cerrar">
 <!ENTITY fullScreenAutohide.label "Ocultar barras de herramientas">
 <!ENTITY fullScreenAutohide.accesskey "h">
 <!ENTITY fullScreenExit.label "Salir de pantalla completa">
 <!ENTITY fullScreenExit.accesskey "S">
-<!ENTITY domFullScreenWarning.label "Pulse ESC para salir de pantalla completa">
+<!ENTITY fullscreenAllowButton.label "Permitir">
+<!ENTITY fullscreenExitButton.label "Denegar">
+<!ENTITY fullscreenApproval.value "¿Permitir pantalla completa?">
+
+<!ENTITY fullscreenExitHint.value "Pulse ESC en cualquier momento para salir de pantalla completa">
+<!ENTITY leaveDOMFullScreen.label "Salir de pantalla completa">
+<!ENTITY leaveDOMFullScreen.accesskey "S">
 
 <!ENTITY closeWindow.label "Cerrar ventana">
 <!ENTITY closeWindow.accesskey "C">
 
 <!ENTITY bookmarksMenu.label "Marcadores">
 <!ENTITY bookmarksMenu.accesskey "M">
 <!ENTITY bookmarkThisPageCmd.label "Marcar esta página">
 <!ENTITY bookmarkThisPageCmd.commandkey "d">
@@ -194,16 +210,20 @@ can reach it easily. -->
 
 <!ENTITY inspectMenu.label            "Inspeccionar">
 <!ENTITY inspectMenu.accesskey        "n">
 <!ENTITY inspectMenu.commandkey       "I">
 
 <!ENTITY inspectContextMenu.label     "Inspeccionar elemento">
 <!ENTITY inspectContextMenu.accesskey "o">
 
+<!ENTITY responsiveUI.label            "Modo sensible">
+<!ENTITY responsiveUI.accesskey        "s">
+<!ENTITY responsiveUI.commandkey       "M">
+
 <!-- LOCALIZATION NOTE (scratchpad.label): This menu item label appears
   -  in the Tools menu. See bug 653093.
   -  The Scratchpad is intended to provide a simple text editor for creating
   -  and evaluating bits of JavaScript code for the purposes of function
   -  prototyping, experimentation and convenient scripting.
   -
   -  It's quite possible that you won't have a good analogue for the word
   -  "Scratchpad" in your locale. You should feel free to find a close
@@ -211,25 +231,44 @@ can reach it easily. -->
   -  "simple discardable text editor". -->
 <!ENTITY scratchpad.label             "Borrador">
 <!ENTITY scratchpad.accesskey         "B">
 <!ENTITY scratchpad.keycode           "VK_F4">
 <!ENTITY scratchpad.keytext           "F4">
 
 <!ENTITY inspectCloseButton.tooltiptext "Cerrar Inspector">
 
+<!ENTITY devToolbarCloseButton.tooltiptext "Cerrar barra de desarrolladores">
+<!ENTITY devToolbarMenu.label "Barra de desarrolladores">
+<!ENTITY devToolbarMenu.accesskey "o">
+<!ENTITY devToolbar.commandkey "v">
+
+<!ENTITY webConsoleButton.label "Consola web">
+<!ENTITY inspectorButton.label "Inspector">
+<!ENTITY scriptsButton.label "Scripts">
+
 <!ENTITY inspectorHTMLCopyInner.label       "Copiar InnerHTML">
 <!ENTITY inspectorHTMLCopyInner.accesskey   "I">
 
 <!ENTITY inspectorHTMLCopyOuter.label       "Copiar OuterHTML">
 <!ENTITY inspectorHTMLCopyOuter.accesskey   "O">
 
 <!ENTITY inspectorHTMLDelete.label          "Borrar nodo">
 <!ENTITY inspectorHTMLDelete.accesskey      "n">
 
+<!-- LOCALIZATION NOTE (inspectOptionButton.*): The menu in the Inspector
+  -  toolbar.  -->
+<!ENTITY inspectOptionButton.tooltiptext    "Opciones del inspector">
+
+<!-- LOCALIZATION NOTE: These are for the menu in the Inspector Toolbar -->
+<!ENTITY inspectorToggleVeil.label          "Oscurcer la página">
+<!ENTITY inspectorToggleVeil.accesskey      "u">
+<!ENTITY inspectorToggleInfobar.label       "Mostrar información del nodo">
+<!ENTITY inspectorToggleInfobar.accesskey   "s">
+
 <!-- LOCALIZATION NOTE (inspect3DViewButton.label): This button shows an
   -  alternate view for the Inspector, creating a 3D visualization of the
   -  webpage. -->
 <!ENTITY inspect3DViewButton.label     "Vista 3D">
 <!ENTITY inspect3DViewButton.accesskey "V">
 
 <!ENTITY inspectStyleButton.label     "Estilo">
 <!ENTITY inspectStyleButton.accesskey "s">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 nv_timeout=Tiempo excedido
 openFile=Abrir archivo
 
 droponhometitle=Establecer página de inicio
 droponhomemsg=¿Desea que este documento sea su nueva página de inicio?
 
 # context menu strings
 
@@ -145,23 +149,24 @@ sanitizeSelectedWarning=Todos los ítems seleccionados serán borrados.
 # directly under the Firefox version in the about dialog (see bug 596813 for
 # screenshots).
 update.checkInsideButton.label=Buscar actualizaciones
 update.checkInsideButton.accesskey=c
 update.resumeButton.label=Continuar descargando %S…
 update.resumeButton.accesskey=d
 update.openUpdateUI.applyButton.label=Aplicar actualización…
 update.openUpdateUI.applyButton.accesskey=A
-update.restart.applyButton.label=Aplicar actualización
-update.restart.applyButton.accesskey=A
+update.restart.updateButton.label=Reiniciar para actualizar
+update.restart.updateButton.accesskey=R
 update.openUpdateUI.upgradeButton.label=Actualizar ahora…
 update.openUpdateUI.upgradeButton.accesskey=u
 update.restart.upgradeButton.label=Actualizar ahora
 update.restart.upgradeButton.accesskey=u
 
+
 # RSS Pretty Print
 feedShowFeedNew=Suscribirse a '%S'…
 
 menuOpenAllInTabs.label=Abrir todo en pestañas
 
 # History menu
 menuRestoreAllTabs.label=Restaurar todas las pestañas
 # LOCALIZATION NOTE (menuRestoreAllWindows, menuUndoCloseWindowLabel, menuUndoCloseWindowSingleTabLabel):
@@ -297,16 +302,17 @@ privateBrowsingNeverAsk=&No mostrar este
 ctrlTab.showAll.label=;Mostrar las #1 pestañas
 
 # LOCALIZATION NOTE (addKeywordTitleAutoFill): %S will be replaced by the page's title
 # Used as the bookmark name when saving a keyword for a search field.
 addKeywordTitleAutoFill=Buscar %S
 
 # TabView
 tabView2.title=%S - Agrupar pestañas
+tabview2.moveToUnnamedGroup.label=%S y %S más
 
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name=Predeterminado
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description=El tema predeterminado.
 
 # safeModeRestart
 safeModeRestartPromptTitle=Reiniciar con los complementos deshabilitados
 safeModeRestartPromptMessage=¿Seguro desea deshabilitar todos los complementos y reiniciar?
 safeModeRestartButton=Reiniciar
@@ -348,8 +354,12 @@ webapps.install.accesskey = I
 #LOCALIZATION NOTE (webapps.requestInstall) %1$S is the web app name, %2$S is the site from which the web app is installed
 webapps.requestInstall = ¿Desea instalar "%1$S" desde este sitio (%2$S)?
 
 # Telemetry opt-out prompt for Aurora and Nightly
 # LOCALIZATION NOTE (telemetryOptOutPrompt): %1$S and %3$S will be replaced by
 # brandFullName, and %2$S by the value of the toolkit.telemetry.server_owner preference.
 telemetryOptOutPrompt = %1$S envía información acerca del rendimiento, hardware, uso y personalizaciones hacia %2$S para ayudar a mejorar %3$S.
 
+# LOCALIZATION NOTE (fullscreen.entered): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
+fullscreen.entered=%S ahora está en pantalla completa.
+# LOCALIZATION NOTE (fullscreen.rememberDecision): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
+fullscreen.rememberDecision=Recordar la decisión para %S
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -1,46 +1,66 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!-- LOCALIZATION NOTE : FILE This file contains the Script Debugger strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkey -->
 
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
 
 <!-- LOCALIZATION NOTE (debuggerMenu.label): This is the label for the
   -  application menu item that opens the debugger UI. -->
-<!ENTITY debuggerMenu.label          "Depurador de scripts">
+<!ENTITY debuggerMenu.label2          "Depurador">
+
+<!-- LOCALIZATION NOTE (remoteDebuggerMenu.label): This is the label for the
+  -  application menu item that opens the remote debugger UI. -->
+<!ENTITY remoteDebuggerMenu.label    "Depurador remoto">
+
+<!-- LOCALIZATION NOTE (chromeDebuggerMenu.label): This is the label for the
+  -  application menu item that opens the browser debugger UI. -->
+<!ENTITY chromeDebuggerMenu.label   "Depurador del navegador">
 
 <!-- LOCALIZATION NOTE (debuggerMenu.commandkey): This is the command key that
   -  launches the debugger UI. Do not translate this one! -->
 <!ENTITY debuggerMenu.commandkey     "S">
 
-<!-- LOCALIZATION NOTE (debuggerUI.closeButton): This is the label for the
-  -  button that closes the debugger UI. -->
-<!ENTITY debuggerUI.closeButton      "Cerrar">
+<!-- LOCALIZATION NOTE (debuggerUI.closeButton.tooltip): This is the tooltip for
+  -  the button that closes the debugger UI. -->
+<!ENTITY debuggerUI.closeButton.tooltip        "Cerrar">
 
-<!-- LOCALIZATION NOTE (debuggerUI.stepOverButton): This is the label for the
-  -  button that steps over a function call. -->
-<!ENTITY debuggerUI.stepOverButton   "Step Over">
+<!-- LOCALIZATION NOTE (debuggerUI.stepOverButton.tooltip): This is the tooltip for
+  -  the button that steps over a function call. -->
+<!ENTITY debuggerUI.stepOverButton.tooltip   "Pisar">
 
-<!-- LOCALIZATION NOTE (debuggerUI.stepInButton): This is the label for the
+<!-- LOCALIZATION NOTE (debuggerUI.stepInButton): This is the tooltip for the
   -  button that steps into a function call. -->
-<!ENTITY debuggerUI.stepInButton     "Step In">
+<!ENTITY debuggerUI.stepInButton.tooltip     "Entrar">
 
-<!-- LOCALIZATION NOTE (debuggerUI.stepOutButton): This is the label for the
+<!-- LOCALIZATION NOTE (debuggerUI.stepOutButton): This is the tooltip for the
   -  button that steps out of a function call. -->
-<!ENTITY debuggerUI.stepOutButton    "Step Out">
+<!ENTITY debuggerUI.stepOutButton.tooltip    "Salir">
 
 <!-- LOCALIZATION NOTE (debuggerUI.stackTitle): This is the label for the
   -  widget that displays the call stack frames in the debugger. -->
-<!ENTITY debuggerUI.stackTitle       "Call stack">
+<!ENTITY debuggerUI.stackTitle       "Pila de llamados">
 
 <!-- LOCALIZATION NOTE (debuggerUI.scriptTitle): This is the label for the
   -  widget that displays the source code for the script that is currently
   -  being inspected in the debugger. -->
 <!ENTITY debuggerUI.scriptTitle      "Script">
 
 <!-- LOCALIZATION NOTE (debuggerUI.propertiesTitle): This is the label for the
   -  widget that displays the variables in the various available scopes in the
   -  debugger. -->
-<!ENTITY debuggerUI.propertiesTitle  "Scope variables">
+<!ENTITY debuggerUI.propertiesTitle  "Variables de contexto">
+
+<!-- LOCALIZATION NOTE (debuggerUI.emptyFilterText): This is the text that
+  -  appears in the filter text box when it is empty. -->
+<!ENTITY debuggerUI.emptyFilterText  "Filtro de scripts">
+
+<!-- LOCALIZATION NOTE (emptyScriptText): The text to display in the menulist when
+  - there are no scripts. -->
+<!ENTITY debuggerUI.emptyScriptText  "No hay scripts.">
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -1,54 +1,94 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # LOCALIZATION NOTE These strings are used inside the Script Debugger
 # which is available from the Web Developer sub-menu -> 'Script Debugger'.
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
+# LOCALIZATION NOTE (confirmTabSwitch): The messages displayed for all the
+# title and buttons on the notification shown when a user attempts to open a
+# debugger in a new tab while a different tab is already being debugged.
+confirmTabSwitch.message=El depurador ya está abierto en otra pestaña. Continuar cerrá esa otra instancia.
+confirmTabSwitch.buttonSwitch=Cambiar a la pestaña depurada
+confirmTabSwitch.buttonSwitch.accessKey=s
+confirmTabSwitch.buttonOpen=Abrir de todos modos
+confirmTabSwitch.buttonOpen.accessKey=o
+
+# LOCALIZATION NOTE (remoteDebuggerWindowTitle): The title displayed for the
+# remote debugger window.
+remoteDebuggerWindowTitle=Depurador remoto
+
+# LOCALIZATION NOTE (remoteDebuggerPromptTitle): The title displayed on the
+# debugger prompt asking for the remote host and port to connect to.
+remoteDebuggerPromptTitle=Conexión remota
+
+# LOCALIZATION NOTE (remoteDebuggerPromptMessage): The message displayed on the
+# debugger prompt asking for the remote host and port to connect to.
+remoteDebuggerPromptMessage=Ingrese nombre de servidor y número de puerto (servidor:puerto)
+
+# LOCALIZATION NOTE (remoteDebuggerPromptCheck): The message displayed on the
+# debugger prompt asking if the prompt should be shown again next time.
+remoteDebuggerPromptCheck=No preguntarme de nuevo
+
+# LOCALIZATION NOTE (remoteDebuggerReconnectMessage): The message displayed on the
+# debugger prompt asking for the remote host and port to connect to.
+remoteDebuggerReconnectMessage=Servidor no encontrado. ¿Reintentar? (servidor:puerto)
+
+# LOCALIZATION NOTE (remoteDebuggerReconnectMessage): The message displayed on the
+# debugger prompt asking for the remote host and port to connect to.
+remoteDebuggerConnectionFailedMessage=No se puede encontrar un servidor en el nombre y número de puerto especificados.
+
 # LOCALIZATION NOTE (pauseLabel): The label that is displayed on the pause
 # button when the debugger is in a running state.
-pauseLabel=Pausa
+pauseTooltip=Clic para pausar
 
 # LOCALIZATION NOTE (resumeLabel): The label that is displayed on the pause
 # button when the debugger is in a paused state.
-resumeLabel=Continuar
-
-# LOCALIZATION NOTE (pausedState): The label that is displayed when the
-# debugger is in a paused state.
-pausedState=Pausado
-
-# LOCALIZATION NOTE (runningState): The label that is displayed when the
-# debugger is in a running state.
-runningState=Ejecutando
-
-# LOCALIZATION NOTE (localScope): The label that is displayed in the variables
-# pane as a header on the local scope container.
-localScope=Local
+resumeTooltip=Clic para continuar
 
-# LOCALIZATION NOTE (globalScope): The label that is displayed in the variables
-# pane as a header on the globel scope container.
-globalScope=Global
-
-# LOCALIZATION NOTE (localScope): The label that is displayed in the variables
-# pane as a header on the container for identifiers in a with block.
-withScope=Bloque With
-
-# LOCALIZATION NOTE (closureScope): The label that is displayed in the variables
-# pane as a header on container for identifiers in a closure scope.
-closureScope=Closure
-
-# LOCALIZATION NOTE (emptyText): The text that is displayed in the stack frames
-# list when there are no frames to display.
-emptyText=Vacío
+# LOCALIZATION NOTE (emptyStackText): The text that is displayed in the stack
+# frames list when there are no frames to display.
+emptyStackText=No hay pilas para mostrar.
 
 # LOCALIZATION NOTE (loadingText): The text that is displayed in the script
 # editor when the laoding process has started but there is no file to display
 # yet.
 loadingText=Cargando\u2026
 
 # LOCALIZATION NOTE (loadingError):
 # This is the error message that is displayed on failed attempts to load an
 # external resource file.
 # %1$S=URL, %2$S=status code
 loadingError=Error cargando %1$S: %2$S
+
+# LOCALIZATION NOTE (remoteIncomingPromptTitle): The title displayed on the
+# dialog that prompts the user to allow the incoming connection.
+remoteIncomingPromptTitle=Conexión entrante
+
+# LOCALIZATION NOTE (remoteIncomingPromptMessage): The message displayed on the
+# dialog that prompts the user to allow the incoming connection.
+remoteIncomingPromptMessage=Se detectó un pedido entrante para permitir depuración remota. ¡Un cliente remoto puede tomar el control completo de su navegador! ¿Permitir conexión?
+
+# LOCALIZATION NOTE (remoteIncomingPromptDisable): The label displayed on the
+# third button in the incoming connection dialog that lets the user disable the
+# remote debugger server.
+remoteIncomingPromptDisable=Deshabilitar
+
+# LOCALIZATION NOTE (emptyVariablesText): The text that is displayed in the
+# variables pane when there are no variables to display.
+emptyVariablesText=No hay variables que mostrar.
+
+# LOCALIZATION NOTE (scopeLabel): The text that is displayed in the variables
+# pane as a header for each variable scope (e.g. "Global scope, "With scope",
+# etc.).
+scopeLabel=Alcance %S
+
+# LOCALIZATION NOTE (globalScopeLabel): The name of the global scope. This text
+# is added to scopeLabel and displayed in the variables pane as a header for
+# the global scope.
+globalScopeLabel=global
--- a/browser/chrome/browser/devtools/gcli.properties
+++ b/browser/chrome/browser/devtools/gcli.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # LOCALIZATION NOTE These strings are used inside the Web Console
 # command line which is available from the Web Developer sub-menu
 # -> 'Web Console'.
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
@@ -15,17 +19,17 @@ canonDescNone=(Sin descripción)
 # of JavaScript like traditional developer tool command lines. This describes
 # the '{' command.
 cliEvalJavascript=Ingrese JavaScript directamente
 
 # LOCALIZATION NOTE (fieldSelectionSelect): When a command has a parameter
 # that has a number of pre-defined options the user interface presents these
 # in a drop-down menu, where the first 'option' is an indicator that a
 # selection should be made. This string describes that first option.
-fieldSelectionSelect=Seleccione %S ...
+fieldSelectionSelect=Seleccione %S…
 
 # LOCALIZATION NOTE (fieldArrayAdd): When a command has a parameter that can
 # be repeated a number of times (e.g. like the 'cat a.txt b.txt' command) the
 # user interface presents buttons to add and remove arguments. This string is
 # used to add arguments.
 fieldArrayAdd=Agregar
 
 # LOCALIZATION NOTE (fieldArrayDel): When a command has a parameter that can
@@ -100,25 +104,26 @@ nodeParseNone=Sin coincidencia
 # fuller description of what it does.
 helpDesc=Obtenga ayuda sobre los comandos disponibles
 
 # LOCALIZATION NOTE (helpManual): A fuller description of the 'help' command.
 # Displayed when the user asks for help on what it does.
 helpManual=Provee ayuda, ya sea sobre un comando específico (si se ingresó una cadena a buscar y hay una coincidencia exacta) o sobre los comandos disponibles (si no se ingresó una cadena a buscar o si no hay coincidencia exacta).
 
 # LOCALIZATION NOTE (helpSearchDesc): A very short description of the 'search'
-# parameter to the 'help' command. See helpSearchManual for a fuller
+# parameter to the 'help' command. See helpSearchManual2 for a fuller
 # description of what it does. This string is designed to be shown in a dialog
 # with restricted space, which is why it should be as short as possible.
 helpSearchDesc=Cadena a buscar
 
-# LOCALIZATION NOTE (helpSearchManual): A fuller description of the 'search'
+# LOCALIZATION NOTE (helpSearchManual2): A fuller description of the 'search'
 # parameter to the 'help' command. Displayed when the user asks for help on
-# what it does.
-helpSearchManual=Una cadena a buscar para reducir el listado de comandos que se muestran al usuario. Cualquier parte de la cadena puede coincidir, no se soportan expresiones regulares.
+# what it does. Inline HTML (e.g. <strong>) can be used to emphasize the core
+# concept.
+helpSearchManual2=<strong>cadena a buscar</strong> para reducir el listado de comandos que se muestran. No se soportan expresiones regulares.
 
 # LOCALIZATION NOTE (helpManSynopsis): A heading shown at the top of a help
 # page for a command in the console It labels a summary of the parameters to
 # the command
 helpManSynopsis=Sinopsis
 
 # LOCALIZATION NOTE (helpManDescription): A heading shown in a help page for a
 # command in the console. This heading precedes the top level description.
@@ -127,17 +132,212 @@ helpManDescription=Descripción
 # LOCALIZATION NOTE (helpManParameters): A heading shown above the parameters
 # in a help page for a command in the console.
 helpManParameters=Parámetros
 
 # LOCALIZATION NOTE (helpManNone): Some text shown under the parameters
 # heading in a help page for a command which has no parameters.
 helpManNone=Ninguno
 
-# LOCALIZATION NOTE (introHeader): The heading displayed at the top of the
-# output for the help command
-introHeader=Bienvenido a las herramientas para desarrolladores de Firefox
+# LOCALIZATION NOTE (subCommands): Text shown as part of the output of the
+# 'help' command when the command in question has sub-commands, before a list
+# of the matching sub-commands
+subCommands=Subcomandos
+
+# LOCALIZATION NOTE (subCommandsNone): Text shown as part of the output of the
+# 'help' command when the command in question should have sub-commands but in
+# fact has none
+subCommandsNone=Ninguno
+
+# LOCALIZATION NOTE (prefDesc): A very short description of the 'pref'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible. See prefManual for a
+# fuller description of what it does.
+prefDesc=Comandos para controlar la configuración
+
+# LOCALIZATION NOTE (prefManual): A fuller description of the 'pref' command.
+# Displayed when the user asks for help on what it does.
+prefManual=Commands to display and alter preferences both for GCLI and the surrounding environment
+
+# LOCALIZATION NOTE (prefListDesc): A very short description of the 'pref
+# list' command. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible. See
+# prefListManual for a fuller description of what it does.
+prefListDesc=Mostrar configuración disponible
+
+# LOCALIZATION NOTE (prefListManual): A fuller description of the 'pref list'
+# command. Displayed when the user asks for help on what it does.
+prefListManual=Mostrar una lista de preferencias, filtrada opcionalmente usando el parámetro 'search' 
+
+# LOCALIZATION NOTE (prefListSearchDesc): A short description of the 'search'
+# parameter to the 'pref list' command. See prefListSearchManual for a fuller
+# description of what it does. This string is designed to be shown in a dialog
+# with restricted space, which is why it should be as short as possible.
+prefListSearchDesc=Filtrar la lista de configuraciones mostradas
+
+# LOCALIZATION NOTE (prefListSearchManual): A fuller description of the
+# 'search' parameter to the 'pref list' command. Displayed when the user asks
+# for help on what it does.
+prefListSearchManual=Buscar la cadena ingresada en la lista de preferencias disponibles
+
+# LOCALIZATION NOTE (prefShowDesc): A very short description of the 'pref
+# show' command. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible. See
+# prefShowManual for a fuller description of what it does.
+prefShowDesc=Mostrar valor de configuración
+
+# LOCALIZATION NOTE (prefShowManual): A fuller description of the 'pref show'
+# command. Displayed when the user asks for help on what it does.
+prefShowManual=Mostrar el valor de una preferencia dada
+
+# LOCALIZATION NOTE (prefShowSettingDesc): A short description of the
+# 'setting' parameter to the 'pref show' command. See prefShowSettingManual
+# for a fuller description of what it does. This string is designed to be
+# shown in a dialog with restricted space, which is why it should be as short
+# as possible.
+prefShowSettingDesc=Configuración a mostrar
+
+# LOCALIZATION NOTE (prefShowSettingManual): A fuller description of the
+# 'setting' parameter to the 'pref show' command. Displayed when the user asks
+# for help on what it does.
+prefShowSettingManual=El nombre de la configuración a mostrar
+
+# LOCALIZATION NOTE (prefSetDesc): A very short description of the 'pref set'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible. See prefSetManual for
+# a fuller description of what it does.
+prefSetDesc=Alterar una configuración
+
+# LOCALIZATION NOTE (prefSetManual): A fuller description of the 'pref set'
+# command. Displayed when the user asks for help on what it does.
+prefSetManual=Alterar preferencias definidas por el entorno
+
+# LOCALIZATION NOTE (prefSetSettingDesc): A short description of the 'setting'
+# parameter to the 'pref set' command. See prefSetSettingManual for a fuller
+# description of what it does. This string is designed to be shown in a dialog
+# with restricted space, which is why it should be as short as possible.
+prefSetSettingDesc=Configuración a alterar
+
+# LOCALIZATION NOTE (prefSetSettingManual): A fuller description of the
+# 'setting' parameter to the 'pref set' command. Displayed when the user asks
+# for help on what it does.
+prefSetSettingManual=El nombre de la configuración a alterar.
+
+# LOCALIZATION NOTE (prefSetValueDesc): A short description of the 'value'
+# parameter to the 'pref set' command. See prefSetValueManual for a fuller
+# description of what it does. This string is designed to be shown in a dialog
+# with restricted space, which is why it should be as short as possible.
+prefSetValueDesc=Nuevo valor para la configuración
+
+# LOCALIZATION NOTE (prefSetValueManual): A fuller description of the 'value'
+# parameter to the 'pref set' command. Displayed when the user asks for help
+# on what it does.
+prefSetValueManual=El nuevo valor para la configuración especificada
+
+# LOCALIZATION NOTE (prefSetCheckHeading): Title displayed to the user the
+# first time they try to alter a setting This is displayed directly above
+# prefSetCheckBody and prefSetCheckGo.
+prefSetCheckHeading=¡Ésto puede cancelar su garantía!
+
+# LOCALIZATION NOTE (prefSetCheckBody): The main text of the warning displayed
+# to the user the first time they try to alter a setting. See also
+# prefSetCheckHeading and prefSetCheckGo.
+prefSetCheckBody=Cambar esta configuración avanzada puede ser peligroso para la estabilidad, seguridad y rendimiento de esta aplicación. Debería continuar solamente si está seguro de lo que está haciendo.
+
+# LOCALIZATION NOTE (prefSetCheckGo): The text to enable preference editing.
+# Displayed in a button directly under prefSetCheckHeading and
+# prefSetCheckBody
+prefSetCheckGo=¡Voy a tener cuidado, lo prometo!
+
+# LOCALIZATION NOTE (prefResetDesc): A very short description of the 'pref
+# reset' command. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible. See
+# prefResetManual for a fuller description of what it does.
+prefResetDesc=Restablecer una configuración
+
+# LOCALIZATION NOTE (prefResetManual): A fuller description of the 'pref
+# reset' command. Displayed when the user asks for help on what it does.
+prefResetManual=Restablecer el valor de una configuración al predeterminado del sistema
+
+# LOCALIZATION NOTE (prefResetSettingDesc): A short description of the
+# 'setting' parameter to the 'pref reset' command. See prefResetSettingManual
+# for a fuller description of what it does. This string is designed to be
+# shown in a dialog with restricted space, which is why it should be as short
+# as possible.
+prefResetSettingDesc=Configuración a restablecer
+
+# LOCALIZATION NOTE (prefResetSettingManual): A fuller description of the
+# 'setting' parameter to the 'pref reset' command. Displayed when the user
+# asks for help on what it does.
+prefResetSettingManual=El nombre de la configuración a restablecer al valor predeterminado del sistema
+
+# LOCALIZATION NOTE (prefOutputFilter): Displayed in the output from the 'pref
+# list' command as a label to an input element that allows the user to filter
+# the results
+prefOutputFilter=Filtro
+
+# LOCALIZATION NOTE (prefOutputName): Displayed in the output from the 'pref
+# list' command as a heading to a table. The column contains the names of the
+# available preferences
+prefOutputName=Nombre
+
+# LOCALIZATION NOTE (prefOutputValue): Displayed in the output from the 'pref
+# list' command as a heading to a table. The column contains the values of the
+# available preferences
+prefOutputValue=Valor
+
+# LOCALIZATION NOTE (introDesc): A very short description of the 'intro'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible. See introManual for a
+# fuller description of what it does.
+introDesc=Mostrar el mensaje de inicio
+
+# LOCALIZATION NOTE (introManual): A fuller description of the 'intro'
+# command. Displayed when the user asks for help on what it does.
+introManual=Volver a mostrar el mensaje que se muestra a los nuevos usuarios hasta que presionan el botón '¡Lo tengo!'
+
+# LOCALIZATION NOTE (introTextOpening): The 'intro text' opens when the user
+# first opens the developer toolbar to explain the command line, and is shown
+# each time it is opened until the user clicks the 'Got it!' button. This
+# string is the opening paragraph of the intro text.
+introTextOpening=La línea de comandos de Firefox está diseñada para desarrolladores. Se centra en la velocidad de ingreso sobre la sintaxis de JavaScript syntax y una pantalla vistosa sobre la salida monoespaciada.
+
+# LOCALIZATION NOTE (introTextCommands): For information about the 'intro
+# text' see introTextOpening. The second paragraph is in 2 sections, the first
+# section points the user to the 'help' command.
+introTextCommands=Para una lista de comandos ingrese
+
+# LOCALIZATION NOTE (introDesc): A very short description of the 'intro'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible. See introManual for a
+# fuller description of what it does.
+introDesc=Muestra el mensaje de inicio
+
+# LOCALIZATION NOTE (introTextKeys): For information about the 'intro text'
+# see introTextOpening. The second section in the second paragraph points the
+# user to the F1/Escape keys which show and hide hints.
+introTextKeys=o para mostrar/ocultar ayudas presione
+
+# LOCALIZATION NOTE (introTextF1Escape): For information about the 'intro
+# text' see introTextOpening. This string is used with introTextKeys, and
+# contains the keys that are pressed to open and close hints.
+introTextF1Escape=F1/Escape
+
+# LOCALIZATION NOTE (introTextGo): For information about the 'intro text' see
+# introTextOpening. The text on the button that dismisses the intro text.
+introTextGo=¡Lo tengo!
+# LOCALIZATION NOTE (hideIntroDesc): Short description of the 'hideIntro'
+# setting. Displayed when the user asks for help on the settings.
+hideIntroDesc=Mostrar el mensaje inicial de bienvenida
+
+# LOCALIZATION NOTE (eagerHelperDesc): Short description of the 'eagerHelper'
+# setting. Displayed when the user asks for help on the settings.
+eagerHelperDesc=How eager are the tooltips
+
+# LOCALIZATION NOTE (allowSetDesc): Short description of the 'allowSetDesc'
+# setting. Displayed when the user asks for help on the settings.
+allowSetDesc=¿El usuario ha habilitado el comando 'pref set'?
 
 # LOCALIZATION NOTE (introBody): The text displayed at the top of the output
 # for the help command, just before the list of commands. This text is wrapped
 # inside a link to a localized MDN article
 introBody=Para más información vea MDN.
 
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # LOCALIZATION NOTE These strings are used inside Web Console commands.
 # The Web Console command line is available from the Web Developer sub-menu
 # -> 'Web Console'.
 #
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
@@ -31,16 +35,56 @@ consoleDesc=Comandos para controlar la c
 # LOCALIZATION NOTE (consoleManual) A longer description describing the
 # set of commands that control the console.
 consoleManual=Filtrar, limpiar y cerrar la consola web
 
 # LOCALIZATION NOTE (consoleclearDesc) A very short string used to describe the
 # function of the 'console clear' command.
 consoleclearDesc=Limpiar la consola
 
+# LOCALIZATION NOTE (screenshotDesc) A very short description of the
+# 'screenshot' command. See screenshotManual for a fuller description of what
+# it does. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+screenshotDesc=Guardar una imagen de la página
+
+# LOCALIZATION NOTE (screenshotManual) A fuller description of the 'screenshot'
+# command, displayed when the user asks for help on what it does.
+screenshotManual=Guardar una imagen PNG del ventana visible completa (opcionalmente después de un retardo)
+
+# LOCALIZATION NOTE (screenshotFilenameDesc) A very short string to describe
+# the 'filename' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotFilenameDesc=Archivo de destino
+
+# LOCALIZATION NOTE (screenshotFilenameManual) A fuller description of the
+# 'filename' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotFilenameManual=El nombre del archivo (debería tener una extensión '.png') en el cual guardar la captura de pantalla.
+
+# LOCALIZATION NOTE (screenshotDelayDesc) A very short string to describe
+# the 'delay' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotDelayDesc=Retardo (segundos)
+
+# LOCALIZATION NOTE (screenshotDelayManual) A fuller description of the
+# 'delay' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotDelayManual=El tiempo a esperar (en segundos) antes de tomar la captura de pantalla
+
+# LOCALIZATION NOTE (screenshotFullscreenDesc) A very short string to describe
+# the 'fullscreen' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotFullPageDesc=¿Página completa? (verdadero/falso)
+
+# LOCALIZATION NOTE (screenshotFullscreenManual) A fuller description of the
+# 'fullscreen' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotFullPageManual=Verdadero si la captura debería incluír partes de la página que está fuera de los límites visibles actualmente.
+
 # LOCALIZATION NOTE (inspectDesc) A very short description of the 'inspect'
 # command. See inspectManual for a fuller description of what it does. This
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
 inspectDesc=Inspeccionar un nodo
 
 # LOCALIZATION NOTE (inspectManual) A fuller description of the 'inspect'
 # command, displayed when the user asks for help on what it does.
@@ -259,16 +303,21 @@ breakdelRemoved=Breakpoint removed
 # command to explain that the breakpoint was not found.
 breakNotFound=Breakpoint was not found
 
 # LOCALIZATION NOTE (consolecloseDesc) A very short description of the
 # 'console close' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 consolecloseDesc=Cerrar la consola
 
+# LOCALIZATION NOTE (consoleopenDesc) A very short description of the
+# 'console open' command. This string is designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+consoleopenDesc=Abrir la consola
+
 # LOCALIZATION NOTE (editDesc) A very short description of the 'edit'
 # command. See editManual for a fuller description of what it does. This
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
 editDesc=Tweak a page resource
 
 # LOCALIZATION NOTE (editManual) A fuller description of the 'edit' command,
 # displayed when the user asks for help on what it does.
--- a/browser/chrome/browser/devtools/inspector.properties
+++ b/browser/chrome/browser/devtools/inspector.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # LOCALIZATION NOTE These strings are used inside the Inspector
 # which is available from the Web Developer sub-menu -> 'Inspect'.
 #
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
@@ -15,21 +19,26 @@ confirmNavigationAway.buttonLeave=Dejar la página
 confirmNavigationAway.buttonLeaveAccesskey=l
 confirmNavigationAway.buttonStay=Quedarse en la página
 confirmNavigationAway.buttonStayAccesskey=s
 
 breadcrumbs.siblings=Hermanos
 # LOCALIZATION NOTE (htmlPanel): Used in the Inspector tool's openInspectorUI
 # method when registering the HTML panel.
 
-# LOCALIZATION NOTE (inspectButton.tooltiptext):
+# LOCALIZATION NOTE (inspectButtonWithShortcutKey.tooltip):
 # This button appears in the Inspector Toolbar. inspectButton is stateful,
 # if it's pressed users can select an element with the mouse.
 # %S is the keyboard shortcut.
-inspectButton.tooltiptext=Seleccionar elemento con el mouse (%S)
+inspectButtonWithShortcutKey.tooltip=Seleccionar elemento con el mouse (%S)
+
+# LOCALIZATION NOTE (inspectButton.tooltip):
+# Same as inspectButtonWithShortcutKey.tooltip but used when an add-on
+# overrides the shortcut key.
+inspectButton.tooltip=Seleccionar elemento con el mouse
 
 # LOCALIZATION NOTE (markupButton.*):
 # This button is the button located at the beginning of the breadcrumbs
 # in the inspector toolbar. Its tooltip is built dynamically.
 # markupButton.tooltip is used on Mac.
 # On Windows and Linux, we use markupButton.tooltipWithAccesskey, where we append
 # the keyboard shortcut.
 markupButton.tooltip=Markup Panel
--- a/browser/chrome/browser/devtools/layoutview.dtd
+++ b/browser/chrome/browser/devtools/layoutview.dtd
@@ -1,21 +1,22 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!-- LOCALIZATION NOTE : FILE This file contains the Layout View strings.
   - The Layout View is the panel accessible at the bottom of the Inspector
   - sidebar. -->
 
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
 
-<!ENTITY elementSize.label      "Tamaño del elemento: ">
-
-
 <!-- LOCALIZATION NOTE (*.tooltip): These tooltips are not regular tooltips.
   -  The text appears on the bottom right corner of the layout view when
   -  the corresponding box is hovered. -->
 
 <!ENTITY margins.tooltip        "márgenes">
 <!ENTITY borders.tooltip        "bordes">
 <!ENTITY padding.tooltip        "padding">
 <!ENTITY content.tooltip        "contenido">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/responsiveUI.properties
@@ -0,0 +1,17 @@
+# LOCALIZATION NOTE These strings are used inside the Responsive Mode
+# which is available from the Web Developer sub-menu -> 'Responsive Mode'.
+#
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
+
+
+# LOCALIZATION NOTE  (responsiveUI.rotate): label of the rotate button.
+responsiveUI.rotate=rotar
+
+# LOCALIZATION NOTE  (responsiveUI.customResolution): label of the first item
+# in the menulist at the beginning of the toolbar. For %S is replace with the
+# current size of the page. For example: "400x600".
+responsiveUI.customResolution=%S (personalizado)
--- a/browser/chrome/browser/devtools/scratchpad.dtd
+++ b/browser/chrome/browser/devtools/scratchpad.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!-- LOCALIZATION NOTE : FILE This file contains the Scratchpad window strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
 
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
    - keep it in English, or another language commonly spoken among web developers.
    - You want to make that choice consistent across the developer tools.
    - A good criteria is the language in which you'd find the best
    - documentation on web development on the web. -->
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # LOCALIZATION NOTE These strings are used inside the JavaScript scratchpad
 # which is available from the Web Developer sub-menu -> 'Scratchpad'.
 #
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
--- a/browser/chrome/browser/devtools/sourceeditor.dtd
+++ b/browser/chrome/browser/devtools/sourceeditor.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!-- LOCALIZATION NOTE : FILE This file contains the Source Editor component
   - strings. The source editor component is used within the Scratchpad and
   - Style Editor tools. -->
 
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
 
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
--- a/browser/chrome/browser/devtools/sourceeditor.properties
+++ b/browser/chrome/browser/devtools/sourceeditor.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # LOCALIZATION NOTE These strings are used inside the Source Editor component.
 # This component is used whenever source code is displayed for the purpose of
 # being edited, inside the Firefox developer tools - current examples are the
 # Scratchpad and the Style Editor tools.
 
 # LOCALIZATION NOTE The correct localization of this file might be to keep it
 # in English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
--- a/browser/chrome/browser/devtools/styleeditor.dtd
+++ b/browser/chrome/browser/devtools/styleeditor.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!-- LOCALIZATION NOTE : FILE This file contains the Style Editor window strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
 <!-- LOCALIZATION NOTE : The correct localization of this file might be to keep
      it in English, or another language commonly spoken among web developers.
      You want to make that choice consistent across the developer tools.
      A good criteria is the language in which you'd find the best documentation
      on web development on the web. -->
 
@@ -47,8 +51,9 @@
 <!-- LOCALICATION NOTE  (noStyleSheet-tip-action.label): This is text for the
      link that triggers creation of a new stylesheet. -->
 <!ENTITY noStyleSheet-tip-action.label "agregar una nueva hoja de estilo">
 <!-- LOCALICATION NOTE  (noStyleSheet-tip-end.label): End of the tip sentence -->
 <!ENTITY noStyleSheet-tip-end.label    "?">
 
 <!-- LOCALIZATION NOTE  (closeCmd.key): Accel + this key closes the window. -->
 <!ENTITY closeCmd.key                  "W">
+
--- a/browser/chrome/browser/devtools/styleeditor.properties
+++ b/browser/chrome/browser/devtools/styleeditor.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # LOCALIZATION NOTE These strings are used inside the Style Editor.
 # LOCALIZATION NOTE The correct localization of this file might be to keep it
 # in English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best documentation
 # on web development on the web.
 
 # LOCALIZATION NOTE  (chromeWindowTitle): This is the title of the Style Editor
--- a/browser/chrome/browser/devtools/styleinspector.dtd
+++ b/browser/chrome/browser/devtools/styleinspector.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!-- LOCALIZATION NOTE (userStylesLabel): This is the label for the checkbox
   -  that specifies whether the styles that are not from the user's stylesheet
   -  should be displayed or not. -->
 <!ENTITY userStylesLabel    "Solamente estilos de usuario">
 
 <!-- LOCALIZATION NOTE (userStylesSearch): This is the placeholder that goes in
   -  the search box when no search term has been entered. -->
 <!ENTITY userStylesSearch      "Buscar">
--- a/browser/chrome/browser/devtools/styleinspector.properties
+++ b/browser/chrome/browser/devtools/styleinspector.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # LOCALIZATION NOTE These strings are used inside the Style Inspector.
 #
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
--- a/browser/chrome/browser/devtools/tilt.properties
+++ b/browser/chrome/browser/devtools/tilt.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # LOCALIZATION NOTE These strings are used inside the Tilt Inspector
 # which is available from the Web Developer sub-menu -> 'Tilt'.
 #
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
--- a/browser/chrome/browser/devtools/webConsole.dtd
+++ b/browser/chrome/browser/devtools/webConsole.dtd
@@ -1,16 +1,26 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
+  - keep it in English, or another language commonly spoken among web developers.
+  - You want to make that choice consistent across the developer tools.
+  - A good criteria is the language in which you'd find the best
+  - documentation on web development on the web. -->
+
 <!ENTITY networkPanel.requestURL                  "URL solicitada">
 <!ENTITY networkPanel.requestMethod               "Método solicitado">
 <!ENTITY networkPanel.statusCode                  "Código de estado">
 
 <!ENTITY networkPanel.requestHeaders              "Encabezados solicitados">
 <!ENTITY networkPanel.requestCookie               "Cookie enviada">
 <!ENTITY networkPanel.requestBody                 "Cuerpo solicitado">
 <!ENTITY networkPanel.requestFormData             "Datos de formulario enviados">
 
-<!ENTITY networkPanel.responseHeaders             "Response Headers">
-<!ENTITY networkPanel.responseBody                "Response Body">
+<!ENTITY networkPanel.responseHeaders             "Encabezados de respuesta">
+<!ENTITY networkPanel.responseBody                "Cuerpo de respuesta">
 <!ENTITY networkPanel.responseBodyCached          "Datos en caché">
 <!ENTITY networkPanel.responseBodyUnknownType     "Tipo de contenido desconocido">
-<!ENTITY networkPanel.responseNoBody              "No Response Body">
+<!ENTITY networkPanel.responseNoBody              "No hay cuerpo de respuesta">
 <!ENTITY networkPanel.responseImage               "Imagen recibida">
 <!ENTITY networkPanel.responseImageCached         "Imagen en caché">
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # LOCALIZATION NOTE
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 typeError=Error: 
@@ -187,8 +191,13 @@ timeEnd=%1$S: %2$Sms
 
 # LOCALIZATION NOTE (Autocomplete.blank):
 # This string is used when inputnode string containing anchor doesn't
 # doesn't matches to any property in the content.
 Autocomplete.blank=  <- ningún resultado
 
 maxTimersExceeded=El máximo permitido de temporizadores en esta página fue superado.
 
+# LOCALIZATION NOTE (JSTerm.updateNotInspectable):
+# This string is used when the user inspects an evaluation result in the Web
+# Console and tries the Update button, but the new result no longer returns an
+# object that can be inspected.
+JSTerm.updateNotInspectable=Después que el ingreso ha sido reevaluado, el resultado no es más inspeccionable.
--- a/browser/chrome/browser/engineManager.dtd
+++ b/browser/chrome/browser/engineManager.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY engineManager.title "Administrar lista de buscadores">
 <!ENTITY engineManager.style "min-width: 35em;">
 <!ENTITY engineManager.intro "Tiene los siguientes buscadores instalados:">
 
 <!ENTITY  columnLabel.name          "Nombre">
 <!ENTITY  columnLabel.keyword       "Palabra clave">
 
 <!-- Buttons -->
--- a/browser/chrome/browser/engineManager.properties
+++ b/browser/chrome/browser/engineManager.properties
@@ -1,5 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 editTitle=Editar palabra clave
 editMsg=Ingrese una nueva palabra clave para "%S":
 duplicateTitle=Palabra clave duplicada
 duplicateEngineMsg=Ha elegido una palabra clave que está actualmente en uso por "%S". Seleccione otra.
 duplicateBookmarkMsg=Ha elegido una palabra clave que está actualmente en uso por un marcador. Seleccione otra.
--- a/browser/chrome/browser/feeds/subscribe.dtd
+++ b/browser/chrome/browser/feeds/subscribe.dtd
@@ -1,6 +1,10 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY feedPage.title
  "Ver canal">
 <!ENTITY feedSubscribeNow 
   "Suscribirse ahora">
 <!ENTITY feedLiveBookmarks 
   "Marcadores vivos">
--- a/browser/chrome/browser/feeds/subscribe.properties
+++ b/browser/chrome/browser/feeds/subscribe.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 linkTitleTextFormat = Ir a %S
 addHandler = ¿Agregar "%S" (%S) como un lector RSS?
 addHandlerAddButton=Agregar lector RSS
 addHandlerAddButtonAccesskey=A
 handlerRegistered = "%S" ya es un lector RSS registrado
 liveBookmarks = Marcadores vivos
 subscribeNow = Suscribirse ahora
 chooseApplicationMenuItem = Seleccionar aplicación…
--- a/browser/chrome/browser/migration/migration.dtd
+++ b/browser/chrome/browser/migration/migration.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 
 <!ENTITY migrationWizard.title "Asistente de importación">
 
 <!ENTITY importFrom.label "Importar opciones, marcadores, historial, contraseñas y otros datos de:">
 <!ENTITY importFromUnix.label "Importar preferencias, marcadores, historial, contraseñas y otros datos de:">
 <!ENTITY importFromBookmarks.label "Importar Marcadores desde:">
 
 <!ENTITY importFromIE.label "Microsoft Internet Explorer">
--- a/browser/chrome/browser/migration/migration.properties
+++ b/browser/chrome/browser/migration/migration.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 profileName_format = %S %S
 
 # Browser Specific
 sourceNameIE = Internet Explorer
 sourceNameSafari = Safari
 sourceNameChrome=Google Chrome
 sourceNameFirefox=Mozilla Firefox
 
@@ -33,14 +37,13 @@ 8_firefox=Historial de formularios guard
 16_ie = Contraseñas guardadas
 16_safari = Contraseñas guardadas
 16_chrome=Contraseñas guardadas
 16_firefox=Contraseñas guardadas
 
 32_ie = Favoritos
 32_safari = Marcadores
 32_chrome=Marcadores
-32_firefox=Marcadores
 
 64_ie = Otros datos
 64_safari = Otros datos
 64_chrome=Otros datos
 64_firefox=Resguardo de marcadores
--- a/browser/chrome/browser/newTab.dtd
+++ b/browser/chrome/browser/newTab.dtd
@@ -1,3 +1,7 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!-- These strings are used in the about:newtab page -->
 <!ENTITY newtab.pageTitle "Nueva pestaña">
 
--- a/browser/chrome/browser/newTab.properties
+++ b/browser/chrome/browser/newTab.properties
@@ -1,6 +1,10 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 newtab.pin=Pegar este sitio en su posición actual
 newtab.unpin=Despegar este sitio
 newtab.block=Eliminar este sitio
 newtab.show=Mostra la página de nueva pestaña
 newtab.hide=Ocultar la página de nueva pestaña
 
--- a/browser/chrome/browser/openLocation.dtd
+++ b/browser/chrome/browser/openLocation.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!-- extracted from content/openLocation.xul -->
 
 <!ENTITY enter.label "Ingrese la dirección web (URL), o especifique el archivo local que desea abrir:">
 <!ENTITY chooseFile.label "Elegir archivo…">
 <!ENTITY newWindow.label "Nueva ventana">
 <!ENTITY newTab.label "Nueva pestaña">
 <!ENTITY topTab.label "Pestaña actual">
 <!ENTITY caption.label "Abrir dirección web">
--- a/browser/chrome/browser/openLocation.properties
+++ b/browser/chrome/browser/openLocation.properties
@@ -1,2 +1,6 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 chooseFileDialogTitle=Elegir archivo
 
--- a/browser/chrome/browser/pageInfo.dtd
+++ b/browser/chrome/browser/pageInfo.dtd
@@ -1,46 +1,11 @@
-<!--
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is Daniel Brooks.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Daniel Brooks <db48x@yahoo.com>
-#                 Florian QUEZE <f.qu@queze.net>
-#                 Ehsan Akhgari <ehsan.akhgari@gmail.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the 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 *****
--->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY  pageInfoWindow.width  "600">
 <!ENTITY  pageInfoWindow.height "500">
 
 <!ENTITY  copy.key              "C">
 <!ENTITY  copy.label            "Copiar">
 <!ENTITY  copy.accesskey        "C">
 <!ENTITY  selectall.key         "a">
@@ -94,16 +59,17 @@
 <!ENTITY  permBlock             "Bloquear">
 <!ENTITY  permissionsFor        "Permisos para:">
 <!ENTITY  permImage             "Cargar imágenes">
 <!ENTITY  permPopup             "Abrir ventanas emergentes">
 <!ENTITY  permCookie            "Establecer cookies">
 <!ENTITY  permInstall           "Instalar extensiones o temas">
 <!ENTITY  permGeo               "Compartir ubicación">
 <!ENTITY  permPlugins           "Activar plugins">
+<!ENTITY  permFullscreen        "Pasar a pantalla completa">
 
 <!ENTITY  permIndexedDB              "Mantener almacenamiento sin conexión">
 <!ENTITY  permClearStorage           "Limpiar almacenamiento">
 <!ENTITY  permClearStorage.accesskey "c">
 
 <!ENTITY  securityTab           "Seguridad">
 <!ENTITY  securityTab.accesskey "S">
 <!ENTITY  securityHeader        "Información de seguridad para esta página">
--- a/browser/chrome/browser/pageInfo.properties
+++ b/browser/chrome/browser/pageInfo.properties
@@ -1,46 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# International Business Machines Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Daniel Brooks <db48x@yahoo.com>
-#   Mike Kowalski <mikejk@ameritech.net>
-#   Ehsan Akhgari <ehsan.akhgari@gmail.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 pageInfo.page.title=Información de la página - %S
 pageInfo.frame.title=Información del marco - %S    
 
 noPageTitle=Página sin título:
 pageTitle=%S:
 unknown=Desconocida
 notset=No especificada
--- a/browser/chrome/browser/places/bookmarkProperties.properties
+++ b/browser/chrome/browser/places/bookmarkProperties.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 dialogAcceptLabelAddItem=Agregar
 dialogAcceptLabelSaveItem=Guardar
 dialogAcceptLabelAddLivemark=Suscribirse
 dialogAcceptLabelAddMulti=Agregar marcadores
 dialogAcceptLabelEdit=Guardar
 dialogTitleAddBookmark=Nuevo marcador
 dialogTitleAddLivemark=Suscribirse con marcador vivo
 dialogTitleAddFolder=Nueva carpeta
--- a/browser/chrome/browser/places/editBookmarkOverlay.dtd
+++ b/browser/chrome/browser/places/editBookmarkOverlay.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY editBookmarkOverlay.name.label                      "Nombre:">
 <!ENTITY editBookmarkOverlay.name.accesskey                  "N">
 <!ENTITY editBookmarkOverlay.location.label                  "Dirección:">
 <!ENTITY editBookmarkOverlay.location.accesskey              "e">
 <!ENTITY editBookmarkOverlay.feedLocation.label              "Dirección del canal:">
 <!ENTITY editBookmarkOverlay.feedLocation.accesskey          "c">
 <!ENTITY editBookmarkOverlay.siteLocation.label              "Dirección del sitio:">
 <!ENTITY editBookmarkOverlay.siteLocation.accesskey          "s">
--- a/browser/chrome/browser/places/moveBookmarks.dtd
+++ b/browser/chrome/browser/places/moveBookmarks.dtd
@@ -1,5 +1,9 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY window.title              "Seleccione carpeta">
 <!ENTITY window.style              "width: 36em; height: 18em;">
 <!ENTITY moveTo.label              "Mover a:">
 <!ENTITY newFolderButton.label     "Nueva carpeta">
 <!ENTITY newFolderButton.accesskey "N">
--- a/browser/chrome/browser/places/places.dtd
+++ b/browser/chrome/browser/places/places.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!-- LOCALIZATION NOTE (places.library.title): use "Library", "Archive" or "Repository" -->
 <!ENTITY places.library.title  "Biblioteca">
 <!ENTITY places.library.width  "700">
 <!ENTITY places.library.height "500">
 <!ENTITY organize.label          "Organizar">
 <!ENTITY organize.accesskey    "O">
 <!ENTITY organize.tooltip      "Organizar sus marcadores">
 
@@ -18,21 +22,16 @@
 <!ENTITY view.sort.accesskey     "s">
 <!ENTITY view.unsorted.label     "Sin ordenar">
 <!ENTITY view.unsorted.accesskey  "d">
 <!ENTITY view.sortAscending.label  "Ordenado A > Z">
 <!ENTITY view.sortAscending.accesskey  "A">
 <!ENTITY view.sortDescending.label     "Ordenado Z > A">
 <!ENTITY view.sortDescending.accesskey  "Z">
 
-<!ENTITY cmd.findInBookmarks.label        "Buscar en Marcadores…">
-<!ENTITY cmd.findInBookmarks.accesskey    "M">
-<!ENTITY cmd.findCurrent.label            "Buscar en colección actual…">
-<!ENTITY cmd.findCurrent.accesskey        "i">
-
 <!ENTITY importBookmarksFromHTML.label     "Importar marcadores desde HTML…">
 <!ENTITY importBookmarksFromHTML.accesskey "I">
 <!ENTITY exportBookmarksToHTML.label       "Exportar marcadores a HTML…">
 <!ENTITY exportBookmarksToHTML.accesskey   "E">
 <!ENTITY importOtherBrowser.label          "Importar datos de otro navegador…">
 <!ENTITY importOtherBrowser.accesskey      "A">
 
 <!ENTITY cmd.backup.label                 "Resguardar…">
--- a/browser/chrome/browser/places/places.properties
+++ b/browser/chrome/browser/places/places.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 load-js-data-url-error=Por razones de seguridad, javascript o urls de datos no pueden cargarse desde la ventana o barra lateral de historial.
 noTitle=(sin título)
 
 bookmarksMenuEmptyFolder=(Vacío)
 
 bookmarksBackupTitle=Archivo de backup de marcadores
 
 bookmarksRestoreAlertTitle=Revertir marcadores
@@ -39,17 +43,16 @@ view.sortBy.lastModified.label=Ordenar por última modificación
 view.sortBy.lastModified.accesskey=m
 view.sortBy.tags.label=Ordenar por etiquetas
 view.sortBy.tags.accesskey=e
 
 searchBookmarks=Buscar en marcadores
 searchHistory=Buscar en historial
 searchDownloads=Buscar en descargas
 searchCurrentDefault=Buscar en '%S'
-findInPrefix=Buscar en '%S'…
 
 tabs.openWarningTitle=Confirmar apertura
 tabs.openWarningMultipleBranded=Está por abrir %S pestañas.  Ésto puede hacer que %S funcione mucho más lento mientras las páginas se cargan.  ¿Está seguro que quiere continuar?
 tabs.openButtonMultiple=Abrir pestañas
 tabs.openWarningPromptMeBranded=Avisarme cuando abrir demasiadas pestañas pueda hacer más lento a %S
 
 SelectImport=Importar archivo de marcadores
 EnterExport=Exportar archivo de marcadores
--- a/browser/chrome/browser/preferences/aboutPermissions.dtd
+++ b/browser/chrome/browser/preferences/aboutPermissions.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY permissionsManager.title        "Administrador de permisos">
 
 <!ENTITY sites.search                    "Buscar sitios">
 <!ENTITY sites.allSites                  "Todos los sitios">
 
 <!-- LOCALIZATION NOTE (permissions.header.start, permissions.header.end): These strings
      surround the host name of the site to make the header for the permissions page.
      example: "Permissions for mozilla.org" -->
@@ -30,8 +34,10 @@
 
 <!ENTITY plugins.label                   "Plugins">
 
 <!-- LOCALIZATION NOTE (indexedDB.label): This is describing indexedDB storage
      using the same language used for the permIndexedDB string in browser/pageInfo.dtd -->
 <!ENTITY indexedDB.label                 "Mantener almacenamiento sin conexión">
 
 <!ENTITY popup.label                     "Abrir ventanas emergentes">
+
+<!ENTITY fullscreen.label                "Pantalla completa">
--- a/browser/chrome/browser/preferences/aboutPermissions.properties
+++ b/browser/chrome/browser/preferences/aboutPermissions.properties
@@ -1,5 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # LOCALIZATION NOTE (visitCount): #1 is the number of history visits for a site
 visitCount=#1 visita;#1 visitas
 
 passwordsCount=Se guarda #1 contraseña para este sitio web.;Se guardan #1 contraseñas para este sitio web.
 cookiesCount=Se estableció #1 cookie para este sitio web.;Se establecieron #1 cookies para este sitio web.
--- a/browser/chrome/browser/preferences/advanced-scripts.dtd
+++ b/browser/chrome/browser/preferences/advanced-scripts.dtd
@@ -1,44 +1,11 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-#if 0
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is the Firefox Preferences System.
-   -
-   - The Initial Developer of the Original Code is Mike Connor.
-   - Portions created by the Initial Developer are Copyright (C) 2005
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the 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.
-   -
-#endif
-   - ***** END LICENSE BLOCK ***** -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY advancedJSDialog.title         "Configuración Avanzada de JavaScript">
 <!ENTITY window.width                   "37em">
 
 <!ENTITY allowScripts.label             "Permitir a los scripts:">
 
 <!ENTITY moveResizePopupWindows.label     "Mover o cambiar tamaño de ventanas emergentes">
 <!ENTITY moveResizePopupWindows.accesskey "M">
--- a/browser/chrome/browser/preferences/advanced.dtd
+++ b/browser/chrome/browser/preferences/advanced.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!-- Note: each tab panel must contain unique accesskeys -->
 
 <!ENTITY generalTab.label                "General">
 
 <!ENTITY accessibility.label             "Accesibilidad">
 
 <!ENTITY useCursorNavigation.label       "Siempre usar las teclas del cursor para navegar entre páginas">
 <!ENTITY useCursorNavigation.accesskey   "c">
@@ -20,18 +24,19 @@
 <!ENTITY allowHWAccel.label              "Usar aceleración por hardware cuando esté disponible">
 <!ENTITY allowHWAccel.accesskey          "h">
 <!ENTITY checkSpelling.label             "Verificar mi ortografía al escribir">
 <!ENTITY checkSpelling.accesskey         "t">
 
 <!ENTITY systemDefaults.label            "Opciones de sistema">
 <!ENTITY alwaysCheckDefault.label        "Siempre verificar si &brandShortName; es el navegador predeterminado al iniciar"><!--XXX-->
 <!ENTITY alwaysCheckDefault.accesskey    "g">
-<!ENTITY checkNow.label                  "Verificar ahora">
-<!ENTITY checkNow.accesskey              "V">
+<!ENTITY setDefault.label                "Establecer &brandShortName; como navegador predeterminado">
+<!ENTITY setDefault.accesskey            "d">
+<!ENTITY isDefault.label                 "&brandShortName; es actualmente su navegador predeterminado">
 <!ENTITY submitCrashes.label             "Enviar informe de fallos">
 <!ENTITY submitCrashes.accesskey         "E">
 <!ENTITY submitTelemetry.label           "Enviar datos de rendimiento">
 <!ENTITY submitTelemetry.accesskey       "r">
 
 <!ENTITY networkTab.label                "Red">
 
 <!ENTITY connection.label                "Conexión">
--- a/browser/chrome/browser/preferences/applicationManager.dtd
+++ b/browser/chrome/browser/preferences/applicationManager.dtd
@@ -1,4 +1,8 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY appManager.title     "Detalles de la aplicación">
 <!ENTITY appManager.style     "width: 30em; min-height: 20em;">
 <!ENTITY remove.label         "Eliminar">
 <!ENTITY remove.accesskey     "r">
--- a/browser/chrome/browser/preferences/applicationManager.properties
+++ b/browser/chrome/browser/preferences/applicationManager.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # LOCALIZATION NOTE
 # in descriptionApplications, %S will be replaced by one of the 3 following strings
 descriptionApplications=The following applications can be used to handle %S.
 
 handleProtocol=enlaces %S
 handleWebFeeds=Canales web
 handleFile=contenido %S
 
--- a/browser/chrome/browser/preferences/applications.dtd
+++ b/browser/chrome/browser/preferences/applications.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY  typeColumn.label        "Tipo de contenido">
 <!ENTITY  typeColumn.accesskey    "T">
 
 <!ENTITY  actionColumn2.label     "Acción">
 <!ENTITY  actionColumn2.accesskey "A">
 
 <!ENTITY  focusSearch1.key        "f">
 <!ENTITY  focusSearch2.key        "k">
--- a/browser/chrome/browser/preferences/colors.dtd
+++ b/browser/chrome/browser/preferences/colors.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY  colorsDialog.title              "Colores">
 <!ENTITY  window.width                    "41em">
 <!ENTITY  window.macWidth                 "43em">
 
 <!ENTITY  allowPagesToUse.label           "Permitir a las páginas elegir sus propios colores, en lugar de esta selección">
 <!ENTITY  allowPagesToUse.accesskey       "A">
 
 <!ENTITY  color                           "Texto y fondo">
--- a/browser/chrome/browser/preferences/connection.dtd
+++ b/browser/chrome/browser/preferences/connection.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 
 <!ENTITY  connectionsDialog.title       "Configuración de la conexión">
 <!ENTITY  window.width                  "39em">
 <!ENTITY  window.macWidth               "41em">
 
 <!ENTITY  proxyTitle.label              "Configurar proxys para acceder a Internet">
 <!ENTITY  noProxyTypeRadio.label        "Sin proxy">
 <!ENTITY  noProxyTypeRadio.accesskey    "y">
--- a/browser/chrome/browser/preferences/content.dtd
+++ b/browser/chrome/browser/preferences/content.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY  blockPopups.label           "Bloquear ventanas emergentes">
 <!ENTITY  blockPopups.accesskey       "B">
 <!ENTITY  popupExceptions.label       "Excepciones…">
 <!ENTITY  popupExceptions.accesskey   "E">
 
 <!ENTITY  loadImages.label            "Cargar imágenes automáticamente">
 <!ENTITY  loadImages.accesskey        "I">
 <!ENTITY  exceptions.label            "Excepciones…">
--- a/browser/chrome/browser/preferences/cookies.dtd
+++ b/browser/chrome/browser/preferences/cookies.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY window.width                       "36em">
 
 <!ENTITY     cookiesonsystem.label          "Las siguientes cookies están guardadas en su computadora:">
 <!ENTITY     cookiename.label               "Nombre de cookie">
 <!ENTITY     cookiedomain.label             "Sitio"> 
 <!ENTITY     button.removecookies.label     "Eliminar cookies">
 <!ENTITY     button.removecookie.label      "Eliminar cookie">
 <!ENTITY     button.removecookie.accesskey  "R">
--- a/browser/chrome/browser/preferences/fonts.dtd
+++ b/browser/chrome/browser/preferences/fonts.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY  fontsDialog.title                       "Fuentes">
 <!ENTITY  window.width                            "49em">
 <!ENTITY  window.macWidth                         "53em">
 <!ENTITY  window.unixWidth                        "51em">
 
 <!ENTITY  language.label                          "Fuentes para:">
 <!ENTITY  language.accesskey                      "F">
 
--- a/browser/chrome/browser/preferences/languages.dtd
+++ b/browser/chrome/browser/preferences/languages.dtd
@@ -1,15 +1,19 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY window.width                                   "30em">
 
 <!ENTITY languages.customize.Header                     "Idiomas">
 <!ENTITY languages.customize.prefLangDescript           "Las páginas web a veces se ofrecen en más de un idioma. Seleccione los idiomas para mostrar esas páginas web, en el orden de su preferencia.">
 <!ENTITY languages.customize.active.label               "Idiomas en orden de preferencia:">
 <!ENTITY languages.customize.moveUp.label               "Subir">
 <!ENTITY languages.customize.moveUp.accesskey           "U">
 <!ENTITY languages.customize.moveDown.label             "Bajar">
 <!ENTITY languages.customize.moveDown.accesskey         "B">
-<!ENTITY languages.customize.deleteButton.label         "Eliminar">
-<!ENTITY languages.customize.deleteButton.accesskey     "r">
+<!ENTITY languages.customize.deleteButton.label         "Eliminar">
+<!ENTITY languages.customize.deleteButton.accesskey     "r">
 <!ENTITY languages.customize.selectLanguage.label       "Seleccione un idioma para agregar...">
 <!ENTITY languages.customize.addButton.label            "Agregar">
 <!ENTITY languages.customize.addButton.accesskey        "A">
 
--- a/browser/chrome/browser/preferences/main.dtd
+++ b/browser/chrome/browser/preferences/main.dtd
@@ -1,17 +1,19 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY startup.label             "Inicio">
 
 <!ENTITY startupPage.label         "Al iniciar &brandShortName;:">
 <!ENTITY startupPage.accesskey     "i">
 <!ENTITY startupHomePage.label     "Mostrar mi página de inicio">
 <!ENTITY startupBlankPage.label    "Mostrar una página en blanco">
 <!ENTITY startupLastSession.label  "Mostrar las ventanas y pestañas de la última vez">
-<!ENTITY restoreOnDemand.label     "No cargar pestañas hasta que sean seleccionadas">
-<!ENTITY restoreOnDemand.accesskey "l">
 
 <!ENTITY homepage.label            "Página de inicio:">
 <!ENTITY homepage.accesskey        "P">
 <!ENTITY useCurrentPage.label      "Usar página actual">
 <!ENTITY useCurrentPage.accesskey  "c">
 <!ENTITY useMultiple.label         "Usar páginas actuales">
 <!ENTITY chooseBookmark.label      "Usar un marcador…">
 <!ENTITY chooseBookmark.accesskey  "m">
--- a/browser/chrome/browser/preferences/permissions.dtd
+++ b/browser/chrome/browser/preferences/permissions.dtd
@@ -1,19 +1,23 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY window.title                 "Excepciones">
 <!ENTITY window.width                 "36em">
 
 <!ENTITY treehead.sitename.label      "Sitio">
 <!ENTITY treehead.status.label        "Estado">
-<!ENTITY removepermission.label       "Eliminar sitio">
-<!ENTITY removepermission.accesskey   "r">
-<!ENTITY removeallpermissions.label   "Eliminar todos los sitios">
-<!ENTITY removeallpermissions.accesskey "E">
+<!ENTITY removepermission.label       "Eliminar sitio">
+<!ENTITY removepermission.accesskey   "r">
+<!ENTITY removeallpermissions.label   "Eliminar todos los sitios">
+<!ENTITY removeallpermissions.accesskey "E">
 <!ENTITY address.label                "Dirección del sitio web:">
-<!ENTITY address.accesskey            "d">
+<!ENTITY address.accesskey            "d">
 <!ENTITY block.label                  "Bloquear">
 <!ENTITY block.accesskey              "B">
 <!ENTITY session.label                "Habilitar durante sesión">
 <!ENTITY session.accesskey            "S">
 <!ENTITY allow.label                  "Habilitar">
 <!ENTITY allow.accesskey              "A">
 <!ENTITY windowClose.key              "w">
 
--- a/browser/chrome/browser/preferences/preferences.dtd
+++ b/browser/chrome/browser/preferences/preferences.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 
 <!ENTITY  prefWindow.titleWin     "Opciones">
 <!ENTITY  prefWindow.titleGNOME   "Preferencias de &brandShortName;">
 <!-- When making changes to prefWindow.styleWin test both Windows Classic and
      Luna since widget heights are different based on the OS theme -->
 <!ENTITY  prefWinMinSize.styleWin2      "width: 42em; min-height: 37.5em;">
 <!ENTITY  prefWinMinSize.styleMac       "width: 47em; min-height: 40em;">
 <!ENTITY  prefWinMinSize.styleGNOME     "width: 45.5em; min-height: 40.5em;">
@@ -12,9 +16,11 @@
 <!ENTITY  paneContent.title       "Contenido">
 <!ENTITY  paneApplications.title  "Aplicaciones">
 <!ENTITY  panePrivacy.title       "Privacidad">
 <!ENTITY  paneSecurity.title      "Seguridad">
 <!ENTITY  paneAdvanced.title      "Avanzadas">
 
 <!-- LOCALIZATION NOTE (paneSync.title): This should match syncBrand.shortName.label in ../syncBrand.dtd -->
 <!ENTITY  paneSync.title          "Sync">
+<!ENTITY  buttonForward.tooltip   "Avanzar una página">
+<!ENTITY  buttonBack.tooltip      "Retroceder una página">
 
--- a/browser/chrome/browser/preferences/preferences.properties
+++ b/browser/chrome/browser/preferences/preferences.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 #### Security
 
 # LOCALIZATION NOTE: phishBefore uses %S to represent the name of the provider
 #                    whose privacy policy must be accepted (for enabling
 #                    check-every-page-as-I-load-it phishing protection).
 phishBeforeText=Seleccionar esta opción enviará la dirección de las páginas web que está viendo a %S. Para continuar, por favor mire y acepte los siquientes términos de servicio.
 
 #### Fonts
--- a/browser/chrome/browser/preferences/privacy.dtd
+++ b/browser/chrome/browser/preferences/privacy.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY tracking.label                 "Rastreo">
 
 <!ENTITY doNotTrack.label                "Decirle a los sitios web que no quiero ser rastreado">
 <!ENTITY doNotTrack.accesskey            "D">
 
 <!ENTITY  history.label "Historial">
 
 <!ENTITY  locationBar.label             "Barra de direcciones">
--- a/browser/chrome/browser/preferences/security.dtd
+++ b/browser/chrome/browser/preferences/security.dtd
@@ -1,9 +1,13 @@
-<!ENTITY  warnAddonInstall.label        "Avisarme cuando algún sitio trate de instalar complementos">
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY  warnAddonInstall.label        "Avisarme cuando sitios traten de instalar complementos">
 <!ENTITY  warnAddonInstall.accesskey    "A">
 
 <!-- LOCALIZATION NOTE (blockWebForgeries.label, blockAttackSites.label):
   The methods by which forged (phished) and attack sites will be detected by
   phishing providers will vary from human review to machine-based heuristics to a
   combination of both, so it's important that these strings and
   useDownloadedList.label convey the meaning "reported" (and not something like
   "known").
--- a/browser/chrome/browser/preferences/selectBookmark.dtd
+++ b/browser/chrome/browser/preferences/selectBookmark.dtd
@@ -1,5 +1,9 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY selectBookmark.title
   "Establecer como página de inicio">
 <!ENTITY selectBookmark.label
   "Elegir un Marcador como su Página de Inicio. Si elige una carpeta, los Marcadores en esa carpeta serán abiertos en pestañas.">
 
--- a/browser/chrome/browser/preferences/sync.dtd
+++ b/browser/chrome/browser/preferences/sync.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!-- The page shown when not logged in... -->
 <!ENTITY setupButton.label "Configurar &syncBrand.fullName.label;">
 <!ENTITY setupButton.accesskey "C">
 <!ENTITY weaveDesc.label "&syncBrand.fullName.label; permite acceder al historial, marcadores, contraseñas y pestañas abiertas entre todos sus dispositivos.">
 
 <!-- The page shown when logged in... -->
 
 <!-- Login error feedback -->
--- a/browser/chrome/browser/preferences/tabs.dtd
+++ b/browser/chrome/browser/preferences/tabs.dtd
@@ -1,17 +1,24 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY newWindowsAsTabs.label       "Abrir páginas nuevas en nuevas pestañas">
 <!ENTITY newWindowsAsTabs.accesskey   "t">
-
-<!ENTITY warnCloseMultipleTabs.label  "Avisarme cuando cierre múltiples pestañas">
-<!ENTITY warnCloseMultipleTabs.accesskey  "m">
-
-<!ENTITY warnOpenManyTabs.label       "Avisarme cuando abrir múltiples pestañas pueda hacer más lento a &brandShortName;">
-<!ENTITY warnOpenManyTabs.accesskey   "o">
-
-<!ENTITY showTabBar.label             "Mostrarme siempre la barra de pestañas">
-<!ENTITY showTabBar.accesskey         "b">
-
-<!ENTITY switchToNewTabs.label        "Cuando abra un enlace en una nueva pestaña, cambiar a ella inmediatamente">
-<!ENTITY switchToNewTabs.accesskey    "s">
+
+<!ENTITY warnCloseMultipleTabs.label  "Avisarme cuando cierre múltiples pestañas">
+<!ENTITY warnCloseMultipleTabs.accesskey  "m">
+
+<!ENTITY warnOpenManyTabs.label       "Avisarme cuando abrir múltiples pestañas pueda hacer más lento a &brandShortName;">
+<!ENTITY warnOpenManyTabs.accesskey   "o">
+
+<!ENTITY showTabBar.label             "Mostrarme siempre la barra de pestañas">
+<!ENTITY showTabBar.accesskey         "b">
+
+<!ENTITY restoreTabsOnDemand.label        "No cargar pestañas hasta que sean seleccionadas">
+<!ENTITY restoreTabsOnDemand.accesskey    "l">
+
+<!ENTITY switchToNewTabs.label        "Cuando abra un enlace en una nueva pestaña, cambiar a ella inmediatamente">
+<!ENTITY switchToNewTabs.accesskey    "s">
 
 <!ENTITY showTabsInTaskbar.label          "Mostrar vista previa de pestañas en la barra de tareas de Windows">
 <!ENTITY showTabsInTaskbar.accesskey      "v">
--- a/browser/chrome/browser/quitDialog.properties
+++ b/browser/chrome/browser/quitDialog.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 quitDialogTitle=Salir de %S
 restartDialogTitle=Reiniciar %S
 
 quitTitle=&Salir
 restartTitle=&Reiniciar
 cancelTitle=&Cancelar
 saveTitle=&Guardar y salir
 neverAsk=No preguntar la próxima vez
--- a/browser/chrome/browser/safeMode.dtd
+++ b/browser/chrome/browser/safeMode.dtd
@@ -1,64 +1,20 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-#if 0
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org Code.
-   -
-   - The Initial Developer of the Original Code is Mike Connor.
-   - Portions created by the Initial Developer are Copyright (C) 2005
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Mike Connor <mconnor@steelgryphon.com>
-   -   
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the 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.
-   -
-#endif
-   - ***** END LICENSE BLOCK ***** -->
-   
-<!ENTITY safeModeDialog.title "Modo seguro de &brandShortName;">
-<!ENTITY window.width "37em">
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY safeModeDialog.title         "Modo seguro de &brandShortName;">
+<!ENTITY window.maxWidth              "400">
+
+<!ENTITY startSafeMode.label          "Iniciar en modo seguro">
+<!ENTITY resetProfile.label           "Restaurar &brandShortName;">
 
-<!ENTITY autoSafeModeIntro.label      "&brandShortName; se cerró inesperadamente mientras se iniciaba">
-<!ENTITY autoSafeModeDescription.label "Pedimos sinceras disculpas por el inconveniente. &brandShortName; ahora se está ejecutando en modo seguro que deshabilita temporalmente sus opciones personales, temas y extensiones.">
-
-<!ENTITY safeModeDescription.label "&brandShortName; se está ejecutando en modo seguro, lo que deshabilita temporalmente sus opciones personales, temas y extensiones.">
-<!ENTITY safeModeDescription2.label "Puede hacer que algunos o todos estos cambios sean permanentes:">
+<!ENTITY safeModeDescription3.label   "Safe Mode is a special mode of &brandShortName; that can be used to troubleshoot issues.">
+<!ENTITY safeModeDescription4.label   "Your add-ons and custom settings will be temporarily disabled.">
 
-<!ENTITY disableAddons.label "Deshabilitar todos los complementos">
-<!ENTITY disableAddons.accesskey "D">
-
-<!ENTITY resetToolbars.label "Reiniciar barras de herramientas y controles">
-<!ENTITY resetToolbars.accesskey "R">
+<!ENTITY resetProfileInstead.label    "You can also Reset &brandShortName; if you want to start fresh.">
 
-<!ENTITY deleteBookmarks.label        "Borrar todos los marcadores excepto para copias de resguardo">
-<!ENTITY deleteBookmarks.accesskey    "B">
-
-<!ENTITY resetUserPrefs.label "Reiniciar todas las preferencias de usuario a las predeterminadas de &brandShortName;">
-<!ENTITY resetUserPrefs.accesskey "p">
+<!-- LOCALIZATION NOTE (autoSafeModeDescription2.label safeModeInstead.label resetProfileFooter.label): Shown on the safe mode dialog after multiple startup crashes. See also chrome/global/resetProfile.dtd -->
+<!ENTITY autoSafeModeDescription2.label "&brandShortName; se cerró inesperadamente mientras se iniciaba. Ésto pudo haber sido causado por complementos u otros problemas. Puede intenter resolver el problema restaurando &brandShortName; a su estado predeterminado o tratar de solucionarlo en modo seguro.">
+<!ENTITY resetProfileFooter.label       "Todo el resto se restaurará a los valores de fábrica.">
+<!ENTITY safeModeInstead.label          "Si no desea ésto, puede continuar en modo seguro para intentar corregir el problema con los complementos y configuraciones personalizadas deshabilitadas temporalmente.">
 
-<!ENTITY restoreSearch.label "Restaurar buscadores predeterminados">
-<!ENTITY restoreSearch.accesskey "s">
-
-<!ENTITY changeAndRestartButton.label "Hacer cambios y reiniciar">
-<!ENTITY continueButton.label "Continuar en modo seguro">
--- a/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
+++ b/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
@@ -1,11 +1,15 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY safeb.palm.warning.title "Falsificación de sitios">
 
-<!ENTITY safeb.palm.message.p1 "Esta página fue informada como falsa, diseñada para engañar usuarios para que compartan su información personal o financiera. Ingresar cualquier información personal en esta página puede resultar en robo de identidad o algún otro fraude.   ">
+<!ENTITY safeb.palm.message.p1 "Esta página fue informada como falsa, diseñada para engañar usuarios para que compartan su información personal o financiera. Ingresar cualquier información personal en esta página puede resultar en robo de identidad o algún otro fraude. &#160;">
 <!ENTITY safeb.palm.message.p1.linkText "Leer más &#187;">
 <!ENTITY safeb.palm.p1.linkStatusText "Leer más  &#133;">
 
 <!ENTITY safeb.palm.message.p2.start "Este tipo de sitios falsos son usados en estafas conocidas como ataques de phishing, en los que sitios web fraudulentos y correos electrónicos son usados para imitar fuentes en las que confía. Puede encontrar más sobre ">
 <!ENTITY safeb.palm.message.p2.linkText "como lo protege &brandShortName;">
 <!ENTITY safeb.palm.message.p2.end " de ataques de phishing.">
 
 <!ENTITY safeb.palm.accept.label "¡Sáquenme de aquí!">
--- a/browser/chrome/browser/safebrowsing/report-phishing.dtd
+++ b/browser/chrome/browser/safebrowsing/report-phishing.dtd
@@ -1,2 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY reportPhishSiteMenu.title2         "Informar sitio fraudulento…">
 <!ENTITY reportPhishSiteMenu.accesskey      "f">
--- a/browser/chrome/browser/sanitize.dtd
+++ b/browser/chrome/browser/sanitize.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY sanitizePrefs2.title          "Opciones de borrado del historial">
 <!ENTITY sanitizeDialog2.title         "Borrar historial reciente">
 
 <!ENTITY sanitizeItems.label          "Borrar los siguientes ítems ahora:">
 <!ENTITY clearDataSettings2.label     "Cuando salga de &brandShortName;, debería borrar automáticamente:">
 
 <!-- XXX rearrange entities to match physical layout when l10n isn't an issue -->
 <!-- LOCALIZATION NOTE (clearTimeDuration.*): "Time range to clear" dropdown.
--- a/browser/chrome/browser/search.properties
+++ b/browser/chrome/browser/search.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 searchtip = Buscar usando %S
 
 # LOCALIZATION NOTE (cmd_pasteAndSearch): "Search" is a verb, this is the
 # search bar equivalent to the url bar's "Paste & Go"
 cmd_pasteAndSearch=Pegar y buscar
 
 cmd_clearHistory = Borrar historial de búsquedas
 cmd_clearHistory_accesskey = C
--- a/browser/chrome/browser/searchbar.dtd
+++ b/browser/chrome/browser/searchbar.dtd
@@ -1,2 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY cmd_engineManager.label "Administrar buscadores…">
 <!ENTITY searchEndCap.label "Buscar">
--- a/browser/chrome/browser/setDesktopBackground.dtd
+++ b/browser/chrome/browser/setDesktopBackground.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY position.label             "Posición:">
 <!ENTITY tile.label                 "Mosaico">    
 <!ENTITY center.label               "Centrado">
 <!ENTITY stretch.label              "Estirado">
 <!ENTITY fill.label                 "Relleno">
 <!ENTITY fit.label                  "Ajustado">
 <!ENTITY preview.label              "Vista previa">
 <!ENTITY color.label                "Color:">
--- a/browser/chrome/browser/shellservice.properties
+++ b/browser/chrome/browser/shellservice.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 optionsLabel=%S &Opciones
 safeModeLabel=%S &Modo seguro
 setDefaultBrowserTitle=Navegador predeterminado
 setDefaultBrowserMessage=%S no es actualmente su navegador predeterminado. ¿Desea que sí lo sea?
 setDefaultBrowserDontAsk=Verificar también la próxima vez que inicie %S.
 alreadyDefaultBrowser=%S ya es su navegador predeterminado.
 desktopBackgroundLeafNameWin=Fondo de escritorio.bmp
 DesktopBackgroundDownloading=Guardando imagen…
--- a/browser/chrome/browser/syncBrand.dtd
+++ b/browser/chrome/browser/syncBrand.dtd
@@ -1,2 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY syncBrand.shortName.label  "Sync">
 <!ENTITY syncBrand.fullName.label   "Firefox Sync">
--- a/browser/chrome/browser/syncGenericChange.properties
+++ b/browser/chrome/browser/syncGenericChange.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # LOCALIZATION NOTE (change.password.title): This (and associated change.password/passphrase) are used when the user elects to change their password.
 change.password.title = Cambiar la contraseña
 change.password.acceptButton = Cambiar contraseña
 change.password.status.active = Cambiando la contraseña…
 change.password.status.success = La contraseña ha sido cambiada.
 change.password.status.error = Hubo un error al cambiar la contraseña.
 
 change.password3.introText = La contraseña debe tener al menos 8 caracteres de longitud.  No puede ser igual que su nombre ni que su clave de recuperación.
--- a/browser/chrome/browser/syncKey.dtd
+++ b/browser/chrome/browser/syncKey.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY syncKey.page.title               "Su clave de &syncBrand.fullName.label;">
 <!ENTITY syncKey.page.description         "Esta clave es usada para decodificar los datos en su cuenta de &syncBrand.fullName.label;. Necesitará ingresar la clave cada vez que configure &syncBrand.fullName.label; en una nueva computadora o dispositivo.">
 <!ENTITY syncKey.keepItSecret.heading     "Manténgala en secreto">
 <!ENTITY syncKey.keepItSecret.description "Su cuenta de &syncBrand.fullName.label; está cifrada para proteger su privacidad. Sin esta clave, le tomaría años a alguien poder decodificar su información personal. Usted es la única persona que posee esta clave. Esto significa que es el único que puede acceder a sus datos de &syncBrand.fullName.label;.">
 <!ENTITY syncKey.keepItSafe.heading       "Manténgala segura">
 <!ENTITY syncKey.keepItSafe1.description  "No pierda esta clave.">
 <!ENTITY syncKey.keepItSafe2.description  " No mantenemos una copia de su clave (¡eso no sería mantenerla en secreto!) así que ">
 <!ENTITY syncKey.keepItSafe3.description  "no podemos ayudarlo a recuperarla">
--- a/browser/chrome/browser/syncProgress.dtd
+++ b/browser/chrome/browser/syncProgress.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY % brandDTD
     SYSTEM "chrome://branding/locale/brand.dtd">
     %brandDTD;
 
 <!-- These strings are used in the sync progress upload page -->
 <!ENTITY syncProgress.pageTitle    "Su primera sincronización">
 <!ENTITY syncProgress.textBlurb    "Sus datos están siendo cifrados y subidos en segundo plano. Puede cerrar esta pestaña y continuar usando &brandShortName;.">
 <!ENTITY syncProgress.closeButton  "Cerrar">
--- a/browser/chrome/browser/syncQuota.dtd
+++ b/browser/chrome/browser/syncQuota.dtd
@@ -1,5 +1,9 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY quota.dialogTitle.label    "Cuota de servidor">
 <!ENTITY quota.retrievingInfo.label "Recuperando información de cuota…">
 <!ENTITY quota.typeColumn.label     "Tipo">
 <!ENTITY quota.sizeColumn.label     "Tamaño">
 
--- a/browser/chrome/browser/syncQuota.properties
+++ b/browser/chrome/browser/syncQuota.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 collection.addons.label    = Complementos
 collection.bookmarks.label = Marcadores
 collection.history.label   = Historial
 collection.passwords.label = Contraseñas
 collection.prefs.label     = Preferencias
 collection.tabs.label      = Pestañas
 
 # LOCALIZATION NOTE (quota.usageNoQuota.label): %1$S and %2$S are numeric value
--- a/browser/chrome/browser/syncSetup.dtd
+++ b/browser/chrome/browser/syncSetup.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY accountSetupTitle.label "Configuración de &syncBrand.fullName.label;">
 
 <!-- First page of the wizard -->
 
 <!ENTITY setup.pickSetupType.description2 "¡Bienvenido! Si nunca usó &syncBrand.fullName.label; antes, necesitará crear una cuenta nueva.">
 <!ENTITY button.createNewAccount.label "Crear una cuenta nueva">
 <!ENTITY button.haveAccount.label      "Ya tengo una cuenta">
 
--- a/browser/chrome/browser/syncSetup.properties
+++ b/browser/chrome/browser/syncSetup.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 button.syncOptions.label       = Opciones de Sync
 button.syncOptionsDone.label   = Listo
 button.syncOptionsCancel.label = Cancelar
 
 invalidEmail.label = Dirección de correo electrónica no válida
 serverInvalid.label = Ingrese una URL de servidor válida
 usernameNotAvailable.label = Ya en uso
 
--- a/browser/chrome/browser/tabbrowser.dtd
+++ b/browser/chrome/browser/tabbrowser.dtd
@@ -1,2 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY  closeTab.label         "Cerrar pestaña">
 <!ENTITY  newTabButton.tooltip        "Abrir una nueva pestaña">
--- a/browser/chrome/browser/tabbrowser.properties
+++ b/browser/chrome/browser/tabbrowser.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # LOCALIZATION NOTE: the following strings can be used in the tab title or
 # location bar to represent various states as a web page loads:
 # tabs.connecting = Firefox is sending a HTTP connection request
 # tabs.encryptingConnection = Firefox is sending a HTTPS connection request
 # tabs.searching = Firefox is searching for something (Awesomebar or Web search)
 # tabs.loading = Firefox is loading the web page
 # tabs.waiting = Firefox is waiting for a web resource to load
 # tabs.downloading = Firefox is downloading a file for a helper application (PDF)
--- a/browser/chrome/browser/tabview.properties
+++ b/browser/chrome/browser/tabview.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 tabview.button.searchTabs=Buscar grupos de pestañas
 tabview.button.exitTabGroups=Cerrar grupos de pestañas
 tabview.groupItem.defaultName=Nombre para este grupo de pestañas…
 tabview.groupItem.closeGroup=Cerrar grupo
 tabview.groupItem.undoCloseGroup=Deshacer cerrar grupo
 tabview.groupItem.discardClosedGroup=Descartar grupo cerrado
 tabview.search.otherWindowTabs=Pestañas de otras ventanas
 tabview.notification.sessionStore=Las pestañas y grupos se restaurarán automáticamente la próxima vez que inicie %S.
--- a/browser/chrome/browser/taskbar.properties
+++ b/browser/chrome/browser/taskbar.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 taskbar.tasks.newTab.label=Abrir nueva pestaña
 taskbar.tasks.newTab.description=Abre una nueva pestaña del navegador.
 taskbar.tasks.newWindow.label=Abrir nueva ventana
 taskbar.tasks.newWindow.description=Abre una nueva ventana del navegador.
 taskbar.tasks.enterPrivacyMode.label=Iniciar navegación privada
 taskbar.tasks.enterPrivacyMode.description=Comenzar la navegación privada. La sesión actual será guardada.
 taskbar.tasks.exitPrivacyMode.label=Dejar navegación privada
 taskbar.tasks.exitPrivacyMode.description=Dejar la navegación privada y restaurar la sesión previa.
--- a/browser/chrome/overrides/appstrings.properties
+++ b/browser/chrome/overrides/appstrings.properties
@@ -1,43 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# 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"),
-# 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 *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 malformedURI = La dirección no es válida y no puede cargarse.
 fileNotFound = Firefox no puede encontrar el archivo en %S.
 dnsNotFound = Firefox no puede encontrar el servidor en %S.
 protocolNotFound = Firefox no sabe como abrir esta dirección, porque el protocolo (%S) no está asociado con ningún programa.
 connectionFailure = Firefox no puede establecer una conexión con el servidor en %S.
 netInterrupt = La conexión con %S fue interrumpida mientras la página se estaba cargando.
 netTimeout = El servidor en %S está tomando demasiado tiempo para responder.
--- a/browser/chrome/overrides/netError.dtd
+++ b/browser/chrome/overrides/netError.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 %brandDTD;
 
 <!ENTITY loadError.label "Problema cargando la página">
 <!ENTITY retry.label "Intente nuevamente">
 
 <!-- Specific error messages -->
 
--- a/browser/chrome/overrides/settingsChange.dtd
+++ b/browser/chrome/overrides/settingsChange.dtd
@@ -1,42 +1,8 @@
 <!-- -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla.org Code.
-#
-# The Initial Developer of the Original Code is
-# Doron Rosenberg.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Ben Goodger <ben@bengoodger.com>
-#   Myk Melez <myk@mozilla.org>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
 <!ENTITY  settingsChangePreferences.label  "Las opciones pueden cambiarse usando la pestaña Aplicaciones en las preferencias de &brandShortName;.">
 <!ENTITY  settingsChangeOptions.label      "Las opciones pueden cambiarse usando la pestaña Aplicaciones en las opciones de &brandShortName;.">
--- a/browser/crashreporter/crashreporter-override.ini
+++ b/browser/crashreporter/crashreporter-override.ini
@@ -1,6 +1,10 @@
+; This Source Code Form is subject to the terms of the Mozilla Public
+; License, v. 2.0. If a copy of the MPL was not distributed with this
+; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # This file is in the UTF-8 encoding
 [Strings]
 # LOCALIZATION NOTE (CrashReporterProductErrorText): The %s is replaced with a string containing detailed information.
 CrashReporterProductErrorText2=Firefox ha tenido un problema y se cerrará. Trataremos de restaurar sus pestañas y ventanas al reiniciarlo.\n\nDesafortunadamente crash reporter no puede enviar un unforme sobre la falla.\n\nDetalles: %s
 CrashReporterDescriptionText2=Firefox ha tenido un problema y se cerrará. Trataremos de restaurar sus pestañas y ventanas al reiniciarlo.\n\nPara ayudarnos a diagnosticar y corregir el problema, puede enviarnos un informe sobre la falla.
 
--- a/browser/feedback/main.dtd
+++ b/browser/feedback/main.dtd
@@ -1,10 +1,13 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY testpilot.brand.label                      "Test Pilot">
-<!-- browser window: menu and status bar -->
 <!ENTITY testpilot.settings.label                   "Configuración">
 <!ENTITY testpilot.settings.dataSubmission.label    "Envío de datos">
 <!ENTITY testpilot.settings.notifications.label     "Notificaciones">
 <!ENTITY testpilot.settings.notifyWhen.label        "Notificarme cuando…">
 <!ENTITY testpilot.settings.readyToSubmit.label     "El estudio esté listo para ser enviado">
 <!ENTITY testpilot.settings.newStudy.label          "Haya un nuevo estudio">
 <!ENTITY testpilot.settings.hasNewResults.label     "El estudio tenga nuevos resultados">
 <!ENTITY testpilot.settings.alwaysSubmitData.label  "Enviar automáticamente los datos (sin preguntar)">
--- a/browser/feedback/main.properties
+++ b/browser/feedback/main.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # description for add-on manager
 extensions.testpilot@labs.mozilla.com.description = Ayude a mejorar Firefox haciendo estudios de usuario.
 
 # common
 testpilot.fullBrandName = Mozilla Labs Test Pilot
 testpilot.moreInfo = Más información
 testpilot.submit = Enviar
 testpilot.takeSurvey = Realizar la encuesta
--- a/browser/installer/custom.properties
+++ b/browser/installer/custom.properties
@@ -1,43 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Mozilla Installer code.
-#
-# The Initial Developer of the Original Code is Mozilla Foundation
-# Portions created by the Initial Developer are Copyright (C) 2006
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#  Robert Strong <robert.bugzilla@gmail.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # LOCALIZATION NOTE:
 
 # This file must be saved as UTF8
 
 # Accesskeys are defined by prefixing the letter that is to be used for the
 # accesskey with an ampersand (e.g. &).
 
--- a/browser/installer/mui.properties
+++ b/browser/installer/mui.properties
@@ -1,43 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Mozilla Installer code.
-#
-# The Initial Developer of the Original Code is Mozilla Foundation
-# Portions created by the Initial Developer are Copyright (C) 2006
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#  Robert Strong <robert.bugzilla@gmail.com>
-#   
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # To make the l10n tinderboxen see changes to this file you can change a value
 # name by adding - to the end of the name followed by chars (e.g. Branding-2).
 
 # LOCALIZATION NOTE:
 
 # This file must be saved as UTF8
 
--- a/browser/installer/override.properties
+++ b/browser/installer/override.properties
@@ -1,44 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Mozilla Installer code.
-#
-# The Initial Developer of the Original Code is Mozilla Foundation
-# Portions created by the Initial Developer are Copyright (C) 2006
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#  Robert Strong <robert.bugzilla@gmail.com>
-#   
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # LOCALIZATION NOTE:
 
 # This file must be saved as UTF8
 
 # Accesskeys are defined by prefixing the letter that is to be used for the
 # accesskey with an ampersand (e.g. &).
 
new file mode 100644
--- /dev/null
+++ b/browser/pdfviewer/viewer.properties
@@ -0,0 +1,46 @@
+bookmark.title=Vista actual (copiar o abrir en nueva ventana)
+previous.title=Página anterior
+next.title=Página siguiente
+print.title=Imprimir
+download.title=Descargar
+zoom_out.title=Zoom Out
+zoom_in.title=Zoom In
+error_more_info=Más información
+error_less_info=Menos información
+error_close=Cerrar
+error_build=PDF.JS Build: {{build}}
+error_message=Mensaje: {{message}}
+error_stack=Stack: {{stack}}
+error_file=Archivo: {{file}}
+error_line=Línea: {{line}}
+page_scale_width=Ancho de página
+page_scale_fit=Page Fit
+page_scale_auto=Automatic Zoom
+page_scale_actual=Tamaño real
+toggle_slider.title=Toggle Slider
+thumbs.title=Show Thumbnails
+outline.title=Show Document Outline
+loading=Cargando... {{percent}}%
+loading_error_indicator=Error
+loading_error=Ocurrió un error al cargar el PDF.
+rendering_error=Ocurrió un error al dibujar la página.
+page_label=Página:
+page_of=de {{pageCount}}
+no_outline=No Outline Available
+open_file.title=Abrir archivo
+text_annotation_type=[{{type}} Anotación]
+toggle_slider_label=Toggle Slider
+thumbs_label=Thumbnails
+outline_label=Document Outline
+bookmark_label=Vista actual
+previous_label=Anterior
+next_label=Siguiente
+print_label=Imprimir
+download_label=Descargar
+zoom_out_label=Zoom Out
+zoom_in_label=Zoom In
+zoom.title=Zoom
+thumb_page_title=Página {{page}}
+thumb_page_canvas=Thumbnail of Page {{page}}
+request_password=PDF protegido por contraseña:
+open_file_label=Abrir
--- a/browser/profile/chrome/userChrome-example.css
+++ b/browser/profile/chrome/userChrome-example.css
@@ -1,8 +1,12 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 /*
  * Edit this file and copy it as userChrome.css into your
  * profile-directory/chrome/
  */
 
 /*
  * This file can be used to customize the look of Mozilla's user interface
  * You should consider using !important on rules which you want to
--- a/browser/profile/chrome/userContent-example.css
+++ b/browser/profile/chrome/userContent-example.css
@@ -1,8 +1,12 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 /*
  * Edit this file and copy it as userContent.css into your
  * profile-directory/chrome/
  */
 
 /*
  * This file can be used to apply a style to all web pages you view
  * Rules without !important are overruled by author rules if the
--- a/browser/updater/updater.ini
+++ b/browser/updater/updater.ini
@@ -1,6 +1,9 @@
+; This Source Code Form is subject to the terms of the Mozilla Public
+; License, v. 2.0. If a copy of the MPL was not distributed with this
+; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 ; This file is in the UTF-8 encoding
 [Strings]
 TitleText=Actualización de %MOZ_APP_DISPLAYNAME%
 InfoText=%MOZ_APP_DISPLAYNAME% está instalando sus actualizaciones y se iniciará en unos instantes…
-MozillaMaintenanceDescription=El servicio de mantenimiento de Mozilla Maintenance asegura que tiene la última y más segura versión de Mozilla Firefox en su computadora. Mantener Firefox actualizado es muy importante para su seguridad en línea y Mozilla recomienda encarecidamente que mantenga este servicio habilitado.
-
+MozillaMaintenanceDescription=El servicio de matenimiento de Mozilla asegura que tiene la última y más segura versión de  Mozilla Firefox en su computadora. Mantener Firefox actualizado es muy importante para su seguridad en línea y Mozilla recomienda encarecidamente que mantenga este servicio habilitado.
new file mode 100644
--- /dev/null
+++ b/browser/webapp-uninstaller/webapp-uninstaller.properties
@@ -0,0 +1,10 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE: This file must be saved as UTF8
+# LOCALIZATION NOTE: $AppName will be replaced with the (already localized)
+#                    name of the webapp being uninstalled.
+
+^UninstallCaption=Desinstalar $AppName
+UN_CONFIRM_UNINSTALL=$AppName se desinstalará de su computadora.
--- a/browser/webapprt/webapp.properties
+++ b/browser/webapprt/webapp.properties
@@ -10,8 +10,16 @@
 
 # LOCALIZATION NOTE (quitApplicationCmdMac.label): %S will be replaced with
 # the name of the webapp.
 quitApplicationCmdMac.label=Salir de %S
 
 # LOCALIZATION NOTE (hideApplicationCmdMac.label): %S will be replaced with
 # the name of the webapp.
 hideApplicationCmdMac.label=Ocultar %S
+
+# LOCALIZATION NOTE (geolocation.title): %S will be replaced with the name of
+# the webapp.
+geolocation.title=%S - Compartir ubicación
+geolocation.description=¿Desea compartir su ubicación?
+geolocation.sharelocation=Compartir ubicación
+geolocation.dontshare=No compartir
+geolocation.remember=Recordar mi selección
--- a/chat/accounts.properties
+++ b/chat/accounts.properties
@@ -1,5 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # LOCALIZATION NOTE (passwordPromptTitle, passwordPromptText):
 # %S is replaced with the name of the account
 passwordPromptTitle=Contraseña para %S
 passwordPromptText=Ingrese la contraseña de %S para conectarse.
 passwordPromptSaveCheckbox=Usar el administrador de contraseñas para recordar ésta.
--- a/chat/commands.properties
+++ b/chat/commands.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # LOCALIZATION NOTE (commands):
 #  %S is a comma separated list of command names.
 commands=Comandos: %S.\nUse /help &lt;comando&gt; para más información.
 # LOCALIZATION NOTE (noCommand, noHelp):
 #  %S is the command name the user typed.
 noCommand=No hay comando'%S'.
 noHelp=No hay mensaje de ayuda para el comando '%S', perdón!
 
--- a/chat/conversations.properties
+++ b/chat/conversations.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # LOCALIZATION NOTE (targetChanged):
 #  %1$S is the new conversation title (display name of the new target),
 #  %2$S is the protocol name used for the new target.
 targetChanged=La conversación continuará con %1$S, usando %2$S.
 
 # LOCALIZATION NOTE (statusChanged):
 #  %1$S is the display name of the contact.
 #  %2$S is the new status type (a value from status.properties).
--- a/chat/facebook.properties
+++ b/chat/facebook.properties
@@ -1,1 +1,5 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 connection.error.useUsernameNotEmailAddress=Utilice su nombre de usuario de Facebook, no la dirección de correo electrónico
--- a/chat/irc.properties
+++ b/chat/irc.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # LOCALIZATION NOTE (connection.error.*):
 #   These will show in the account manager if the account is
 #   disconnected because of an error.
 connection.error.lost=Conexión con el servidor perdida
 connection.error.timeOut=La conexión tardó demasiado tiempo
 connection.error.certError=Error de certificación al conectarse al servidor
 
 # LOCALIZATION NOTE (joinChat.*):
@@ -61,16 +65,17 @@ command.ping=%S [&lt;nick&gt;]: Asks how
 command.quit=%S &lt;mensaje&gt;: Desconecta del servidor con un mensaje opcional.
 command.quote=%S &lt;command&gt;: Send a raw command to the server.
 command.time=%S: Displays the current local time at the IRC server.
 command.topic=%S [&lt;new topic&gt;]: View or change the channel topic.
 command.umode=%S (+|-)&lt;new mode&gt;: Set or unset a user mode.
 command.version=%S &lt;nick&gt;: Request the version of a user's client.
 command.voice=%S &lt;nick1&gt;[,&lt;nick2&gt;]*: Grant channel voice status to someone. You must be a channel operator to do this.
 command.wallops=%S &lt;message&gt;: If you don't know what this is, you probably can't use it (sends a command to all connected with the +w flag and all operators on the server.
+command.whois=%S &lt;nick&gt;: Get information on a user.
 command.whowas=%S &lt;nick&gt;: Get information on a user that has logged off.
 
 # LOCALIZATION NOTE (message.*):
 #    These are shown as system messages in the conversation.
 #    %1$S is the nick and %2$S is the nick and host of the user who joined.
 message.join=%1$S [%2$S] entered the room.
 #    %1$S is the nick of who kicked you.
 #    %2$S is message.kicked.reason, if a kick message was given.
@@ -99,33 +104,49 @@ message.quit=%1$S has left the room (Qui
 message.quit2=: %S
 #    %1$S is the user who changed the topic, %2$S is the new topic.
 message.topicChanged=%1$S has changed the topic to: %2$S.
 #    %1$S is the user who cleared the topic.
 message.topicCleared=%1$S has cleared the topic.
 #    %1$S is the conversation name, %2$S is the topic.
 message.topic=The topic for %1$S is: %2$S.
 #    %S is the conversation name.
-message.topicRemoved=The topic for %S was removed.
+message.topicNotSet=There is no topic for %S.
 #    %1$S is the nickname of the invited user, %2$S is the conversation name
 #    they were invited to.
 message.invited=%1$S was successfully invited to %2$S.
 #    %S is the nickname of the user who was summoned.
 message.summoned=%S was summoned.
+#    %S is the nickname of the user whose WHOIS information follows this message.
+message.whois=Información de WHOIS para %S:
+#    %1$S is the nickname of the (offline) user whose WHOWAS information follows this message.
+message.whowas=%1$S is offline. WHOWAS information for %1$S:
+#    %1$S is the entry description (from tooltip.*), %2$S is its value.
+message.whoisEntry=\ua0\ua0\ua0\ua0%1$S: %2$S
+#    %S is the nickname that is not known to the server.
+message.unknownNick=%S is an unknown nickname.
 
 # LOCALIZATION NOTE (error.*):
 #    These are shown as error messages in the conversation.
 #    %S is the channel name.
 error.noChannel=There is no channel: %S.
 error.tooManyChannels=Cannot join %S; you've joined too many channels.
 #    %1$S is your new nick, %2$S is the kill message from the server.
 error.nickCollision=Nick already in use, changing nick to %1$S [%2$S].
 error.banned=You are banned from this server.
 error.bannedSoon=You will soon be banned from this server.
-error.mode.wrongUser=You cannot change modes for other users.
+error.mode.wrongUser=No puede cambar modos para otros usuarios.
+#    %S is the nickname or channel name that isn't available.
+error.noSuchNick=%S is not online.
+error.wasNoSuchNick=There was no nickname: %S
+error.noSuchChannel=No hay canal: %S.
+#    %S is the channel name.
+error.cannotSendToChannel=No puede enviar mensajes a %S.
+error.nonUniqueTarget=%S is not a unique user@host or shortname or you have tried to join too many channels at once.
+error.notChannelOp=No es operador del canal en %S.
 
 # LOCALIZATION NOTE (tooltip.*):
 #    These are the descriptions given in a tooltip with information received
 #    from a whois response.
 #    The human readable ("realname") description of the user.
 tooltip.realname=Nombre
 #    The username and hostname that the user connects from (usually based on the
 #    reverse DNS of the user's IP, but often mangled by the server to
@@ -135,13 +156,8 @@ tooltip.connectedFrom=Connected from
 tooltip.away=Away
 tooltip.ircOp=Operador de IRC
 tooltip.channels=Actualmente en
 tooltip.server=Conectado a
 #    %1$S is the server name, %2$S is the server location.
 tooltip.serverValue=%1$S (%2$S)
 tooltip.idleTime=Inactivo por
 
-# LOCALIZATION NOTE (gtalk.usernameHint):
-#  This is displayed inside the accountUsernameInfoWithDescription
-#  string defined in imAccounts.properties when the user is
-#  configuring an IRC account.
-usernameHint=y servidor
--- a/chat/status.properties
+++ b/chat/status.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 availableStatusType=Disponible
 awayStatusType=Away
 unavailableStatusType=No disponible
 offlineStatusType=No conectado
 invisibleStatusType=Invisible
 idleStatusType=Idle
 mobileStatusType=Móvil
 # LOCALIZATION NOTE (unknownStatusType):
--- a/chat/twitter.properties
+++ b/chat/twitter.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # LOCALIZATION NOTE (error.*):
 #   These are errors that will be shown to the user in conversation.
 error.tooLong=Status is over 140 characters.
 # LOCALIZATION NOTE (error.general, error.retweet, error.delete):
 #   %1$S will be either the error string returned by the twitter server,
 #   in English, inside parenthesis, or the empty string if we have no specific
 #   message for the error.
 #   %2$S is the message that caused the error.
--- a/chat/xmpp.properties
+++ b/chat/xmpp.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # LOCALIZATION NOTE (connection.*)
 #   These will be displayed in the account manager in order to show the progress
 #   of the connection.
 #   (These will be displayed in account.connection.progress from
 #    accounts.properties, which adds … at the end, so do not include
 #    periods at the end of these messages.)
 connection.initializingStream=Initializing stream
 connection.initializingEncryption=Inicializando cifrado
--- a/dom/chrome/accessibility/AccessFu.properties
+++ b/dom/chrome/accessibility/AccessFu.properties
@@ -1,91 +1,109 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
 menubar        =       menu bar
 scrollbar      =       scroll bar
 grip           =       grip
-alert          =       alert
+alert          =       alerta
 menupopup      =       menu popup
-document       =       document
+document       =       documento
 pane           =       pane
-dialog         =       dialog
-separator      =       separator
+dialog         =       diálogo
+separator      =       separador
 toolbar        =       toolbar
 statusbar      =       status bar
-table          =       table
+table          =       tabla
 columnheader   =       column header
 rowheader      =       row header
-column         =       column
-row            =       row
+column         =       columna
+row            =       fila
 cell           =       cell
-link           =       link
-list           =       list
+link           =       enlace
+list           =       lista
 listitem       =       list item
 outline        =       outline
 outlineitem    =       outline item
 pagetab        =       page tab
 propertypage   =       property page
-graphic        =       graphic
-pushbutton     =       button
+graphic        =       gráfico
+pushbutton     =       botón
 checkbutton    =       check button
 radiobutton    =       radio button
 combobox       =       combo box
 progressbar    =       progress bar
 slider         =       slider
 spinbutton     =       spin button
-diagram        =       diagram
-animation      =       animation
-equation       =       equation
+diagram        =       diagrama
+animation      =       animación
+equation       =       ecuación
 buttonmenu     =       button menu
 whitespace     =       white space
 pagetablist    =       page tab list
 canvas         =       canvas
 checkmenuitem  =       check menu item
 label          =       label
 passwordtext   =       password text
 radiomenuitem  =       radio menu item
 textcontainer  =       text container
 togglebutton   =       toggle button
 treetable      =       tree table
 header         =       header
 footer         =       footer
-paragraph      =       paragraph
+paragraph      =       párrafo
 entry          =       entry
 caption        =       caption
-heading        =       heading
-section        =       section
-form           =       form
+heading        =       encabezado
+section        =       sección
+form           =       formulario
 comboboxlist   =       combo box list
 comboboxoption =       combo box option
 imagemap       =       image map
 listboxoption  =       list box option
 listbox        =       list box
 flatequation   =       flat equation
 gridcell       =       gridcell
-note           =       note
-figure         =       figure
+note           =       nota
+figure         =       figura
+definitionlist =       lista de definiciones
+term           =       término
+definition     =       definición
+
+# More sophisticated roles which are not actual numeric roles
+textarea       =       área de texto
 
 # More sophisiticated object descriptions
-headingLevel   =       heading level %S
+headingLevel   =       nivel de encabezado %S
 # LOCALIZATION NOTE: %1$S is the item's role name (e.g. "List item" or "Page tab"), %2$S is the position of the item n the set. %3$S is the total number of such items in the set. An expanded example would read "List item 2 of 5".
-objItemOf      =       %1$S %2$S of %3$S
-objChecked     =       checked %S
-objNotChecked  =       not checked %S
-objExpanded    =       expanded %S
-objCollapsed   =       collapsed %S
+objItemOf      =       %1$S %2$S de %3$S
 
 # Invoked actions
 jumpAction     =      jumped
-pressAction    =      pressed
+pressAction    =      presionado
 checkAction    =      checked
 uncheckAction  =      unchecked
-selectAction   =      selected
-openAction     =      opened
-closeAction    =      closed
+selectAction   =      seleccionado
+openAction     =      abierto
+closeAction    =      cerrado
 switchAction   =      switched
 clickAction    =      clicked
-collapseAction =      collapsed
-expandAction   =      expanded
-activateAction =      activated
-cycleAction    =      cycled
\ No newline at end of file
+collapseAction =      colapsado
+expandAction   =      expandido
+activateAction =      activado
+cycleAction    =      cycled
+
+# Tab states
+tabLoading     =      cargando
+tabLoaded      =      cargada
+tabNew         =      nueva pestaña
+tabLoadStopped =      carga detenida
+tabReload      =      recargando
+
+# Object states
+stateChecked     =    checked
+stateNotChecked  =    not checked
+stateExpanded    =    expandido
+stateCollapsed   =    colapsado
+stateUnavailable =    no disponible
+stateRequired    =    requerido
+stateTraversed   =    visitado
--- a/dom/chrome/accessibility/mac/accessible.properties
+++ b/dom/chrome/accessibility/mac/accessible.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 jump    =       Saltar
 press   =       Pulsar
 check   =       Chequear
 uncheck =       Deschequear
 select  =       Seleccionar
 open    =       Abrir
 close   =       Cerrar
 switch  =       Cambiar
--- a/dom/chrome/accessibility/unix/accessible.properties
+++ b/dom/chrome/accessibility/unix/accessible.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 jump    =       Saltar
 press   =       Pulsar
 check   =       Chequear
 uncheck =       Deschequear
 select  =       Seleccionar
 open    =       Abrir
 close   =       Cerrar
 switch  =       Cambiar
--- a/dom/chrome/accessibility/win/accessible.properties
+++ b/dom/chrome/accessibility/win/accessible.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 jump    =       Saltar
 press   =       Pulsar
 check   =       Chequear
 uncheck =       Deschequear
 select  =       Seleccionar
 open    =       Abrir
 close   =       Cerrar
 switch  =       Cambiar
--- a/dom/chrome/appstrings.properties
+++ b/dom/chrome/appstrings.properties
@@ -1,43 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# 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"),
-# 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 *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 malformedURI=La dirección no es válida y no será cargada.
 fileNotFound=No se encontró el archivo %S. Verifique el nombre y la ruta, e inténtelo de nuevo.
 dnsNotFound=No se pudo encontrar %S. Por favor revise el nombre e inténtelo de nuevo.
 protocolNotFound=%S no es un protocolo registrado.
 connectionFailure=La conexión fue rechazada intentando contactar %S.
 netInterrupt=La conexión con %S ha terminado sorpresivamente. Algunos datos pueden haber sido transferidos.
 netTimeout=El intento de conexión con %S ha tomado mucho tiempo.
--- a/dom/chrome/charsetTitles.properties
+++ b/dom/chrome/charsetTitles.properties
@@ -1,43 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1999 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ## Rule of this file:
 ## 1. key should always be in lower case ascii so we can do case insensitive
 ##    comparison in the code faster.
 
 ## Format of this file:
 ## charset_name.title = a_title  -  specifies the human readable title for 
 ## this charset
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -1,63 +1,27 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mitch <mstoltz@netscape.com> (original author)
-#   Ehsan Akhgari <ehsan.akhgari@gmail.com>
-#   Ms2ger <ms2ger@gmail.com>
-#
-# 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 El uso de 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 *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 KillScriptTitle=Advertencia: Script sin respuesta
 KillScriptMessage=Un script en esta página puede estar ocupado, o puede haber dejado de responder. Puede detener el script ahora, o puede continuar para ver si el script se completa.
 KillScriptWithDebugMessage=Un script en esta página puede estar ocupado, o puede haber dejado de responder. Puede detener el script ahora, abrir el script el el debugger, o permitir que el script continue.
 KillScriptLocation=Script: %S
 StopScriptButton=Detener script
 DebugScriptButton=Depurar script
 WaitForScriptButton=Continuar
 DontAskAgain=No preguntar nuevamente
 JSURLLoadBlockedWarning=Se intento cargar un JavaScript: URL de un servidor en una ventana que muestra contenido de otro servidor. Ha sido bloqueado por el administrador de seguridad.
 WindowCloseBlockedWarning=Scripts no pueden cerrar ventanas que no se abrieron mediante script.
 OnBeforeUnloadTitle=¿Está seguro?
 OnBeforeUnloadMessage=Esta página está pidiendo que confirme que desea abandonarla - los datos que haya ingresado puede que se pierdan.
 OnBeforeUnloadStayButton=Permanecer en la página
 OnBeforeUnloadLeaveButton=Abandonar la página
 DocumentAllUsed=Se utilizó una propiedad document.all no estándar. Utilice el estándar de W3C document.getElementById() en su lugar.
-GlobalScopeElementReference=Elemento referenciado por ID/NAME globalmente. Utilice el estándar de W3C document.getElementById() en su lugar.
 UseOfCaptureEventsWarning=No se aconseja el uso de captureEvents(), ver bug 330494.
 UseOfReleaseEventsWarning=No se aconseja el uso de releaseEvents(), ver bug 330494.
 UseOfRouteEventWarning=No se aconseja el uso de routeEvent(), Ver bug 330494.
 UseOfPreventBubbleWarning=Evento=%S, No se aconseja el uso de preventBubble(). Use el estándar del W3C stopPropagation() en su lugar.
 UseOfPreventCaptureWarning=Evento=%S, No se aconseja el uso de preventCapture(). Use el estándar del W3C stopPropagation() en su lugar.
 UseOfDOM3LoadMethodWarning=El uso de Document.load() es obsoleto. Para actualizar su código, use el objeto DOM XMLHttpRequest. Para más ayuda vea https://developer.mozilla.org/en/XMLHttpRequest
 UnexpectedCanvasVariantStyle=canvas: un intento de establecer strokeStyle o fillStyle a un valor que no es string ni CanvasGradient ni CanvasPattern fue ignorado.
 EmptyGetElementByIdParam=Cadena vacía pasada a getElementById().
@@ -73,18 +37,16 @@ FormValidationFileMissing=Seleccione un 
 FormValidationSelectMissing=Seleccione un ítem de la lista.
 FormValidationInvalidEmail=Ingrese una dirección de correo electrónico.
 FormValidationInvalidURL=Ingrese una URL.
 FormValidationPatternMismatch=Please match the requested format.
 # LOCALIZATION NOTE (FormValidationPatternMismatchWithTitle): %S is the (possibly truncated) title attribute value.
 FormValidationPatternMismatchWithTitle=Please match the requested format: %S.
 GetAttributeNodeWarning=El uso de getAttributeNode() es obsoleto. Use getAttribute() en su lugar.
 SetAttributeNodeWarning=El uso de setAttributeNode() es obsoleto. Use setAttribute() en su lugar.
-GetAttributeNodeWarning=El uso de getAttributeNodeNS() es obsoleto. Use getAttributeNS() en su lugar.
-SetAttributeNodeWarning=El uso de setAttributeNodeNS() es obsoleto. Use setAttributeNS() en su lugar.
 GetAttributeNodeNSWarning=El uso de getAttributeNodeNS() es obsoleto. Use getAttributeNS() en su lugar.
 SetAttributeNodeNSWarning=El uso de setAttributeNodeNS() es obsoleto. Use setAttributeNS() en su lugar.
 RemoveAttributeNodeWarning=El uso de removeAttributeNode() es obsoleto. Use removeAttribute() en su lugar.
 CreateAttributeWarning=El uso de document.createAttribute() es obsoleto. Use element.setAttribute() en su lugar.
 CreateAttributeNSWarning=El uso de document.createAttributeNS() es obsoleto. Use element.setAttributeNS() en su lugar.
 SpecifiedWarning=El uso de attributes' specified attribute es obsoleto. Siempre devuelve verdadero.
 OwnerElementWarning=El uso de attributes' ownerElement attribute es obsoleto.
 NodeNameWarning=El uso de attributes' nodeName attribute es obsoleto. Use name en su lugar.
@@ -113,16 +75,17 @@ EnablePrivilegeWarning=El uso de enablePrivilege es obsoleto.  Use código que se ejecute con el sistea principal (ej. una extensión) en su lugar.
 PositionWarning=El uso del atributo de posición de progreso de eventos de XMLHttpRequest es obsoleto.
 TotalSizeWarning=El usoe del atributo totalSize de progreso de eventos de XMLHttpRequest es obsoleto.
 nsIJSONDecodeDeprecatedWarning=nsIJSON.decode es obsoleto.  Use JSON.parse en su lugar.
 nsIJSONEncodeDeprecatedWarning=nsIJSON.encode es obsoleto.  Use JSON.stringify en su lugar.
 nsIDOMWindowInternalWarning=El uso de nsIDOMWindowInternal es obsoleto. Use nsIDOMWindow en su lugar.
 InputEncodingWarning=El uso de inputEncoding es obsoleto.
 # LOCALIZATION NOTE: Do not translate "MozBeforePaint" and "mozRequestAnimationFrame"
 MozBeforePaintWarning=Los eventos MozBeforePaint no están más soportados. A mozRequestAnimationFrame se le debe pasar un argumento callback no nulo.
+FullScreenDeniedBlocked=El pedido de pantalla completa fue denegado porque este dominio fue bloqueado de pantalla completa por el usuario.
 FullScreenDeniedDisabled=El pedido de pantalla completa fue denegado porque la API de pantalla completa fue deshabilitada por una preferencia del usuario.
 FullScreenDeniedFocusedPlugin=El pedido de pantalla completa fue denegado porque un plugin en ventana tiene el foco.
 FullScreenDeniedHidden=El pedido de pantalla completa fue denegado porque el documento ya no es visible.
 FullScreenDeniedIframeDisallowed=El pedido de pantalla completa fue denegado porque al menos uno de los documentos que contienen iframes no tiene un atributo "mozallowfullscreen".
 FullScreenDeniedNotInputDriven=Request for full-screen was denied because Element.mozRequestFullScreen() was not called from inside a short running user-generated event handler.
 FullScreenDeniedNotInDocument=El pedido de pantalla completa fue denegado porque el elemento solicitante ya no está en su documento.
 FullScreenDeniedMovedDocument=El pedido de pantalla completa fue denegado porque el elemento solicitante ha movido el documento.
 FullScreenDeniedLostWindow=El pedido de pantalla completa fue denegado porque ya no hay más una ventana.
@@ -140,19 +103,25 @@ TimeoutSyncXHRWarning=El uso del atributo timeout XMLHttpRequest's no está soportado en el modo sincrónico en el contexto de la ventana.
 JSONCharsetWarning=Se intentó declarar una codificación no UTF-8 para JSON recueprada usando XMLHttpRequest. Solamente se soporta UTF-8 para decodificar JSON.
 MediaLoadExhaustedCandidates=Todos los recursos candidatos fallaron al cargarse. Carga de medio pausada.
 MediaLoadSourceMissingSrc=Elemento <source> no tiene atributo"src". Recurso de medios no pudo cargarse.
 # LOCALIZATION NOTE: %1$S is the Http error code the server returned (e.g. 404, 500, etc), %2$S is the URL of the media resource which failed to load.
 MediaLoadHttpError=Carga de HTTP falló con estado %1$S. Carga de recurso de medios %2$S falló.
 # LOCALIZATION NOTE: %S is the URL of the media resource which failed to load.
 MediaLoadInvalidURI=URI inválido. Carga de recurso de medios %S falló.
 # LOCALIZATION NOTE: %1$S is the media resource's format/codec type (basically equivalent to the file type, e.g. MP4,AVI,WMV,MOV etc), %2$S is the URL of the media resource which failed to load.
-MediaLoadUnsupportedType="Tipo" especificado de "%1$S" no está soportado. Carga de recurso de medios %2$S falló.
+MediaLoadUnsupportedTypeAttribute=El atributo "type" especificado de "%1$S" no está soportado. La carga del recurso de medios %2$S falló.
+# LOCALIZATION NOTE: %1$S is the "media" attribute value of the <source> element. It is a media query. %2$S is the URL of the media resource which failed to load.
+MediaLoadSourceMediaNotMatched=El atributo "media" especificado como "%1$S" no coincide con el entorno. La carga del recurso de medios %2$S falló
 # LOCALIZATION NOTE: %1$S is the MIME type HTTP header being sent by the web server, %2$S is the URL of the media resource which failed to load.
 MediaLoadUnsupportedMimeType="Content-Type" HTTP de "%1$S" no está soportado. Carga de recurso de medios %2$S falló.
 # LOCALIZATION NOTE: %S is the URL of the media resource which failed to load because of error in decoding.
 MediaLoadDecodeError=Recurso de medios %S no pudo decodificarse.
 # LOCALIZATION NOTE: Do not translate "MozBlobBuilder" and "Blob"
 MozBlobBuilderWarning=El uso de MozBlobBuilder es obsoleto. Use Blob constructor en su lugar.
 # LOCALIZATION NOTE: Do not translate "DOMException", "code" and "name"
 DOMExceptionCodeWarning=El uso del atributo de código DOMException es obsoleto. Use name en su lugar.
-# LOCALIZATION NOTE: Do not translate "java" or "Packages".
-JavaPackagesWarning=El uso de los objetos DOM 'java' y 'Packages' para acceder a la funcionalidad de Java es obsoleto. El soporte será eliminado pronto.
+# LOCALIZATION NOTE: Do not translate "__exposedProps__"
+NoExposedPropsWarning=Exponer objetos JS del chrome al contexto sin __exposedProps__ es inseguro y obsoleto. Vea https://developer.mozilla.org/en/XPConnect_wrappers para más información
+# LOCALIZATION NOTE: Do not translate "Mutation Event" and "MutationObserver"
+MutationEventWarning=El uso de Mutation Event es obsoleto. Use MutationObserver en su lugar.
+# LOCALIZATION NOTE: Do not translate "Blob", "mozSlice", or "slice"
+MozSliceWarning=El uso de mozSlice en el objeto Blob object es obsoleto.  Use slice en su lugar.
--- a/dom/chrome/global-strres.properties
+++ b/dom/chrome/global-strres.properties
@@ -1,37 +1,5 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# The Mozilla Foundation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2003
-# 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"),
-# 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 *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 16389=Un error desconocido ha ocurrido (%1$S)
--- a/dom/chrome/global.dtd
+++ b/dom/chrome/global.dtd
@@ -1,2 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY locale.dir "ltr">
 
--- a/dom/chrome/layout/HtmlForm.properties
+++ b/dom/chrome/layout/HtmlForm.properties
@@ -1,43 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# 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"),
-# 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 *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 Reset=Limpiar
 Submit=Enviar Consulta
 Browse=Examinar…
 FileUpload=Subir archivo
 MediaUpload=Subir medios
 # LOCALIZATION NOTE (IsIndexPromptWithSpace): The last character of the string 
 # should be a space (U+0020) in most locales. The prompt is followed by an 
--- a/dom/chrome/layout/MediaDocument.properties
+++ b/dom/chrome/layout/MediaDocument.properties
@@ -1,46 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Blake Ross <blakeross@telocity.com> (Original Author)
-#   Morten Nilsen <morten@nilsen.com>
-#   Christian Biesinger <cbiesinger@web.de>
-#
-# 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 *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #LOCALIZATION NOTE (ImageTitleWithDimensionsAndFile): first %S is filename, second %S is type, third %S is width and fourth %S is height
 #LOCALIZATION NOTE (ImageTitleWithoutDimensions): first %S is filename, second %S is type
 #LOCALIZATION NOTE (ImageTitleWithDimensions): first %S is type, second %S is width and third %S is height
 #LOCALIZATION NOTE (ImageTitleWithNeitherDimensionsNorFile): first %S is type
 #LOCALIZATION NOTE (MediaTitleWithFile): first %S is filename, second %S is type
 #LOCALIZATION NOTE (MediaTitleWithNoInfo): first %S is type
 ImageTitleWithDimensionsAndFile=%S (Imagen %S, %Sx%S pixels)
--- a/dom/chrome/layout/css.properties
+++ b/dom/chrome/layout/css.properties
@@ -1,43 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is css.properties.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation.  Portions created by the Initial Developer are Copyright
-# (C) 2002 Netscape Communications Corporation.  All Rights Reserved.
-#
-# Contributor(s):
-#   L. David Baron <dbaron@dbaron.org> (original author)
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MimeNotCss=La hoja de estilo %1$S no fue cargada porque su tipo MIME, "%2$S", no es "text/css".
 MimeNotCssWarn=La hoja de estilo %1$S fue cargada como CSS aunque su tipo MIME, "%2$S", no es "text/css".
 
 PEUnexpEOF2=Fin de archivo inesperado buscando %1$S.
 PEParseRuleWSOnly=Cadena conteniendo solamente espacios entregada para utilizarse como regla.
 PEDeclDropped=Declaración ignorada.
 PEDeclSkipped=Salteando a la próxima declaración.
--- a/dom/chrome/layout/htmlparser.properties
+++ b/dom/chrome/layout/htmlparser.properties
@@ -1,44 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is HTML parser error reporting code.
-#
-# The Initial Developer of the Original Code is
-# Mozilla Foundation.
-# Portions created by the Initial Developer are Copyright (C) 2011
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Henri Sivonen <hsivonen@iki.fi>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Encoding warnings and errors
 EncNoDeclarationFrame=La codificación de caracteres de un documento en un marco no fue decarada. El documento puede verse diferente sin el documento en el cual está el marco.
 EncNoDeclarationPlain=La codificación de caracteres del doucmento de texto plano no fue declarada. El documento se verá con basura en el texto en algunas configuraciones de navegadores si contiene caracteres fuera del rango US-ASCII. La codificación de caracteres necesita ser declarada en el protocolo de transferencia o el archivo necesita usar una marca de orden de byte como firma de codificación.
 EncNoDeclaration=La codificación de caracteres del documento HTML no fue declarada. El documento se verá con basura en el texto en algunas configuraciones de navegadores si el documento contiene caracteres fuera del rango US-ASCII. La codificación de caracteres de la página debe declararse en el documento o en el protocolo de transferencia.
 EncLateMetaFrame=La codificación de caracteres de un documento en un marco no fue encontrada al preexplorar los primeros 1024 bytes del archivo. Al verlo sin el documento que lo enmarca, la página se recargará automáticamente. La declaración de codificación necesita ser movida a los primeros 1024 bytes del archivo.
 EncLateMeta=La codificación de caracteres del documento HTML no fue encontrada al preexplorar los primeros 1024 bytes del archivo. Al verlo en un navegador con una configuración diferente, la página se recargará automáticamente. La declaración de codificación necesita ser movida a los primeros 1024 bytes del archivo.
 EncLateMetaReload=La página fue recargada porque la declaración de codificación no fue encontrada al preexplorar los primeros 1024 bytes del archivo. La declaración de codificación necesita ser movida a los primeros 1024 bytes del archivo.
--- a/dom/chrome/layout/layout_errors.properties
+++ b/dom/chrome/layout/layout_errors.properties
@@ -1,42 +1,9 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2002
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Boris Zbarsky <bzbarsky@mit.edu>  (original author)
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ImageMapRectBoundsError=El atributo "coords" del tag <area shape="rect"> no tiene el formato "izquierda,arriba,derecha,abajo".
 ImageMapCircleWrongNumberOfCoords=El atributo "coords" del tag <area shape="circle"> no tiene el formato "center-x,center-y,radius".
 ImageMapCircleNegativeRadius=El atributo "coords" del tag <area shape="circle"> tiene un radio negativo.
 ImageMapPolyWrongNumberOfCoords=El atributo "coords" del tag <area shape="poly"> no tiene el formato "x1,y1,x2,y2 ...".
 ImageMapPolyOddNumberOfCoords=El atributo "coords" del tag <area shape="poly"> no tiene la última coordenada "y" (el formato correcto es "x1,y1,x2,y2 ...").
--- a/dom/chrome/layout/printing.properties
+++ b/dom/chrome/layout/printing.properties
@@ -1,44 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Roland Mainz <roland.mainz@informatik.med.uni-giessen.de>
-#
-# 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 *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Page number formating
 ## @page_number The current page number
 #LOCALIZATION NOTE (pageofpages): Do not translate %ld in the following line.
 # Place the word %ld where the page number and number of pages should be
 # The first %ld will receive the the page number
 pagenumber=%1$d
 
--- a/dom/chrome/layout/xbl.properties
+++ b/dom/chrome/layout/xbl.properties
@@ -1,42 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is xbl.properties.
-#
-# The Initial Developer of the Original Code is Boris Zbarsky
-# <bzbarsky@mit.edu>.  Portions created by the Initial Developer are Copyright
-# (C) 2003.  All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 UnexpectedElement=Elemento <%1$S> inesperado.
 # LOCALIZATION NOTE: do not localize key="%S" modifiers="%S"
 GTK2Conflict=Evento clave no disponible en  GTK2: key="%S" modifiers="%S"
 WinConflict=Evento clave no disponible en algunas disposiciones de teclado: key="%S" modifiers="%S"
 TooDeepBindingRecursion=The XBL binding "%S" is already used by too many ancestor elements; not applying it to prevent infinite recursion.
 CircularExtendsBinding=Extending the XBL binding "%S" with "%S" would lead to it extending itself
 # LOCALIZATION NOTE: do not localize <handler command="…">
--- a/dom/chrome/layout/xmlparser.properties
+++ b/dom/chrome/layout/xmlparser.properties
@@ -1,43 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# 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"),
-# 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 *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Map Expat error codes to error strings
 1=sin memoria
 2=error de sintaxis
 3=no se encontraron elementos
 4=malformado
 5=token sin cerrar
 6=token sin cerrar
--- a/dom/chrome/layout/xul.properties
+++ b/dom/chrome/layout/xul.properties
@@ -1,39 +1,8 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is xul.properties.
-#
-# The Initial Developer of the Original Code is Boris Zbarsky
-# <bzbarsky@mit.edu>.  Portions created by the Initial Developer are Copyright
-# (C) 2004.  All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MissingOverlay=No se puede cargar overlay de %1$S.
 PINotInProlog=<?%1$S?> la instrucción de procesamiento no tiene actualmente ningún efecto fuera del prólogo (ver bug 360119).
 NeededToWrapXUL=La caja XUL para el elemento %1$S contiene un hijo incluído %2$S, forzando a todos sus hijos a estar encerrados en un bloque.
 NeededToWrapXULInlineBox=La caja XUL para el elemento %1$S contiene un hijo en incluío %2$S, forzando a todos sus hijos a estar encerrados en un bloque.  Esto puede a menudo ser corregido reemplazando "display: -moz-inline-box" con "display: -moz-inline-box; display: inline-block".
--- a/dom/chrome/netError.dtd
+++ b/dom/chrome/netError.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!ENTITY loadError.label "Error al cargar la página">
 <!ENTITY retry.label "Intente de nuevo">
 
 <!-- Specific error messages -->
 
 <!ENTITY connectionFailure.title "Falla de conexión">
 <!ENTITY connectionFailure.longDesc "<p>Aunque el sitio parece válido, el navegador no puede conectarse.</p><ul><li>¿Puede ser que el sitio no esté disponible temporariamente? Intente nuevamente después.</li><li>¿No puede navegar otros sitios?  Verifique la conexión a la red de su computadora.</li><li>¿Su computadora o red están protegidas por un firewall o proxy? Una configuración incorrecta puede interferir con la navegación.</li></ul>">
 
--- a/dom/chrome/netErrorApp.dtd
+++ b/dom/chrome/netErrorApp.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!-- Error messages that are likely to be overridden by applications go in this
      file, all messages that likely don't need to tie into app-specific UI
      should go into netError.dtd -->
 
 <!ENTITY securityOverride.linkText "O puede agregar una excepción…">
 <!ENTITY securityOverride.warningContent "
 <p>No debería agregar una excepción si está usando una conexión a internet en la que no confía completamente o si no suele recibir una advertencia de este servidor.</p>
 <p>Si aún desea agregar una excepción para este sitio, puede hacerlo en sus opciones avanzadas de cifrado.</p>
--- a/dom/chrome/nsWebBrowserPersist.properties
+++ b/dom/chrome/nsWebBrowserPersist.properties
@@ -1,44 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla Progress Dialog.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corp.
-# Portions created by the Initial Developer are Copyright (C) 2002
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Bill Law  <law@netscape.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 readError=No se  pudo guardar %S, porque el archivo de origen no pudo ser leído.\n\nIntente de nuevo más tarde, o contacte al administrador del servidor.
 writeError=No se pudo guardar %S, porque ocurrió un error desconocido. \n\nLo sentimos. Intente guardarlo en una ubicación diferente.
 launchError=No se pudo abrir %S, porque sucedió un error desconocido. \n\nLo sentimos. Intente guardarlo primero en un disco, y luego abrir el archivo.
 diskFull=No hay suficiente espacio libre en disco para guardar %S. \n\nLibere espacio en el disco e intente de nuevo, o intente guardarlo en un lugar distinto.
 readOnly=No se pudo guardar %S, porque el disco, la carpeta, o el archivo está protegido contra escritura.\n\nHabilite la escritura e intente de nuevo, o guárdelo en una ubicación distinta.
 accessError=No se pudo guardar %S, porque usted no puede cambiar los contenidos de esa carpeta.\n\nCambie las propiedades de la carpeta, o intente guardarlo en un lugar distinto.
 helperAppNotFound=%S no se puede abrir, porque la aplicación asociada no existe. Cambie la asociación en sus preferencias.
--- a/dom/chrome/plugins.properties
+++ b/dom/chrome/plugins.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # LOCALIZATION NOTE (plugins.properties):
 #    Those strings are inserted into an HTML page, so you all HTML characters
 #    have to be escaped in a way that they show up correctly in HTML!
 
 title_label=Acerca de plugins
 enabledplugins_label=Plugins habilitados
 nopluginsareenabled_label=No se encontraron plugins habilitados
 findmore_label=Buscar más información sobre plugins del navegador en
--- a/dom/chrome/security/caps.properties
+++ b/dom/chrome/security/caps.properties
@@ -1,45 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mitch Stoltz <mstoltz@netscape.com>
-#   Christopher A. Aillon <christopher@aillon.com>
-#
-# 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 *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 Yes = Permitir
 No = Denegar
 Titleline = Seguridad en Internet
 CheckMessage = Recordar esta decisión
 EnableCapabilityQuery = Un script de "%S" está pidiendo habilidades mejoradas que son INSEGURAS y pueden ser utilizadas para comprometer su máquina o sus datos:\n\n%S\n\nPermita estas habilidades solamente si confía en que esta fuente está libre de virus o programas maliciosos.
 EnableCapabilityDenied = A un script de "%S" se le denegaron  %S privilegios.
 CheckLoadURIError = Error de seguridad: El contenido en %S no puede cargar o enlazar a %S.
 CheckSameOriginError = Error de seguridad: El contenido en %S no puede cargar datos de %S.
--- a/dom/chrome/svg/svg.properties
+++ b/dom/chrome/svg/svg.properties
@@ -1,38 +1,5 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Mozilla SVG project.
-#
-# The Initial Developer of the Original Code is
-# Robert Longson.
-# Portions created by the Initial Developer are Copyright (C) 2006
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#    Robert Longson <longsonr@gmail.com> (original author)
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 AttributeParseWarning=Valor inesperado %2$S analizando atributo de %1$S.
--- a/dom/chrome/xml/prettyprint.dtd
+++ b/dom/chrome/xml/prettyprint.dtd
@@ -1,37 +1,5 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org.
-   -
-   - The Initial Developer of the Original Code is
-   - Vincent Béron.
-   - Portions created by the Initial Developer are Copyright (C) 2003
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s): Vincent Béron <vberon@hermes.usherb.ca>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the 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 ***** -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY xml.nostylesheet "Este archivo XML parece no tener información de estilo asociada. El árbol del documento se muestra debajo.">
--- a/dom/chrome/xslt/xslt.properties
+++ b/dom/chrome/xslt/xslt.properties
@@ -1,44 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is TransforMiiX XSLT processor code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2003
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Peter Van der Beken <peterv@propagandism.org>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 1=Falla en parseo de hoja de estilo XSLT
 2=Fallo en parseo de expresión XPath.
 3=
 4=Falló la transormación de XSLT.
 5=XSLT/XPath trató de llamar a una función desconocida.
 6=Hoja de estilo XSLT (posiblemente) contenga recursión.
 7=Valor ilegal de atributo en XSLT 1.0.
--- a/editor/ui/chrome/composer/editingOverlay.dtd
+++ b/editor/ui/chrome/composer/editingOverlay.dtd
@@ -1,8 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <!-- ***** BEGIN LICENSE BLOCK *****
    - Version: MPL 1.1/GPL 2.0/LGPL 2.1
    -
    - The contents of this file are subject to the Mozilla Public License Version
    - 1.1 (the "License"); you may not use this file except in compliance with
    - the License. You may obtain a copy of the License at
    - http://www.mozilla.org/MPL/
    -
--- a/editor/ui/chrome/composer/editor.dtd
+++ b/editor/ui/chrome/composer/editor.dtd
@@ -1,44 +1,11 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator client code, released
-   - March 31, 1998.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 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"),
-   - 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 ***** -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- Window title -->
 <!-- LOCALIZATION NOTE  (editorWindow.titlemodifier): DONT_TRANSLATE -->
 <!ENTITY editorWindow.titlemodifier "Composer"> 
 <!ENTITY editorWindow.titlemodifiermenuseparator " - ">
 
 <!-- Menu items:  the . means that the menu item isn't implemented yet -->
 
@@ -78,17 +45,17 @@
 <!-- Display Mode toolbar and View menu items -->
 <!ENTITY NormalModeTab.label "Normal">
 <!ENTITY NormalMode.label "Modo normal de edición">
 <!ENTITY NormalMode.accesskey "n">
 <!ENTITY NormalMode.tooltip "Mostrar los bordes de las tablas y los enlaces con nombre">
 <!ENTITY AllTagsModeTab.label "Etiquetas HTML">
 <!ENTITY AllTagsMode.label "Etiquetas HTML">
 <!ENTITY AllTagsMode.accesskey "a">
-<!ENTITY AllTagsMode.tooltip "Mostrar iconos para todas las etiquetas HTML">
+<!ENTITY AllTagsMode.tooltip "Mostrar íconos para todas las etiquetas HTML">
 <!-- LOCALIZATION NOTE: (HTMLSourceModeTab.dir, HTMLSourceModeTab.label)
      Do NOT translate text for 'HTMLSourceModeTab.dir', use latin "ltr" if
      you want the <html> image to left of the 'HTMLSourceModeTab.label' text,
      or use latin "rtl" if you want this image to the right of text. You do
      not need to include HTML in the label 'HTMLSourceModeTab.label' -->
 <!ENTITY HTMLSourceModeTab.dir "ltr">
 <!ENTITY HTMLSourceModeTab.label "Fuente">
 <!ENTITY HTMLSourceMode.label "Fuente HTML">
--- a/editor/ui/chrome/composer/editor.properties
+++ b/editor/ui/chrome/composer/editor.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # LOCALIZATION NOTE FILE: embedded "\n" represent HTML breaks (<br>)
 # Don't translate embedded "\n".
 # Don't translate strings like this: %variable%
 #  as they will be replaced using JavaScript
 #
 No=No
 Save=Guardar
 More=Más
--- a/editor/ui/chrome/composer/editorOverlay.dtd
+++ b/editor/ui/chrome/composer/editorOverlay.dtd
@@ -1,49 +1,11 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator client code, released
-   - March 31, 1998.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1999-2000
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Sammy Ford
-   -   Blake Ross
-   -   Ryan Cassin (rcassin@supernova.org)
-   -   Daniel Glazman (glazman@netscape.com)
-   -   Stephen Donner (technutz@netscape.net)
-   -
-   - 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 ***** -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- Attn: Localization - some of the menus in this dialog directly affect mail also. -->
 
 <!-- File menu items -->
 <!ENTITY saveCmd.key "G">
 
 <!-- Edit menu items -->
 <!ENTITY pasteNoFormatting.label "Pegar sin formato">
--- a/editor/ui/chrome/composer/editorPrefsOverlay.dtd
+++ b/editor/ui/chrome/composer/editorPrefsOverlay.dtd
@@ -1,8 +1,11 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!--LOCALIZATION NOTE (editorCheck.label): DONT_TRANSLATE -->
 <!ENTITY editorCheck.label "Composer">
 <!ENTITY editorCheck.accesskey "c">
 
 <!ENTITY compose.label "Composer">
 <!ENTITY editing.label "Nuevas opciones de página">
 <!ENTITY toolbars.label "Barras de herramienta">
--- a/editor/ui/chrome/composer/editorSmileyOverlay.dtd
+++ b/editor/ui/chrome/composer/editorSmileyOverlay.dtd
@@ -1,44 +1,11 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Editor Smiley Overlay.
-   -
-   - The Initial Developer of the Original Code is
-   - Neil Rashbrook.
-   - Portions created by the Initial Developer are Copyright (C) 2003
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -    Neil Rashbrook <neil@parkwaycc.co.uk>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable