Session Menu

Merge lp:~vorlon/indicator-session/en_l10n into lp:indicator-session/12.10

  1. en_l10n
  2. Merge into trunk.12.10
Proposed by Steve Langasek
Status: Merged
Approved by: Ted Gould
Approved revision: 357
Merged at revision: 356
Proposed branch: lp:~vorlon/indicator-session/en_l10n
Merge into: lp:indicator-session/12.10
Diff against target: 213 lines (+22/-22)
4 files modified
po/en_AU.po (+6/-6)
po/en_CA.po (+6/-6)
po/en_GB.po (+7/-7)
src/dialog.c (+3/-3)
To merge this branch: bzr merge lp:~vorlon/indicator-session/en_l10n
Reviewer Review Type Date Requested Status
jenkins (community) continuous-integration Needs Fixing
Ted Gould (community) Approve
Review via email: mp+124028@code.launchpad.net

Commit message

Fix strings to ensure en_US are used in proper locations

To post a comment you must log in.
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

PASSED: Continuous integration, rev:357
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./label=quantal/10/console

review: Approve (continuous-integration)
Revision history for this message
Ted Gould (ted) :
review: Approve
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Autolanding.
No commit message was specified.
http://jenkins.qa.ubuntu.com/job/indicator-session-autolanding/8/

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'po/en_AU.po'
--- po/en_AU.po 2011-09-27 21:31:21 +0000
+++ po/en_AU.po 2012-09-12 18:49:21 +0000
@@ -72,7 +72,7 @@
72#: ../data/indicator-session-shutdown.desktop.in.in.h:172#: ../data/indicator-session-shutdown.desktop.in.in.h:1
73#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:71673#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
74msgid "Shut Down"74msgid "Shut Down"
75msgstr "Shut Down"75msgstr "Switch Off"
7676
77#: ../data/indicator-session-logout.desktop.in.in.h:177#: ../data/indicator-session-logout.desktop.in.in.h:1
78#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:67278#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
@@ -94,7 +94,7 @@
9494
95#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:72195#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
96msgid "Shut Down…"96msgid "Shut Down…"
97msgstr "Shut Down…"97msgstr "Switch Off…"
9898
99#. LOGOUT_DIALOG_LOGOUT,99#. LOGOUT_DIALOG_LOGOUT,
100#: ../src/dialog.c:35100#: ../src/dialog.c:35
@@ -112,7 +112,7 @@
112#: ../src/dialog.c:37112#: ../src/dialog.c:37
113msgctxt "title"113msgctxt "title"
114msgid "Shut Down"114msgid "Shut Down"
115msgstr "Shut Down"115msgstr "Switch Off"
116116
117#. LOGOUT_DIALOG_LOGOUT,117#. LOGOUT_DIALOG_LOGOUT,
118#: ../src/dialog.c:41118#: ../src/dialog.c:41
@@ -132,7 +132,7 @@
132msgid ""132msgid ""
133"Are you sure you want to close all programs and shut down the computer?"133"Are you sure you want to close all programs and shut down the computer?"
134msgstr ""134msgstr ""
135"Are you sure you want to close all programs and shut down the computer?"135"Are you sure you want to close all programs and switch off the computer?"
136136
137#. LOGOUT_DIALOG_LOGOUT,137#. LOGOUT_DIALOG_LOGOUT,
138#: ../src/dialog.c:47138#: ../src/dialog.c:47
@@ -150,7 +150,7 @@
150#: ../src/dialog.c:49150#: ../src/dialog.c:49
151msgctxt "button"151msgctxt "button"
152msgid "Shut Down"152msgid "Shut Down"
153msgstr "Shut Down"153msgstr "Switch Off"
154154
155#. LOGOUT_DIALOG_LOGOUT,155#. LOGOUT_DIALOG_LOGOUT,
156#: ../src/dialog.c:55156#: ../src/dialog.c:55
@@ -168,7 +168,7 @@
168#: ../src/dialog.c:57168#: ../src/dialog.c:57
169msgctxt "button auth"169msgctxt "button auth"
170msgid "Shut Down…"170msgid "Shut Down…"
171msgstr "Shut Down…"171msgstr "Switch Off…"
172172
173#. TRANSLATORS: This button appears on the logout dialog when173#. TRANSLATORS: This button appears on the logout dialog when
174#. there are updates that require restart. It will do a restart174#. there are updates that require restart. It will do a restart
175175
=== modified file 'po/en_CA.po'
--- po/en_CA.po 2011-09-27 21:31:21 +0000
+++ po/en_CA.po 2012-09-12 18:49:21 +0000
@@ -70,7 +70,7 @@
70#: ../data/indicator-session-shutdown.desktop.in.in.h:170#: ../data/indicator-session-shutdown.desktop.in.in.h:1
71#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:71671#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
72msgid "Shut Down"72msgid "Shut Down"
73msgstr "Shut Down"73msgstr "Switch Off"
7474
75#: ../data/indicator-session-logout.desktop.in.in.h:175#: ../data/indicator-session-logout.desktop.in.in.h:1
76#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:67276#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
@@ -92,7 +92,7 @@
9292
93#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:72193#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
94msgid "Shut Down…"94msgid "Shut Down…"
95msgstr "Shut Down…"95msgstr "Switch Off…"
9696
97#. LOGOUT_DIALOG_LOGOUT,97#. LOGOUT_DIALOG_LOGOUT,
98#: ../src/dialog.c:3598#: ../src/dialog.c:35
@@ -110,7 +110,7 @@
110#: ../src/dialog.c:37110#: ../src/dialog.c:37
111msgctxt "title"111msgctxt "title"
112msgid "Shut Down"112msgid "Shut Down"
113msgstr "Shut Down"113msgstr "Switch Off"
114114
115#. LOGOUT_DIALOG_LOGOUT,115#. LOGOUT_DIALOG_LOGOUT,
116#: ../src/dialog.c:41116#: ../src/dialog.c:41
@@ -130,7 +130,7 @@
130msgid ""130msgid ""
131"Are you sure you want to close all programs and shut down the computer?"131"Are you sure you want to close all programs and shut down the computer?"
132msgstr ""132msgstr ""
133"Are you sure you want to close all programs and shut down the computer?"133"Are you sure you want to close all programs and switch off the computer?"
134134
135#. LOGOUT_DIALOG_LOGOUT,135#. LOGOUT_DIALOG_LOGOUT,
136#: ../src/dialog.c:47136#: ../src/dialog.c:47
@@ -148,7 +148,7 @@
148#: ../src/dialog.c:49148#: ../src/dialog.c:49
149msgctxt "button"149msgctxt "button"
150msgid "Shut Down"150msgid "Shut Down"
151msgstr "Shut Down"151msgstr "Switch Off"
152152
153#. LOGOUT_DIALOG_LOGOUT,153#. LOGOUT_DIALOG_LOGOUT,
154#: ../src/dialog.c:55154#: ../src/dialog.c:55
@@ -166,7 +166,7 @@
166#: ../src/dialog.c:57166#: ../src/dialog.c:57
167msgctxt "button auth"167msgctxt "button auth"
168msgid "Shut Down…"168msgid "Shut Down…"
169msgstr ""169msgstr "Switch Off…"
170170
171#. TRANSLATORS: This button appears on the logout dialog when171#. TRANSLATORS: This button appears on the logout dialog when
172#. there are updates that require restart. It will do a restart172#. there are updates that require restart. It will do a restart
173173
=== modified file 'po/en_GB.po'
--- po/en_GB.po 2011-09-27 21:31:21 +0000
+++ po/en_GB.po 2012-09-12 18:49:21 +0000
@@ -42,7 +42,7 @@
4242
43#: ../data/com.canonical.indicator.session.gschema.xml.in.h:643#: ../data/com.canonical.indicator.session.gschema.xml.in.h:6
44msgid "Remove the shutdown item from the session menu"44msgid "Remove the shutdown item from the session menu"
45msgstr "Remove the Shut Down item from the session menu"45msgstr "Remove the Switch Off item from the session menu"
4646
47#: ../data/com.canonical.indicator.session.gschema.xml.in.h:747#: ../data/com.canonical.indicator.session.gschema.xml.in.h:7
48msgid "Suppress the dialog to confirm logout, restart and shutdown action"48msgid "Suppress the dialog to confirm logout, restart and shutdown action"
@@ -72,7 +72,7 @@
72#: ../data/indicator-session-shutdown.desktop.in.in.h:172#: ../data/indicator-session-shutdown.desktop.in.in.h:1
73#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:71673#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
74msgid "Shut Down"74msgid "Shut Down"
75msgstr "Shut Down"75msgstr "Switch Off"
7676
77#: ../data/indicator-session-logout.desktop.in.in.h:177#: ../data/indicator-session-logout.desktop.in.in.h:1
78#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:67278#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
@@ -94,7 +94,7 @@
9494
95#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:72195#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
96msgid "Shut Down…"96msgid "Shut Down…"
97msgstr "Shut Down…"97msgstr "Switch Off…"
9898
99#. LOGOUT_DIALOG_LOGOUT,99#. LOGOUT_DIALOG_LOGOUT,
100#: ../src/dialog.c:35100#: ../src/dialog.c:35
@@ -112,7 +112,7 @@
112#: ../src/dialog.c:37112#: ../src/dialog.c:37
113msgctxt "title"113msgctxt "title"
114msgid "Shut Down"114msgid "Shut Down"
115msgstr "Shut Down"115msgstr "Switch Off"
116116
117#. LOGOUT_DIALOG_LOGOUT,117#. LOGOUT_DIALOG_LOGOUT,
118#: ../src/dialog.c:41118#: ../src/dialog.c:41
@@ -132,7 +132,7 @@
132msgid ""132msgid ""
133"Are you sure you want to close all programs and shut down the computer?"133"Are you sure you want to close all programs and shut down the computer?"
134msgstr ""134msgstr ""
135"Are you sure you want to close all programs and shut down the computer?"135"Are you sure you want to close all programs and switch off the computer?"
136136
137#. LOGOUT_DIALOG_LOGOUT,137#. LOGOUT_DIALOG_LOGOUT,
138#: ../src/dialog.c:47138#: ../src/dialog.c:47
@@ -150,7 +150,7 @@
150#: ../src/dialog.c:49150#: ../src/dialog.c:49
151msgctxt "button"151msgctxt "button"
152msgid "Shut Down"152msgid "Shut Down"
153msgstr "Shut Down"153msgstr "Switch Off"
154154
155#. LOGOUT_DIALOG_LOGOUT,155#. LOGOUT_DIALOG_LOGOUT,
156#: ../src/dialog.c:55156#: ../src/dialog.c:55
@@ -168,7 +168,7 @@
168#: ../src/dialog.c:57168#: ../src/dialog.c:57
169msgctxt "button auth"169msgctxt "button auth"
170msgid "Shut Down…"170msgid "Shut Down…"
171msgstr "Shut Down…"171msgstr "Switch Off…"
172172
173#. TRANSLATORS: This button appears on the logout dialog when173#. TRANSLATORS: This button appears on the logout dialog when
174#. there are updates that require restart. It will do a restart174#. there are updates that require restart. It will do a restart
175175
=== modified file 'src/dialog.c'
--- src/dialog.c 2012-08-22 17:42:11 +0000
+++ src/dialog.c 2012-09-12 18:49:21 +0000
@@ -34,7 +34,7 @@
34static const gchar * title_strings[LOGOUT_DIALOG_TYPE_CNT] = {34static const gchar * title_strings[LOGOUT_DIALOG_TYPE_CNT] = {
35 /* LOGOUT_DIALOG_LOGOUT, */ NC_("title", "Log Out"),35 /* LOGOUT_DIALOG_LOGOUT, */ NC_("title", "Log Out"),
36 /* LOGOUT_DIALOG_RESTART, */ NC_("title", "Restart"),36 /* LOGOUT_DIALOG_RESTART, */ NC_("title", "Restart"),
37 /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("title", "Switch Off")37 /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("title", "Shut Down")
38};38};
3939
40static const gchar * body_strings[LOGOUT_DIALOG_TYPE_CNT] = {40static const gchar * body_strings[LOGOUT_DIALOG_TYPE_CNT] = {
@@ -46,7 +46,7 @@
46static const gchar * button_strings[LOGOUT_DIALOG_TYPE_CNT] = {46static const gchar * button_strings[LOGOUT_DIALOG_TYPE_CNT] = {
47 /* LOGOUT_DIALOG_LOGOUT, */ NC_("button", "Log Out"),47 /* LOGOUT_DIALOG_LOGOUT, */ NC_("button", "Log Out"),
48 /* LOGOUT_DIALOG_RESTART, */ NC_("button", "Restart"),48 /* LOGOUT_DIALOG_RESTART, */ NC_("button", "Restart"),
49 /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button", "Switch Off")49 /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button", "Shut Down")
50};50};
5151
52/* TRANSLATORS: These strings have an ellipsis so that the user knows52/* TRANSLATORS: These strings have an ellipsis so that the user knows
@@ -54,7 +54,7 @@
54static const gchar * button_auth_strings[LOGOUT_DIALOG_TYPE_CNT] = {54static const gchar * button_auth_strings[LOGOUT_DIALOG_TYPE_CNT] = {
55 /* LOGOUT_DIALOG_LOGOUT, */ NC_("button auth", "Log Out"),55 /* LOGOUT_DIALOG_LOGOUT, */ NC_("button auth", "Log Out"),
56 /* LOGOUT_DIALOG_RESTART, */ NC_("button auth", "Restart…"),56 /* LOGOUT_DIALOG_RESTART, */ NC_("button auth", "Restart…"),
57 /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button auth", "Switch Off…")57 /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button auth", "Shut Down…")
58};58};
5959
60/* TRANSLATORS: This button appears on the logout dialog when60/* TRANSLATORS: This button appears on the logout dialog when

Subscribers

People subscribed via source and target branches