Fx updates (browser & toolkit) for en-GB Fx3.1b2
authorMark Tyndall <moz_en-gb@tyndall.org.uk>
Wed, 05 Nov 2008 17:08:58 +0000
changeset 19 46ea04e217ced95a1a218de3150d33109dec621a
parent 18 269bcbc9ac5c03dd23fbd52476330b7f5dabd4f1
child 20 0cbf0cd875345037e8316b6719344d7e65e8831c
push id1
push userroot
push dateWed, 13 Apr 2011 19:42:42 +0000
Fx updates (browser & toolkit) for en-GB Fx3.1b2
browser/chrome/browser/places/places.dtd
toolkit/chrome/global/viewSource.dtd
toolkit/chrome/mozapps/update/updates.dtd
toolkit/chrome/mozapps/update/updates.properties
--- a/browser/chrome/browser/places/places.dtd
+++ b/browser/chrome/browser/places/places.dtd
@@ -66,16 +66,21 @@
 <!ENTITY cmd.edit_delete.accesskey  "D">
 <!ENTITY cmd.edit_undo.label        "Undo">
 <!ENTITY cmd.edit_undo.accesskey    "U">
 <!ENTITY cmd.edit_undo.key          "z">
 <!ENTITY cmd.edit_redo.label        "Redo">
 <!ENTITY cmd.edit_redo.accesskey    "R">
 <!ENTITY cmd.edit_redo.key          "y">
 
+<!ENTITY cmd.delete.label               "Delete This Page">
+<!ENTITY cmd.delete.accesskey           "D">
+<!ENTITY cmd.deleteDomainData.label     "Forget About This Site">
+<!ENTITY cmd.deleteDomainData.accesskey "F">
+
 <!ENTITY cmd.open.label                  "Open">
 <!ENTITY cmd.open.accesskey              "O">
 <!ENTITY cmd.open_window.label           "Open in a New Window">
 <!ENTITY cmd.open_window.accesskey       "N">
 <!ENTITY cmd.open_tab.label              "Open in a New Tab">
 <!ENTITY cmd.open_tab.accesskey          "w">
 <!ENTITY cmd.open_all_in_tabs.label      "Open All in Tabs">
 <!ENTITY cmd.open_all_in_tabs.accesskey  "O">
--- a/toolkit/chrome/global/viewSource.dtd
+++ b/toolkit/chrome/global/viewSource.dtd
@@ -62,8 +62,15 @@ you can use these alternative items. Oth
 
 <!ENTITY findOnCmd.label     "Find in This Page…">
 <!ENTITY findOnCmd.accesskey "F">
 <!ENTITY findOnCmd.commandkey "f">
 <!ENTITY findAgainCmd.label  "Find Again">
 <!ENTITY findAgainCmd.accesskey "g">
 <!ENTITY findAgainCmd.commandkey "g">
 <!ENTITY findAgainCmd.commandkey2 "VK_F3">
+
+<!ENTITY backCmd.label "Back">
+<!ENTITY backCmd.accesskey "B">
+<!ENTITY forwardCmd.label "Forwards">
+<!ENTITY forwardCmd.accesskey "F">
+<!ENTITY goBackCmd.commandKey "[">
+<!ENTITY goForwardCmd.commandKey "]">
--- a/toolkit/chrome/mozapps/update/updates.dtd
+++ b/toolkit/chrome/mozapps/update/updates.dtd
@@ -1,83 +1,74 @@
 <!ENTITY  updateWizard.title              "Software Update">
 
 <!ENTITY  window.width                    "36em">
 <!ENTITY  window.macWidth                 "39em">
 
 <!ENTITY  checking.title                  "Checking for Updates">
-<!ENTITY  checking.label                  "&brandShortName; is now checking for updates…">
-
-<!ENTITY  cancel.label                    "Cancel">
-<!ENTITY  cancel.accesskey                "C">
+<!ENTITY  updateCheck.label               "Looking for newer versions of &brandShortName;…">
 
 <!ENTITY  noupdatesfound.title            "No Updates Found">
 <!ENTITY  noupdatesautoenabled.intro      "There are no updates available. &brandShortName; will check
                                            periodically for updates.">
 <!ENTITY  noupdatesautodisabled.intro     "There are no updates available. Please check again later or enable
                                            &brandShortName;'s automatic update checking.">
 
-<!ENTITY  incompatibleChecking.label      "Checking if this update will cause problems with your extensions and/or themes…">
+<!ENTITY  incompatibleCheck.title         "Checking Add-on Compatibility">
+<!ENTITY  incompatibleCheck.label         "Looking for newer versions of your add-ons…">
+
 <!ENTITY  clickHere.label                 "View more information about this update">
 
-<!ENTITY  incompatible.warning            "This update will cause some of your extensions and/or themes 
-                                           to stop working until they are updated.">
-<!ENTITY  listIncompatible.label          "Show List">
-<!ENTITY  listIncompatible.accesskey      "L">
-
-<!ENTITY  upgrade.evangelism              "It is strongly recommended that you upgrade &brandShortName;
-                                           as soon as possible.">
+<!ENTITY  evangelism.desc                 "It is strongly recommended that you apply this 
+                                           update for &brandShortName; as soon as possible.">
 
 <!ENTITY  license.instructions            "If you agree to the terms of this agreement, click I Agree 
                                            below to continue installing this update.">
 
 <!ENTITY  license.titleText               "Software Licence Agreement">
 <!ENTITY  license.introText               "Terms and conditions for using this software.">
 <!ENTITY  license.instructionText         "Please read the following licence agreement. Use the scroll bar to view the rest of this agreement.">
 <!ENTITY  license.accept                  "I accept the terms of the Licence Agreement">
 <!ENTITY  license.accept.accesskey        "c">
 <!ENTITY  license.decline                 "I do NOT accept the terms of the Licence Agreement">
 <!ENTITY  license.decline.accesskey       "T">
 
+<!ENTITY  incompatibleList.title          "Incompatible Add-ons Found">
+
 <!ENTITY  downloading.title               "Downloading Update">
 <!ENTITY  downloading.intro               "Downloading the update…">
 <!ENTITY  connecting.label                "Connecting to the update server…">
 <!ENTITY  verificationFailedText.label    "&brandShortName; was unable to verify the integrity of the 
                                            incremental update it downloaded, so it is now downloading
                                            the complete update package.">
 
+<!ENTITY  viewDetails.tooltip             "View details for this update">
+
 <!ENTITY  details.link                    "Details">
-<!ENTITY  pause.label                     "Pause">
-<!ENTITY  pause.accesskey                 "e">
-<!ENTITY  close.label                     "Close">
-<!ENTITY  close.accesskey                 "C">
 
 <!ENTITY  error.label                     "There were problems checking for, downloading or installing this 
                                            update. &brandShortName; could not be updated because:">
                                            
 <!ENTITY  errorManual.label               "You can update &brandShortName; manually by visiting this link
                                            and downloading the latest version:">
                                            
 <!ENTITY  errorpatching.title             "Update Failed">
 <!ENTITY  errorpatching.intro             "The partial Update could not be applied. 
                                            &brandShortName; will try again by downloading a complete Update.">
 
-<!ENTITY  finished.title                  "Update Downloaded">
-<!ENTITY  finished.text                   "The update was successfully downloaded and verified, and it will
-                                           be installed the next time &brandShortName; starts.">
+<!ENTITY  finishedPage.title              "Update Ready to Install">
+<!ENTITY  finishedPage.text               "The update will be installed the next time &brandShortName; starts. You 
+                                           can restart &brandShortName; now, or continue working and restart later.">
 
-<!ENTITY  finishedBackground.title        "Update Ready to Install">
-<!ENTITY  finishedBackground.text         "&brandShortName; has downloaded and verified an important update.
-                                           Click the link below for more details.">
+<!ENTITY  finishedBackgroundPage.text     "A security and stability update for &brandShortName; has been
+                                           downloaded and is ready to be installed.">
 <!ENTITY  finishedBackground.name         "Update:">
-<!-- LOCALIZATION NOTE (finishedBackground.more1): This string describes the button label defined by restartButton in updates.properties. -->
-<!ENTITY  finishedBackground.more1        "Click Restart &brandShortName; Now to install the update now.">
-<!-- LOCALIZATION NOTE (finishedBackground.textNotNow): This string describes the button label defined by notNowButton in updates.properties. -->
-<!ENTITY  finishedBackground.textNotNow   "Click Not Now to close this dialogue and continue working. &brandShortName;
-                                           will install the update the next time it starts.">
+<!-- LOCALIZATION NOTE (finishedBackground.more): This string describes the button labels defined by restartNowButton and restartLaterButton in updates.properties. -->
+<!ENTITY  finishedBackground.more         "The update will be installed the next time &brandShortName; starts. You
+                                           can restart &brandShortName; now, or continue working and restart later.">
 
 <!ENTITY  installed.title                 "Update Installed">
 <!ENTITY  installed.intro                 "The update was successfully installed.">
 <!ENTITY  whatsnew.label                  "Read more about what's new…">
 
 <!ENTITY  update.details.label            "Details">
 <!ENTITY  update.installedOn.label        "Installed on:">
 <!ENTITY  update.status.label             "Status:">
--- a/toolkit/chrome/mozapps/update/updates.properties
+++ b/toolkit/chrome/mozapps/update/updates.properties
@@ -1,76 +1,103 @@
+# LOCALIZATION NOTE: The 1st %S is the update name and the 2nd %S is the build
+# identifier from the local updates.xml for displaying update history
+# example: MyApplication (20081022033543)
+updateFullName=%S (%S)
+
+# LOCALIZATION NOTE: The 1st %S is brandShortName and 2nd %S is update version
+# where update version from the update xml
+# example: MyApplication 10.0.5
 updateName=%S %S
-updateFullName=%S (%S)
+licenseContentDownloading=Getting licence for %S %S…
+updateMoreInfoContentDownloading=Getting more details about %S %S…
+intro_major_app_and_version=Do you want to upgrade to %S %S now?
+
+# LOCALIZATION NOTE: The 1st %S is brandShortName and 2nd %S is update version
+# and the 3rd %S is brandShortName. where update version from the update xml
+incompatibleAddons_major=Some of your add-ons won't work with %S %S, and will be disabled. As soon as they are made compatible, %S will update and re-enable these add-ons:
+
 updateType_major=New Version
 updateType_minor=Security Update
-introType_minor_app=An update for %S is available:
-introType_major_app_and_version=You can download and install %S %S now!
+
+# LOCALIZATION NOTE: When present %S is brandShortName
+incompatibleAddons_minor=Some of your add-ons won't work with this update, and must be disabled. As soon as they are made compatible, %S will update and re-enable these add-ons:
+intro_minor_app=A security and stability update for %S is available:
 verificationError=%S could not confirm the integrity of the update package.
 errorsPageHeader=Update Failed
 licenseContentNotFound=The licence file for this version could not be found. Please visit the %S homepage for more information.
 updateMoreInfoContentNotFound=Additional details about this version could not be found. Please visit the %S homepage for more information.
-licenseContentDownloading=Getting licence for %S %S…
-updateMoreInfoContentDownloading=Getting more details about %S %S…
+resumePausedAfterCloseTitle=Software Update
+resumePausedAfterCloseMsg=You have paused downloading this update. Do you want to download the update in the background while you continue to use %S?
+updaterIOErrorTitle=Software Update Failed
+updaterIOErrorMsg=The update could not be installed. Please make sure there are no other copies of %S running on your computer, and then restart %S to try again.
+okButton=OK
+okButton.accesskey=O
+askLaterButton=Ask Later
+askLaterButton.accesskey=A
+noThanksButton=No Thanks
+noThanksButton.accesskey=N
+updateButton_minor=Update %S
+updateButton_minor.accesskey=U
+updateButton_major=Get the New Version
+updateButton_major.accesskey=G
+backButton=Back
+backButton.accesskey=B
+acceptTermsButton=Accept Terms
+acceptTermsButton.accesskey=A
+restartLaterButton=Restart Later
+restartLaterButton.accesskey=L
+restartNowButton=Restart %S
+restartNowButton.accesskey=R
+
+# LOCALIZATION NOTE: %S is the date the update was installed from the local
+# updates.xml for displaying update history
 statusSucceededFormat=Installed on: %S
+
 statusFailed=Install Failed
 pauseButtonPause=Pause
 pauseButtonResume=Resume
 hideButton=Hide
 hideButton.accesskey=H
 
 updatesfound_minor.title=Update Available
 updatesfound_major.title=New Version Available
 
+installSuccess=The Update was successfully installed
+installPending=Install Pending
+patchApplyFailure=The Update could not be installed (patch apply failed)
+
+# LOCALIZATION NOTE: When present %S is the update name provided by the remote
+# update xml for the following
 downloadingPrefix=Downloading %S…
 pausedName=Paused downloading %S
-
-restartButton=Restart %S Now
-restartButton.accesskey=R
-downloadButton_minor=Download & Install Now »
-downloadButton_minor.accesskey=D
-downloadButton_major=Get the new version »
-downloadButton_major.accesskey=G
-notNowButton=Not Now
-notNowButton.accesskey=o
-neverButton=Never
-neverButton.accesskey=N
-
-resumePausedAfterCloseTitle=Software Update
-resumePausedAfterCloseMsg=You have paused downloading this update. Do you want to download the update in the background while you continue to use %S?
-
-updateReadyToInstallHeader=%S Ready to Install
-
-checker_error-200=AUS: Update XML file malformed (200)
-checker_error-403=AUS: Access denied (403)
-checker_error-404=AUS: Update XML file not found (404)
-checker_error-500=AUS: Internal server error (500)
-checker_error-2152398849=Failed (unknown reason)
-checker_error-2152398861=AUS: Connection refused
-checker_error-2152398862=AUS: Connection timed out
-# NS_ERROR_OFFLINE
-checker_error-2152398864=Network is offline (Go online)
-checker_error-2152398867=AUS: Port not allowed (Contact your Administrator)
-checker_error-2152398868=AUS: No data was received (Please try again)
-checker_error-2152398878=AUS: Update server not found (Check your internet connection or contact your Administrator)
-checker_error-2152398890=Proxy server not found (Check your internet connection or contact your Administrator)
-# NS_ERROR_DOCUMENT_NOT_CACHED
-checker_error-2152398918=Network is offline (Go online)
-checker_error-2152398919=AUS: Data transfer was interrupted (Please try again)
-checker_error-2152398920=Proxy server connection refused (Contact your Administrator)
-checker_error-2153390069=Server certificate has expired (Please adjust your system clock to the correct date and time if it is incorrect or contact your Administrator)
-checker_error-verification_failed=The integrity of the update could not be verified (Contact your Administrator)
-
-installSuccess=The Update was successfully installed
-patchApplyFailure=The Update could not be installed (Patch Apply Failed)
-installPending=Install Pending
-
-updaterIOErrorTitle=Software Update Failed
-updaterIOErrorMsg=The update could not be installed. Please make sure there are no other copies of %S running on your computer, and then restart %S to try again.
-
 updateAvailable_minor.title=%S available
 updateAvailable_minor.text=Download & Install…
 updateAvailable_major.title=%S available
 updateAvailable_major.text=Get the new version…
 updateDownloaded_minor.title=%S available
 updateDownloaded_minor.text=Apply Downloaded Update…
 updateDownloaded_major.title=%S available
 updateDownloaded_major.text=Install the new version…
+
+# LOCALIZATION NOTE: %S is the amount downloaded so far
+# example: Downloaded 879 KB of 2.1 MB
+pausedStatus=Downloaded %S
+
+check_error-200=Update XML file malformed (200)
+check_error-403=Access denied (403)
+check_error-404=Update XML file not found (404)
+check_error-500=Internal server error (500)
+check_error-2152398849=Failed (unknown reason)
+check_error-2152398861=Connection refused
+check_error-2152398862=Connection timed out
+# NS_ERROR_OFFLINE
+check_error-2152398864=Network is offline (go online)
+check_error-2152398867=Port not allowed
+check_error-2152398868=No data was received (please try again)
+check_error-2152398878=Update server not found (check your internet connection)
+check_error-2152398890=Proxy server not found (check your internet connection)
+# NS_ERROR_DOCUMENT_NOT_CACHED
+check_error-2152398918=Network is offline (go online)
+check_error-2152398919=Data transfer was interrupted (please try again)
+check_error-2152398920=Proxy server connection refused
+check_error-2153390069=Server certificate has expired (please adjust your system clock to the correct date and time if it is incorrect)
+check_error-verification_failed=The integrity of the update could not be verified