Sync with trunk
authorEduardo Trápani <eduardo@esperanto.org.uy>
Tue, 03 Aug 2010 15:43:45 -0300
changeset 64 b301935c59a2cc8888af2fc05842966d8326fe58
parent 63 f58d0e5eb18cf608992ba419d8a4335ad7bde4fc
child 65 add5b245e1f4b6db948753b0d3c7e034b8df70d5
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:46:40 +0000
Sync with trunk
browser/chrome/browser/aboutRights.dtd
browser/chrome/browser/aboutRights.properties
browser/chrome/browser/aboutSyncTabs.dtd
browser/chrome/browser/inspector.properties
browser/chrome/browser/metaData.dtd
browser/chrome/browser/metaData.properties
browser/chrome/browser/preferences/securityWarnings.dtd
browser/chrome/browser/preferences/sync.dtd
browser/chrome/browser/syncBrand.dtd
browser/chrome/browser/syncGenericChange.properties
browser/chrome/browser/syncSetup.dtd
browser/chrome/browser/syncSetup.properties
browser/chrome/browser/taskbar.properties
browser/feedback/main.dtd
browser/feedback/main.properties
dom/chrome/printdialog.properties
dom/chrome/prompts.properties
dom/chrome/webservices/security.properties
services/sync/errors.properties
services/sync/sync.properties
toolkit/chrome/global/aboutAbout.dtd
toolkit/chrome/global/aboutRights.dtd
toolkit/chrome/global/aboutRights.properties
toolkit/chrome/global/aboutSupport.dtd
toolkit/chrome/global/actions.dtd
toolkit/chrome/global/gnomeprintdialog.properties
toolkit/chrome/global/headsUpDisplay.properties
toolkit/chrome/global/history/history.properties
toolkit/chrome/global/license.dtd
toolkit/chrome/global/nsHelperAppDlg.dtd
toolkit/chrome/global/nsHelperAppDlg.properties
toolkit/chrome/global/nsProgressDialog.dtd
toolkit/chrome/global/nsProgressDialog.properties
toolkit/chrome/global/printdialog.properties
toolkit/chrome/mozapps/update/incompatible.dtd
deleted file mode 100644
--- a/browser/chrome/browser/aboutRights.dtd
+++ /dev/null
@@ -1,65 +0,0 @@
-<!-- rights.locale-direction instead of the usual local.dir entity, so RTL can skip translating page. -->
-<!ENTITY rights.locale-direction "ltr">
-<!ENTITY rights.pagetitle "about:rights">
-<!ENTITY rights.intro-header "Pri viaj rajtoj">
-<!ENTITY rights.intro "&brandFullName; estas libera kaj malfermitkoda programaro, konstruata de komunumo de miloj de homoj tra la mondo. Kelkajn aĵojn vi devus scii:">
-<!-- Note on pointa / pointb / pointc form:
-     These points each have an embedded link in the HTML, so each point is
-     split into chunks for text before the link, the link text, and the text
-     after the link. If a localized grammar doesn't need the before or after
-     chunk, it can be left blank.
-
-     Also note the leading/trailing whitespace in strings here, which is
-     deliberate for formatting around the embedded links. -->
-
-<!ENTITY rights.intro-point1a "&brandShortName; estas disponigita al vi laŭ la reguloj de">
-<!ENTITY rights.intro-point1b "Mozilla Public License">
-<!ENTITY rights.intro-point1c "Tio signifas ke vi povas uzi, kopii kaj distribui &brandShortName; al aliaj homoj. Oni kuraĝigas vin modifi la fontan kodon de &brandShortName; kiel ajn vi volas por akomodi ĝin al viaj bezonoj. La Mozilla Public License ankaŭ rajtigas vin distribui viajn modifitajn versiojn.">
-
-<!ENTITY rights.intro-point2a "Mozilla ne transdonas iujn ajn rajton rilate al la Mozilla kaj Firefox markoj aŭ bildsimboloj. Aldona informo pri registritaj markoj troviĝas">
-<!ENTITY rights.intro-point2b "ĉi tie">
-<!ENTITY rights.intro-point2c ".">
-<!-- point 3 text for official branded builds -->
-
-<!ENTITY rights.intro-point3a "Privatecaj politikoj por la produktoj de &vendorShortName; povas esti trovitaj ">
-<!ENTITY rights.intro-point3b "ĉi tie">
-<!ENTITY rights.intro-point3c ".">
-<!-- point 3 text for unbranded builds -->
-
-<!ENTITY rights.intro-point3-unbranded "Ĉiu aplikebla privateca politiko por tiu ĉi produkto devus esti listita ĉi tie.">
-<!-- point 4 text for official branded builds -->
-
-<!ENTITY rights.intro-point4a "&brandShortName; oferas ankaŭ opciajn informajn servojn pri retejoj, ekzemple la servon Sekura Retesplorado, tamen ni ne povas garantii ke ili estas 100&#37; akurataj aŭ seneraraj. Pliajn detalojn, kun informo pri kiel malaktivigi tiujn servojn, vi trovos en la">
-<!ENTITY rights.intro-point4b "servaj kondiĉoj">
-<!ENTITY rights.intro-point4c ".">
-<!-- point 4 text for unbranded builds -->
-
-<!ENTITY rights.intro-point4a-unbranded "Se tiu ĉi produkto inkluzivas retejajn servojn, ĉiu aplikebla kondiĉo de uzado por tiuj servoj devus esti ligita el la">
-<!ENTITY rights.intro-point4b-unbranded "Retejaj servoj">
-<!ENTITY rights.intro-point4c-unbranded "sekcio.">
-
-<!ENTITY rights.webservices-header "&brandFullName; Retejaj servoj">
-<!-- Note that this paragraph references a couple of entities from
-     preferences/security.dtd, so that we can refer to text the user sees in
-     the UI, without this page being forgotten every time those strings are
-     updated.  -->
-<!-- intro paragraph for branded builds -->
-
-<!ENTITY rights.webservices-a "&brandFullName; uzas retejajn informajn servojn  (&quot;Servoj&quot;), kiel la servon Sekura retesplorado, kiuj estas disponeblaj por via uzado per tiu ĉi duuma versio de &brandShortName; laŭ la suba priskribo. Se vi ne volas uzi la Servojn aŭ se la subaj kondiĉoj estas neakcepteblaj, vi povas malaktivigi la servon Sekura retesplorado per malfermado de la programaj preferoj, elektado de ">
-<!ENTITY rights.webservices-b "Sekureco">
-<!ENTITY rights.webservices-c " sekcion kaj malaktivigado de la opcioj por &quot;&blockAttackSites.label;&quot; kaj &quot;&blockWebForgeries.label;&quot;">
-<!-- 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 -->
-
-<!ENTITY rights.webservices-term1-unbranded "Ĉiu aplikebla kondiĉo de servoj por tiu ĉi produko devus esti listita ĉi tie.">
-<!-- points 1-7 text for branded builds -->
-
-<!ENTITY rights.webservices-term1 "&vendorShortName; kaj ĝiaj kontribuantoj, permesdonantoj kaj asociitoj laboras por provizi la plej akuratan kaj ĝisdatigitan informon pri fiprogramoj kaj trompoj. Tamen, ili ne povas garantii ke tiu ĉi informo estas tuta kaj senerara: kelkaj riskaj retejoj eble ne estas ankoraŭ identigitaj kaj kelkaj sekuraj retejoj povas esti erare identigitaj.">
-<!ENTITY rights.webservices-term2 "&vendorShortName; povas maldaŭrigi aŭ ŝanĝi la servojn laŭ ĝia volo.">
-<!ENTITY rights.webservices-term3 "Estas bonvena la uzado de tiuj ĉi servoj kun la akompana versio de&brandShortName;, kaj vi havas ĉiujn bezonatajn rajtojn por fari tion.  &vendorShortName; kaj ĝiaj permesdonantojn rezervas ĉiujn aliajn rajtojn en la servoj.  Tiuj ĉi kondiĉoj ne celas limigi iun ajn rajtojn jam havebla de malfermikodaj permesiloj, kaj aplikeblaj al &brandShortName; kaj al la asociita fonta kodo de &brandShortName;.">
-<!ENTITY rights.webservices-term4 "The Services are provided &quot;as-is.&quot;  &vendorShortName;, its contributors, licensors, and distributors, disclaim all warranties, whether express or implied, including without limitation, warranties that the Services are merchantable and fit for your particular purposes.  You bear the entire risk as to selecting the Services for your purposes and as to the quality and performance of the Services. Some jurisdictions do not allow the exclusion or limitation of implied warranties, so this disclaimer may not apply to you.">
-<!ENTITY rights.webservices-term5 "Except as required by law, &vendorShortName;, its contributors, licensors, and distributors will not be liable for any indirect, special, incidental, consequential, punitive, or exemplary damages arising out of or in any way relating to the use of &brandShortName; and the Services.  The collective liability under these terms will not exceed $500 (five hundred dollars). Some jurisdictions do not allow the exclusion or limitation of certain damages, so this exclusion and limitation may not apply to you.">
-<!ENTITY rights.webservices-term6 "&vendorShortName; may update these terms as necessary from time to time. These terms may not be modified or cancelled without &vendorShortName;'s written agreement.">
-<!ENTITY rights.webservices-term7 "These terms are governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions. If any portion of these terms is held to be invalid or unenforceable, the remaining portions will remain in full force and effect. In the event of a conflict between a translated version of these terms and the English language version, the English language version shall control.">
deleted file mode 100644
--- a/browser/chrome/browser/aboutRights.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-buttonLabel = Konu viajn rajtojn…
-buttonAccessKey = K
-notifyRightsText = %S estas la libera kaj malfermitkoda programaro de la neprofitcela organizo Mozilla Foundation.
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/aboutSyncTabs.dtd
@@ -0,0 +1,17 @@
+<!-- LOCALIZATION NOTE (tabs.otherComputers.label): Keep this in sync with syncTabsMenu.label from browser.dtd -->
+<!ENTITY tabs.otherComputers.label               "Tabs From Other Computers">
+
+<!ENTITY tabs.searchText.label                   "Type here to find tabs…">
+
+<!-- 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                   "Open This Tab">
+<!ENTITY tabs.context.openTab.accesskey               "O">
+<!ENTITY tabs.context.openMultipleTabs.label          "Open Selected Tabs">
+<!ENTITY tabs.context.openMultipleTabs.accesskey      "O">
+<!ENTITY tabs.context.bookmarkSingleTab.label         "Bookmark This Tab…">
+<!ENTITY tabs.context.bookmarkSingleTab.accesskey     "B">
+<!ENTITY tabs.context.bookmarkMultipleTabs.label      "Bookmark Selected Tabs…">
+<!ENTITY tabs.context.bookmarkMultipleTabs.accesskey  "B">
+<!ENTITY tabs.context.refreshList.label               "Refresh List">
+<!ENTITY tabs.context.refreshList.accesskey           "R">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/inspector.properties
@@ -0,0 +1,11 @@
+# LOCALIZATION NOTE  (style.selectorLabel): Used in the Inspector style panel
+#  to label a CSS Selector.
+style.selectorLabel=Selector
+
+# LOCALIZATION NOTE  (style.inheritedFrom): used in Style panel in
+#  inspector. Describes which tagname[#id] the properties are inherited from.
+style.inheritedFrom=Inherited from: #1
+
+# LOCALIZATION NOTE (style.styleItemLabel: used in Style panel in inspector.
+#  Used for construction of list items, #1 = label, #2 = content.
+style.styleItemLabel=#1: #2
deleted file mode 100644
--- a/browser/chrome/browser/metaData.dtd
+++ /dev/null
@@ -1,27 +0,0 @@
-<!ENTITY no-properties.label "Neniu atributo difinita.">
-
-<!ENTITY caption.label "Atributoj de elemento">
-<!ENTITY image-sec.label "Atributoj de bildo">
-<!ENTITY image-url.label "Retadreso:">
-<!ENTITY image-type.label "Tipo:">
-<!ENTITY image-desc.label "Priskribo:">
-<!ENTITY image-alt.label "Alternativa teksto:">
-<!ENTITY image-size.label "Dimensioj de bildo:">
-<!ENTITY image-filesize.label "Grandeco de dosiero:">
-<!ENTITY insdel-sec.label "Atributoj de enmetado/forigado">
-<!ENTITY insdel-cite.label "Informo:">
-<!ENTITY insdel-date.label "Dato:">
-<!ENTITY link-sec.label "Atributoj de ligo">
-<!ENTITY link-url.label "Adreso:">
-<!ENTITY link-target.label "Estos malfermita en:">
-<!ENTITY link-type.label "Tipo de celo:">
-<!ENTITY link-lang.label "Lingvo celata:">
-<!ENTITY link-rel.label "Rilato:">
-<!ENTITY link-rev.label "Inversa rilato:">
-<!ENTITY link-ping.label "Sciigado:">
-<!ENTITY misc-sec.label "Aliaj atributoj">
-<!ENTITY misc-lang.label "Teksta lingvo:">
-<!ENTITY misc-title.label "Titolo:">
-<!ENTITY misc-tblsummary.label "Tabela Resumo:">
-<!ENTITY quote-sec.label "Atributoj de citaĵo">
-<!ENTITY quote-cite.label "Informo:">
deleted file mode 100644
--- a/browser/chrome/browser/metaData.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-sameWindowText=Sama fenestro
-newWindowText=Nova fenestro
-newTabText=Nova folio
-parentFrameText=Enhavanta kadro
-sameFrameText=Sama kadro
-embeddedText=Enkonstruita
-unableToShowProps=Neniu atributo disponeblas.
-altTextMissing=Mankanta
-altTextBlank=Malplena
-imageSize=%S KO (%S oktetoj)
-imageSizeUnknown=Nekonata (ne en la staplo)
-imageType=%S bildo
-animatedImageType=%S bildo (moviĝanta, %S kadroj)
-imageDimensions=%Spx × %Spx
-imageDimensionsScaled=%Spx × %Spx (skaligita al %Spx × %Spx)
-# LOCALIZATION NOTE: Next two strings are for language name representations
-#                    %1$S = language name, %2$S = region name
-languageRegionFormat=%1$S (%2$S)
deleted file mode 100644
--- a/browser/chrome/browser/preferences/securityWarnings.dtd
+++ /dev/null
@@ -1,13 +0,0 @@
-<!ENTITY securityWarnings.title "Sekurecaj atentigoj">
-
-<!ENTITY security.warn_when "Montri atentigan dialogon kiam:">
-<!ENTITY security.warn_entering_secure.label "Mi pretas vidi ĉifritan paĝon.">
-<!ENTITY security.warn_entering_secure.accesskey "v">
-<!ENTITY security.warn_entering_weak.label "Mi pretas vidi paĝon kiu uzas malaltgradan ĉifradon.">
-<!ENTITY security.warn_entering_weak.accesskey "p">
-<!ENTITY security.warn_leaving_secure.label "Mi transiras de ĉifrita paĝo al neĉifrita paĝo.">
-<!ENTITY security.warn_leaving_secure.accesskey "t">
-<!ENTITY security.warn_submit_insecure.label "Mi sendas datumojn neĉifrite.">
-<!ENTITY security.warn_submit_insecure.accesskey "s">
-<!ENTITY security.warn_viewing_mixed.label "Mi pretas vidi ĉifritan paĝon kiu enhavas kelkajn neĉifritajn komponentojn.">
-<!ENTITY security.warn_viewing_mixed.accesskey "i">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/preferences/sync.dtd
@@ -0,0 +1,44 @@
+<!-- The page shown when not logged in... -->
+<!ENTITY setupButton.label          "Set Up &syncBrand.fullName.label;">
+<!ENTITY setupButton.accesskey      "S">
+<!ENTITY weaveDesc.label            "&syncBrand.fullName.label; lets you access your history, bookmarks, passwords and open tabs across all your devices.">
+
+<!-- The page shown when logged in... -->
+<!ENTITY accountGroupboxCaption.label "&syncBrand.fullName.label; Account">
+<!ENTITY currentUser.label            "Current User:">
+
+<!-- Login error feedback -->
+<!ENTITY updatePass.label             "Update">
+<!ENTITY resetPass.label              "Reset">
+
+<!-- Manage Account -->
+<!ENTITY manageAccount.label          "Manage Account">
+<!ENTITY manageAccount.accesskey      "A">
+<!ENTITY changePassword.label         "Change Password">
+<!ENTITY changePassphrase.label       "Change Secret Phrase">
+<!ENTITY resetSync.label              "Reset Sync">
+<!ENTITY differentAccount.label       "Use a Different Account">
+
+<!-- Sync Settings -->
+<!ENTITY syncPrefsCaption.label       "Browser Sync">
+<!ENTITY syncComputerName.label       "Computer Name:">
+<!ENTITY syncComputerName.accesskey   "c">
+<!ENTITY syncModeSwitchDesc.label     "&brandShortName; will: ">
+<!ENTITY syncModeSwitchDesc.accesskey "w">
+<!ENTITY syncEverything.label         "Sync Everything">
+<!ENTITY customSync.label             "Use my custom settings">
+<!ENTITY syncEverythingDescription.label  "Your bookmarks, history, passwords, preferences, and tabs will be synced.">
+<!ENTITY syncItem.bookmarks.label     "Sync Bookmarks">
+<!ENTITY syncItem.bookmarks.accesskey "m">
+<!ENTITY syncItem.tabs.label          "Sync Tabs">
+<!ENTITY syncItem.tabs.accesskey      "T">
+<!ENTITY syncItem.history.label       "Sync History">
+<!ENTITY syncItem.history.accesskey   "r">
+<!ENTITY syncItem.passwords.label     "Sync Passwords">
+<!ENTITY syncItem.passwords.accesskey "P">
+<!ENTITY syncItem.prefs.label         "Sync Preferences">
+<!ENTITY syncItem.prefs.accesskey     "S">
+
+<!-- Footer stuff -->
+<!ENTITY prefs.tosLink.label        "Terms of Service">
+<!ENTITY prefs.ppLink.label         "Privacy Policy">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/syncBrand.dtd
@@ -0,0 +1,2 @@
+<!ENTITY syncBrand.shortName.label  "Sync">
+<!ENTITY syncBrand.fullName.label   "Firefox Sync">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/syncGenericChange.properties
@@ -0,0 +1,37 @@
+# LOCALIZATION NOTE (change.password.title): This (and associated change.password/passphrase) are used when the user elects to change their password.
+change.password.title = Change your Password
+change.password.acceptButton = Change Password
+change.password.status.active = Changing your password…
+change.password.status.success = Your password has been changed.
+change.password.status.error = There was an error changing your password.
+
+change.password.introText = Your password must be at least 8 characters long.  It cannot be the same as either your user name or your secret phrase.
+change.password.warningText = Note: All of your other devices will be unable to connect to your account once you change this password.
+
+change.passphrase.title = Change your Secret Phrase
+change.passphrase.acceptButton = Change Secret Phrase
+change.passphrase.label = Changing secret phrase and uploading local data, please wait…
+change.passphrase.error = There was an error while changing your secret phrase!
+change.passphrase.success = Your secret phrase was successfully changed!
+
+# LOCALIZATION NOTE (change.passphrase.introText) "Sync" should match &syncBrand.shortName.label; from syncBrand.dtd
+change.passphrase.introText = Your secret phrase must be at least 12 characters long.  Sync uses this phrase as part of encrypting your data.
+# LOCALIZATION NOTE (change.passphrase.introText2) "Firefox Sync" should match syncBrand.fullName.label from syncBrand.dtd
+change.passphrase.introText2 = You may wish to write this down, as this is never sent over the Internet and is not backed up or synced by Firefox Sync for your security.
+# LOCALIZATION NOTE (change.passphrase.warningText) "Sync" should match &syncBrand.shortName.label; from syncBrand.dtd
+change.passphrase.warningText = Note: This will erase all data stored on the Sync server and upload new data secured by this phrase. Your other devices will not sync until the secret phrase is entered for that device.
+
+# LOCALIZATION NOTE (new.password.title): This (and associated new.password/passphrase) are used on a second computer when it detects that your password or passphrase has been changed on a different device.
+new.password.title            = Update Password
+new.password.introText        = Your password was rejected by the server, please update your password.
+new.password.label            = Enter your new password
+new.password.confirm          = Confirm your new password
+new.password.acceptButton     = Update Password
+new.password.status.incorrect = Password incorrect, please try again.
+
+new.passphrase.title            = Update Secret Phrase
+new.passphrase.introText        = Your secret phrase has changed, please enter your new secret phrase
+new.passphrase.label            = New secret phrase
+new.passphrase.confirm          = Confirm secret phrase
+new.passphrase.acceptButton     = Update Secret Phrase
+new.passphrase.status.incorrect = Secret phrase incorrect, please try again.
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/syncSetup.dtd
@@ -0,0 +1,98 @@
+<!ENTITY accountSetupTitle.label    "&syncBrand.fullName.label; Setup">
+
+<!-- First page of the wizard -->
+
+<!ENTITY setup.choicePage.title.label     "Have you used &syncBrand.fullName.label; before?">
+<!ENTITY setup.choicePage.new.label       "I've never used &syncBrand.shortName.label; before">
+<!ENTITY setup.choicePage.existing.label  "I'm already using &syncBrand.shortName.label; on another computer">
+
+<!-- New Account AND Existing Account -->
+<!ENTITY connectTo.label            "Connect to">
+<!ENTITY serverType.main.label      "&syncBrand.fullName.label; Server">
+<!ENTITY serverType.custom.label    "Use a custom server">
+<!ENTITY signIn.username.label      "User Name">
+<!ENTITY signIn.username.accesskey  "U">
+<!ENTITY signIn.password.label      "Password">
+<!ENTITY signIn.password.accesskey  "P">
+<!ENTITY signIn.serverURL.label     "Server URL">
+<!ENTITY signIn.serverURL.accesskey "L">
+
+<!-- New Account Page 1: Basic Account Info -->
+<!ENTITY setup.newAccountPage.title.label  "Create your &syncBrand.shortName.label; Account">
+<!ENTITY setup.confirmPassword.label  "Confirm Password">
+<!ENTITY setup.confirmPassword.accesskey  "m">
+<!ENTITY setup.emailAddress.label     "Email Address">
+<!ENTITY setup.emailAddress.accesskey "E">
+<!-- LOCALIZATION NOTE: tosAgree1, tosLink, tosAgree2, ppLink, tosAgree3 are
+     joined with implicit white space, so spaces in the strings aren't necessary -->
+<!ENTITY setup.tosAgree1.label      "I agree to the">
+<!ENTITY setup.tosAgree1.accesskey  "a">
+<!ENTITY setup.tosLink.label        "Terms of Service">
+<!ENTITY setup.tosAgree2.label      "and the">
+<!ENTITY setup.ppLink.label         "Privacy Policy">
+<!ENTITY setup.tosAgree3.label      "">
+<!ENTITY setup.tosAgree2.accesskey  "">
+
+<!-- New Account Page 2: Passphrase Entry -->
+<!ENTITY setup.newPPPage.title.label       "Enter your Secret Phrase">
+<!ENTITY passphraseDesc.label         "Please enter a secret phrase. This will be used to encrypt all your data so only you can access it. It is never stored on the server, so don't lose this!">
+<!ENTITY passphraseDesc2.label        "This must be at least 12 characters long and cannot match your account password.">
+<!ENTITY passphraseEntry.label        "Secret Phrase">
+<!ENTITY passphraseEntry.accesskey    "S">
+<!ENTITY passphraseConfirm.label      "Confirm">
+<!ENTITY passphraseConfirm.accesskey  "m">
+
+<!-- New Account Page 3: Sync Type Options -->
+<!ENTITY setup.newAccountPrefs2.title.label "Browser Sync Preferences">
+<!ENTITY syncComputerName.label       "Computer Name:">
+<!ENTITY syncComputerName.accesskey   "c">
+<!ENTITY syncModeSwitchDesc.label     "&brandShortName; will: ">
+<!ENTITY syncModeSwitchDesc.accesskey "w">
+<!ENTITY syncEverything.label         "Sync Everything">
+<!ENTITY customSync.label             "Use my custom settings">
+<!ENTITY syncEverythingDescription.label  "Your bookmarks, history, passwords, preferences, and tabs will be synced.">
+<!ENTITY syncItem.bookmarks.label     "Sync Bookmarks">
+<!ENTITY syncItem.bookmarks.accesskey "m">
+<!ENTITY syncItem.tabs.label          "Sync Tabs">
+<!ENTITY syncItem.tabs.accesskey      "T">
+<!ENTITY syncItem.history.label       "Sync History">
+<!ENTITY syncItem.history.accesskey   "r">
+<!ENTITY syncItem.passwords.label     "Sync Passwords">
+<!ENTITY syncItem.passwords.accesskey "P">
+<!ENTITY syncItem.prefs.label         "Sync Preferences">
+<!ENTITY syncItem.prefs.accesskey     "S">
+
+<!-- New Account Page 4: Captcha -->
+<!ENTITY setup.captchaPage.title.label     "Please confirm you're not a robot ;)">
+
+<!-- Existing Account Page 1: Login -->
+<!ENTITY setup.existingAccount.title.label "Enter Account Information">
+<!ENTITY resetPassword.label          "Reset Password">
+<!ENTITY connecting.label             "Connecting…">
+
+<!-- Existing Account Page 2: Passphrase -->
+<!ENTITY passphraseGroupbox.label     "Enter Secret Phrase">
+<!ENTITY passphraseDesc3.label        "Please enter your secret phrase. This must be the same secret phrase that you used to encrypt your data.">
+<!ENTITY passphraseHelp.label         "Your secret phrase is at least 12 characters long and is not your password. You can find your saved secret phrase by going to your other computer and checking the Saved Passwords under Security. If you still cannot get the correct secret phrase, you can choose to reset it, but you will lose any data stored on the server.">
+<!ENTITY changePassphrase.label       "Change Secret Phrase">
+<!ENTITY verifying.label              "Verifying…">
+
+<!-- New & Existing Account: Merge Options -->
+<!ENTITY setup.mergeChoicePage.title.label "How do you want to start off?">
+<!ENTITY choice.merge.main.label      "Merge this computer's data with your &syncBrand.shortName.label; data">
+<!ENTITY choice.merge.recommend.label "This option is strongly recommended by Mozilla for all users.">
+<!ENTITY choice.client.main.label     "Replace all data on this computer with your &syncBrand.fullName.label; data">
+<!ENTITY choice.server.main.label     "Replace all other devices with your local data">
+
+<!-- New & Existing Account: Confirm Merge Options -->
+<!ENTITY confirm.caption.label        "Confirm your choice">
+<!ENTITY confirm.merge.label          "You have chosen to merge your data on this computer with the data on your other devices running &syncBrand.fullName.label;.">
+<!ENTITY confirm.client.label         "All &brandShortName; data on this computer will be deleted, including the following:">
+<!ENTITY confirm.client.moreinfo.label "&brandShortName; will then copy your &syncBrand.fullName.label; data to this computer.">
+<!ENTITY confirm.client.warning.label "WARNING: This will result in all &brandShortName; data on this computer being replaced!">
+<!ENTITY confirm.server.label         "The following devices will be overwritten with your local data:">
+<!ENTITY confirm.server.warning.label "WARNING: Your local data will replace all &brandShortName; data on these devices!">
+
+<!-- New & Existing Account: Setup Complete -->
+<!ENTITY setup.successPage.title.label   "Setup Complete!">
+<!ENTITY setup.successPage.desc.label    "Congratulations! &brandShortName; is now set up to automatically sync your information. Don't forget to install &syncBrand.fullName.label; on all your devices. You can now continue using &brandShortName;.">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/syncSetup.properties
@@ -0,0 +1,16 @@
+cancelSetup.label           = Cancel Setup
+errorCreatingAccount.title  = Error Creating Account
+
+invalidEmail.label          = Invalid email address
+serverInvalid.label         = Please enter a valid server URL
+usernameNotAvailable.label  = Already in use
+
+# LOCALIZATION NOTE (additionalClients.label, bookmarkCount.label, historyCount.label, passwordCount.label).
+# We'll fix the lack of PluralForms in bug 583661.
+additionalClients.label     = and %S additional devices
+bookmarkCount.label         = %S bookmarks
+historyCount.label          = %S days of history
+passwordCount.label         = %S passwords
+
+# Several other strings are used (via Weave.Status.login), but they come from
+#  /services/sync */
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/taskbar.properties
@@ -0,0 +1,10 @@
+taskbar.tasks.newTab.label=Open new tab
+taskbar.tasks.newTab.description=Open a new browser tab.
+taskbar.tasks.newWindow.label=Open new window
+taskbar.tasks.newWindow.description=Open a new browser window.
+taskbar.tasks.enterPrivacyMode.label=Enter private browsing
+taskbar.tasks.enterPrivacyMode.description=Start private browsing. The current session will be saved.
+taskbar.tasks.exitPrivacyMode.label=Quit private browsing
+taskbar.tasks.exitPrivacyMode.description=Quit private browsing and restore the previous session.
+taskbar.frequent.label=Frequent
+taskbar.recent.label=Recent
new file mode 100644
--- /dev/null
+++ b/browser/feedback/main.dtd
@@ -0,0 +1,30 @@
+<!ENTITY testpilot.brand.label                      "Test Pilot">
+<!-- browser window: menu and status bar -->
+<!ENTITY testpilot.settings.label                   "Settings">
+<!ENTITY testpilot.settings.notifyMeWhen.label      "Notify me when">
+<!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">
+<!ENTITY testpilot.settings.alwaysSubmitData.label  "Automatically submit my data (don't ask me)">
+<!ENTITY testpilot.allStudies.label                 "All Your User Studies">
+<!ENTITY testpilot.about.label                      "About Test Pilot">
+
+<!-- all studies window -->
+<!ENTITY testpilot.studiesWindow.title                  "Your Test Pilot Studies">
+<!ENTITY testpilot.studiesWindow.currentStudies.label   "Current Studies">
+<!ENTITY testpilot.studiesWindow.finishedStudies.label  "Finished Studies">
+<!ENTITY testpilot.studiesWindow.studyFindings.label    "Study Findings">
+<!ENTITY testpilot.studiesWindow.settings.label         "Settings">
+<!ENTITY testpilot.studiesWindow.stillLoadingMessage    "Loading, please wait...">
+
+<!-- raw data dialog -->
+<!ENTITY testpilot.rawDataWindow.title                  "Test Pilot: Raw Data">
+
+<!-- notification -->
+<!ENTITY testpilot.notification.close.tooltip            "Close">
+
+<!-- Firefox 4 beta version UI -->
+<!ENTITY testpilot.enable.label                        "Turn On User Studies">
+<!ENTITY testpilot.feedbackbutton.label                "Feedback">
+<!ENTITY testpilot.happy.label        "Firefox Made Me Happy Because...">
+<!ENTITY testpilot.sad.label          "Firefox Made Me Sad Because...">
new file mode 100644
--- /dev/null
+++ b/browser/feedback/main.properties
@@ -0,0 +1,95 @@
+# common
+testpilot.fullBrandName = Mozilla Labs Test Pilot
+testpilot.moreInfo = More Info
+testpilot.submit = Submit
+testpilot.takeSurvey = Take the Survey
+
+# Feedback button menu
+testpilot.turnOn = Turn On User Studies
+testpilot.turnOff = Turn Off User Studies
+
+# studies window
+testpilot.studiesWindow.noStudies = We are working on a new study now; it will knock on your door soon! Stay Tuned!
+testpilot.studiesWindow.uploading = Uploading...
+testpilot.studiesWindow.unableToReachServer = Unable to reach Mozilla; please try again later.
+testpilot.studiesWindow.thanksForContributing = Thanks for contributing!
+testpilot.studiesWindow.finishedOn = Finished on %S
+testpilot.studiesWindow.canceledStudy = (You canceled this study)
+testpilot.studiesWindow.missedStudy = (You missed this study)
+testpilot.studiesWindow.willStart = Will start on %S
+testpilot.studiesWindow.gatheringData = Currently gathering data.
+testpilot.studiesWindow.willFinish = Will finish on %S
+testpilot.studiesWindow.proposeStudy = Propose your own study
+
+# for pages
+testpilot.page.commentsAndDiscussions = Comments & Discussions &raquo;
+testpilot.page.proposeATest = Propose a Test &raquo;
+testpilot.page.testpilotOnTwitter = @MozTestPilot on Twitter &raquo;
+
+# status page
+testpilot.statusPage.uploadingData = Now uploading data...
+testpilot.statusPage.uploadErrorMsg = Oops! There was an error connecting to the Mozilla servers.  Maybe your network connection is down?
+testpilot.statusPage.willRetry = Test Pilot will retry automatically, so it's OK to close this page now.
+testpilot.statusPage.endedAlready = (It has already ended and you should not be seeing this page)
+testpilot.statusPage.todayAt =  today, at %S
+testpilot.statusPage.endOn = on %S
+# LOCALIZATION NOTE (numExtensions): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 = number of extensions
+# example: "2 extensions"
+testpilot.statusPage.numExtensions = #1 extension;#1 extensions
+testpilot.statusPage.recursEveryNumberOfDays = This test recurs every %S days. Each time it completes:
+testpilot.statusPage.askMeBeforeSubmitData = Ask me whether I want to submit my data.
+testpilot.statusPage.alwaysSubmitData = Always submit my data, and don't ask me about it.
+testpilot.statusPage.neverSubmitData = Never submit my data, and don't ask me about it.
+testpilot.statusPage.loading = Loading, please wait a moment...
+
+# quit page
+testpilot.quitPage.aboutToQuit = You are about to quit the "%S" study.
+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.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 = Privacy Policy
+testpilot.welcomePage.legalNotices = Legal Notices
+
+# survey page
+testpilot.surveyPage.saveAnswers = Save Answers
+testpilot.surveyPage.submitAnswers = Submit Answers
+testpilot.surveyPage.changeAnswers = Change Answers
+testpilot.surveyPage.loading = Loading, please wait a moment...
+testpilot.surveyPage.thankYouForFinishingSurvey = Thank you for finishing this survey. Your answers will be uploaded along with the next set of experimental data.
+testpilot.surveyPage.reviewOrChangeYourAnswers = If you would like to review or change your answers, you can do so at any time using the button below.
+
+# modules/task.js
+testpilot.finishedTask.finishedStudy = Excellent! You finished the %S Study!
+testpilot.finishedTask.allRelatedDataDeleted = All data related to this study has been removed from your computer.
+
+# modules/setup.js
+testpilot.notification.update = Update...
+testpilot.notification.thankYouForUploadingData = Thanks!
+testpilot.notification.thankYouForUploadingData.message = Thank you for uploading your data.
+testpilot.notification.readyToSubmit = Ready to Submit
+testpilot.notification.readyToSubmit.message = The Test Pilot "%S" study is finished gathering data and is ready to submit.
+testpilot.notification.newTestPilotStudy = New Test Pilot Study
+testpilot.notification.newTestPilotStudy.pre.message = The Test Pilot "%S" study is about to begin.
+testpilot.notification.newTestPilotSurvey = New Test Pilot Survey
+testpilot.notification.newTestPilotSurvey.message = The Test Pilot "%S" survey is available.
+testpilot.notification.newTestPilotResults = New Test Pilot Results
+testpilot.notification.newTestPilotResults.message = New results are now available for the Test Pilot "%S" study.
+testpilot.notification.autoUploadedData = Thank you!
+testpilot.notification.autoUploadedData.message = The Test Pilot "%S" study is completed and your data has been submitted!
+testpilot.notification.extensionUpdate = Extension Update
+testpilot.notification.extensionUpdate.message = One of your studies requires a newer version of Test Pilot. You can get the latest version using the Add-ons window.
deleted file mode 100644
--- a/dom/chrome/printdialog.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.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 *****
-
-PrintFrames=Presi kadrojn
-Aslaid=Kiel &videblas sur la ekrano
-selectedframe=La ele&ktita kadro
-Eachframe=&Ĉiu kadro aparte
-options=Opcioj
deleted file mode 100644
--- a/dom/chrome/prompts.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.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 *****
-
-# LOCALIZATION NOTE (EnterLoginForRealm, EnterLoginForProxy):
-# %1 is an untrusted string provided by a remote server. It could try to
-# take advantage of sentence structure in order to mislead the user (see
-# bug 244273). %1 should be integrated into the translated sentences as
-# little as possible. %2 is the url of the site being accessed.
-EnterLoginForRealm=A username and password are being requested by %2$S. The site says: "%1$S"
-EnterLoginForProxy=The proxy %2$S is requesting a username and password. The site says: "%1$S"
-
-EnterUserPasswordFor=Tajpu la nomon de uzanto kaj pasvorton por %1$S
-EnterPasswordFor=Tajpu pasvorton por %1$S en %2$S
-
deleted file mode 100644
--- a/dom/chrome/webservices/security.properties
+++ /dev/null
@@ -1,45 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the SOAP security 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): Harish Dhurvasula <harishd@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 *****
-
-UnsupportedNamespace = The namespace "%S" is not supported. Please use "http://www.mozilla.org/2002/soap/security".
-UnknownRootElement = The root element "%S" is not recognized. Please use "webScriptAccess" element.
-UnknownElement = The element "%S" is not recognized.
-UnknownAttribute = The attribute "%S" is not recognized.
-TooManyElements = There can be no more than one "%S" element.
-ElementHasSibling = "%S" element cannot have "%S" sibiling.
-ElementNotEmpty = The "%S" element should be empty.
-SOAPFault = SOAP { %S } %S call resulted in fault: { %S } %S : %S.
-
new file mode 100644
--- /dev/null
+++ b/services/sync/errors.properties
@@ -0,0 +1,26 @@
+error.login.reason.network    = Failed to connect to the server
+error.login.reason.passphrase = Wrong secret phrase
+error.login.reason.password   = Incorrect username or password
+error.login.reason.no_password= No saved password to use
+error.login.reason.no_passphrase= No saved secret phrase to use
+error.login.reason.server     = Server incorrectly configured
+
+error.sync.failed_partial     = One or more data types could not be synced
+
+invalid-captcha = Incorrect words, try again
+weak-password   = Use a stronger password
+
+# this is the fallback, if we hit an error we didn't bother to localize
+error.reason.unknown          = Unknown error
+
+change.passphrase.ppSameAsPassphrase = The secret phrase cannot be the same as your current secret phrase
+change.passphrase.ppSameAsPassword   = The secret phrase cannot be the same as your password
+change.passphrase.ppSameAsUsername   = The secret phrase cannot be the same as your user name
+change.passphrase.mismatch           = The phrases entered do not match
+change.passphrase.tooShort           = The secret phrase entered is too short
+
+change.password.pwSameAsPassphrase   = Password can't match secret phrase
+change.password.pwSameAsPassword     = Password can't match current password
+change.password.pwSameAsUsername     = Password can't match your user name
+change.password.mismatch             = The passwords entered do not match
+change.password.tooShort             = The password entered is too short
new file mode 100644
--- /dev/null
+++ b/services/sync/sync.properties
@@ -0,0 +1,37 @@
+# %1: the user name (Ed), %2: the app name (Firefox), %3: the operating system (Android)
+client.name2 = %1$S's %2$S on %3$S
+
+# %S is the date and time at which the last sync successfully completed
+lastSync.label = Last Update: %S
+lastSyncInProgress.label = Last Update: in progress…
+
+# %S is the username logged in
+connected.label = Connected: %S
+disconnected.label = Disconnected
+connecting.label = Connecting…
+
+mobile.label = Mobile Bookmarks
+
+remote.pending.label = Remote tabs are being synced…
+remote.missing.label = Sync your other computers again to access their tabs
+remote.opened.label = All remote tabs are already open
+remote.notification.label = Recent desktop tabs will be available once they sync
+
+error.login.title = Error While Signing In
+error.login.description = Sync encountered an error while connecting: %1$S.  Please try again.
+error.login.prefs.label = Preferences…
+error.login.prefs.accesskey = P
+# should decide if we're going to show this
+error.logout.title = Error While Signing Out
+error.logout.description = Sync encountered an error while connecting.  It's probably ok, and you don't have to do anything about it.
+error.sync.title = Error While Syncing
+error.sync.description = Sync encountered an error while syncing: %1$S.  Sync will automatically retry this action.
+error.sync.no_node_found = The Sync server is a little busy right now, but you don't need to do anything about it.  We'll start syncing your data as soon as we can!
+error.sync.no_node_found.title = Sync Delay
+error.sync.needUpdate.description = You need to update Firefox Sync to continue syncing your data.
+error.sync.needUpdate.label = Update Firefox Sync
+error.sync.needUpdate.accesskey = U
+error.sync.tryAgainButton.label = Sync Now
+error.sync.tryAgainButton.accesskey = S
+
+tabs.fromOtherComputers.label = Tabs From Other Computers
new file mode 100644
--- /dev/null
+++ b/toolkit/chrome/global/aboutAbout.dtd
@@ -0,0 +1,4 @@
+<!ENTITY aboutAbout.title  "About About">
+<!ENTITY aboutAbout.note   "This is a list of “about” pages for your convenience.<br/>
+                            Some of them might be confusing. Some are for diagnostic purposes only.<br/>
+                            And some are omitted because they require query strings.">
new file mode 100644
--- /dev/null
+++ b/toolkit/chrome/global/aboutRights.dtd
@@ -0,0 +1,65 @@
+<!-- rights.locale-direction instead of the usual local.dir entity, so RTL can skip translating page. -->
+<!ENTITY rights.locale-direction "ltr">
+<!ENTITY rights.pagetitle       "about:rights">
+<!ENTITY rights.intro-header    "Pri viaj rajtoj">
+<!ENTITY rights.intro "&brandFullName; estas libera kaj malfermitkoda programo, konstruita de komunumo de miloj de personoj el la tuta mondo. Estas kelkaj aferoj kiujn vi devus scii:">
+
+<!-- Note on pointa / pointb / pointc form:
+     These points each have an embedded link in the HTML, so each point is
+     split into chunks for text before the link, the link text, and the text
+     after the link. If a localized grammar doesn't need the before or after
+     chunk, it can be left blank.
+
+     Also note the leading/trailing whitespace in strings here, which is
+     deliberate for formatting around the embedded links. -->
+<!ENTITY rights.intro-point1a "&brandShortName; estas akirebla de vi laŭ la kondiĉoj de la permesilo ">
+<!ENTITY rights.intro-point1b "Mozilla Public License">
+<!ENTITY rights.intro-point1c ". This means you may use, copy and distribute &brandShortName; to others.  You are also welcome to modify the source code of &brandShortName; as you want to meet your needs. The Mozilla Public License also gives you the right to distribute your modified versions.">
+
+<!ENTITY rights.intro-point2-a "You are not granted any trademark rights or licenses to the trademarks of the Mozilla Foundation or any party, including without limitation the Firefox name or logo. Additional information on trademarks may be found ">
+<!ENTITY rights.intro-point2-b "here">
+<!ENTITY rights.intro-point2-c ".">
+
+<!-- point 3 text for official branded builds -->
+<!ENTITY rights.intro-point3a "Privacy policies for &vendorShortName;'s products may be found ">
+<!ENTITY rights.intro-point3b "here">
+<!ENTITY rights.intro-point3c ".">
+
+<!-- point 3 text for unbranded builds -->
+<!ENTITY rights.intro-point3-unbranded "Any applicable privacy policies for this product should be listed here.">
+
+<!-- point 4 text for official branded builds -->
+<!ENTITY rights.intro-point4a "&brandShortName; also offers optional web site information services, such as the SafeBrowsing service; however, we cannot guarantee they are 100&#37; accurate or error-free. More details, including information on how to disable the services, can be found in the ">
+<!ENTITY rights.intro-point4b "service terms">
+<!ENTITY rights.intro-point4c ".">
+
+<!-- point 4 text for unbranded builds -->
+<!ENTITY rights.intro-point4a-unbranded "If this product incorporates web services, any applicable service terms for the service(s) should be linked to the ">
+<!ENTITY rights.intro-point4b-unbranded "Web Site Services">
+<!ENTITY rights.intro-point4c-unbranded " section.">
+
+<!ENTITY rights.webservices-header "&brandFullName; Web Site Services">
+
+<!-- Note that this paragraph references a couple of entities from
+     preferences/security.dtd, so that we can refer to text the user sees in
+     the UI, without this page being forgotten every time those strings are
+     updated.  -->
+<!-- intro paragraph for branded builds -->
+<!ENTITY rights.webservices-a "&brandFullName; uses web site information services (&quot;Services&quot;), such as the SafeBrowsing service, that are available for your use with this binary version of &brandShortName; as described below. If you do not want to use the Services or the terms below are unacceptable, you may disable the SafeBrowsing service by opening the application preferences, selecting the ">
+<!ENTITY rights.webservices-b "Security">
+<!ENTITY rights.webservices-c " section, and unchecking the options for &quot;&blockAttackSites.label;&quot; and &quot;&blockWebForgeries.label;&quot;">
+
+<!-- intro paragraph for unbranded builds -->
+<!ENTITY rights.webservices-unbranded "An overview of the web site services the product incorporates, along with instructions on how to disable them, if applicable, should be included here.">
+
+<!-- point 1 text for unbranded builds -->
+<!ENTITY rights.webservices-term1-unbranded "Any applicable service terms for this product should be listed here.">
+
+<!-- points 1-7 text for branded builds -->
+<!ENTITY rights.webservices-term1 "&vendorShortName; and its contributors, licensors and partners work to provide the most accurate and up-to-date phishing and malware information. However, they cannot guarantee that this information is comprehensive and error-free: some risky sites may not be identified and some safe sites may be identified in error.">
+<!ENTITY rights.webservices-term2 "&vendorShortName; may discontinue or change the Services at its discretion.">
+<!ENTITY rights.webservices-term3 "You are welcome to use these Services with the accompanying version of &brandShortName;, and you have all the rights necessary to do so.  &vendorShortName; and its licensors reserve all other rights in the Services.  These terms are not intended to limit any rights granted under open source licenses applicable to &brandShortName; and to corresponding source code versions of &brandShortName;.">
+<!ENTITY rights.webservices-term4 "The Services are provided &quot;as-is.&quot;  &vendorShortName;, its contributors, licensors, and distributors, disclaim all warranties, whether express or implied, including without limitation, warranties that the Services are merchantable and fit for your particular purposes.  You bear the entire risk as to selecting the Services for your purposes and as to the quality and performance of the Services. Some jurisdictions do not allow the exclusion or limitation of implied warranties, so this disclaimer may not apply to you.">
+<!ENTITY rights.webservices-term5 "Except as required by law, &vendorShortName;, its contributors, licensors, and distributors will not be liable for any indirect, special, incidental, consequential, punitive, or exemplary damages arising out of or in any way relating to the use of &brandShortName; and the Services.  The collective liability under these terms will not exceed $500 (five hundred dollars). Some jurisdictions do not allow the exclusion or limitation of certain damages, so this exclusion and limitation may not apply to you.">
+<!ENTITY rights.webservices-term6 "&vendorShortName; may update these terms as necessary from time to time. These terms may not be modified or canceled without &vendorShortName;'s written agreement.">
+<!ENTITY rights.webservices-term7 "These terms are governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions. If any portion of these terms is held to be invalid or unenforceable, the remaining portions will remain in full force and effect. In the event of a conflict between a translated version of these terms and the English language version, the English language version shall control.">
new file mode 100644
--- /dev/null
+++ b/toolkit/chrome/global/aboutRights.properties
@@ -0,0 +1,3 @@
+buttonLabel = Konu viajn rajtojn…
+buttonAccessKey = K
+notifyRightsText = %S estas libera kaj malfermitkoda programo de la neprofitcela organizo Mozilla Foundation.
new file mode 100644
--- /dev/null
+++ b/toolkit/chrome/global/aboutSupport.dtd
@@ -0,0 +1,37 @@
+<!ENTITY aboutSupport.pageTitle "Troubleshooting Information">
+
+<!-- LOCALIZATION NOTE (aboutSupport.pageSubtitle): don't change the 'supportLink' id. -->
+<!ENTITY aboutSupport.pageSubtitle "
+  This page contains technical information that might be useful when you're
+  trying to solve a problem. If you are looking for answers to common questions
+  about &brandShortName;, check out our <a id='supportLink'>support web site</a>.
+">
+
+<!ENTITY aboutSupport.extensionsTitle "Extensions">
+<!ENTITY aboutSupport.extensionName "Name">
+<!ENTITY aboutSupport.extensionEnabled "Enabled">
+<!ENTITY aboutSupport.extensionVersion "Version">
+<!ENTITY aboutSupport.extensionId "ID">
+
+<!ENTITY aboutSupport.appBasicsTitle "Application Basics">
+<!ENTITY aboutSupport.appBasicsName "Name">
+<!ENTITY aboutSupport.appBasicsVersion "Version">
+<!ENTITY aboutSupport.appBasicsProfileDir "Profile Directory">
+<!ENTITY aboutSupport.appBasicsEnabledPlugins "Enabled Plugins">
+<!ENTITY aboutSupport.appBasicsBuildConfig "Build Configuration">
+
+<!ENTITY aboutSupport.show.label "Open Containing Folder">
+
+<!-- LOCALIZATION NOTE (aboutSupport.showMac.label): This is the Mac-specific
+variant of aboutSupport.show.label.  This allows us to use the preferred
+"Finder" terminology on Mac. -->
+<!ENTITY aboutSupport.showMac.label "Show in Finder">
+
+<!ENTITY aboutSupport.modifiedPrefsTitle "Modified Preferences">
+<!ENTITY aboutSupport.modifiedPrefsName "Name">
+<!ENTITY aboutSupport.modifiedPrefsValue "Value">
+
+<!ENTITY aboutSupport.installationHistoryTitle "Installation History">
+<!ENTITY aboutSupport.updateHistoryTitle "Update History">
+
+<!ENTITY aboutSupport.copyToClipboard.label "Copy all to clipboard">
new file mode 100644
--- /dev/null
+++ b/toolkit/chrome/global/actions.dtd
@@ -0,0 +1,1 @@
+<!ENTITY action.switchToTab.label "Switch to tab">
deleted file mode 100644
--- a/toolkit/chrome/global/gnomeprintdialog.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-printTitle=Presi
-optionsTabLabel=Opcioj
-printFramesTitle=Presi kadrojn
-
-# TRANSLATOR NOTE: For radio button labels and check button labels, an underscore _
-# before a character will turn that character into an accesskey.
-# e.g. "_As laid out" will make A the accesskey.
-
-asLaidOut=_Kiel videblas surekrane
-selectedFrame=La _elektitan kadron
-separateFrames=Ĉiun kadron en apartaj _paĝoj
-shrinkToFit=Ignori skaligon kaj _adapti al la larĝo de paĝo
-selectionOnly=Presi _nur la elektaĵon
-printBGOptions=Presi fonojn
-printBGColors=Presi fonajn _kolorojn
-printBGImages=Presi fonajn _bildojn
-headerFooter=Paĝokapo kaj paĝopiedo
-left=Maldekstre
-center=Centre
-right=Dekstre
-headerFooterBlank=--malplena--
-headerFooterTitle=Titolo
-headerFooterURL=URL
-headerFooterDate=Dato/Horo
-headerFooterPage=Paĝo #
-headerFooterPageTotal=Paĝo # de #
-headerFooterCustom=Agordite...
-customHeaderFooterPrompt=Bonvolu tajpu vian agorditan paĝokapan/paĝopiedan tekston
new file mode 100644
--- /dev/null
+++ b/toolkit/chrome/global/headsUpDisplay.properties
@@ -0,0 +1,36 @@
+typeError=Error:
+typeWarning=Warning:
+typeNetwork=Network:
+typeException=Exception:
+typeCssParser=CSS Parser:
+typeStrict=Strict Warning:
+msgCategory=Category:
+errFile=Source File: %S
+errLine=Line: %S
+errLineCol=Line: %S, Column: %S
+errCode=Source Code:
+jsWorkspaceTitle=JS Workspace
+btnHide=Hide
+btnPrefs=Preferences
+btnMutation=DOM Mutation
+tipMutation=Toggle DOM Mutation event logging
+btnNetwork=Network
+tipNetwork=Toggle Network event logging
+btnCSSParser=CSS Warnings
+tipCSSParser=Toggle CSS Warning logging
+btnException=Exceptions
+tipException=Toggle Exception logging
+btnError=Error
+tipError=Toggle console.error logging
+btnInfo=Info
+tipInfo=Toggle console.info logging
+btnWarn=Warnings
+tipWarn=Toggle console.warn logging
+btnLog=Log
+tipLog=Toggle console.log logging
+btnGlobal=Global Messages
+tipGlobal=Toggle Global Message logging
+localConsole=Local Console
+btnClear=Clear Console
+tipClear=Clear the console output
+stringFilter=Filter
deleted file mode 100644
--- a/toolkit/chrome/global/history/history.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-deleteHost=Forviŝi ĉiujn el %S
-deleteDomain=Forviŝi tutan retregionon %S
-deleteHostNoSelection=Forviŝi servilon
-deleteDomainNoSelection=Forviŝi retregionon
-
-finduri-AgeInDays-is-0=Hodiaŭ
-finduri-AgeInDays-is-1=Hieraŭ
-finduri-AgeInDays-is=antaŭ %S tagoj
-finduri-AgeInDays-isgreater=Antaŭ pli ol %S tagoj
-
-finduri-Hostname-is-=(neniu servilo)
-
-load-js-data-url-error=Pro sekurecaj kialoj javaskizaj aŭ datumajn retadresojn ne povas esti ŝargitaj el la historia fenestro aŭ flanka strio.
deleted file mode 100644
--- a/toolkit/chrome/global/license.dtd
+++ /dev/null
@@ -1,5 +0,0 @@
-<!ENTITY license.part0 "estas kopirajtita">
-<!ENTITY license.part1 "de siaj">
-<!ENTITY license.contrib "kontribuantoj">
-<!ENTITY license.part2 "laŭ la kondiĉoj difinitaj en la">
-<!ENTITY license.part3 "dokumento. Ĉiuj rajtoj rezervitaj.">
deleted file mode 100644
--- a/toolkit/chrome/global/nsHelperAppDlg.dtd
+++ /dev/null
@@ -1,42 +0,0 @@
-<!ENTITY caption.label "Malfermado de #1">
-<!-- Localization note: The default intro text has 3 "inserts":
-        #1 - replaced with the descriptive text that describes the mime type
-             (e.g., "MSWord Document")
-        #2 - replaced with the mime type (e.g., "application/ms-word")
-        #3 - replaced with the filename (e.g., "manual.doc")
-        #4 - will be replaced by the brand name (e.g., "Mozilla")
-     If there is no descriptive text, then the alternative text is used which
-     has only insert #2.
- -->
-
-<!ENTITY intro.label "La dosiero &quot;#3&quot; apartenas al la tipo #2 (#1), kaj #4 ne scias kiel pritrakti tiun ĉi tipon de dosiero. Tiu dosiero troviĝas ĉe:">
-<!ENTITY intro.noDesc.label "La dosiero &quot;#3&quot; apartenas al la tipo #2, kaj #4 ne scias kiel pritrakti tiun ĉi tipon de dosiero. Tiu dosiero troviĝas ĉe:">
-
-<!ENTITY intro.attachment.label "La retejo sugestas ke &quot;#3&quot; estu pritraktita kiel anekso. Ĝi apartenas al la tipo #2 (#1) kaj troviĝas ĉe:">
-<!ENTITY intro.attachment.noDesc.label "La retejo sugestas ke &quot;#3&quot; estu pritraktata kiel anekso. Ĝi apartenas al la tipo #2 kaj troviĝas ĉe:">
-
-<!ENTITY intro.sniffed.label "#4 has detected that the file &quot;#3&quot; is likely to be of type #2 (#1). The file is located at:">
-<!ENTITY intro.sniffed.noDesc.label "#4 has detected that the file &quot;#3&quot; is likely to be of type #2. The file is located at:">
-
-<!ENTITY prompt.label "What should #1 do with this file?">
-
-<!ENTITY alwaysHandle.label "Always perform this action when handling files of this type">
-<!ENTITY alwaysHandle.accesskey "A">
-
-<!ENTITY saveToDisk.label "Save it to disk">
-<!ENTITY saveToDisk.accesskey "S">
-
-<!ENTITY useSystemDefault.label "Open it with the default application (#1)">
-<!ENTITY useSystemDefault.noDesc.label "Open it with the default application">
-<!ENTITY useSystemDefault.accesskey "O">
-
-<!ENTITY openUsing.label "Open it with">
-<!ENTITY openUsing.accesskey "w">
-
-<!ENTITY chooseApp.label "Elekti…">
-<!ENTITY chooseApp.accesskey "E">
-
-<!ENTITY chooseAppFilePickerTitle "Elekti helpan programon">
-
-<!ENTITY badApp "The application you specified (&quot;#1&quot;) could not be found.  Check the file name or select another application.">
-<!ENTITY badApp.title "Programo ne trovita">
deleted file mode 100644
--- a/toolkit/chrome/global/nsHelperAppDlg.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-saveDialogTitle=Tajpu la nomon de la konservota dosiero…
-noDefaultFile=unnamed
deleted file mode 100644
--- a/toolkit/chrome/global/nsProgressDialog.dtd
+++ /dev/null
@@ -1,136 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla 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>
-   -   Aaron Kaluszka <ask@swva.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 ***** -->
-<!-- These strings are used on the download progress dialog.
-     See: http://lxr.mozilla.org/seamonkey/source/embedding/components/ui/progressDlg/nsProgressDialog.xul
--->
-<!-- This is used prior to initializing with a proper title -->
-
-
-<!ENTITY defaultTitle "Konservado">
-<!-- These are used when saving -->
-
-<!ENTITY savingTitle "#2&#037; el #1 konservita">
-<!ENTITY savingSource "Konservado el:">
-<!ENTITY savingTarget "Al:">
-<!-- These are used when opening (with an application) -->
-
-<!ENTITY openingTitle "#2&#037; el #1 farita">
-<!ENTITY openingSource "Malfermado el:">
-<!ENTITY openingTarget "Kun:">
-<!-- This is used when the download percentage is unknown -->
-
-<!ENTITY unknownSavingTitle "Konservado #1">
-<!ENTITY unknownOpeningTitle "Malfermado #1">
-<!-- Labels on other fields -->
-
-<!ENTITY status "Stato:">
-<!ENTITY timeElapsed "Pasinta tempo:">
-<!ENTITY timeLeft "Restanta tempo:">
-<!ENTITY progress "Progreso:">
-<!-- Label for the "keep dialog" checkbox -->
-
-<!ENTITY keep "Konservi tiun ĉi fenestron malfermita post la fino de la elŝuto">
-<!-- Button labels -->
-
-<!ENTITY cancel "Nuligi">
-<!ENTITY pause "Paŭzigi">
-<!ENTITY resume "Daŭrigi">
-<!ENTITY close "Fermi">
-<!ENTITY reveal "Montri dosieran lokon">
-<!ENTITY launch "Komenci dosieron">
-<!-- Status/progress messages -->
-<!-- LOCALIZATION NOTE (pausedMsg):
-    This string is used to indicate that the download is paused -->
-
-
-<!ENTITY pausedMsg "Paŭzo de elŝuto">
-<!-- LOCALIZATION NOTE (progressMsg):
-
-    This string is used to generate the status message used during
-    file download.
-
-    #1 will be replaced by the number of bytes downloaded thus far
-    #2 will be replaced by the total number of bytes to be downloaded
-    #3 will be replaced by the download rate (in KB per second) -->
-
-<!ENTITY progressMsg "#1KB el #2KB (je #3KB/sek)">
-<!-- LOCALIZATION NOTE (unknownTime):
-    
-    This string is used when the time remaining is unknown. -->
-
-<!ENTITY unknownTime "Nekonata">
-<!-- LOCALIZATION NOTE (longTimeFormat):
-
-    This string is used to format elapsed/remaining times when the
-    time exceeds 1 hour in length.
-
-    #1 will be replaced by the number of hours
-    #2 will be replaced by the number of minutes
-    #3 will be replaced by the number of seconds -->
-
-<!ENTITY longTimeFormat "#1:#2:#3">
-<!-- LOCALIZATION NOTE (shortTimeFormat):
-
-    This string is used to format elapsed/remaining times when the
-    time is less than 1 hour in length.  Note that you can leave
-    "#1" out of this string to omit the leading "00:" if you so choose.
-
-    #1 will be replaced by the number of hours
-    #2 will be replaced by the number of minutes
-    #3 will be replaced by the number of seconds -->
-
-<!ENTITY shortTimeFormat "#2:#3">
-<!-- LOCALIZATION NOTE (completeMsg):
-
-    This string is displayed when the download is complete.  The insert
-    "#1" is replaced by the elapsed time, formatted according to the
-    xxxTimeFormat strings defined above).  You can omit "#1" if you don't
-    want the elapsed time in the message.
-
-    #1 will be replaced by the elapsed time
-    #2 will be replaced by the size of the file in Kilobytes -->
-
-<!ENTITY completeMsg "Finita, #2 KB elŝutitaj (la tuta tempo estis #1)">
-<!-- LOCALIZATION NOTE (percentMsg):
-
-    This string is used to format the text to the right of the progress
-    meter.
-
-    #1 will be replaced by the percentage of the file that has been saved -->
-
-<!ENTITY percentMsg "#1&#037;">
deleted file mode 100644
--- a/toolkit/chrome/global/nsProgressDialog.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla 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 *****
-
-savingAlertTitle=Konservanta %S
-openingAlertTitle=Malfermanta %S
-securityAlertMsg=Warning! Executable files may contain viruses or other malicious code that could harm your computer. Use caution when opening this file. Are you sure you want to launch %S?
-dontAskAgain=Ne demandi denove
new file mode 100644
--- /dev/null
+++ b/toolkit/chrome/global/printdialog.properties
@@ -0,0 +1,59 @@
+# These strings are used in the native GTK, Mac and Windows print dialogs.
+
+# GTK titles:
+printTitleGTK=Print
+optionsTabLabelGTK=Options
+printFramesTitleGTK=Print Frames
+
+# Mac titles:
+optionsTitleMac=Options:
+appearanceTitleMac=Appearance:
+framesTitleMac=Frames:
+pageHeadersTitleMac=Page Headers:
+pageFootersTitleMac=Page Footers:
+
+# Windows titles:
+optionsTitleWindows=Options
+printFramesTitleWindows=Print Frames
+
+# TRANSLATOR NOTE: For radio button labels and check button labels, an underscore _
+# before a character will turn that character into an accesskey in the GTK dialog.
+# e.g. "_As laid out" will make A the accesskey.
+# In the Windows labels, use an ampersand (&).
+# On Mac, underscores will be stripped.
+
+asLaidOut=_As Laid Out on the Screen
+asLaidOutWindows=As &laid out on the screen
+selectedFrame=The _Selected Frame
+selectedFrameWindows=The selected &frame
+separateFrames=Each Frame on Separate _Pages
+separateFramesWindows=&Each frame separately
+shrinkToFit=Ignore Scaling and S_hrink To Fit Page Width
+selectionOnly=Print Selection _Only
+printBGOptions=Print Backgrounds
+printBGColors=Print Background _Colors
+printBGImages=Print Background I_mages
+headerFooter=Header and Footer
+left=Left
+center=Center
+right=Right
+headerFooterBlank=--blank--
+headerFooterTitle=Title
+headerFooterURL=URL
+headerFooterDate=Date/Time
+headerFooterPage=Page #
+headerFooterPageTotal=Page # of #
+headerFooterCustom=Custom...
+customHeaderFooterPrompt=Please enter your custom header/footer text
+
+# These are for the summary view in the Mac dialog:
+summaryFramesTitle=Print Frames
+summarySelectionOnlyTitle=Print Selection
+summaryShrinkToFitTitle=Shrink To Fit
+summaryPrintBGColorsTitle=Print BG Colors
+summaryPrintBGImagesTitle=Print BG Images
+summaryHeaderTitle=Page Headers
+summaryFooterTitle=Page Footers
+summaryNAValue=N/A
+summaryOnValue=On
+summaryOffValue=Off
deleted file mode 100644
--- a/toolkit/chrome/mozapps/update/incompatible.dtd
+++ /dev/null
@@ -1,12 +0,0 @@
-
-<!ENTITY incompatible.title "Nekongruaj elementoj">
-<!ENTITY incompatible.intro "La jenaj elementoj ne estas kongruaj kun tiu ĉi ĝisdatigo de &brandShortName; 
-kaj ili estos do malaktivigitaj kiam ĝi estos instalita:">
-<!ENTITY incompatible.update "&brandShortName; periode kontrolos ĉu estas ĝisdatigoj por ili okaze ke 
-kongrua versio iĝas disponebla.">
-<!ENTITY incompatible.suffix "La ĝisdatigoj de &brandShortName; enhavas gravajn sekurecajn plibonigojn. 
-Por protekti vin estas treege rekomendata ke vi ĝisdatigu &brandShortName; 
-eĉ se kelkaj el viaj etendoprogramoj kaj etosoj iĝas nekongruaj.">
-                                     
-<!ENTITY closebutton.label "Fermi">
-