Sync from en-US with autotranslate
authorEduardo Trápani <eduardo@esperanto.org.uy>
Sat, 07 Jul 2012 15:06:52 -0300
changeset 354 d233c4c86b4df9cfc405dc702502663a04733570
parent 342 72d59b756c64e6f54b4c64b5376213b46b289429
child 355 def418e5542f4dcde7c728f04c74dcff169d1bbc
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:46:40 +0000
Sync from en-US with autotranslate
browser/chrome/browser-region/region.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/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/downloads/downloads.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/defines.inc
browser/feedback/main.dtd
browser/feedback/main.properties
browser/firefox-l10n.js
browser/installer/custom.properties
browser/installer/mui.properties
browser/installer/override.properties
browser/profile/chrome/userChrome-example.css
browser/profile/chrome/userContent-example.css
browser/updater/updater.ini
browser/webapprt/webapp.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
netwerk/necko.properties
security/manager/chrome/pipnss/nsserrors.properties
security/manager/chrome/pipnss/pipnss.properties
security/manager/chrome/pipnss/security.properties
security/manager/chrome/pippki/certManager.dtd
security/manager/chrome/pippki/deviceManager.dtd
security/manager/chrome/pippki/pippki.dtd
security/manager/chrome/pippki/pippki.properties
security/manager/chrome/pippki/validation.dtd
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.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.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/printPreviewProgress.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/extensions.properties
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
toolkit/crashreporter/crashes.dtd
toolkit/crashreporter/crashes.properties
toolkit/crashreporter/crashreporter.ini
toolkit/defines.inc
--- a/browser/chrome/browser-region/region.properties
+++ b/browser/chrome/browser-region/region.properties
@@ -1,13 +1,17 @@
+# 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/.
+
 # Default search engine
-browser.search.defaultenginename=Google
+browser.search.defaultenginename=Netvibes
 
 # Search engine order (order displayed in the search bar dropdown)s
-browser.search.order.1=Google
+browser.search.order.1=Netvibes
 browser.search.order.2=Yahoo
 browser.search.order.3=Bing
 
 # This is the default set of web based feed handlers shown in the reader
 # selection UI
 browser.contentHandlers.types.0.title=Netvibes
 browser.contentHandlers.types.0.uri=http://www.netvibes.com/subscribe.php?url=%s
 browser.contentHandlers.types.1.title=My Yahoo
--- 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,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/.  -->
 <!ENTITY aboutDialog.title          "Pri &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; estas prova version kaj povas esti nestabila.">
 <!-- 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      "Ĝi aŭtomate sendas informon pri efikeco, aparataro, uzado kaj personaj agordoj al &vendorShortName; por helpi plibonigi &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. -->
@@ -64,13 +67,15 @@
 <!-- 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   "Ĝisdatigo elŝutata — ">
 <!ENTITY update.downloading.end     "">
 
+<!ENTITY update.applying            "Applying update…">
+
 <!-- 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  "Vi nun estas en la ĝisdatiga kanalo ">
 <!ENTITY channel.description.end    ". ">
--- a/browser/chrome/browser/aboutHome.dtd
+++ b/browser/chrome/browser/aboutHome.dtd
@@ -1,10 +1,14 @@
+<!-- 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;
+%brandDTD;
 <!ENTITY % syncBrandDTD SYSTEM "chrome://browser/locale/syncBrand.dtd">
 %syncBrandDTD;
 
 <!-- These strings are used in the about:home page -->
 
 <!ENTITY abouthome.pageTitle "Eka paĝo de &brandFullName;">
 
 <!ENTITY abouthome.searchEngineButton.label "Serĉi">
--- a/browser/chrome/browser/aboutPrivateBrowsing.dtd
+++ b/browser/chrome/browser/aboutPrivateBrowsing.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 privatebrowsingpage.title                 "Privata retesplorado">
 <!ENTITY privatebrowsingpage.title.normal          "Ĉu vi ŝatus komenci la privatan retesploradon?">
 
 <!ENTITY privatebrowsingpage.issueDesc                 "&brandShortName; ne memoros la historion de tiu ĉi seanco.">
 <!ENTITY privatebrowsingpage.issueDesc.normal          "&brandShortName; ne troviĝas en la reĝimo de privata retesplorado.">
 
 <!ENTITY privatebrowsingpage.description               "En seanco de privata retesplorado, &brandShortName; ne konservos la historion de retesplorado, serĉado, elŝutado, retformularoj, nek la kuketojn aŭ tempajn interretaj dosieroj.  Tamen, elŝutitaj dosieroj kaj novaj legosignoj estos konservitaj.">
 
--- 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       "Restaŭri seancon">
 
 <!-- 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     "Nu, tio estas hontiga.">
 <!ENTITY restorepage.problemDesc    "&brandShortName; havas problemojn je la restaŭro de viaj fenestroj kaj folioj. Tion kaŭzas kutime antaŭ nelonge malfermita reta paĝo.">
 <!ENTITY restorepage.tryThis        "Vi povas klopodi:">
 <!ENTITY restorepage.restoreSome    "forigi unu aŭ plurajn foliojn kiujn vi suspektas ke kaŭzas la problemo">
--- 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               "Folioj el aliaj komputiloj">
 
 <!ENTITY tabs.searchText.label                   "Tajpu ĉi tie por serĉi foliojn…">
 
 <!-- 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                   "Malfermi tiun ĉi folion">
--- 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     "Plejetigi">
 <!ENTITY bringAllToFront.label    "Malfonigi ĉiujn">
 <!ENTITY zoomWindow.label         "Pligrandigilo">
 <!ENTITY windowMenu.label         "Fenestro">
 
 <!ENTITY helpMenu.label           "Helpo"> 
 <!ENTITY helpMenu.accesskey       "e"> 
--- 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 "a">
 
 <!ENTITY pageSourceCmd.label "Fonto de paĝo">
 <!ENTITY pageSourceCmd.accesskey "p">
 <!ENTITY pageSourceCmd.commandkey "u">
 <!ENTITY pageInfoCmd.label "Informo de paĝo">
 <!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 "Enter Full Screen">
+<!ENTITY enterFullScreenCmd.accesskey "F">
+<!ENTITY exitFullScreenCmd.label "Eliri el ekranplena reĝimo">
+<!ENTITY exitFullScreenCmd.accesskey "F">
 <!ENTITY fullScreenCmd.label "Plenekrane">
 <!ENTITY fullScreenCmd.accesskey "P">
 <!ENTITY fullScreenCmd.macCommandKey "f">
 <!ENTITY showAllTabsCmd.label "Montri ĉiujn foliojn">
 <!ENTITY showAllTabsCmd.accesskey "m">
 
 <!ENTITY fullScreenMinimize.tooltip "Malplejgrandigi">
 <!ENTITY fullScreenRestore.tooltip "Normala grando">
 <!ENTITY fullScreenClose.tooltip "Fermi">
 <!ENTITY fullScreenAutohide.label "Kaŝi ilarojn">
 <!ENTITY fullScreenAutohide.accesskey "K">
 <!ENTITY fullScreenExit.label "Eliri el plenekrana reĝimo">
 <!ENTITY fullScreenExit.accesskey "P">
-<!ENTITY domFullScreenWarning.label "Premu ESK por eliri el la plenekrana reĝimo">
+<!ENTITY fullscreenAllowButton.label "Permesi">
+<!ENTITY fullscreenExitButton.label "Rifuzi">
+<!ENTITY fullscreenApproval.value "Allow fullscreen?">
+
+<!ENTITY fullscreenExitHint.value "Press ESC at any time to exit fullscreen.">
+<!ENTITY leaveDOMFullScreen.label "Eliri el ekranplena reĝimo">
+<!ENTITY leaveDOMFullScreen.accesskey "u">
 
 <!ENTITY closeWindow.label "Fermi fenestron">
 <!ENTITY closeWindow.accesskey "e">
 
 <!ENTITY bookmarksMenu.label "Legosignoj">
 <!ENTITY bookmarksMenu.accesskey "L">
 <!ENTITY bookmarkThisPageCmd.label "Aldoni legosignon por tiu ĉi paĝo">
 <!ENTITY bookmarkThisPageCmd.commandkey "d">
@@ -193,16 +209,20 @@ can reach it easily. -->
 
 <!ENTITY inspectMenu.label            "Inspekti">
 <!ENTITY inspectMenu.accesskey        "T">
 <!ENTITY inspectMenu.commandkey       "I">
 
 <!ENTITY inspectContextMenu.label     "Inspekti elementon">
 <!ENTITY inspectContextMenu.accesskey "n">
 
+<!ENTITY responsiveDesignTool.label   "Responsive Design View">
+<!ENTITY responsiveDesignTool.accesskey "R">
+<!ENTITY responsiveDesignTool.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
@@ -210,25 +230,44 @@ can reach it easily. -->
   -  "simple discardable text editor". -->
 <!ENTITY scratchpad.label             "Malneta redaktilo">
 <!ENTITY scratchpad.accesskey         "r">
 <!ENTITY scratchpad.keycode           "VK_F4">
 <!ENTITY scratchpad.keytext           "F4">
 
 <!ENTITY inspectCloseButton.tooltiptext "Fermi inspektilon">
 
+<!ENTITY devToolbarCloseButton.tooltiptext "Close Developer Toolbar">
+<!ENTITY devToolbarMenu.label              "Developer Toolbar">
+<!ENTITY devToolbarMenu.accesskey          "v">
+<!ENTITY devToolbar.commandkey             "v">
+
+<!ENTITY webConsoleButton.label "TTTa konzolo">
+<!ENTITY inspectorButton.label "Inspector">
+<!ENTITY scriptsButton.label "Scripts">
+
 <!ENTITY inspectorHTMLCopyInner.label       "Kopii enan HTML">
 <!ENTITY inspectorHTMLCopyInner.accesskey   "e">
 
 <!ENTITY inspectorHTMLCopyOuter.label       "Kopii eksteran HTML">
 <!ENTITY inspectorHTMLCopyOuter.accesskey   "k">
 
 <!ENTITY inspectorHTMLDelete.label          "Forigi nodon">
 <!ENTITY inspectorHTMLDelete.accesskey      "F">
 
+<!-- LOCALIZATION NOTE (inspectOptionButton.*): The menu in the Inspector
+  -  toolbar.  -->
+<!ENTITY inspectOptionButton.tooltiptext    "Inspector Options">
+
+<!-- LOCALIZATION NOTE: These are for the menu in the Inspector Toolbar -->
+<!ENTITY inspectorToggleVeil.label          "Dim The Page">
+<!ENTITY inspectorToggleVeil.accesskey      "D">
+<!ENTITY inspectorToggleInfobar.label       "Show Node Info">
+<!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     "Vido 3D">
 <!ENTITY inspect3DViewButton.accesskey "V">
 
 <!ENTITY inspectStyleButton.label     "Stilo">
 <!ENTITY inspectStyleButton.accesskey "S">
@@ -275,17 +314,17 @@ can reach it easily. -->
 <!ENTITY preferencesCmd2.label       "Opcioj">
 <!ENTITY preferencesCmd2.accesskey     "O">
 <!ENTITY preferencesCmdUnix.label       "Preferoj">
 <!ENTITY preferencesCmdUnix.accesskey     "P"> 
 
 <!ENTITY clearRecentHistory.label               "Forigi ĵusan historion…">
 <!ENTITY clearRecentHistory.accesskey           "h">
 
-<!-- LOCALIZATION NOTE : These two strings can share an access key beause they never appear together on the menu -->
+<!-- LOCALIZATION NOTE : These two strings can share an access key because they never appear together on the menu -->
 <!ENTITY privateBrowsingCmd.start.label         "Komenci privatan retesploradon">
 <!ENTITY privateBrowsingCmd.start.accesskey     "K">
 <!ENTITY privateBrowsingCmd.stop.label          "Haltigi privatan retesploradon">
 <!ENTITY privateBrowsingCmd.stop.accesskey      "H">
 <!ENTITY privateBrowsingCmd.commandkey          "P">
 
 <!ENTITY viewMenu.label         "Vidi"> 
 <!ENTITY viewMenu.accesskey       "V"> 
@@ -437,32 +476,44 @@ can reach it easily. -->
 <!ENTITY copyAudioURLCmd.label        "Kopii adreson de sono">
 <!ENTITY copyAudioURLCmd.accesskey    "o">
 <!ENTITY copyEmailCmd.label           "Kopii retpoŝtan adreson">
 <!ENTITY copyEmailCmd.accesskey       "R">
 <!ENTITY thisFrameMenu.label              "Tiu ĉi kadro">
 <!ENTITY thisFrameMenu.accesskey          "i">
 
 <!-- Media (video/audio) controls -->
+<!-- LOCALIZATION NOTE: The access keys for "Play" and
+"Pause" are the same because the two context-menu
+items are mutually exclusive. -->
 <!ENTITY mediaPlay.label             "Ludi">
 <!ENTITY mediaPlay.accesskey         "P">
 <!ENTITY mediaPause.label            "Paŭzigi">
 <!ENTITY mediaPause.accesskey        "P">
+<!-- LOCALIZATION NOTE: The access keys for "Mute" and
+"Unmute" are the same because the two context-menu
+items are mutually exclusive. -->
 <!ENTITY mediaMute.label             "Silentigi">
 <!ENTITY mediaMute.accesskey         "M">
 <!ENTITY mediaUnmute.label           "Malsilentigi">
 <!ENTITY mediaUnmute.accesskey       "m">
+<!-- LOCALIZATION NOTE: The access keys for "Show Controls" and
+"Hide Controls" are the same because the two context-menu
+items are mutually exclusive. -->
 <!ENTITY mediaShowControls.label     "Montri regilojn">
 <!ENTITY mediaShowControls.accesskey "C">
 <!ENTITY mediaHideControls.label     "Kaŝi regilojn">
 <!ENTITY mediaHideControls.accesskey "C">
 <!ENTITY videoFullScreen.label       "Plenekrane">
 <!ENTITY videoFullScreen.accesskey   "F">
 <!ENTITY videoSaveImage.label        "Konservi filmetan bildon kiel…">
 <!ENTITY videoSaveImage.accesskey    "K">
+<!-- LOCALIZATION NOTE: The access keys for "Show Statistics" and
+"Hide Statistics" are the same because the two context-menu
+items are mutually exclusive. -->
 <!ENTITY videoShowStats.label        "Montri statistikojn">
 <!ENTITY videoShowStats.accesskey    "s">
 <!ENTITY videoHideStats.label        "Kaŝi statistikojn">
 <!ENTITY videoHideStats.accesskey    "s">
 
 <!-- LOCALIZATION NOTE :
 fullZoomEnlargeCmd.commandkey3, fullZoomReduceCmd.commandkey2 and
 fullZoomResetCmd.commandkey2 are alternative acceleration keys for zoom.
--- 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=Tempo elĉerpita
 openFile=Malfermi dosieron
 
 droponhometitle=Difini la ekan paĝon
 droponhomemsg=Ĉu vi volas ke tiu ĉi dokumento iĝu via komenca paĝo?
 
 # context menu strings
 
@@ -145,18 +149,18 @@ sanitizeSelectedWarning=Ĉiuj elektitaj elementoj estos forviŝitaj.
 # directly under the Firefox version in the about dialog (see bug 596813 for
 # screenshots).
 update.checkInsideButton.label=Kontroli ĉu estas ĝisdatigoj
 update.checkInsideButton.accesskey=C
 update.resumeButton.label=Repreni elŝutadon de %S…
 update.resumeButton.accesskey=D
 update.openUpdateUI.applyButton.label=Apliki ĝisdatigon…
 update.openUpdateUI.applyButton.accesskey=A
-update.restart.applyButton.label=Apliki ĝisdatigon
-update.restart.applyButton.accesskey=A
+update.restart.updateButton.label=Restart to Update
+update.restart.updateButton.accesskey=R
 update.openUpdateUI.upgradeButton.label=Ĝisdatigi nun…
 update.openUpdateUI.upgradeButton.accesskey=U
 update.restart.upgradeButton.label=Ĝisdatigi nun
 update.restart.upgradeButton.accesskey=U
 
 # RSS Pretty Print
 feedShowFeedNew=Aboni '%S'…
 
@@ -246,27 +250,26 @@ pu.notifyButton.label=Detaloj…
 pu.notifyButton.accesskey=D
 # LOCALIZATION NOTE %S will be replaced by the short name of the application.
 puNotifyText=%S estis ĝisdatigita
 puAlertTitle=%S ĝisdatigita
 puAlertText=Alklaku ĉi tie por vidi detalojn
 
 # Geolocation UI
 
-# LOCALIZATION NOTE (geolocation.shareLocation geolocation.dontShareLocation geolocation.alwaysShare geolocation.neverShare): 
+# LOCALIZATION NOTE (geolocation.shareLocation geolocation.alwaysShareLocation geolocation.neverShareLocation):
 #If you're having trouble with the word Share, please use Allow and Block in your language.
 geolocation.shareLocation=Diskonigi lokon
 geolocation.shareLocation.accesskey=D
-geolocation.neverShareLocation=Neniam diskonigi lokon
-geolocation.neverShareLocation.accesskey=o
 geolocation.alwaysShareLocation=Ĉiam diskonigi lokon
 geolocation.alwaysShareLocation.accesskey=A
+geolocation.neverShareLocation=Neniam diskonigi lokon
+geolocation.neverShareLocation.accesskey=o
 geolocation.shareWithSite=Ĉu vi ŝatus diskonigi vian lokon al %S?
 geolocation.shareWithFile=Ĉu vi ŝatus diskonigi vian lokon al la dosiero %S?
-
 # LOCALIZATION NOTE (geolocation.learnMore): Use the unicode ellipsis char, \u2026,
 # or use "..." if \u2026 doesn't suit traditions in your locale.
 geolocation.learnMore=Plia informo…
 
 # Phishing/Malware Notification Bar.
 # LOCALIZATION NOTE (notAForgery, notAnAttack)
 # The two button strings will never be shown at the same time, so
 # it's okay for them to have the same access key
@@ -297,17 +300,23 @@ privateBrowsingNeverAsk=&Ne montri tiun ĉi mesaĝon denove
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 ctrlTab.showAll.label=;Montri ĉiujn #1 foliojn
 
 # 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=Serĉi %S
 
 # TabView
-tabView2.title=%S - Grupigi viajn foliojn
+# LOCALIZATION NOTE (tabview.title): %S is the application name.
+tabview.title=%S - Grupigi viajn foliojn
+# LOCALIZATION NOTE (tabview.moveToUnnamedGroup.label): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the page title of the first tab in the unnamed group, 
+# #2 is the number of remaining tabs.
+tabview.moveToUnnamedGroup.label=#1 and 1 more;#1 and #2 more
 
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name=Ĉefa
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description=La ĉefa etoso.
 
 # safeModeRestart
 safeModeRestartPromptTitle=Restartigi kun aldonaĵoj malaktivigitaj
 safeModeRestartPromptMessage=Ĉu vi certas ke vi volas malaktivigi ĉiujn aldonaĵojn kaj restartigi?
 safeModeRestartButton=Restartigi
@@ -315,31 +324,32 @@ safeModeRestartButton=Restartigi
 # LOCALIZATION NOTE (browser.menu.showCharacterEncoding): Set to the string
 # "true" (spelled and capitalized exactly that way) to show the "Character
 # Encoding" menu in the main Firefox button on Windows. Any other value will
 # hide it. Regardless of the value of this setting, the "Character Encoding"
 # menu will always be accessible via the "Web Developer" menu.
 # This is not a string to translate; it just controls whether the menu shows
 # up in the Firefox button. If users frequently use the "Character Encoding"
 # menu, set this to "true". Otherwise, you can leave it as "false".
-browser.menu.showCharacterEncoding=false
+browser.menu.showCharacterEncoding=malvera
 
 # LOCALIZATION NOTE (syncPromoNotification.bookmarks.label): This appears in
 # the add bookmark star panel.  %S will be replaced by syncBrandShortName.
 # The final space separates this text from the Learn More link.
 syncPromoNotification.bookmarks.description=Vi povas aliri viajn legosignojn en ĉiuj viaj aparatoj per %S.\u0020
 # LOCALIZATION NOTE (syncPromoNotification.passwords.label): This appears in
 # the remember password panel.  %S will be replaced by syncBrandShortName.
 # The final space separates this text from the Learn More link.
 syncPromoNotification.passwords.description=Vi povas aliri viajn pasvortojn en ĉiuj viaj aparatoj per %S.\u0020
 syncPromoNotification.learnMoreLinkText=Pli da informo
 
 # Telemetry prompt
-# LOCALIZATION NOTE (telemetryOptInPrompt): %1$S will be replaced by brandFullName,
-# and %2$S by the value of the toolkit.telemetry.server_owner preference.
+# LOCALIZATION NOTE (telemetryOptInPrompt): %1$S will be replaced by
+# brandFullName, and %2$S by the value of the toolkit.telemetry.server_owner
+# preference.
 telemetryOptInPrompt = Ĉu vi helpos plibonigi %1$S per sendado de informoj pri efikeco, aparataro, uzado kaj personaj agordoj al %2$S?
 telemetryLinkLabel = Pli da informo
 telemetryYesButtonLabel2 = Jes, mi volas helpi
 telemetryYesButtonAccessKey = J
 telemetryNoButtonLabel = Ne
 telemetryNoButtonAccessKey = N
 
 # Webapps notification popup
@@ -347,8 +357,13 @@ webapps.install = Instali
 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 = Ĉu vi volas instali "%1$S" el tiu ĉi retejo (%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 sendas informon pri efikeco, aparataro, uzado kaj personaj agordoj al %2$S por helpi plibonigi %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 is now fullscreen.
+# 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=Remember decision for %S
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -1,45 +1,70 @@
-<!-- LOCALIZATION NOTE : FILE This file contains the Script Debugger strings -->
+<!-- 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 Debugger strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkey -->
 
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
+
 <!-- LOCALIZATION NOTE (debuggerMenu.label): This is the label for the
   -  application menu item that opens the debugger UI. -->
-<!ENTITY debuggerMenu.label          "Script Debugger">
+<!ENTITY debuggerMenu.label2          "Debugger">
+
+<!-- LOCALIZATION NOTE (remoteDebuggerMenu.label): This is the label for the
+  -  application menu item that opens the remote debugger UI. -->
+<!ENTITY remoteDebuggerMenu.label    "Remote Debugger">
+
+<!-- LOCALIZATION NOTE (chromeDebuggerMenu.label): This is the label for the
+  -  application menu item that opens the browser debugger UI. -->
+<!ENTITY chromeDebuggerMenu.label    "Browser Debugger">
 
 <!-- LOCALIZATION NOTE (debuggerMenu.commandkey): This is the command key that
   -  launches the debugger UI. Do not translate this one! -->
 <!ENTITY debuggerMenu.commandkey     "S">
 
-<!-- LOCALIZATION NOTE (debuggerUI.closeButton): This is the label for the
-  -  button that closes the debugger UI. -->
-<!ENTITY debuggerUI.closeButton      "Close">
+<!-- LOCALIZATION NOTE (debuggerUI.closeButton.tooltip): This is the tooltip for
+  -  the button that closes the debugger UI. -->
+<!ENTITY debuggerUI.closeButton.tooltip        "Fermi">
 
-<!-- LOCALIZATION NOTE (debuggerUI.stepOverButton): This is the label for the
-  -  button that steps over a function call. -->
-<!ENTITY debuggerUI.stepOverButton   "Preterpaŝi">
+<!-- LOCALIZATION NOTE (debuggerUI.pauseExceptions): This is the label for the
+  -  checkbox that toggles pausing on exceptions. -->
+<!ENTITY debuggerUI.pauseExceptions          "Pause on exceptions">
 
-<!-- LOCALIZATION NOTE (debuggerUI.stepInButton): This is the label for the
-  -  button that steps into a function call. -->
-<!ENTITY debuggerUI.stepInButton     "Enpaŝi">
+<!-- LOCALIZATION NOTE (debuggerUI.stepOverButton.tooltip): This is the tooltip for
+  -  the button that steps over a function call. -->
+<!ENTITY debuggerUI.stepOverButton.tooltip   "Preterpaŝi">
 
-<!-- LOCALIZATION NOTE (debuggerUI.stepOutButton): 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.tooltip     "Enpaŝi">
+
+<!-- LOCALIZATION NOTE (debuggerUI.stepOutButton): This is the tooltip for the
   -  button that steps out of a function call. -->
-<!ENTITY debuggerUI.stepOutButton    "Elpaŝi">
+<!ENTITY debuggerUI.stepOutButton.tooltip    "Elpaŝi">
 
 <!-- LOCALIZATION NOTE (debuggerUI.stackTitle): This is the label for the
   -  widget that displays the call stack frames in the debugger. -->
 <!ENTITY debuggerUI.stackTitle       "Call stack">
 
 <!-- LOCALIZATION NOTE (debuggerUI.scriptTitle): This is the label for the
   -  widget that displays the source code for the script that is currently
   -  being inspected in the debugger. -->
 <!ENTITY debuggerUI.scriptTitle      "Script">
 
 <!-- LOCALIZATION NOTE (debuggerUI.propertiesTitle): This is the label for the
   -  widget that displays the variables in the various available scopes in the
   -  debugger. -->
 <!ENTITY debuggerUI.propertiesTitle  "Scope variables">
+
+<!-- LOCALIZATION NOTE (debuggerUI.emptyFilterText): This is the text that
+  -  appears in the filter text box when it is empty. -->
+<!ENTITY debuggerUI.emptyFilterText  "Filter scripts">
+
+<!-- LOCALIZATION NOTE (emptyScriptText): The text to display in the menulist when
+  - there are no scripts. -->
+<!ENTITY debuggerUI.emptyScriptText  "No scripts.">
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -1,53 +1,94 @@
-# LOCALIZATION NOTE These strings are used inside the Script Debugger
-# which is available from the Web Developer sub-menu -> 'Script Debugger'.
+# 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 Debugger
+# which is available from the Web Developer sub-menu -> '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=Debugger is already open in another tab. Continuing will close the other instance.
+confirmTabSwitch.buttonSwitch=Switch to debugged tab
+confirmTabSwitch.buttonSwitch.accessKey=S
+confirmTabSwitch.buttonOpen=Open anyway
+confirmTabSwitch.buttonOpen.accessKey=O
+
+# LOCALIZATION NOTE (remoteDebuggerWindowTitle): The title displayed for the
+# remote debugger window.
+remoteDebuggerWindowTitle=Remote Debugger
+
+# LOCALIZATION NOTE (remoteDebuggerPromptTitle): The title displayed on the
+# debugger prompt asking for the remote host and port to connect to.
+remoteDebuggerPromptTitle=Remote Connection
+
+# LOCALIZATION NOTE (remoteDebuggerPromptMessage): The message displayed on the
+# debugger prompt asking for the remote host and port to connect to.
+remoteDebuggerPromptMessage=Enter hostname and port number (host:port)
+
+# LOCALIZATION NOTE (remoteDebuggerPromptCheck): The message displayed on the
+# debugger prompt asking if the prompt should be shown again next time.
+remoteDebuggerPromptCheck=Don't ask me again
+
+# LOCALIZATION NOTE (remoteDebuggerReconnectMessage): The message displayed on the
+# debugger prompt asking for the remote host and port to connect to.
+remoteDebuggerReconnectMessage=Server not found. Try again? (host:port)
+
+# LOCALIZATION NOTE (remoteDebuggerReconnectMessage): The message displayed on the
+# debugger prompt asking for the remote host and port to connect to.
+remoteDebuggerConnectionFailedMessage=Could not find a server at the specified hostname and port number.
+
 # LOCALIZATION NOTE (pauseLabel): The label that is displayed on the pause
 # button when the debugger is in a running state.
-pauseLabel=Pause
+pauseTooltip=Click to pause
+
 # LOCALIZATION NOTE (resumeLabel): The label that is displayed on the pause
 # button when the debugger is in a paused state.
-resumeLabel=Resume
-
-# LOCALIZATION NOTE (pausedState): The label that is displayed when the
-# debugger is in a paused state.
-pausedState=Paused
-
-# LOCALIZATION NOTE (runningState): The label that is displayed when the
-# debugger is in a running state.
-runningState=Running
-
-# LOCALIZATION NOTE (localScope): The label that is displayed in the variables
-# pane as a header on the local scope container.
-localScope=Local
+resumeTooltip=Click to resume
 
-# 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=With block
-
-# 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=Empty
+# LOCALIZATION NOTE (emptyStackText): The text that is displayed in the stack
+# frames list when there are no frames to display.
+emptyStackText=No stacks to display.
 
 # 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=Loading\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 loading %1$S: %2$S
+
+# LOCALIZATION NOTE (remoteIncomingPromptTitle): The title displayed on the
+# dialog that prompts the user to allow the incoming connection.
+remoteIncomingPromptTitle=Incoming Connection
+
+# LOCALIZATION NOTE (remoteIncomingPromptMessage): The message displayed on the
+# dialog that prompts the user to allow the incoming connection.
+remoteIncomingPromptMessage=An incoming request to permit remote debugging connection was detected. A remote client can take complete control over your browser! Allow connection?
+
+# 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=Malaktivigi
+
+# LOCALIZATION NOTE (emptyVariablesText): The text that is displayed in the
+# variables pane when there are no variables to display.
+emptyVariablesText=No variables to display.
+
+# 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=%S scope
+
+# 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.
@@ -100,25 +104,26 @@ nodeParseNone=Nenio kongruas
 # fuller description of what it does.
 helpDesc=Ricevi helpon pri disponeblaj ordonoj
 
 # LOCALIZATION NOTE (helpManual): A fuller description of the 'help' command.
 # Displayed when the user asks for help on what it does.
 helpManual=Provizi helpo pri specifa ordono (se oni provizas tekston por serĉi kaj ekzakta kongruo estas trovita) aŭ pri la disponeblaj ordonoj (se oni ne provizas tekston por serĉi aŭ se ekzakta kongruo ne estas trovita).
 
 # 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=Serĉi tekston
 
-# 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=La teksto estas uzata por redukti la liston de ordonoj montrataj al la uzanto.  Iu parto de la teksto povas kongrui.  Regulaj esprimoj ne estas subtenataj.
+# what it does. Inline HTML (e.g. <strong>) can be used to emphasize the core
+# concept.
+helpSearchManual2=<strong>search string</strong> to use in narrowing down the displayed commands. Regular expressions not supported.
 
 # 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=Resumo
 
 # 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,207 @@ helpManDescription=Priskribo
 # LOCALIZATION NOTE (helpManParameters): A heading shown above the parameters
 # in a help page for a command in the console.
 helpManParameters=Parametro
 
 # LOCALIZATION NOTE (helpManNone): Some text shown under the parameters
 # heading in a help page for a command which has no parameters.
 helpManNone=Neniu
 
-# LOCALIZATION NOTE (introHeader): The heading displayed at the top of the
-# output for the help command
-introHeader=Bonvenon al la iloj de Firefox por disvolvantoj
+# 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=Sub-Commands
+
+# 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=Neniu
+
+# 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=Commands to control settings
+
+# 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=Display available settings
+
+# LOCALIZATION NOTE (prefListManual): A fuller description of the 'pref list'
+# command. Displayed when the user asks for help on what it does.
+prefListManual=Display a list of preferences, optionally filtered when using the 'search' parameter
+
+# 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=Filter the list of settings displayed
+
+# 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=Search for the given string in the list of available preferences
+
+# 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=Display setting value
+
+# LOCALIZATION NOTE (prefShowManual): A fuller description of the 'pref show'
+# command. Displayed when the user asks for help on what it does.
+prefShowManual=Display the value of a given preference
+
+# 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=Setting to display
+
+# 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=The name of the setting to display
+
+# 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=Alter a setting
+
+# LOCALIZATION NOTE (prefSetManual): A fuller description of the 'pref set'
+# command. Displayed when the user asks for help on what it does.
+prefSetManual=Alter preferences defined by the environment
+
+# 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=Setting to alter
+
+# 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=The name of the setting to alter.
+
+# 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=New value for setting
+
+# 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=The new value for the specified setting
+
+# 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=Tio povas nuligi vian garantion!
+
+# 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=Ŝanĝado de tiuj spertaj agordoj povas efiki malbone sur la stabileco, sekureco kaj efikeco de tiu ĉi programo. Vi devus daŭrigi nur se vi estas certa ke vi scias kion vi faras.
+
+# LOCALIZATION NOTE (prefSetCheckGo): The text to enable preference editing.
+# Displayed in a button directly under prefSetCheckHeading and
+# prefSetCheckBody
+prefSetCheckGo=Mi estos singarda, mi promesas!
+
+# 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=Reset a setting
+
+# LOCALIZATION NOTE (prefResetManual): A fuller description of the 'pref
+# reset' command. Displayed when the user asks for help on what it does.
+prefResetManual=Reset the value of a setting to the system defaults
+
+# 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=Setting to reset
+
+# 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=The name of the setting to reset to the system default value
+
+# 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=Filtri
+
+# 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=Nomo
+
+# 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=Valoro
+
+# 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=Show the opening message
+
+# LOCALIZATION NOTE (introManual): A fuller description of the 'intro'
+# command. Displayed when the user asks for help on what it does.
+introManual=Redisplay the message that is shown to new users until they click the 'Got it!' button
+
+# 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=The Firefox command line is designed for developers. It focuses on speed of input over JavaScript syntax and a rich display over monospace output.
+
+# 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=For a list of commands type
+
+# 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=or to show/hide command hints press
+
+# 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=Got it!
+
+# LOCALIZATION NOTE (hideIntroDesc): Short description of the 'hideIntro'
+# setting. Displayed when the user asks for help on the settings.
+hideIntroDesc=Show the initial welcome message
+
+# 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=Has the user enabled the 'pref set' command?
 
 # 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=Por pli da informo vidu 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=Ordonoj por kontroli la konz
 # LOCALIZATION NOTE (consoleManual) A longer description describing the
 # set of commands that control the console.
 consoleManual=Filtri, viŝi kaj fermi la konzolon de TTT
 
 # LOCALIZATION NOTE (consoleclearDesc) A very short string used to describe the
 # function of the 'console clear' command.
 consoleclearDesc=Viŝi la konzolon
 
+# 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=Save an image of the page
+
+# LOCALIZATION NOTE (screenshotManual) A fuller description of the 'screenshot'
+# command, displayed when the user asks for help on what it does.
+screenshotManual=Save an PNG image of the entire visible window (optionally after a delay)
+
+# 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=Destination filename
+
+# 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=The name of the file (should have a '.png' extension) to which we write the screenshot.
+
+# 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=Delay (seconds)
+
+# 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=The time to wait (in seconds) before the screenshot is taken
+
+# 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=Entire webpage? (true/false)
+
+# 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=True if the screenshot should also include parts of the webpage which are outside the current scrolled bounds.
+
 # 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=Inspekti nodon
 
 # 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=Fermi konzolon
 
+# 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=Open the console
+
 # 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,22 +19,26 @@ confirmNavigationAway.buttonLeave=Forlasi paĝon
 confirmNavigationAway.buttonLeaveAccesskey=F
 confirmNavigationAway.buttonStay=Resti en la paĝo
 confirmNavigationAway.buttonStayAccesskey=R
 
 breadcrumbs.siblings=Gefratoj
 # 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. Pressing the
-# "Return" key # changes that state. %S is the keyboard shortcut (VK_RETURN in
-# chrome://global/locale/keys.properties).
-inspectButton.tooltiptext=Elekti elementon per muso (%S)
+# if it's pressed users can select an element with the mouse.
+# %S is the keyboard shortcut.
+inspectButtonWithShortcutKey.tooltip=Elekti elementon per muso (%S)
+
+# LOCALIZATION NOTE (inspectButton.tooltip):
+# Same as inspectButtonWithShortcutKey.tooltip but used when an add-on
+# overrides the shortcut key.
+inspectButton.tooltip=Select element with 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=Panelo de marklingvo
--- 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      "Gradeco de 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        "marĝenoj">
 <!ENTITY borders.tooltip        "randoj">
 <!ENTITY padding.tooltip        "ŝtopado">
 <!ENTITY content.tooltip        "enhavo">
--- 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.
@@ -49,11 +53,12 @@ confirmClose.title=Nekonservitaj ŝanĝoj
 # LOCALIZATION NOTE  (scratchpadIntro): This is a multi-line comment explaining
 # how to use the Scratchpad. Note that this should be a valid JavaScript
 # comment inside /* and */.
 scratchpadIntro=/*\n * Tio ĉi estas malneta redaktilo por JavaScript.n *n * Tajpu ion en JavaScript, poste alklaku per la alia butono aŭ elektu el la menuo Ruli:n * 1. Ruli por taksi la elektitan tekston,n * 2. Inspekti por malfonigi inspektilon de objekto sur la rezulto, aŭ,n * 3. Montri por enmeti la rezulton en komenton post la elektita teksto.n */\n\n
 
 # LOCALIZATION NOTE  (notification.browserContext): This is the message displayed
 # over the top of the editor when the user has switched to browser context.
 browserContext.notification=Tiu ĉi malneta redaktilo rulas en la kunteksto de retesplorilo.
+
 # LOCALIZATION NOTE (help.openDocumentationPage): This returns a localized link with
 # documentation for Scratchpad on MDN.
 help.openDocumentationPage=https://developer.mozilla.org/en/Tools/Scratchpad
--- 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. -->
 
--- 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,18 @@
+<!-- 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. -->
+
 <!-- 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    "Nur stiloj de uzanto">
 
 <!-- LOCALIZATION NOTE (userStylesSearch): This is the placeholder that goes in
   -  the search box when no search term has been entered. -->
 <!ENTITY userStylesSearch      "Serĉi">
--- 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.
 
@@ -28,17 +32,17 @@ rule.sourceElement=elemento
 
 # LOCALIZATION NOTE (rule.inheritedSource): Shown for CSS rules
 # that were inherited from a parent node.  Will be passed a node
 # identifier and a source location.
 # e.g "Inherited from body#bodyID (styles.css:20)"
 rule.inheritedSource=Heredita el %S (%S)
 
 # LOCALIZATION NOTE (style.highlighter.button): These strings are used inside
-# sidebar of the Highlighter for the style inspector button
+# sidebar of the Highlighter for the style inspector button.
 # "Computed" refers to the Computed Style of the element.
 style.highlighter.button.label2=Komputitaj
 style.highlighter.accesskey2=K
 style.highlighter.button.tooltip2=Inspekti komputitajn stilojn de elemento
 
 # LOCALIZATION NOTE (helpLinkTitle): For each style property
 # the user can hover it and get a help link button which allows one to
 # quickly jump to the documentation from the Mozilla Developer Network site.
--- 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,8 +1,18 @@
+<!-- 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                  "Peta URL">
 <!ENTITY networkPanel.requestMethod               "Peta metodo">
 <!ENTITY networkPanel.statusCode                  "Stata kodo">
 
 <!ENTITY networkPanel.requestHeaders              "Petaj mesaĝkapoj">
 <!ENTITY networkPanel.requestCookie               "Sendita kuketo">
 <!ENTITY networkPanel.requestBody                 "Peta korpo">
 <!ENTITY networkPanel.requestFormData             "Senditaj formularaj datumoj">
--- 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=Eraro: 
@@ -35,17 +39,17 @@ btnPageLogging=Registrado
 #
 # This is used as the text of the tool tip for the "Logging" button on
 # the toolbar.
 tipPageLogging=Registri mesaĝojn senditajn al la objekto "konzolo"
 btnConsoleErrors=Eraroj
 tipConsoleErrors=Registri vokojn al console.error()
 btnConsoleInfo=Informo
 tipConsoleInfo=Registri vokojn al console.info()
-btnConsoleWarnings=Warnings
+btnConsoleWarnings=Avertoj
 tipConsoleWarnings=Log calls to console.warn()
 btnConsoleLog=Registro
 tipConsoleLog=Registri vokojn al console.log()
 btnGlobal=Mallokaj mesaĝoj
 tipGlobal=Ŝalti/malŝalti registradoj de mallokaj mesaĝoj
 localConsole=Loka konzolo
 clearConsoleCmd.label=Viŝi konzolon
 clearConsoleCmd.accesskey=e
@@ -182,8 +186,14 @@ timerStarted=%S: tempomezurilo startita
 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=  <- sen rezulto
 
 maxTimersExceeded=La maksimuma permesata nombro de tempomezuriloj estis superita en tiu ĉi paĝo.
+
+# 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=After your input has been re-evaluated the result is no longer inspectable.
--- a/browser/chrome/browser/downloads/downloads.properties
+++ b/browser/chrome/browser/downloads/downloads.properties
@@ -35,17 +35,17 @@ stateBlockedParentalControls=Blokita de 
 # http://support.microsoft.com/kb/174360
 stateBlockedPolicy=Blokita de via politiko pri sekura regiono
 # LOCALIZATION NOTE (stateDirty):
 # Indicates that the download was blocked after scanning.
 stateDirty=Blokita: ĝi povas enhavi viruson aŭ spionprogramon
 
 # LOCALIZATION NOTE (sizeWithUnits):
 # %1$S is replaced with the size number, and %2$S with the measurement unit.
-sizeWithUnits=%1$S %2$S
+sizeWithUnits=%2$S de %1$S
 sizeUnknown=Nekonata grandeco
 
 # LOCALIZATION NOTE (shortTimeLeftSeconds, shortTimeLeftMinutes,
 # shortTimeLeftHours, shortTimeLeftDays):
 # These values are displayed in the downloads indicator in the main browser
 # window, where space is available for three characters maximum.  %1$S is
 # replaced with the time left for the given measurement unit.  Even for days,
 # the value is never longer than two digits.
--- 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       "Administri serĉilaron">
 <!ENTITY  engineManager.style       "min-width: 35em;">
 <!ENTITY  engineManager.intro       "Vi havas la jenajn serĉilojn instalitaj:">
 
 <!ENTITY  columnLabel.name          "Nomo">
 <!ENTITY  columnLabel.keyword       "Kategoria vorto">
 
 <!-- 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=Redakti kategorian vorton
 editMsg=Tajpu novan kategorian vorton por "%S":
 duplicateTitle=Duobligita kategoria vorto
 duplicateEngineMsg=Vi elektis kategorian vorton kiu estas nuntempe uzata de "%S". Bonvolu elekti alian.
 duplicateBookmarkMsg=Vi elektis kategorian vorton kiu estas nuntempe uzata de legosigno. Bonvolu elekti alian.
--- 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
   "Montrado de informfonto">
 <!ENTITY feedSubscribeNow
   "Aboni nun">
 <!ENTITY feedLiveBookmarks
   "Aktivaj legosignoj">
--- a/browser/chrome/browser/feeds/subscribe.properties
+++ b/browser/chrome/browser/feeds/subscribe.properties
@@ -1,25 +1,29 @@
+# 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=Iri al %S
 addHandler=Ĉu aldoni "%S" (%S) kiel novaĵfontan legilon?
 addHandlerAddButton=Aldoni legilon de novaĵfonto
 addHandlerAddButtonAccesskey=A
 handlerRegistered="%S" jam estas registrita kiel informfontan legilon
 liveBookmarks=Aktivaj legosignoj
 subscribeNow=Aboni nun
 chooseApplicationMenuItem=Elekti programon…
 chooseApplicationDialogTitle=Elekti programon
 alwaysUse=Ĉiam aboni informfontojn per %S
 mediaLabel=Aŭdvidaj dosieroj
 
 # LOCALIZATION NOTE: The next string is for the size of the enclosed media.
 #   e.g. enclosureSizeText : "50.23 MB"
 #   %1$S = size (in bytes or megabytes, ...)
 #   %2$S = unit of measure (bytes, KB, MB, ...)
-enclosureSizeText=%1$S %2$S
+enclosureSizeText=%2$S de %1$S
 
 bytes=oktetoj
 kilobyte=KO
 megabyte=MO
 gigabyte=GO
 
 # LOCALIZATION NOTE: The next three strings explains to the user what they're 
 # doing.
--- 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          "Asistanto de importado">
 
 <!ENTITY importFrom.label               "Importi opciojn, legosignojn, historion, pasvortojn kaj aliajn datumojn el:">
 <!ENTITY importFromUnix.label           "Importi preferojn, legosignojn, historion, pasvortojn kaj aliajn datumojn el:">
 <!ENTITY importFromBookmarks.label      "Importi legosignojn el:">
 
 <!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=Konservita historio de formula
 16_ie=Konservitaj pasvortoj
 16_safari=Konservitaj pasvortoj
 16_chrome=Konservitaj pasvortoj
 16_firefox=Konservitaj pasvortoj
 
 32_ie=Plej ŝatataj
 32_safari=Legosignoj
 32_chrome=Legosignoj
-32_firefox=Legosignoj
 
 64_ie=Aliaj datumoj
 64_safari=Aliaj datumoj
 64_chrome=Aliaj datumoj
 64_firefox=Sekurkopio de legosignoj
--- a/browser/chrome/browser/newTab.dtd
+++ b/browser/chrome/browser/newTab.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/. -->
+
 <!-- These strings are used in the about:newtab page -->
 <!ENTITY newtab.pageTitle "Nova folio">
--- a/browser/chrome/browser/newTab.properties
+++ b/browser/chrome/browser/newTab.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/.
+
 newtab.pin=Alpingli tiun ĉi retejon al ĝia nuna loko
 newtab.unpin=Depingli tiun ĉi retejon
 newtab.block=Forigi tiun ĉi retejon
 newtab.show=Montri la paĝon de nova folio
 newtab.hide=Kaŝi la paĝon de nova folio
\ No newline at end of file
--- 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 "Tajpu la TTT-an adreson (URL), aŭ elektu la dosieron kiun vi ŝatus vidi">  
 <!ENTITY chooseFile.label "Elekti dosieron…">
 <!ENTITY newTab.label "Nova folio">
 <!ENTITY newWindow.label "Nova fenestro">
 <!ENTITY topTab.label "Nuna folio">
 <!ENTITY caption.label "Vidi paĝon...">
--- a/browser/chrome/browser/openLocation.properties
+++ b/browser/chrome/browser/openLocation.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/.
+
 chooseFileDialogTitle=Elekti dosieron
--- a/browser/chrome/browser/pageInfo.dtd
+++ b/browser/chrome/browser/pageInfo.dtd
@@ -1,45 +1,12 @@
 <!--
-# ***** 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              "K">
 <!ENTITY  copy.label            "Kopii">
 <!ENTITY  copy.accesskey        "K">
@@ -94,16 +61,17 @@
 <!ENTITY  permBlock             "Bloki">
 <!ENTITY  permissionsFor        "Permesoj por:">
 <!ENTITY  permImage             "Ŝargi bildojn">
 <!ENTITY  permPopup             "Malfermi ŝprucfenestrojn">
 <!ENTITY  permCookie            "Difini kuketojn">
 <!ENTITY  permInstall           "Instali etendoprogramojn aŭ temojn">
 <!ENTITY  permGeo               "Diskonigi lokon">
 <!ENTITY  permPlugins           "Aktivigi komprogramojn">
+<!ENTITY  permFullscreen        "Enter Fullscreen">
 
 <!ENTITY  permIndexedDB              "Konservi memoro por malkonektitaĵoj">
 <!ENTITY  permClearStorage           "Malplenigi memoron">
 <!ENTITY  permClearStorage.accesskey "M">
 
 <!ENTITY  securityTab           "Sekureco">
 <!ENTITY  securityTab.accesskey "S">
 <!ENTITY  securityHeader        "Sekureca informo de tiu ĉi paĝo">
--- 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=Informo de paĝo - %S
 pageInfo.frame.title=Informo de kadro - %S
 
 noPageTitle=Paĝo sen titolo
 pageTitle=%S:
 unknown=Nekonata
 notset=Ne difinita
--- 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=Aldoni
 dialogAcceptLabelSaveItem=Konservi
 dialogAcceptLabelAddLivemark=Aboni
 dialogAcceptLabelAddMulti=Aldoni legosignojn
 dialogAcceptLabelEdit=Konservi
 dialogTitleAddBookmark=Nova legosigno
 dialogTitleAddLivemark=Aboni per aktiva legosigno
 dialogTitleAddFolder=Nova dosierujo
--- 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                      "Nomo:">
 <!ENTITY editBookmarkOverlay.name.accesskey                  "N">
 <!ENTITY editBookmarkOverlay.location.label                  "Retadreso:">
 <!ENTITY editBookmarkOverlay.location.accesskey              "R">
 <!ENTITY editBookmarkOverlay.feedLocation.label              "Retadreso de informfonto:">
 <!ENTITY editBookmarkOverlay.feedLocation.accesskey          "R">
 <!ENTITY editBookmarkOverlay.siteLocation.label              "Retadreso de retejo:">
 <!ENTITY editBookmarkOverlay.siteLocation.accesskey          "R">
--- 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              "Elekti dosierujon">
 <!ENTITY window.style              "width: 36em; height: 18em;">
 <!ENTITY moveTo.label              "Movi al:">
 <!ENTITY newFolderButton.label     "Nova dosierujo">
 <!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  "Biblioteko">
 <!ENTITY places.library.width  "700">
 <!ENTITY places.library.height "500">
 <!ENTITY organize.label        "Organizi">
 <!ENTITY organize.accesskey    "O">
 <!ENTITY organize.tooltip      "Organizi viajn legosignojn">
 
@@ -18,21 +22,16 @@
 <!ENTITY view.sort.accesskey            "R">
 <!ENTITY view.unsorted.label            "Ne ordigite">
 <!ENTITY view.unsorted.accesskey        "N">
 <!ENTITY view.sortAscending.label       "Ordigado laŭ A > Z">
 <!ENTITY view.sortAscending.accesskey   "A">
 <!ENTITY view.sortDescending.label      "Ordigado laŭ Z > A">
 <!ENTITY view.sortDescending.accesskey  "Z">
 
-<!ENTITY cmd.findInBookmarks.label      "Serĉi en legosignoj…">
-<!ENTITY cmd.findInBookmarks.accesskey  "S">
-<!ENTITY cmd.findCurrent.label          "Serĉi en la nuna kolekto…">
-<!ENTITY cmd.findCurrent.accesskey      "e">
-
 <!ENTITY importBookmarksFromHTML.label     "Importi legosignojn el HTML…">
 <!ENTITY importBookmarksFromHTML.accesskey "I">
 <!ENTITY exportBookmarksToHTML.label       "Eksporti legosignojn al HTML…">
 <!ENTITY exportBookmarksToHTML.accesskey   "E">
 <!ENTITY importOtherBrowser.label          "Importi datumojn el alia retesplorilo…">
 <!ENTITY importOtherBrowser.accesskey      "A">
 
 <!ENTITY cmd.backup.label               "Sekurkopii…">
--- 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=Pro sekurecaj kialoj, javaskizo aŭ datumajn retadresojn ne povas esti ŝargitaj el la historia fenestro aŭ el la flanka strio.
 noTitle=(sen titolo)
 
 bookmarksMenuEmptyFolder=(Malplena)
 
 bookmarksBackupTitle=Dosiernomo de sekurkopio de legosignoj
 
 bookmarksRestoreAlertTitle=Restaŭri legosignojn
@@ -39,17 +43,16 @@ view.sortBy.lastModified.label=Ordigi laŭ dato de lasta modifo
 view.sortBy.lastModified.accesskey=M
 view.sortBy.tags.label=Ordigi laŭ etikedoj
 view.sortBy.tags.accesskey=T
 
 searchBookmarks=Serĉi legosignojn
 searchHistory=Serĉi en historio
 searchDownloads=Serĉi en elŝutoj
 searchCurrentDefault=Serĉi en '%S'
-findInPrefix=Serĉi en '%S'…
 
 tabs.openWarningTitle=Konfirmi malfermadon
 tabs.openWarningMultipleBranded=Vi pretas malfermi %S foliojn.  Tio povas malrapidigi %S dum la paĝoj estas ŝargataj.  Ĉu vi certas ke vi volas daŭrigi?
 tabs.openButtonMultiple=Malfermi foliojn
 tabs.openWarningPromptMeBranded=Averti min se malfermado de pluraj folioj povus malrapidigi %S
 
 SelectImport=Importi dosieron de legosignoj
 EnterExport=Eksporti dosieron de legosignoj
@@ -70,23 +73,23 @@ recentlyBookmarkedTitle=Ĵusaj legosignoj
 recentTagsTitle=Ĵusaj etikedoj
 
 OrganizerQueryHistory=Historio
 OrganizerQueryDownloads=Elŝutoj
 OrganizerQueryAllBookmarks=Ĉiuj legosignoj
 OrganizerQueryTags=Etikedoj
 
 # LOCALIZATION NOTE (tagResultLabel) :
-# This is what we use to form the label (for screen readers)
-# for url bar autocomplete results of type "tag"
+# Noun used to describe the location bar autocomplete result type
+# to users with screen readers
 # See createResultLabel() in urlbarBindings.xml 
 tagResultLabel=Etikedo
 # LOCALIZATION NOTE (bookmarkResultLabel) :
-# This is what we use to form the label (for screen readers)
-# for url bar autocomplete results of type "bookmark"
+# Noun used to describe the location bar autocomplete result type
+# to users with screen readers
 # See createResultLabel() in urlbarBindings.xml 
 bookmarkResultLabel=Legosigno
 
 # LOCALIZATION NOTE (lockPrompt.text)
 # %S will be replaced with the application name.
 lockPrompt.title=Eraro dum starto de la retesplorilo
 lockPrompt.text=La paĝosigna kaj historia sistemo ne estos aktiva ĉar unu el la dosieroj de %S estas uzata de alia programo. Tiun problemon povas okazigi sekureca programo.
 lockPromptInfoButton.label=Plia informo
--- 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        "Administrado de permesoj">
 
 <!ENTITY sites.search                    "Serĉi retejojn">
 <!ENTITY sites.allSites                  "Ĉiujn retejojn">
 
 <!-- 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                   "Kromprogramoj">
 
 <!-- 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                 "Gardi deponejon por malkonektitaĵoj">
 
 <!ENTITY popup.label                     "Malfermi spruĉfenestrojn">
+
+<!ENTITY fullscreen.label                "Fullscreen">
--- 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 vizito;#1 vizitoj
 
 passwordsCount=#1 pasvorto estas konservita por tiu ĉi retejo.;#1 pasvortoj estas konservitaj por tiu ĉi retejo.
 cookiesCount=#1 kuketo estas konservita por tiu ĉi retejo.;#1 kuketoj estas konservita por tiu ĉi retejo.
--- 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         "Spertaj agordoj de JavaScript">
 <!ENTITY window.width                   "37em">
 
 <!ENTITY allowScripts.label             "Permesi al skizoj:">
 
 <!ENTITY moveResizePopupWindows.label     "Movi aŭ ŝanĝi grandecon de ŝprucfenestroj">
 <!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                "Ĝenerala">
 
 <!ENTITY accessibility.label             "Alirebleco">
 
 <!ENTITY useCursorNavigation.label       "Ĉiam uzi la moviĝoklavojn por moviĝi ene de paĝoj">
 <!ENTITY useCursorNavigation.accesskey   "m">
@@ -20,18 +24,19 @@
 <!ENTITY allowHWAccel.label              "Uzi aparatan akceladon se tio disponeblas">
 <!ENTITY allowHWAccel.accesskey          "d">
 <!ENTITY checkSpelling.label             "Kontroli literumadon dum tajpado">
 <!ENTITY checkSpelling.accesskey         "t">
 
 <!ENTITY systemDefaults.label            "Difinitaj de la sistemo">
 <!ENTITY alwaysCheckDefault.label        "Ĉiam kontroli ĉe la eko ĉu &brandShortName; estas la ĉefa retumilo"><!--XXX-->
 <!ENTITY alwaysCheckDefault.accesskey    "k">
-<!ENTITY checkNow.label                  "Kontroli nun">
-<!ENTITY checkNow.accesskey              "N">
+<!ENTITY setDefault.label                "Make &brandShortName; the default browser">
+<!ENTITY setDefault.accesskey            "d">
+<!ENTITY isDefault.label                 "&brandShortName; is currently your default browser">
 <!ENTITY submitCrashes.label             "Sendi raportojn pri paneoj">
 <!ENTITY submitCrashes.accesskey         "p">
 <!ENTITY submitTelemetry.label           "Sendi informon pri efikeco">
 <!ENTITY submitTelemetry.accesskey       "e">
 
 <!ENTITY networkTab.label                "Reto">
 
 <!ENTITY connection.label                "Konektado">
--- 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     "Detaloj de programo">
 <!ENTITY appManager.style     "width: 30em; min-height: 20em;">
 <!ENTITY remove.label         "Forigi">
 <!ENTITY remove.accesskey     "F">
--- 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=La jenaj programoj povas esti uzitaj por pritrakti %S.
 
 handleProtocol=%S ligiloj
 handleWebFeeds=TTT novaĵfontoj
 handleFile=%S enhavo
 
--- 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 enhavo">
 <!ENTITY  typeColumn.accesskey    "E">
 
 <!ENTITY  actionColumn2.label     "Ago">
 <!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              "Koloroj">
 <!ENTITY  window.width                    "38em">
 <!ENTITY  window.macWidth                 "41em">
 
 <!ENTITY  allowPagesToUse.label           "Permesi al paĝoj elekti siajn proprajn kolorojn, anstataŭ la elektitaj de mi">
 <!ENTITY  allowPagesToUse.accesskey       "P">
 
 <!ENTITY  color                           "Teksto kaj fono">
--- 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       "Agordoj de konektado">
 <!ENTITY  window.width                  "37em">
 <!ENTITY  window.macWidth               "39em">
 
 <!ENTITY  proxyTitle.label              "Agordi retperantojn por atingi la reton">
 <!ENTITY  noProxyTypeRadio.label        "Sen retperanto">
 <!ENTITY  noProxyTypeRadio.accesskey    "r">
--- 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           "Bloki spruĉfenestrojn">
 <!ENTITY  blockPopups.accesskey       "B">
 <!ENTITY  popupExceptions.label       "Esceptoj…">
 <!ENTITY  popupExceptions.accesskey   "E">
 
 <!ENTITY  loadImages.label            "Aŭtomate ŝargi bildojn">
 <!ENTITY  loadImages.accesskey        "I">
 <!ENTITY  exceptions.label            "Esceptoj…">
--- 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          "La jenaj kuketoj estas konservitaj en via komputilo:">
 <!ENTITY     cookiename.label               "Nomo de kuketo">
 <!ENTITY     cookiedomain.label             "Retejo"> 
 <!ENTITY     button.removecookies.label     "Forigi kuketojn">
 <!ENTITY     button.removecookie.label      "Forigi kuketon">
 <!ENTITY     button.removecookie.accesskey  "F">
--- 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                       "Tiparoj">
 <!ENTITY  window.width                            "39em">
 <!ENTITY  window.macWidth                         "43em">
 <!ENTITY  window.unixWidth                        "41em">
 
 <!ENTITY  language.label                          "Tiparoj por:">
 <!ENTITY  language.accesskey                      "T">
 
@@ -11,17 +15,17 @@
 <!ENTITY  sizeMonospace.accesskey                 "G">
 
 <!ENTITY  proportional.label                      "Proporcia:">
 <!ENTITY  proportional.accesskey                  "P">
 
 <!ENTITY  serif.label                             "Serifa:">
 <!ENTITY  serif.accesskey                         "S">
 <!ENTITY  sans-serif.label                        "Senserifa:">
-<!ENTITY  sans-serif.accesskey                    "n">
+<!ENTITY  sans-serif.accesskey                    "e">
 <!ENTITY  monospace.label                         "Egallarĝa:">
 <!ENTITY  monospace.accesskey                     "E">
 
 <!ENTITY  font.langGroup.latin1                   "Okcidenta">
 <!ENTITY  font.langGroup.latin2                   "Mezeŭropa">
 <!ENTITY  font.langGroup.japanese                 "Japana">
 <!ENTITY  font.langGroup.trad-chinese             "Ĉina tradicia (Taiwan)">
 <!ENTITY  font.langGroup.simpl-chinese            "Ĉina simpligita">
--- a/browser/chrome/browser/preferences/languages.dtd
+++ b/browser/chrome/browser/preferences/languages.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                                   "30em">
 
 <!ENTITY languages.customize.Header                     "Lingvoj">
 <!ENTITY languages.customize.prefLangDescript           "Kelkfoje retpaĝoj estas oferataj en pli ol unu lingvo. Elektu lingvojn por montri tiajn paĝojn, en la ordo de via prefero.">
 <!ENTITY languages.customize.active.label               "Lingvoj ordigitaj laŭ prefero:">
 <!ENTITY languages.customize.moveUp.label               "Movi supren">
 <!ENTITY languages.customize.moveUp.accesskey           "S">
 <!ENTITY languages.customize.moveDown.label             "Movi malsupren">
--- 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             "Starto">
 
 <!ENTITY startupPage.label         "Kiam &brandShortName; ekfunkcias:">
 <!ENTITY startupPage.accesskey     "e">
 <!ENTITY startupHomePage.label     "Montri mian ekan paĝon">
 <!ENTITY startupBlankPage.label    "Montri malplenan paĝon">
 <!ENTITY startupLastSession.label  "Montri miajn lastajn fenestrojn kaj foliojn">
-<!ENTITY restoreOnDemand.label     "Ne ŝargi foliojn ĝis elektado">
-<!ENTITY restoreOnDemand.accesskey "N">
 
 <!ENTITY homepage.label            "Eka paĝo:">
 <!ENTITY homepage.accesskey        "P">
 <!ENTITY useCurrentPage.label      "Uzi la nunan paĝon">
 <!ENTITY useCurrentPage.accesskey  "U">
 <!ENTITY useMultiple.label         "Uzi nunajn paĝojn">
 <!ENTITY chooseBookmark.label      "Uzi legosignon…">
 <!ENTITY chooseBookmark.accesskey  "s">
@@ -22,17 +24,17 @@
 
 <!ENTITY showWhenDownloading.label     "Montri la fenestron de elŝutoj dum elŝutado de dosiero">
 <!ENTITY showWhenDownloading.accesskey "M">
 <!ENTITY closeWhenDone.label "Fermi ĝin kiam ĉiuj elŝutoj finiĝas">
 <!ENTITY closeWhenDone.accesskey "k">
 <!ENTITY saveTo.label "Konservi dosierojn en">
 <!ENTITY saveTo.accesskey "d">
 <!ENTITY chooseFolderWin.label        "Esplori…">
-<!ENTITY chooseFolderWin.accesskey    "o">
+<!ENTITY chooseFolderWin.accesskey    "l">
 <!ENTITY chooseFolderMac.label        "Elekti…">
 <!ENTITY chooseFolderMac.accesskey    "i">
 <!ENTITY alwaysAsk.label "Ĉiam demandi al mi kie konservi dosierojn">
 <!ENTITY alwaysAsk.accesskey "I">
 
 <!ENTITY addonsMgr.label               "Aldonaĵoj">
 <!ENTITY manageAddonsDescWin.label     "Ŝanĝi opciojn de viaj aldonaĵoj">
 <!ENTITY manageAddonsDescUnix2.label   "Ŝanĝi agordojn de viaj aldonaĵoj">
--- a/browser/chrome/browser/preferences/permissions.dtd
+++ b/browser/chrome/browser/preferences/permissions.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.title                 "Esceptoj">
 <!ENTITY window.width                 "36em">
 
 <!ENTITY treehead.sitename.label      "Retejo">
 <!ENTITY treehead.status.label        "Stato">
 <!ENTITY removepermission.label       "Forigi retejon">
 <!ENTITY removepermission.accesskey   "F">
 <!ENTITY removeallpermissions.label   "Forigi ĉiujn retejojn">
--- 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     "Opcioj">
 <!ENTITY  prefWindow.titleGNOME   "Preferoj 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,8 +16,10 @@
 <!ENTITY  paneContent.title       "Enhavo">
 <!ENTITY  paneApplications.title  "Programoj">
 <!ENTITY  panePrivacy.title       "Privateco">
 <!ENTITY  paneSecurity.title      "Sekureco">
 <!ENTITY  paneAdvanced.title      "Spertaj">
 
 <!-- LOCALIZATION NOTE (paneSync.title): This should match syncBrand.shortName.label in ../syncBrand.dtd -->
 <!ENTITY  paneSync.title          "Speguli">
+<!ENTITY  buttonForward.tooltip   "Unu paĝo antaŭen">
+<!ENTITY  buttonBack.tooltip      "Unu paĝo malantauen">
\ No newline at end of file
--- 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=Se tiu ĉi opcio estas elektita %S ricevos la adresojn de retpaĝoj vizititaj de vi. Por daŭrigi bonvolu legu kaj akceptu la jenajn servajn kondiĉojn.
 
 #### Fonts
@@ -54,16 +58,17 @@ useDefault=Uzi %S (ĉefa)
 
 useOtherApp=Uzi alian…
 fpTitleChooseApp=Elekti helpan programon
 manageApp=Detaloj de programo…
 webFeed=TTTa novaĵfonto
 videoPodcastFeed=Videa podkasto
 audioPodcastFeed=Podkasto
 alwaysAsk=Ĉiam demandi
+portableDocumentFormat=Portable Document Format (PDF)
 
 # LOCALIZATION NOTE (usePluginIn):
 # %1$S = plugin name (for example "QuickTime Plugin-in 7.2")
 # %2$S = brandShortName from brand.properties (for example "Minefield")
 usePluginIn=Uzi %S (en %S)
 
 # LOCALIZATION NOTE (previewInApp, addLiveBookmarksInApp): %S = brandShortName
 previewInApp=Antaŭvidi en %S
@@ -94,17 +99,17 @@ offlineAppRemoveTitle=Forigi malkonektit
 offlineAppRemovePrompt=Post la forigado de tiuj ĉi datumoj %S ne estos disponebla dum malkonektita uzado.  Ĉu vi certe volas forigi ĉiun ĉi malkonektitan retejon?
 offlineAppRemoveConfirm=Forigi malkonektitaĵojn
 
 # LOCALIZATION NOTE: The next string is for the disk usage of the
 # offline application
 #   e.g. offlineAppUsage : "50.23 MB"
 #   %1$S = size (in bytes or megabytes, ...)
 #   %2$S = unit of measure (bytes, KB, MB, ...)
-offlineAppUsage=%1$S %2$S
+offlineAppUsage=%2$S de %1$S
 
 offlinepermissionstext=La jenaj retejoj ne rajtas konservi datumojn por uzi malkonektite:
 offlinepermissionstitle=Malkonektitaĵoj
 
 ####Preferences::Advanced::Network
 #LOCALIZATION NOTE: The next string is for the disk usage of the web content cache.
 #   e.g., "Your web content cache is currently using 200 MB"
 #   %1$S = size
--- a/browser/chrome/browser/preferences/privacy.dtd
+++ b/browser/chrome/browser/preferences/privacy.dtd
@@ -1,26 +1,29 @@
+<!-- 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                 "Spurado">
 
 <!ENTITY doNotTrack.label               "Diri al retejoj ke mi ne volas esti spurita">
 <!ENTITY doNotTrack.accesskey           "d">
 
 <!ENTITY  history.label                 "Historio">
 
 <!ENTITY  locationBar.label             "Retadresa strio">
 
 <!ENTITY  locbar.pre.label              "Dum uzado de la retadresa strio, sugesti el:">
-<!ENTITY  locbar.pre.accessKey          "u">
+<!ENTITY  locbar.pre.accessKey          "r">
 <!ENTITY  locbar.post.label             "">
 <!ENTITY  locbar.both.label             "Historio kaj legosignoj">
 <!ENTITY  locbar.history.label          "Historio">
 <!ENTITY  locbar.bookmarks.label        "Legosignoj">
 <!ENTITY  locbar.nothing.label          "Nenio">
 
-
 <!ENTITY  acceptCookies.label           "Akcepti kuketojn el retejoj">
 <!ENTITY  acceptCookies.accesskey       "A">
 
 <!ENTITY  acceptThirdParty.label        "Akcepti nerektajn kuketojn">
 <!ENTITY  acceptThirdParty.accesskey    "c">
 
 <!ENTITY  keepUntil.label               "Konservi ĝis:">
 <!ENTITY  keepUntil.accesskey           "K">
--- a/browser/chrome/browser/preferences/security.dtd
+++ b/browser/chrome/browser/preferences/security.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  warnAddonInstall.label        "Atentigi min kiam retejoj volas instali aldonaĵojn">
 <!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
--- 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
   "Difini la ekan paĝon">
 <!ENTITY selectBookmark.label
   "Elekti legosignon kiel ekan paĝon.  Se vi elektas dosierujon ĉiuj legosignoj en tiu dosierujo estos malfermitaj en folioj.">
 
--- 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          "Agordo de &syncBrand.fullName.label;">
 <!ENTITY setupButton.accesskey      "A">
 <!ENTITY weaveDesc.label            "&syncBrand.fullName.label; permesas al vi havi vian historion, viajn legosignojn, pasvortojn kaj malfermitajn foliojn en ĉiuj viaj aparatoj.">
 
 <!-- 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       "Malfermi novajn fenestrojn en novaj folioj anstataŭe">
 <!ENTITY newWindowsAsTabs.accesskey   "f">
 
 <!ENTITY warnCloseMultipleTabs.label  "Atentigi min antaŭ ol fermi plurajn foliojn">
 <!ENTITY warnCloseMultipleTabs.accesskey  "p">
 
 <!ENTITY warnOpenManyTabs.label       "Averti min se malfermado de pluraj folioj povus malrapidigi &brandShortName;">
 <!ENTITY warnOpenManyTabs.accesskey   "m">
 
 <!ENTITY showTabBar.label             "Ĉiam montri la folian strion">
 <!ENTITY showTabBar.accesskey         "s">
 
+<!ENTITY restoreTabsOnDemand.label        "Ne ŝargi foliojn ĝis elektado">
+<!ENTITY restoreTabsOnDemand.accesskey    "l">
+
 <!ENTITY switchToNewTabs.label        "Kiam mi malfermas ligilon en nova folio, ŝanĝi al ĝi tuj">
 <!ENTITY switchToNewTabs.accesskey    "a">
 
 <!ENTITY showTabsInTaskbar.label          "Montri antaŭvidon de miaj folioj en la taskstrio de Windows">
 <!ENTITY showTabsInTaskbar.accesskey      "k">
--- 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=Fini %S
 restartDialogTitle=Restartigi %S
 
 quitTitle=&Fini
 restartTitle=&Restartigi
 cancelTitle=&Nuligi
 saveTitle=&Konservi kaj fini
 neverAsk=Ne demandi venontan fojon
--- a/browser/chrome/browser/safeMode.dtd
+++ b/browser/chrome/browser/safeMode.dtd
@@ -1,64 +1,19 @@
-<!-- ***** 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 ***** -->
+<!-- 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         "&brandShortName; sekura reĝimo">
-<!ENTITY window.width                 "37em">
-
-<!ENTITY autoSafeModeIntro.label      "&brandShortName; neatendite finis dum starto">
-<!ENTITY autoSafeModeDescription.label "Ni sincere pardonpetas pro la ĝeno. &brandShortName; nun funkcias en sekura reĝimo, kiu dumtempe malaktivigas vian personajn agordojn,  etosojn kaj etendoprogramojn.">
+<!ENTITY window.maxWidth              "400">
 
-<!ENTITY safeModeDescription.label    "&brandShortName; nun funkcias en sekura reĝimo, kiu tempe malaktivigas viajn personajn agordojn, etosojn kaj etendoprogramojn.">
-<!ENTITY safeModeDescription2.label   "Vi povas igi konstantaj kelkajn aŭ ĉiujn el tiuj ŝanĝoj:">
-
-<!ENTITY disableAddons.label          "Malaktivigi ĉiujn aldonaĵojn">
-<!ENTITY disableAddons.accesskey      "M">
+<!ENTITY startSafeMode.label          "Start in Safe Mode">
+<!ENTITY resetProfile.label           "Reagordi &brandShortName;">
 
-<!ENTITY resetToolbars.label          "Redifini ilarojn kaj kontrolojn">
-<!ENTITY resetToolbars.accesskey      "R">
+<!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 deleteBookmarks.label        "Forviŝi ĉiujn legosignojn krom la sekurkopiajn">
-<!ENTITY deleteBookmarks.accesskey    "s">
+<!ENTITY resetProfileInstead.label    "You can also Reset &brandShortName; if you want to start fresh.">
 
-<!ENTITY resetUserPrefs.label         "Anstataŭi ĉiujn preferojn de uzanto per la predeterminitaj de &brandShortName;">
-<!ENTITY resetUserPrefs.accesskey     "p">
-
-<!ENTITY restoreSearch.label          "Rekuperi la predeterminitajn serĉilojn">
-<!ENTITY restoreSearch.accesskey      "s">
-
-<!ENTITY changeAndRestartButton.label "Fari ŝanĝojn kaj rekomenci">
-<!ENTITY continueButton.label         "Daŭrigi en sekura reĝimo">
+<!-- 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; closed unexpectedly while starting. This might be caused by add-ons or other problems. You can try to resolve the problem by resetting &brandShortName; to its default state or troubleshooting in Safe Mode.">
+<!ENTITY resetProfileFooter.label       "Everything else will be reset to factory defaults.">
+<!ENTITY safeModeInstead.label          "If you don't want this, you can continue in Safe Mode to do your own troubleshooting with your add-ons and custom settings temporarily disabled.">
--- a/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
+++ b/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.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 safeb.palm.warning.title "Retfalsaĵo suspektata">
 
 <!ENTITY safeb.palm.message.p1 "Tiu ĉi paĝo estas raportita kiel reta falsaĵo kreita por trompi uzantoj kaj igi ilin dividi personajn aŭ financajn datumojn. Tajpado de ia ajn persona datumo en tiu ĉi paĝo povas rezultigi ŝteladon de idento aŭ aliajn trompoŝteladon.&#160;">
 <!ENTITY safeb.palm.message.p1.linkText "Legu pli &#187;">
 <!ENTITY safeb.palm.p1.linkStatusText "Legu pli &#133;">
 
 <!ENTITY safeb.palm.message.p2.start "Tiuj tipoj de retfalsaĵoj estas uzataj en trompoj, kiujn oni konas kiel phishing-atakoj, en kiuj falsaj retpaĝoj aŭ retmesaĝoj estas uzataj por imiti fontojn, kiujn vi eble fidas.  Vi povas lerni pli pri ">
 <!ENTITY safeb.palm.message.p2.linkText "kiel &brandShortName; protektas vin">
--- 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         "Denunci retfalsaĵon…">
 <!ENTITY reportPhishSiteMenu.accesskey      "D">
--- 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          "Agordoj por forviŝado de historio">
 <!ENTITY sanitizeDialog2.title         "Forviŝi ĵusan historion">
 
 <!ENTITY sanitizeItems.label          "Forviŝi nun la jenajn elementojn:">
 <!ENTITY clearDataSettings2.label     "Kiam mi finas &brandShortName;, ĝi devus aŭtomate forviŝi ĉiujn:">
 
 <!-- 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=Serĉi per %S
 
 # LOCALIZATION NOTE (cmd_pasteAndSearch): "Search" is a verb, this is the
 # search bar equivalent to the url bar's "Paste & Go"
 cmd_pasteAndSearch=Algui kaj serĉi
 
 cmd_clearHistory=Forviŝi la serĉilan historion
 cmd_clearHistory_accesskey=H
--- 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        "Administri serĉilojn…">
 <!ENTITY searchEndCap.label             "Serĉi">
--- 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             "Pozicio:">
 <!ENTITY tile.label                 "Tegoli">
 <!ENTITY center.label               "Centre">
 <!ENTITY stretch.label              "Etendi">
 <!ENTITY fill.label                 "Plenigi">
 <!ENTITY fit.label                  "Adapti">
 <!ENTITY preview.label              "Antaŭvidi">
 <!ENTITY color.label                "Koloro:">
--- 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 &opcioj
 safeModeLabel=%S &sekura reĝimo
 setDefaultBrowserTitle=Ĉefa retlegilo
 setDefaultBrowserMessage=%S ne estas nun via ĉefa retlegilo. Ĉu vi ŝatus igin ĝin ĉefa?
 setDefaultBrowserDontAsk=Ĉiam kontroli tion dum la ekfunkciado de %S
 alreadyDefaultBrowser=%S jam estas via ĉefa retlegilo
 desktopBackgroundLeafNameWin=Desktop Background.bmp
 DesktopBackgroundDownloading=Konservado de bildo…
--- 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  "Speguli">
 <!ENTITY syncBrand.fullName.label   "Spegulado de Firefox">
--- 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 = Ŝanĝi vian pasvorton
 change.password.acceptButton = Ŝanĝi pasvorton
 change.password.status.active = Ŝanĝado de via pasvorto…
 change.password.status.success = Via pasvorto estis ŝanĝita.
 change.password.status.error = Okazis eraro dum la ŝanĝado de via pasvorto.
 
 change.password3.introText = Via pasvorto devas enhavi almenaŭ 8 karakterojn. Ĝi ne povas esti egala al via uzantonomo aŭ via reakira ŝlosilo.
--- 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               "Via ŝlosilo de &syncBrand.fullName.label;">
 <!ENTITY syncKey.page.description         "Tiu ĉi ŝlosilo estas uzata por malĉifri la datumojn en via konto de &syncBrand.fullName.label;. Vi devos tajpi la ŝlosilon ĉiufoje kiam vi agordas &syncBrand.fullName.label; en nova komputilo aŭ aparato.">
 <!ENTITY syncKey.keepItSecret.heading     "Tenu ĝin sekreta">
 <!ENTITY syncKey.keepItSecret.description "Via konto de &syncBrand.fullName.label; estas ĉifrita por protekti vian privatecon. Sen tiu ĉi ŝlosilo la malĉifrado de viaj personaj datumoj postulus jarojn al iu ajn. Vi estas la ununura persono, kiu tenas tiun ĉi ŝlosilon. Tio signifas, ke vi estas la ununura, kiu povas aliri viajn datumojn de &syncBrand.fullName.label;.">
 <!ENTITY syncKey.keepItSafe.heading       "Tenu ĝin sekura">
 <!ENTITY syncKey.keepItSafe1.description  "Ne perdu tiun ĉi ŝlosilon.">
 <!ENTITY syncKey.keepItSafe2.description  " Ni ne konservas kopion de via ŝlosilo (se ni tion farus, ĝi ne estus sekreta!), do ">
 <!ENTITY syncKey.keepItSafe3.description  "ni ne povas helpi vin rehavi ĝin">
--- 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    "Via unua spegulado">
 <!ENTITY syncProgress.textBlurb    "Viaj datumoj estas nun ĉifrataj kaj alŝutataj en la fono. Vi povas fermi tiun ĉi folion kaj daŭrigi la uzadon de &brandShortName;.">
 <!ENTITY syncProgress.closeButton  "Fermi">
--- a/browser/chrome/browser/syncQuota.dtd
+++ b/browser/chrome/browser/syncQuota.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 quota.dialogTitle.label    "Limigo de spaco en servilo">
 <!ENTITY quota.retrievingInfo.label "Ricevado de informo pri limigo de spaco…">
 <!ENTITY quota.typeColumn.label     "Tipo">
 <!ENTITY quota.sizeColumn.label     "Grando">
--- 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    = Aldonaĵoj
 collection.bookmarks.label = Legosignoj
 collection.history.label   = Historio
 collection.passwords.label = Pasvortoj
 collection.prefs.label     = Preferoj
 collection.tabs.label      = Folioj
 
 # LOCALIZATION NOTE (quota.usageNoQuota.label): %1$S and %2$S are numeric value
@@ -16,17 +20,17 @@ quota.usageNoQuota.label    = Vi nuntemp
 # %3$S and %4$S numeric value and unit (as defined in the download manager)
 # of the total space available.
 quota.usagePercentage.label = Vi uzas %1$S%% (%2$S %3$S) el viaj rajtigitaj %4$S %5$S.
 quota.usageError.label      = Ne eblis ricevi la informon pri limigo de spaco.
 quota.retrieving.label      = Ricevado de informo pri limigo de spaco…
 # LOCALIZATION NOTE (quota.sizeValueUnit.label): %1$S is the amount of space
 # occupied by the engine, %2$K the corresponding unit (e.g. kB) as defined in
 # the download manager.
-quota.sizeValueUnit.label   = %1$S %2$S
+quota.sizeValueUnit.label   = %2$S de %1$S
 quota.remove.label          = Forigi
 quota.treeCaption.label     = Malelektu elementojn por ne plu speguli ilin kaj liberigi spacon en la servilo.
 # LOCALIZATION NOTE (quota.removal.label): %S is a list of engines that will be
 # disabled and whose data will be removed once the user confirms.
 quota.removal.label         = La Spegulado de Firefox forigos la jenajn datumojn: %S.
 # LOCALIZATION NOTE (quota.list.separator): This is the separator string used
 # for the list of engines (incl. spaces where appropriate)
 quota.list.separator        = ,\u0020
--- 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    "Agordo de &syncBrand.fullName.label;">
 
 <!-- First page of the wizard -->
 
 <!ENTITY setup.pickSetupType.description2 "Bonvenon! Se vi neniam antaŭe uzis &syncBrand.fullName.label; vi devos krei novan konton.">
 <!ENTITY button.createNewAccount.label "Krei novan konton">
 <!ENTITY button.haveAccount.label      "Mi havas konton">
 
--- 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       = Opcioj de spegulado
 button.syncOptionsDone.label   = Preta
 button.syncOptionsCancel.label = Nuligi
 
 invalidEmail.label          = Nevalida retpoŝta adreso
 serverInvalid.label         = Bonvolu tajpi validan URL por la servilo
 usernameNotAvailable.label  = Jam uzita
 
--- 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         "Fermi folion">
 <!ENTITY  newTabButton.tooltip        "Malfermi novan folion">
--- 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=Serĉi grupojn de folioj
 tabview.button.exitTabGroups=Eliri el grupoj de folioj
 tabview.groupItem.defaultName=Nomo de tiu ĉi grupo de folioj…
 tabview.groupItem.closeGroup=Fermi grupon
 tabview.groupItem.undoCloseGroup=Remalfermi grupon
 tabview.groupItem.discardClosedGroup=Forigi fermitan grupon
 tabview.search.otherWindowTabs=Folioj el aliaj fenestroj
 tabview.notification.sessionStore=Folioj kaj grupoj estos aŭtomate reŝargitaj kiam vi startigos %S venontfoje.
--- 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=Malfermi novan folion
 taskbar.tasks.newTab.description=Malfermi novan retesplorilan folion.
 taskbar.tasks.newWindow.label=Malfermi novan fenestron
 taskbar.tasks.newWindow.description=Malfermi novan retesplorilan fenestron.
 taskbar.tasks.enterPrivacyMode.label=Komenci privatan retesploradon
 taskbar.tasks.enterPrivacyMode.description=Komenci privatan retesploradon. La nuna seanco estos konservita.
 taskbar.tasks.exitPrivacyMode.label=Fini privatan retesploradon
 taskbar.tasks.exitPrivacyMode.description=Fini privatan retesploradon kaj rekrei la antaŭan seancon.
--- 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 URL ne estas valida kaj ne povas esti ŝargata
 fileNotFound=Firefox ne trovas la dosieron ĉe %S.
 dnsNotFound=Firefox ne trovas servilon ĉe %S.
 protocolNotFound=Firefox ne scias kiel vizi tiun adreson ĉar la protokolo (%S) ne estas asociata kun iu ajn programo.
 connectionFailure=Firefox ne povas konektiĝi al la servilo ĉe %S.
 netInterrupt=La konekto al %S estis haltigita dum la ŝargado de paĝo.
 netTimeout=La servilo ĉe %S prenas tro da tempo por respondi.
--- 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 "Okazis problemo dum ŝargado de la paĝo">
 <!ENTITY retry.label "Klopodi denove">
 
 <!-- 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  "Agordoj povas esti ŝanĝitaj per uzado de la folio Programoj en la preferoj de &brandShortName;.">
 <!ENTITY  settingsChangeOptions.label      "Agordoj povas esti ŝanĝitaj per uzado de la folio Programoj en la opcioj de &brandShortName;.">
--- a/browser/crashreporter/crashreporter-override.ini
+++ b/browser/crashreporter/crashreporter-override.ini
@@ -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/.
+
 # This file is in the UTF-8 encoding
 [Strings]
 # LOCALIZATION NOTE (CrashReporterProductErrorText2): The %s is replaced with a string containing detailed information.
 CrashReporterProductErrorText2=Firefox havis problemon kaj ĝi paneis. Ni klopodos restaŭri viajn foliojn kaj fenestrojn je la restarto.\n\nBedaŭrinde la raportisto de paneoj ne kapablas sendi raporton pri la paneo.\n\nDetaloj: %s
 CrashReporterDescriptionText2=Firefox havis problemon kaj ĝi paneis. Ni klopodos restaŭri viajn foliojn kaj fenestrojn je la restarto.\n\nPor helpi nin diagnozi kaj solvi tiun problemon, vi povas sendi al ni raporton pri la paneo.
--- a/browser/defines.inc
+++ b/browser/defines.inc
@@ -1,9 +1,9 @@
 #filter emptyLines
 
 #define MOZ_LANGPACK_CREATOR mozilla.org
 
 # If non-English locales wish to credit multiple contributors, uncomment this
 # variable definition and use the format specified.
-# #define MOZ_LANGPACK_CONTRIBUTORS <em:contributor>Joe Solon</em:contributor> <em:contributor>Eduardo Trápani</em:contributor>
+# #define MOZ_LANGPACK_CONTRIBUTORS <em:contributor>Joe Solon</em:contributor> <em:contributor>Suzy Solon</em:contributor>
 
 #unfilter emptyLines
--- a/browser/feedback/main.dtd
+++ b/browser/feedback/main.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 testpilot.brand.label                      "Test Pilot">
 <!ENTITY testpilot.settings.label                   "Agordoj">
 <!ENTITY testpilot.settings.dataSubmission.label    "Sendado de datumoj">
 <!ENTITY testpilot.settings.notifications.label     "Sciigoj">
 <!ENTITY testpilot.settings.notifyWhen.label        "Sciigi min kiam…">
 <!ENTITY testpilot.settings.readyToSubmit.label     "A study is ready to submit">
 <!ENTITY testpilot.settings.newStudy.label          "There's a new study">
 <!ENTITY testpilot.settings.hasNewResults.label     "A study has new results">
--- 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 = Help make Firefox better by running user studies.
 
 # common
 testpilot.fullBrandName = Mozilla Labs Test Pilot
 testpilot.moreInfo = Pli da informo
 testpilot.submit = Sendi
 testpilot.takeSurvey = Take the Survey
@@ -52,17 +56,17 @@ testpilot.quitPage.aboutToQuit = You are
 testpilot.quitPage.optionalMessage = (Optional) If you have a minute, please let us know why you have chosen to quit the study.
 testpilot.quitPage.reason = Reason:
 testpilot.quitPage.recurringStudy = This is a recurring study. Normally we will let you know the next time we run the study.  If you never want to hear about this study again, check the box below:
 testpilot.quitPage.quitForever = Quit this recurring study.
 testpilot.quitPage.quitStudy = Quit the Study &raquo;
 
 # welcome page
 testpilot.welcomePage.thankYou = Thank You for Joining the Test Pilot Team!
-testpilot.welcomePage.gettingStarted = Getting Started
+testpilot.welcomePage.gettingStarted = Unuaj paŝoj
 testpilot.welcomePage.pleaseTake = Please take the
 testpilot.welcomePage.backgroundSurvey = Pilot Background Survey
 testpilot.welcomePage.clickToOpenStudiesWindow = Click here to see the studies that are currently running.
 testpilot.welcomePage.testpilotAddon = Test Pilot Add-on
 testpilot.welcomePage.iconExplanation = &laquo; look for this icon in the bottom right of the browser window.
 testpilot.welcomePage.moreIconExplanation = You can click on it to get the main Test Pilot menu.
 testpilot.welcomePage.notificationInfo = The icon will pop up a notification when a study needs your attention.
 testpilot.welcomePage.privacyPolicy = Politiko pri privateco
--- a/browser/firefox-l10n.js
+++ b/browser/firefox-l10n.js
@@ -1,39 +1,7 @@
-# ***** 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 Firefox browser.
-#
-# The Initial Developer of the Original Code is
-# Benjamin Smedberg <bsmedberg@covad.net>
-# Portions created by the Initial Developer are Copyright (C) 2004
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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/.
 
 #filter substitution
 
 pref("general.useragent.locale", "@AB_CD@");
--- 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,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/profile/chrome/userChrome-example.css
+++ b/browser/profile/chrome/userChrome-example.css
@@ -1,1 +1,50 @@
+/* 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
+ * override default settings.
+ */
+
+/*
+ * Do not remove the @namespace line -- it's required for correct functioning
+ */
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to XUL */
+
+
+/*
+ * Some possible accessibility enhancements:
+ */
+/*
+ * Make all the default font sizes 20 pt:
+ *
+ * * {
+ *   font-size: 20pt !important
+ * }
+ */
+/*
+ * Make menu items in particular 15 pt instead of the default size:
+ *
+ * menupopup > * {
+ *   font-size: 15pt !important
+ * }
+ */
+/*
+ * Give the Location (URL) Bar a fixed-width font
+ *
+ * #urlbar {
+ *    font-family: monospace !important;
+ * }
+ */
+
+/*
+ * For more examples see http://www.mozilla.org/unix/customizing.html
+ */
+
--- a/browser/profile/chrome/userContent-example.css
+++ b/browser/profile/chrome/userContent-example.css
@@ -1,1 +1,39 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+/*
+ * 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
+ * author sets any.  Rules with !important overrule author rules.
+ */
+
+/*
+ * example: turn off "blink" element blinking
+ *
+ * blink { text-decoration: none ! important; }
+ *
+ */
+
+/*
+ * example: give all tables a 2px border
+ *
+ * table { border: 2px solid; }
+ */
+
+/*
+ * example: turn off "marquee" element
+ *
+ * marquee { -moz-binding: none; }
+ *
+ */
+ 
+/* 
+ * For more examples see http://www.mozilla.org/unix/customizing.html
+ */
+
--- a/browser/updater/updater.ini
+++ b/browser/updater/updater.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
 ; All strings must be less than 600 chars.
 [Strings]
 TitleText=Ĝisdatigo de %MOZ_APP_DISPLAYNAME%
 InfoText=%MOZ_APP_DISPLAYNAME% instalas viajn ĝisdatigojn kaj baldaŭ startos…
 MozillaMaintenanceDescription=La funkcitena servo de Mozilla certigas ke vi havas la lastan kaj plej sekuran version de Mozilla Firefox en via komputilo. Ĝisdatigi Firefox estas tre grave por via retesplora sekureco, kaj Mozilla intense rekomendas al vi havi tiun ĉi servon aktiva.
--- 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=Fini %S
 
 # LOCALIZATION NOTE (hideApplicationCmdMac.label): %S will be replaced with
 # the name of the webapp.
 hideApplicationCmdMac.label=Kaŝi %S
+
+# LOCALIZATION NOTE (geolocation.title): %S will be replaced with the name of
+# the webapp.
+geolocation.title=%S - Share Location
+geolocation.description=Do you want to share your location?
+geolocation.sharelocation=Diskonigi lokon
+geolocation.dontshare=Don't Share
+geolocation.remember=Remember my choice
--- a/dom/chrome/accessibility/AccessFu.properties
+++ b/dom/chrome/accessibility/AccessFu.properties
@@ -60,32 +60,50 @@ 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
+definitionlist =       definition list
+term           =       termino
+definition     =       difino
 
-# More sophisiticated object descriptions
+# More sophisticated roles which are not actual numeric roles
+textarea       =       text area
+
+# More sophisticated object descriptions
 headingLevel   =       heading level %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
 
 # Invoked actions
 jumpAction     =      jumped
 pressAction    =      pressed
 checkAction    =      checked
 uncheckAction  =      unchecked
 selectAction   =      selected
 openAction     =      opened
 closeAction    =      closed
 switchAction   =      switched
 clickAction    =      clicked
 collapseAction =      collapsed
 expandAction   =      expanded
 activateAction =      activated
-cycleAction    =      cycled
\ No newline at end of file
+cycleAction    =      cycled
+
+# Tab states
+tabLoading     =      loading
+tabLoaded      =      loaded
+tabNew         =      new tab
+tabLoadStopped =      loading stopped
+tabReload      =      reloading
+
+# Object states
+stateChecked     =    checked
+stateNotChecked  =    not checked
+stateExpanded    =    expanded
+stateCollapsed   =    collapsed
+stateUnavailable =    unavailable
+stateRequired    =    required
+stateTraversed   =    visited
--- 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    =       Salti
 press   =       Premi
 check   =       kontroli
 uncheck =       Malaktivigi
 select  =       Elekti
 open    =       Malfermi
 close   =       Fermi
 switch  =       Baskuli
--- 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    =       Salti
 press   =       Premi
 check   =       kontroli
 uncheck =       Malaktivigi
 select  =       Elekti
 open    =       Malfermi
 close   =       Fermi
 switch  =       Baskuli
--- 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    =       Salti
 press   =       Premi
 check   =       kontroli
 uncheck =       Malaktivigi
 select  =       Elekti
 open    =       Malfermi
 close   =       Fermi
 switch  =       Baskuli
--- 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 URL ne estas valida kaj ne povas esti ŝargata
 fileNotFound=La dosiero %S ne povas esti trovita. Bonvolu kontroli la lokon kaj klopodi denove.
 dnsNotFound=%S ne povis esti trovita.  Bonvolu kontroli la nomon kaj klopodi denove.
 protocolNotFound=%S ne estas registrita protokolo.
 connectionFailure=La konekto estis rifuzita dum la klopodo konekti al %S.
 netInterrupt=La konekto al %S neatendite finiĝis. Kelkaj datumoj povus esti senditaj/ricevitaj.
 netTimeout=Elĉerpiĝis la tempo por la operacio dum la klopodo kontakti %S.
--- 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 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/.
 
 KillScriptTitle=Averto: nerespondanta skripto
 KillScriptMessage=A script on this page may be busy, or it may have stopped responding. You can stop the script now, or you can continue to see if the script will complete.
 KillScriptWithDebugMessage=A script on this page may be busy, or it may have stopped responding. You can stop the script now, open the script in the debugger, or let the script continue.
 KillScriptLocation=Skripto: %S
 StopScriptButton=Haltigi skripton
 DebugScriptButton=Sencimigi skripton
 WaitForScriptButton=Daŭrigi
 DontAskAgain=&Ne plu demandi
 JSURLLoadBlockedWarning=La klopodo ŝargi javascript-an URLon el iu servilo en la fenestro kiu montras enhavon de alia servilo estis blokita de la sekureca administranto.
 WindowCloseBlockedWarning=Scripts may not close windows that were not opened by script.
 OnBeforeUnloadTitle=Ĉu vi certas?
 OnBeforeUnloadMessage=This page is asking you to confirm that you want to leave - data you have entered may not be saved.
-OnBeforeUnloadStayButton=Stay on Page
-OnBeforeUnloadLeaveButton=Leave Page
+OnBeforeUnloadStayButton=Resti en la paĝo
+OnBeforeUnloadLeaveButton=Forlasi paĝon
 DocumentAllUsed=Non-standard document.all property was used. Use W3C standard document.getElementById() instead.
-GlobalScopeElementReference=Element referenced by ID/NAME in the global scope. Use W3C standard document.getElementById() instead.
 UseOfCaptureEventsWarning=Use of captureEvents() is deprecated. To upgrade your code, use the DOM 2 addEventListener() method. For more help http://developer.mozilla.org/en/docs/DOM:element.addEventListener
 UseOfReleaseEventsWarning=Use of releaseEvents() is deprecated. To upgrade your code, use the DOM 2 removeEventListener() method. For more help http://developer.mozilla.org/en/docs/DOM:element.removeEventListener
 UseOfRouteEventWarning=Use of routeEvent() is deprecated. To upgrade your code, use the DOM 2 dispatchEvent() method. For more help http://developer.mozilla.org/en/docs/DOM:element.dispatchEvent
 UseOfPreventBubbleWarning=Event=%S, use of preventBubble() is deprecated. Use W3C standard stopPropagation() instead.
 UseOfPreventCaptureWarning=Event=%S, use of preventCapture() is deprecated. Use W3C standard stopPropagation() instead.
 UseOfDOM3LoadMethodWarning=Use of Document.load() is deprecated. To upgrade your code, use the DOM XMLHttpRequest object. For more help https://developer.mozilla.org/en/XMLHttpRequest
 UnexpectedCanvasVariantStyle=canvas: an attempt to set strokeStyle or fillStyle to a value that is neither a string, a CanvasGradient, or a CanvasPattern was ignored.
 EmptyGetElementByIdParam=Empty string passed to getElementById().
@@ -111,16 +75,17 @@ EnablePrivilegeWarning=Use of enablePriv
 PositionWarning=Use of XMLHttpRequest's progress events' position attribute is deprecated.
 TotalSizeWarning=Use of XMLHttpRequest's progress events' totalSize attribute is deprecated.
 nsIJSONDecodeDeprecatedWarning=nsIJSON.decode is deprecated.  Please use JSON.parse instead.
 nsIJSONEncodeDeprecatedWarning=nsIJSON.encode is deprecated.  Please use JSON.stringify instead.
 nsIDOMWindowInternalWarning=Use of nsIDOMWindowInternal is deprecated. Use nsIDOMWindow instead.
 InputEncodingWarning=Use of inputEncoding is deprecated.
 # LOCALIZATION NOTE: Do not translate "MozBeforePaint" and "mozRequestAnimationFrame"
 MozBeforePaintWarning=MozBeforePaint events are no longer supported.  mozRequestAnimationFrame must be passed a non-null callback argument.
+FullScreenDeniedBlocked=Request for full-screen was denied because this domain has been blocked from full-screen by user.
 FullScreenDeniedDisabled=Request for full-screen was denied because full-screen API is disabled by user preference.
 FullScreenDeniedFocusedPlugin=Request for full-screen was denied because a windowed plugin is focused.
 FullScreenDeniedHidden=Request for full-screen was denied because the document is no longer visible.
 FullScreenDeniedIframeDisallowed=Request for full-screen was denied because at least one of the document's containing iframes does not have a "mozallowfullscreen" attribute.
 FullScreenDeniedNotInputDriven=Request for full-screen was denied because Element.mozRequestFullScreen() was not called from inside a short running user-generated event handler.
 FullScreenDeniedNotInDocument=Request for full-screen was denied because requesting element is no longer in its document.
 FullScreenDeniedMovedDocument=Request for full-screen was denied because requesting element has moved document.
 FullScreenDeniedLostWindow=Request for full-screen was denied because we no longer have a window.
@@ -138,19 +103,26 @@ TimeoutSyncXHRWarning=Use of XMLHttpRequ
 JSONCharsetWarning=An attempt was made to declare a non-UTF-8 encoding for JSON retrieved using XMLHttpRequest. Only UTF-8 is supported for decoding JSON.
 MediaLoadExhaustedCandidates=All candidate resources failed to load. Media load paused.
 MediaLoadSourceMissingSrc=<source> element has no "src" attribute. Media resource load failed.
 # 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=HTTP load failed with status %1$S. Load of media resource %2$S failed.
 # LOCALIZATION NOTE: %S is the URL of the media resource which failed to load.
 MediaLoadInvalidURI=Invalid URI. Load of media resource %S failed.
 # 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=Specified "type" of "%1$S" is not supported. Load of media resource %2$S failed.
+MediaLoadUnsupportedTypeAttribute=Specified "type" attribute of "%1$S" is not supported. Load of media resource %2$S failed.
+# 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=Specified "media" attribute of "%1$S" does not match the environment. Load of media resource %2$S failed.
 # 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=HTTP "Content-Type" of "%1$S" is not supported. Load of media resource %2$S failed.
 # LOCALIZATION NOTE: %S is the URL of the media resource which failed to load because of error in decoding.
 MediaLoadDecodeError=Media resource %S could not be decoded.
 # LOCALIZATION NOTE: Do not translate "MozBlobBuilder" and "Blob"
 MozBlobBuilderWarning=La uzado de MozBlobBuilder estas evitinda. Anstataŭe uzu la konstruiston de Blob.
 # LOCALIZATION NOTE: Do not translate "DOMException", "code" and "name"
 DOMExceptionCodeWarning=La uzado de la atributo code de DOMException estas evitinda. Anstataŭe uzu name.
-# LOCALIZATION NOTE: Do not translate "java" or "Packages".
-JavaPackagesWarning=La uzado de la objektoj de DOM 'java' kaj 'Packages' por aliri funkciojn de Java estas evitinda. Subteno por tio baldaŭ malaperos.
+# LOCALIZATION NOTE: Do not translate "__exposedProps__"
+NoExposedPropsWarning=Exposing chrome JS objects to content without __exposedProps__ is insecure and deprecated. See https://developer.mozilla.org/en/XPConnect_wrappers for more information.
+# LOCALIZATION NOTE: Do not translate "Mutation Event" and "MutationObserver"
+MutationEventWarning=Use of Mutation Events is deprecated. Use MutationObserver instead.
+# LOCALIZATION NOTE: Do not translate "Blob", "mozSlice", or "slice"
+MozSliceWarning=Use of mozSlice on the Blob object is deprecated.  Use slice instead.
+OnuploadprogressWarning=La uzado de la atributo onuploadprogress de XMLHttpRequest estas evitinda.
--- 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=Okazis nekonata eraro (%1$S)
--- a/dom/chrome/global.dtd
+++ b/dom/chrome/global.dtd
@@ -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/. -->
+
 <!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=Rekomenci
 Submit=Sendi formularon
 Browse=Esplori…
 FileUpload=Dosiera alŝuto
 MediaUpload=Alŝuti aŭdvidaĵon
 # 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 (%S Bildo, %S x %S grafikaj punktoj)
--- 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 stilfolio %1$S ne estis ŝargita ĉar ĝia MIMEa tipo "%2$S", ne estas "text/css".
 MimeNotCssWarn=La stilfolio %1$S estis ŝargita kiel CSS malgraŭ tio ke ĝia MIMEa tipo "%2$S", ne estas "text/css".
 
 PEUnexpEOF2=Neatendita fino de dosiero dum serĉado de %1$S.
 PEParseRuleWSOnly=Kateno, kiu nur havas spacetajn signojn, estis ricevita kiel rekonota regulo.
 PEDeclDropped=Deklaro abandonita.
 PEDeclSkipped=Pretersaltis al la sekvanta deklaro.
--- a/dom/chrome/layout/htmlparser.properties
+++ b/dom/chrome/layout/htmlparser.properties
@@ -1,60 +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 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=The character encoding of a framed document was not declared. The document may appear different if viewed without the document framing it.
 EncNoDeclarationPlain=The character encoding of the plain text document was not declared. The document will render with garbled text in some browser configurations if the document contains characters from outside the US-ASCII range. The character encoding of the file needs to be declared in the transfer protocol or file needs to use a byte order mark as an encoding signature.
 EncNoDeclaration=The character encoding of the HTML document was not declared. The document will render with garbled text in some browser configurations if the document contains characters from outside the US-ASCII range. The character encoding of the page must to be declared in the document or in the transfer protocol.
 EncLateMetaFrame=The character encoding declaration of the framed HTML document was not found when prescanning the first 1024 bytes of the file. When viewed without the document framing it, the page will reload automatically. The encoding declaration needs to be moved to be within the first 1024 bytes of the file.
 EncLateMeta=The character encoding declaration of the HTML document was not found when prescanning the first 1024 bytes of the file. When viewed in a differently-configured browser, this page will reload automatically. The encoding declaration needs to be moved to be within the first 1024 bytes of the file.
 EncLateMetaReload=The page was reloaded, because the character encoding declaration of the HTML document was not found when prescanning the first 1024 bytes of the file. The encoding declaration needs to be moved to be within the first 1024 bytes of the file.
 EncLateMetaTooLate=The character encoding declaration of document was found too late for it to take effect. The encoding declaration needs to be moved to be within the first 1024 bytes of the file.
 EncMetaUnsupported=An unsupported character encoding was declared for the HTML document using a meta tag. The declaration was ignored.
 EncProtocolUnsupported=An unsupported character encoding was declared on the transfer protocol level. The declaration was ignored.
 EncBomlessUtf16=Detected UTF-16-encoded Basic Latin-only text without a byte order mark and without a transfer protocol-level declaration. Encoding this content in UTF-16 is inefficient and the character encoding should have been declared in any case.
 EncMetaUtf16=A meta tag was used to declare the character encoding as UTF-16. This was interpreted as an UTF-8 declaration instead.
 EncMetaNonRoughSuperset=A meta tag was used to declare a character encoding the does not encode the Basic Latin range roughly like US-ASCII. The declaration was ignored.
 
-# The bulk of the messages in this file are derived from 
+# The bulk of the messages below are derived from 
 # http://hg.mozilla.org/projects/htmlparser/file/1f633cef7de7/src/nu/validator/htmlparser/impl/ErrorReportingTokenizer.java
 # which is available under the MIT license.
 
 # Tokenizer errors
 errGarbageAfterLtSlash=Garbage after “</”.
 errLtSlashGt=Saw “</>”. Probable causes: Unescaped “<” (escape as “&lt;”) or mistyped end tag.
 errCharRefLacksSemicolon=Character reference was not terminated by a semicolon.
 errNoDigitsInNCR=No digits in numeric character reference.
--- 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=La atributo "coords" de la etikedo <area shape="rect"> ne estas en la formo "left,top,right,bottom".
 ImageMapCircleWrongNumberOfCoords=La atributo "coords" de la etikedo <area shape="circle"> ne estas en la "center-x,center-y,radius" formo.
 ImageMapCircleNegativeRadius=La atributo "coords" de la etikedo <area shape="circle"> havas negativan radiuson.
 ImageMapPolyWrongNumberOfCoords=La atributo "coords" de la etikedo <area shape="poly"> tag ne estas en la formo "x1,y1,x2,y2 …".
 ImageMapPolyOddNumberOfCoords=Al la atributo "coords" attribute de la etikedo <area shape="poly"> mankas la lasta "y" koordinato (la ĝusta formo estas "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=Neatendita elemento <%1$S>.
 # LOCALIZATION NOTE: do not localize key="%S" modifiers="%S"
 GTK2Conflict=Klava evento ne disponebla en GTK2: key="%S" modifiers="%S"
 WinConflict=Klava evento ne disponebla en kelkaj klavaraj distribuoj: key="%S" modifiers="%S"
 TooDeepBindingRecursion=La bindado XBL "%S" jam estas uzata de tro multe de praulaj elementoj; ĝi ne estos aplikata por eviti senfinan rekuradon.
 CircularExtendsBinding=Etendado de la bindo XBL "%S" kun "%S" igus ĝin etendi sin mem
 # 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 = la memoro elĉerpiĝis
 2 = sintaksa eraro
 3 = neniu elemento trovita
 4 = malbone formita
 5 = nefermita ĵetono
 6 = parta karaktero
--- a/dom/chrome/layout/xul.properties
+++ b/dom/chrome/layout/xul.properties
@@ -1,40 +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):
-#   L. David Baron <dbaron@dbaron.org>, Mozilla Corporation
-#
-# 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=Malsukcesa ŝargado de surmeto el %1$S.
 PINotInProlog=La proceza instrukcio <?%1$S?> ne plu efikas ekster la prologo (see bug 360119).
 NeededToWrapXUL=La XUL skatolo por la elemento %1$S enhavis entekstan filon %2$S, kio ĉirkaŭvolvis en blokon ĉiujn siajn filojn.
 NeededToWrapXULInlineBox=La XUL skatolo por la elemento %1$S havis entekstan filon %2$S, kio ĉirkaŭvolvis en blokon ĉiujn siajn filojn.  Tion oni povas ofte solvi per anstataŭado de "display: -moz-inline-box" per "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 "Eraro dum ŝargado de paĝo">
 <!ENTITY retry.label "Klopodi denove">
 
 <!-- Specific error messages -->
 
 <!ENTITY connectionFailure.title "Malsukcesa konektado">
 <!ENTITY connectionFailure.longDesc "<p>Malgraŭ tio ke la retejo aspektas valida la retlegilo ne sukcesis konektiĝi al ĝi.</p><ul><li>Ĉu eble la retejo estas tempe ne aktiva? Klopodu denove poste.</li><li>Ĉu ankaŭ aliajn retejojn vi ne sukcesas vidi?  Kontrolu la retan konekton de la komputilo.</li><li>Ĉu vi komputilo aŭ reto estas protektata de retbarilo aŭ retperanto? Malĝustaj agordoj povus malhelpi la retesploradon.</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 "Aŭ vi povas aldoni escepton…">
 <!ENTITY securityOverride.warningContent "
 <p>Vi ne devus aldoni escepton se vi uzas interretan konekton kiun vi ne fidas tute aŭ se vi ne kutimas vidi averton por tiu ĉi retejo.</p>
 <p>Se vi daŭre volas aldoni escepton por tiu ĉi retejo, vi povas tion fari en la spertaj agordoj pri ĉifrado.</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=Ne povis konservi %S ĉar la fonta dosiero ne estis legebla.\n\nKlopodu poste aŭ kontaktu la servilan administranton.
 writeError=%S could not be saved, because an unknown error occurred.\n\nTry saving to a different location.
 launchError=%S could not be opened, because an unknown error occurred.\n\nTry saving to disk first and then opening the file.
 diskFull=Ne estas sufiĉe da libera spaco en la disko por konservi %S. Forigu la nebezonatajn dosierojn el la disko kaj klopodu denove aŭ klopodu konservi en alia loko.
 readOnly=%S ne povis esti konservita ĉar la disko, la dosierujo aŭ dosiero estas protektita kontraŭ skribado.\n\nŜanĝi la permesojn por ke la disko estu skribebla kaj klopodu denove, aŭ klopodu konservi la dosieron en alia loko.
 accessError=%S could not be saved, because you cannot change the contents of that folder.\n\nChange the folder properties and try again, or try saving in a different location.
 helperAppNotFound=%S could not be opened, because the associated helper application does not exist. Change the association in your preferences.
--- 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=Pri kromprogramoj
 enabledplugins_label=Aktivaj kromprogramoj
 nopluginsareenabled_label=Neniu aktiva kromprogramo estis trovita
 findmore_label=Trovi pli da informo pri retesplorilaj kromprogramoj ĉe
--- 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 = Permesi
 No = Rifuzi
 Titleline = Interreta sekureco
 CheckMessage = Memori ĉi tiun decidon
 EnableCapabilityQuery = Skizo el "%S" petas apartajn eblecojn kiuj estas NESEKURAJ kaj povus esti uzitaj por kompromiti vian komputilon aŭ viajn datumojn:\n\n%S\n\nPermesu tiujn eblecojn nur se vi fidas tiun ĉi fonton, ke ĝi ne enhavos virusojn aŭ fiprogramojn.
 EnableCapabilityDenied = Skizo el "%S" ne ricevis la privilegiojn %S.
 CheckLoadURIError = Sekureca eraro: Enhavo ĉe %S ne povas ŝargi aŭ ligi al %S.
 CheckSameOriginError = Sekureca eraro: La enhavo ĉe %S ne povas ŝargi datumojn el %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=Neatendita valoro %2$S dum la analizado de la atributo %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 "This XML file does not appear to have any style information associated with it. The document tree is shown below.">
--- 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  = Malsukcesa analizado de XSLT stilfolio.
 2  = Malsukcesa analizado de XPath esprimo.
 3  = 
 4  = Malsukcesa transformado de XSLT.
 5  = Nevalida funkcio de XSLT/XPath.
 6  = XSLT stilfolio (eble) enhavas rekuradon.
 7  = Nevalida atributa valoro en XSLT 1.0.
--- a/netwerk/necko.properties
+++ b/netwerk/necko.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 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/.
 
 #ResolvingHost=Looking up
 #ConnectedTo=Connected to
 #ConnectingTo=Connecting to
 #SendingRequestTo=Sending request to
 #TransferringDataFrom=Transferring data from
 
 3=Serĉado de adreso de %1$S…
--- a/security/manager/chrome/pipnss/nsserrors.properties
+++ b/security/manager/chrome/pipnss/nsserrors.properties
@@ -1,19 +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/.
+
 SSL_ERROR_EXPORT_ONLY_SERVER=Ne eblas komunikiĝi sekure.  La paro ne kapablas uzi altgradan ĉifradon.
 SSL_ERROR_US_ONLY_SERVER=Ne eblas komunikiĝi sekure.  La paro postulas altgradan ĉifradon kiu ne estas subtenata.
 SSL_ERROR_NO_CYPHER_OVERLAP=Ne eblas komunikiĝi sekure kun la paro: neniu komuna ĉifra algoritmo.
 SSL_ERROR_NO_CERTIFICATE=Ne eblas trovi la atestilon aŭ ŝlosilon bezonatan por la aŭtentikado.
 SSL_ERROR_BAD_CERTIFICATE=Ne eblas komunikiĝi sekure kun la paro: la atestilo de la paro estis rifuzita.
+SSL_ERROR_UNUSED_5=Unrecognized SSL error code.
 SSL_ERROR_BAD_CLIENT=La servilo renkontis malbonajn datumojn el la kliento.
 SSL_ERROR_BAD_SERVER=La kliento renkontis malbonajn datumojn el la servilo.
 SSL_ERROR_UNSUPPORTED_CERTIFICATE_TYPE=Nesubtenata tipo de atestilo.
 SSL_ERROR_UNSUPPORTED_VERSION=La paro uzas nesubtenatan version de sekureca protokolo.
+SSL_ERROR_UNUSED_10=Unrecognized SSL error code.
 SSL_ERROR_WRONG_CERTIFICATE=Aŭtentikado de kliento malsukcesa: privata ŝlosilo en la datumbazo de ŝlosiloj ne kongruas kun la publika ŝlosilo en la datumbazo de atestiloj.
 SSL_ERROR_BAD_CERT_DOMAIN=Ne eblas komunikiĝi sekure kun la paro: la petita retregiona nomo ne kongruas kun la atestilo de la servilo.
+SSL_ERROR_POST_WARNING=Unrecognized SSL error code.
 SSL_ERROR_SSL2_DISABLED=La paro nur subtenas version 2 de SSL, kiu estas loke malaktiva.
 SSL_ERROR_BAD_MAC_READ=SSL ricevis mesaĝon kun malĝusta aŭtentika kodo de mesaĝo.
 SSL_ERROR_BAD_MAC_ALERT=La paro de SSL raportas malĝustan aŭtentikan kodon de mesaĝo.
 SSL_ERROR_BAD_CERT_ALERT=La paro de SSL ne povas kontroli vian atestilon.
 SSL_ERROR_REVOKED_CERT_ALERT=La paro de SSL rifuzis vian atestilon kiel senvalidigita.
 SSL_ERROR_EXPIRED_CERT_ALERT=La paro de SSL rifuzis vian atestilon kiel senvalidiĝinta.
 SSL_ERROR_SSL_DISABLED=Ne eblas konekti: SSL ne estas aktiva.
 SSL_ERROR_FORTEZZA_PQG=Ne eblas konekti: la paro de SSL estas en alia retregiono de FORTEZZA.
@@ -106,16 +113,20 @@ SSL_ERROR_BAD_CERT_STATUS_RESPONSE_ALERT
 SSL_ERROR_BAD_CERT_HASH_VALUE_ALERT=SSL peer reported bad certificate hash value.
 SSL_ERROR_RX_UNEXPECTED_NEW_SESSION_TICKET=SSL received an unexpected New Session Ticket handshake message.
 SSL_ERROR_RX_MALFORMED_NEW_SESSION_TICKET=SSL received a malformed New Session Ticket handshake message.
 SSL_ERROR_DECOMPRESSION_FAILURE=SSL received a compressed record that could not be decompressed.
 SSL_ERROR_RENEGOTIATION_NOT_ALLOWED=Renegotiation is not allowed on this SSL socket.
 SSL_ERROR_UNSAFE_NEGOTIATION=Peer attempted old style (potentially vulnerable) handshake.
 SSL_ERROR_RX_UNEXPECTED_UNCOMPRESSED_RECORD=SSL received an unexpected uncompressed record.
 SSL_ERROR_WEAK_SERVER_EPHEMERAL_DH_KEY=SSL received a weak ephemeral Diffie-Hellman key in Server Key Exchange handshake message.
+SSL_ERROR_NEXT_PROTOCOL_DATA_INVALID=SSL received invalid NPN extension data.
+SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_SSL2=SSL feature not supported for SSL 2.0 connections.
+SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_SERVERS=SSL feature not supported for servers.
+SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_CLIENTS=SSL feature not supported for clients.
 SEC_ERROR_IO=An I/O error occurred during security authorization.
 SEC_ERROR_LIBRARY_FAILURE=security library failure.
 SEC_ERROR_BAD_DATA=security library: received bad data.
 SEC_ERROR_OUTPUT_LEN=security library: output length error.
 SEC_ERROR_INPUT_LEN=security library has experienced an input length error.
 SEC_ERROR_INVALID_ARGS=security library: invalid arguments.
 SEC_ERROR_INVALID_ALGORITHM=security library: invalid algorithm.
 SEC_ERROR_INVALID_AVA=security library: invalid AVA.
@@ -139,17 +150,17 @@ SEC_ERROR_ADDING_CERT=Error adding certi
 SEC_ERROR_FILING_KEY=Error refiling the key for this certificate.
 SEC_ERROR_NO_KEY=The private key for this certificate cannot be found in key database
 SEC_ERROR_CERT_VALID=This certificate is valid.
 SEC_ERROR_CERT_NOT_VALID=This certificate is not valid.
 SEC_ERROR_CERT_NO_RESPONSE=Cert Library: No Response
 SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE=The certificate issuer's certificate has expired.  Check your system date and time.
 SEC_ERROR_CRL_EXPIRED=The CRL for the certificate's issuer has expired.  Update it or check your system date and time.
 SEC_ERROR_CRL_BAD_SIGNATURE=The CRL for the certificate's issuer has an invalid signature.
-SEC_ERROR_CRL_INVALID=New CRL has an invalid format.
+SEC_ERROR_CRL_INVALID=La nova CRL havas nevalidan formon.
 SEC_ERROR_EXTENSION_VALUE_INVALID=Certificate extension value is invalid.
 SEC_ERROR_EXTENSION_NOT_FOUND=Certificate extension not found.
 SEC_ERROR_CA_CERT_INVALID=Issuer certificate is invalid.
 SEC_ERROR_PATH_LEN_CONSTRAINT_INVALID=Certificate path length constraint is invalid.
 SEC_ERROR_CERT_USAGES_INVALID=Certificate usages field is invalid.
 SEC_INTERNAL_ONLY=**Internal ONLY module**
 SEC_ERROR_INVALID_KEY=The key does not support the requested operation.
 SEC_ERROR_UNKNOWN_CRITICAL_EXTENSION=Certificate contains unknown critical extension.
@@ -278,8 +289,13 @@ SEC_ERROR_BAD_LDAP_RESPONSE=Servilo redonis malĝustan LDAP respondon
 SEC_ERROR_FAILED_TO_ENCODE_DATA=Failed to encode data with ASN1 encoder
 SEC_ERROR_BAD_INFO_ACCESS_LOCATION=Bad information access location in cert extension
 SEC_ERROR_LIBPKIX_INTERNAL=Libpkix internal error occured during cert validation.
 SEC_ERROR_PKCS11_GENERAL_ERROR=A PKCS #11 module returned CKR_GENERAL_ERROR, indicating that an unrecoverable error has occurred.
 SEC_ERROR_PKCS11_FUNCTION_FAILED=A PKCS #11 module returned CKR_FUNCTION_FAILED, indicating that the requested function could not be performed.  Trying the same operation again might succeed.
 SEC_ERROR_PKCS11_DEVICE_ERROR=A PKCS #11 module returned CKR_DEVICE_ERROR, indicating that a problem has occurred with the token or slot.
 SEC_ERROR_BAD_INFO_ACCESS_METHOD=Unknown information access method in certificate extension.
 SEC_ERROR_CRL_IMPORT_FAILED=Error attempting to import a CRL.
+SEC_ERROR_EXPIRED_PASSWORD=The password expired.
+SEC_ERROR_LOCKED_PASSWORD=The password is locked.
+SEC_ERROR_UNKNOWN_PKCS11_ERROR=Unknown PKCS #11 error.
+SEC_ERROR_BAD_CRL_DP_URL=Invalid or unsupported URL in CRL distribution point name.
+SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED=The certificate was signed using an signature algorithm that is disabled because it is not secure.
--- a/security/manager/chrome/pipnss/pipnss.properties
+++ b/security/manager/chrome/pipnss/pipnss.properties
@@ -1,48 +1,12 @@
 #
-# ***** 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):
-#   Javier Delgadillo <javi@netscape.com>
-#   Brian Ryner <bryner@brianryner.com>
-#   Terry Hayes <thayes@netscape.com>
-#   John Gardiner Myers <jgmyers@speakeasy.net>
-#
-# 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/.
 
 SignedBy=Subskribita de %S
 CertPassPrompt=Bonvolu tajpi la ĉefan pasvorton por la %S.
 # the following strings have special requirements:
 # they must fit in a 32 or 64 byte buffer after being translated
 # to UTF8.  Note to translator. It's not easy for you to figure
 # whether the escaped unicode string you produce will fit in 
 # the space allocated.
--- a/security/manager/chrome/pipnss/security.properties
+++ b/security/manager/chrome/pipnss/security.properties
@@ -1,45 +1,12 @@
 #
-# ***** 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):
-#   Sean Cotter <cotter@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/.
 
 Title=Sekureca atentigo
 MixedContentMessage=Vi petis ĉifritan paĝon kiu enhavas kelkajn neĉifritajn informojn. Informo kiun vi vidos aŭ tajpos en tiu ĉi paĝo povus esti facile legita de iu alia.
 LeaveSecureMessage=Vi foriras el ĉifrita paĝo. Informoj senditaj aŭ ricevitaj de vi ekde nun povus esti facile legitaj de iu alia.
 EnterSecureMessage=Vi petis ĉifritan paĝon.  La TTT-a retejo korekte identiĝis, kaj la informojn vi vidos aŭ tajpos en tiu ĉi paĝo ne povas esti facile legitaj de iu alia.
 WeakSecureMessage=Vi petis ĉifritan paĝon. La TTT-a retejo korekte identiĝis, sed la informo kiun vi vi vidos aŭ tajpos povus estis legitaj de iu alia.
 PostToInsecureFromSecureMessage=Kvankam tiu ĉi paĝo estas ĉifrita, la informoj kiujn vi enigis estos senditaj per neĉifrita konekto kaj ili povus esti facile legitaj de iu alia.##Ĉu vi certe volas daŭrigi la sendadon de ĉi tiujn informojn?##
 PostToInsecureFromInsecureMessage=La informo  kiun vi enigis estos sendita per neĉifrita konekto kaj ĝi povus esti facile legita de iu alia.##Ĉu vi certe volas daŭrigi la sendadon de ĉi tiu informo?##
--- a/security/manager/chrome/pippki/certManager.dtd
+++ b/security/manager/chrome/pippki/certManager.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.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Ian McGreer <mcgreer@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/. -->
 
 <!ENTITY certmgr.title                       "Atestila administranto">
 
 <!ENTITY certmgr.tab.mine                     "Viaj atestiloj">
 <!ENTITY certmgr.tab.others2                  "Personoj">
 <!ENTITY certmgr.tab.websites3                "Serviloj">
 <!ENTITY certmgr.tab.ca                       "Aŭtoritatoj">
 <!ENTITY certmgr.tab.orphan2                  "Aliaj">
--- a/security/manager/chrome/pippki/deviceManager.dtd
+++ b/security/manager/chrome/pippki/deviceManager.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.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Ian McGreer <mcgreer@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/. -->
 
 <!ENTITY devmgr.title                           "Aparata administranto">
 
 <!ENTITY devmgr.devlist.label                   "Sekurecaj programonoj kaj aparatoj">
 <!ENTITY devmgr.details.title                   "Detaloj">
 <!ENTITY devmgr.details.title2                  "Valoro">
 <!ENTITY devmgr.status.label                    "Stato">
 <!ENTITY devmgr.version.label                   "Versio">
--- a/security/manager/chrome/pippki/pippki.dtd
+++ b/security/manager/chrome/pippki/pippki.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.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Terry Hayes <thayes@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/. -->
 
 <!-- Values for changepassword.xul -->
 <!ENTITY setPassword.title  "Ŝanĝi ĉefan pasvorton">
 <!ENTITY setPassword.tokenName.label "Sekureca aparato">
 <!ENTITY setPassword.oldPassword.label "Nuna pasvorto:">
 <!ENTITY setPassword.newPassword.label "Nova pasvorto:">
 <!ENTITY setPassword.reenterPassword.label "Nova pasvorto (denove):">
 <!ENTITY setPassword.meter.label "Mezurilo de pasvorta kvalito">
--- a/security/manager/chrome/pippki/pippki.properties
+++ b/security/manager/chrome/pippki/pippki.properties
@@ -1,44 +1,12 @@
 #
-# ***** 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 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/.
 
 SignedBy=Aŭtentigita de %S
 CertPassPrompt=Bonvolu tajpi la personan sekurecan pasvorton por la sekureca aparato PSM privataj ŝlosiloj.
 
 #These are for dialogs
 #Download Cert dialog
 newCAMessage1=Ĉu vi volas fidi je  "%S" por la jenaj taskoj?
 unnamedCA=Atestila aŭtoritato (sennoma)
--- a/security/manager/chrome/pippki/validation.dtd
+++ b/security/manager/chrome/pippki/validation.dtd
@@ -1,57 +1,24 @@
-<!-- ***** 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 Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   David P. Drinan (ddrinan@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/. -->
 
 <!ENTITY  validation.crlmanager.label             "Manage CRLs">
 <!ENTITY  validation.crlmanager.description       "These Certificate Revocation Lists (CRL) are stored in your certificate database:">
 <!ENTITY  validation.crlname.label                "Nomo">
 <!ENTITY  validation.crllastupdate.label          "Last Update">
 <!ENTITY  validation.crlnextupdate.label          "Next Update">
 <!ENTITY  validation.crlautoupdateenabled.label   "Auto Update">
 <!ENTITY  validation.crlautoupdatestatus.label    "Auto Update Status">
 <!ENTITY  validation.deletecrl.label              "Forviŝi">
 <!ENTITY  validation.deletecrl.accesskey          "D">
 <!ENTITY  validation.updatecrl.label              "Ĝisdatigi">
 <!ENTITY  validation.updatecrl.accesskey          "U">
-<!ENTITY  validation.advanced.label               "Settings">
+<!ENTITY  validation.advanced.label               "Agordoj">
 <!ENTITY  validation.advanced.accesskey           "S">
 
 <!ENTITY  validation.crl.autoupdate.title         "Automatic CRL Update Preferences">
 <!ENTITY  validation.crl.autoupdate.enable.label  "Enable Automatic Update for this CRL">
 <!ENTITY  validation.crl.autoupdate.time.label1   "Ĝisdatigi">
 <!ENTITY  validation.crl.autoupdate.time.label2   "Day(s) before Next Update date">
 <!ENTITY  validation.crl.autoupdate.freq.label1   "Update every">
 <!ENTITY  validation.crl.autoupdate.freq.label2   "Day(s)">
@@ -59,9 +26,9 @@
 <!ENTITY  crl.import.status.title                 "CRL Import Status">
 <!ENTITY  crl.import.success.message              "The Certificate Revocation List (CRL) was successfully imported.">
 <!ENTITY  crl.issuer.label                        "CRL Issued By:">
 <!ENTITY  crl.issuer.org.label                    "Organization: ">
 <!ENTITY  crl.issuer.orgunit.label                "Unit: ">
 <!ENTITY  crl.import.nextupdate.label             "Next Update On: ">
 <!ENTITY  crl.autoupdate.fail.cnt.label           "Previous Consecutive Update Failures: ">
 <!ENTITY  crl.autoupdate.fail.reason.label        "Details of Last Update Failure: ">
-<!ENTITY  edit.button                             "Settings">
+<!ENTITY  edit.button                             "Agordoj">
--- a/services/sync/errors.properties
+++ b/services/sync/errors.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/.
+
 error.login.reason.network      = Ne eblis konekti la servilon
 error.login.reason.recoverykey  = Malĝusta reakira ŝlosilo
 error.login.reason.account      = Malĝusta nomo de konto aŭ pasvorto
 error.login.reason.no_username  = Neekzistanta nomo de konto
 error.login.reason.no_password2 = Neekzistanta pasvorto
 error.login.reason.no_recoverykey= Neniu konservita reakira ŝlosilo estas uzebla
 error.login.reason.server       = Servilo malĝuste agordita
 
--- a/services/sync/sync.properties
+++ b/services/sync/sync.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/.
+
 # %1: the user name (Ed), %2: the app name (Firefox), %3: the operating system (Android)
 client.name2 = %2$S de %1$S en %3$S
 
 # %S is the date and time at which the last sync successfully completed
 lastSync2.label = Lasta spegulado: %S
 
 mobile.label = Legosignoj de poŝtelefono
 
--- a/toolkit/chrome/alerts/notificationNames.properties
+++ b/toolkit/chrome/alerts/notificationNames.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/.
+
 general=Ĝenerala sciigo
--- a/toolkit/chrome/autoconfig/autoconfig.properties
+++ b/toolkit/chrome/autoconfig/autoconfig.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/.
+
 readConfigTitle = Eraro en agordado
 readConfigMsg = Malsukcesa legado de la agorda dosiero. Bonvolu kontakti vian sisteman administranton.
 
 autoConfigTitle = Averto de aŭtomata agordado
 autoConfigMsg = Malsukceso je Netscape.cfg/AutoConfig. Bonvolu kontakti vian sisteman administranton. \n Eraro: %S malsukcesa:
 
 emailPromptTitle = Retpoŝta adreso
 emailPromptMsg = Tajpu vian retpoŝtan adreson
--- a/toolkit/chrome/cookie/cookieAcceptDialog.dtd
+++ b/toolkit/chrome/cookie/cookieAcceptDialog.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     props.name.label               "Nomo:">
 <!ENTITY     props.value.label              "Enhavo:">
 <!ENTITY     props.domain.label             "Servilo:">
 <!ENTITY     props.path.label               "Vojo:">
 <!ENTITY     props.secure.label             "Sendi por:">
 <!ENTITY     props.expires.label            "Senvalidiĝos:">
 
 <!ENTITY     button.allow.label             "Permesi">
--- a/toolkit/chrome/cookie/cookieAcceptDialog.properties
+++ b/toolkit/chrome/cookie/cookieAcceptDialog.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/.
+
 hostColon=Servilo:
 domainColon=Retregiono:
 forSecureOnly=Nur ĉifritaj konektadoj
 forAnyConnection=Ia ajn konektado
 expireAtEndOfSession=je la fino de la seanco
 
 showDetails=Montri detalojn
 hideDetails=Kaŝi detalojn
--- a/toolkit/chrome/global-platform/mac/intl.properties
+++ b/toolkit/chrome/global-platform/mac/intl.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/.
+
 # moved from navigator/locale/navigator.properties
 intl.charset.default=UTF-8
 # LOCALIZATION NOTE (intl.ellipsis): Use the unicode ellipsis char, \u2026,
 # or use "..." if \u2026 doesn't suit traditions in your locale.
 intl.ellipsis=…
--- a/toolkit/chrome/global-platform/mac/platformKeys.properties
+++ b/toolkit/chrome/global-platform/mac/platformKeys.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/.
+
 #mac
 #this file defines the on screen display names for the various modifier keys
 #these are used in XP menus to show keyboard shortcuts
 
 #the shift key - open up arrow symbol (ctrl-e)
 VK_SHIFT=\u21e7
 
 #the command key - clover leaf symbol (ctrl-q)
--- a/toolkit/chrome/global-platform/unix/intl.properties
+++ b/toolkit/chrome/global-platform/unix/intl.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/.
+
 # moved from navigator/locale/navigator.properties
 intl.charset.default=UTF-8
 # LOCALIZATION NOTE (intl.ellipsis): Use the unicode ellipsis char, \u2026,
 # or use "..." if \u2026 doesn't suit traditions in your locale.
 intl.ellipsis=…
--- a/toolkit/chrome/global-platform/unix/platformKeys.properties
+++ b/toolkit/chrome/global-platform/unix/platformKeys.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/.
+
 #default
 #this file defines the on screen display names for the various modifier keys
 #these are used in XP menus to show keyboard shortcuts
 
 #the shift key
 VK_SHIFT=Maj
 
 #the command key
--- a/toolkit/chrome/global-platform/win/intl.properties
+++ b/toolkit/chrome/global-platform/win/intl.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/.
+
 # moved from navigator/locale/navigator.properties
 intl.charset.default=UTF-8
 # LOCALIZATION NOTE (intl.ellipsis): Use the unicode ellipsis char, \u2026,
 # or use "..." if \u2026 doesn't suit traditions in your locale.
 intl.ellipsis=…
--- a/toolkit/chrome/global-platform/win/platformKeys.properties
+++ b/toolkit/chrome/global-platform/win/platformKeys.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/.
+
 #default
 #this file defines the on screen display names for the various modifier keys
 #these are used in XP menus to show keyboard shortcuts
 
 #the shift key
 VK_SHIFT=Maj
 
 #the command key
--- a/toolkit/chrome/global-region/region.properties
+++ b/toolkit/chrome/global-region/region.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/.
+
 #
 #   Localizable URLs
 #
 pluginStartupMessage=Unua kromprogramo por tipo
 
 # plug-ins URLs
 more_plugins_label=mozilla.org
 more_plugins_url=https://pfs.mozilla.org/plugins/
--- a/toolkit/chrome/global/aboutAbout.dtd
+++ b/toolkit/chrome/global/aboutAbout.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 aboutAbout.title  "Pri Pri">
 <!ENTITY aboutAbout.note   "Tiu ĉi estas listo de “pri” paĝoj por via uzado.<br/>
                             Kelkaj el ili povas esti konfuzaj.  Kelkaj nur utilas por diagnozo.<br/>
                             Kaj kelkaj ne aperas ĉar ili postulas serĉotekstojn.">
--- a/toolkit/chrome/global/aboutRights.dtd
+++ b/toolkit/chrome/global/aboutRights.dtd
@@ -59,17 +59,17 @@
 <!ENTITY rights.safebrowsing-term2 "Select the Security selection">
 <!ENTITY rights.safebrowsing-term3 "Uncheck the options to &quot;&blockAttackSites.label;&quot; and &quot;&blockWebForgeries.label;&quot;">
 <!ENTITY rights.safebrowsing-term4 "Safe Browsing is now disabled">
 
 <!-- location aware browsing points for branded builds -->
 <!ENTITY rights.locationawarebrowsing-a "Location Aware Browsing: ">
 <!ENTITY rights.locationawarebrowsing-b "is always opt-in.  No location information is ever sent without your permission.  If you wish to disable the feature completely, follow these steps:">
 <!ENTITY rights.locationawarebrowsing-term1a "En la adresa strio tajpu ">
-<!ENTITY rights.locationawarebrowsing-term1b "about:config">
+<!ENTITY rights.locationawarebrowsing-term1b "pri:agordo">
 <!ENTITY rights.locationawarebrowsing-term2 "Tajpu geo.enabled">
 <!ENTITY rights.locationawarebrowsing-term3 "Duoble alklaku la preferon geo.enabled">
 <!ENTITY rights.locationawarebrowsing-term4 "Location-Aware Browsing is now disabled">
 
 <!-- intro paragraph for unbranded builds -->
 <!ENTITY rights.webservices-unbranded "Superrigardo de la retejaj servoj inkluzivitaj de la produkto, kune kun instrukcioj pri kiel malaktivigi ilin, se eblas, devus aperi ĉi tie.">
 
 <!-- point 1 text for unbranded builds -->
--- a/toolkit/chrome/global/aboutRights.properties
+++ b/toolkit/chrome/global/aboutRights.properties
@@ -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/.
+
 buttonLabel = Konu viajn rajtojn…
 buttonAccessKey = K
 notifyRightsText = %S estas libera kaj malfermitkoda programo de la neprofitcela organizo Mozilla Foundation.
--- a/toolkit/chrome/global/aboutSupport.dtd
+++ b/toolkit/chrome/global/aboutSupport.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 aboutSupport.pageTitle "Informo por solvado de problemoj">
 
 <!-- LOCALIZATION NOTE (aboutSupport.pageSubtitle): don't change the 'supportLink' id. -->
 <!ENTITY aboutSupport.pageSubtitle "
   Tiu ĉi paĝo enhavas teĥnikajn informojn kiuj povas esti utilaj kiam vi klopodas solvi problemon. Se vi serĉas respondojn al oftaj demandoj pri  &brandShortName;, bonvolu viziti nian <a id='supportLink'>helporetejon</a>.
 ">
 
 <!ENTITY aboutSupport.extensionsTitle "Etendoprogramoj">
@@ -16,31 +20,23 @@
 <!ENTITY aboutSupport.appBasicsVersion "Versio">
 
 <!ENTITY aboutSupport.appBasicsProfileDir "Dosierujo de profiloj">
 <!-- LOCALIZATION NOTE (aboutSupport.appBasicsProfileDirWinMac):
 This is the Windows- and Mac-specific variant of aboutSupport.appBasicsProfileDir.
 Windows/Mac use the term "Folder" instead of "Directory" -->
 <!ENTITY aboutSupport.appBasicsProfileDirWinMac "Dosierujo de profiloj">
 
-<!ENTITY aboutSupport.appBasicsEnabledPlugins "Aktivigitaj kromprogramoj">
+<!ENTITY aboutSupport.appBasicsEnabledPlugins "Aktivaj kromprogramoj">
 <!ENTITY aboutSupport.appBasicsBuildConfig "Agordoj de konstruado">
 <!ENTITY aboutSupport.appBasicsUserAgent "Agento de uzanto">
 <!ENTITY aboutSupport.appBasicsCrashIDs "Raportoj pri paneoj">
 <!ENTITY aboutSupport.appBasicsMemoryUse "Uzado de memoro">
 
 <!ENTITY aboutSupport.showDir.label "Malfermi dosierujon">
-
-<!ENTITY aboutSupport.appBasicsEnabledPlugins "Aktivaj kromprogramoj">
-<!ENTITY aboutSupport.appBasicsBuildConfig "Agordoj de konstruado">
-<!ENTITY aboutSupport.appBasicsUserAgent "Agento de uzanto">
-<!ENTITY aboutSupport.appBasicsCrashIDs "Raportoj pri paneoj">
-<!ENTITY aboutSupport.appBasicsMemoryUse "Uzado de memoro">
-
-<!ENTITY aboutSupport.showDir.label "Open Directory">
 <!-- LOCALIZATION NOTE (aboutSupport.showMac.label): This is the Mac-specific
 variant of aboutSupport.showDir.label.  This allows us to use the preferred
 "Finder" terminology on Mac. -->
 <!ENTITY aboutSupport.showMac.label "Montri en dosierserĉilo">
 <!-- LOCALIZATION NOTE (aboutSupport.showWin.label): This is the Windows-specific
 variant of aboutSupport.showDir.label. -->
 <!ENTITY aboutSupport.showWin.label "Montri dosierujon">
 
--- a/toolkit/chrome/global/aboutSupport.properties
+++ b/toolkit/chrome/global/aboutSupport.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 the following strings, "Direct2D", "DirectWrite" and "ClearType" 
 # are proper nouns and should not be translated. Feel free to leave english strings if 
 # there are no good translations, these are only used in about:support
 
 # LOCALIZATION NOTE: This can be localized with a more generic term, like
 # "Graphics-accelerated Windows". It describes a number of windows, e.g.:
 # "GPU Accelerated Windows: 2/2 (Direct3D 9)"
 # "GPU Accelerated Windows: 0/2"
--- a/toolkit/chrome/global/actions.dtd
+++ b/toolkit/chrome/global/actions.dtd
@@ -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/. -->
+
 <!ENTITY action.switchToTab.label "Iri al folio">
--- a/toolkit/chrome/global/appPicker.dtd
+++ b/toolkit/chrome/global/appPicker.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/. -->
+
 <!ENTITY NoAppFound.label      "Neniu programo estis trovita por tiu ĉi tipo de dosiero">
 <!ENTITY BrowseButton.label    "Esplori…">
 <!ENTITY SendMsg.label         "Sendi tiun ĉi elementon al:">
--- a/toolkit/chrome/global/browser.properties
+++ b/toolkit/chrome/global/browser.properties
@@ -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/.
+
 browsewithcaret.checkMsg=Ne montri ĉi tiun dialogon denove.
 browsewithcaret.checkWindowTitle=Esplorado per "Caret"
 browsewithcaret.checkLabel=Premado de F7 ŝaltas kaj malŝaltas la esploradon per "Caret". Tiu trajto lokigas movigeblan montrilon en retpaĝoj, kio permesas al vi elekti tekston per la klavaro. Ĉu vi volas ŝalti la esploradon per "Caret"?
 browsewithcaret.checkButtonLabel=Jes
--- a/toolkit/chrome/global/charsetOverlay.dtd
+++ b/toolkit/chrome/global/charsetOverlay.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 charsetOverlay.xul -->
 <!ENTITY charsetMenu.label             "Signa enkodigo">
 <!ENTITY charsetMenu.accesskey         "k">
 <!ENTITY charsetMenuAutodet.label      "Eltrovi aŭtomate">
 <!ENTITY charsetMenuAutodet.accesskey  "a">
 <!ENTITY charsetMenuMore.label         "Pliaj enkodigoj">
 <!ENTITY charsetMenuMore.accesskey     "P">
 <!ENTITY charsetMenuMore1.label        "Okcidenteŭropaj">
--- a/toolkit/chrome/global/commonDialog.dtd
+++ b/toolkit/chrome/global/commonDialog.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 header.label     "Mallonga titolo"> 
 <!ENTITY message.label    "Ekzempla teksto estos ĉi tie.">
 <!ENTITY editfield0.label "Nomo de uzanto:"> 
 <!ENTITY editfield1.label "Pasvorto:"> 
 <!ENTITY checkbox.label   "kontroli">
 <!ENTITY copyCmd.label    "Kopii">
 <!ENTITY copyCmd.accesskey "K">
 <!ENTITY selectAllCmd.label "Elekti ĉion">
--- a/toolkit/chrome/global/commonDialogs.properties
+++ b/toolkit/chrome/global/commonDialogs.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/.
+
 Alert=Atentigo
 Confirm=Konfirmi
 ConfirmCheck=Konfirmi
 Prompt=Demando
 PromptUsernameAndPassword2=Aŭtentigado postulata
 PromptPassword2=Pasvorto postulata
 Select=Elekti
 OK=Akcepti
--- a/toolkit/chrome/global/config.dtd
+++ b/toolkit/chrome/global/config.dtd
@@ -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 configuration viewer.
-   -
-   - 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):
-   -
-   - 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 window.title "pri:agordo">
 
 <!-- about:config warning page -->
 <!-- LOCALIZATION NOTE: aboutWarningTitle.label should be attention grabbing and playful -->
 <!ENTITY aboutWarningTitle.label "Tio povas nuligi vian garantion!">
 <!ENTITY aboutWarningText.label "Ŝanĝado de tiuj spertaj agordoj povas efiki malbone sur la stabileco, sekureco kaj efikeco de tiu ĉi programo. Vi devus daŭrigi nur se vi estas certa ke vi scias kion vi faras.">
 <!ENTITY aboutWarningButton.label "Mi estos singarda, mi promesas!">
--- a/toolkit/chrome/global/config.properties
+++ b/toolkit/chrome/global/config.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 configuration viewer.
-#
-# 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 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/.
 
 # Lock column values
 default=norma
 user=difinita de uzanto
 locked=blokita
 
 # Type column values
 string=kateno
--- a/toolkit/chrome/global/console.dtd
+++ b/toolkit/chrome/global/console.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) 1998-1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the 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 errorConsole.title "Konzolo de eraro">
 
 <!ENTITY errFile.label   "Fonta dosiero:">
 <!ENTITY errLine.label   "Linio:">
 <!ENTITY errColumn.label "Kolumno:">
 
 <!ENTITY all.label          "Ĉiuj">
--- a/toolkit/chrome/global/console.properties
+++ b/toolkit/chrome/global/console.properties
@@ -1,7 +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/.
+
 typeError=Eraro:
 typeWarning=Averto:
 errFile=Fonta dosiero: %S
 errLine=Linio: %S
 errLineCol=Linio: %S, kolumno: %S
 errCode=Fonta Kodo:
 errTime=Tempostampo: %S
--- a/toolkit/chrome/global/contentAreaCommands.properties
+++ b/toolkit/chrome/global/contentAreaCommands.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/.
+
 # context menu strings
 
 SaveImageTitle=Konservi bildon
 SaveVideoTitle=Konservi videon
 SaveAudioTitle=Konservi aŭdeblaĵonn
 SaveLinkTitle=Konservi kiel
 DefaultSaveFileName=indekso
 WebPageCompleteFilter=TTTa paĝo, kompleta
--- a/toolkit/chrome/global/customizeCharset.dtd
+++ b/toolkit/chrome/global/customizeCharset.dtd
@@ -1,46 +1,12 @@
 <!-- -*- Mode: HTML -*- -->
-<!-- ***** 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 charset encoding.
-   -
-   - 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):
-   -  Stephen Lamm <slamm@netscape.com>
-   -  Pierre Chanial <p_ch@verizon.net>
-   -
-   - 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 title.label        "Persone agordi signan enkodigon">
 <!ENTITY current.label      "Aktivaj signaj enkodigoj:">
 <!ENTITY remove.label       "Forigi">
 <!ENTITY remove.accessKey   "F">
 <!ENTITY additional.label   "Disponeblaj signaj enkodigoj:">
 <!ENTITY add.label          "Aldoni">
 <!ENTITY add.accessKey      "A">
--- a/toolkit/chrome/global/customizeToolbar.dtd
+++ b/toolkit/chrome/global/customizeToolbar.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 dialog.title             "Persone agordi ilaron">
 <!ENTITY dialog.dimensions        "width: 92ch; height: 36em;">
 <!ENTITY instructions.description "Vi povas aldoni aŭ forviŝi elementojn trenante ilin el aŭ al la ilaroj.">
 <!ENTITY show.label               "Montri:">
 <!ENTITY iconsAndText.label       "Bildsimboloj kaj teksto">
 <!ENTITY icons.label              "Bildsimboloj">
 <!ENTITY text.label               "Teksto">
 <!ENTITY useSmallIcons.label      "Uzi etajn bildsimbolojn">
--- a/toolkit/chrome/global/customizeToolbar.properties
+++ b/toolkit/chrome/global/customizeToolbar.properties
@@ -1,7 +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/.
+
 enterToolbarTitle=Nova ilaro
 enterToolbarName=Tajpu nomon por tiu ĉi ilaro
 enterToolbarDup=Jam ekzistas ilaro kun la nomo "%S". Bonvolu tajpi alian nomon.
 enterToolbarBlank=Vi devas tajpi nomon por krei novan ilaron.
 separatorTitle=Nova apartigilo
 springTitle=Fleksebla spaco
 spacerTitle=Spaco
--- a/toolkit/chrome/global/dateFormat.properties
+++ b/toolkit/chrome/global/dateFormat.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 OEone Calendar Code, released October 31st, 2001.
-#
-# The Initial Developer of the Original Code is
-# OEone Corporation.
-# Portions created by OEone Corporation are Copyright (C) 2001
-# OEone Corporation. All Rights Reserved.
-#
-# Contributor(s):
-#   Garth Smedley <garths@oeone.com>
-#   Martin Schroeder <mschroeder@mozilla.x-home.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/.
 
 month.1.Mmm=Jan
 month.2.Mmm=Feb
 month.3.Mmm=Mar
 month.4.Mmm=Apr
 month.5.Mmm=Maj
 month.6.Mmm=Jun
 month.7.Mmm=Jul
--- a/toolkit/chrome/global/datetimepicker.dtd
+++ b/toolkit/chrome/global/datetimepicker.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/. -->
+
 <!-- first day of week to display in datepicker, a value from 0 to 6,
      0 = Sunday, 1 = Monday, etc. -->
 <!ENTITY firstdayofweek.default "0">
--- a/toolkit/chrome/global/dialog.properties
+++ b/toolkit/chrome/global/dialog.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-accept=Akcepti
 button-cancel=Nuligi
 button-help=Helpo
 button-disclosure=Pli da informo
 accesskey-accept=
 accesskey-cancel=
 accesskey-help=H
 accesskey-disclosure=I
--- a/toolkit/chrome/global/dialogOverlay.dtd
+++ b/toolkit/chrome/global/dialogOverlay.dtd
@@ -1,44 +1,12 @@
 <!-- -*- Mode: HTML -*-
-# ***** 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 toolkit.
-#
-# 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):
-#
-# 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/.
 #
 # WARNING!!! This file is obsoleted by the dialog.xml widget
 #
 -->
 
 <!-- OK Cancel Buttons -->
 <!ENTITY okButton.label      "Akcepti">
 <!ENTITY cancelButton.label  "Nuligi">
--- a/toolkit/chrome/global/downloadProgress.properties
+++ b/toolkit/chrome/global/downloadProgress.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 (BadPluginTitle): 
 #
 #    This dialog is displayed when plugin throws unhandled exception
 #
 BadPluginTitle=Nevalida ago en kromprogramo
 # LOCALIZATION NOTE (BadPluginMessage): 
 #
 #    This is the message for the BadPlugin dialog.
--- a/toolkit/chrome/global/editMenuOverlay.dtd
+++ b/toolkit/chrome/global/editMenuOverlay.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 editMenu.label            "Modifi">
 <!ENTITY editMenu.accesskey        "M">
 <!ENTITY undoCmd.label             "Malfari">
 <!ENTITY undoCmd.key               "Z">
 <!ENTITY undoCmd.accesskey         "M">
 <!ENTITY redoCmd.label             "Refari">
 <!ENTITY redoCmd.key               "Y">
 <!ENTITY redoCmd.accesskey         "R">
--- a/toolkit/chrome/global/filefield.properties
+++ b/toolkit/chrome/global/filefield.properties
@@ -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/.
+
 #### Change Action
 
 downloadHelperNoneSelected=Neniu elektita
--- a/toolkit/chrome/global/filepicker.dtd
+++ b/toolkit/chrome/global/filepicker.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 lookInMenuList.label   "Rigardi en:">
 <!ENTITY lookInMenuList.accesskey   "R">
 <!ENTITY textInput.label        "Dosiera nomo:">
 <!ENTITY textInput.accesskey        "n">
 <!ENTITY filterMenuList.label   "Dosieroj de tipo:">
 <!ENTITY filterMenuList.accesskey   "t">
 <!ENTITY name.label             "Nomo">
 <!ENTITY size.label             "Grando">
--- a/toolkit/chrome/global/filepicker.properties
+++ b/toolkit/chrome/global/filepicker.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 extensions to which these descriptions refer
 #                    now live in toolkit/content/filepicker.properties
 allTitle=Ĉiuj dosieroj
 htmlTitle=HTMLaj dosieroj
 textTitle=Tekstaj dosieroj
 imageTitle=Bildaj dosieroj
 xmlTitle=XMLaj dosieroj
 xulTitle=XULaj dosieroj
--- a/toolkit/chrome/global/findbar.dtd
+++ b/toolkit/chrome/global/findbar.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 entities needed to -->
 <!-- LOCALIZATION NOTE : FILE use the Find Bar. --> 
 
 <!-- entities split out from browser.dtd -->
 <!ENTITY next.label "Antaŭen">
 <!ENTITY next.accesskey "A">
 <!ENTITY next.tooltip "Serĉi la venontan aperon de la frazo">
 <!ENTITY previous.label "Malantaŭen">
--- a/toolkit/chrome/global/findbar.properties
+++ b/toolkit/chrome/global/findbar.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/.
+
 # strings used by the Find bar, split from browser.properties
 NotFound=Frazo ne trovita
 WrappedToTop=Fino de la paĝo atingita, daŭrigado ekde la komenco
 WrappedToBottom=Komenco de la paĝo atingita, daŭrigado ekde la fino
 NormalFindLabel=Serĉi:
 FastFindLabel=Rapida serĉo:
 FastFindLinksLabel=Rapida serĉado (nur ligiloj):
 CaseSensitive=(distingi inter minuskloj kaj majuskloj)
--- a/toolkit/chrome/global/finddialog.dtd
+++ b/toolkit/chrome/global/finddialog.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 finddialog.xul -->
 
 <!ENTITY findDialog.title "Serĉi en tiu ĉi paĝo ">
 <!ENTITY findField.label "Kion serĉi:">
 <!ENTITY findField.accesskey "k">
 <!ENTITY caseSensitiveCheckbox.label "Distingi inter majuskloj kaj minuskloj">
 <!ENTITY caseSensitiveCheckbox.accesskey "i">
 <!ENTITY wrapCheckbox.label "post la fino ekde la eko">
--- a/toolkit/chrome/global/finddialog.properties
+++ b/toolkit/chrome/global/finddialog.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/.
+
 notFoundWarning=La teksto kiun vi tajpis ne troveblas.
 notFoundTitle=Serĉi
--- a/toolkit/chrome/global/globalKeys.dtd
+++ b/toolkit/chrome/global/globalKeys.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 openHelp.commandkey     "VK_F1">
 <!ENTITY openHelpMac.commandkey  "?">
--- a/toolkit/chrome/global/headsUpDisplay.properties
+++ b/toolkit/chrome/global/headsUpDisplay.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 (stacktrace.anonymousFunction):
 # This string is used to display JavaScript functions that have no given name -
 # they are said to be anonymous. See stacktrace.outputMessage.
 stacktrace.anonymousFunction=<anonima>
 
 # LOCALIZATION NOTE (stacktrace.outputMessage):
 # This string is used in the Web Console output to identify a web developer call
--- a/toolkit/chrome/global/intl.css
+++ b/toolkit/chrome/global/intl.css
@@ -1,1 +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/. */
 
+/*
+ * This file contains all localizable skin settings such as 
+ *   font, layout, and geometry
+ */
+window { 
+  font: 3mm tahoma,arial,helvetica,sans-serif;
+}
--- a/toolkit/chrome/global/intl.properties
+++ b/toolkit/chrome/global/intl.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/.
+
 # all.js
 #
 # Localization Note: Cases of charset names must be preserved. If you're 
 # adding charsets to your localized version, please refer to 
 # intl/uconv/src/charsetalias.properties file for the list of canonical 
 # charset names and use canonical names exactly as listed there.
 # Also note that "UTF-8" should always be included in intl.charsetmenu.browser.static
 general.useragent.locale=en-US
@@ -24,9 +28,9 @@ font.language.group=x-western
 intl.accept_languages=eo, en-us, en
 intl.charsetmenu.browser.static=ISO-8859-1, UTF-8
 intl.charset.default=UTF-8
 intl.charset.detector=
 intl.charsetmenu.mailedit=ISO-8859-1, ISO-8859-15, ISO-8859-6, armscii-8, geostd8, ISO-8859-13, ISO-8859-14, ISO-8859-2, GB2312, GB18030, Big5, KOI8-R, windows-1251, KOI8-U, ISO-8859-7, ISO-8859-8-I, windows-1255, ISO-2022-JP, EUC-KR, ISO-8859-10, ISO-8859-3, TIS-620, ISO-8859-9, UTF-8, VISCII
 # valid intl.menuitems.appendedacceskeys are: true or false, <empty string> (missing or empty preference equals false)
 intl.menuitems.alwaysappendaccesskeys=
 # valid intl.menuitems.insertseparatorbeforeaccesskeys are: true or false, <empty string> (missing or empty preference equals false)
-intl.menuitems.insertseparatorbeforeaccesskeys=true
+intl.menuitems.insertseparatorbeforeaccesskeys=vera
--- a/toolkit/chrome/global/keys.properties
+++ b/toolkit/chrome/global/keys.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 This file contains the application's labels for keys on the keyboard.
 #                     If you decide to translate this file, you should translate it based on
 #                     the prevelant kind of keyboard for your target user.
 # LOCALIZATION NOTE : There are two types of keys, those w/ text on their labels
 #                     and those w/ glyphs.
 # LOCALIZATION NOTE : VK_<…> represents a key on the keyboard.
 #
 # For more information please see bugzilla bug 90888.
--- a/toolkit/chrome/global/languageNames.properties
+++ b/toolkit/chrome/global/languageNames.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/.
+
 aa = Afara
 ab = Abĥaza
 ae = Avestana
 af = Afrikansa
 ak = Akana
 am = Amhara
 an = Aragona
 ar = Araba
--- a/toolkit/chrome/global/mozilla.dtd
+++ b/toolkit/chrome/global/mozilla.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 mozilla.title
 'The Book of Mozilla, 11:9'>
 
 <!ENTITY mozilla.quote
 'Mammon slept. And the <em>beast reborn</em> spread over the earth and its numbers
 grew legion. And they proclaimed the times and <em>sacrificed</em> crops unto the
 fire, with the <em>cunning of foxes</em>. And they built a new world in their own
 image as promised by the <em><a href="http://www.mozilla.org/about/mozilla-manifesto.html">
--- a/toolkit/chrome/global/notification.dtd
+++ b/toolkit/chrome/global/notification.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/. -->
+
 <!ENTITY closeNotification.tooltip "Fermi tiun ĉi mesaĝon">
 
 <!ENTITY closeNotificationItem.label "Ne nun">
--- a/toolkit/chrome/global/nsTreeSorting.properties
+++ b/toolkit/chrome/global/nsTreeSorting.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/.
+
 SortMenuItems=Ordigitaj laŭ %COLNAME%
--- a/toolkit/chrome/global/preferences.dtd
+++ b/toolkit/chrome/global/preferences.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  windowClose.key                         "w">
 <!ENTITY  preferencesDefaultTitleMac.title        "Preferoj">
 <!ENTITY  preferencesDefaultTitleWin.title        "Opcioj">
 <!ENTITY  preferencesCloseButton.label            "Fermi">
 <!ENTITY  preferencesCloseButton.accesskey        "F">
--- a/toolkit/chrome/global/printPageSetup.dtd
+++ b/toolkit/chrome/global/printPageSetup.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 printjoboptions.xul -->
 
 <!ENTITY printSetup.title    "Agordi paĝon">
 
 <!ENTITY basic.tab           "Formato kaj opcioj">
 
 <!ENTITY formatGroup.label   "Formato">
 
--- a/toolkit/chrome/global/printPreview.dtd
+++ b/toolkit/chrome/global/printPreview.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 the print preview toolbar.
-   -
-   - 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):
-   -  Samir Gehani <sgehani@netscape.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 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 print.label          "Presi…">
 <!ENTITY print.accesskey      "P">
 <!ENTITY pageSetup.label      "Agordi paĝon…">
 <!ENTITY pageSetup.accesskey  "a">
 <!ENTITY page.label           "Paĝo:">
 <!ENTITY page.accesskey       "a">
 <!ENTITY of.label             "de">
--- a/toolkit/chrome/global/printPreviewProgress.dtd
+++ b/toolkit/chrome/global/printPreviewProgress.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/. -->
+
 <!--LOCALIZATION NOTE printPreviewProgress.dtd Main UI for Print Preview Progress Dialog -->
 <!ENTITY printWindow.title "Antaŭvidi presadon"> 
 <!ENTITY title   "Titolo:"> 
 <!ENTITY preparing "Preparado…">
 <!ENTITY progress "Progreso:">
--- a/toolkit/chrome/global/printProgress.dtd
+++ b/toolkit/chrome/global/printProgress.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 printProgress.dtd Main UI for Print Progress Dialog -->
 <!ENTITY printWindow.title "Presado"> 
 <!ENTITY title    "Titolo:"> 
 <!ENTITY progress "Progreso:">
 <!ENTITY preparing "Preparado…">
 <!ENTITY printComplete "La presado finiĝis.">
 
 <!ENTITY dialogCancel.label "Nuligi"> 
--- a/toolkit/chrome/global/printdialog.dtd
+++ b/toolkit/chrome/global/printdialog.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 printdialog.xul -->
 
 <!ENTITY printButton.label "Presi">
 
 <!ENTITY printDialog.title "Presi">
 
 <!ENTITY fpDialog.title "Konservi dosieron">
 
--- a/toolkit/chrome/global/printdialog.properties
+++ b/toolkit/chrome/global/printdialog.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/.
+
 # These strings are used in the native GTK, Mac and Windows print dialogs.
 
 # GTK titles:
 printTitleGTK=Presi
 optionsTabLabelGTK=Opcioj
 printFramesTitleGTK=Presi kadrojn
 
 # Mac titles:
--- a/toolkit/chrome/global/printjoboptions.dtd
+++ b/toolkit/chrome/global/printjoboptions.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 printjoboptions.xul -->
 
 <!ENTITY printJobOptions.title "Atributoj de presilo">
 
 <!ENTITY paperInput.label "Grando de papero:">
 <!ENTITY paperInput.accesskey "P">
 
 <!ENTITY plexInput.label "Plex reĝimo:">
--- a/toolkit/chrome/global/regionNames.properties
+++ b/toolkit/chrome/global/regionNames.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/.
+
 ad	=	Andoro
 ae	=	Unuiĝintaj Arabaj Emirlandoj
 af	=	Afganujo
 ag	=	Antigvo kaj Barbudo
 ai	=	Angvilo
 al	=	Albanujo
 am	=	Armenujo
 an	=	Nederlandaj Antiloj
--- a/toolkit/chrome/global/resetProfile.dtd
+++ b/toolkit/chrome/global/resetProfile.dtd
@@ -1,12 +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 resetProfile.dialog.title        "Reagordi &brandShortName;">
 <!ENTITY resetProfile.dialog.description  "Ĉu vi certas ke vi volas reagordi &brandShortName; al la norma stato?">
-<!ENTITY resetProfile.dialog.items.label  "La jenaj aferoj estos konservitaj:">
+<!ENTITY resetProfile.dialog.items2.label "&brandShortName; will try to preserve your:">
 <!ENTITY resetProfile.dialog.footer.label "&brandShortName; restartos kaj ĉio alia estos forigita.">
 <!ENTITY resetProfile.dialog.button.label "Reagordi &brandShortName;">
+
 <!ENTITY resetProfile.title               "Reagordi &brandShortName; al ĝia norma stato">
 <!ENTITY resetProfile.description         "Se vi havas gravegajn problemojn, kiujn vi ne povas solvi, restartigu freŝe nur kun via nepraj informoj.">
 <!ENTITY resetProfile.button.label        "Reagordi &brandShortName;">
+
+<!ENTITY resetProfile.cleaning.description "Please wait while &brandShortName; cleans up your old data…">
--- a/toolkit/chrome/global/textcontext.dtd
+++ b/toolkit/chrome/global/textcontext.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 cutCmd.label "Eltondi">
 <!ENTITY cutCmd.accesskey "t">
 <!ENTITY copyCmd.label "Kopii">
 <!ENTITY copyCmd.accesskey "K">
 <!ENTITY pasteCmd.label "Alglui">
 <!ENTITY pasteCmd.accesskey "A">
 <!ENTITY undoCmd.label "Malfari">
 <!ENTITY undoCmd.accesskey "M">
--- a/toolkit/chrome/global/tree.dtd
+++ b/toolkit/chrome/global/tree.dtd
@@ -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/. -->
+
 <!ENTITY restoreColumnOrder.label "Restaŭri la ordon de kolumnoj">
--- a/toolkit/chrome/global/videocontrols.dtd
+++ b/toolkit/chrome/global/videocontrols.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 playButton.playLabel "Ludi">
 <!ENTITY playButton.pauseLabel "Paŭzigi">
 <!ENTITY muteButton.muteLabel "Silentigi">
 <!ENTITY muteButton.unmuteLabel "Malsilentigi">
 <!ENTITY fullscreenButton.enterfullscreenlabel "Ekranplena reĝimo">
 <!ENTITY fullscreenButton.exitfullscreenlabel "Eliri el ekranplena reĝimo">
 
 <!ENTITY stats.media "Komunikrimedoj">
--- a/toolkit/chrome/global/viewSource.dtd
+++ b/toolkit/chrome/global/viewSource.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/viewSource.xul -->
 
 <!-- LOCALIZATION NOTE (mainWindow.title) : DONT_TRANSLATE --> 
 <!ENTITY mainWindow.title "&brandFullName;">
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE --> 
 <!ENTITY mainWindow.titlemodifier "&brandFullName;">
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifierseparator) : DONT_TRANSLATE -->
 <!ENTITY mainWindow.titlemodifierseparator " - ">
--- a/toolkit/chrome/global/viewSource.properties
+++ b/toolkit/chrome/global/viewSource.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/.
+
 goToLineTitle     = Iri al linio
 goToLineText      = Tajpu numeron de linio
 invalidInputTitle = Nevalida valoro
 invalidInputText  = La numero de linio tajpita ne estas valida.
 outOfRangeTitle   = Linio ne trovita
 outOfRangeText    = La petita linio ne estis trovita.
 statusBarLineCol  = Linio %1$S, Kolumno %2$S
 viewSelectionSourceTitle = DOM Fonto de elektado
--- a/toolkit/chrome/global/wizard.dtd
+++ b/toolkit/chrome/global/wizard.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  button-back-mac.label        "Iri malantaŭen">
 <!ENTITY  button-back-mac.accesskey    "M">
 <!ENTITY  button-next-mac.label        "Daŭrigi">
 <!ENTITY  button-next-mac.accesskey    "D">
 <!ENTITY  button-finish-mac.label      "Preta">
 <!ENTITY  button-cancel-mac.label      "Nuligi">
 
 <!ENTITY  button-back-unix.label       "Malantaŭen">
--- a/toolkit/chrome/global/wizard.properties
+++ b/toolkit/chrome/global/wizard.properties
@@ -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/.
+
 default-first-title=Bonvenon al %S
 default-last-title=Kompletigado de %S
 default-first-title-mac=Enkonduko
 default-last-title-mac=Konkludo
--- a/toolkit/chrome/global/xpinstall/xpinstall.properties
+++ b/toolkit/chrome/global/xpinstall/xpinstall.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 Communicator client code, released
-# March 31, 1998.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-1999
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Samir Gehani <sgehani@netscape.com>
-#   Daniel Veditz <dveditz@netscape.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/.
 
 #--------------------------------------------------------------------
 #   Install Actions
 #--------------------------------------------------------------------
 InstallFile=Instalado: %s
 InstallSharedFile=Instalado de dividitaj dosieroj: %s
 ReplaceFile=Anstataŭado: %s
 ReplaceSharedFile=Anstataŭado de dividita dosiero: %s
--- a/toolkit/chrome/mozapps/downloads/downloads.dtd
+++ b/toolkit/chrome/mozapps/downloads/downloads.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 (window.width2, window.height): These values should be
 close to the golden ratio (1.618:1) while making sure it's wide enough for long
 file names and tall enough to hint that there are more downloads in the list -->
 <!ENTITY window.width2                    "485">
 <!ENTITY window.height                    "300"> 
 
 <!ENTITY starting.label                   "Komenco…">
 <!ENTITY scanning.label                   "Serĉado de virusoj…">
--- a/toolkit/chrome/mozapps/downloads/downloads.properties
+++ b/toolkit/chrome/mozapps/downloads/downloads.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 (seconds, minutes, hours, days): Semi-colon list of plural
 # forms. See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 seconds=sekundo;sekundoj
 minutes=minuto;minutoj
 hours=horo;horoj
 days=tago;tagoj
 
 # LOCALIZATION NOTE (paused): — is the "em dash" (long dash)
@@ -57,21 +61,21 @@ gigabyte=GO
 transferSameUnits2=%1$S el %2$S %3$S
 # LOCALIZATION NOTE (transferDiffUnits2):
 # %1$S progress number; %2$S progress unit; %3$S total number; %4$S total unit
 # example: 11.1 MB of 3.3 GB
 transferDiffUnits2=%1$S %2$S el %3$S %4$S
 # LOCALIZATION NOTE (transferNoTotal2):
 # %1$S progress number; %2$S unit
 # example: 111 KB
-transferNoTotal2=%1$S %2$S
+transferNoTotal2=%2$S de %1$S
 
 # LOCALIZATION NOTE (timePair2): %1$S time number; %2$S time unit
 # example: 1 minute; 11 hours
-timePair2=%1$S %2$S
+timePair2=%2$S de %1$S
 # LOCALIZATION NOTE (timeLeftSingle2): %1$S time left
 # example: 1 minute remaining; 11 hours remaining
 timeLeftSingle2=restas %1$S
 # LOCALIZATION NOTE (timeLeftDouble2): %1$S time left; %2$S time left sub units
 # example: 11 hours, 2 minutes remaining; 1 day, 22 hours remaining
 timeLeftDouble2=%1$S, %2$S remaining
 timeFewSeconds=Restas kelkaj sekundoj
 timeUnknown=Nekonata restanta tempo
--- a/toolkit/chrome/mozapps/downloads/settingsChange.dtd
+++ b/toolkit/chrome/mozapps/downloads/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  "Settings can be changed in &brandShortName;'s Preferences.">
 <!ENTITY  settingsChangeOptions.label      "Settings can be changed in &brandShortName;'s Options.">
--- a/toolkit/chrome/mozapps/downloads/unknownContentType.dtd
+++ b/toolkit/chrome/mozapps/downloads/unknownContentType.dtd
@@ -1,45 +1,12 @@
 <!-- -*- 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>
-#
-# 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  intro.label                 "Vi decidis malfermi">
 <!ENTITY  from.label                  "el:">
 <!ENTITY  actionQuestion.label        "Kion devus fari &brandShortName; kun tiu ĉi dosiero?">
 
 <!ENTITY  openWith.label              "Malfermi per">
 <!ENTITY  openWith.accesskey          "m">
--- a/toolkit/chrome/mozapps/downloads/unknownContentType.properties
+++ b/toolkit/chrome/mozapps/downloads/unknownContentType.properties
@@ -1,47 +1,12 @@
 # -*- 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>
-#   Rich Walsh <dragtext@e-vertise.com>
-#   Kailas Patil <patilkr24@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/.
 
 title=Malfermado de %S
 saveDialogTitle=Tajpu la nomon de la konservota dosiero…
 defaultApp=%S (ĉefa)
 chooseAppFilePickerTitle=Elekti programon
 badApp=La programo elektita de vi ("%S") ne estis trovita. Kontrolu la nomon de la dosiero aŭ elektu alian programon.
 badApp.title=Programoj
 badPermissions=La dosiero no povis esti konservita ĉar vi ne havas taŭgajn rajtojn. Elektu alian dosierujon por konservi.
--- a/toolkit/chrome/mozapps/extensions/about.dtd
+++ b/toolkit/chrome/mozapps/extensions/about.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  creator.label               "Kreita de:">
 <!ENTITY  developers.label            "Disvolvigantoj:">
 <!ENTITY  translators.label           "Tradukistoj:">
 <!ENTITY  contributors.label          "Kontribuantoj:">
 <!ENTITY  homepage.label              "Viziti ĉefpaĝon">
--- a/toolkit/chrome/mozapps/extensions/blocklist.dtd
+++ b/toolkit/chrome/mozapps/extensions/blocklist.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 blocklist.title             "Aldonaĵoj povas esti okazigantaj problemojn">
 <!ENTITY blocklist.style             "width: 45em; height: 30em">
 <!ENTITY blocklist.summary           "&brandShortName; eltrovis, ke la jenaj aldonaĵoj okazigas stabilecajn aŭ sekurecajn problemojn:">
 <!ENTITY blocklist.softblocked       "Por via protektado estas treege rekomendata ke vi restartigu la programon kun tiuj aldonaĵoj malaktivaj.">
 <!ENTITY blocklist.hardblocked       "Tiuj ĉi aldonaĵoj tre riskas okazigi stabilecajn aŭ sekurecajn problemojn kaj ili estis blokitaj, sed restartigo estas postulata por tuta malaktivigo.">
 <!ENTITY blocklist.softandhard       "La aldonaĵoj kiuj tre riskas okazigi stabilecajn aŭ sekurecajn problemojn estis blokitaj. La aliaj estas malpli riskaj sed estas treege rekomendata malaktivigi ilin kaj restartigi.">
 <!ENTITY blocklist.moreinfo          "Plia informo">
 
--- a/toolkit/chrome/mozapps/extensions/extensions.dtd
+++ b/toolkit/chrome/mozapps/extensions/extensions.dtd
@@ -1,13 +1,15 @@
 <!ENTITY addons.windowTitle                   "Administranto de aldonaĵoj">
+
 <!ENTITY search.placeholder                   "Serĉi ĉiujn aldonaĵojn">
 <!-- LOCALIZATION NOTE (search.commandKey):
      The search command key should match findOnCmd.commandkey from browser.dtd -->
 <!ENTITY search.commandkey                    "f">
+
 <!ENTITY loading.label                        "Ŝargado…">
 <!ENTITY listEmpty.installed.label            "Vi havas neniun aldonaĵon de tiu tipo instalita">
 <!ENTITY listEmpty.availableUpdates.label     "Neniu ĝisdatigo trovita">
 <!ENTITY listEmpty.recentUpdates.label        "Vi ne ĝisdatigis viajn aldonaĵojn lastatempe">
 <!ENTITY listEmpty.findUpdates.label          "Kontroli ĉu estas ĝisdatigoj">
 <!ENTITY listEmpty.search.label               "Kongruaj aldonaĵoj ne trovitaj">
 <!ENTITY listEmpty.button.label               "Pli da informo pri aldonaĵoj">
 <!ENTITY installAddonFromFile.label           "Instali aldonaĵon el dosiero…">
--- a/toolkit/chrome/mozapps/extensions/extensions.properties
+++ b/toolkit/chrome/mozapps/extensions/extensions.properties
@@ -13,34 +13,34 @@ uninstallNotice=%S estis forigita.
 numReviews=#1 recenzo;#1 recenzoj
 
 #LOCALIZATION NOTE (dateUpdated) %S is the date the addon was last updated
 dateUpdated=Ĝisdatigita %S
 
 #LOCALIZATION NOTE (notification.incompatible) %1$S is the add-on name, %2$S is brand name, %3$S is application version
 notification.incompatible=%1$S estas nekongrua kun %2$S %3$S.
 #LOCALIZATION NOTE (notification.blocked) %1$S is the add-on name
-notification.blocked=%1$S has been disabled due to security or stability issues.
+notification.blocked=%1$S esti blokita pro sekurecaj kaj stabilecaj problemoj.
 notification.blocked.link=Plia informo
 #LOCALIZATION NOTE (notification.softblocked) %1$S is the add-on name
-notification.softblocked=%1$S is known to cause security or stability issues.
+notification.softblocked=Estas konata fakto ke %1$S povas okazigi sekurecajn kaj stabilecajn problemojn.
 notification.softblocked.link=Plia informo
 #LOCALIZATION NOTE (notification.outdated) %1$S is the add-on name
-notification.outdated=An important update is available for %1$S.
+notification.outdated=Haveblas grava ĝisdatigo por %1$S.
 notification.outdated.link=Ĝisdatigi nun
 #LOCALIZATION NOTE (notification.enable) %1$S is the add-on name, %2$S is brand name
-notification.enable=%1$S will be enabled after you restart %2$S.
+notification.enable=%1$S estos aktiva post via restartigo de %2$S.
 #LOCALIZATION NOTE (notification.disable) %1$S is the add-on name, %2$S is brand name
-notification.disable=%1$S will be disabled after you restart %2$S.
+notification.disable=%1$S ne estos aktiva post via restartigo de %2$S.
 #LOCALIZATION NOTE (notification.install) %1$S is the add-on name, %2$S is brand name
-notification.install=%1$S will be installed after you restart %2$S.
+notification.install=%1$S estos instalita post via restartigo de %2$S.
 #LOCALIZATION NOTE (notification.uninstall) %1$S is the add-on name, %2$S is brand name
-notification.uninstall=%1$S will be uninstalled after you restart %2$S.
+notification.uninstall=%1$S estos malinstalita post via restartigo de %2$S.
 #LOCALIZATION NOTE (notification.upgrade) %1$S is the add-on name, %2$S is brand name
-notification.upgrade=%1$S will be updated after you restart %2$S.
+notification.upgrade=%1$S estos ĝisdatigita post via restartigo de %2$S.
 #LOCALIZATION NOTE (notification.downloadError) %1$S is the add-on name.
 notification.downloadError=There was an error downloading %1$S.
 notification.downloadError.retry=Klopodu denove
 notification.downloadError.retry.tooltip=Klopodu elŝuti tiun ĉi aldonaĵon denove
 #LOCALIZATION NOTE (notification.installError) %1$S is the add-on name.
 notification.installError=Okazis eraro dum la instalado de %1$S.
 notification.installError.retry=Klopodu denove
 notification.installError.retry.tooltip=Klopodu elŝuti kaj instali denove tiun ĉi aldonaĵon
--- a/toolkit/chrome/mozapps/extensions/newaddon.dtd
+++ b/toolkit/chrome/mozapps/extensions/newaddon.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 title           "Instali aldonaĵon">
 <!ENTITY intro           "Alia programo en via komputilo ŝatus modifi
                           &brandShortName; per la jena aldonaĵo:">
 <!ENTITY warning         "Instalu aldonaĵojn nur de aŭtoroj kiujn vi fidas.">
 <!ENTITY allow           "Permesi tiun ĉi instaladon">
 <!ENTITY later           "Vi povas ŝanĝi vian opinion iam ajn per vizito
                           al Administrado de aldonaĵoj.">
 <!ENTITY continue        "Daŭrigi">
--- a/toolkit/chrome/mozapps/extensions/newaddon.properties
+++ b/toolkit/chrome/mozapps/extensions/newaddon.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/.
+
 #LOCALIZATION NOTE (name) %1$S is the add-on name, %2$S is the add-on version
-name=%1$S %2$S
+name=%2$S de %1$S
 #LOCALIZATION NOTE (author) %S is the author of the add-on
 author=Verkita de %S
 #LOCALIZATION NOTE (location) %S is the path the add-on is installed in
 location=Loko: %S
--- a/toolkit/chrome/mozapps/extensions/selectAddons.dtd
+++ b/toolkit/chrome/mozapps/extensions/selectAddons.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 upgrade.style               "width: 93ch; height: 448px;">
 
 <!ENTITY checking.heading            "Kontrolado de viaj aldonaĵoj">
 <!ENTITY checking.progress.label     "Kontrolado de la kongrueco de viaj aldonaĵoj kun tiu ĉi version de &brandShortName;.">
 
 <!ENTITY select.heading              "Elektu viajn aldonaĵojn">
 <!-- LOCALIZATION NOTE (select.description): The term used for "third parties"
      here should match the string source.other in selectAddons.properties. -->
--- a/toolkit/chrome/mozapps/extensions/selectAddons.properties
+++ b/toolkit/chrome/mozapps/extensions/selectAddons.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 (source.profile) add-ons installed by the user, this may be
 # translated as "You" or "User" depending on the locale
 source.profile=Vi
 #LOCALIZATION NOTE (source.bundled) add-ons shipped with the application, and thus
 # treated as installed by the user. This may be
 # translated as "You" or "User" depending on the locale
 source.bundled=Vi (kunliverita)
 #LOCALIZATION NOTE (source.other) add-ons installed by other applications
--- a/toolkit/chrome/mozapps/extensions/update.dtd
+++ b/toolkit/chrome/mozapps/extensions/update.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  updateWizard.title              "Ĝisdatigo de &brandShortName;">
 
 <!ENTITY  offline.title                   "&brandShortName; estas en malkonektita reĝimo">
 <!ENTITY  offline.description             "&brandShortName; devas konektiĝi antaŭ ol povi vidi ĉu ekzistas ĝisdatigoj por viaj aldonaĵoj tiel ke ili kongruos kun tiu ĉi versio.">
 <!ENTITY  offline.toggleOffline.label     "Konektiĝi nun.">
 <!ENTITY  offline.toggleOffline.accesskey "K">
 
 <!ENTITY  mismatch.win.title              "Nekongruaj aldonaĵoj">
--- a/toolkit/chrome/mozapps/extensions/update.properties
+++ b/toolkit/chrome/mozapps/extensions/update.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/.
+
 mismatchCheckNow=Kontroli nun
 mismatchCheckNowAccesskey=K
 mismatchDontCheck=Ne kontroli
 mismatchDontCheckAccesskey=N
 installButtonText=Instali nun
 installButtonTextAccesskey=I
 nextButtonText=Antaŭen >
 nextButtonTextAccesskey=N
--- a/toolkit/chrome/mozapps/extensions/xpinstallConfirm.dtd
+++ b/toolkit/chrome/mozapps/extensions/xpinstallConfirm.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 institems.xul -->
 
 <!ENTITY dialog.title            "Instalado de programo">
 <!ENTITY dialog.style            "width: 45em">
 <!ENTITY warningPrimary.label    "Nur instali aldonaĵojn el aŭtoroj kiujn vi fidas.">
 <!ENTITY warningSecondary.label  "Malicaj programoj povas difekti vian komputilon aŭ elmeti vian privatecon.">
 
 <!ENTITY from.label "de:">
--- a/toolkit/chrome/mozapps/extensions/xpinstallConfirm.properties
+++ b/toolkit/chrome/mozapps/extensions/xpinstallConfirm.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/.
+
 unverified=(Aŭtoro ne kontrolita)
 signed=(%S)
 
 itemWarnIntroMultiple=Vi petis instali jenajn %S elementojn:
 itemWarnIntroSingle=Vi petis instali la jenan elementon:
 installButtonDisabledLabel=Instali (%S)
 installButtonLabel=Instali nun
 
--- a/toolkit/chrome/mozapps/handling/handling.dtd
+++ b/toolkit/chrome/mozapps/handling/handling.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.emWidth "26em">
 <!ENTITY window.emHeight "26em">
 <!ENTITY ChooseApp.description "Elekti programon">
 <!ENTITY ChooseApp.label "Elekti…">
 <!ENTITY ChooseApp.accessKey "I">
--- a/toolkit/chrome/mozapps/handling/handling.properties
+++ b/toolkit/chrome/mozapps/handling/handling.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/.
+
 protocol.title=Lanĉi programon
 protocol.description=Tiu ĉi ligilo devas esti malfermita per programo.
 protocol.choices.label=Sendi al:
 protocol.checkbox.label=Memori mian decidon por ligiloj %S.
 protocol.checkbox.accesskey=M
 protocol.checkbox.extra=Tio ĉi povas esti ŝanĝita en la preferoj de %S.
 
 choose.application.title=Alia programo…
--- a/toolkit/chrome/mozapps/help/help-toc.rdf
+++ b/toolkit/chrome/mozapps/help/help-toc.rdf
@@ -1,1 +1,29 @@
+<?xml version="1.0" encoding="UTF-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/. -->
 
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns:nc="http://home.netscape.com/NC-rdf#">
+
+  <rdf:Description about="urn:root">
+    <nc:subheadings>
+      <rdf:Seq>
+        <rdf:li> <rdf:Description ID="use-help" nc:name="Using the Help Window"
+                  nc:link="chrome://help/locale/welcome.xhtml"/> </rdf:li>
+      </rdf:Seq>
+    </nc:subheadings>
+  </rdf:Description>
+
+  <rdf:Description about="#use-help">
+    <nc:subheadings>
+      <rdf:Seq>
+        <rdf:li> <rdf:Description ID="use-help-finding-the-topic-you-want" nc:name="Finding the Topic You Want"
+                  nc:link="chrome://help/locale/welcome.xhtml#finding_the_topic_you_want"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="use-help-search" nc:name="Search Tips"
+                  nc:link="chrome://help/locale/welcome.xhtml#search_tips"/> </rdf:li>
+      </rdf:Seq>
+    </nc:subheadings>
+  </rdf:Description>
+
+</rdf:RDF>
--- a/toolkit/chrome/mozapps/help/help.dtd
+++ b/toolkit/chrome/mozapps/help/help.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 printCmd.commandkey            "p">
 
 <!ENTITY findOnCmd.commandkey           "F">
 <!ENTITY findAgainCmd.commandkey        "G">
 <!ENTITY findAgainCmd.commandkey2       "VK_F3">
 
 <!ENTITY backButton.label               "Malantaŭen">
 <!ENTITY backButton.accesskey           "B">
--- a/toolkit/chrome/mozapps/help/help.properties
+++ b/toolkit/chrome/mozapps/help/help.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/.
+
 emptySearchText=Ekzistas neniu elemento por serĉi.
--- a/toolkit/chrome/mozapps/help/welcome.xhtml
+++ b/toolkit/chrome/mozapps/help/welcome.xhtml
@@ -1,1 +1,67 @@
+<?xml version="1.0" encoding="UTF-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/. -->
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
+    <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
+    %brandDTD;
+]
+>
+<!--
+Contributors:
+  R.J. Keller <rlk@trfenv.com> (original author)
+  Jeff Walden <jwalden+code@mit.edu>
+  Steffen Wilberg <steffen.wilberg@web.de>
+-->
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <title>Using the Help Window</title>
+  <link rel="stylesheet" type="text/css" href="chrome://help/skin/helpFileLayout.css"/>
+</head>
+
+<body>
+
+<h1 id="help_window_top">Using the Help Window</h1>
+
+<div class="contentsBox">In this section:
+  <ul>
+    <li><a href="#finding_the_topic_you_want">Finding the Topic You Want</a></li>
+    <li><a href="#search_tips">Search Tips</a></li>
+  </ul>
+</div>
+
+<h2 id="finding_the_topic_you_want">Finding the Topic You Want</h2>
+
+<p>To display help information in this window, click a topic in the
+  <em>Contents</em> sidebar. Click the <span class="noMac">plus icon</span>
+  <span class="mac">triangle</span> next to a topic to see its subtopics.</p>
+
+<p>To search for a help topic, type a word or phrase in the <em>Search</em> bar
+  to see related topics. Click on a topic to read about it. If your search
+  doesn't return any topics, try typing fewer words or a different combination
+  of words. The results will be displayed in the sidebar as you type. To
+  display the contents in the sidebar again, clear the <em>Search</em> bar or
+  press <kbd>Esc</kbd>.</p>
+
+<p>To see information related to the Help topic you are reading, click links in
+  the Help window just as you would in a regular web page.  You can also move
+  back and forth between pages you've already seen using the Back and Forward
+  buttons.</p>
+
+<h2 id="search_tips">Search Tips</h2>
+
+<p>If you don't find what you want, here are a few helpful tips:</p>
+
+<ul>
+  <li>Be sure that you are searching for something that relates to
+    &brandShortName;; this is not a general Internet search.</li>
+  <li>Try to broaden your search - don't be too specific; terms could be worded
+    differently than your search.</li>
+  <li>Avoid being too broad with your search.  For example, a common word like
+    &quot;page&quot; will likely return more topics than you want.</li>
+</ul>
+
+</body>
+</html>
--- a/toolkit/chrome/mozapps/plugins/plugins.dtd
+++ b/toolkit/chrome/mozapps/plugins/plugins.dtd
@@ -18,17 +18,17 @@
 <!ENTITY pluginWizard.finalPage.description.label            "&brandShortName; finis la instaladon de la mankantaj kromprogramoj:">
 
 <!ENTITY pluginWizard.finalPage.moreInfo.label               "Sciu pli pri kromprogramoj aŭ mem serĉi mankantajn kromprogramojn.">
 <!ENTITY pluginWizard.finalPage.restart.label                "&brandShortName; devas esti rekomencita antaŭ ol la kromprogramo(j) funkcios.">
 
 <!ENTITY missingPlugin                                       "Kromprogramo estas bezonata por montri tiun ĉi enhavon.">
 <!-- LOCALIZATION NOTE (tapToPlayPlugin): Mobile (used for touch interfaces) only has one type of plugin possible. -->
 <!ENTITY tapToPlayPlugin                                     "Tuŝetu ĉi tie por aktivigi komprogramon.">
-<!ENTITY clickToPlayPlugins                                   "Alklaku ĉi tie por aktivigi kromprogramojn.">
+<!ENTITY clickToPlayPlugin                                   "Click here to activate plugin.">
 <!ENTITY disabledPlugin                                      "Tiu ĉi kromprogramo estas malaktivigita.">
 <!ENTITY blockedPlugin.label                                 "Tiu ĉi kromprogramo estis blokita por protekti vin.">
 
 <!ENTITY installPlugin                                       "Instali kromprogramon…">
 <!ENTITY managePlugins                                       "Administri kromprogramojn…">
 
 <!-- LOCALIZATION NOTE (reloadPlugin.pre): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (reloadPlugin.middle): avoid leading/trailing spaces, this text is a link -->
--- a/toolkit/chrome/mozapps/preferences/changemp.dtd
+++ b/toolkit/chrome/mozapps/preferences/changemp.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 setPassword.title                 "Ŝanĝi ĉefan pasvorton">
 <!ENTITY setPassword.tokenName.label       "Sekureca aparato">
 <!ENTITY setPassword.oldPassword.label     "Nuna pasvorto:">
 <!ENTITY setPassword.newPassword.label     "Tajpu novan pasvorton:">
 <!ENTITY setPassword.reenterPassword.label "Retajpu pasvorton:">
 <!ENTITY setPassword.meter.label           "Mezurilo de pasvorta kvalito">
 <!ENTITY setPassword.meter.loading         "Ŝarganta">
 <!ENTITY masterPasswordDescription.label   "Ĉefa pasvorto estas uzata por protekti delikatan informon, kiel retejaj pasvortoj. Se vi kreis ĉefan pasvorton, oni petos al vi tajpi ĝin po unu fojo en ĉiu seanco kiam &brandShortName; reprenas konservitan informon protektitan de la pasvorto.">
--- a/toolkit/chrome/mozapps/preferences/ocsp.dtd
+++ b/toolkit/chrome/mozapps/preferences/ocsp.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 ocspDialog.title             "Validigo de atestiloj">
 <!ENTITY enableOCSP.label             "Uzi la Online Certificate Status Protocol (OCSP) por konfirmi la nunan validecon de atestiloj">
 <!ENTITY enableOCSP.accesskey         "U">
 <!ENTITY certOCSP2.label              "Validigi atestilon se ĝi difinas OCSP servilon">
 <!ENTITY certOCSP2.accesskey          "V">
 <!ENTITY proxyOCSP2.label             "Validigi ĉiujn atestilojn kiuj uzas la jenan OCSP servilon:">
 <!ENTITY proxyOCSP2.accesskey         "a">
 <!ENTITY serviceURL.label             "Adreso de servo:">
--- a/toolkit/chrome/mozapps/preferences/preferences.properties
+++ b/toolkit/chrome/mozapps/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/.
+
 #### Master Password
 
 password_not_set=(ne difinita)
 failed_pw_change=Ne eblas ŝanĝi la ĉefan pasvorton.
 incorrect_pw=Vi ne tajpis la ĝustan (nunan) ĉefan pasvorton. Bonvolu klopodi denove.
 pw_change_ok=Ĉefa pasvorto sukcese ŝanĝita.
 pw_erased_ok=Vi forigis la ĉefan pasvorton.
 pw_not_wanted=Averto! Vi decidis ne uzi ĉefan pasvorton.
--- a/toolkit/chrome/mozapps/preferences/removemp.dtd
+++ b/toolkit/chrome/mozapps/preferences/removemp.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 removePassword.title              "Forigi ĉefan pasvorton">
 <!ENTITY removeInfo.label                  "Vi devas tajpi vian nunan pasvorton por daŭrigi:">
 <!ENTITY removeWarning1.label              "Per via ĉefa pasvorto delikataj informoj, kiel retejaj pasvortoj, estas protektataj.">
 <!ENTITY removeWarning2.label              "Se vi forigas vian ĉefan pasvorton via informo ne plu estos protektata se via komputilo estas riskita.">
 <!ENTITY setPassword.oldPassword.label     "Nuna pasvorto:">
 
--- a/toolkit/chrome/mozapps/profile/createProfileWizard.dtd
+++ b/toolkit/chrome/mozapps/profile/createProfileWizard.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 newprofile.title             "Asistanto de kreado de profilo">
 <!ENTITY window.size                  "width: 45em; height: 32em;">
 
 <!-- First wizard page -->
 <!ENTITY profileCreationExplanation_1.text  "&brandShortName; konservas informon pri viaj agordoj kaj preferoj en via persona dosiero.">
 <!ENTITY profileCreationExplanation_2.text  "Se vi dividas tiun ĉi kopion de &brandShortName; kun aliaj uzantoj vi povas uzi profilojn por teni aparte la informon de ĉiu uzanto. Se vi faras tion ĉiu uzanto devus krei sian propran profilon.">
 <!ENTITY profileCreationExplanation_3.text  "Se vi estas la ununura persono kiu uzas tiun ĉi kopion de &brandShortName; vi devas almenaŭ havi unu profilon. Se vi volas, vi povas krei malsamajn profilojn por vi mem, por konservi malsamajn arojn de agordoj kaj preferoj. Ekzempe, vi eble volas havi du apartajn profilojn por negoca kaj persona uzado.">
 <!ENTITY profileCreationExplanation_4.text  "Por eki la kreadon de via profilo alklaku Sekvanta.">
--- a/toolkit/chrome/mozapps/profile/profileSelection.dtd
+++ b/toolkit/chrome/mozapps/profile/profileSelection.dtd
@@ -1,47 +1,14 @@
 <!-- -*- Mode: SGML; indent-tabs-mode: nil; -*- -->
 <!--
 
- ***** BEGIN LICENSE BLOCK *****