From a81de326ec68928e9787f65ce7f0506b0434253e Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 8 Mar 2011 03:41:37 +1100
Subject: [PATCH] Move some more message strings to the properties file.

--HG--
extra : rebase_source : a889c395e2c67d6352d51ee04a77ac870f4da972
---
 common/locale/en-US/messages.properties | 9 +++++----
 common/modules/config.jsm               | 3 +--
 common/modules/util.jsm                 | 1 -
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/common/locale/en-US/messages.properties b/common/locale/en-US/messages.properties
index d0177d5b..1e19e0f4 100644
--- a/common/locale/en-US/messages.properties
+++ b/common/locale/en-US/messages.properties
@@ -121,7 +121,7 @@ io.downloadFinished-2 = Download of %S to %S finished
 
 macro.canceled-1 = Canceled playback of macro '%S'
 macro.recorded-1 = Recorded macro '%S'
-macro.loadFailed-1 = Page did not load completely in %S seconds.
+macro.loadFailed-1 = Page did not load completely in %S seconds
 macro.loadWaiting = Waiting for page to load...
 macro.noSuch-1 = Macro '%S' not set
 macro.noPrevious = No previous macro
@@ -143,7 +143,7 @@ mow.noPreviousOutput = No previous command output
 
 option.noSuch = No such option
 option.noSuch-1 = No such option: %S
-option.replaceExisting-1 = Warning: %S already exists: replacing existing option.
+option.replaceExisting-1 = Warning: %S already exists: replacing existing option
 
 plugin.searchingFor-1 = Searching for %S
 plugin.searchingForIn-2 = Searching for %S in %S
@@ -151,7 +151,7 @@ plugin.notReplacingContext-1 = Not replacing plugin context for %S
 
 print.toFile-1 = Printing to file: %S
 print.sending = Sending to printer...
-print.sent = Print job sent.
+print.sent = Print job sent
 print.printed-1 = Printed: %S
 
 quickmark.none = No QuickMarks set
@@ -190,8 +190,9 @@ error.unavailable-2 = Not available on %S %S
 error.argumentRequired = Argument required
 error.argumentOrBang = Argument or ! required
 error.invalidOperation = Invalid operation
-
 error.monkeyPatchOverlay-1 = Not replacing property with eval-generated overlay by %S
 error.nullComputedStyle-1 = Computed style is null: %S
 
+warn.notDefaultBranch-2 = You are running %S from a testing branch: %S. Please do not report errors which do not also occur in the default branch.
+
 # vim:se ft=jproperties tw=0:
diff --git a/common/modules/config.jsm b/common/modules/config.jsm
index 7e088f98..c6c4b74a 100644
--- a/common/modules/config.jsm
+++ b/common/modules/config.jsm
@@ -778,8 +778,7 @@ config.INIT = update(Object.create(config.INIT), config.INIT, {
         this.timeout(function () {
             if (this.branch && this.branch !== "default" &&
                     modules.yes_i_know_i_should_not_report_errors_in_these_branches_thanks.indexOf(this.branch) === -1)
-                dactyl.warn("You are running " + config.appName + " from a testing branch: " + this.branch + ". " +
-                            "Please do not report errors which do not also occur in the default branch.");
+                dactyl.warn(_("warn.notDefaultBranch", config.appName, this.branch));
         }, 1000);
     }
 });
diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index 30d45baa..d087d6c0 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -440,7 +440,6 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
         });
     },
 
-
     /**
      * Returns an object representing a Node's computed CSS style.
      *