Merge lp:~jbicha/ubuntu-docs/lp969235-ctrl-super-keyboard-shortcuts into lp:ubuntu-docs/precise

Proposed by Jeremy Bicha on 2012-04-03
Status: Merged
Merged at revision: 124
Proposed branch: lp:~jbicha/ubuntu-docs/lp969235-ctrl-super-keyboard-shortcuts
Merge into: lp:ubuntu-docs/precise
Diff against target: 260 lines (+40/-31) 4 files modified
To merge this branch: bzr merge lp:~jbicha/ubuntu-docs/lp969235-ctrl-super-keyboard-shortcuts
Reviewer Review Type Date Requested Status
Ubuntu Documentation Committers 2012-04-03 Pending
Review via email: mp+100546@code.launchpad.net
To post a comment you must log in.
David Planella (dpm) wrote :

Sounds sensible to me. However, that will break quite a lot of existing translations. In order to avoid it, if you apply this change, could you please:

1. Apply the s/Meta/Super/g substitution to the .pot file and all the .po files in the precise-translations docs branch [1] (both in the msgid and msgstr fields)
2. Merge the precise-translations branch with trunk (*), so that Launchpad can import the new translations

Let me know if we can help with any of this.

Cheers,
David.

(*) I've noticed Launchpad changes the directory layout on the precise-translations branch to be a flat listing of PO files, which means the merge probably won't work. Then I'd simply suggest fetching the files from the branch, putting them in the right place in the trunk branch and committing.

[1] https://code.launchpad.net/~ubuntu-core-doc/ubuntu-docs/precise-translations

Matthew East (mdke) wrote :

Hi,

On 3 April 2012 07:17, David Planella <email address hidden> wrote:
> Sounds sensible to me. However, that will break quite a lot of existing translations. In order to avoid it, if you apply this change, could you please:
>
> 1. Apply the s/Meta/Super/g substitution to the .pot file and all the .po files in the precise-translations docs branch [1] (both in the msgid and msgstr fields)

Wouldn't this cause problems for languages where "Super" gets
translated? I would have thought it would because the new strings
might not be reviewed by translators.

--
Matthew East
http://www.mdke.org
gnupg pub 1024D/0E6B06FF

Matthew East (mdke) wrote :

On 3 April 2012 03:10, Jeremy Bicha <email address hidden> wrote:
> Jeremy Bicha has proposed merging lp:~jbicha/ubuntu-docs/lp969235-ctrl-super-keyboard-shortcuts into lp:ubuntu-docs.

Small comment on the merge proposal itself - I think it leaves one
reference to "Meta" in unity-dash-intro.page.

--
Matthew East
http://www.mdke.org
gnupg pub 1024D/0E6B06FF

Jeremy Bicha (jbicha) wrote :

Thanks Matthew for catching the remaining meta in unity-dash-intro.

Merging the translations was a pain as I didn't trust sed in this case.

Preview Diff

1=== modified file 'ubuntu-help/C/keyboard-nav.page'
2--- ubuntu-help/C/keyboard-nav.page 2012-03-26 04:04:57 +0000
3+++ ubuntu-help/C/keyboard-nav.page 2012-04-03 03:09:19 +0000
4@@ -149,7 +149,7 @@
5 <td><p>Close the current window.</p></td>
6 </tr>
7 <tr>
8- <td><p><keyseq><key xref="windows-key">Meta</key><key>&#8595;</key></keyseq></p></td>
9+ <td><p><keyseq><key>Ctrl</key><key xref="windows-key">Super</key><key>&#8595;</key></keyseq></p></td>
10 <td><p>Restore a maximized window to its original size.</p></td>
11 </tr>
12 <tr>
13@@ -168,16 +168,16 @@
14 href="shell-keyboard-shortcuts.page"
15 xpointer="ctrl-alt-shift-updown"/>
16 <tr>
17- <td><p><keyseq><key xref="windows-key">Meta</key><key>&#8593;</key></keyseq></p></td>
18+ <td><p><keyseq><key>Ctrl</key><key xref="windows-key">Super</key><key>&#8593;</key></keyseq></p></td>
19 <td><p><link xref="shell-windows-maximize">Maximize</link> a window.</p></td>
20 </tr>
21 <tr>
22- <td><p><keyseq><key xref="windows-key">Meta</key><key>&#8592;</key></keyseq></p></td>
23+ <td><p><keyseq><key>Ctrl</key><key xref="windows-key">Super</key><key>&#8592;</key></keyseq></p></td>
24 <td><p>Maximize a window vertically along the left side of the screen.
25 </p></td>
26 </tr>
27 <tr>
28- <td><p><keyseq><key xref="windows-key">Meta</key><key>&#8594;</key></keyseq></p></td>
29+ <td><p><keyseq><key>Ctrl</key><key xref="windows-key">Super</key><key>&#8594;</key></keyseq></p></td>
30 <td><p>Maximize a window vertically along the right side of the screen.
31 </p></td>
32 </tr>
33
34=== modified file 'ubuntu-help/C/shell-keyboard-shortcuts.page'
35--- ubuntu-help/C/shell-keyboard-shortcuts.page 2012-03-26 04:04:57 +0000
36+++ ubuntu-help/C/shell-keyboard-shortcuts.page 2012-04-03 03:09:19 +0000
37@@ -49,11 +49,11 @@
38 <key>Alt</key> plus whatever key is above <key>Tab</key>.</p></td>
39 </tr>
40 <tr>
41- <td><p><keyseq><key xref="windows-key">Meta</key><key>S</key></keyseq></p></td>
42+ <td><p><keyseq><key xref="windows-key">Super</key><key>S</key></keyseq></p></td>
43 <td><p>Activate the workspace switcher. Zoom out on all <link xref="shell-workspaces">workspaces</link>.</p></td>
44 </tr>
45 <tr>
46- <td><p><keyseq><key xref="windows-key">Meta</key><key>W</key></keyseq></p></td>
47+ <td><p><keyseq><key xref="windows-key">Super</key><key>W</key></keyseq></p></td>
48 <td><p>Activate "Expo" mode. Show all windows from current workspace.</p></td>
49 </tr>
50 <tr>
51@@ -75,7 +75,7 @@
52 <td><p><link xref="shell-exit">Log out.</link></p></td>
53 </tr>
54 <tr>
55- <td><p><keyseq><key>Ctrl</key><key>Alt</key><key>D</key></keyseq></p></td>
56+ <td><p><keyseq><key>Ctrl</key><key xref="windows-key">Super</key><key>D</key></keyseq></p></td>
57 <td><p>Hide all windows and show the desktop. Press the keys again to restore your windows.</p></td>
58 </tr>
59 <tr xml:id="ctrl-alt-l">
60
61=== modified file 'ubuntu-help/C/windows-key.page'
62--- ubuntu-help/C/windows-key.page 2012-03-25 22:51:13 +0000
63+++ ubuntu-help/C/windows-key.page 2012-04-03 03:09:19 +0000
64@@ -3,7 +3,7 @@
65 id="windows-key">
66
67 <info>
68- <desc>The meta key provides access to the Dash and the Launcher. You can usually find it
69+ <desc>The Super key provides access to the Dash and the Launcher. You can usually find it
70 next to the <key>Alt</key> key on your keyboard.</desc>
71 <revision version="12.04" date="2012-03-22" status="outdated"/>
72 <credit type="author">
73@@ -14,22 +14,22 @@
74 <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
75 </info>
76
77-<title>What is the "meta" key?</title>
78+<title>What is the "Super" key?</title>
79
80 <p>This key can usually be found on the bottom-left of your keyboard,
81 next to the <key>Alt</key> key, and usually has a window/squares icon on it. It
82- is sometimes called the super key, logo key, or system key.</p>
83+ is sometimes called the Windows key, logo key, or system key.</p>
84
85 <note>
86 <p>If you have an Apple keyboard, there will not be a Windows key on your
87 keyboard. The <key>Cmd</key> (Command) key can be used instead.</p>
88 </note>
89
90- <p>The meta key serves a special function in <em>Unity</em>. If you press the meta key,
91- the Dash is displayed. If you press <em>and hold</em> the meta key, an overlay showing
92- many of Unity's keyboard shortcuts appears until you release the meta key.</p>
93+ <p>The Super key serves a special function in <em>Unity</em>. If you press the Super key,
94+ the Dash is displayed. If you press <em>and hold</em> the Super key, an overlay showing
95+ many of Unity's keyboard shortcuts appears until you release the Super key.</p>
96
97-<p>The meta key can help you do even more than that, though. To learn about more uses for the <em>meta</em> key, see the <link xref="shell-keyboard-shortcuts">keyboard shortcuts</link> page.</p>
98+<p>The Super key can help you do even more than that, though. To learn about more uses for the <em>Super</em> key, see the <link xref="shell-keyboard-shortcuts">keyboard shortcuts</link> page.</p>
99
100 <comment>
101 <p>Need to add info on changing the keybinding using the new preferences
102
103=== modified file 'ubuntu-help/ubuntu-help.pot'
104--- ubuntu-help/ubuntu-help.pot 2012-03-29 18:32:34 +0000
105+++ ubuntu-help/ubuntu-help.pot 2012-04-03 03:09:19 +0000
106@@ -1,7 +1,7 @@
107 msgid ""
108 msgstr ""
109 "Project-Id-Version: PACKAGE VERSION\n"
110-"POT-Creation-Date: 2012-03-29 14:32-0400\n"
111+"POT-Creation-Date: 2012-04-02 23:05-0400\n"
112 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
113 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
114 "Language-Team: LANGUAGE <LL@li.org>\n"
115@@ -4305,7 +4305,7 @@
116 msgstr ""
117
118 #: C/keyboard-nav.page:152(td/p)
119-msgid "<keyseq><key xref=\"windows-key\">Meta</key><key>↓</key></keyseq>"
120+msgid "<keyseq><key>Ctrl</key><key xref=\"windows-key\">Super</key><key>↓</key></keyseq>"
121 msgstr ""
122
123 #: C/keyboard-nav.page:153(td/p)
124@@ -4329,7 +4329,7 @@
125 msgstr ""
126
127 #: C/keyboard-nav.page:171(td/p)
128-msgid "<keyseq><key xref=\"windows-key\">Meta</key><key>↑</key></keyseq>"
129+msgid "<keyseq><key>Ctrl</key><key xref=\"windows-key\">Super</key><key>↑</key></keyseq>"
130 msgstr ""
131
132 #: C/keyboard-nav.page:172(td/p)
133@@ -4337,7 +4337,7 @@
134 msgstr ""
135
136 #: C/keyboard-nav.page:175(td/p)
137-msgid "<keyseq><key xref=\"windows-key\">Meta</key><key>←</key></keyseq>"
138+msgid "<keyseq><key>Ctrl</key><key xref=\"windows-key\">Super</key><key>←</key></keyseq>"
139 msgstr ""
140
141 #: C/keyboard-nav.page:176(td/p)
142@@ -4345,7 +4345,7 @@
143 msgstr ""
144
145 #: C/keyboard-nav.page:180(td/p)
146-msgid "<keyseq><key xref=\"windows-key\">Meta</key><key>→</key></keyseq>"
147+msgid "<keyseq><key>Ctrl</key><key xref=\"windows-key\">Super</key><key>→</key></keyseq>"
148 msgstr ""
149
150 #: C/keyboard-nav.page:181(td/p)
151@@ -9468,7 +9468,7 @@
152 msgstr ""
153
154 #: C/shell-keyboard-shortcuts.page:52(td/p)
155-msgid "<keyseq><key xref=\"windows-key\">Meta</key><key>S</key></keyseq>"
156+msgid "<keyseq><key xref=\"windows-key\">Super</key><key>S</key></keyseq>"
157 msgstr ""
158
159 #: C/shell-keyboard-shortcuts.page:53(td/p)
160@@ -9476,7 +9476,7 @@
161 msgstr ""
162
163 #: C/shell-keyboard-shortcuts.page:56(td/p)
164-msgid "<keyseq><key xref=\"windows-key\">Meta</key><key>W</key></keyseq>"
165+msgid "<keyseq><key xref=\"windows-key\">Super</key><key>W</key></keyseq>"
166 msgstr ""
167
168 #: C/shell-keyboard-shortcuts.page:57(td/p)
169@@ -9513,7 +9513,7 @@
170 msgstr ""
171
172 #: C/shell-keyboard-shortcuts.page:78(td/p)
173-msgid "<keyseq><key>Ctrl</key><key>Alt</key><key>D</key></keyseq>"
174+msgid "<keyseq><key>Ctrl</key><key xref=\"windows-key\">Super</key><key>D</key></keyseq>"
175 msgstr ""
176
177 #: C/shell-keyboard-shortcuts.page:79(td/p)
178@@ -9912,7 +9912,7 @@
179 #. whatever you like once you have updated your copy of the file.
180 #: C/shell-workspaces.page:26(media)
181 msgctxt "_"
182-msgid "external ref='figures/unity-workspace-intro.png' md5='2e45c34b1367c077c28b50a6818cb8d0'"
183+msgid "external ref='figures/unity-workspace-intro.png' md5='b371b822f44d16c540123e27c0892a4b'"
184 msgstr ""
185
186 #: C/shell-workspaces.page:9(info/desc)
187@@ -9963,6 +9963,15 @@
188 msgid "<code>gconftool-2 --type=int --set /apps/compiz-1/general/screen0/options/hsize 2</code>"
189 msgstr ""
190
191+#. This is a reference to an external file such as an image or video. When
192+#. the file changes, the md5 hash will change to let you know you need to
193+#. update your localized copy. The msgstr is not used at all. Set it to
194+#. whatever you like once you have updated your copy of the file.
195+#: C/shell-workspaces-switch.page:57(media)
196+msgctxt "_"
197+msgid "external ref='figures/unity-windows.png' md5='1f4310e19424bbac96962bb802cb349d'"
198+msgstr ""
199+
200 #: C/shell-workspaces-switch.page:11(info/desc)
201 msgid "Open the workspace switcher and double-click one of the workspaces."
202 msgstr ""
203@@ -10534,7 +10543,7 @@
204 #. whatever you like once you have updated your copy of the file.
205 #: C/unity-dash-intro.page:17(media)
206 msgctxt "_"
207-msgid "external ref='figures/unity-dash-sample.png' md5='a3f10896a2361c701619491d9aa35f24'"
208+msgid "external ref='figures/unity-dash-sample.png' md5='e779fe310080ec1dc99a326f7ad91ceb'"
209 msgstr ""
210
211 #: C/unity-dash-intro.page:14(page/title)
212@@ -10655,7 +10664,7 @@
213 #. whatever you like once you have updated your copy of the file.
214 #: C/unity-introduction.page:37(media)
215 msgctxt "_"
216-msgid "external ref='figures/unity-overview.png' md5='3a766ca229b4db7d710d27c2341a9f89'"
217+msgid "external ref='figures/unity-overview.png' md5='12ec9c818be891db69394b6d52cb09af'"
218 msgstr ""
219
220 #. This is a reference to an external file such as an image or video. When
221@@ -10673,7 +10682,7 @@
222 #. whatever you like once you have updated your copy of the file.
223 #: C/unity-introduction.page:69(media)
224 msgctxt "_"
225-msgid "external ref='figures/unity-dash.png' md5='f65b19b259c742a7440ea43ba2a03113'"
226+msgid "external ref='figures/unity-dash.png' md5='c1ec5f3efb8eef2ae6f9cb8a1154bda2'"
227 msgstr ""
228
229 #: C/unity-introduction.page:9(info/desc)
230@@ -11564,15 +11573,15 @@
231 msgstr ""
232
233 #: C/windows-key.page:6(info/desc)
234-msgid "The meta key provides access to the Dash and the Launcher. You can usually find it next to the <key>Alt</key> key on your keyboard."
235+msgid "The Super key provides access to the Dash and the Launcher. You can usually find it next to the <key>Alt</key> key on your keyboard."
236 msgstr ""
237
238 #: C/windows-key.page:17(page/title)
239-msgid "What is the \"meta\" key?"
240+msgid "What is the \"Super\" key?"
241 msgstr ""
242
243 #: C/windows-key.page:19(page/p)
244-msgid "This key can usually be found on the bottom-left of your keyboard, next to the <key>Alt</key> key, and usually has a window/squares icon on it. It is sometimes called the super key, logo key, or system key."
245+msgid "This key can usually be found on the bottom-left of your keyboard, next to the <key>Alt</key> key, and usually has a window/squares icon on it. It is sometimes called the Windows key, logo key, or system key."
246 msgstr ""
247
248 #: C/windows-key.page:24(note/p)
249@@ -11580,10 +11589,10 @@
250 msgstr ""
251
252 #: C/windows-key.page:28(page/p)
253-msgid "The meta key serves a special function in <em>Unity</em>. If you press the meta key, the Dash is displayed. If you press <em>and hold</em> the meta key, an overlay showing many of Unity's keyboard shortcuts appears until you release the meta key."
254+msgid "The Super key serves a special function in <em>Unity</em>. If you press the Super key, the Dash is displayed. If you press <em>and hold</em> the Super key, an overlay showing many of Unity's keyboard shortcuts appears until you release the Super key."
255 msgstr ""
256
257 #: C/windows-key.page:32(page/p)
258-msgid "The meta key can help you do even more than that, though. To learn about more uses for the <em>meta</em> key, see the <link xref=\"shell-keyboard-shortcuts\">keyboard shortcuts</link> page."
259+msgid "The Super key can help you do even more than that, though. To learn about more uses for the <em>Super</em> key, see the <link xref=\"shell-keyboard-shortcuts\">keyboard shortcuts</link> page."
260 msgstr ""
261

Subscribers

People subscribed via source and target branches