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

[Jeremy Bícha]

[David Planella (dpm)]

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)]

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)]

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 Bícha (jbicha)]

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.

=== modified file 'ubuntu-help/C/keyboard-nav.page'
--- ubuntu-help/C/keyboard-nav.page	2012-03-26 04:04:57 +0000
+++ ubuntu-help/C/keyboard-nav.page	2012-04-03 03:09:19 +0000
@@ -149,7 +149,7 @@
     <td><p>Close the current window.</p></td>
   </tr>
   <tr>
-    <td><p><keyseq><key xref="windows-key">Meta</key><key>&#8595;</key></keyseq></p></td>
+    <td><p><keyseq><key>Ctrl</key><key xref="windows-key">Super</key><key>&#8595;</key></keyseq></p></td>
     <td><p>Restore a maximized window to its original size.</p></td>
   </tr>
   <tr>
@@ -168,16 +168,16 @@
            href="shell-keyboard-shortcuts.page"
            xpointer="ctrl-alt-shift-updown"/>
   <tr>
-    <td><p><keyseq><key xref="windows-key">Meta</key><key>&#8593;</key></keyseq></p></td>
+    <td><p><keyseq><key>Ctrl</key><key xref="windows-key">Super</key><key>&#8593;</key></keyseq></p></td>
     <td><p><link xref="shell-windows-maximize">Maximize</link> a window.</p></td>
   </tr>
   <tr>
-    <td><p><keyseq><key xref="windows-key">Meta</key><key>&#8592;</key></keyseq></p></td>
+    <td><p><keyseq><key>Ctrl</key><key xref="windows-key">Super</key><key>&#8592;</key></keyseq></p></td>
     <td><p>Maximize a window vertically along the left side of the screen.
     </p></td>
   </tr>
   <tr>
-    <td><p><keyseq><key xref="windows-key">Meta</key><key>&#8594;</key></keyseq></p></td>
+    <td><p><keyseq><key>Ctrl</key><key xref="windows-key">Super</key><key>&#8594;</key></keyseq></p></td>
     <td><p>Maximize a window vertically along the right side of the screen.
     </p></td>
   </tr>

=== modified file 'ubuntu-help/C/shell-keyboard-shortcuts.page'
--- ubuntu-help/C/shell-keyboard-shortcuts.page	2012-03-26 04:04:57 +0000
+++ ubuntu-help/C/shell-keyboard-shortcuts.page	2012-04-03 03:09:19 +0000
@@ -49,11 +49,11 @@
     <key>Alt</key> plus whatever key is above <key>Tab</key>.</p></td>
   </tr>
   <tr>
-    <td><p><keyseq><key xref="windows-key">Meta</key><key>S</key></keyseq></p></td>
+    <td><p><keyseq><key xref="windows-key">Super</key><key>S</key></keyseq></p></td>
     <td><p>Activate the workspace switcher. Zoom out on all <link xref="shell-workspaces">workspaces</link>.</p></td>
   </tr>
   <tr>
-    <td><p><keyseq><key xref="windows-key">Meta</key><key>W</key></keyseq></p></td>
+    <td><p><keyseq><key xref="windows-key">Super</key><key>W</key></keyseq></p></td>
     <td><p>Activate "Expo" mode. Show all windows from current workspace.</p></td>
   </tr>
   <tr>
@@ -75,7 +75,7 @@
     <td><p><link xref="shell-exit">Log out.</link></p></td>
   </tr>
   <tr>
-    <td><p><keyseq><key>Ctrl</key><key>Alt</key><key>D</key></keyseq></p></td>
+    <td><p><keyseq><key>Ctrl</key><key xref="windows-key">Super</key><key>D</key></keyseq></p></td>
     <td><p>Hide all windows and show the desktop. Press the keys again to restore your windows.</p></td>
   </tr>
   <tr xml:id="ctrl-alt-l">

=== modified file 'ubuntu-help/C/windows-key.page'
--- ubuntu-help/C/windows-key.page	2012-03-25 22:51:13 +0000
+++ ubuntu-help/C/windows-key.page	2012-04-03 03:09:19 +0000
@@ -3,7 +3,7 @@
       id="windows-key">
 
   <info>
-    <desc>The meta key provides access to the Dash and the Launcher.  You can usually find it
+    <desc>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.</desc>
     <revision version="12.04" date="2012-03-22" status="outdated"/>
     <credit type="author">
@@ -14,22 +14,22 @@
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
-<title>What is the "meta" key?</title>
+<title>What is the "Super" key?</title>
 
   <p>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.</p>
+ is sometimes called the Windows key, logo key, or system key.</p>
 
 <note>
   <p>If you have an Apple keyboard, there will not be a Windows key on your
  keyboard. The <key>Cmd</key> (Command) key can be used instead.</p>
 </note>
 
-  <p>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.</p>
+  <p>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.</p>
 
-<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>
+<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>
 
 <comment>
   <p>Need to add info on changing the keybinding using the new preferences

=== modified file 'ubuntu-help/ubuntu-help.pot'
--- ubuntu-help/ubuntu-help.pot	2012-03-29 18:32:34 +0000
+++ ubuntu-help/ubuntu-help.pot	2012-04-03 03:09:19 +0000
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-03-29 14:32-0400\n"
+"POT-Creation-Date: 2012-04-02 23:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -4305,7 +4305,7 @@
 msgstr ""
 
 #: C/keyboard-nav.page:152(td/p)
-msgid "<keyseq><key xref=\"windows-key\">Meta</key><key>↓</key></keyseq>"
+msgid "<keyseq><key>Ctrl</key><key xref=\"windows-key\">Super</key><key>↓</key></keyseq>"
 msgstr ""
 
 #: C/keyboard-nav.page:153(td/p)
@@ -4329,7 +4329,7 @@
 msgstr ""
 
 #: C/keyboard-nav.page:171(td/p)
-msgid "<keyseq><key xref=\"windows-key\">Meta</key><key>↑</key></keyseq>"
+msgid "<keyseq><key>Ctrl</key><key xref=\"windows-key\">Super</key><key>↑</key></keyseq>"
 msgstr ""
 
 #: C/keyboard-nav.page:172(td/p)
@@ -4337,7 +4337,7 @@
 msgstr ""
 
 #: C/keyboard-nav.page:175(td/p)
-msgid "<keyseq><key xref=\"windows-key\">Meta</key><key>←</key></keyseq>"
+msgid "<keyseq><key>Ctrl</key><key xref=\"windows-key\">Super</key><key>←</key></keyseq>"
 msgstr ""
 
 #: C/keyboard-nav.page:176(td/p)
@@ -4345,7 +4345,7 @@
 msgstr ""
 
 #: C/keyboard-nav.page:180(td/p)
-msgid "<keyseq><key xref=\"windows-key\">Meta</key><key>→</key></keyseq>"
+msgid "<keyseq><key>Ctrl</key><key xref=\"windows-key\">Super</key><key>→</key></keyseq>"
 msgstr ""
 
 #: C/keyboard-nav.page:181(td/p)
@@ -9468,7 +9468,7 @@
 msgstr ""
 
 #: C/shell-keyboard-shortcuts.page:52(td/p)
-msgid "<keyseq><key xref=\"windows-key\">Meta</key><key>S</key></keyseq>"
+msgid "<keyseq><key xref=\"windows-key\">Super</key><key>S</key></keyseq>"
 msgstr ""
 
 #: C/shell-keyboard-shortcuts.page:53(td/p)
@@ -9476,7 +9476,7 @@
 msgstr ""
 
 #: C/shell-keyboard-shortcuts.page:56(td/p)
-msgid "<keyseq><key xref=\"windows-key\">Meta</key><key>W</key></keyseq>"
+msgid "<keyseq><key xref=\"windows-key\">Super</key><key>W</key></keyseq>"
 msgstr ""
 
 #: C/shell-keyboard-shortcuts.page:57(td/p)
@@ -9513,7 +9513,7 @@
 msgstr ""
 
 #: C/shell-keyboard-shortcuts.page:78(td/p)
-msgid "<keyseq><key>Ctrl</key><key>Alt</key><key>D</key></keyseq>"
+msgid "<keyseq><key>Ctrl</key><key xref=\"windows-key\">Super</key><key>D</key></keyseq>"
 msgstr ""
 
 #: C/shell-keyboard-shortcuts.page:79(td/p)
@@ -9912,7 +9912,7 @@
 #. whatever you like once you have updated your copy of the file.
 #: C/shell-workspaces.page:26(media)
 msgctxt "_"
-msgid "external ref='figures/unity-workspace-intro.png' md5='2e45c34b1367c077c28b50a6818cb8d0'"
+msgid "external ref='figures/unity-workspace-intro.png' md5='b371b822f44d16c540123e27c0892a4b'"
 msgstr ""
 
 #: C/shell-workspaces.page:9(info/desc)
@@ -9963,6 +9963,15 @@
 msgid "<code>gconftool-2 --type=int --set /apps/compiz-1/general/screen0/options/hsize 2</code>"
 msgstr ""
 
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/shell-workspaces-switch.page:57(media)
+msgctxt "_"
+msgid "external ref='figures/unity-windows.png' md5='1f4310e19424bbac96962bb802cb349d'"
+msgstr ""
+
 #: C/shell-workspaces-switch.page:11(info/desc)
 msgid "Open the workspace switcher and double-click one of the workspaces."
 msgstr ""
@@ -10534,7 +10543,7 @@
 #. whatever you like once you have updated your copy of the file.
 #: C/unity-dash-intro.page:17(media)
 msgctxt "_"
-msgid "external ref='figures/unity-dash-sample.png' md5='a3f10896a2361c701619491d9aa35f24'"
+msgid "external ref='figures/unity-dash-sample.png' md5='e779fe310080ec1dc99a326f7ad91ceb'"
 msgstr ""
 
 #: C/unity-dash-intro.page:14(page/title)
@@ -10655,7 +10664,7 @@
 #. whatever you like once you have updated your copy of the file.
 #: C/unity-introduction.page:37(media)
 msgctxt "_"
-msgid "external ref='figures/unity-overview.png' md5='3a766ca229b4db7d710d27c2341a9f89'"
+msgid "external ref='figures/unity-overview.png' md5='12ec9c818be891db69394b6d52cb09af'"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
@@ -10673,7 +10682,7 @@
 #. whatever you like once you have updated your copy of the file.
 #: C/unity-introduction.page:69(media)
 msgctxt "_"
-msgid "external ref='figures/unity-dash.png' md5='f65b19b259c742a7440ea43ba2a03113'"
+msgid "external ref='figures/unity-dash.png' md5='c1ec5f3efb8eef2ae6f9cb8a1154bda2'"
 msgstr ""
 
 #: C/unity-introduction.page:9(info/desc)
@@ -11564,15 +11573,15 @@
 msgstr ""
 
 #: C/windows-key.page:6(info/desc)
-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."
+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."
 msgstr ""
 
 #: C/windows-key.page:17(page/title)
-msgid "What is the \"meta\" key?"
+msgid "What is the \"Super\" key?"
 msgstr ""
 
 #: C/windows-key.page:19(page/p)
-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."
+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."
 msgstr ""
 
 #: C/windows-key.page:24(note/p)
@@ -11580,10 +11589,10 @@
 msgstr ""
 
 #: C/windows-key.page:28(page/p)
-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."
+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."
 msgstr ""
 
 #: C/windows-key.page:32(page/p)
-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."
+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."
 msgstr ""