[tor-commits] [tor-launcher/master] Rename torcontroller.properties to torlauncher.properties.

[brade at torproject.org]

commit 1702921184a9f1857f2c679a5a384ae0d96e4ad9
Author: Kathy Brade <brade at torproject.org>
Date:   Tue Apr 9 13:24:51 2013 -0400

    Rename torcontroller.properties to torlauncher.properties.
---
 src/chrome/locale/en/torcontroller.properties |   26 -------------------------
 src/chrome/locale/en/torlauncher.properties   |   26 +++++++++++++++++++++++++
 src/modules/tl-util.jsm                       |    2 +-
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/chrome/locale/en/torcontroller.properties b/src/chrome/locale/en/torcontroller.properties
deleted file mode 100644
index 9331ecf..0000000
--- a/src/chrome/locale/en/torcontroller.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-### Copyright (c) 2013, The Tor Project, Inc.
-### See LICENSE for licensing information.
-
-torlauncher.error_title=Tor Launcher
-
-torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.tor_failed_to_start=Tor failed to start.
-torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S
-
-torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
-torlauncher.password_hash_missing=Failed to get hashed password.
-
-torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
-torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S
-torlauncher.ensure_tor_is_running=Please ensure that Tor is running.
-
-torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
-torlauncher.error_proxy_type_missing=You must select the proxy type.
-torlauncher.error_bridges_missing=You must specify one or more bridges.
-
-torlauncher.connect=Connect
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties
new file mode 100644
index 0000000..9331ecf
--- /dev/null
+++ b/src/chrome/locale/en/torlauncher.properties
@@ -0,0 +1,26 @@
+### Copyright (c) 2013, The Tor Project, Inc.
+### See LICENSE for licensing information.
+
+torlauncher.error_title=Tor Launcher
+
+torlauncher.tor_exited=Tor unexpectedly exited.
+torlauncher.tor_failed_to_start=Tor failed to start.
+torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S
+
+torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
+torlauncher.tor_missing=The Tor executable is missing.
+torlauncher.torrc_missing=The torrc file is missing.
+torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.password_hash_missing=Failed to get hashed password.
+
+torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
+torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S
+torlauncher.ensure_tor_is_running=Please ensure that Tor is running.
+
+torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
+torlauncher.error_proxy_type_missing=You must select the proxy type.
+torlauncher.error_bridges_missing=You must specify one or more bridges.
+
+torlauncher.connect=Connect
+torlauncher.quit=Quit
+torlauncher.quit_win=Exit
diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm
index 5f85815..e6ed617 100644
--- a/src/modules/tl-util.jsm
+++ b/src/modules/tl-util.jsm
@@ -11,7 +11,7 @@ let EXPORTED_SYMBOLS = [ "TorLauncherUtil" ];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-const kPropBundleURI = "chrome://torlauncher/locale/torcontroller.properties";
+const kPropBundleURI = "chrome://torlauncher/locale/torlauncher.properties";
 const kPropNamePrefix = "torlauncher.";
 
 let TorLauncherUtil =  // Public