Change the menu to say 'Shut Down' instead of 'Switch Off' by default,

since the latter is completely non-idiomatic in American English; and
update the translations for commonwealth English in the package to
preserve the preferred wording for en_GB.  LP: #1029036.

5 files changed, 31 insertions, 22 deletions

diff --git a/debian/changelog b/debian/changelog
index 8e97c5b..8ff9b9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+indicator-session (12.10.2-0ubuntu2) UNRELEASED; urgency=low
+
+  * Change the menu to say 'Shut Down' instead of 'Switch Off' by default,
+    since the latter is completely non-idiomatic in American English; and
+    update the translations for commonwealth English in the package to
+    preserve the preferred wording for en_GB.  LP: #1029036.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 12 Sep 2012 11:48:39 -0700
+
 indicator-session (12.10.2-0ubuntu1) quantal; urgency=low
 
   * New upstream release:
diff --git a/po/en_AU.po b/po/en_AU.po
index c9ed739..22e749b 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -72,7 +72,7 @@ msgstr "Lock Screen"
 #: ../data/indicator-session-shutdown.desktop.in.in.h:1
 #: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
 msgid "Shut Down"
-msgstr "Shut Down"
+msgstr "Switch Off"
 
 #: ../data/indicator-session-logout.desktop.in.in.h:1
 #: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
@@ -94,7 +94,7 @@ msgstr "Restart…"
 
 #: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
 msgid "Shut Down…"
-msgstr "Shut Down…"
+msgstr "Switch Off…"
 
 #. LOGOUT_DIALOG_LOGOUT,
 #: ../src/dialog.c:35
@@ -112,7 +112,7 @@ msgstr "Restart"
 #: ../src/dialog.c:37
 msgctxt "title"
 msgid "Shut Down"
-msgstr "Shut Down"
+msgstr "Switch Off"
 
 #. LOGOUT_DIALOG_LOGOUT,
 #: ../src/dialog.c:41
@@ -132,7 +132,7 @@ msgstr ""
 msgid ""
 "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
-"Are you sure you want to close all programs and shut down the computer?"
+"Are you sure you want to close all programs and switch off the computer?"
 
 #. LOGOUT_DIALOG_LOGOUT,
 #: ../src/dialog.c:47
@@ -150,7 +150,7 @@ msgstr "Restart"
 #: ../src/dialog.c:49
 msgctxt "button"
 msgid "Shut Down"
-msgstr "Shut Down"
+msgstr "Switch Off"
 
 #. LOGOUT_DIALOG_LOGOUT,
 #: ../src/dialog.c:55
@@ -168,7 +168,7 @@ msgstr "Restart…"
 #: ../src/dialog.c:57
 msgctxt "button auth"
 msgid "Shut Down…"
-msgstr "Shut Down…"
+msgstr "Switch Off…"
 
 #. TRANSLATORS: This button appears on the logout dialog when
 #. there are updates that require restart.  It will do a restart
diff --git a/po/en_CA.po b/po/en_CA.po
index 07bfa3c..2ec61de 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -70,7 +70,7 @@ msgstr "Lock Screen"
 #: ../data/indicator-session-shutdown.desktop.in.in.h:1
 #: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
 msgid "Shut Down"
-msgstr "Shut Down"
+msgstr "Switch Off"
 
 #: ../data/indicator-session-logout.desktop.in.in.h:1
 #: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
@@ -92,7 +92,7 @@ msgstr "Restart…"
 
 #: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
 msgid "Shut Down…"
-msgstr "Shut Down…"
+msgstr "Switch Off…"
 
 #. LOGOUT_DIALOG_LOGOUT,
 #: ../src/dialog.c:35
@@ -110,7 +110,7 @@ msgstr "Restart"
 #: ../src/dialog.c:37
 msgctxt "title"
 msgid "Shut Down"
-msgstr "Shut Down"
+msgstr "Switch Off"
 
 #. LOGOUT_DIALOG_LOGOUT,
 #: ../src/dialog.c:41
@@ -130,7 +130,7 @@ msgstr ""
 msgid ""
 "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
-"Are you sure you want to close all programs and shut down the computer?"
+"Are you sure you want to close all programs and switch off the computer?"
 
 #. LOGOUT_DIALOG_LOGOUT,
 #: ../src/dialog.c:47
@@ -148,7 +148,7 @@ msgstr "Restart"
 #: ../src/dialog.c:49
 msgctxt "button"
 msgid "Shut Down"
-msgstr "Shut Down"
+msgstr "Switch Off"
 
 #. LOGOUT_DIALOG_LOGOUT,
 #: ../src/dialog.c:55
@@ -166,7 +166,7 @@ msgstr ""
 #: ../src/dialog.c:57
 msgctxt "button auth"
 msgid "Shut Down…"
-msgstr ""
+msgstr "Switch Off…"
 
 #. TRANSLATORS: This button appears on the logout dialog when
 #. there are updates that require restart.  It will do a restart
diff --git a/po/en_GB.po b/po/en_GB.po
index 312c348..09a87cd 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -42,7 +42,7 @@ msgstr "Remove the Restart item from the session menu"
 
 #: ../data/com.canonical.indicator.session.gschema.xml.in.h:6
 msgid "Remove the shutdown item from the session menu"
-msgstr "Remove the Shut Down item from the session menu"
+msgstr "Remove the Switch Off item from the session menu"
 
 #: ../data/com.canonical.indicator.session.gschema.xml.in.h:7
 msgid "Suppress the dialog to confirm logout, restart and shutdown action"
@@ -72,7 +72,7 @@ msgstr "Lock Screen"
 #: ../data/indicator-session-shutdown.desktop.in.in.h:1
 #: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
 msgid "Shut Down"
-msgstr "Shut Down"
+msgstr "Switch Off"
 
 #: ../data/indicator-session-logout.desktop.in.in.h:1
 #: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
@@ -94,7 +94,7 @@ msgstr "Restart…"
 
 #: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
 msgid "Shut Down…"
-msgstr "Shut Down…"
+msgstr "Switch Off…"
 
 #. LOGOUT_DIALOG_LOGOUT,
 #: ../src/dialog.c:35
@@ -112,7 +112,7 @@ msgstr "Restart"
 #: ../src/dialog.c:37
 msgctxt "title"
 msgid "Shut Down"
-msgstr "Shut Down"
+msgstr "Switch Off"
 
 #. LOGOUT_DIALOG_LOGOUT,
 #: ../src/dialog.c:41
@@ -132,7 +132,7 @@ msgstr ""
 msgid ""
 "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
-"Are you sure you want to close all programs and shut down the computer?"
+"Are you sure you want to close all programs and switch off the computer?"
 
 #. LOGOUT_DIALOG_LOGOUT,
 #: ../src/dialog.c:47
@@ -150,7 +150,7 @@ msgstr "Restart"
 #: ../src/dialog.c:49
 msgctxt "button"
 msgid "Shut Down"
-msgstr "Shut Down"
+msgstr "Switch Off"
 
 #. LOGOUT_DIALOG_LOGOUT,
 #: ../src/dialog.c:55
@@ -168,7 +168,7 @@ msgstr "Restart…"
 #: ../src/dialog.c:57
 msgctxt "button auth"
 msgid "Shut Down…"
-msgstr "Shut Down…"
+msgstr "Switch Off…"
 
 #. TRANSLATORS: This button appears on the logout dialog when
 #. there are updates that require restart.  It will do a restart
diff --git a/src/dialog.c b/src/dialog.c
index 7c562d5..eb91f57 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -34,7 +34,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 static const gchar * title_strings[LOGOUT_DIALOG_TYPE_CNT] = {
 	/* LOGOUT_DIALOG_LOGOUT, */ 	NC_("title", "Log Out"),
 	/* LOGOUT_DIALOG_RESTART, */	NC_("title", "Restart"),
-	/* LOGOUT_DIALOG_SHUTDOWN, */	NC_("title", "Switch Off")
+	/* LOGOUT_DIALOG_SHUTDOWN, */	NC_("title", "Shut Down")
 };
 
 static const gchar * body_strings[LOGOUT_DIALOG_TYPE_CNT] = {
@@ -46,7 +46,7 @@ static const gchar * body_strings[LOGOUT_DIALOG_TYPE_CNT] = {
 static const gchar * button_strings[LOGOUT_DIALOG_TYPE_CNT] = {
 	/* LOGOUT_DIALOG_LOGOUT, */ 	NC_("button", "Log Out"),
 	/* LOGOUT_DIALOG_RESTART, */	NC_("button", "Restart"),
-	/* LOGOUT_DIALOG_SHUTDOWN, */	NC_("button", "Switch Off")
+	/* LOGOUT_DIALOG_SHUTDOWN, */	NC_("button", "Shut Down")
 };
 
 /* TRANSLATORS: These strings have an ellipsis so that the user knows
@@ -54,7 +54,7 @@ static const gchar * button_strings[LOGOUT_DIALOG_TYPE_CNT] = {
 static const gchar * button_auth_strings[LOGOUT_DIALOG_TYPE_CNT] = {
 	/* LOGOUT_DIALOG_LOGOUT, */ 	NC_("button auth", "Log Out"),
 	/* LOGOUT_DIALOG_RESTART, */	NC_("button auth", "Restart…"),
-	/* LOGOUT_DIALOG_SHUTDOWN, */	NC_("button auth", "Switch Off…")
+	/* LOGOUT_DIALOG_SHUTDOWN, */	NC_("button auth", "Shut Down…")
 };
 
 /* TRANSLATORS: This button appears on the logout dialog when