From f022150024707dd81ed18e72b025d3c9bc1b15ae Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sun, 27 Oct 2013 18:25:35 +0100
Subject: [PATCH] Add key and button handling

---
 help/generic/po/de.po                         | 63 ++++++++-----------
 help/generic/po/fr.po                         | 63 ++++++++-----------
 help/generic/po/generic.pot                   | 52 +++++++--------
 help/generic/po/pl.po                         | 63 ++++++++-----------
 .../perllib/Locale/Po4a/Colobothelp.pm        | 20 +++---
 levels/scene101/po/de.po                      |  6 +-
 levels/scene101/po/fr.po                      |  2 +-
 levels/scene101/po/pl.po                      |  4 +-
 levels/scene101/po/scene101.pot               |  4 +-
 levels/scene102/po/de.po                      |  8 +--
 levels/scene102/po/fr.po                      |  6 +-
 levels/scene102/po/pl.po                      | 21 ++-----
 levels/scene102/po/scene102.pot               | 14 ++---
 13 files changed, 137 insertions(+), 189 deletions(-)

diff --git a/help/generic/po/de.po b/help/generic/po/de.po
index 08cfb563..bb7c7144 100644
--- a/help/generic/po/de.po
+++ b/help/generic/po/de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-25 14:04+0300\n"
+"POT-Creation-Date: 2013-10-27 18:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -314,23 +314,20 @@ msgstr ""
 #: generic-help/command.txt:10
 #, no-wrap
 msgid ""
-"\\key;\\key left;<norm/> = turn left\n"
-"\\key;\\key right;<norm/> = turn right\n"
-"\\key;\\key up;<norm/> = move forward\n"
-"\\key;\\key down;<norm/> = move back\n"
-"These controls are unavailable when working with the <a "
-"object|bottr>practice bots</a>."
+"<format key><key left/></format> = turn left\n"
+"<format key><key right/></format> = turn right\n"
+"<format key><key up/></format> = move forward\n"
+"<format key><key down/></format> = move back\n"
+"These controls are unavailable when working with the <a object|bottr>practice bots</a>."
 msgstr ""
 
 #. type: Plain text
 #: generic-help/command.txt:14
 #, no-wrap
 msgid ""
-"\\key;\\key gup;<norm/> = take off and climb <button 28/>\n"
-"\\key;\\key gdown;<norm/> = descend and land <button 29/>\n"
-"These controls are of course restricted to the <a object|human>astronaut</a> "
-"as well as the various <a object|botgj>winged bots</a> and in selected "
-"missions only."
+"<format key><key gup/></format> = take off and climb <button 28/>\n"
+"<format key><key gdown/></format> = descend and land <button 29/>\n"
+"These controls are of course restricted to the <a object|human>astronaut</a> as well as the various <a object|botgj>winged bots</a> and in selected missions only."
 msgstr ""
 
 #. type: Plain text
@@ -341,19 +338,15 @@ msgid ""
 "mouse backward = lower aim\n"
 "mouse right = aim right\n"
 "mouse left = aim left\n"
-"These controls are only available to the <a object|botfr>shooters</a>, the "
-"<a object|botor>orga shooters</a> and the <a object|botphaz>phazer "
-"shooter</a>."
+"These controls are only available to the <a object|botfr>shooters</a>, the <a object|botor>orga shooters</a> and the <a object|botphaz>phazer shooter</a>."
 msgstr ""
 
 #. type: Plain text
 #: generic-help/command.txt:23
 #, no-wrap
 msgid ""
-"\\key;\\key action;<norm/> = main action for a given selection (human or "
-"bot)\n"
-"This control will for example operate the arm of a <a "
-"object|botgr>grabber</a> or fire a <a object|botfr>shooter</a> <button 42/>."
+"<format key><key action/></format> = main action for a given selection (human or bot)\n"
+"This control will for example operate the arm of a <a object|botgr>grabber</a> or fire a <a object|botfr>shooter</a> <button 42/>."
 msgstr ""
 
 #. type: \t; header
@@ -366,9 +359,9 @@ msgstr ""
 #: generic-help/command.txt:28
 #, no-wrap
 msgid ""
-"\\key;\\key next;<norm/> = selects next object\n"
-"\\key;\\key human;<norm/> = selects astronaut\n"
-"\\key;\\key desel;<norm/> = previous selection <button 10/>"
+"<format key><key next/></format> = selects next object\n"
+"<format key><key human/></format> = selects astronaut\n"
+"<format key><key desel/></format> = previous selection <button 10/>"
 msgstr ""
 
 #. type: \t; header
@@ -381,12 +374,10 @@ msgstr ""
 #: generic-help/command.txt:34
 #, no-wrap
 msgid ""
-"\\key;\\key camera;<norm/> = shifts between onboard and following cameras "
-"<button 13/>\n"
-"\\key;\\key near;<norm/> = zoom in\n"
-"\\key;\\key away;<norm/> = zoom out\n"
-"\\key;\\key visit;<norm/> = pauses the game and shows where the latest "
-"message originated. Press again to show origin of previous message."
+"<format key><key camera/></format> = shifts between onboard and following cameras <button 13/>\n"
+"<format key><key near/></format> = zoom in\n"
+"<format key><key away/></format> = zoom out\n"
+"<format key><key visit/></format> = pauses the game and shows where the latest message originated. Press again to show origin of previous message."
 msgstr ""
 
 #. type: \t; header
@@ -399,8 +390,8 @@ msgstr ""
 #: generic-help/command.txt:38
 #, no-wrap
 msgid ""
-"\\key;\\key help;<norm/> = mission instructions\n"
-"\\key;\\key prog;<norm/> = programming help"
+"<format key><key help/></format> = mission instructions\n"
+"<format key><key prog/></format> = programming help"
 msgstr ""
 
 #. type: \t; header
@@ -413,10 +404,10 @@ msgstr ""
 #: generic-help/command.txt:44
 #, no-wrap
 msgid ""
-"\\key;\\key speed10;<norm/> = normal speed x1\n"
-"\\key;\\key speed15;<norm/> = medium speed x1.5\n"
-"\\key;\\key speed20;<norm/> = faster speed x2\n"
-"\\key;\\key quit;<norm/> = exits mission <button 11/>"
+"<format key><key speed10/></format> = normal speed x1\n"
+"<format key><key speed15/></format> = medium speed x1.5\n"
+"<format key><key speed20/></format> = faster speed x2\n"
+"<format key><key quit/></format> = exits mission <button 11/>"
 msgstr ""
 
 #. type: Plain text
@@ -461,9 +452,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "<button 30/> Home\n"
-"Get back to the home page, i.e. the first page that was displayed, for "
-"example when you hit the \\key;\\key help;<norm/> or \\key;\\key "
-"prog;<norm/> key."
+"Get back to the home page, i.e. the first page that was displayed, for example when you hit the <format key><key help/></format> or <format key><key prog/></format> key."
 msgstr ""
 
 #. type: Plain text
diff --git a/help/generic/po/fr.po b/help/generic/po/fr.po
index 9fdb4473..e1593c80 100644
--- a/help/generic/po/fr.po
+++ b/help/generic/po/fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-25 14:04+0300\n"
+"POT-Creation-Date: 2013-10-27 18:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -314,23 +314,20 @@ msgstr ""
 #: generic-help/command.txt:10
 #, no-wrap
 msgid ""
-"\\key;\\key left;<norm/> = turn left\n"
-"\\key;\\key right;<norm/> = turn right\n"
-"\\key;\\key up;<norm/> = move forward\n"
-"\\key;\\key down;<norm/> = move back\n"
-"These controls are unavailable when working with the <a "
-"object|bottr>practice bots</a>."
+"<format key><key left/></format> = turn left\n"
+"<format key><key right/></format> = turn right\n"
+"<format key><key up/></format> = move forward\n"
+"<format key><key down/></format> = move back\n"
+"These controls are unavailable when working with the <a object|bottr>practice bots</a>."
 msgstr ""
 
 #. type: Plain text
 #: generic-help/command.txt:14
 #, no-wrap
 msgid ""
-"\\key;\\key gup;<norm/> = take off and climb <button 28/>\n"
-"\\key;\\key gdown;<norm/> = descend and land <button 29/>\n"
-"These controls are of course restricted to the <a object|human>astronaut</a> "
-"as well as the various <a object|botgj>winged bots</a> and in selected "
-"missions only."
+"<format key><key gup/></format> = take off and climb <button 28/>\n"
+"<format key><key gdown/></format> = descend and land <button 29/>\n"
+"These controls are of course restricted to the <a object|human>astronaut</a> as well as the various <a object|botgj>winged bots</a> and in selected missions only."
 msgstr ""
 
 #. type: Plain text
@@ -341,19 +338,15 @@ msgid ""
 "mouse backward = lower aim\n"
 "mouse right = aim right\n"
 "mouse left = aim left\n"
-"These controls are only available to the <a object|botfr>shooters</a>, the "
-"<a object|botor>orga shooters</a> and the <a object|botphaz>phazer "
-"shooter</a>."
+"These controls are only available to the <a object|botfr>shooters</a>, the <a object|botor>orga shooters</a> and the <a object|botphaz>phazer shooter</a>."
 msgstr ""
 
 #. type: Plain text
 #: generic-help/command.txt:23
 #, no-wrap
 msgid ""
-"\\key;\\key action;<norm/> = main action for a given selection (human or "
-"bot)\n"
-"This control will for example operate the arm of a <a "
-"object|botgr>grabber</a> or fire a <a object|botfr>shooter</a> <button 42/>."
+"<format key><key action/></format> = main action for a given selection (human or bot)\n"
+"This control will for example operate the arm of a <a object|botgr>grabber</a> or fire a <a object|botfr>shooter</a> <button 42/>."
 msgstr ""
 
 #. type: \t; header
@@ -366,9 +359,9 @@ msgstr ""
 #: generic-help/command.txt:28
 #, no-wrap
 msgid ""
-"\\key;\\key next;<norm/> = selects next object\n"
-"\\key;\\key human;<norm/> = selects astronaut\n"
-"\\key;\\key desel;<norm/> = previous selection <button 10/>"
+"<format key><key next/></format> = selects next object\n"
+"<format key><key human/></format> = selects astronaut\n"
+"<format key><key desel/></format> = previous selection <button 10/>"
 msgstr ""
 
 #. type: \t; header
@@ -381,12 +374,10 @@ msgstr ""
 #: generic-help/command.txt:34
 #, no-wrap
 msgid ""
-"\\key;\\key camera;<norm/> = shifts between onboard and following cameras "
-"<button 13/>\n"
-"\\key;\\key near;<norm/> = zoom in\n"
-"\\key;\\key away;<norm/> = zoom out\n"
-"\\key;\\key visit;<norm/> = pauses the game and shows where the latest "
-"message originated. Press again to show origin of previous message."
+"<format key><key camera/></format> = shifts between onboard and following cameras <button 13/>\n"
+"<format key><key near/></format> = zoom in\n"
+"<format key><key away/></format> = zoom out\n"
+"<format key><key visit/></format> = pauses the game and shows where the latest message originated. Press again to show origin of previous message."
 msgstr ""
 
 #. type: \t; header
@@ -399,8 +390,8 @@ msgstr ""
 #: generic-help/command.txt:38
 #, no-wrap
 msgid ""
-"\\key;\\key help;<norm/> = mission instructions\n"
-"\\key;\\key prog;<norm/> = programming help"
+"<format key><key help/></format> = mission instructions\n"
+"<format key><key prog/></format> = programming help"
 msgstr ""
 
 #. type: \t; header
@@ -413,10 +404,10 @@ msgstr ""
 #: generic-help/command.txt:44
 #, no-wrap
 msgid ""
-"\\key;\\key speed10;<norm/> = normal speed x1\n"
-"\\key;\\key speed15;<norm/> = medium speed x1.5\n"
-"\\key;\\key speed20;<norm/> = faster speed x2\n"
-"\\key;\\key quit;<norm/> = exits mission <button 11/>"
+"<format key><key speed10/></format> = normal speed x1\n"
+"<format key><key speed15/></format> = medium speed x1.5\n"
+"<format key><key speed20/></format> = faster speed x2\n"
+"<format key><key quit/></format> = exits mission <button 11/>"
 msgstr ""
 
 #. type: Plain text
@@ -461,9 +452,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "<button 30/> Home\n"
-"Get back to the home page, i.e. the first page that was displayed, for "
-"example when you hit the \\key;\\key help;<norm/> or \\key;\\key "
-"prog;<norm/> key."
+"Get back to the home page, i.e. the first page that was displayed, for example when you hit the <format key><key help/></format> or <format key><key prog/></format> key."
 msgstr ""
 
 #. type: Plain text
diff --git a/help/generic/po/generic.pot b/help/generic/po/generic.pot
index aa252441..8eddae9f 100644
--- a/help/generic/po/generic.pot
+++ b/help/generic/po/generic.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-25 14:09+0300\n"
+"POT-Creation-Date: 2013-10-27 18:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -314,10 +314,10 @@ msgstr ""
 #: generic-help/command.txt:10
 #, no-wrap
 msgid ""
-"\\key;\\key left;<norm/> = turn left\n"
-"\\key;\\key right;<norm/> = turn right\n"
-"\\key;\\key up;<norm/> = move forward\n"
-"\\key;\\key down;<norm/> = move back\n"
+"<format key><key left/></format> = turn left\n"
+"<format key><key right/></format> = turn right\n"
+"<format key><key up/></format> = move forward\n"
+"<format key><key down/></format> = move back\n"
 "These controls are unavailable when working with the <a "
 "object|bottr>practice bots</a>."
 msgstr ""
@@ -326,8 +326,8 @@ msgstr ""
 #: generic-help/command.txt:14
 #, no-wrap
 msgid ""
-"\\key;\\key gup;<norm/> = take off and climb <button 28/>\n"
-"\\key;\\key gdown;<norm/> = descend and land <button 29/>\n"
+"<format key><key gup/></format> = take off and climb <button 28/>\n"
+"<format key><key gdown/></format> = descend and land <button 29/>\n"
 "These controls are of course restricted to the <a object|human>astronaut</a> "
 "as well as the various <a object|botgj>winged bots</a> and in selected "
 "missions only."
@@ -350,8 +350,8 @@ msgstr ""
 #: generic-help/command.txt:23
 #, no-wrap
 msgid ""
-"\\key;\\key action;<norm/> = main action for a given selection (human or "
-"bot)\n"
+"<format key><key action/></format> = main action for a given selection "
+"(human or bot)\n"
 "This control will for example operate the arm of a <a "
 "object|botgr>grabber</a> or fire a <a object|botfr>shooter</a> <button 42/>."
 msgstr ""
@@ -366,9 +366,9 @@ msgstr ""
 #: generic-help/command.txt:28
 #, no-wrap
 msgid ""
-"\\key;\\key next;<norm/> = selects next object\n"
-"\\key;\\key human;<norm/> = selects astronaut\n"
-"\\key;\\key desel;<norm/> = previous selection <button 10/>"
+"<format key><key next/></format> = selects next object\n"
+"<format key><key human/></format> = selects astronaut\n"
+"<format key><key desel/></format> = previous selection <button 10/>"
 msgstr ""
 
 #. type: \t; header
@@ -381,12 +381,12 @@ msgstr ""
 #: generic-help/command.txt:34
 #, no-wrap
 msgid ""
-"\\key;\\key camera;<norm/> = shifts between onboard and following cameras "
-"<button 13/>\n"
-"\\key;\\key near;<norm/> = zoom in\n"
-"\\key;\\key away;<norm/> = zoom out\n"
-"\\key;\\key visit;<norm/> = pauses the game and shows where the latest "
-"message originated. Press again to show origin of previous message."
+"<format key><key camera/></format> = shifts between onboard and following "
+"cameras <button 13/>\n"
+"<format key><key near/></format> = zoom in\n"
+"<format key><key away/></format> = zoom out\n"
+"<format key><key visit/></format> = pauses the game and shows where the "
+"latest message originated. Press again to show origin of previous message."
 msgstr ""
 
 #. type: \t; header
@@ -399,8 +399,8 @@ msgstr ""
 #: generic-help/command.txt:38
 #, no-wrap
 msgid ""
-"\\key;\\key help;<norm/> = mission instructions\n"
-"\\key;\\key prog;<norm/> = programming help"
+"<format key><key help/></format> = mission instructions\n"
+"<format key><key prog/></format> = programming help"
 msgstr ""
 
 #. type: \t; header
@@ -413,10 +413,10 @@ msgstr ""
 #: generic-help/command.txt:44
 #, no-wrap
 msgid ""
-"\\key;\\key speed10;<norm/> = normal speed x1\n"
-"\\key;\\key speed15;<norm/> = medium speed x1.5\n"
-"\\key;\\key speed20;<norm/> = faster speed x2\n"
-"\\key;\\key quit;<norm/> = exits mission <button 11/>"
+"<format key><key speed10/></format> = normal speed x1\n"
+"<format key><key speed15/></format> = medium speed x1.5\n"
+"<format key><key speed20/></format> = faster speed x2\n"
+"<format key><key quit/></format> = exits mission <button 11/>"
 msgstr ""
 
 #. type: Plain text
@@ -462,8 +462,8 @@ msgstr ""
 msgid ""
 "<button 30/> Home\n"
 "Get back to the home page, i.e. the first page that was displayed, for "
-"example when you hit the \\key;\\key help;<norm/> or \\key;\\key "
-"prog;<norm/> key."
+"example when you hit the <format key><key help/></format> or <format "
+"key><key prog/></format> key."
 msgstr ""
 
 #. type: Plain text
diff --git a/help/generic/po/pl.po b/help/generic/po/pl.po
index 7976f088..2e301d5b 100644
--- a/help/generic/po/pl.po
+++ b/help/generic/po/pl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-25 14:04+0300\n"
+"POT-Creation-Date: 2013-10-27 18:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -314,23 +314,20 @@ msgstr ""
 #: generic-help/command.txt:10
 #, no-wrap
 msgid ""
-"\\key;\\key left;<norm/> = turn left\n"
-"\\key;\\key right;<norm/> = turn right\n"
-"\\key;\\key up;<norm/> = move forward\n"
-"\\key;\\key down;<norm/> = move back\n"
-"These controls are unavailable when working with the <a "
-"object|bottr>practice bots</a>."
+"<format key><key left/></format> = turn left\n"
+"<format key><key right/></format> = turn right\n"
+"<format key><key up/></format> = move forward\n"
+"<format key><key down/></format> = move back\n"
+"These controls are unavailable when working with the <a object|bottr>practice bots</a>."
 msgstr ""
 
 #. type: Plain text
 #: generic-help/command.txt:14
 #, no-wrap
 msgid ""
-"\\key;\\key gup;<norm/> = take off and climb <button 28/>\n"
-"\\key;\\key gdown;<norm/> = descend and land <button 29/>\n"
-"These controls are of course restricted to the <a object|human>astronaut</a> "
-"as well as the various <a object|botgj>winged bots</a> and in selected "
-"missions only."
+"<format key><key gup/></format> = take off and climb <button 28/>\n"
+"<format key><key gdown/></format> = descend and land <button 29/>\n"
+"These controls are of course restricted to the <a object|human>astronaut</a> as well as the various <a object|botgj>winged bots</a> and in selected missions only."
 msgstr ""
 
 #. type: Plain text
@@ -341,19 +338,15 @@ msgid ""
 "mouse backward = lower aim\n"
 "mouse right = aim right\n"
 "mouse left = aim left\n"
-"These controls are only available to the <a object|botfr>shooters</a>, the "
-"<a object|botor>orga shooters</a> and the <a object|botphaz>phazer "
-"shooter</a>."
+"These controls are only available to the <a object|botfr>shooters</a>, the <a object|botor>orga shooters</a> and the <a object|botphaz>phazer shooter</a>."
 msgstr ""
 
 #. type: Plain text
 #: generic-help/command.txt:23
 #, no-wrap
 msgid ""
-"\\key;\\key action;<norm/> = main action for a given selection (human or "
-"bot)\n"
-"This control will for example operate the arm of a <a "
-"object|botgr>grabber</a> or fire a <a object|botfr>shooter</a> <button 42/>."
+"<format key><key action/></format> = main action for a given selection (human or bot)\n"
+"This control will for example operate the arm of a <a object|botgr>grabber</a> or fire a <a object|botfr>shooter</a> <button 42/>."
 msgstr ""
 
 #. type: \t; header
@@ -366,9 +359,9 @@ msgstr ""
 #: generic-help/command.txt:28
 #, no-wrap
 msgid ""
-"\\key;\\key next;<norm/> = selects next object\n"
-"\\key;\\key human;<norm/> = selects astronaut\n"
-"\\key;\\key desel;<norm/> = previous selection <button 10/>"
+"<format key><key next/></format> = selects next object\n"
+"<format key><key human/></format> = selects astronaut\n"
+"<format key><key desel/></format> = previous selection <button 10/>"
 msgstr ""
 
 #. type: \t; header
@@ -381,12 +374,10 @@ msgstr ""
 #: generic-help/command.txt:34
 #, no-wrap
 msgid ""
-"\\key;\\key camera;<norm/> = shifts between onboard and following cameras "
-"<button 13/>\n"
-"\\key;\\key near;<norm/> = zoom in\n"
-"\\key;\\key away;<norm/> = zoom out\n"
-"\\key;\\key visit;<norm/> = pauses the game and shows where the latest "
-"message originated. Press again to show origin of previous message."
+"<format key><key camera/></format> = shifts between onboard and following cameras <button 13/>\n"
+"<format key><key near/></format> = zoom in\n"
+"<format key><key away/></format> = zoom out\n"
+"<format key><key visit/></format> = pauses the game and shows where the latest message originated. Press again to show origin of previous message."
 msgstr ""
 
 #. type: \t; header
@@ -399,8 +390,8 @@ msgstr ""
 #: generic-help/command.txt:38
 #, no-wrap
 msgid ""
-"\\key;\\key help;<norm/> = mission instructions\n"
-"\\key;\\key prog;<norm/> = programming help"
+"<format key><key help/></format> = mission instructions\n"
+"<format key><key prog/></format> = programming help"
 msgstr ""
 
 #. type: \t; header
@@ -413,10 +404,10 @@ msgstr ""
 #: generic-help/command.txt:44
 #, no-wrap
 msgid ""
-"\\key;\\key speed10;<norm/> = normal speed x1\n"
-"\\key;\\key speed15;<norm/> = medium speed x1.5\n"
-"\\key;\\key speed20;<norm/> = faster speed x2\n"
-"\\key;\\key quit;<norm/> = exits mission <button 11/>"
+"<format key><key speed10/></format> = normal speed x1\n"
+"<format key><key speed15/></format> = medium speed x1.5\n"
+"<format key><key speed20/></format> = faster speed x2\n"
+"<format key><key quit/></format> = exits mission <button 11/>"
 msgstr ""
 
 #. type: Plain text
@@ -461,9 +452,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "<button 30/> Home\n"
-"Get back to the home page, i.e. the first page that was displayed, for "
-"example when you hit the \\key;\\key help;<norm/> or \\key;\\key "
-"prog;<norm/> key."
+"Get back to the home page, i.e. the first page that was displayed, for example when you hit the <format key><key help/></format> or <format key><key prog/></format> key."
 msgstr ""
 
 #. type: Plain text
diff --git a/levels-i18n/scripts/perllib/Locale/Po4a/Colobothelp.pm b/levels-i18n/scripts/perllib/Locale/Po4a/Colobothelp.pm
index 8e3b5151..c2a683c6 100644
--- a/levels-i18n/scripts/perllib/Locale/Po4a/Colobothelp.pm
+++ b/levels-i18n/scripts/perllib/Locale/Po4a/Colobothelp.pm
@@ -130,39 +130,39 @@ sub parse_colobothelp {
 
 sub offlink {
   my ($paragraph) = @_;
+  # Replace \button $id; as pseudo xHTML <button $id/> tags
+  $paragraph =~ s#\\(button|key) ([^;]*?);#<$1 $2/>#g;
   # Put \const;Code\norm; sequences into pseudo-HTML <format const> tags
-  $paragraph =~ s#\\(const|type|token);([^\\;]*?)\\norm;#<format $1>$2</format>#g;
+  $paragraph =~ s#\\(const|type|token|key);([^\\;]*?)\\norm;#<format $1>$2</format>#g;
   # Transform CBot links \l;text\u target; into pseudo-HTML <a target>text</a>
   $paragraph =~ s#\\l;(.*?)\\u ([^;]*?);#<a $2>$1</a>#g;
   # Cleanup pseudo-html targets separated by \\ to have a single character |
   $paragraph =~ s#<a (.*?)\\(.*?)>#<a $1|$2>#g;
+  # Replace remnants of \const; \type; \token or \norm; as pseudo xHTML <const/> tags
+  $paragraph =~ s#\\(const|type|token|norm|key);#<$1/>#g;
   # Put \c;Code\n; sequences into pseudo-HTML <code> tags
   $paragraph =~ s#\\c;([^\\;]*?)\\n;#<code>$1</code>#g;
   # Replace remnants of \s; \c; \b; or \n; as pseudo xHTML <s/> tags
   $paragraph =~ s#\\([scbn]);#<$1/>#g;
-  # Replace remnants of \const; \type; \token or \norm; as pseudo xHTML <const/> tags
-  $paragraph =~ s#\\(const|type|token|norm);#<$1/>#g;
-  # Replace \button $id; as pseudo xHTML <button $id/> tags
-  $paragraph =~ s#\\button ([^;]*?);#<button $1/>#g;
   return ($paragraph);
 }
 
 sub onlink {
   my ($paragraph) = @_;
-  # Invert the replace of \button $id; as pseudo xHTML <button $id/> tags
-  $paragraph =~ s#<button ([^;]*?)/>#\\button $1;#g;
-  # Invert the replace remnants of \const; \type; \token or \norm; as pseudo xHTML <const/> tags
-  $paragraph =~ s#<(const|type|token|norm)/>#\\$1;#g;
   # Invert the replace remnants of \s; \c; \b; or \n; as pseudo xHTML <s/> tagsyy
   $paragraph =~ s#<([scbn])/>#\\$1;#g;
   # Inverse the put of \c;Code\n; sequences into pseudo-HTML <code> tags
   $paragraph =~ s#<code>([^\\;]*?)</code>#\\c;$1\\n;#g;
+  # Invert the replace remnants of \const; \type; \token or \norm; as pseudo xHTML <const/> tags
+  $paragraph =~ s#<(const|type|token|norm|key)/>#\\$1;#g;
   # Inverse of the cleanup of pseudo-html targets separated by \\ to have a single character |
   $paragraph =~ s#<a (.*?)\|(.*?)>#<a $1\\$2>#g;
   # Inverse of the transform of CBot links \l;text\u target; into pseudo-HTML <a target>text</a>
   $paragraph =~ s#<a (.*?)>(.*?)</a>#\\l;$2\\u $1;#g;
   # Invert the put \const;Code\norm; sequences into pseudo-HTML <format const> tags
-  $paragraph =~ s#<format (const|type|token)>([^\\;]*?)</format>#\\$1;$2\\norm;#g;
+  $paragraph =~ s#<format (const|type|token|key)>([^\\;]*?)</format>#\\$1;$2\\norm;#g;
+  # Invert the replace of \button $id; as pseudo xHTML <button $id/> tags
+  $paragraph =~ s#<(button|key) ([^;]*?)/>#\\$1 $2;#g;
   return ($paragraph);
 }
 
diff --git a/levels/scene101/po/de.po b/levels/scene101/po/de.po
index b991dabf..d9e2748a 100644
--- a/levels/scene101/po/de.po
+++ b/levels/scene101/po/de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-24 09:00+0200\n"
+"POT-Creation-Date: 2013-10-27 18:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -146,9 +146,7 @@ msgstr ""
 #. type: Plain text
 #: scene101-help/mhterre1.txt:25
 #, no-wrap
-msgid ""
-"\\key;\\key help;<norm/> allows you to review these instructions at all "
-"times on your personal SatCom \\button 63;."
+msgid "<format key><key help/></format> allows you to review these instructions at all times on your personal SatCom <button 63/>."
 msgstr ""
 
 #. type: \t; header
diff --git a/levels/scene101/po/fr.po b/levels/scene101/po/fr.po
index ad5917d5..6b950eaf 100644
--- a/levels/scene101/po/fr.po
+++ b/levels/scene101/po/fr.po
@@ -117,7 +117,7 @@ msgstr ""
 #. type: Plain text
 #: scene101-help/mhterre1.txt:25
 #, no-wrap
-msgid "\\key;\\key help;<norm/> allows you to review these instructions at all times on your personal SatCom \\button 63;."
+msgid "<format key><key help/></format> allows you to review these instructions at all times on your personal SatCom <button 63/>."
 msgstr ""
 
 #. type: \t; header
diff --git a/levels/scene101/po/pl.po b/levels/scene101/po/pl.po
index cba35cdc..4ef0f1a2 100644
--- a/levels/scene101/po/pl.po
+++ b/levels/scene101/po/pl.po
@@ -146,9 +146,7 @@ msgstr ""
 #. type: Plain text
 #: scene101-help/mhterre1.txt:25
 #, no-wrap
-msgid ""
-"\\key;\\key help;<norm/> allows you to review these instructions at all "
-"times on your personal SatCom \\button 63;."
+msgid "<format key><key help/></format> allows you to review these instructions at all times on your personal SatCom <button 63/>."
 msgstr ""
 
 #. type: \t; header
diff --git a/levels/scene101/po/scene101.pot b/levels/scene101/po/scene101.pot
index b1d43c89..b3b947b8 100644
--- a/levels/scene101/po/scene101.pot
+++ b/levels/scene101/po/scene101.pot
@@ -147,8 +147,8 @@ msgstr ""
 #: scene101-help/mhterre1.txt:25
 #, no-wrap
 msgid ""
-"\\key;\\key help;<norm/> allows you to review these instructions at all "
-"times on your personal SatCom \\button 63;."
+"<format key><key help/></format> allows you to review these instructions at "
+"all times on your personal SatCom <button 63/>."
 msgstr ""
 
 #. type: \t; header
diff --git a/levels/scene102/po/de.po b/levels/scene102/po/de.po
index a2302f7d..f4eff2bd 100644
--- a/levels/scene102/po/de.po
+++ b/levels/scene102/po/de.po
@@ -90,9 +90,7 @@ msgstr ""
 #. type: Plain text
 #: scene102-help/mhterre2.txt:12
 #, no-wrap
-msgid ""
-"\\key;\\key help;<norm/> allows you to review these instructions at all "
-"times on your personal SatCom \\button 63;."
+msgid "<format key><key help/></format> allows you to review these instructions at all times on your personal SatCom <button 63/>."
 msgstr ""
 
 #. type: \t; header
@@ -141,9 +139,7 @@ msgstr ""
 #. type: Bullet: '3)'
 #: scene102-help/msterre2.txt:6
 #, no-wrap
-msgid ""
-"Repeat 1) but click on the second button: \\button 160; <build a <a "
-"object|factory>bot factory</a>>."
+msgid "Repeat 1) but click on the second button: <button 160/> <build a <a object|factory>bot factory</a>>."
 msgstr ""
 
 #. type: Plain text
diff --git a/levels/scene102/po/fr.po b/levels/scene102/po/fr.po
index 9f639c69..2658c412 100644
--- a/levels/scene102/po/fr.po
+++ b/levels/scene102/po/fr.po
@@ -81,7 +81,7 @@ msgstr ""
 #. type: Plain text
 #: scene102-help/mhterre2.txt:12
 #, no-wrap
-msgid "\\key;\\key help;<norm/> allows you to review these instructions at all times on your personal SatCom \\button 63;."
+msgid "<format key><key help/></format> allows you to review these instructions at all times on your personal SatCom <button 63/>."
 msgstr ""
 
 #. type: \t; header
@@ -111,7 +111,7 @@ msgstr ""
 #. type: Bullet: '1)'
 #: scene102-help/msterre2.txt:4
 #, no-wrap
-msgid "Face the cube. Click on the first button at the bottom left of your screen: \\button 163; <build a <a object|research>research center</a>>."
+msgid "Face the cube. Click on the first button at the bottom left of your screen: <button 163/> <build a <a object|research>research center</a>>."
 msgstr ""
 
 #. type: Bullet: '2)'
@@ -123,7 +123,7 @@ msgstr ""
 #. type: Bullet: '3)'
 #: scene102-help/msterre2.txt:6
 #, no-wrap
-msgid "Repeat 1) but click on the second button: \\button 160; <build a <a object|factory>bot factory</a>>."
+msgid "Repeat 1) but click on the second button: <button 160/> <build a <a object|factory>bot factory</a>>."
 msgstr ""
 
 #. type: Plain text
diff --git a/levels/scene102/po/pl.po b/levels/scene102/po/pl.po
index 34642538..0edacbc7 100644
--- a/levels/scene102/po/pl.po
+++ b/levels/scene102/po/pl.po
@@ -73,26 +73,19 @@ msgstr ""
 #. type: Bullet: '2)'
 #: scene102-help/mhterre2.txt:8
 #, no-wrap
-msgid ""
-"Build a <a object|research>research center</a> \\button 163;. Note that only "
-"<a object|human>you</a> can accomplish the task of building; no bot can be "
-"substituted."
+msgid "Build a <a object|research>research center</a> <button 163/>. Note that only <a object|human>you</a> can accomplish the task of building; no bot can be substituted."
 msgstr ""
 
 #. type: Bullet: '3)'
 #: scene102-help/mhterre2.txt:9
 #, no-wrap
-msgid ""
-"With a second <a object|titan>titanium cube</a>, build a <a "
-"object|factory>bot factory</a> \\button 160;."
+msgid "With a second <a object|titan>titanium cube</a>, build a <a object|factory>bot factory</a> <button 160/>."
 msgstr ""
 
 #. type: Plain text
 #: scene102-help/mhterre2.txt:12
 #, no-wrap
-msgid ""
-"\\key;\\key help;<norm/> allows you to review these instructions at all "
-"times on your personal SatCom \\button 63;."
+msgid "<format key><key help/></format> allows you to review these instructions at all times on your personal SatCom <button 63/>."
 msgstr ""
 
 #. type: \t; header
@@ -125,9 +118,7 @@ msgstr ""
 #. type: Bullet: '1)'
 #: scene102-help/msterre2.txt:4
 #, no-wrap
-msgid ""
-"Face the cube. Click on the first button at the bottom left of your screen: "
-"\\button 163; <build a <a object|research>research center</a>>."
+msgid "Face the cube. Click on the first button at the bottom left of your screen: <button 163/> <build a <a object|research>research center</a>>."
 msgstr ""
 
 #. type: Bullet: '2)'
@@ -141,9 +132,7 @@ msgstr ""
 #. type: Bullet: '3)'
 #: scene102-help/msterre2.txt:6
 #, no-wrap
-msgid ""
-"Repeat 1) but click on the second button: \\button 160; <build a <a "
-"object|factory>bot factory</a>>."
+msgid "Repeat 1) but click on the second button: <button 160/> <build a <a object|factory>bot factory</a>>."
 msgstr ""
 
 #. type: Plain text
diff --git a/levels/scene102/po/scene102.pot b/levels/scene102/po/scene102.pot
index b98265c1..cfd2b4b6 100644
--- a/levels/scene102/po/scene102.pot
+++ b/levels/scene102/po/scene102.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-10-25 12:49+0300\n"
+"POT-Creation-Date: 2013-10-27 18:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -74,7 +74,7 @@ msgstr ""
 #: scene102-help/mhterre2.txt:8
 #, no-wrap
 msgid ""
-"Build a <a object|research>research center</a> \\button 163;. Note that only "
+"Build a <a object|research>research center</a> <button 163/>. Note that only "
 "<a object|human>you</a> can accomplish the task of building; no bot can be "
 "substituted."
 msgstr ""
@@ -84,15 +84,15 @@ msgstr ""
 #, no-wrap
 msgid ""
 "With a second <a object|titan>titanium cube</a>, build a <a "
-"object|factory>bot factory</a> \\button 160;."
+"object|factory>bot factory</a> <button 160/>."
 msgstr ""
 
 #. type: Plain text
 #: scene102-help/mhterre2.txt:12
 #, no-wrap
 msgid ""
-"\\key;\\key help;<norm/> allows you to review these instructions at all "
-"times on your personal SatCom \\button 63;."
+"<format key><key help/></format> allows you to review these instructions at "
+"all times on your personal SatCom <button 63/>."
 msgstr ""
 
 #. type: \t; header
@@ -127,7 +127,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Face the cube. Click on the first button at the bottom left of your screen: "
-"\\button 163; <build a <a object|research>research center</a>>."
+"<button 163/> <build a <a object|research>research center</a>>."
 msgstr ""
 
 #. type: Bullet: '2)'
@@ -142,7 +142,7 @@ msgstr ""
 #: scene102-help/msterre2.txt:6
 #, no-wrap
 msgid ""
-"Repeat 1) but click on the second button: \\button 160; <build a <a "
+"Repeat 1) but click on the second button: <button 160/> <build a <a "
 "object|factory>bot factory</a>>."
 msgstr ""