Updates for SM
authorMark Tyndall <moz_en-gb@tyndall.org.uk>
Mon, 13 Jul 2009 18:22:45 +0100
changeset 45 88cccc33ffd8f6c47cf5ae5472d96b939fb9b95a
parent 44 b1ab839e27b5c646ab1dff48a876f6631cffbfd8
child 46 3fdbe5f7c55159dae76d2230de8cf6030c99586a
push id28
push usermoz_en-gb@tyndall.org.uk
push dateSat, 07 Nov 2009 22:20:20 +0000
Updates for SM
suite/chrome/common/pref/pref-download.dtd
suite/chrome/common/pref/prefutilities.properties
suite/chrome/mailnews/filter.properties
suite/chrome/mailnews/search-attributes.properties
suite/chrome/mailnews/search-operators.properties
--- a/suite/chrome/common/pref/pref-download.dtd
+++ b/suite/chrome/common/pref/pref-download.dtd
@@ -1,29 +1,29 @@
 <!ENTITY pref.download.title            "Downloads">
+
 <!ENTITY downloadBehavior.label         "When starting a download">
-<!ENTITY downloadLocation.label         "When saving a file">
-<!ENTITY finishedBehavior.label         "When a download completes">
+<!ENTITY focusWhenStarting.label        "Flash the download manager if it is already open, otherwise:">
+<!ENTITY focusWhenStarting.accesskey    "F">
 <!ENTITY openDM.label                   "Open the download manager">
 <!ENTITY openDM.accesskey               "m">
 <!ENTITY openProgressDialog.label       "Open a progress dialogue">
 <!ENTITY openProgressDialog.accesskey   "O">
 <!ENTITY doNothing.label                "Don't open anything">
 <!ENTITY doNothing.accesskey            "D">
-<!ENTITY promptDownload.label           "Prompt for download location and default to">
-<!ENTITY promptDownload.accesskey       "P">
-<!ENTITY lastLocation.label             "Last download folder">
-<!ENTITY lastLocation.accesskey         "L">
-<!ENTITY specifiedLocation.label        "Specified download folder">
-<!ENTITY specifiedLocation.accesskey    "e">
-<!ENTITY autoDownload.label             "Automatically download files to specified download folder">
-<!ENTITY autoDownload.accesskey         "A">
-<!ENTITY downloadFolder.label           "Current Download Folder:">
+
+<!ENTITY downloadLocation.label         "When saving a file">
+<!ENTITY saveTo.label                   "Save files to">
+<!ENTITY saveTo.accesskey               "v">
 <!ENTITY chooseDownloadFolder.label     "Choose Folder…">
 <!ENTITY chooseDownloadFolder.accesskey "C">
+<!ENTITY alwaysAsk.label                "Always ask me where to save files">
+<!ENTITY alwaysAsk.accesskey            "A">
+
+<!ENTITY finishedBehavior.label         "When a download completes">
 <!ENTITY playSound.label                "Play a sound">
 <!ENTITY playSound.accesskey            "s">
 <!ENTITY showAlert.label                "Show an alert">
-<!ENTITY showAlert.accesskey            "n">
+<!ENTITY showAlert.accesskey            "a">
 <!ENTITY browse.label                   "Browse…">
 <!ENTITY browse.accesskey               "B">
 <!ENTITY preview.label                  "Preview">
-<!ENTITY preview.accesskey              "v">
+<!ENTITY preview.accesskey              "e">
--- a/suite/chrome/common/pref/prefutilities.properties
+++ b/suite/chrome/common/pref/prefutilities.properties
@@ -1,8 +1,10 @@
 cachefolder=Choose Cache Folder
 choosehomepage=Choose Home Page
 downloadfolder=Choose a Download Folder
+desktopFolderName=Desktop
+downloadsFolderName=Downloads
 choosesound=Choose a sound
 
 SoundFiles=Sounds
 
 labelDefaultFont=Default (%font_family%)
--- a/suite/chrome/mailnews/filter.properties
+++ b/suite/chrome/mailnews/filter.properties
@@ -11,16 +11,18 @@ customHeaderOverflow=You've exceeded the
 filterCustomHeaderOverflow=Your filters have exceeded the limit of 50 custom headers. Please edit the msgFilterRules.dat file, which contains your filters, to use fewer custom headers.
 invalidCustomHeader=One of your filters uses a custom header that contains an invalid character, such as ':', a non-printable character, a non-ascii character, or an eight-bit ascii character. Please edit the msgFilterRules.dat file, which contains your filters, to remove invalid characters from your custom headers.
 continueFilterExecution=Applying filter %S failed. Would you like to continue applying filters?
 promptTitle=Running Filters
 promptMsg=You are currently in the process of filtering messages.\nWould you like to continue applying filters?
 stopButtonLabel=Stop
 continueButtonLabel=Continue
 cannotEnableFilter=This filter was probably created by a future version of this software. You cannot enable this filter because we don't know how to apply it.
+searchTermsInvalidTitle=Search Terms Invalid
+searchTermsInvalidMessage=This filter cannot be saved because some search terms are invalid in the current context.
 
 # for junk mail logging / mail filter logging
 # LOCALIZATION NOTE(junkLogDetectStr)
 # %1$S=author, %2$S=subject, %3$S=date
 junkLogDetectStr=Detected junk message from %1$S - %2$S at %3$S
 # LOCALIZATION NOTE(logMoveStr)
 # %1$S=message id, %2$S=folder URI
 logMoveStr=moved message id = %1$S to %2$S
--- a/suite/chrome/mailnews/search-attributes.properties
+++ b/suite/chrome/mailnews/search-attributes.properties
@@ -33,8 +33,9 @@ Department=Department
 # more mailnews
 FromToCcOrBcc=From, To, Cc or Bcc
 JunkScoreOrigin=Junk Score Origin
 JunkPercent=Junk Percent
 AttachmentStatus=Attachment Status
 JunkStatus=Junk Status
 Label=Label
 Customize=Customise…
+MissingCustomTerm=Missing Custom Term
--- a/suite/chrome/mailnews/search-operators.properties
+++ b/suite/chrome/mailnews/search-operators.properties
@@ -18,8 +18,10 @@ 12=LdapDwim
 
 13=is greater than
 14=is less than
 
 15=NameCompletion
 16=is in my address book
 17=isn't in my address book
 18=isn't empty
+19=matches
+20=doesn't match