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
1=== modified file 'po/en_AU.po'
2--- po/en_AU.po 2011-09-27 21:31:21 +0000
3+++ po/en_AU.po 2012-09-12 18:49:21 +0000
4@@ -72,7 +72,7 @@
5 #: ../data/indicator-session-shutdown.desktop.in.in.h:1
6 #: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
7 msgid "Shut Down"
8-msgstr "Shut Down"
9+msgstr "Switch Off"
10
11 #: ../data/indicator-session-logout.desktop.in.in.h:1
12 #: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
13@@ -94,7 +94,7 @@
14
15 #: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
16 msgid "Shut Down…"
17-msgstr "Shut Down…"
18+msgstr "Switch Off…"
19
20 #. LOGOUT_DIALOG_LOGOUT,
21 #: ../src/dialog.c:35
22@@ -112,7 +112,7 @@
23 #: ../src/dialog.c:37
24 msgctxt "title"
25 msgid "Shut Down"
26-msgstr "Shut Down"
27+msgstr "Switch Off"
28
29 #. LOGOUT_DIALOG_LOGOUT,
30 #: ../src/dialog.c:41
31@@ -132,7 +132,7 @@
32 msgid ""
33 "Are you sure you want to close all programs and shut down the computer?"
34 msgstr ""
35-"Are you sure you want to close all programs and shut down the computer?"
36+"Are you sure you want to close all programs and switch off the computer?"
37
38 #. LOGOUT_DIALOG_LOGOUT,
39 #: ../src/dialog.c:47
40@@ -150,7 +150,7 @@
41 #: ../src/dialog.c:49
42 msgctxt "button"
43 msgid "Shut Down"
44-msgstr "Shut Down"
45+msgstr "Switch Off"
46
47 #. LOGOUT_DIALOG_LOGOUT,
48 #: ../src/dialog.c:55
49@@ -168,7 +168,7 @@
50 #: ../src/dialog.c:57
51 msgctxt "button auth"
52 msgid "Shut Down…"
53-msgstr "Shut Down…"
54+msgstr "Switch Off…"
55
56 #. TRANSLATORS: This button appears on the logout dialog when
57 #. there are updates that require restart. It will do a restart
58
59=== modified file 'po/en_CA.po'
60--- po/en_CA.po 2011-09-27 21:31:21 +0000
61+++ po/en_CA.po 2012-09-12 18:49:21 +0000
62@@ -70,7 +70,7 @@
63 #: ../data/indicator-session-shutdown.desktop.in.in.h:1
64 #: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
65 msgid "Shut Down"
66-msgstr "Shut Down"
67+msgstr "Switch Off"
68
69 #: ../data/indicator-session-logout.desktop.in.in.h:1
70 #: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
71@@ -92,7 +92,7 @@
72
73 #: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
74 msgid "Shut Down…"
75-msgstr "Shut Down…"
76+msgstr "Switch Off…"
77
78 #. LOGOUT_DIALOG_LOGOUT,
79 #: ../src/dialog.c:35
80@@ -110,7 +110,7 @@
81 #: ../src/dialog.c:37
82 msgctxt "title"
83 msgid "Shut Down"
84-msgstr "Shut Down"
85+msgstr "Switch Off"
86
87 #. LOGOUT_DIALOG_LOGOUT,
88 #: ../src/dialog.c:41
89@@ -130,7 +130,7 @@
90 msgid ""
91 "Are you sure you want to close all programs and shut down the computer?"
92 msgstr ""
93-"Are you sure you want to close all programs and shut down the computer?"
94+"Are you sure you want to close all programs and switch off the computer?"
95
96 #. LOGOUT_DIALOG_LOGOUT,
97 #: ../src/dialog.c:47
98@@ -148,7 +148,7 @@
99 #: ../src/dialog.c:49
100 msgctxt "button"
101 msgid "Shut Down"
102-msgstr "Shut Down"
103+msgstr "Switch Off"
104
105 #. LOGOUT_DIALOG_LOGOUT,
106 #: ../src/dialog.c:55
107@@ -166,7 +166,7 @@
108 #: ../src/dialog.c:57
109 msgctxt "button auth"
110 msgid "Shut Down…"
111-msgstr ""
112+msgstr "Switch Off…"
113
114 #. TRANSLATORS: This button appears on the logout dialog when
115 #. there are updates that require restart. It will do a restart
116
117=== modified file 'po/en_GB.po'
118--- po/en_GB.po 2011-09-27 21:31:21 +0000
119+++ po/en_GB.po 2012-09-12 18:49:21 +0000
120@@ -42,7 +42,7 @@
121
122 #: ../data/com.canonical.indicator.session.gschema.xml.in.h:6
123 msgid "Remove the shutdown item from the session menu"
124-msgstr "Remove the Shut Down item from the session menu"
125+msgstr "Remove the Switch Off item from the session menu"
126
127 #: ../data/com.canonical.indicator.session.gschema.xml.in.h:7
128 msgid "Suppress the dialog to confirm logout, restart and shutdown action"
129@@ -72,7 +72,7 @@
130 #: ../data/indicator-session-shutdown.desktop.in.in.h:1
131 #: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
132 msgid "Shut Down"
133-msgstr "Shut Down"
134+msgstr "Switch Off"
135
136 #: ../data/indicator-session-logout.desktop.in.in.h:1
137 #: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
138@@ -94,7 +94,7 @@
139
140 #: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
141 msgid "Shut Down…"
142-msgstr "Shut Down…"
143+msgstr "Switch Off…"
144
145 #. LOGOUT_DIALOG_LOGOUT,
146 #: ../src/dialog.c:35
147@@ -112,7 +112,7 @@
148 #: ../src/dialog.c:37
149 msgctxt "title"
150 msgid "Shut Down"
151-msgstr "Shut Down"
152+msgstr "Switch Off"
153
154 #. LOGOUT_DIALOG_LOGOUT,
155 #: ../src/dialog.c:41
156@@ -132,7 +132,7 @@
157 msgid ""
158 "Are you sure you want to close all programs and shut down the computer?"
159 msgstr ""
160-"Are you sure you want to close all programs and shut down the computer?"
161+"Are you sure you want to close all programs and switch off the computer?"
162
163 #. LOGOUT_DIALOG_LOGOUT,
164 #: ../src/dialog.c:47
165@@ -150,7 +150,7 @@
166 #: ../src/dialog.c:49
167 msgctxt "button"
168 msgid "Shut Down"
169-msgstr "Shut Down"
170+msgstr "Switch Off"
171
172 #. LOGOUT_DIALOG_LOGOUT,
173 #: ../src/dialog.c:55
174@@ -168,7 +168,7 @@
175 #: ../src/dialog.c:57
176 msgctxt "button auth"
177 msgid "Shut Down…"
178-msgstr "Shut Down…"
179+msgstr "Switch Off…"
180
181 #. TRANSLATORS: This button appears on the logout dialog when
182 #. there are updates that require restart. It will do a restart
183
184=== modified file 'src/dialog.c'
185--- src/dialog.c 2012-08-22 17:42:11 +0000
186+++ src/dialog.c 2012-09-12 18:49:21 +0000
187@@ -34,7 +34,7 @@
188 static const gchar * title_strings[LOGOUT_DIALOG_TYPE_CNT] = {
189 /* LOGOUT_DIALOG_LOGOUT, */ NC_("title", "Log Out"),
190 /* LOGOUT_DIALOG_RESTART, */ NC_("title", "Restart"),
191- /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("title", "Switch Off")
192+ /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("title", "Shut Down")
193 };
194
195 static const gchar * body_strings[LOGOUT_DIALOG_TYPE_CNT] = {
196@@ -46,7 +46,7 @@
197 static const gchar * button_strings[LOGOUT_DIALOG_TYPE_CNT] = {
198 /* LOGOUT_DIALOG_LOGOUT, */ NC_("button", "Log Out"),
199 /* LOGOUT_DIALOG_RESTART, */ NC_("button", "Restart"),
200- /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button", "Switch Off")
201+ /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button", "Shut Down")
202 };
203
204 /* TRANSLATORS: These strings have an ellipsis so that the user knows
205@@ -54,7 +54,7 @@
206 static const gchar * button_auth_strings[LOGOUT_DIALOG_TYPE_CNT] = {
207 /* LOGOUT_DIALOG_LOGOUT, */ NC_("button auth", "Log Out"),
208 /* LOGOUT_DIALOG_RESTART, */ NC_("button auth", "Restart…"),
209- /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button auth", "Switch Off…")
210+ /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button auth", "Shut Down…")
211 };
212
213 /* TRANSLATORS: This button appears on the logout dialog when

Subscribers

People subscribed via source and target branches