Sync with trunk
authorEduardo Trápani <eduardo@esperanto.org.uy>
Tue, 28 Sep 2010 14:25:41 -0300
changeset 86 1834aa43e7697d72082809c675c01299817fe129
parent 85 6ed25c6f65cbe9b77026a532379bb3acd88df1d2
child 87 de3816e459d77589aa4eb563d5df139c7b8509f6
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:46:40 +0000
Sync with trunk
browser/chrome/browser/aboutDialog.dtd
browser/chrome/browser/aboutHome.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/credits.dtd
browser/chrome/browser/syncKey.dtd
browser/chrome/browser/syncQuota.dtd
browser/chrome/browser/syncQuota.properties
browser/chrome/browser/syncSetup.dtd
browser/chrome/browser/tabview.properties
extensions/reporter/chrome/about.dtd
extensions/reporter/chrome/reportResults.dtd
extensions/reporter/chrome/reportWizard.dtd
extensions/reporter/chrome/reportWizard.properties
extensions/reporter/chrome/reporter.dtd
extensions/reporter/chrome/reporterOverlay.dtd
extensions/reporter/chrome/reporterOverlay.properties
services/sync/sync.properties
toolkit/chrome/global/aboutSupport.properties
toolkit/chrome/global/headsUpDisplay.properties
toolkit/chrome/global/webConsole.dtd
--- a/browser/chrome/browser/aboutDialog.dtd
+++ b/browser/chrome/browser/aboutDialog.dtd
@@ -16,8 +16,41 @@
 <!-- LOCALIZATION NOTE (bottomLinks.license): This is a link title that links to about:license. -->
 <!ENTITY bottomLinks.license        "Licensing Information">
 
 <!-- LOCALIZATION NOTE (bottomLinks.rights): This is a link title that links to about:rights. -->
 <!ENTITY bottomLinks.rights         "End User Rights">
 
 <!-- LOCALIZATION NOTE (bottomLinks.privacy): This is a link title that links to http://www.mozilla.com/legal/privacy/. -->
 <!ENTITY bottomLinks.privacy        "Privacy Policy">
+
+<!-- LOCALIZATION NOTE (update.checkingForUpdates): try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.checkingForUpdates  "Checking for updates…">
+<!-- LOCALIZATION NOTE (update.checkingAddonCompat): try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.checkingAddonCompat "Checking Add-on compatibility…">
+<!-- LOCALIZATION NOTE (update.noUpdatesFound): try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.noUpdatesFound      "&brandShortName; is up to date">
+<!-- LOCALIZATION NOTE (update.adminDisabled): try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.adminDisabled       "Updates disabled by your system administrator">
+
+<!-- LOCALIZATION NOTE (update.failed.start,update.failed.linkText,update.failed.end):
+     update.failed.start, update.failed.linkText, and update.failed.end all go into
+     one line with linkText being wrapped in an anchor that links to a site to download
+     the latest version of Firefox (e.g. http://www.firefox.com). As this is all in
+     one line, try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.failed.start        "Update failed. ">
+<!ENTITY update.failed.linkText     "Download the latest version">
+<!ENTITY update.failed.end          "">
+
+<!-- LOCALIZATION NOTE (update.manual.start,update.manual.end): update.manual.start and update.manual.end
+     all go into one line and have an anchor in between with text that is the same as the link to a site
+     to download the latest version of Firefox (e.g. http://www.firefox.com). As this is all in one line,
+     try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.manual.start        "Updates available at ">
+<!ENTITY update.manual.end          "">
+
+<!-- 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   "Downloading update — ">
+<!ENTITY update.downloading.end     "">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/aboutHome.dtd
@@ -0,0 +1,28 @@
+<!ENTITY % brandDTD
+    SYSTEM "chrome://branding/locale/brand.dtd">
+  %brandDTD;
+
+<!-- These strings are used in the about:home page -->
+
+<!ENTITY abouthome.pageTitle "&brandFullName; Start Page">
+
+<!-- LOCALIZATION NOTE (abouthome.brandStart):
+     brandShortName must be in a <span/>
+-->
+<!ENTITY abouthome.brandStart "<span>&brandShortName;</span> Start">
+
+<!ENTITY abouthome.searchEngineButton.label "Search">
+
+<!ENTITY abouthome.searchEngineLinks.advanced "Advanced Search">
+<!ENTITY abouthome.searchEngineLinks.preferences "Preferences">
+
+<!ENTITY abouthome.aboutMozilla "About Mozilla">
+
+<!-- LOCALIZATION NOTE (abouthome.defaultSnippet1.v1):
+     text in <a/> will be linked to the Firefox features page on mozilla.com
+-->
+<!ENTITY abouthome.defaultSnippet1.v1 "Thanks for choosing Firefox! To get the most out of your browser, learn more about the <a>latest features</a>.">
+<!-- LOCALIZATION NOTE (abouthome.defaultSnippet2.v1):
+     text in <a/> will be linked to the featured add-ons on addons.mozilla.org
+-->
+<!ENTITY abouthome.defaultSnippet2.v1 "It's easy to customize your Firefox exactly the way you want it. <a>Choose from thousands of add-ons</a>.">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -294,34 +294,33 @@ can reach it easily. -->
 
 <!-- 
   Comment duplicated from browser-sets.inc:
 
   Search Command Key Logic works like this:
 
   Unix: Ctrl+J (0.8, 0.9 support)
         Ctrl+K (cross platform binding)
-  Mac:  Ctrl+K (cross platform binding)
+  Mac:  Cmd+K (cross platform binding)
+        Cmd+Opt+F (platform convention)
   Win:  Ctrl+K (cross platform binding)
-        Ctrl+E (IE compat) 
 
   We support Ctrl+K on all platforms now and advertise it in the menu since it is
   our standard - it is a "safe" choice since it is near no harmful keys like "W" as
   "E" is. People mourning the loss of Ctrl+K for emacs compat can switch their GTK
   system setting to use emacs emulation, and we should respect it. Focus-Search-Box
   is a fundamental keybinding and we are maintaining a XP binding so that it is easy
   for people to switch to Linux.
 
-  Do *not* tamper with these values without talking to ben@mozilla.org
-
  -->
 <!ENTITY searchFocus.commandkey       "k">
-<!ENTITY searchFocus.commandkey2      "e">
 <!ENTITY searchFocusUnix.commandkey   "j">
 
+<!ENTITY tabView.commandkey           "e">
+
 <!ENTITY openLinkCmdInTab.label       "Malfermi ligilon en nova folio">
 <!ENTITY openLinkCmdInTab.accesskey   "F">
 <!ENTITY openLinkCmd.label            "Malfermi ligilon en nova fenestro">
 <!ENTITY openLinkCmd.accesskey        "F">
 <!ENTITY openLinkCmdInCurrent.label     "Open Link">
 <!ENTITY openLinkCmdInCurrent.accesskey "O">
 <!ENTITY openFrameCmdInTab.label      "Malfermi kadron en nova folio">
 <!ENTITY openFrameCmdInTab.accesskey  "F">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -136,41 +136,33 @@ updatesItem_downloading.accesskey=e
 updatesItem_resume=Repreni elŝutadon de %S…
 updatesItem_resumeFallback=Repreni elŝutadon de ĝisdatigo…
 updatesItem_resume.accesskey=R
 updatesItem_pending=Apliki nun la elŝutitan ĝisdatigon…
 updatesItem_pendingFallback=Apliki nun la elŝutitan ĝisdatigon…
 updatesItem_pending.accesskey=A
 
 # Check for Updates in the About Dialog - button labels and accesskeys
-# LOCALIZATION NOTE - all of the following update buttons and labels will only
-# be displayed one at a time. So, if a button is displayed no other buttons or
-# labels will be displayed and if a label is displayed no other buttons or
-# labels will be displayed. They will be placed directly under the Firefox
-# version in the about dialog.
-update.checkButton.label=Check for Updates…
-update.checkButton.accesskey=C
+# LOCALIZATION NOTE - all of the following update buttons labels will only be
+# displayed one at a time. So, if a button is displayed nothing else will
+# be displayed alongside of the button. The button when displayed is located
+# directly under the Firefox version in the about dialog (see bug 596813 for
+# screenshots).
+update.checkInsideButton.label=Check for Updates
+update.checkInsideButton.accesskey=C
 update.resumeButton.label=Resume Downloading %S…
 update.resumeButton.accesskey=D
 update.openUpdateUI.applyButton.label=Apply Update…
 update.openUpdateUI.applyButton.accesskey=A
 update.restart.applyButton.label=Apply Update
 update.restart.applyButton.accesskey=A
 update.openUpdateUI.upgradeButton.label=Upgrade Now…
 update.openUpdateUI.upgradeButton.accesskey=U
 update.restart.upgradeButton.label=Upgrade Now
 update.restart.upgradeButton.accesskey=U
-# Check for Updates in the About Dialog - status labels
-update.checkingForUpdate.label=Checking for updates…
-update.checkingAddonCompat.label=Checking add-on compatibility…
-update.noUpdateFound.label=This is the latest available version
-# LOCALIZATION NOTE (update.downloading) — is the "em dash" (long dash)
-# %S is the amount download
-# examples: Downloading update — 111 KB of 13 MB
-update.downloading=Downloading update — %S
 
 # RSS Pretty Print
 feedShowFeedNew=Aboni '%S'…
 
 menuOpenAllInTabs.label=Malfermi ĉiujn en folioj
 
 # History menu
 menuRestoreAllTabs.label=Restaŭri ĉiujn foliojn
deleted file mode 100644
--- a/browser/chrome/browser/credits.dtd
+++ /dev/null
@@ -1,15 +0,0 @@
-<!ENTITY brandMotto       "Remalkovri la TTT-n">
-<!ENTITY credit.thanks    "Specialan dankon al">
-
-<!ENTITY credit.thanks2       "Dankegon al niaj">
-<!ENTITY credit.contributors2 "kontribuantoj">
-
-<!-- localization credits look like this: -->
-<!--
-<!ENTITY credit.translation
-  "Eduardo Trápani">
--->
-<!ENTITY credit.translation "">
-
-<!ENTITY credit.memory      "Rememorante">
-<!ENTITY credit.poweredByGeckoReg "Funkciigata de Gecko&reg;">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/syncKey.dtd
@@ -0,0 +1,14 @@
+<!ENTITY syncKey.page.title               "Your &syncBrand.fullName.label; Key">
+<!ENTITY syncKey.page.description         "This key is used to decode the data in your &syncBrand.fullName.label; account. You will need to enter the key each time you configure &syncBrand.fullName.label; on a new computer or device.">
+<!ENTITY syncKey.keepItSecret.heading     "Keep it secret">
+<!ENTITY syncKey.keepItSecret.description "Your &syncBrand.fullName.label; account is encrypted to protect your privacy. Without this key, it would take years for anyone to decode your personal information. You are the only person who holds this key. This means you're the only one who can access your &syncBrand.fullName.label; data.">
+<!ENTITY syncKey.keepItSafe.heading       "Keep it safe">
+<!ENTITY syncKey.keepItSafe1.description  "Do not lose this key.">
+<!ENTITY syncKey.keepItSafe2.description  " We don't keep a copy of your key (that wouldn't be keeping it secret!) so ">
+<!ENTITY syncKey.keepItSafe3.description  "we can't help you recover it">
+<!ENTITY syncKey.keepItSafe4.description  " if it's lost. You'll need to use this key any time you connect a new computer or device to &syncBrand.fullName.label;.">
+<!ENTITY syncKey.findOutMore1.label       "Find out more about &syncBrand.fullName.label; and your privacy at ">
+<!ENTITY syncKey.findOutMore2.label       ".">
+<!ENTITY syncKey.footer1.label            "&syncBrand.fullName.label; Terms of Service are available at ">
+<!ENTITY syncKey.footer2.label            ". The Privacy Policy is available at ">
+<!ENTITY syncKey.footer3.label            ".">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/syncQuota.dtd
@@ -0,0 +1,4 @@
+<!ENTITY quota.dialogTitle.label    "Server Quota">
+<!ENTITY quota.retrievingInfo.label "Retrieving quota information…">
+<!ENTITY quota.typeColumn.label     "Type">
+<!ENTITY quota.sizeColumn.label     "Size">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/syncQuota.properties
@@ -0,0 +1,37 @@
+collection.bookmarks.label = Bookmarks
+collection.history.label   = History
+collection.passwords.label = Passwords
+collection.prefs.label     = Preferences
+collection.tabs.label      = Tabs
+
+# LOCALIZATION NOTE (quota.usageNoQuota.label): %1$S and %2$S are numeric value
+# and unit (as defined in the download manager) of the amount of space occupied
+# on the server
+quota.usageNoQuota.label    = You are currently using %1$S %2$S.
+# LOCALIZATION NOTE (quota.usagePercentage.label):
+# %1$S is the percentage of space used,
+# %2$S and %3$S numeric value and unit (as defined in the download manager)
+# of the amount of space used,
+# %3$S and %4$S numeric value and unit (as defined in the download manager)
+# of the total space available.
+quota.usagePercentage.label = You are using %1$S%% (%2$S %3$S) of your allowed %4$S %5$S.
+quota.usageError.label      = Could not retrieve quota information.
+quota.retrieving.label      = Retrieving…
+# 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.remove.label          = Remove
+quota.treeCaption.label     = Uncheck items to stop syncing them and free up space on the server.
+# 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         = Firefox Sync will remove the following data: %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
+# LOCALIZATION NOTE (quota.freeup.label): %1$S and %2$S are numeric value
+# and unit (as defined in the download manager) of the amount of space freed
+# up by disabling the unchecked engines.  If displayed this string is
+# concatenated directly to quota.removal.label and may need to start off with
+# whitespace.
+quota.freeup.label          = \u0020This will free up %1$S %2$S.
--- a/browser/chrome/browser/syncSetup.dtd
+++ b/browser/chrome/browser/syncSetup.dtd
@@ -38,16 +38,18 @@
 <!ENTITY setup.tosAgree2.accesskey  "">
 
 <!-- New Account Page 2: Sync Key -->
 <!ENTITY setup.newSyncKeyPage.title.label "&brandShortName; Cares About Your Privacy">
 <!ENTITY setup.newSyncKeyPage.description.label "To ensure your total privacy, all of your data is encrypted prior to being uploaded. The Sync Key which is necessary to decrypt your data is not uploaded.">
 <!ENTITY syncKeyEntry.label        "Your Sync Key">
 <!ENTITY syncKeyEntry.accesskey    "K">
 <!ENTITY syncKeyGenerate.label     "Generate">
+<!ENTITY syncKeyStrength.label     "Strength:">
+<!ENTITY syncKeyHelp.label         "What does the strength mean?">
 <!ENTITY syncKeyBackup.description "Your Sync Key is required to access &syncBrand.fullName.label; on other machines. Please create a backup copy. We cannot help you recover your Sync Key.">
 
 <!ENTITY button.syncKeyBackup.print.label     "Print…">
 <!ENTITY button.syncKeyBackup.print.accesskey "P">
 <!ENTITY button.syncKeyBackup.save.label      "Save…">
 <!ENTITY button.syncKeyBackup.save.accesskey  "S">
 
 <!-- New Account Page 3: Captcha -->
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/tabview.properties
@@ -0,0 +1,3 @@
+tabview.groupItem.newTabButton=New tab
+tabview.groupItem.defaultName=Name this tab group…
+tabview.search.otherWindowTabs=Tabs from other windows
deleted file mode 100644
--- a/extensions/reporter/chrome/about.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY projectLead.text                         "Projekta estraro">
-<!ENTITY copyright.text                           "Copyright (C) 2004-2005">
-<!ENTITY thanks.text                              "Dankon">
-
deleted file mode 100644
--- a/extensions/reporter/chrome/reportResults.dtd
+++ /dev/null
@@ -1,15 +0,0 @@
-<!ENTITY reportSite                  "Retejo">
-<!ENTITY reportProblemType           "Tipo de problemo">
-<!ENTITY reportDecsription           "Priskribo">
-<!ENTITY reportPlatform              "Platformo">
-<!ENTITY reportProduct               "Produkto">
-<!ENTITY reportoscpu                 "Mastruma sistemo">
-<!ENTITY reportGecko                 "Gecko">
-<!ENTITY reportBuildConfig           "Build Config">
-<!ENTITY reportUseragent             "Useragent">
-<!ENTITY reportLanguage              "Lingvo">
-<!ENTITY reportCharset               "Charset">
-<!ENTITY reportEmail                 "Retpoŝto">
-<!ENTITY error                       "Detaloj de la eraro">
-<!ENTITY faultCode                   "Kodo">
-<!ENTITY faultMessage                "Mesaĝo">
deleted file mode 100644
--- a/extensions/reporter/chrome/reportWizard.dtd
+++ /dev/null
@@ -1,58 +0,0 @@
-<!-- Entities for the Sample Extension Options Dialog go here -->
-<!ENTITY reportWizard.title                         "Raporti nefunkciantan TTTan retejon">
-
-<!ENTITY privacyNotice.label                        "Politiko pri privateco">
-<!ENTITY reportWizardPrivacy.description            "Tiu ĉi ilo permesas al vi raporti al la Evangelism Team pri TTTaj retejoj kiuj ne funkcias bone en &brandShortName; aŭ blokas vizitojn faritajn de ĝi. Tiel vi povas helpi nin asekuri la plej bonan sperton por &brandShortName; uzantoj. Bonvolu preni momenton por legi tion kio sekvas kaj lerni kiel ni uzas la informon kiun ni kolektas, se vi volas partopreni.">
-<!ENTITY reportWizardMustAgree.description          "Por daŭrigi vi devas akordi kun la supre menciita politiko pri privateco.">
-
-<!ENTITY dontShowPrivacyStatement.label             "Mi legis kaj akceptas la supre menciitan politikon pri privateco.">
-<!ENTITY dontShowPrivacyStatement.accesskey         "M">
-
-<!ENTITY reportForm.label                           "Plenigi raporton">
-
-<!ENTITY reportForm.description                     "Rakontu al ni iom pli pri la problemo kiun vi trovis:">
-<!ENTITY reportForm.url.title                       "Retadreso de la TTTa retejo:">
-<!ENTITY reportForm.url.accesskey                   "R">
-
-<!ENTITY reportForm.behind_login.title              "La TTTa retejo postulas pasvorton"><!-- No ":" at the end -->
-<!ENTITY reportForm.behind_login.accesskey          "P">
-
-<!ENTITY reportForm.problem_type.title              "Tipo de problemo:">
-<!ENTITY reportForm.problem_type.accesskey          "T">
-
-<!ENTITY reportForm.problem_type.chooseOne.title    "Elektu unu…">
-
-<!-- DO *NOT* Add/change/modify (except localization) without consulting with r.m.o server admin first! -->
-<!ENTITY reportForm.problem_type.item1.title        "Retumilo ne subtenata">
-<!ENTITY reportForm.problem_type.item2.title        "Ne eblas akrediti">
-<!ENTITY reportForm.problem_type.item3.title        "Kromprogramo ne montrata">
-<!ENTITY reportForm.problem_type.item4.title        "Mankas alia enhavo">
-<!ENTITY reportForm.problem_type.item5.title        "Malĝusta funkciado">
-<!ENTITY reportForm.problem_type.item6.title        "Malĝusta aspeko">
-<!ENTITY reportForm.problem_type.item7.title        "Alia problemo">
-<!ENTITY reportForm.problem_type.item8.title        "Disability access">
-<!ENTITY reportForm.problem_type.item9.title        "Printed output is wrong">
-
-<!ENTITY reportForm.describe.title                  "Priskribu la problemon:">
-<!ENTITY reportForm.describe.accesskey              "P">
-
-<!ENTITY reportForm.platform.title                  "Platformo:">
-<!ENTITY reportForm.product.title                   "Produkto:">
-<!ENTITY reportForm.gecko.title                     "Gecko:">
-<!ENTITY reportForm.useragent.title                 "Useragent:">
-<!ENTITY reportForm.language.title                  "Lingvo:">
-
-<!--  Make sure this has "(Optional)" at the end.  This is important for the user to know -->
-<!ENTITY reportForm.email.title                     "Retpoŝto:">
-<!ENTITY reportForm.email.accesskey                 "E">
-
-<!ENTITY reportForm.privacyPolicy.title             "Politiko pri privateco">
-<!ENTITY reportForm.privacyPolicy.tooltip           "Vidi politikon pri privateco">
-
-<!ENTITY reportResults.showDetail.title             "Montri detalojn">
-<!ENTITY reportResults.showDetail.accesskey         "M">
-
-<!ENTITY sendReport.label                           "Sendanta raporton">
-<!ENTITY sendReport.description                     "Sendanta raporton al la servilo…">
-
-<!ENTITY finish.label                               "Raporto sendita">
deleted file mode 100644
--- a/extensions/reporter/chrome/reportWizard.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-submitReport=Sendi raporton
-submitReport.accesskey=S
-
-sendingReport=Sendanta raporton…
-reportSent=Raporto sendita
-
-finishError=Okazis eraro dum la sendado de raporto
-
-successfullyCreatedReport=Raporto sukcese sendita
-failedCreatingReport=Okazis eraro dum la rekado de la raporto kaj do neniu informo estis sendita al mozilla.org
-defaultError=Unable to make a successful connection to the server.
-invalidResponse=An invalid response was received from the server.  Please try again later.
deleted file mode 100644
--- a/extensions/reporter/chrome/reporter.dtd
+++ /dev/null
@@ -1,3 +0,0 @@
-<!ENTITY productName.label                           "Raportisto">
-<!ENTITY productVersion.label                        "v0.2">
-
deleted file mode 100644
--- a/extensions/reporter/chrome/reporterOverlay.dtd
+++ /dev/null
@@ -1,3 +0,0 @@
-<!ENTITY reporterMenu2.title                        "Raporti nefunkciantan TTTan retejon…">
-<!ENTITY reporterMenu.accesskey                     "R">
-
deleted file mode 100644
--- a/extensions/reporter/chrome/reporterOverlay.properties
+++ /dev/null
@@ -1,1 +0,0 @@
-# Script accessible strings for the browser integration overlay go here. 
--- a/services/sync/sync.properties
+++ b/services/sync/sync.properties
@@ -23,16 +23,18 @@ 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.serverStatusButton.label = Server Status
+error.sync.serverStatusButton.accesskey = V
 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
 warning.sync.quota.label = Approaching Server Quota
 warning.sync.quota.description = You are approaching the server quota. Please review which data to sync.
 error.sync.quota.label = Server Quota Exceeded
new file mode 100644
--- /dev/null
+++ b/toolkit/chrome/global/aboutSupport.properties
@@ -0,0 +1,18 @@
+# LOCALIZATION NOTE In the following string, "Direct2D" is a proper noun 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"
+acceleratedWindows = GPU Accelerated Windows
+
+direct2DEnabled = Direct2D Enabled
+directWriteEnabled = DirectWrite Enabled
+adapterDescription = Adapter Description
+adapterVendorID = Vendor ID
+adapterDeviceID = Device ID
+adapterDrivers = Adapter Drivers
+adapterRAM = Adapter RAM
+driverVersion = Driver Version
+driverDate = Driver Date
--- a/toolkit/chrome/global/headsUpDisplay.properties
+++ b/toolkit/chrome/global/headsUpDisplay.properties
@@ -28,17 +28,18 @@ btnConsoleInfo=Info
 tipConsoleInfo=Log calls to console.info()
 btnConsoleWarnings=Warnings
 tipConsoleWarnings=Log calls to console.warn()
 btnConsoleLog=Log
 tipConsoleLog=Log calls to console.log()
 btnGlobal=Global Messages
 tipGlobal=Toggle Global Message logging
 localConsole=Local Console
-itemClear=Clear Console
+clearConsoleCmd.label=Clear Console
+clearConsoleCmd.accesskey=e
 stringFilter=Filter
 close.button=Close
 close.accesskey=F
 update.button=Update
 update.accesskey=U
 # LOCALIZATION NOTE FOR `jsPropertyTitle` AND `jsPropertyInspectTitle`:
 #
 # The "PropertyPanel" is used to display a JS object to the user.
new file mode 100644
--- /dev/null
+++ b/toolkit/chrome/global/webConsole.dtd
@@ -0,0 +1,15 @@
+<!ENTITY networkPanel.requestURL                  "Request URL">
+<!ENTITY networkPanel.requestMethod               "Request Method">
+<!ENTITY networkPanel.statusCode                  "Status Code">
+
+<!ENTITY networkPanel.requestHeaders              "Request Headers">
+<!ENTITY networkPanel.requestCookie               "Sent Cookie">
+<!ENTITY networkPanel.requestBody                 "Request Body">
+<!ENTITY networkPanel.requestFormData             "Sent Form Data">
+
+<!ENTITY networkPanel.responseHeaders             "Response Headers">
+<!ENTITY networkPanel.responseBody                "Response Body">
+<!ENTITY networkPanel.responseBodyCached          "Cached Data">
+<!ENTITY networkPanel.responseNoBody              "No Response Body">
+<!ENTITY networkPanel.responseImage               "Received Image">
+<!ENTITY networkPanel.responseImageCached         "Cached Image">