[wiican: 16/16] [m][i18n] Manual import of launchpad translations

[J. FÃlix OntaÃÃn <felixonta src gnome org>]

commit 843a22e31f85d56f2fd1df8ab06f5feb05142c82
Author: J. FÃlix OntaÃÃn <fontanon emergya es>
Date:   Thu Aug 16 14:45:21 2012 +0200

    [m][i18n] Manual import of launchpad translations

 data/wiimotemanager.ui |   21 +++-
 po/ast.po              |  320 +++++++++++++++++++++++--------------------
 po/ca.po               |  295 +++++++++++++++++++++-------------------
 po/da.po               |  218 ++++++++++++++---------------
 po/de.po               |  338 +++++++++++++++++++++++----------------------
 po/el.po               |  292 +++++++++++++++++++++++++++++++++++++++
 po/en_GB.po            |  302 +++++++++++++++++++++-------------------
 po/es.po               |  303 +++++++++++++++++++++-------------------
 po/et.po               |  237 +++++++++++++++-----------------
 po/eu.po               |  357 ++++++++++++++++++++++++++----------------------
 po/fi.po               |  219 ++++++++++++++---------------
 po/fr.po               |  310 ++++++++++++++++++++++--------------------
 po/gl.po               |  296 +++++++++++++++++++++-------------------
 po/it.po               |  301 +++++++++++++++++++++-------------------
 po/nl.po               |  295 +++++++++++++++++++++-------------------
 po/pt.po               |  221 +++++++++++++++---------------
 po/pt_BR.po            |  301 +++++++++++++++++++++-------------------
 po/ru.po               |  290 ++++++++++++++++++++-------------------
 po/sv.po               |  301 +++++++++++++++++++++-------------------
 po/tr.po               |  218 ++++++++++++++---------------
 po/wiican.pot          |  184 ++++++++++++-------------
 po/zh_TW.po            |  296 +++++++++++++++++++++-------------------
 22 files changed, 3201 insertions(+), 2714 deletions(-)
---
diff --git a/data/wiimotemanager.ui b/data/wiimotemanager.ui
index f519656..5522c31 100644
--- a/data/wiimotemanager.ui
+++ b/data/wiimotemanager.ui
@@ -802,17 +802,25 @@ Public License instead of this License.  But first, please read
 
 Launchpad contributors:
 (ast) Xandru &lt;xandru softastur org&gt;
+(ast) ASTUR2000
+(eu) Abel Camacho &lt;didaktika santurtzieus com&gt;
+(eu) Asier Iturralde Sarasola
 (ca) oriolsbd &lt;oriolsbd yahoo es&gt;
 (ca) Sergio Oller
 (ca) Siegfried Gevatter &lt;rainct ubuntu com&gt;
 (ca) noidelsucre
+(ca) josep87 &lt;josep87 gmail com&gt;
 (da) zpon &lt;zpon dk gmail com&gt;
 (da) Niels Kristensen
-(de) Daniel Garcia Stelzner
 (de) Gregor Santner
 (de) Mario BlÃttermann &lt;mariobl gnome org&gt;
 (de) siziwi
-(en_GB) bouchard renaud 
+(de) xlazarus  &lt;xlazarus lazarusware at&gt;
+(de) yanuzz
+(de) Dennis Baudys
+(el) Vamire
+(en_GB) bouchard renaud
+(en_GB) Lars Vierbergen
 (es) Diego-arg &lt;toledo244 hotmail com&gt;
 (es) pcgaldo
 (es) J. FÃlix OntaÃÃn &lt;fontanon emergya es&gt;
@@ -821,12 +829,12 @@ Launchpad contributors:
 (fi) Jani VÃlimaa
 (fi) Jiri GrÃnroos
 (fi) Tommi Saira
-(fr) Anthony Chaput
-(fr) Chris Murphy &lt;chrismurf+ubuntu gmail com&gt;
 (fr) Djiboun 
 (fr) Fabien Boutantin &lt;fabien boutantin laposte net&gt;
 (fr) Florent ThÃvenet &lt;feuloren free fr&gt;
 (fr) Pierre Slamich &lt;pierre slamich net&gt;
+(fr) Glyca
+(fr) Mathieu Fontaine
 (gl) Gal_Escriban
 (gl) csrparga
 (gl) pcgaldo
@@ -834,18 +842,22 @@ Launchpad contributors:
 (it) Emanuele Aiello 
 (it) Emanuele Toscano 
 (it) Martino Barbon 
+(it) Gianfranco Frisani &lt;gfrisani libero it&gt;
 (nl) cumulus007 &lt;cumulus0007 gmail com&gt;
 (nl) Bert de Bruijn
 (nl) Gwijde &lt;gwijde maegherman gmail com&gt;
 (nl) Tico
 (pt) Claudio Novais
 (pt) Tiago Silva
+(pt) pcgaldo
 (pt_BR) Jean Roberto Souza 
 (pt_BR) Licio Fonseca &lt;licio ubuntu com&gt;
 (pt_BR) Moraes Junior &lt;moraesjunior gmail com&gt;
 (pt_BR) Sam Samuels &lt;gemini_sam_samuels hotmail co uk&gt;
 (pt_BR) feen 
 (pt_BR) pcgaldo
+(pt_BR) Edilson Takano
+(pt_BR) Rafael Jannone &lt;rafael jannone org&gt;
 (ru) Alexander 'FONTER' Zinin &lt;spore_09 mail ru&gt;
 (ru) Alexey Afanasyev 
 (ru) Anton Lashkov 
@@ -856,6 +868,7 @@ Launchpad contributors:
 (sv) Christian Widell &lt;christian widell gmail com&gt;
 (sv) Leopold Augustsson 
 (sv) Phoenix 
+(sv) Patrik Kullman
 (tr) Metin Akdere
 (zh_TW) kentxchang</property>
     <property name="artists">Dani Planas &lt;daniplanas a gmail com&gt;
diff --git a/po/ast.po b/po/ast.po
index 70c67ae..657d51f 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -6,119 +6,108 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wiican\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL ADDRESS>\n"
-"POT-Creation-Date: 2010-11-13 14:38+0100\n"
-"PO-Revision-Date: 2011-03-31 20:30+0000\n"
-"Last-Translator: Xandru <xandru softastur org>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-16 14:27+0200\n"
+"PO-Revision-Date: 2011-10-09 16:58+0000\n"
+"Last-Translator: ASTUR2000 <Unknown>\n"
 "Language-Team: Asturian <ast li org>\n"
+"Language: ast\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-07 23:04+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2012-08-16 12:08+0000\n"
+"X-Generator: Launchpad (build 15810)\n"
 
-#: ../bin/wiican:102
+#: ../bin/wiican:134
 msgid "Plug a bluetooth adapter"
-msgstr "Coneuta un adaptador Bluetooth"
+msgstr "Coneuta un presÃu Bluetooth"
 
-#: ../bin/wiican:107
+#: ../bin/wiican:142
 msgid "Please load uinput module first"
 msgstr "Carga'l mÃdulu uinput primero"
 
-#: ../bin/wiican:113
-msgid ""
-"Hold left button for use wiimote\n"
-"Right button for menu"
-msgstr ""
-"CaltÃn calcÃu'l botÃn izquierdu pa usar wiimote\n"
-"BotÃn drechu pal menÃ"
-
-#: ../bin/wiican:125
-msgid "Discovering Wiimote"
-msgstr "Descubriendo Wiimote"
-
-#: ../bin/wiican:160
-msgid "Add visible mappings"
-msgstr "Amiesta mapeos visibles"
+#: ../bin/wiican:196
+msgid "Set some visible mappings"
+msgstr "Poner dalgunos controles agÃeyables"
 
-#: ../bin/wiican:205 ../wiican/ui/editordlg.py:148
+#: ../bin/wiican:239 ../wiican/ui/editordlg.py:148
 msgid "Editing "
 msgstr "Editando "
 
-#: ../bin/wiican:218 ../wiican/ui/editordlg.py:266
+#: ../bin/wiican:252 ../wiican/ui/editordlg.py:267
 msgid "Press 1+2"
-msgstr "Calca 1+2"
+msgstr "Primi 1+2"
 
-#: ../bin/wiican:219 ../wiican/ui/editordlg.py:267
+#: ../bin/wiican:253 ../wiican/ui/editordlg.py:268
 msgid "To put you Wiimote in discoverable mode now"
 msgstr "Pa poner agora'l Wiimote en mou descubrible"
 
-#: ../bin/wiican:239 ../wiican/mapping/manager.py:106
+#: ../bin/wiican:273 ../wiican/mapping/manager.py:106
 #, python-format
 msgid "Not %s file found on wiican package"
 msgstr "Nun s'atopÃ'l ficheru %s nel paquete de mapÃu wiican"
 
-#: ../bin/wiican:243 ../wiican/mapping/manager.py:110
+#: ../bin/wiican:277 ../wiican/mapping/manager.py:110
 #, python-format
 msgid "Not %s file found  on wiican package"
 msgstr "Nun s'atopÃ'l ficheru %s nel paquete de mapÃu wiican"
 
-#: ../bin/wiican:282
+#: ../bin/wiican:316
 msgid "Wiican Mapping Package load failed!"
 msgstr "Fallà la carga del paquete de mapÃu wiican"
 
-#: ../bin/wiican:289
+#: ../bin/wiican:323
 msgid "usage: %prog [options] arg"
 msgstr "usu: %prog [opciones] arg"
 
-#: ../bin/wiican:291
+#: ../bin/wiican:325
 msgid "loads mapping package from FILENAME"
 msgstr "carga'l paquete de mapeos dende FILENAME"
 
-#: ../bin/wiican:310
+#: ../bin/wiican:344
 #, python-format
 msgid "No wiican package mapping found: %s"
-msgstr "Nun s'atopÃ'l paquete de mapÃu wiican: %s"
+msgstr "Nun s'atopÃ'l paquete mapÃu Wiican: %s"
 
-#: ../wiican/ui/managerdlg.py:38
+#: ../wiican/ui/managerdlg.py:43
 msgid "Wiican Mapping Package"
-msgstr "Paquete de MapÃu Wiican"
+msgstr "Paquete MapÃu Wiican"
 
-#: ../wiican/ui/managerdlg.py:88
+#: ../wiican/ui/managerdlg.py:111
 msgid "Editing new mapping"
 msgstr "Editando mapÃu nuevu"
 
-#: ../wiican/ui/managerdlg.py:143
+#: ../wiican/ui/managerdlg.py:179
 msgid "Are you sure you want to completely remove this mapping?"
 msgstr "ÂDe xuru quies desaniciar esti mapÃu dafechu?"
 
-#: ../wiican/ui/managerdlg.py:152
+#: ../wiican/ui/managerdlg.py:188
 msgid "Deleting mappings"
 msgstr "Esborrando mapeos"
 
-#: ../wiican/ui/managerdlg.py:179
+#: ../wiican/ui/managerdlg.py:217
 msgid "Import mapping..."
 msgstr "Importar mapÃu..."
 
-#: ../wiican/ui/managerdlg.py:197
+#: ../wiican/ui/managerdlg.py:235
 msgid "Wiican Mapping Package import failed!"
 msgstr "Fallà la importaciÃn del paquete de mapÃu wiican"
 
-#: ../wiican/ui/managerdlg.py:227
+#: ../wiican/ui/managerdlg.py:265
 msgid "Exporting mapping..."
 msgstr "Esportando mapÃu..."
 
 #: ../wiican/ui/editordlg.py:50
 msgid "Select image icon.."
-msgstr "Seleiciona iconu.."
+msgstr "Esbilla iconu"
 
 #: ../wiican/ui/editordlg.py:80
 msgid "Images"
-msgstr "ImÃxenes"
+msgstr "Semeyes"
 
 #: ../wiican/ui/editordlg.py:171
 msgid "A mapping is running"
-msgstr "Hai un mapÃu corriendo"
+msgstr "Hai un mapÃu furrulando"
 
 #: ../wiican/ui/editordlg.py:176
 msgid "Execute this mapping"
@@ -129,146 +118,149 @@ msgid "Ensure a bluetooth "
 msgstr "AsegÃrate que'l bluetoobh "
 
 #: ../wiican/mapping/manager.py:131 ../wiican/mapping/manager.py:171
-#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:184
-#: ../wiican/mapping/manager.py:192 ../wiican/mapping/manager.py:200
-#: ../wiican/mapping/manager.py:218 ../wiican/mapping/manager.py:232
-#: ../wiican/mapping/manager.py:238
+#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:193
+#: ../wiican/mapping/manager.py:201 ../wiican/mapping/manager.py:209
+#: ../wiican/mapping/manager.py:225 ../wiican/mapping/manager.py:248
+#: ../wiican/mapping/manager.py:262 ../wiican/mapping/manager.py:268
 msgid "Mapping not found:"
 msgstr "MapÃu nun atopÃu:"
 
-#: ../wiican/mapping/manager.py:221
+#: ../wiican/mapping/manager.py:251
 msgid "Cannot remove a system installed mapping"
-msgstr "Nun se pue desaniciar el mapÃu instalÃu nel sistema"
+msgstr "Nun pue esnicase'l mapÃu allugÃu nel sistema"
 
-#: ../data/mapping.ui:21
-msgid "Wiican mappings"
-msgstr "Mapeos Wiican"
-
-#: ../data/mapping.ui:44
-msgid "toolbutton1"
-msgstr "toolbutton1"
-
-#: ../data/mapping.ui:57
-msgid "toolbutton2"
-msgstr "toolbutton2"
-
-#: ../data/mapping.ui:70
-msgid "toolbutton3"
-msgstr "toolbutton3"
-
-#: ../data/mapping.ui:92
-msgid "toolbutton4"
-msgstr "toolbutton4"
-
-#: ../data/mapping.ui:105
-msgid "toolbutton5"
-msgstr "toolbutton5"
-
-#: ../data/mapping.ui:314
-msgid "_Name:"
-msgstr "_Nome:"
-
-#: ../data/mapping.ui:326
-msgid "Co_mment:"
-msgstr "Co_mentariu:"
-
-#: ../data/mapping.ui:337
-msgid "A_uthor/s:"
-msgstr "A_utor/es:"
-
-#: ../data/mapping.ui:348
-msgid "_Version:"
-msgstr "_VersiÃn:"
-
-#: ../data/mapping.ui:443
-msgid "_Icon:"
-msgstr "_Iconu:"
+#: ../data/mapping.ui:5
+#, fuzzy
+msgid "Autostart running this mapping"
+msgstr "Executa esti mapÃu"
 
-#: ../data/mapping.ui:466
-msgid "<b>General</b>"
-msgstr "<b>Xeneral</b>"
+#: ../data/mapping.ui:6 ../data/mapping.ui:651
+msgid "_Autostart"
+msgstr ""
 
-#: ../data/mapping.ui:539
-msgid ""
-"This is a system installed mapping. \n"
-"Changes will be saved in a new mapping."
+#: ../data/mapping.ui:7
+msgid "Launch this mapping automatically at desktop session start"
 msgstr ""
-"Esti ye un mapÃu instalÃu del sistema.\n"
-"Los cambios van guardase nun mapÃu nuevu.."
 
-#: ../data/mapping.ui:565
-msgid "Execute mapping"
-msgstr "Executar mapÃu"
+#: ../data/mapping.ui:11
+msgid "Delete mapping"
+msgstr "Esborrando mapeos"
 
-#: ../data/mapping.ui:586
-msgid "Mapping programming help"
-msgstr "Ayuda de programaciÃn de mapeos"
+#: ../data/mapping.ui:12
+msgid "_Delete"
+msgstr "_Esborrar"
 
-#: ../data/mapping.ui:620
-msgid "<b>Mapping</b>"
-msgstr "<b>MapÃu</b>"
+#: ../data/mapping.ui:13
+#, fuzzy
+msgid "Remove mapping from the catalog"
+msgstr "Desanicia'l mapÃu del catÃlogu"
 
-#: ../data/mapping.ui:684
+#: ../data/mapping.ui:18
 msgid "Edit mapping"
 msgstr "Editar mapÃu"
 
-#: ../data/mapping.ui:685
+#: ../data/mapping.ui:19 ../data/mapping.ui:620
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../data/mapping.ui:686
+#: ../data/mapping.ui:20
 msgid "Edit mapping properties"
 msgstr "Editar propiedaes del mapÃu"
 
-#: ../data/mapping.ui:691
-msgid "Delete mapping"
-msgstr "Esborrando mapeos"
+#: ../data/mapping.ui:25
+msgid "_Export mapping"
+msgstr "_Esportar mapÃu"
 
-#: ../data/mapping.ui:692
-msgid "_Delete"
-msgstr "_Esborrar"
+#: ../data/mapping.ui:26 ../data/mapping.ui:692
+msgid "E_xport"
+msgstr "_Esportar"
 
-#: ../data/mapping.ui:693
-msgid "Removes the mapping from the catalog"
-msgstr "Desanicia'l mapÃu del catÃlogu"
+#: ../data/mapping.ui:27
+msgid "Export mapping as a .wii file"
+msgstr "Exportar mapÃu con ficheru .wii"
 
-#: ../data/mapping.ui:698
+#: ../data/mapping.ui:32
 msgid "Import mapping"
 msgstr "Importar mapÃu"
 
-#: ../data/mapping.ui:699
+#: ../data/mapping.ui:33 ../data/mapping.ui:676
 msgid "_Import"
 msgstr "_Importar"
 
-#: ../data/mapping.ui:700
+#: ../data/mapping.ui:34
 msgid "Import a mapping from a .wii file"
 msgstr "Importar un mapÃu dende un ficheru .wii"
 
-#: ../data/mapping.ui:705
-msgid "_Export mapping"
-msgstr "_Esportar mapÃu"
-
-#: ../data/mapping.ui:706
-msgid "E_xport"
-msgstr "_Esportar"
-
-#: ../data/mapping.ui:707
-msgid "Export mapping as a .wii file"
-msgstr "Exportar mapÃu con ficheru .wii"
-
-#: ../data/mapping.ui:712
+#: ../data/mapping.ui:39
 msgid "New mapping"
 msgstr "MapÃu Nuevu"
 
-#: ../data/mapping.ui:713
+#: ../data/mapping.ui:40 ../data/mapping.ui:604
 msgid "_New"
 msgstr "_Nuevu"
 
-#: ../data/mapping.ui:714
-msgid "Creates a new mapping"
+#: ../data/mapping.ui:41
+#, fuzzy
+msgid "Create a new mapping"
 msgstr "Crea un mapÃu nuevu"
 
-#: ../data/wiimotemanager.ui:13
+#: ../data/mapping.ui:146
+msgid "_Name:"
+msgstr "_Nome:"
+
+#: ../data/mapping.ui:160
+msgid "Co_mment:"
+msgstr "Co_mentariu:"
+
+#: ../data/mapping.ui:174
+msgid "A_uthor/s:"
+msgstr "A_utor/es:"
+
+#: ../data/mapping.ui:188
+msgid "_Version:"
+msgstr "_VersiÃn:"
+
+#: ../data/mapping.ui:298
+msgid "_Icon:"
+msgstr "_Iconu:"
+
+#: ../data/mapping.ui:325
+msgid "<b>General</b>"
+msgstr "<b>Xeneral</b>"
+
+#: ../data/mapping.ui:384
+msgid "Mapping programming help"
+msgstr "Aida programaciÃn mapeos"
+
+#: ../data/mapping.ui:402
+msgid "Execute mapping"
+msgstr "Executar mapÃu"
+
+#: ../data/mapping.ui:454
+msgid ""
+"This is a system installed mapping. \n"
+"Changes will be saved in a new mapping."
+msgstr ""
+"Esti ye un mapÃu allugÃu nel sistema. \n"
+"Les camudancies atroxaranse nun nuevu mapÃu."
+
+#: ../data/mapping.ui:496
+msgid "<b>Mapping</b>"
+msgstr "<b>MapÃu</b>"
+
+#: ../data/mapping.ui:540
+msgid "Wiican mappings"
+msgstr "Mapeos Wiican"
+
+#: ../data/wiimotemanager.ui:7
+msgid "Mapping validation failed"
+msgstr "Fallà la validaciÃn de mapÃu"
+
+#: ../data/wiimotemanager.ui:87
+msgid "It looks the activated mapping contains errors."
+msgstr "Parez que'l mapÃu activÃu contiÃn fallos."
+
+#: ../data/wiimotemanager.ui:120
 msgid ""
 "Yes wii can\n"
 "Wiimote usage assistant and mapping manager"
@@ -276,20 +268,44 @@ msgstr ""
 "Yes wii can\n"
 "Asistente d'usu de Wiimote y xestor de mapeos"
 
-#: ../data/wiimotemanager.ui:726
+#: ../data/wiimotemanager.ui:921
 msgid "Edit mappings..."
 msgstr "Editar mapeos..."
 
-#: ../data/wiimotemanager.ui:759
-msgid "Mapping validation failed"
-msgstr "Fallà la validaciÃn de mapÃu"
+#: ../data/wiimotemanager.ui:935
+msgid "Show mappings on startup"
+msgstr "Amosar controles nel aniciu"
 
-#: ../data/wiimotemanager.ui:788
-msgid "It looks the activated mapping contains errors."
-msgstr "Parez que'l mapÃu activÃu contiÃn fallos."
+#~ msgid "toolbutton1"
+#~ msgstr "toolbutton1"
+
+#~ msgid "toolbutton2"
+#~ msgstr "toolbutton2"
+
+#~ msgid "toolbutton3"
+#~ msgstr "toolbutton3"
+
+#~ msgid "toolbutton4"
+#~ msgstr "toolbutton4"
+
+#~ msgid "toolbutton5"
+#~ msgstr "toolbutton5"
 
 #~ msgid "Wiimote mappings"
 #~ msgstr "Mapeos de Wiimote"
 
 #~ msgid "<b>Mappings</b>"
 #~ msgstr "<b>Mapeos</b>"
+
+#~ msgid ""
+#~ "Hold left button for use wiimote\n"
+#~ "Right button for menu"
+#~ msgstr ""
+#~ "CaltÃn calcÃu'l botÃn izquierdu pa usar wiimote\n"
+#~ "BotÃn drechu pal menÃ"
+
+#~ msgid "Discovering Wiimote"
+#~ msgstr "Descubriendo Wiimote"
+
+#~ msgid "Add visible mappings"
+#~ msgstr "Amiesta mapeos visibles"
diff --git a/po/ca.po b/po/ca.po
index 9e53f37..0a93c40 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,105 +7,93 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wiican\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-13 14:38+0100\n"
+"POT-Creation-Date: 2012-08-16 14:27+0200\n"
 "PO-Revision-Date: 2011-03-12 15:56+0000\n"
 "Last-Translator: oriolsbd <oriolsbd yahoo es>\n"
 "Language-Team: Catalan <ca li org>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-07 23:04+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
-"Language: ca\n"
+"X-Launchpad-Export-Date: 2012-08-16 12:08+0000\n"
+"X-Generator: Launchpad (build 15810)\n"
 
-#: ../bin/wiican:102
+#: ../bin/wiican:134
 msgid "Plug a bluetooth adapter"
 msgstr "Connecteu un adaptador Bluetooth"
 
-#: ../bin/wiican:107
+#: ../bin/wiican:142
 msgid "Please load uinput module first"
 msgstr "Carregueu primer el mÃdul uinput"
 
-#: ../bin/wiican:113
-msgid ""
-"Hold left button for use wiimote\n"
-"Right button for menu"
+#: ../bin/wiican:196
+msgid "Set some visible mappings"
 msgstr ""
-"Mantingueu premut el botà esquerra per a utilitzar el Wiimote o el bot dret "
-"per accedir al menÃ."
-
-#: ../bin/wiican:125
-msgid "Discovering Wiimote"
-msgstr "S'està cercant el Wiimote"
 
-#: ../bin/wiican:160
-msgid "Add visible mappings"
-msgstr "Afegeix el mapeig visible"
-
-#: ../bin/wiican:205 ../wiican/ui/editordlg.py:148
+#: ../bin/wiican:239 ../wiican/ui/editordlg.py:148
 msgid "Editing "
 msgstr "S'està editant "
 
-#: ../bin/wiican:218 ../wiican/ui/editordlg.py:266
+#: ../bin/wiican:252 ../wiican/ui/editordlg.py:267
 msgid "Press 1+2"
 msgstr "Premeu 1+2"
 
-#: ../bin/wiican:219 ../wiican/ui/editordlg.py:267
+#: ../bin/wiican:253 ../wiican/ui/editordlg.py:268
 msgid "To put you Wiimote in discoverable mode now"
 msgstr "Posar el vostre Wiimote en mode descobriment ara"
 
-#: ../bin/wiican:239 ../wiican/mapping/manager.py:106
+#: ../bin/wiican:273 ../wiican/mapping/manager.py:106
 #, python-format
 msgid "Not %s file found on wiican package"
 msgstr "No s'ha trobat el fitxer %s al paquet del wiican"
 
-#: ../bin/wiican:243 ../wiican/mapping/manager.py:110
+#: ../bin/wiican:277 ../wiican/mapping/manager.py:110
 #, python-format
 msgid "Not %s file found  on wiican package"
 msgstr "No s'ha trobat el fitxer %s al paquet del wiican"
 
-#: ../bin/wiican:282
+#: ../bin/wiican:316
 msgid "Wiican Mapping Package load failed!"
 msgstr "Ha fallat la cÃrrega del paquet de mapeig de Wiican."
 
-#: ../bin/wiican:289
+#: ../bin/wiican:323
 msgid "usage: %prog [options] arg"
 msgstr "Ãs: %prog [opcions] arguments"
 
-#: ../bin/wiican:291
+#: ../bin/wiican:325
 msgid "loads mapping package from FILENAME"
 msgstr "carrega el paquet de mapeig de NOM_DE_FITXER"
 
-#: ../bin/wiican:310
+#: ../bin/wiican:344
 #, python-format
 msgid "No wiican package mapping found: %s"
 msgstr "No s'ha trobat el paquet de mapeig de wiican: %s"
 
-#: ../wiican/ui/managerdlg.py:38
+#: ../wiican/ui/managerdlg.py:43
 msgid "Wiican Mapping Package"
 msgstr "Paquet de mapeig de Wiican"
 
-#: ../wiican/ui/managerdlg.py:88
+#: ../wiican/ui/managerdlg.py:111
 msgid "Editing new mapping"
 msgstr "S'està editant un nou mapeig"
 
-#: ../wiican/ui/managerdlg.py:143
+#: ../wiican/ui/managerdlg.py:179
 msgid "Are you sure you want to completely remove this mapping?"
 msgstr "Esteu segur que voleu eliminar aquest mapeig?"
 
-#: ../wiican/ui/managerdlg.py:152
+#: ../wiican/ui/managerdlg.py:188
 msgid "Deleting mappings"
 msgstr "S'està esborrant els mapatges"
 
-#: ../wiican/ui/managerdlg.py:179
+#: ../wiican/ui/managerdlg.py:217
 msgid "Import mapping..."
 msgstr "S'està important el mapeig..."
 
-#: ../wiican/ui/managerdlg.py:197
+#: ../wiican/ui/managerdlg.py:235
 msgid "Wiican Mapping Package import failed!"
 msgstr "Ha fallat la importacià del paquet de mapeig de wiican."
 
-#: ../wiican/ui/managerdlg.py:227
+#: ../wiican/ui/managerdlg.py:265
 msgid "Exporting mapping..."
 msgstr "S'està exportant el mapeig..."
 
@@ -130,66 +118,125 @@ msgid "Ensure a bluetooth "
 msgstr "Assegura un bluetooth "
 
 #: ../wiican/mapping/manager.py:131 ../wiican/mapping/manager.py:171
-#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:184
-#: ../wiican/mapping/manager.py:192 ../wiican/mapping/manager.py:200
-#: ../wiican/mapping/manager.py:218 ../wiican/mapping/manager.py:232
-#: ../wiican/mapping/manager.py:238
+#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:193
+#: ../wiican/mapping/manager.py:201 ../wiican/mapping/manager.py:209
+#: ../wiican/mapping/manager.py:225 ../wiican/mapping/manager.py:248
+#: ../wiican/mapping/manager.py:262 ../wiican/mapping/manager.py:268
 msgid "Mapping not found:"
 msgstr "No s'ha trobat el mapeig:"
 
-#: ../wiican/mapping/manager.py:221
+#: ../wiican/mapping/manager.py:251
 msgid "Cannot remove a system installed mapping"
 msgstr "No es pot eliminar un mapeig instalÂlat al sistema"
 
-#: ../data/mapping.ui:21
-msgid "Wiican mappings"
-msgstr "Mapejos de wiican"
+#: ../data/mapping.ui:5
+#, fuzzy
+msgid "Autostart running this mapping"
+msgstr "Executa aquest mapeig"
 
-#: ../data/mapping.ui:44
-msgid "toolbutton1"
-msgstr "botÃ1"
+#: ../data/mapping.ui:6 ../data/mapping.ui:651
+msgid "_Autostart"
+msgstr ""
 
-#: ../data/mapping.ui:57
-msgid "toolbutton2"
-msgstr "botÃ2"
+#: ../data/mapping.ui:7
+msgid "Launch this mapping automatically at desktop session start"
+msgstr ""
 
-#: ../data/mapping.ui:70
-msgid "toolbutton3"
-msgstr "botÃ3"
+#: ../data/mapping.ui:11
+msgid "Delete mapping"
+msgstr "Elimina el mapeig"
 
-#: ../data/mapping.ui:92
-msgid "toolbutton4"
-msgstr "botÃ4"
+#: ../data/mapping.ui:12
+msgid "_Delete"
+msgstr "_Elimina"
 
-#: ../data/mapping.ui:105
-msgid "toolbutton5"
-msgstr "botÃ5"
+#: ../data/mapping.ui:13
+#, fuzzy
+msgid "Remove mapping from the catalog"
+msgstr "Elimina el mapeig del catÃleg"
+
+#: ../data/mapping.ui:18
+msgid "Edit mapping"
+msgstr "Edita el mapeig"
 
-#: ../data/mapping.ui:314
+#: ../data/mapping.ui:19 ../data/mapping.ui:620
+msgid "_Edit"
+msgstr "_Edita"
+
+#: ../data/mapping.ui:20
+msgid "Edit mapping properties"
+msgstr "Edita les propietats del mapeig"
+
+#: ../data/mapping.ui:25
+msgid "_Export mapping"
+msgstr "_Exporta el mapeig"
+
+#: ../data/mapping.ui:26 ../data/mapping.ui:692
+msgid "E_xport"
+msgstr "E_xporta"
+
+#: ../data/mapping.ui:27
+msgid "Export mapping as a .wii file"
+msgstr "Exporta el mapeig com a fitxer .wii"
+
+#: ../data/mapping.ui:32
+msgid "Import mapping"
+msgstr "Importa el mapeig"
+
+#: ../data/mapping.ui:33 ../data/mapping.ui:676
+msgid "_Import"
+msgstr "_Importa"
+
+#: ../data/mapping.ui:34
+msgid "Import a mapping from a .wii file"
+msgstr "Importa un mapeig d'un fitxer .wii"
+
+#: ../data/mapping.ui:39
+msgid "New mapping"
+msgstr "Mapeig nou"
+
+#: ../data/mapping.ui:40 ../data/mapping.ui:604
+msgid "_New"
+msgstr "_Nou"
+
+#: ../data/mapping.ui:41
+#, fuzzy
+msgid "Create a new mapping"
+msgstr "Crea un nou mapeig"
+
+#: ../data/mapping.ui:146
 msgid "_Name:"
 msgstr "_Nom:"
 
-#: ../data/mapping.ui:326
+#: ../data/mapping.ui:160
 msgid "Co_mment:"
 msgstr "Co_mentari:"
 
-#: ../data/mapping.ui:337
+#: ../data/mapping.ui:174
 msgid "A_uthor/s:"
 msgstr "A_utor/s:"
 
-#: ../data/mapping.ui:348
+#: ../data/mapping.ui:188
 msgid "_Version:"
 msgstr "_VersiÃ"
 
-#: ../data/mapping.ui:443
+#: ../data/mapping.ui:298
 msgid "_Icon:"
 msgstr "_Icona:"
 
-#: ../data/mapping.ui:466
+#: ../data/mapping.ui:325
 msgid "<b>General</b>"
 msgstr "<b>General</b>"
 
-#: ../data/mapping.ui:539
+#: ../data/mapping.ui:384
+msgid "Mapping programming help"
+msgstr "Ajuda del programa de mapeig"
+
+#: ../data/mapping.ui:402
+msgid "Execute mapping"
+msgstr "Executa el mapeig"
+
+#: ../data/mapping.ui:454
 msgid ""
 "This is a system installed mapping. \n"
 "Changes will be saved in a new mapping."
@@ -197,79 +244,23 @@ msgstr ""
 "Aixà Ãs un mapeig instaÅlat al sistema. \n"
 "Es desaran els canvis en un mapeig nou."
 
-#: ../data/mapping.ui:565
-msgid "Execute mapping"
-msgstr "Executa el mapeig"
-
-#: ../data/mapping.ui:586
-msgid "Mapping programming help"
-msgstr "Ajuda del programa de mapeig"
-
-#: ../data/mapping.ui:620
+#: ../data/mapping.ui:496
 msgid "<b>Mapping</b>"
 msgstr "<b>Mapeig</b>"
 
-#: ../data/mapping.ui:684
-msgid "Edit mapping"
-msgstr "Edita el mapeig"
-
-#: ../data/mapping.ui:685
-msgid "_Edit"
-msgstr "_Edita"
-
-#: ../data/mapping.ui:686
-msgid "Edit mapping properties"
-msgstr "Edita les propietats del mapeig"
-
-#: ../data/mapping.ui:691
-msgid "Delete mapping"
-msgstr "Elimina el mapeig"
-
-#: ../data/mapping.ui:692
-msgid "_Delete"
-msgstr "_Elimina"
-
-#: ../data/mapping.ui:693
-msgid "Removes the mapping from the catalog"
-msgstr "Elimina el mapeig del catÃleg"
-
-#: ../data/mapping.ui:698
-msgid "Import mapping"
-msgstr "Importa el mapeig"
-
-#: ../data/mapping.ui:699
-msgid "_Import"
-msgstr "_Importa"
-
-#: ../data/mapping.ui:700
-msgid "Import a mapping from a .wii file"
-msgstr "Importa un mapeig d'un fitxer .wii"
-
-#: ../data/mapping.ui:705
-msgid "_Export mapping"
-msgstr "_Exporta el mapeig"
-
-#: ../data/mapping.ui:706
-msgid "E_xport"
-msgstr "E_xporta"
-
-#: ../data/mapping.ui:707
-msgid "Export mapping as a .wii file"
-msgstr "Exporta el mapeig com a fitxer .wii"
-
-#: ../data/mapping.ui:712
-msgid "New mapping"
-msgstr "Mapeig nou"
+#: ../data/mapping.ui:540
+msgid "Wiican mappings"
+msgstr "Mapejos de wiican"
 
-#: ../data/mapping.ui:713
-msgid "_New"
-msgstr "_Nou"
+#: ../data/wiimotemanager.ui:7
+msgid "Mapping validation failed"
+msgstr "Ha fallat la validacià del mapeig"
 
-#: ../data/mapping.ui:714
-msgid "Creates a new mapping"
-msgstr "Crea un nou mapeig"
+#: ../data/wiimotemanager.ui:87
+msgid "It looks the activated mapping contains errors."
+msgstr "Sembla que el mapeig que heu activat contà errors."
 
-#: ../data/wiimotemanager.ui:13
+#: ../data/wiimotemanager.ui:120
 msgid ""
 "Yes wii can\n"
 "Wiimote usage assistant and mapping manager"
@@ -277,17 +268,41 @@ msgstr ""
 "Wiican\n"
 "Assistent d'Ãs i gestor de mapejos del WiiMote"
 
-#: ../data/wiimotemanager.ui:726
+#: ../data/wiimotemanager.ui:921
 msgid "Edit mappings..."
 msgstr "Edita els mapejos..."
 
-#: ../data/wiimotemanager.ui:759
-msgid "Mapping validation failed"
-msgstr "Ha fallat la validacià del mapeig"
+#: ../data/wiimotemanager.ui:935
+msgid "Show mappings on startup"
+msgstr ""
 
-#: ../data/wiimotemanager.ui:788
-msgid "It looks the activated mapping contains errors."
-msgstr "Sembla que el mapeig que heu activat contà errors."
+#~ msgid "toolbutton1"
+#~ msgstr "botÃ1"
+
+#~ msgid "toolbutton2"
+#~ msgstr "botÃ2"
+
+#~ msgid "toolbutton3"
+#~ msgstr "botÃ3"
+
+#~ msgid "toolbutton4"
+#~ msgstr "botÃ4"
+
+#~ msgid "toolbutton5"
+#~ msgstr "botÃ5"
+
+#~ msgid "Discovering Wiimote"
+#~ msgstr "S'està cercant el Wiimote"
 
 #~ msgid "Wiimote mappings"
 #~ msgstr "Mapatges del Wiimote"
+
+#~ msgid "Add visible mappings"
+#~ msgstr "Afegeix el mapeig visible"
+
+#~ msgid ""
+#~ "Hold left button for use wiimote\n"
+#~ "Right button for menu"
+#~ msgstr ""
+#~ "Mantingueu premut el botà esquerra per a utilitzar el Wiimote o el bot "
+#~ "dret per accedir al menÃ."
diff --git a/po/da.po b/po/da.po
index 6076143..aa2fa8d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,105 +7,93 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wiican\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-13 14:38+0100\n"
+"POT-Creation-Date: 2012-08-16 14:27+0200\n"
 "PO-Revision-Date: 2011-02-13 16:35+0000\n"
 "Last-Translator: Wiican Team <wiican-list gnome org>\n"
 "Language-Team: Danish <da li org>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-07 23:04+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
-"Language: da\n"
+"X-Launchpad-Export-Date: 2012-08-16 12:08+0000\n"
+"X-Generator: Launchpad (build 15810)\n"
 
-#: ../bin/wiican:102
+#: ../bin/wiican:134
 msgid "Plug a bluetooth adapter"
 msgstr "IndsÃt en bluetooth adapter"
 
-#: ../bin/wiican:107
+#: ../bin/wiican:142
 msgid "Please load uinput module first"
 msgstr ""
 
-#: ../bin/wiican:113
-msgid ""
-"Hold left button for use wiimote\n"
-"Right button for menu"
+#: ../bin/wiican:196
+msgid "Set some visible mappings"
 msgstr ""
-"Tryk venstre knappen for at bruge Wii controlleren\n"
-"HÃjre knappen for menu"
 
-#: ../bin/wiican:125
-msgid "Discovering Wiimote"
-msgstr "SÃger efter Wii controlleren"
-
-#: ../bin/wiican:160
-msgid "Add visible mappings"
-msgstr ""
-
-#: ../bin/wiican:205 ../wiican/ui/editordlg.py:148
+#: ../bin/wiican:239 ../wiican/ui/editordlg.py:148
 msgid "Editing "
 msgstr "Redigerer "
 
-#: ../bin/wiican:218 ../wiican/ui/editordlg.py:266
+#: ../bin/wiican:252 ../wiican/ui/editordlg.py:267
 msgid "Press 1+2"
 msgstr ""
 
-#: ../bin/wiican:219 ../wiican/ui/editordlg.py:267
+#: ../bin/wiican:253 ../wiican/ui/editordlg.py:268
 msgid "To put you Wiimote in discoverable mode now"
 msgstr ""
 
-#: ../bin/wiican:239 ../wiican/mapping/manager.py:106
+#: ../bin/wiican:273 ../wiican/mapping/manager.py:106
 #, python-format
 msgid "Not %s file found on wiican package"
 msgstr ""
 
-#: ../bin/wiican:243 ../wiican/mapping/manager.py:110
+#: ../bin/wiican:277 ../wiican/mapping/manager.py:110
 #, python-format
 msgid "Not %s file found  on wiican package"
 msgstr ""
 
-#: ../bin/wiican:282
+#: ../bin/wiican:316
 msgid "Wiican Mapping Package load failed!"
 msgstr ""
 
-#: ../bin/wiican:289
+#: ../bin/wiican:323
 msgid "usage: %prog [options] arg"
 msgstr ""
 
-#: ../bin/wiican:291
+#: ../bin/wiican:325
 msgid "loads mapping package from FILENAME"
 msgstr ""
 
-#: ../bin/wiican:310
+#: ../bin/wiican:344
 #, python-format
 msgid "No wiican package mapping found: %s"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:38
+#: ../wiican/ui/managerdlg.py:43
 msgid "Wiican Mapping Package"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:88
+#: ../wiican/ui/managerdlg.py:111
 msgid "Editing new mapping"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:143
+#: ../wiican/ui/managerdlg.py:179
 msgid "Are you sure you want to completely remove this mapping?"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:152
+#: ../wiican/ui/managerdlg.py:188
 msgid "Deleting mappings"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:179
+#: ../wiican/ui/managerdlg.py:217
 msgid "Import mapping..."
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:197
+#: ../wiican/ui/managerdlg.py:235
 msgid "Wiican Mapping Package import failed!"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:227
+#: ../wiican/ui/managerdlg.py:265
 msgid "Exporting mapping..."
 msgstr ""
 
@@ -130,157 +118,163 @@ msgid "Ensure a bluetooth "
 msgstr ""
 
 #: ../wiican/mapping/manager.py:131 ../wiican/mapping/manager.py:171
-#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:184
-#: ../wiican/mapping/manager.py:192 ../wiican/mapping/manager.py:200
-#: ../wiican/mapping/manager.py:218 ../wiican/mapping/manager.py:232
-#: ../wiican/mapping/manager.py:238
+#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:193
+#: ../wiican/mapping/manager.py:201 ../wiican/mapping/manager.py:209
+#: ../wiican/mapping/manager.py:225 ../wiican/mapping/manager.py:248
+#: ../wiican/mapping/manager.py:262 ../wiican/mapping/manager.py:268
 msgid "Mapping not found:"
 msgstr ""
 
-#: ../wiican/mapping/manager.py:221
+#: ../wiican/mapping/manager.py:251
 msgid "Cannot remove a system installed mapping"
 msgstr ""
 
-#: ../data/mapping.ui:21
-msgid "Wiican mappings"
+#: ../data/mapping.ui:5
+msgid "Autostart running this mapping"
 msgstr ""
 
-#: ../data/mapping.ui:44
-msgid "toolbutton1"
+#: ../data/mapping.ui:6 ../data/mapping.ui:651
+msgid "_Autostart"
 msgstr ""
 
-#: ../data/mapping.ui:57
-msgid "toolbutton2"
+#: ../data/mapping.ui:7
+msgid "Launch this mapping automatically at desktop session start"
 msgstr ""
 
-#: ../data/mapping.ui:70
-msgid "toolbutton3"
+#: ../data/mapping.ui:11
+msgid "Delete mapping"
 msgstr ""
 
-#: ../data/mapping.ui:92
-msgid "toolbutton4"
+#: ../data/mapping.ui:12
+msgid "_Delete"
 msgstr ""
 
-#: ../data/mapping.ui:105
-msgid "toolbutton5"
+#: ../data/mapping.ui:13
+msgid "Remove mapping from the catalog"
 msgstr ""
 
-#: ../data/mapping.ui:314
-msgid "_Name:"
+#: ../data/mapping.ui:18
+msgid "Edit mapping"
 msgstr ""
 
-#: ../data/mapping.ui:326
-msgid "Co_mment:"
+#: ../data/mapping.ui:19 ../data/mapping.ui:620
+msgid "_Edit"
 msgstr ""
 
-#: ../data/mapping.ui:337
-msgid "A_uthor/s:"
+#: ../data/mapping.ui:20
+msgid "Edit mapping properties"
 msgstr ""
 
-#: ../data/mapping.ui:348
-msgid "_Version:"
+#: ../data/mapping.ui:25
+msgid "_Export mapping"
 msgstr ""
 
-#: ../data/mapping.ui:443
-msgid "_Icon:"
+#: ../data/mapping.ui:26 ../data/mapping.ui:692
+msgid "E_xport"
 msgstr ""
 
-#: ../data/mapping.ui:466
-msgid "<b>General</b>"
+#: ../data/mapping.ui:27
+msgid "Export mapping as a .wii file"
 msgstr ""
 
-#: ../data/mapping.ui:539
-msgid ""
-"This is a system installed mapping. \n"
-"Changes will be saved in a new mapping."
+#: ../data/mapping.ui:32
+msgid "Import mapping"
 msgstr ""
 
-#: ../data/mapping.ui:565
-msgid "Execute mapping"
+#: ../data/mapping.ui:33 ../data/mapping.ui:676
+msgid "_Import"
 msgstr ""
 
-#: ../data/mapping.ui:586
-msgid "Mapping programming help"
+#: ../data/mapping.ui:34
+msgid "Import a mapping from a .wii file"
 msgstr ""
 
-#: ../data/mapping.ui:620
-msgid "<b>Mapping</b>"
+#: ../data/mapping.ui:39
+msgid "New mapping"
 msgstr ""
 
-#: ../data/mapping.ui:684
-msgid "Edit mapping"
+#: ../data/mapping.ui:40 ../data/mapping.ui:604
+msgid "_New"
 msgstr ""
 
-#: ../data/mapping.ui:685
-msgid "_Edit"
+#: ../data/mapping.ui:41
+msgid "Create a new mapping"
 msgstr ""
 
-#: ../data/mapping.ui:686
-msgid "Edit mapping properties"
+#: ../data/mapping.ui:146
+msgid "_Name:"
 msgstr ""
 
-#: ../data/mapping.ui:691
-msgid "Delete mapping"
+#: ../data/mapping.ui:160
+msgid "Co_mment:"
 msgstr ""
 
-#: ../data/mapping.ui:692
-msgid "_Delete"
+#: ../data/mapping.ui:174
+msgid "A_uthor/s:"
 msgstr ""
 
-#: ../data/mapping.ui:693
-msgid "Removes the mapping from the catalog"
+#: ../data/mapping.ui:188
+msgid "_Version:"
 msgstr ""
 
-#: ../data/mapping.ui:698
-msgid "Import mapping"
+#: ../data/mapping.ui:298
+msgid "_Icon:"
 msgstr ""
 
-#: ../data/mapping.ui:699
-msgid "_Import"
+#: ../data/mapping.ui:325
+msgid "<b>General</b>"
 msgstr ""
 
-#: ../data/mapping.ui:700
-msgid "Import a mapping from a .wii file"
+#: ../data/mapping.ui:384
+msgid "Mapping programming help"
 msgstr ""
 
-#: ../data/mapping.ui:705
-msgid "_Export mapping"
+#: ../data/mapping.ui:402
+msgid "Execute mapping"
 msgstr ""
 
-#: ../data/mapping.ui:706
-msgid "E_xport"
+#: ../data/mapping.ui:454
+msgid ""
+"This is a system installed mapping. \n"
+"Changes will be saved in a new mapping."
 msgstr ""
 
-#: ../data/mapping.ui:707
-msgid "Export mapping as a .wii file"
+#: ../data/mapping.ui:496
+msgid "<b>Mapping</b>"
 msgstr ""
 
-#: ../data/mapping.ui:712
-msgid "New mapping"
+#: ../data/mapping.ui:540
+msgid "Wiican mappings"
 msgstr ""
 
-#: ../data/mapping.ui:713
-msgid "_New"
+#: ../data/wiimotemanager.ui:7
+msgid "Mapping validation failed"
 msgstr ""
 
-#: ../data/mapping.ui:714
-msgid "Creates a new mapping"
+#: ../data/wiimotemanager.ui:87
+msgid "It looks the activated mapping contains errors."
 msgstr ""
 
-#: ../data/wiimotemanager.ui:13
+#: ../data/wiimotemanager.ui:120
 msgid ""
 "Yes wii can\n"
 "Wiimote usage assistant and mapping manager"
 msgstr ""
 
-#: ../data/wiimotemanager.ui:726
+#: ../data/wiimotemanager.ui:921
 msgid "Edit mappings..."
 msgstr ""
 
-#: ../data/wiimotemanager.ui:759
-msgid "Mapping validation failed"
+#: ../data/wiimotemanager.ui:935
+msgid "Show mappings on startup"
 msgstr ""
 
-#: ../data/wiimotemanager.ui:788
-msgid "It looks the activated mapping contains errors."
-msgstr ""
+#~ msgid ""
+#~ "Hold left button for use wiimote\n"
+#~ "Right button for menu"
+#~ msgstr ""
+#~ "Tryk venstre knappen for at bruge Wii controlleren\n"
+#~ "HÃjre knappen for menu"
+
+#~ msgid "Discovering Wiimote"
+#~ msgstr "SÃger efter Wii controlleren"
diff --git a/po/de.po b/po/de.po
index 00f94c1..665011f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,111 +7,99 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wiican\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-13 14:38+0100\n"
-"PO-Revision-Date: 2011-02-13 16:28+0000\n"
-"Last-Translator: J. FÃlix OntaÃÃn <Unknown>\n"
+"POT-Creation-Date: 2012-08-16 14:27+0200\n"
+"PO-Revision-Date: 2012-03-23 00:44+0000\n"
+"Last-Translator: Dennis Baudys <Unknown>\n"
 "Language-Team: German <de li org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-07 23:04+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
-"Language: de\n"
+"X-Launchpad-Export-Date: 2012-08-16 12:08+0000\n"
+"X-Generator: Launchpad (build 15810)\n"
 
-#: ../bin/wiican:102
+#: ../bin/wiican:134
 msgid "Plug a bluetooth adapter"
-msgstr "Bluetoothadapter anschlieÃen"
+msgstr "Bitte schlieÃen Sie einen Bluetooth-Adapter an"
 
-#: ../bin/wiican:107
+#: ../bin/wiican:142
 msgid "Please load uinput module first"
 msgstr "Bitte laden Sie zuerst das uinput-Modul"
 
-#: ../bin/wiican:113
-msgid ""
-"Hold left button for use wiimote\n"
-"Right button for menu"
-msgstr ""
-"Linke Maustaste: Wiimote benutzen\n"
-"Rechte Maustaste: MenÃ"
-
-#: ../bin/wiican:125
-msgid "Discovering Wiimote"
-msgstr "Wiimote entdecken"
-
-#: ../bin/wiican:160
-msgid "Add visible mappings"
-msgstr ""
+#: ../bin/wiican:196
+msgid "Set some visible mappings"
+msgstr "setzt sichtbare Zuordnungnen"
 
-#: ../bin/wiican:205 ../wiican/ui/editordlg.py:148
+#: ../bin/wiican:239 ../wiican/ui/editordlg.py:148
 msgid "Editing "
-msgstr "Bearbeiten "
+msgstr "Bearbeiten von "
 
-#: ../bin/wiican:218 ../wiican/ui/editordlg.py:266
+#: ../bin/wiican:252 ../wiican/ui/editordlg.py:267
 msgid "Press 1+2"
 msgstr "DrÃcken Sie 1+2"
 
-#: ../bin/wiican:219 ../wiican/ui/editordlg.py:267
+#: ../bin/wiican:253 ../wiican/ui/editordlg.py:268
 msgid "To put you Wiimote in discoverable mode now"
-msgstr ""
+msgstr "Schalten Sie Ihre Wiimote jetzt in den sichtbaren Modus"
 
-#: ../bin/wiican:239 ../wiican/mapping/manager.py:106
+#: ../bin/wiican:273 ../wiican/mapping/manager.py:106
 #, python-format
 msgid "Not %s file found on wiican package"
-msgstr "Datei %s wurde im wiican-Paket nicht gefunden"
+msgstr "Datei %s wurde nicht im Paket Âwiican gefunden"
 
-#: ../bin/wiican:243 ../wiican/mapping/manager.py:110
+#: ../bin/wiican:277 ../wiican/mapping/manager.py:110
 #, python-format
 msgid "Not %s file found  on wiican package"
-msgstr "Datei %s wurde im wiican-Paket nicht gefunden"
+msgstr "Datei %s wurde nicht im Paket Âwiican gefunden"
 
-#: ../bin/wiican:282
+#: ../bin/wiican:316
 msgid "Wiican Mapping Package load failed!"
-msgstr ""
+msgstr "Wiican-Zuordnungspaket konnte nicht geladen werden!"
 
-#: ../bin/wiican:289
+#: ../bin/wiican:323
 msgid "usage: %prog [options] arg"
 msgstr "Aufruf: %prog [Optionen] Argumente"
 
-#: ../bin/wiican:291
+#: ../bin/wiican:325
 msgid "loads mapping package from FILENAME"
-msgstr ""
+msgstr "LÃdt das Zuordnungspaket aus DATEINAME"
 
-#: ../bin/wiican:310
+#: ../bin/wiican:344
 #, python-format
 msgid "No wiican package mapping found: %s"
-msgstr ""
+msgstr "es konnte kein wiican Zuordnungspaket gefunden werden: %s"
 
-#: ../wiican/ui/managerdlg.py:38
+#: ../wiican/ui/managerdlg.py:43
 msgid "Wiican Mapping Package"
-msgstr ""
+msgstr "Wiican-Zuordnungspaket"
 
-#: ../wiican/ui/managerdlg.py:88
+#: ../wiican/ui/managerdlg.py:111
 msgid "Editing new mapping"
 msgstr "Neue Zuordnung bearbeiten"
 
-#: ../wiican/ui/managerdlg.py:143
+#: ../wiican/ui/managerdlg.py:179
 msgid "Are you sure you want to completely remove this mapping?"
-msgstr ""
+msgstr "Sind Sie sicher, dass Sie diese Zuordnung vollstÃndig lÃschen wollen?"
 
-#: ../wiican/ui/managerdlg.py:152
+#: ../wiican/ui/managerdlg.py:188
 msgid "Deleting mappings"
-msgstr ""
+msgstr "Zuordnungen werden gelÃscht"
 
-#: ../wiican/ui/managerdlg.py:179
+#: ../wiican/ui/managerdlg.py:217
 msgid "Import mapping..."
-msgstr ""
+msgstr "Zuordnung importieren â"
 
-#: ../wiican/ui/managerdlg.py:197
+#: ../wiican/ui/managerdlg.py:235
 msgid "Wiican Mapping Package import failed!"
-msgstr ""
+msgstr "Wiican-Zuordnungspaket konnte nicht importiert werden!"
 
-#: ../wiican/ui/managerdlg.py:227
+#: ../wiican/ui/managerdlg.py:265
 msgid "Exporting mapping..."
-msgstr ""
+msgstr "Zuordnung wird exportiert â"
 
 #: ../wiican/ui/editordlg.py:50
 msgid "Select image icon.."
-msgstr "Bildsymbol auswÃhlen â"
+msgstr "Symbol auswÃhlen â"
 
 #: ../wiican/ui/editordlg.py:80
 msgid "Images"
@@ -119,168 +107,192 @@ msgstr "Bilder"
 
 #: ../wiican/ui/editordlg.py:171
 msgid "A mapping is running"
-msgstr ""
+msgstr "Eine Zuordnung ist aktiv"
 
 #: ../wiican/ui/editordlg.py:176
 msgid "Execute this mapping"
-msgstr ""
+msgstr "Diese Zuordnung aktivieren"
 
 #: ../wiican/ui/editordlg.py:185
 msgid "Ensure a bluetooth "
 msgstr ""
+"Stellen Sie sicher, dass ein Bluetooth-Adapter angeschlossen und das uinput-"
+"Modul geladen ist "
 
 #: ../wiican/mapping/manager.py:131 ../wiican/mapping/manager.py:171
-#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:184
-#: ../wiican/mapping/manager.py:192 ../wiican/mapping/manager.py:200
-#: ../wiican/mapping/manager.py:218 ../wiican/mapping/manager.py:232
-#: ../wiican/mapping/manager.py:238
+#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:193
+#: ../wiican/mapping/manager.py:201 ../wiican/mapping/manager.py:209
+#: ../wiican/mapping/manager.py:225 ../wiican/mapping/manager.py:248
+#: ../wiican/mapping/manager.py:262 ../wiican/mapping/manager.py:268
 msgid "Mapping not found:"
-msgstr ""
+msgstr "Zuordnung nicht gefunden:"
 
-#: ../wiican/mapping/manager.py:221
+#: ../wiican/mapping/manager.py:251
 msgid "Cannot remove a system installed mapping"
-msgstr ""
+msgstr "Eine systemweit installierte Zuordnung kann nicht gelÃscht werden"
 
-#: ../data/mapping.ui:21
-msgid "Wiican mappings"
-msgstr ""
+#: ../data/mapping.ui:5
+#, fuzzy
+msgid "Autostart running this mapping"
+msgstr "Diese Zuordnung aktivieren"
 
-#: ../data/mapping.ui:44
-msgid "toolbutton1"
+#: ../data/mapping.ui:6 ../data/mapping.ui:651
+msgid "_Autostart"
 msgstr ""
 
-#: ../data/mapping.ui:57
-msgid "toolbutton2"
+#: ../data/mapping.ui:7
+msgid "Launch this mapping automatically at desktop session start"
 msgstr ""
 
-#: ../data/mapping.ui:70
-msgid "toolbutton3"
-msgstr ""
+#: ../data/mapping.ui:11
+msgid "Delete mapping"
+msgstr "LÃsche Zuordnung"
 
-#: ../data/mapping.ui:92
-msgid "toolbutton4"
-msgstr ""
+#: ../data/mapping.ui:12
+msgid "_Delete"
+msgstr "_LÃschen"
 
-#: ../data/mapping.ui:105
-msgid "toolbutton5"
-msgstr ""
+#: ../data/mapping.ui:13
+#, fuzzy
+msgid "Remove mapping from the catalog"
+msgstr "Entfernt die Zuordnung aus dem Katalog"
 
-#: ../data/mapping.ui:314
+#: ../data/mapping.ui:18
+msgid "Edit mapping"
+msgstr "Bearbeite Zuordnung"
+
+#: ../data/mapping.ui:19 ../data/mapping.ui:620
+msgid "_Edit"
+msgstr "_Bearbeiten"
+
+#: ../data/mapping.ui:20
+msgid "Edit mapping properties"
+msgstr "Bearbeite Zuordnungseigenschaften"
+
+#: ../data/mapping.ui:25
+msgid "_Export mapping"
+msgstr "_exportiere Zuordnung"
+
+#: ../data/mapping.ui:26 ../data/mapping.ui:692
+msgid "E_xport"
+msgstr "E_xportieren"
+
+#: ../data/mapping.ui:27
+msgid "Export mapping as a .wii file"
+msgstr "Exportiere Zuordnung als .wii-Datei"
+
+#: ../data/mapping.ui:32
+msgid "Import mapping"
+msgstr "Importiere Zuordnung"
+
+#: ../data/mapping.ui:33 ../data/mapping.ui:676
+msgid "_Import"
+msgstr "_Importieren"
+
+#: ../data/mapping.ui:34
+msgid "Import a mapping from a .wii file"
+msgstr "Importiere Zuordnung aus einer .wii-Datei"
+
+#: ../data/mapping.ui:39
+msgid "New mapping"
+msgstr "Neue Zuordnung"
+
+#: ../data/mapping.ui:40 ../data/mapping.ui:604
+msgid "_New"
+msgstr "_Neu"
+
+#: ../data/mapping.ui:41
+#, fuzzy
+msgid "Create a new mapping"
+msgstr "Erstellt einen neue Zuordnung"
+
+#: ../data/mapping.ui:146
 msgid "_Name:"
 msgstr "_Name:"
 
-#: ../data/mapping.ui:326
+#: ../data/mapping.ui:160
 msgid "Co_mment:"
-msgstr "_Kommentar:"
+msgstr "Ko_mmentar:"
 
-#: ../data/mapping.ui:337
+#: ../data/mapping.ui:174
 msgid "A_uthor/s:"
 msgstr "A_utor(en):"
 
-#: ../data/mapping.ui:348
+#: ../data/mapping.ui:188
 msgid "_Version:"
 msgstr "_Version:"
 
-#: ../data/mapping.ui:443
+#: ../data/mapping.ui:298
 msgid "_Icon:"
 msgstr "_Symbol:"
 
-#: ../data/mapping.ui:466
+#: ../data/mapping.ui:325
 msgid "<b>General</b>"
 msgstr "<b>Allgemein</b>"
 
-#: ../data/mapping.ui:539
-msgid ""
-"This is a system installed mapping. \n"
-"Changes will be saved in a new mapping."
-msgstr ""
+#: ../data/mapping.ui:384
+msgid "Mapping programming help"
+msgstr "Hilfe fÃr Zuordnungsprogrammierung"
 
-#: ../data/mapping.ui:565
+#: ../data/mapping.ui:402
 msgid "Execute mapping"
-msgstr ""
+msgstr "Zuordnung aktivieren"
 
-#: ../data/mapping.ui:586
-msgid "Mapping programming help"
+#: ../data/mapping.ui:454
+msgid ""
+"This is a system installed mapping. \n"
+"Changes will be saved in a new mapping."
 msgstr ""
+"Dies ist eine systemweit installierte Zuordnung. \n"
+"Ãnderungen werden in einer neuen Zuordnung gespeichert."
 
-#: ../data/mapping.ui:620
+#: ../data/mapping.ui:496
 msgid "<b>Mapping</b>"
-msgstr ""
-
-#: ../data/mapping.ui:684
-msgid "Edit mapping"
-msgstr ""
-
-#: ../data/mapping.ui:685
-msgid "_Edit"
-msgstr ""
-
-#: ../data/mapping.ui:686
-msgid "Edit mapping properties"
-msgstr ""
+msgstr "<b>Zuordnung</b>"
 
-#: ../data/mapping.ui:691
-msgid "Delete mapping"
-msgstr ""
-
-#: ../data/mapping.ui:692
-msgid "_Delete"
-msgstr ""
-
-#: ../data/mapping.ui:693
-msgid "Removes the mapping from the catalog"
-msgstr ""
-
-#: ../data/mapping.ui:698
-msgid "Import mapping"
-msgstr ""
-
-#: ../data/mapping.ui:699
-msgid "_Import"
-msgstr "_Importieren"
-
-#: ../data/mapping.ui:700
-msgid "Import a mapping from a .wii file"
-msgstr ""
-
-#: ../data/mapping.ui:705
-msgid "_Export mapping"
-msgstr ""
-
-#: ../data/mapping.ui:706
-msgid "E_xport"
-msgstr "E_xportieren"
-
-#: ../data/mapping.ui:707
-msgid "Export mapping as a .wii file"
-msgstr ""
-
-#: ../data/mapping.ui:712
-msgid "New mapping"
-msgstr ""
+#: ../data/mapping.ui:540
+msgid "Wiican mappings"
+msgstr "Wiican Zuordnungen"
 
-#: ../data/mapping.ui:713
-msgid "_New"
-msgstr ""
+#: ../data/wiimotemanager.ui:7
+msgid "Mapping validation failed"
+msgstr "ÃberprÃfung der Zuordnung gescheitert"
 
-#: ../data/mapping.ui:714
-msgid "Creates a new mapping"
-msgstr ""
+#: ../data/wiimotemanager.ui:87
+msgid "It looks the activated mapping contains errors."
+msgstr "Anscheinend enthÃlt die aktivierte Zuordnung Fehler."
 
-#: ../data/wiimotemanager.ui:13
+#: ../data/wiimotemanager.ui:120
 msgid ""
 "Yes wii can\n"
 "Wiimote usage assistant and mapping manager"
 msgstr ""
+"Yes wii can\n"
+"Wiimote-Bedienassistent und Zuordnungsverwaltung"
 
-#: ../data/wiimotemanager.ui:726
+#: ../data/wiimotemanager.ui:921
 msgid "Edit mappings..."
-msgstr ""
+msgstr "Zuordnungen bearbeiten â"
 
-#: ../data/wiimotemanager.ui:759
-msgid "Mapping validation failed"
-msgstr ""
+#: ../data/wiimotemanager.ui:935
+msgid "Show mappings on startup"
+msgstr "Zuordnungen beim Start anzeigen"
 
-#: ../data/wiimotemanager.ui:788
-msgid "It looks the activated mapping contains errors."
-msgstr ""
+#~ msgid ""
+#~ "Hold left button for use wiimote\n"
+#~ "Right button for menu"
+#~ msgstr ""
+#~ "Linke Maustaste: Wiimote benutzen\n"
+#~ "Rechte Maustaste: MenÃ"
+
+#~ msgid "Add visible mappings"
+#~ msgstr "Sichtbare Zuordnungen hinzufÃgen"
+
+#~ msgid "Wiimote mappings"
+#~ msgstr "Wiimote-Zuordnungen"
+
+#~ msgid "<b>Mappings</b>"
+#~ msgstr "<b>Zuordnungen</b>"
+
+#~ msgid "Discovering Wiimote"
+#~ msgstr "Wiimote wird gesucht"
diff --git a/po/el.po b/po/el.po
new file mode 100644
index 0000000..3b5de4c
--- /dev/null
+++ b/po/el.po
@@ -0,0 +1,292 @@
+# Greek translation for wiican
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the wiican package.
+# FIRST AUTHOR <EMAIL ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: wiican\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-16 14:27+0200\n"
+"PO-Revision-Date: 2011-12-04 08:56+0000\n"
+"Last-Translator: Vamire <Unknown>\n"
+"Language-Team: Greek <el li org>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-16 12:08+0000\n"
+"X-Generator: Launchpad (build 15810)\n"
+
+#: ../bin/wiican:134
+msgid "Plug a bluetooth adapter"
+msgstr "ÎÏÎÎÎÏÏÎ ÎÎÎÎ ÏÏÎÏÎÏÎÎÎÎÎ Bluetooth"
+
+#: ../bin/wiican:142
+msgid "Please load uinput module first"
+msgstr "ÎÎÏÎÎÎÎÏ ÏÎÏÏÏÏÏÎ ÏÎ ÎÎÎÏÏÎÎÎ ÏÏÏÏÎ"
+
+#: ../bin/wiican:196
+msgid "Set some visible mappings"
+msgstr "ÎÏÎÏÏÎ ÎÎÏÎÎÎÏ ÎÎÏÎÏÏÎÎÏÎÎÏ ÏÎÎÎÏÏÏÎ"
+
+#: ../bin/wiican:239 ../wiican/ui/editordlg.py:148
+msgid "Editing "
+msgstr "ÎÏÎÎÎÏÎÎÏÎÎ "
+
+#: ../bin/wiican:252 ../wiican/ui/editordlg.py:267
+msgid "Press 1+2"
+msgstr "ÎÎÏÎÏÏÎ 1+2"
+
+#: ../bin/wiican:253 ../wiican/ui/editordlg.py:268
+msgid "To put you Wiimote in discoverable mode now"
+msgstr "ÎÏÎÏÏÎ ÏÎ Wiimote ÏÎ ÎÎÎÏÎÏÏÎÎÎ ÎÎÎÏÎÎÏÏÎÏ"
+
+#: ../bin/wiican:273 ../wiican/mapping/manager.py:106
+#, python-format
+msgid "Not %s file found on wiican package"
+msgstr "ÎÎÎ %s ÎÏÎÎÎÎÎ ÎÏÏÎÎÎ ÏÏÎ ÏÎÎÎÏÎ wiican"
+
+#: ../bin/wiican:277 ../wiican/mapping/manager.py:110
+#, python-format
+msgid "Not %s file found  on wiican package"
+msgstr "ÎÎÎ %s ÎÏÎÎÎÎÎ ÎÏÏÎÎÎ ÏÏÎ ÏÎÎÎÏÎ wiican"
+
+#: ../bin/wiican:316
+msgid "Wiican Mapping Package load failed!"
+msgstr "ÎÎ ÏÎÎÎÏÎ ÎÎÏÎÏÏÎÎÏÎÎÏ ÏÎÏ ÏÎÏÏÏÏÎÏÎ ÏÏÎ Wiican ÎÏÎÏÏÏÎ"
+
+#: ../bin/wiican:323
+msgid "usage: %prog [options] arg"
+msgstr "ÏÏÎÏÎ: %prog [ÎÏÎÎÎÎÎÏ] arg"
+
+#: ../bin/wiican:325
+msgid "loads mapping package from FILENAME"
+msgstr "ÏÎÏÏÏÏÎ ÏÎÎÎÏÎÏ ÎÎÏÎÏÏÎÎÏÎÎÏ ÎÏÏ FILENAME"
+
+#: ../bin/wiican:344
+#, python-format
+msgid "No wiican package mapping found: %s"
+msgstr "ÎÎ wiican ÎÎÎ ÎÏÎÎÎ ÎÎÎÎÎÏÎÎÎ ÎÎÏÎÏÏÎÎÏÎÎ: %s"
+
+#: ../wiican/ui/managerdlg.py:43
+msgid "Wiican Mapping Package"
+msgstr "Wiican ÏÎÎÎÏÎ ÎÎÏÎÏÏÎÎÏÎÎÏ"
+
+#: ../wiican/ui/managerdlg.py:111
+msgid "Editing new mapping"
+msgstr "ÎÏÎÎÎÏÎÎÏÎÎ ÎÎÎÏ ÎÎÏÎÏÏÎÎÏÎÎÏ"
+
+#: ../wiican/ui/managerdlg.py:179
+msgid "Are you sure you want to completely remove this mapping?"
+msgstr "ÎÎÏÏÎ ÏÎÎÎÏÏÎÏ ÏÏÎ ÎÎÎÎÏÎ ÎÎ ÎÎÎÎÏÎÏÎÏÎ ÏÎÎ ÎÎÏÎÏÏÎÎÏÎÎ;"
+
+#: ../wiican/ui/managerdlg.py:188
+msgid "Deleting mappings"
+msgstr "ÎÎÎÎÏÎÏÎ ÎÎÏÎÏÏÎÎÏÎÎÏ"
+
+#: ../wiican/ui/managerdlg.py:217
+msgid "Import mapping..."
+msgstr "ÎÎÏÎÎÏÎÎ ÎÎÏÎÏÏÎÎÏÎÎÏ..."
+
+#: ../wiican/ui/managerdlg.py:235
+msgid "Wiican Mapping Package import failed!"
+msgstr "Î ÎÎÏÎÎÏÎÎ ÏÎÎÎÏÎÏ ÎÎÏÎÏÏÎÎÏÎÎÏ ÏÏÎ Wiican ÎÏÎÏÏÏÎ!"
+
+#: ../wiican/ui/managerdlg.py:265
+msgid "Exporting mapping..."
+msgstr "ÎÎÎÎÏÎÎ ÎÎÏÎÏÏÎÎÏÎÎÏ..."
+
+#: ../wiican/ui/editordlg.py:50
+msgid "Select image icon.."
+msgstr "ÎÎÎÎÎÎÏÎ ÎÎÎ ÎÎÎÎÎÎÎÎÎ.."
+
+#: ../wiican/ui/editordlg.py:80
+msgid "Images"
+msgstr "ÎÎÎÏÎÎÏ"
+
+#: ../wiican/ui/editordlg.py:171
+msgid "A mapping is running"
+msgstr "Î ÎÎÏÎÏÏÎÎÏÎÎ ÎÏÎÏÎÎÏÎÎ ÏÎ ÎÎÎÏÎÏÏÎÎÎ"
+
+#: ../wiican/ui/editordlg.py:176
+msgid "Execute this mapping"
+msgstr "ÎÎÏÎÎÎÏÎ ÏÎÏ ÎÎÏÎÏÏÎÎÏÎÎÏ"
+
+#: ../wiican/ui/editordlg.py:185
+msgid "Ensure a bluetooth "
+msgstr "ÎÎÎÏÏÎÎÎÏÎ bluetooth "
+
+#: ../wiican/mapping/manager.py:131 ../wiican/mapping/manager.py:171
+#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:193
+#: ../wiican/mapping/manager.py:201 ../wiican/mapping/manager.py:209
+#: ../wiican/mapping/manager.py:225 ../wiican/mapping/manager.py:248
+#: ../wiican/mapping/manager.py:262 ../wiican/mapping/manager.py:268
+msgid "Mapping not found:"
+msgstr "ÎÎÎ ÎÏÎÎÎÎÎ ÎÎÏÎÏÏÎÎÏÎÎ:"
+
+#: ../wiican/mapping/manager.py:251
+msgid "Cannot remove a system installed mapping"
+msgstr "ÎÎÎ ÎÏÎÏÎÎÏÎ ÎÎ ÎÎÏÎÏÎÎÏÎÏÎ ÎÎÎÎÏÎÏÏÎÎÎÎÎ ÎÎÏÎÏÏÎÎÏÎÎ"
+
+#: ../data/mapping.ui:5
+#, fuzzy
+msgid "Autostart running this mapping"
+msgstr "ÎÎÏÎÎÎÏÎ ÏÎÏ ÎÎÏÎÏÏÎÎÏÎÎÏ"
+
+#: ../data/mapping.ui:6 ../data/mapping.ui:651
+msgid "_Autostart"
+msgstr ""
+
+#: ../data/mapping.ui:7
+msgid "Launch this mapping automatically at desktop session start"
+msgstr ""
+
+#: ../data/mapping.ui:11
+msgid "Delete mapping"
+msgstr "ÎÎÎÎÏÎÏÎ ÎÎÏÎÏÏÎÎÏÎÎÏ"
+
+#: ../data/mapping.ui:12
+msgid "_Delete"
+msgstr "ÎÎÎÎÏÎÏÎ"
+
+#: ../data/mapping.ui:13
+#, fuzzy
+msgid "Remove mapping from the catalog"
+msgstr "ÎÏÎÎÎÎÏÏÎÏÎ ÎÎÏÎÏÏÎÎÏÎÎÏ ÎÏÏ ÏÎÎ ÎÎÏÎÎÎÎÎ"
+
+#: ../data/mapping.ui:18
+msgid "Edit mapping"
+msgstr "ÎÏÎÎÎÏÎÎÏÎÎ ÎÎÏÎÏÏÎÎÏÎÎÏ"
+
+#: ../data/mapping.ui:19 ../data/mapping.ui:620
+msgid "_Edit"
+msgstr "ÎÏÎÎÎÏÎÎÏÎÎ"
+
+#: ../data/mapping.ui:20
+msgid "Edit mapping properties"
+msgstr "ÎÏÎÎÎÏÎÎÏÎÎ ÎÎÎÎÏÎÏÏÎ ÎÎÏÎÏÏÎÎÏÎÎÏ"
+
+#: ../data/mapping.ui:25
+msgid "_Export mapping"
+msgstr "ÎÎÎÎÏÎÎ ÎÎÏÎÏÏÎÎÏÎÎÏ"
+
+#: ../data/mapping.ui:26 ../data/mapping.ui:692
+msgid "E_xport"
+msgstr "ÎÎÎÎÏÎÎ"
+
+#: ../data/mapping.ui:27
+msgid "Export mapping as a .wii file"
+msgstr "ÎÎÎÎÏÎÎ ÎÎÏÎÏÏÎÎÏÎÎÏ ÎÏÎ .wii ÎÏÏÎÎÎ"
+
+#: ../data/mapping.ui:32
+msgid "Import mapping"
+msgstr "ÎÎÏÎÎÏÎÎ ÎÎÏÎÏÏÎÎÏÎÎÏ"
+
+#: ../data/mapping.ui:33 ../data/mapping.ui:676
+msgid "_Import"
+msgstr "ÎÎÏÎÎÏÎÎ"
+
+#: ../data/mapping.ui:34
+msgid "Import a mapping from a .wii file"
+msgstr "ÎÎÏÎÎÏÎÎ ÎÎÏÎÏÏÎÎÏÎÎÏ ÎÏÎ .wii ÎÏÏÎÎÎ"
+
+#: ../data/mapping.ui:39
+msgid "New mapping"
+msgstr "ÎÎÎ ÎÎÏÎÏÏÎÎÏÎÎ"
+
+#: ../data/mapping.ui:40 ../data/mapping.ui:604
+msgid "_New"
+msgstr "NÎÎ"
+
+#: ../data/mapping.ui:41
+#, fuzzy
+msgid "Create a new mapping"
+msgstr "ÎÎÎÎÎÏÏÎÎÎ ÎÎÎÏ ÎÎÏÎÏÏÎÎÏÎÎÏ"
+
+#: ../data/mapping.ui:146
+msgid "_Name:"
+msgstr "ÏÎÎÎÎ"
+
+#: ../data/mapping.ui:160
+msgid "Co_mment:"
+msgstr "ÎÏÏÎÎÎ"
+
+#: ../data/mapping.ui:174
+msgid "A_uthor/s:"
+msgstr "ÎÏÎÎÏÎÏÎÎÏ"
+
+#: ../data/mapping.ui:188
+msgid "_Version:"
+msgstr "ÎÎÎÎÏÎ"
+
+#: ../data/mapping.ui:298
+msgid "_Icon:"
+msgstr "ÎÎÎÎÎÎÎÎÎ:"
+
+#: ../data/mapping.ui:325
+msgid "<b>General</b>"
+msgstr "ÎÎÎÎÎÎ"
+
+#: ../data/mapping.ui:384
+msgid "Mapping programming help"
+msgstr "ÎÎÎÎÎÎÎ ÎÎÎ ÏÏÎÎÏÎÎÎÎÏÎÏÎÏ ÎÎÏÎÏÏÎÎÏÎÎÏ"
+
+#: ../data/mapping.ui:402
+msgid "Execute mapping"
+msgstr "ÎÎÏÎÎÎÏÎ ÎÎÏÎÏÏÎÎÏÎÎÏ"
+
+#: ../data/mapping.ui:454
+msgid ""
+"This is a system installed mapping. \n"
+"Changes will be saved in a new mapping."
+msgstr ""
+"ÎÏÏÎ ÎÎÎÎÎ ÏÏÎÎÎÎÎÏÎÏÏÎÎÎÎÎ ÎÎÏÎÏÏÎÎÏÎÎ.\n"
+"ÎÎ ÎÎÎÎÎÎÏ ÎÎ ÏÏÎÎÏÎ ÏÎ ÎÎÎ ÎÎÏÎÏÏÎÎÏÎÎ."
+
+#: ../data/mapping.ui:496
+msgid "<b>Mapping</b>"
+msgstr "ÎÎÏÎÏÏÎÎÏÎÎ"
+
+#: ../data/mapping.ui:540
+msgid "Wiican mappings"
+msgstr "Wiican ÎÎÏÎÏÏÎÎÏÎÎÏ"
+
+#: ../data/wiimotemanager.ui:7
+msgid "Mapping validation failed"
+msgstr "Î ÎÎÏÎÏÏÎÎÏÎÎ ÎÎÎ ÎÎÎÎÎ ÎÎÎÏÏÎ"
+
+#: ../data/wiimotemanager.ui:87
+msgid "It looks the activated mapping contains errors."
+msgstr "Î ÎÎÎÏÎÎÏÎÎÎÎÎÎÎ ÏÎÏÏÎÎÏÎÏÎÏÎ ÏÎÏÎÎÏÎÎ ÏÏÎÎÎÎÏÎ"
+
+#: ../data/wiimotemanager.ui:120
+msgid ""
+"Yes wii can\n"
+"Wiimote usage assistant and mapping manager"
+msgstr ""
+"Îes wii can\n"
+"ÎÎÎÎÏÏ ÏÏÎÎÎÏÎÏ Wiimote ÎÎÎ ÎÎÏÎÏÏÎÎÏÎÎ ÏÎÎÎÏÏÏÎ"
+
+#: ../data/wiimotemanager.ui:921
+msgid "Edit mappings..."
+msgstr "ÎÏÎÎÎÏÎÎÏÎÎ ÎÎÏÎÏÏÎÎÏÎÏÎ..."
+
+#: ../data/wiimotemanager.ui:935
+msgid "Show mappings on startup"
+msgstr "ÎÏÎÎÎÎÎ ÎÎÏÎÏÏÎÎÏÎÏÎ ÏÏÎÎ ÎÎÎÎÎÎÏÎ"
+
+#~ msgid "toolbutton1"
+#~ msgstr "ÎÎÏÎÏÎ1"
+
+#~ msgid "toolbutton2"
+#~ msgstr "ÎÎÏÎÏÎ2"
+
+#~ msgid "toolbutton3"
+#~ msgstr "ÎÎÏÎÏÎ3"
+
+#~ msgid "toolbutton4"
+#~ msgstr "ÎÎÏÎÏÎ4"
+
+#~ msgid "toolbutton5"
+#~ msgstr "ÎÎÏÎÏÎ5"
diff --git a/po/en_GB.po b/po/en_GB.po
index e1a56b2..697284a 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,105 +6,94 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wiican\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL ADDRESS>\n"
-"POT-Creation-Date: 2010-11-13 14:38+0100\n"
-"PO-Revision-Date: 2011-02-13 16:22+0000\n"
-"Last-Translator: J. FÃlix OntaÃÃn <Unknown>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-16 14:27+0200\n"
+"PO-Revision-Date: 2011-08-09 18:47+0000\n"
+"Last-Translator: Lars Vierbergen <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB li org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-07 23:04+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2012-08-16 12:08+0000\n"
+"X-Generator: Launchpad (build 15810)\n"
 
-#: ../bin/wiican:102
+#: ../bin/wiican:134
 msgid "Plug a bluetooth adapter"
 msgstr "Plug a bluetooth adapter"
 
-#: ../bin/wiican:107
+#: ../bin/wiican:142
 msgid "Please load uinput module first"
 msgstr "Please load uinput module first"
 
-#: ../bin/wiican:113
-msgid ""
-"Hold left button for use wiimote\n"
-"Right button for menu"
-msgstr ""
-"Hold left button for use wiimote\n"
-"Right button for menu"
-
-#: ../bin/wiican:125
-msgid "Discovering Wiimote"
-msgstr "Discovering Wiimote"
-
-#: ../bin/wiican:160
-msgid "Add visible mappings"
-msgstr "Add visible mappings"
+#: ../bin/wiican:196
+msgid "Set some visible mappings"
+msgstr "Set some visible mappings"
 
-#: ../bin/wiican:205 ../wiican/ui/editordlg.py:148
+#: ../bin/wiican:239 ../wiican/ui/editordlg.py:148
 msgid "Editing "
 msgstr "Editing "
 
-#: ../bin/wiican:218 ../wiican/ui/editordlg.py:266
+#: ../bin/wiican:252 ../wiican/ui/editordlg.py:267
 msgid "Press 1+2"
 msgstr "Press 1+2"
 
-#: ../bin/wiican:219 ../wiican/ui/editordlg.py:267
+#: ../bin/wiican:253 ../wiican/ui/editordlg.py:268
 msgid "To put you Wiimote in discoverable mode now"
 msgstr "To put you Wiimote in discoverable mode now"
 
-#: ../bin/wiican:239 ../wiican/mapping/manager.py:106
+#: ../bin/wiican:273 ../wiican/mapping/manager.py:106
 #, python-format
 msgid "Not %s file found on wiican package"
 msgstr "Not %s file found on wiican package"
 
-#: ../bin/wiican:243 ../wiican/mapping/manager.py:110
+#: ../bin/wiican:277 ../wiican/mapping/manager.py:110
 #, python-format
 msgid "Not %s file found  on wiican package"
 msgstr "Not %s file found  on wiican package"
 
-#: ../bin/wiican:282
+#: ../bin/wiican:316
 msgid "Wiican Mapping Package load failed!"
 msgstr "Wiican Mapping Package load failed!"
 
-#: ../bin/wiican:289
+#: ../bin/wiican:323
 msgid "usage: %prog [options] arg"
 msgstr "usage: %prog [options] arg"
 
-#: ../bin/wiican:291
+#: ../bin/wiican:325
 msgid "loads mapping package from FILENAME"
 msgstr "loads mapping package from FILENAME"
 
-#: ../bin/wiican:310
+#: ../bin/wiican:344
 #, python-format
 msgid "No wiican package mapping found: %s"
 msgstr "No wiican package mapping found: %s"
 
-#: ../wiican/ui/managerdlg.py:38
+#: ../wiican/ui/managerdlg.py:43
 msgid "Wiican Mapping Package"
 msgstr "Wiican Mapping Package"
 
-#: ../wiican/ui/managerdlg.py:88
+#: ../wiican/ui/managerdlg.py:111
 msgid "Editing new mapping"
 msgstr "Editing new mapping"
 
-#: ../wiican/ui/managerdlg.py:143
+#: ../wiican/ui/managerdlg.py:179
 msgid "Are you sure you want to completely remove this mapping?"
 msgstr "Are you sure you want to completely remove this mapping?"
 
-#: ../wiican/ui/managerdlg.py:152
+#: ../wiican/ui/managerdlg.py:188
 msgid "Deleting mappings"
 msgstr "Deleting mappings"
 
-#: ../wiican/ui/managerdlg.py:179
+#: ../wiican/ui/managerdlg.py:217
 msgid "Import mapping..."
 msgstr "Import mapping..."
 
-#: ../wiican/ui/managerdlg.py:197
+#: ../wiican/ui/managerdlg.py:235
 msgid "Wiican Mapping Package import failed!"
 msgstr "Wiican Mapping Package import failed!"
 
-#: ../wiican/ui/managerdlg.py:227
+#: ../wiican/ui/managerdlg.py:265
 msgid "Exporting mapping..."
 msgstr "Exporting mapping..."
 
@@ -129,66 +118,125 @@ msgid "Ensure a bluetooth "
 msgstr "Ensure a bluetooth "
 
 #: ../wiican/mapping/manager.py:131 ../wiican/mapping/manager.py:171
-#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:184
-#: ../wiican/mapping/manager.py:192 ../wiican/mapping/manager.py:200
-#: ../wiican/mapping/manager.py:218 ../wiican/mapping/manager.py:232
-#: ../wiican/mapping/manager.py:238
+#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:193
+#: ../wiican/mapping/manager.py:201 ../wiican/mapping/manager.py:209
+#: ../wiican/mapping/manager.py:225 ../wiican/mapping/manager.py:248
+#: ../wiican/mapping/manager.py:262 ../wiican/mapping/manager.py:268
 msgid "Mapping not found:"
 msgstr "Mapping not found:"
 
-#: ../wiican/mapping/manager.py:221
+#: ../wiican/mapping/manager.py:251
 msgid "Cannot remove a system installed mapping"
 msgstr "Cannot remove a system installed mapping"
 
-#: ../data/mapping.ui:21
-msgid "Wiican mappings"
-msgstr "Wiican mappings"
+#: ../data/mapping.ui:5
+#, fuzzy
+msgid "Autostart running this mapping"
+msgstr "Execute this mapping"
+
+#: ../data/mapping.ui:6 ../data/mapping.ui:651
+msgid "_Autostart"
+msgstr ""
+
+#: ../data/mapping.ui:7
+msgid "Launch this mapping automatically at desktop session start"
+msgstr ""
+
+#: ../data/mapping.ui:11
+msgid "Delete mapping"
+msgstr "Delete mapping"
+
+#: ../data/mapping.ui:12
+msgid "_Delete"
+msgstr "_Delete"
+
+#: ../data/mapping.ui:13
+#, fuzzy
+msgid "Remove mapping from the catalog"
+msgstr "Removes the mapping from the catalog"
+
+#: ../data/mapping.ui:18
+msgid "Edit mapping"
+msgstr "Edit mapping"
+
+#: ../data/mapping.ui:19 ../data/mapping.ui:620
+msgid "_Edit"
+msgstr "_Edit"
+
+#: ../data/mapping.ui:20
+msgid "Edit mapping properties"
+msgstr "Edit mapping properties"
 
-#: ../data/mapping.ui:44
-msgid "toolbutton1"
-msgstr "toolbutton1"
+#: ../data/mapping.ui:25
+msgid "_Export mapping"
+msgstr "_Export mapping"
+
+#: ../data/mapping.ui:26 ../data/mapping.ui:692
+msgid "E_xport"
+msgstr "E_xport"
+
+#: ../data/mapping.ui:27
+msgid "Export mapping as a .wii file"
+msgstr "Export mapping as a .wii file"
 
-#: ../data/mapping.ui:57
-msgid "toolbutton2"
-msgstr "toolbutton2"
+#: ../data/mapping.ui:32
+msgid "Import mapping"
+msgstr "Import mapping"
+
+#: ../data/mapping.ui:33 ../data/mapping.ui:676
+msgid "_Import"
+msgstr "_Import"
+
+#: ../data/mapping.ui:34
+msgid "Import a mapping from a .wii file"
+msgstr "Import a mapping from a .wii file"
 
-#: ../data/mapping.ui:70
-msgid "toolbutton3"
-msgstr "toolbutton3"
+#: ../data/mapping.ui:39
+msgid "New mapping"
+msgstr "New mapping"
 
-#: ../data/mapping.ui:92
-msgid "toolbutton4"
-msgstr "toolbutton4"
+#: ../data/mapping.ui:40 ../data/mapping.ui:604
+msgid "_New"
+msgstr "_New"
 
-#: ../data/mapping.ui:105
-msgid "toolbutton5"
-msgstr "toolbutton5"
+#: ../data/mapping.ui:41
+#, fuzzy
+msgid "Create a new mapping"
+msgstr "Creates a new mapping"
 
-#: ../data/mapping.ui:314
+#: ../data/mapping.ui:146
 msgid "_Name:"
 msgstr "_Name:"
 
-#: ../data/mapping.ui:326
+#: ../data/mapping.ui:160
 msgid "Co_mment:"
 msgstr "Co_mment:"
 
-#: ../data/mapping.ui:337
+#: ../data/mapping.ui:174
 msgid "A_uthor/s:"
 msgstr "A_uthor/s:"
 
-#: ../data/mapping.ui:348
+#: ../data/mapping.ui:188
 msgid "_Version:"
 msgstr "_Version:"
 
-#: ../data/mapping.ui:443
+#: ../data/mapping.ui:298
 msgid "_Icon:"
 msgstr "_Icon:"
 
-#: ../data/mapping.ui:466
+#: ../data/mapping.ui:325
 msgid "<b>General</b>"
 msgstr "<b>General</b>"
 
-#: ../data/mapping.ui:539
+#: ../data/mapping.ui:384
+msgid "Mapping programming help"
+msgstr "Mapping programming help"
+
+#: ../data/mapping.ui:402
+msgid "Execute mapping"
+msgstr "Execute mapping"
+
+#: ../data/mapping.ui:454
 msgid ""
 "This is a system installed mapping. \n"
 "Changes will be saved in a new mapping."
@@ -196,79 +244,23 @@ msgstr ""
 "This is a system installed mapping. \n"
 "Changes will be saved in a new mapping."
 
-#: ../data/mapping.ui:565
-msgid "Execute mapping"
-msgstr "Execute mapping"
-
-#: ../data/mapping.ui:586
-msgid "Mapping programming help"
-msgstr "Mapping programming help"
-
-#: ../data/mapping.ui:620
+#: ../data/mapping.ui:496
 msgid "<b>Mapping</b>"
 msgstr "<b>Mapping</b>"
 
-#: ../data/mapping.ui:684
-msgid "Edit mapping"
-msgstr "Edit mapping"
-
-#: ../data/mapping.ui:685
-msgid "_Edit"
-msgstr "_Edit"
-
-#: ../data/mapping.ui:686
-msgid "Edit mapping properties"
-msgstr "Edit mapping properties"
-
-#: ../data/mapping.ui:691
-msgid "Delete mapping"
-msgstr "Delete mapping"
-
-#: ../data/mapping.ui:692
-msgid "_Delete"
-msgstr "_Delete"
-
-#: ../data/mapping.ui:693
-msgid "Removes the mapping from the catalog"
-msgstr "Removes the mapping from the catalog"
-
-#: ../data/mapping.ui:698
-msgid "Import mapping"
-msgstr "Import mapping"
-
-#: ../data/mapping.ui:699
-msgid "_Import"
-msgstr "_Import"
-
-#: ../data/mapping.ui:700
-msgid "Import a mapping from a .wii file"
-msgstr "Import a mapping from a .wii file"
-
-#: ../data/mapping.ui:705
-msgid "_Export mapping"
-msgstr "_Export mapping"
-
-#: ../data/mapping.ui:706
-msgid "E_xport"
-msgstr "E_xport"
-
-#: ../data/mapping.ui:707
-msgid "Export mapping as a .wii file"
-msgstr "Export mapping as a .wii file"
-
-#: ../data/mapping.ui:712
-msgid "New mapping"
-msgstr "New mapping"
+#: ../data/mapping.ui:540
+msgid "Wiican mappings"
+msgstr "Wiican mappings"
 
-#: ../data/mapping.ui:713
-msgid "_New"
-msgstr "_New"
+#: ../data/wiimotemanager.ui:7
+msgid "Mapping validation failed"
+msgstr "Mapping validation failed"
 
-#: ../data/mapping.ui:714
-msgid "Creates a new mapping"
-msgstr "Creates a new mapping"
+#: ../data/wiimotemanager.ui:87
+msgid "It looks the activated mapping contains errors."
+msgstr "It looks the activated mapping contains errors."
 
-#: ../data/wiimotemanager.ui:13
+#: ../data/wiimotemanager.ui:120
 msgid ""
 "Yes wii can\n"
 "Wiimote usage assistant and mapping manager"
@@ -276,14 +268,38 @@ msgstr ""
 "Yes wii can\n"
 "Wiimote usage assistant and mapping manager"
 
-#: ../data/wiimotemanager.ui:726
+#: ../data/wiimotemanager.ui:921
 msgid "Edit mappings..."
 msgstr "Edit mappings..."
 
-#: ../data/wiimotemanager.ui:759
-msgid "Mapping validation failed"
-msgstr "Mapping validation failed"
+#: ../data/wiimotemanager.ui:935
+msgid "Show mappings on startup"
+msgstr "Show mappings on startup"
 
-#: ../data/wiimotemanager.ui:788
-msgid "It looks the activated mapping contains errors."
-msgstr "It looks the activated mapping contains errors."
+#~ msgid "toolbutton1"
+#~ msgstr "toolbutton1"
+
+#~ msgid "toolbutton2"
+#~ msgstr "toolbutton2"
+
+#~ msgid "toolbutton3"
+#~ msgstr "toolbutton3"
+
+#~ msgid "toolbutton4"
+#~ msgstr "toolbutton4"
+
+#~ msgid "toolbutton5"
+#~ msgstr "toolbutton5"
+
+#~ msgid ""
+#~ "Hold left button for use wiimote\n"
+#~ "Right button for menu"
+#~ msgstr ""
+#~ "Hold left button for use wiimote\n"
+#~ "Right button for menu"
+
+#~ msgid "Discovering Wiimote"
+#~ msgstr "Discovering Wiimote"
+
+#~ msgid "Add visible mappings"
+#~ msgstr "Add visible mappings"
diff --git a/po/es.po b/po/es.po
index 9b380eb..2fc1fce 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,105 +7,93 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-13 14:38+0100\n"
-"PO-Revision-Date: 2011-02-13 16:21+0000\n"
-"Last-Translator: Fitoschido <fitoschido gmail com>\n"
+"POT-Creation-Date: 2012-08-16 14:27+0200\n"
+"PO-Revision-Date: 2011-12-28 04:09+0000\n"
+"Last-Translator: gonzalo <Unknown>\n"
 "Language-Team: LANGUAGE <LL li org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-07 23:04+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
-"Language: \n"
+"X-Launchpad-Export-Date: 2012-08-16 12:08+0000\n"
+"X-Generator: Launchpad (build 15810)\n"
 
-#: ../bin/wiican:102
+#: ../bin/wiican:134
 msgid "Plug a bluetooth adapter"
 msgstr "Conecte un adaptador Bluetooth"
 
-#: ../bin/wiican:107
+#: ../bin/wiican:142
 msgid "Please load uinput module first"
 msgstr "Cargue el mÃdulo uinput primero"
 
-#: ../bin/wiican:113
-msgid ""
-"Hold left button for use wiimote\n"
-"Right button for menu"
+#: ../bin/wiican:196
+msgid "Set some visible mappings"
 msgstr ""
-"MantÃn presionado el botÃn izquierdo para usar el Wiimote\n"
-"BotÃn derecho para el menÃ"
-
-#: ../bin/wiican:125
-msgid "Discovering Wiimote"
-msgstr "Descubriendo Wiimote"
 
-#: ../bin/wiican:160
-msgid "Add visible mappings"
-msgstr "AÃade mapeos visibles"
-
-#: ../bin/wiican:205 ../wiican/ui/editordlg.py:148
+#: ../bin/wiican:239 ../wiican/ui/editordlg.py:148
 msgid "Editing "
 msgstr "Editando "
 
-#: ../bin/wiican:218 ../wiican/ui/editordlg.py:266
+#: ../bin/wiican:252 ../wiican/ui/editordlg.py:267
 msgid "Press 1+2"
 msgstr "Presiona 1+2"
 
-#: ../bin/wiican:219 ../wiican/ui/editordlg.py:267
+#: ../bin/wiican:253 ../wiican/ui/editordlg.py:268
 msgid "To put you Wiimote in discoverable mode now"
 msgstr "Para ajustar tu Wiimote en modo descubrible ahora"
 
-#: ../bin/wiican:239 ../wiican/mapping/manager.py:106
+#: ../bin/wiican:273 ../wiican/mapping/manager.py:106
 #, python-format
 msgid "Not %s file found on wiican package"
-msgstr "No se encontrà el fichero %s en el paquete de mapeo wiican"
+msgstr "No se encontrà el archivo %s en el paquete wiican"
 
-#: ../bin/wiican:243 ../wiican/mapping/manager.py:110
+#: ../bin/wiican:277 ../wiican/mapping/manager.py:110
 #, python-format
 msgid "Not %s file found  on wiican package"
-msgstr "No se encontrà el fichero %s en el paquete de mapeo wiican"
+msgstr "No se encontrà el archivo %s en el paquete wiican"
 
-#: ../bin/wiican:282
+#: ../bin/wiican:316
 msgid "Wiican Mapping Package load failed!"
 msgstr "Fallà la carga del paquete de mapeo wiican"
 
-#: ../bin/wiican:289
+#: ../bin/wiican:323
 msgid "usage: %prog [options] arg"
 msgstr "uso: %prog [opciones] arg"
 
-#: ../bin/wiican:291
+#: ../bin/wiican:325
 msgid "loads mapping package from FILENAME"
 msgstr "carga el paquete de mapeos desde FILENAME"
 
-#: ../bin/wiican:310
+#: ../bin/wiican:344
 #, python-format
 msgid "No wiican package mapping found: %s"
 msgstr "No se encontrà paquete de mapeo wiican: %s"
 
-#: ../wiican/ui/managerdlg.py:38
+#: ../wiican/ui/managerdlg.py:43
 msgid "Wiican Mapping Package"
 msgstr "Paquete de mapeo wiican"
 
-#: ../wiican/ui/managerdlg.py:88
+#: ../wiican/ui/managerdlg.py:111
 msgid "Editing new mapping"
 msgstr "Editando nuevo mapeo"
 
-#: ../wiican/ui/managerdlg.py:143
+#: ../wiican/ui/managerdlg.py:179
 msgid "Are you sure you want to completely remove this mapping?"
 msgstr "ÂSeguro que deseas eliminar este mapeo definitivamente?"
 
-#: ../wiican/ui/managerdlg.py:152
+#: ../wiican/ui/managerdlg.py:188
 msgid "Deleting mappings"
 msgstr "Eliminando mapeos"
 
-#: ../wiican/ui/managerdlg.py:179
+#: ../wiican/ui/managerdlg.py:217
 msgid "Import mapping..."
 msgstr "Importar mapeo..."
 
-#: ../wiican/ui/managerdlg.py:197
+#: ../wiican/ui/managerdlg.py:235
 msgid "Wiican Mapping Package import failed!"
 msgstr "Fallà la importaciÃn del paquete de mapeo wiican"
 
-#: ../wiican/ui/managerdlg.py:227
+#: ../wiican/ui/managerdlg.py:265
 msgid "Exporting mapping..."
 msgstr "Exportando mapeo..."
 
@@ -130,66 +118,125 @@ msgid "Ensure a bluetooth "
 msgstr "AsegÃrate que un bluetooth "
 
 #: ../wiican/mapping/manager.py:131 ../wiican/mapping/manager.py:171
-#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:184
-#: ../wiican/mapping/manager.py:192 ../wiican/mapping/manager.py:200
-#: ../wiican/mapping/manager.py:218 ../wiican/mapping/manager.py:232
-#: ../wiican/mapping/manager.py:238
+#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:193
+#: ../wiican/mapping/manager.py:201 ../wiican/mapping/manager.py:209
+#: ../wiican/mapping/manager.py:225 ../wiican/mapping/manager.py:248
+#: ../wiican/mapping/manager.py:262 ../wiican/mapping/manager.py:268
 msgid "Mapping not found:"
 msgstr "Mapeo no encontrado:"
 
-#: ../wiican/mapping/manager.py:221
+#: ../wiican/mapping/manager.py:251
 msgid "Cannot remove a system installed mapping"
 msgstr "No se puede eliminar el mapeo instalado en el sistema"
 
-#: ../data/mapping.ui:21
-msgid "Wiican mappings"
-msgstr "Mapeos de wiimote"
+#: ../data/mapping.ui:5
+#, fuzzy
+msgid "Autostart running this mapping"
+msgstr "Lanzar este mapeo"
+
+#: ../data/mapping.ui:6 ../data/mapping.ui:651
+msgid "_Autostart"
+msgstr ""
+
+#: ../data/mapping.ui:7
+msgid "Launch this mapping automatically at desktop session start"
+msgstr ""
+
+#: ../data/mapping.ui:11
+msgid "Delete mapping"
+msgstr "Eliminando mapeos"
 
-#: ../data/mapping.ui:44
-msgid "toolbutton1"
-msgstr "toolbutton1"
+#: ../data/mapping.ui:12
+msgid "_Delete"
+msgstr "_Eliminar"
 
-#: ../data/mapping.ui:57
-msgid "toolbutton2"
-msgstr "toolbutton2"
+#: ../data/mapping.ui:13
+#, fuzzy
+msgid "Remove mapping from the catalog"
+msgstr "Elimina el mapeo del catÃlogo"
 
-#: ../data/mapping.ui:70
-msgid "toolbutton3"
-msgstr "toolbutton3"
+#: ../data/mapping.ui:18
+msgid "Edit mapping"
+msgstr "Editar mapeo"
 
-#: ../data/mapping.ui:92
-msgid "toolbutton4"
-msgstr "toolbutton4"
+#: ../data/mapping.ui:19 ../data/mapping.ui:620
+msgid "_Edit"
+msgstr "_Editar"
 
-#: ../data/mapping.ui:105
-msgid "toolbutton5"
-msgstr "toolbutton5"
+#: ../data/mapping.ui:20
+msgid "Edit mapping properties"
+msgstr "Editar propiedades del mapeo"
 
-#: ../data/mapping.ui:314
+#: ../data/mapping.ui:25
+msgid "_Export mapping"
+msgstr "_Exporta un mapeo"
+
+#: ../data/mapping.ui:26 ../data/mapping.ui:692
+msgid "E_xport"
+msgstr "E_xportar"
+
+#: ../data/mapping.ui:27
+msgid "Export mapping as a .wii file"
+msgstr "Exportar un mapeo como un archivo .wii"
+
+#: ../data/mapping.ui:32
+msgid "Import mapping"
+msgstr "Importar mapeo"
+
+#: ../data/mapping.ui:33 ../data/mapping.ui:676
+msgid "_Import"
+msgstr "_Importar"
+
+#: ../data/mapping.ui:34
+msgid "Import a mapping from a .wii file"
+msgstr "Importar un mapeo desde un archivo .wii"
+
+#: ../data/mapping.ui:39
+msgid "New mapping"
+msgstr "Nuevo mapeo"
+
+#: ../data/mapping.ui:40 ../data/mapping.ui:604
+msgid "_New"
+msgstr "_Nuevo"
+
+#: ../data/mapping.ui:41
+#, fuzzy
+msgid "Create a new mapping"
+msgstr "Crea un nuevo mapeo"
+
+#: ../data/mapping.ui:146
 msgid "_Name:"
 msgstr "_Nombre:"
 
-#: ../data/mapping.ui:326
+#: ../data/mapping.ui:160
 msgid "Co_mment:"
 msgstr "Co_mentario"
 
-#: ../data/mapping.ui:337
+#: ../data/mapping.ui:174
 msgid "A_uthor/s:"
 msgstr "A_utor/es"
 
-#: ../data/mapping.ui:348
+#: ../data/mapping.ui:188
 msgid "_Version:"
 msgstr "_VersiÃn:"
 
-#: ../data/mapping.ui:443
+#: ../data/mapping.ui:298
 msgid "_Icon:"
 msgstr "_Ãcono:"
 
-#: ../data/mapping.ui:466
+#: ../data/mapping.ui:325
 msgid "<b>General</b>"
 msgstr "<b>General</b>"
 
-#: ../data/mapping.ui:539
+#: ../data/mapping.ui:384
+msgid "Mapping programming help"
+msgstr "Ayuda de programaciÃn de mapeos"
+
+#: ../data/mapping.ui:402
+msgid "Execute mapping"
+msgstr "Ejecutar mapeo"
+
+#: ../data/mapping.ui:454
 msgid ""
 "This is a system installed mapping. \n"
 "Changes will be saved in a new mapping."
@@ -197,79 +244,23 @@ msgstr ""
 "Este es un mapeo instalado en el sistema. \n"
 "Los cambios se guardarÃn en un mapeo nuevo."
 
-#: ../data/mapping.ui:565
-msgid "Execute mapping"
-msgstr "Ejecutar mapeo"
-
-#: ../data/mapping.ui:586
-msgid "Mapping programming help"
-msgstr "Ayuda de programaciÃn de mapeos"
-
-#: ../data/mapping.ui:620
+#: ../data/mapping.ui:496
 msgid "<b>Mapping</b>"
 msgstr "<b>Mapeo</b>"
 
-#: ../data/mapping.ui:684
-msgid "Edit mapping"
-msgstr "Editar mapeo"
-
-#: ../data/mapping.ui:685
-msgid "_Edit"
-msgstr "_Editar"
-
-#: ../data/mapping.ui:686
-msgid "Edit mapping properties"
-msgstr "Editar propiedades del mapeo"
-
-#: ../data/mapping.ui:691
-msgid "Delete mapping"
-msgstr "Eliminando mapeos"
-
-#: ../data/mapping.ui:692
-msgid "_Delete"
-msgstr "_Eliminar"
-
-#: ../data/mapping.ui:693
-msgid "Removes the mapping from the catalog"
-msgstr "Elimina el mapeo del catÃlogo"
-
-#: ../data/mapping.ui:698
-msgid "Import mapping"
-msgstr "Importar mapeo"
-
-#: ../data/mapping.ui:699
-msgid "_Import"
-msgstr "_Importar"
-
-#: ../data/mapping.ui:700
-msgid "Import a mapping from a .wii file"
-msgstr "Importa un mapeo desde un fichero .wii"
-
-#: ../data/mapping.ui:705
-msgid "_Export mapping"
-msgstr "_Exporta un mapeo"
-
-#: ../data/mapping.ui:706
-msgid "E_xport"
-msgstr "E_xportar"
-
-#: ../data/mapping.ui:707
-msgid "Export mapping as a .wii file"
-msgstr "Exporta un mapeo como fichero .wii"
-
-#: ../data/mapping.ui:712
-msgid "New mapping"
-msgstr "Nuevo mapeo"
+#: ../data/mapping.ui:540
+msgid "Wiican mappings"
+msgstr "Mapeos de wiimote"
 
-#: ../data/mapping.ui:713
-msgid "_New"
-msgstr "_Nuevo"
+#: ../data/wiimotemanager.ui:7
+msgid "Mapping validation failed"
+msgstr "ValidaciÃn de mapeo fallida"
 
-#: ../data/mapping.ui:714
-msgid "Creates a new mapping"
-msgstr "Crea un nuevo mapeo"
+#: ../data/wiimotemanager.ui:87
+msgid "It looks the activated mapping contains errors."
+msgstr "Parece que el mapeo activado contiene errores."
 
-#: ../data/wiimotemanager.ui:13
+#: ../data/wiimotemanager.ui:120
 msgid ""
 "Yes wii can\n"
 "Wiimote usage assistant and mapping manager"
@@ -277,20 +268,44 @@ msgstr ""
 "Yes wii can\n"
 "Asistente de uso de Wiimote y gestor de mapeos"
 
-#: ../data/wiimotemanager.ui:726
+#: ../data/wiimotemanager.ui:921
 msgid "Edit mappings..."
 msgstr "Editar mapeo..."
 
-#: ../data/wiimotemanager.ui:759
-msgid "Mapping validation failed"
-msgstr "ValidaciÃn de mapeo fallida"
+#: ../data/wiimotemanager.ui:935
+msgid "Show mappings on startup"
+msgstr "Mostrar mapeos al iniciar"
 
-#: ../data/wiimotemanager.ui:788
-msgid "It looks the activated mapping contains errors."
-msgstr "Parece que el mapeo activado contiene errores."
+#~ msgid "toolbutton1"
+#~ msgstr "toolbutton1"
+
+#~ msgid "toolbutton2"
+#~ msgstr "toolbutton2"
+
+#~ msgid "toolbutton3"
+#~ msgstr "toolbutton3"
+
+#~ msgid "toolbutton4"
+#~ msgstr "toolbutton4"
+
+#~ msgid "toolbutton5"
+#~ msgstr "toolbutton5"
+
+#~ msgid "Discovering Wiimote"
+#~ msgstr "Descubriendo Wiimote"
 
 #~ msgid "Wiimote mappings"
 #~ msgstr "Mapeos de wiimote"
 
+#~ msgid "Add visible mappings"
+#~ msgstr "AÃade mapeos visibles"
+
 #~ msgid "<b>Mappings</b>"
 #~ msgstr "<b>Mapeos</b>"
+
+#~ msgid ""
+#~ "Hold left button for use wiimote\n"
+#~ "Right button for menu"
+#~ msgstr ""
+#~ "MantÃn presionado el botÃn izquierdo para usar el Wiimote\n"
+#~ "BotÃn derecho para el menÃ"
diff --git a/po/et.po b/po/et.po
index f9fbacd..7585a80 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,103 +6,94 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wiican\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL ADDRESS>\n"
-"POT-Creation-Date: 2010-11-13 14:38+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-16 14:27+0200\n"
 "PO-Revision-Date: 2011-02-13 16:28+0000\n"
 "Last-Translator: J. FÃlix OntaÃÃn <Unknown>\n"
 "Language-Team: Estonian <et li org>\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-07 23:04+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2012-08-16 12:08+0000\n"
+"X-Generator: Launchpad (build 15810)\n"
 
-#: ../bin/wiican:102
+#: ../bin/wiican:134
 msgid "Plug a bluetooth adapter"
 msgstr ""
 
-#: ../bin/wiican:107
+#: ../bin/wiican:142
 msgid "Please load uinput module first"
 msgstr ""
 
-#: ../bin/wiican:113
-msgid ""
-"Hold left button for use wiimote\n"
-"Right button for menu"
-msgstr ""
-
-#: ../bin/wiican:125
-msgid "Discovering Wiimote"
+#: ../bin/wiican:196
+msgid "Set some visible mappings"
 msgstr ""
 
-#: ../bin/wiican:160
-msgid "Add visible mappings"
-msgstr ""
-
-#: ../bin/wiican:205 ../wiican/ui/editordlg.py:148
+#: ../bin/wiican:239 ../wiican/ui/editordlg.py:148
 msgid "Editing "
 msgstr "Muudan "
 
-#: ../bin/wiican:218 ../wiican/ui/editordlg.py:266
+#: ../bin/wiican:252 ../wiican/ui/editordlg.py:267
 msgid "Press 1+2"
 msgstr ""
 
-#: ../bin/wiican:219 ../wiican/ui/editordlg.py:267
+#: ../bin/wiican:253 ../wiican/ui/editordlg.py:268
 msgid "To put you Wiimote in discoverable mode now"
 msgstr ""
 
-#: ../bin/wiican:239 ../wiican/mapping/manager.py:106
+#: ../bin/wiican:273 ../wiican/mapping/manager.py:106
 #, python-format
 msgid "Not %s file found on wiican package"
 msgstr ""
 
-#: ../bin/wiican:243 ../wiican/mapping/manager.py:110
+#: ../bin/wiican:277 ../wiican/mapping/manager.py:110
 #, python-format
 msgid "Not %s file found  on wiican package"
 msgstr ""
 
-#: ../bin/wiican:282
+#: ../bin/wiican:316
 msgid "Wiican Mapping Package load failed!"
 msgstr ""
 
-#: ../bin/wiican:289
+#: ../bin/wiican:323
 msgid "usage: %prog [options] arg"
 msgstr ""
 
-#: ../bin/wiican:291
+#: ../bin/wiican:325
 msgid "loads mapping package from FILENAME"
 msgstr ""
 
-#: ../bin/wiican:310
+#: ../bin/wiican:344
 #, python-format
 msgid "No wiican package mapping found: %s"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:38
+#: ../wiican/ui/managerdlg.py:43
 msgid "Wiican Mapping Package"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:88
+#: ../wiican/ui/managerdlg.py:111
 msgid "Editing new mapping"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:143
+#: ../wiican/ui/managerdlg.py:179
 msgid "Are you sure you want to completely remove this mapping?"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:152
+#: ../wiican/ui/managerdlg.py:188
 msgid "Deleting mappings"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:179
+#: ../wiican/ui/managerdlg.py:217
 msgid "Import mapping..."
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:197
+#: ../wiican/ui/managerdlg.py:235
 msgid "Wiican Mapping Package import failed!"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:227
+#: ../wiican/ui/managerdlg.py:265
 msgid "Exporting mapping..."
 msgstr ""
 
@@ -127,157 +118,153 @@ msgid "Ensure a bluetooth "
 msgstr ""
 
 #: ../wiican/mapping/manager.py:131 ../wiican/mapping/manager.py:171
-#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:184
-#: ../wiican/mapping/manager.py:192 ../wiican/mapping/manager.py:200
-#: ../wiican/mapping/manager.py:218 ../wiican/mapping/manager.py:232
-#: ../wiican/mapping/manager.py:238
+#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:193
+#: ../wiican/mapping/manager.py:201 ../wiican/mapping/manager.py:209
+#: ../wiican/mapping/manager.py:225 ../wiican/mapping/manager.py:248
+#: ../wiican/mapping/manager.py:262 ../wiican/mapping/manager.py:268
 msgid "Mapping not found:"
 msgstr ""
 
-#: ../wiican/mapping/manager.py:221
+#: ../wiican/mapping/manager.py:251
 msgid "Cannot remove a system installed mapping"
 msgstr ""
 
-#: ../data/mapping.ui:21
-msgid "Wiican mappings"
+#: ../data/mapping.ui:5
+msgid "Autostart running this mapping"
 msgstr ""
 
-#: ../data/mapping.ui:44
-msgid "toolbutton1"
+#: ../data/mapping.ui:6 ../data/mapping.ui:651
+msgid "_Autostart"
 msgstr ""
 
-#: ../data/mapping.ui:57
-msgid "toolbutton2"
+#: ../data/mapping.ui:7
+msgid "Launch this mapping automatically at desktop session start"
 msgstr ""
 
-#: ../data/mapping.ui:70
-msgid "toolbutton3"
+#: ../data/mapping.ui:11
+msgid "Delete mapping"
 msgstr ""
 
-#: ../data/mapping.ui:92
-msgid "toolbutton4"
+#: ../data/mapping.ui:12
+msgid "_Delete"
 msgstr ""
 
-#: ../data/mapping.ui:105
-msgid "toolbutton5"
+#: ../data/mapping.ui:13
+msgid "Remove mapping from the catalog"
 msgstr ""
 
-#: ../data/mapping.ui:314
-msgid "_Name:"
-msgstr "_Nimi:"
-
-#: ../data/mapping.ui:326
-msgid "Co_mment:"
-msgstr "_Kommentaar:"
-
-#: ../data/mapping.ui:337
-msgid "A_uthor/s:"
+#: ../data/mapping.ui:18
+msgid "Edit mapping"
 msgstr ""
 
-#: ../data/mapping.ui:348
-msgid "_Version:"
-msgstr "_Versioon:"
-
-#: ../data/mapping.ui:443
-msgid "_Icon:"
-msgstr "_Ikoon:"
-
-#: ../data/mapping.ui:466
-msgid "<b>General</b>"
-msgstr "<b>Ãldine</b>"
-
-#: ../data/mapping.ui:539
-msgid ""
-"This is a system installed mapping. \n"
-"Changes will be saved in a new mapping."
+#: ../data/mapping.ui:19 ../data/mapping.ui:620
+msgid "_Edit"
 msgstr ""
 
-#: ../data/mapping.ui:565
-msgid "Execute mapping"
+#: ../data/mapping.ui:20
+msgid "Edit mapping properties"
 msgstr ""
 
-#: ../data/mapping.ui:586
-msgid "Mapping programming help"
+#: ../data/mapping.ui:25
+msgid "_Export mapping"
 msgstr ""
 
-#: ../data/mapping.ui:620
-msgid "<b>Mapping</b>"
-msgstr "<b>Kaardistus</b>"
+#: ../data/mapping.ui:26 ../data/mapping.ui:692
+msgid "E_xport"
+msgstr "_Ekspordi"
 
-#: ../data/mapping.ui:684
-msgid "Edit mapping"
+#: ../data/mapping.ui:27
+msgid "Export mapping as a .wii file"
 msgstr ""
 
-#: ../data/mapping.ui:685
-msgid "_Edit"
+#: ../data/mapping.ui:32
+msgid "Import mapping"
 msgstr ""
 
-#: ../data/mapping.ui:686
-msgid "Edit mapping properties"
-msgstr ""
+#: ../data/mapping.ui:33 ../data/mapping.ui:676
+msgid "_Import"
+msgstr "_Impordi"
 
-#: ../data/mapping.ui:691
-msgid "Delete mapping"
+#: ../data/mapping.ui:34
+msgid "Import a mapping from a .wii file"
 msgstr ""
 
-#: ../data/mapping.ui:692
-msgid "_Delete"
+#: ../data/mapping.ui:39
+msgid "New mapping"
 msgstr ""
 
-#: ../data/mapping.ui:693
-msgid "Removes the mapping from the catalog"
+#: ../data/mapping.ui:40 ../data/mapping.ui:604
+msgid "_New"
 msgstr ""
 
-#: ../data/mapping.ui:698
-msgid "Import mapping"
+#: ../data/mapping.ui:41
+msgid "Create a new mapping"
 msgstr ""
 
-#: ../data/mapping.ui:699
-msgid "_Import"
-msgstr "_Impordi"
+#: ../data/mapping.ui:146
+msgid "_Name:"
+msgstr "_Nimi:"
 
-#: ../data/mapping.ui:700
-msgid "Import a mapping from a .wii file"
+#: ../data/mapping.ui:160
+msgid "Co_mment:"
+msgstr "_Kommentaar:"
+
+#: ../data/mapping.ui:174
+msgid "A_uthor/s:"
 msgstr ""
 
-#: ../data/mapping.ui:705
-msgid "_Export mapping"
+#: ../data/mapping.ui:188
+msgid "_Version:"
+msgstr "_Versioon:"
+
+#: ../data/mapping.ui:298
+msgid "_Icon:"
+msgstr "_Ikoon:"
+
+#: ../data/mapping.ui:325
+msgid "<b>General</b>"
+msgstr "<b>Ãldine</b>"
+
+#: ../data/mapping.ui:384
+msgid "Mapping programming help"
 msgstr ""
 
-#: ../data/mapping.ui:706
-msgid "E_xport"
-msgstr "_Ekspordi"
+#: ../data/mapping.ui:402
+msgid "Execute mapping"
+msgstr ""
 
-#: ../data/mapping.ui:707
-msgid "Export mapping as a .wii file"
+#: ../data/mapping.ui:454
+msgid ""
+"This is a system installed mapping. \n"
+"Changes will be saved in a new mapping."
 msgstr ""
 
-#: ../data/mapping.ui:712
-msgid "New mapping"
+#: ../data/mapping.ui:496
+msgid "<b>Mapping</b>"
+msgstr "<b>Kaardistus</b>"
+
+#: ../data/mapping.ui:540
+msgid "Wiican mappings"
 msgstr ""
 
-#: ../data/mapping.ui:713
-msgid "_New"
+#: ../data/wiimotemanager.ui:7
+msgid "Mapping validation failed"
 msgstr ""
 
-#: ../data/mapping.ui:714
-msgid "Creates a new mapping"
+#: ../data/wiimotemanager.ui:87
+msgid "It looks the activated mapping contains errors."
 msgstr ""
 
-#: ../data/wiimotemanager.ui:13
+#: ../data/wiimotemanager.ui:120
 msgid ""
 "Yes wii can\n"
 "Wiimote usage assistant and mapping manager"
 msgstr ""
 
-#: ../data/wiimotemanager.ui:726
+#: ../data/wiimotemanager.ui:921
 msgid "Edit mappings..."
 msgstr "Muuda kaardistust..."
 
-#: ../data/wiimotemanager.ui:759
-msgid "Mapping validation failed"
-msgstr ""
-
-#: ../data/wiimotemanager.ui:788
-msgid "It looks the activated mapping contains errors."
+#: ../data/wiimotemanager.ui:935
+msgid "Show mappings on startup"
 msgstr ""
diff --git a/po/eu.po b/po/eu.po
index fc6e083..3bffe51 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,109 +7,99 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wiican\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-13 14:38+0100\n"
-"PO-Revision-Date: 2011-02-13 16:38+0000\n"
-"Last-Translator: Abel Camacho <didaktika santurtzieus com>\n"
+"POT-Creation-Date: 2012-08-16 14:27+0200\n"
+"PO-Revision-Date: 2011-12-12 16:45+0000\n"
+"Last-Translator: Asier Iturralde Sarasola <Unknown>\n"
 "Language-Team: Basque <eu li org>\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-07 23:04+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
-"Language: eu\n"
+"X-Launchpad-Export-Date: 2012-08-16 12:08+0000\n"
+"X-Generator: Launchpad (build 15810)\n"
 
-#: ../bin/wiican:102
+#: ../bin/wiican:134
 msgid "Plug a bluetooth adapter"
-msgstr ""
+msgstr "Konektatu bluetooth egokigailu bat"
 
-#: ../bin/wiican:107
+#: ../bin/wiican:142
 msgid "Please load uinput module first"
-msgstr ""
-
-#: ../bin/wiican:113
-msgid ""
-"Hold left button for use wiimote\n"
-"Right button for menu"
-msgstr ""
-
-#: ../bin/wiican:125
-msgid "Discovering Wiimote"
-msgstr ""
+msgstr "Mesedez, kargatu uinput modulua lehenik"
 
-#: ../bin/wiican:160
-msgid "Add visible mappings"
-msgstr ""
+#: ../bin/wiican:196
+msgid "Set some visible mappings"
+msgstr "Ezarri zenbait mapatze ikusgai"
 
-#: ../bin/wiican:205 ../wiican/ui/editordlg.py:148
+#: ../bin/wiican:239 ../wiican/ui/editordlg.py:148
 msgid "Editing "
 msgstr "Editatzen "
 
-#: ../bin/wiican:218 ../wiican/ui/editordlg.py:266
+#: ../bin/wiican:252 ../wiican/ui/editordlg.py:267
 msgid "Press 1+2"
-msgstr ""
+msgstr "Sakatu 1+2"
 
-#: ../bin/wiican:219 ../wiican/ui/editordlg.py:267
+#: ../bin/wiican:253 ../wiican/ui/editordlg.py:268
 msgid "To put you Wiimote in discoverable mode now"
-msgstr ""
+msgstr "Zure Wiimote-a modu aurkigarrian jartzeko orain"
 
-#: ../bin/wiican:239 ../wiican/mapping/manager.py:106
+#: ../bin/wiican:273 ../wiican/mapping/manager.py:106
 #, python-format
 msgid "Not %s file found on wiican package"
-msgstr ""
+msgstr "Ez da %s fitxategirik aurkitu wiican paketean"
 
-#: ../bin/wiican:243 ../wiican/mapping/manager.py:110
+#: ../bin/wiican:277 ../wiican/mapping/manager.py:110
 #, python-format
 msgid "Not %s file found  on wiican package"
-msgstr ""
+msgstr "Ez da %s fitxategirik aurkitu wiican paketean"
 
-#: ../bin/wiican:282
+#: ../bin/wiican:316
 msgid "Wiican Mapping Package load failed!"
-msgstr ""
+msgstr "Wiican-en Mapatze Paketearen kargak huts egin du!"
 
-#: ../bin/wiican:289
+#: ../bin/wiican:323
 msgid "usage: %prog [options] arg"
-msgstr ""
+msgstr "erabilera: %prog [aukerak] arg"
 
-#: ../bin/wiican:291
+#: ../bin/wiican:325
 msgid "loads mapping package from FILENAME"
-msgstr ""
+msgstr "FILENAME-etik mapatze paketea kargatzen du"
 
-#: ../bin/wiican:310
+#: ../bin/wiican:344
 #, python-format
 msgid "No wiican package mapping found: %s"
-msgstr ""
+msgstr "Ez da wiican-en mapatze paketerik aurkitu: %s"
 
-#: ../wiican/ui/managerdlg.py:38
+#: ../wiican/ui/managerdlg.py:43
 msgid "Wiican Mapping Package"
-msgstr ""
+msgstr "Wiican-en Mapatze Paketea"
 
-#: ../wiican/ui/managerdlg.py:88
+#: ../wiican/ui/managerdlg.py:111
 msgid "Editing new mapping"
-msgstr ""
+msgstr "Mapatze berria editatzen"
 
-#: ../wiican/ui/managerdlg.py:143
+#: ../wiican/ui/managerdlg.py:179
 msgid "Are you sure you want to completely remove this mapping?"
-msgstr ""
+msgstr "Ziur zaude mapatze hau betirako ezabatu nahi duzula?"
 
-#: ../wiican/ui/managerdlg.py:152
+#: ../wiican/ui/managerdlg.py:188
 msgid "Deleting mappings"
-msgstr ""
+msgstr "Mapatzeak ezabatzen"
 
-#: ../wiican/ui/managerdlg.py:179
+#: ../wiican/ui/managerdlg.py:217
 msgid "Import mapping..."
-msgstr ""
+msgstr "Inportatu mapatzea..."
 
-#: ../wiican/ui/managerdlg.py:197
+#: ../wiican/ui/managerdlg.py:235
 msgid "Wiican Mapping Package import failed!"
-msgstr ""
+msgstr "Wiican-en Mapatze Paketearen inportazioak huts egin du!"
 
-#: ../wiican/ui/managerdlg.py:227
+#: ../wiican/ui/managerdlg.py:265
 msgid "Exporting mapping..."
-msgstr ""
+msgstr "Mapatzea esportatzen..."
 
 #: ../wiican/ui/editordlg.py:50
 msgid "Select image icon.."
-msgstr ""
+msgstr "Hautatu irudi-ikonoa..."
 
 #: ../wiican/ui/editordlg.py:80
 msgid "Images"
@@ -117,168 +107,205 @@ msgstr "Irudiak"
 
 #: ../wiican/ui/editordlg.py:171
 msgid "A mapping is running"
-msgstr ""
+msgstr "Mapatze bat martxan dago"
 
 #: ../wiican/ui/editordlg.py:176
 msgid "Execute this mapping"
-msgstr ""
+msgstr "Exekutatu mapatze hau"
 
 #: ../wiican/ui/editordlg.py:185
 msgid "Ensure a bluetooth "
-msgstr ""
+msgstr "Ziurtatu bluetooth bat "
 
 #: ../wiican/mapping/manager.py:131 ../wiican/mapping/manager.py:171
-#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:184
-#: ../wiican/mapping/manager.py:192 ../wiican/mapping/manager.py:200
-#: ../wiican/mapping/manager.py:218 ../wiican/mapping/manager.py:232
-#: ../wiican/mapping/manager.py:238
+#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:193
+#: ../wiican/mapping/manager.py:201 ../wiican/mapping/manager.py:209
+#: ../wiican/mapping/manager.py:225 ../wiican/mapping/manager.py:248
+#: ../wiican/mapping/manager.py:262 ../wiican/mapping/manager.py:268
 msgid "Mapping not found:"
-msgstr ""
+msgstr "Ez da mapatzea aurkitu:"
 
-#: ../wiican/mapping/manager.py:221
+#: ../wiican/mapping/manager.py:251
 msgid "Cannot remove a system installed mapping"
-msgstr ""
+msgstr "Ezin da sisteman instalatutako mapatze bat kendu"
 
-#: ../data/mapping.ui:21
-msgid "Wiican mappings"
-msgstr ""
+#: ../data/mapping.ui:5
+#, fuzzy
+msgid "Autostart running this mapping"
+msgstr "Exekutatu mapatze hau"
 
-#: ../data/mapping.ui:44
-msgid "toolbutton1"
+#: ../data/mapping.ui:6 ../data/mapping.ui:651
+msgid "_Autostart"
 msgstr ""
 
-#: ../data/mapping.ui:57
-msgid "toolbutton2"
+#: ../data/mapping.ui:7
+msgid "Launch this mapping automatically at desktop session start"
 msgstr ""
 
-#: ../data/mapping.ui:70
-msgid "toolbutton3"
-msgstr ""
+#: ../data/mapping.ui:11
+msgid "Delete mapping"
+msgstr "Ezabatu mapatzea"
 
-#: ../data/mapping.ui:92
-msgid "toolbutton4"
-msgstr ""
+#: ../data/mapping.ui:12
+msgid "_Delete"
+msgstr "E_zabatu"
 
-#: ../data/mapping.ui:105
-msgid "toolbutton5"
-msgstr ""
+#: ../data/mapping.ui:13
+#, fuzzy
+msgid "Remove mapping from the catalog"
+msgstr "Mapatzea katalogotik ezabatzen du"
+
+#: ../data/mapping.ui:18
+msgid "Edit mapping"
+msgstr "Editatu mapatzea"
+
+#: ../data/mapping.ui:19 ../data/mapping.ui:620
+msgid "_Edit"
+msgstr "E_ditatu"
+
+#: ../data/mapping.ui:20
+msgid "Edit mapping properties"
+msgstr "Editatu mapatzearen ezaugarriak"
+
+#: ../data/mapping.ui:25
+msgid "_Export mapping"
+msgstr "_Esportatu mapatzea"
 
-#: ../data/mapping.ui:314
+#: ../data/mapping.ui:26 ../data/mapping.ui:692
+msgid "E_xport"
+msgstr "E_sportatu"
+
+#: ../data/mapping.ui:27
+msgid "Export mapping as a .wii file"
+msgstr "Esportatu mapatzea .wii fitxategi bezala"
+
+#: ../data/mapping.ui:32
+msgid "Import mapping"
+msgstr "Inportatu mapatzea"
+
+#: ../data/mapping.ui:33 ../data/mapping.ui:676
+msgid "_Import"
+msgstr "I_nportatu"
+
+#: ../data/mapping.ui:34
+msgid "Import a mapping from a .wii file"
+msgstr "Inportatu mapatze bat .wii fitxategi batetatik"
+
+#: ../data/mapping.ui:39
+msgid "New mapping"
+msgstr "Mapatze berria"
+
+#: ../data/mapping.ui:40 ../data/mapping.ui:604
+msgid "_New"
+msgstr "_Berria"
+
+#: ../data/mapping.ui:41
+#, fuzzy
+msgid "Create a new mapping"
+msgstr "Mapatze berri bat sortzen du"
+
+#: ../data/mapping.ui:146
 msgid "_Name:"
-msgstr ""
+msgstr "_Izena:"
 
-#: ../data/mapping.ui:326
+#: ../data/mapping.ui:160
 msgid "Co_mment:"
-msgstr ""
+msgstr "I_ruzkina:"
 
-#: ../data/mapping.ui:337
+#: ../data/mapping.ui:174
 msgid "A_uthor/s:"
-msgstr ""
+msgstr "_Egilea(k):"
 
-#: ../data/mapping.ui:348
+#: ../data/mapping.ui:188
 msgid "_Version:"
-msgstr ""
+msgstr "_Bertsioa:"
 
-#: ../data/mapping.ui:443
+#: ../data/mapping.ui:298
 msgid "_Icon:"
-msgstr ""
+msgstr "I_konoa"
 
-#: ../data/mapping.ui:466
+#: ../data/mapping.ui:325
 msgid "<b>General</b>"
-msgstr ""
+msgstr "<b>Orokorra</b>"
 
-#: ../data/mapping.ui:539
-msgid ""
-"This is a system installed mapping. \n"
-"Changes will be saved in a new mapping."
-msgstr ""
+#: ../data/mapping.ui:384
+msgid "Mapping programming help"
+msgstr "Mapatzeen programaziorako laguntza"
 
-#: ../data/mapping.ui:565
+#: ../data/mapping.ui:402
 msgid "Execute mapping"
-msgstr ""
+msgstr "Exekutatu mapatzea"
 
-#: ../data/mapping.ui:586
-msgid "Mapping programming help"
+#: ../data/mapping.ui:454
+msgid ""
+"This is a system installed mapping. \n"
+"Changes will be saved in a new mapping."
 msgstr ""
+"Hau sisteman instalatutako mapatze bat da. \n"
+"Aldaketak mapatze berri batean gordeko dira."
 
-#: ../data/mapping.ui:620
+#: ../data/mapping.ui:496
 msgid "<b>Mapping</b>"
-msgstr ""
+msgstr "<b>Mapatzea</b>"
 
-#: ../data/mapping.ui:684
-msgid "Edit mapping"
-msgstr ""
-
-#: ../data/mapping.ui:685
-msgid "_Edit"
-msgstr ""
-
-#: ../data/mapping.ui:686
-msgid "Edit mapping properties"
-msgstr ""
-
-#: ../data/mapping.ui:691
-msgid "Delete mapping"
-msgstr ""
+#: ../data/mapping.ui:540
+msgid "Wiican mappings"
+msgstr "Wiican mapatzeak"
 
-#: ../data/mapping.ui:692
-msgid "_Delete"
-msgstr ""
+#: ../data/wiimotemanager.ui:7
+msgid "Mapping validation failed"
+msgstr "Mapatzearen egiaztatzeak huts egin du"
 
-#: ../data/mapping.ui:693
-msgid "Removes the mapping from the catalog"
-msgstr ""
+#: ../data/wiimotemanager.ui:87
+msgid "It looks the activated mapping contains errors."
+msgstr "Aktibatutako mapatzeak erroreak dituela dirudi."
 
-#: ../data/mapping.ui:698
-msgid "Import mapping"
+#: ../data/wiimotemanager.ui:120
+msgid ""
+"Yes wii can\n"
+"Wiimote usage assistant and mapping manager"
 msgstr ""
+"Yes wii can\n"
+"Wiimote-aren erabilerarako laguntzailea eta mapatze kudeatzailea"
 
-#: ../data/mapping.ui:699
-msgid "_Import"
-msgstr ""
+#: ../data/wiimotemanager.ui:921
+msgid "Edit mappings..."
+msgstr "Editatu mapatzeak..."
 
-#: ../data/mapping.ui:700
-msgid "Import a mapping from a .wii file"
-msgstr ""
+#: ../data/wiimotemanager.ui:935
+msgid "Show mappings on startup"
+msgstr "Erakutsi mapatzeak abioan"
 
-#: ../data/mapping.ui:705
-msgid "_Export mapping"
-msgstr ""
+#~ msgid "toolbutton1"
+#~ msgstr "toolbutton1"
 
-#: ../data/mapping.ui:706
-msgid "E_xport"
-msgstr ""
+#~ msgid "toolbutton2"
+#~ msgstr "toolbutton2"
 
-#: ../data/mapping.ui:707
-msgid "Export mapping as a .wii file"
-msgstr ""
+#~ msgid "toolbutton3"
+#~ msgstr "toolbutton3"
 
-#: ../data/mapping.ui:712
-msgid "New mapping"
-msgstr ""
+#~ msgid "toolbutton4"
+#~ msgstr "toolbutton4"
 
-#: ../data/mapping.ui:713
-msgid "_New"
-msgstr ""
+#~ msgid "toolbutton5"
+#~ msgstr "toolbutton5"
 
-#: ../data/mapping.ui:714
-msgid "Creates a new mapping"
-msgstr ""
+#~ msgid "Wiimote mappings"
+#~ msgstr "Wiimote mapatzeak"
 
-#: ../data/wiimotemanager.ui:13
-msgid ""
-"Yes wii can\n"
-"Wiimote usage assistant and mapping manager"
-msgstr ""
+#~ msgid "Discovering Wiimote"
+#~ msgstr "Wiimote-a aurkitzen"
 
-#: ../data/wiimotemanager.ui:726
-msgid "Edit mappings..."
-msgstr ""
+#~ msgid "<b>Mappings</b>"
+#~ msgstr "<b>Mapatzeak</b>"
 
-#: ../data/wiimotemanager.ui:759
-msgid "Mapping validation failed"
-msgstr ""
+#~ msgid "Add visible mappings"
+#~ msgstr "Gehitu mapatze ikusgaiak"
 
-#: ../data/wiimotemanager.ui:788
-msgid "It looks the activated mapping contains errors."
-msgstr ""
+#~ msgid ""
+#~ "Hold left button for use wiimote\n"
+#~ "Right button for menu"
+#~ msgstr ""
+#~ "Mantendu ezkerreko botoia sakatuta wiimote-a erabiltzeko\n"
+#~ "Eskuineko botoia menuarentzat"
diff --git a/po/fi.po b/po/fi.po
index 11745ff..08282af 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,105 +6,94 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wiican\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL ADDRESS>\n"
-"POT-Creation-Date: 2010-11-13 14:38+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-16 14:27+0200\n"
 "PO-Revision-Date: 2011-02-13 16:23+0000\n"
 "Last-Translator: J. FÃlix OntaÃÃn <Unknown>\n"
 "Language-Team: Finnish <fi li org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-07 23:04+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2012-08-16 12:08+0000\n"
+"X-Generator: Launchpad (build 15810)\n"
 
-#: ../bin/wiican:102
+#: ../bin/wiican:134
 msgid "Plug a bluetooth adapter"
 msgstr "Liità bluetooth-sovitin"
 
-#: ../bin/wiican:107
+#: ../bin/wiican:142
 msgid "Please load uinput module first"
 msgstr "Lataa ensin ytimen uinput-moduuli"
 
-#: ../bin/wiican:113
-msgid ""
-"Hold left button for use wiimote\n"
-"Right button for menu"
-msgstr ""
-"Pidà vasenta painiketta pohjassa kÃyttÃÃksesi Wiimotea\n"
-"Oikea painike avaa valikon"
-
-#: ../bin/wiican:125
-msgid "Discovering Wiimote"
-msgstr "EtsitÃÃn Wiimotea"
-
-#: ../bin/wiican:160
-msgid "Add visible mappings"
+#: ../bin/wiican:196
+msgid "Set some visible mappings"
 msgstr ""
 
-#: ../bin/wiican:205 ../wiican/ui/editordlg.py:148
+#: ../bin/wiican:239 ../wiican/ui/editordlg.py:148
 msgid "Editing "
 msgstr "Muokataan "
 
-#: ../bin/wiican:218 ../wiican/ui/editordlg.py:266
+#: ../bin/wiican:252 ../wiican/ui/editordlg.py:267
 msgid "Press 1+2"
 msgstr "Paina 1+2"
 
-#: ../bin/wiican:219 ../wiican/ui/editordlg.py:267
+#: ../bin/wiican:253 ../wiican/ui/editordlg.py:268
 msgid "To put you Wiimote in discoverable mode now"
 msgstr "saadaksesi Wiimoten tilaan, jossa se voidaan havaita"
 
-#: ../bin/wiican:239 ../wiican/mapping/manager.py:106
+#: ../bin/wiican:273 ../wiican/mapping/manager.py:106
 #, python-format
 msgid "Not %s file found on wiican package"
 msgstr "%s tiedostoa ei lÃytynyt wiican paketista"
 
-#: ../bin/wiican:243 ../wiican/mapping/manager.py:110
+#: ../bin/wiican:277 ../wiican/mapping/manager.py:110
 #, python-format
 msgid "Not %s file found  on wiican package"
 msgstr "%s tiedostoa ei lÃytynyt wiican paketista"
 
-#: ../bin/wiican:282
+#: ../bin/wiican:316
 msgid "Wiican Mapping Package load failed!"
 msgstr ""
 
-#: ../bin/wiican:289
+#: ../bin/wiican:323
 msgid "usage: %prog [options] arg"
 msgstr ""
 
-#: ../bin/wiican:291
+#: ../bin/wiican:325
 msgid "loads mapping package from FILENAME"
 msgstr ""
 
-#: ../bin/wiican:310
+#: ../bin/wiican:344
 #, python-format
 msgid "No wiican package mapping found: %s"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:38
+#: ../wiican/ui/managerdlg.py:43
 msgid "Wiican Mapping Package"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:88
+#: ../wiican/ui/managerdlg.py:111
 msgid "Editing new mapping"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:143
+#: ../wiican/ui/managerdlg.py:179
 msgid "Are you sure you want to completely remove this mapping?"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:152
+#: ../wiican/ui/managerdlg.py:188
 msgid "Deleting mappings"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:179
+#: ../wiican/ui/managerdlg.py:217
 msgid "Import mapping..."
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:197
+#: ../wiican/ui/managerdlg.py:235
 msgid "Wiican Mapping Package import failed!"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:227
+#: ../wiican/ui/managerdlg.py:265
 msgid "Exporting mapping..."
 msgstr ""
 
@@ -129,157 +118,163 @@ msgid "Ensure a bluetooth "
 msgstr ""
 
 #: ../wiican/mapping/manager.py:131 ../wiican/mapping/manager.py:171
-#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:184
-#: ../wiican/mapping/manager.py:192 ../wiican/mapping/manager.py:200
-#: ../wiican/mapping/manager.py:218 ../wiican/mapping/manager.py:232
-#: ../wiican/mapping/manager.py:238
+#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:193
+#: ../wiican/mapping/manager.py:201 ../wiican/mapping/manager.py:209
+#: ../wiican/mapping/manager.py:225 ../wiican/mapping/manager.py:248
+#: ../wiican/mapping/manager.py:262 ../wiican/mapping/manager.py:268
 msgid "Mapping not found:"
 msgstr ""
 
-#: ../wiican/mapping/manager.py:221
+#: ../wiican/mapping/manager.py:251
 msgid "Cannot remove a system installed mapping"
 msgstr ""
 
-#: ../data/mapping.ui:21
-msgid "Wiican mappings"
+#: ../data/mapping.ui:5
+msgid "Autostart running this mapping"
 msgstr ""
 
-#: ../data/mapping.ui:44
-msgid "toolbutton1"
+#: ../data/mapping.ui:6 ../data/mapping.ui:651
+msgid "_Autostart"
 msgstr ""
 
-#: ../data/mapping.ui:57
-msgid "toolbutton2"
+#: ../data/mapping.ui:7
+msgid "Launch this mapping automatically at desktop session start"
 msgstr ""
 
-#: ../data/mapping.ui:70
-msgid "toolbutton3"
+#: ../data/mapping.ui:11
+msgid "Delete mapping"
 msgstr ""
 
-#: ../data/mapping.ui:92
-msgid "toolbutton4"
+#: ../data/mapping.ui:12
+msgid "_Delete"
 msgstr ""
 
-#: ../data/mapping.ui:105
-msgid "toolbutton5"
+#: ../data/mapping.ui:13
+msgid "Remove mapping from the catalog"
 msgstr ""
 
-#: ../data/mapping.ui:314
-msgid "_Name:"
+#: ../data/mapping.ui:18
+msgid "Edit mapping"
 msgstr ""
 
-#: ../data/mapping.ui:326
-msgid "Co_mment:"
+#: ../data/mapping.ui:19 ../data/mapping.ui:620
+msgid "_Edit"
 msgstr ""
 
-#: ../data/mapping.ui:337
-msgid "A_uthor/s:"
+#: ../data/mapping.ui:20
+msgid "Edit mapping properties"
 msgstr ""
 
-#: ../data/mapping.ui:348
-msgid "_Version:"
+#: ../data/mapping.ui:25
+msgid "_Export mapping"
 msgstr ""
 
-#: ../data/mapping.ui:443
-msgid "_Icon:"
+#: ../data/mapping.ui:26 ../data/mapping.ui:692
+msgid "E_xport"
 msgstr ""
 
-#: ../data/mapping.ui:466
-msgid "<b>General</b>"
+#: ../data/mapping.ui:27
+msgid "Export mapping as a .wii file"
 msgstr ""
 
-#: ../data/mapping.ui:539
-msgid ""
-"This is a system installed mapping. \n"
-"Changes will be saved in a new mapping."
+#: ../data/mapping.ui:32
+msgid "Import mapping"
 msgstr ""
 
-#: ../data/mapping.ui:565
-msgid "Execute mapping"
+#: ../data/mapping.ui:33 ../data/mapping.ui:676
+msgid "_Import"
 msgstr ""
 
-#: ../data/mapping.ui:586
-msgid "Mapping programming help"
+#: ../data/mapping.ui:34
+msgid "Import a mapping from a .wii file"
 msgstr ""
 
-#: ../data/mapping.ui:620
-msgid "<b>Mapping</b>"
+#: ../data/mapping.ui:39
+msgid "New mapping"
 msgstr ""
 
-#: ../data/mapping.ui:684
-msgid "Edit mapping"
+#: ../data/mapping.ui:40 ../data/mapping.ui:604
+msgid "_New"
 msgstr ""
 
-#: ../data/mapping.ui:685
-msgid "_Edit"
+#: ../data/mapping.ui:41
+msgid "Create a new mapping"
 msgstr ""
 
-#: ../data/mapping.ui:686
-msgid "Edit mapping properties"
+#: ../data/mapping.ui:146
+msgid "_Name:"
 msgstr ""
 
-#: ../data/mapping.ui:691
-msgid "Delete mapping"
+#: ../data/mapping.ui:160
+msgid "Co_mment:"
 msgstr ""
 
-#: ../data/mapping.ui:692
-msgid "_Delete"
+#: ../data/mapping.ui:174
+msgid "A_uthor/s:"
 msgstr ""
 
-#: ../data/mapping.ui:693
-msgid "Removes the mapping from the catalog"
+#: ../data/mapping.ui:188
+msgid "_Version:"
 msgstr ""
 
-#: ../data/mapping.ui:698
-msgid "Import mapping"
+#: ../data/mapping.ui:298
+msgid "_Icon:"
 msgstr ""
 
-#: ../data/mapping.ui:699
-msgid "_Import"
+#: ../data/mapping.ui:325
+msgid "<b>General</b>"
 msgstr ""
 
-#: ../data/mapping.ui:700
-msgid "Import a mapping from a .wii file"
+#: ../data/mapping.ui:384
+msgid "Mapping programming help"
 msgstr ""
 
-#: ../data/mapping.ui:705
-msgid "_Export mapping"
+#: ../data/mapping.ui:402
+msgid "Execute mapping"
 msgstr ""
 
-#: ../data/mapping.ui:706
-msgid "E_xport"
+#: ../data/mapping.ui:454
+msgid ""
+"This is a system installed mapping. \n"
+"Changes will be saved in a new mapping."
 msgstr ""
 
-#: ../data/mapping.ui:707
-msgid "Export mapping as a .wii file"
+#: ../data/mapping.ui:496
+msgid "<b>Mapping</b>"
 msgstr ""
 
-#: ../data/mapping.ui:712
-msgid "New mapping"
+#: ../data/mapping.ui:540
+msgid "Wiican mappings"
 msgstr ""
 
-#: ../data/mapping.ui:713
-msgid "_New"
+#: ../data/wiimotemanager.ui:7
+msgid "Mapping validation failed"
 msgstr ""
 
-#: ../data/mapping.ui:714
-msgid "Creates a new mapping"
+#: ../data/wiimotemanager.ui:87
+msgid "It looks the activated mapping contains errors."
 msgstr ""
 
-#: ../data/wiimotemanager.ui:13
+#: ../data/wiimotemanager.ui:120
 msgid ""
 "Yes wii can\n"
 "Wiimote usage assistant and mapping manager"
 msgstr ""
 
-#: ../data/wiimotemanager.ui:726
+#: ../data/wiimotemanager.ui:921
 msgid "Edit mappings..."
 msgstr ""
 
-#: ../data/wiimotemanager.ui:759
-msgid "Mapping validation failed"
+#: ../data/wiimotemanager.ui:935
+msgid "Show mappings on startup"
 msgstr ""
 
-#: ../data/wiimotemanager.ui:788
-msgid "It looks the activated mapping contains errors."
-msgstr ""
+#~ msgid ""
+#~ "Hold left button for use wiimote\n"
+#~ "Right button for menu"
+#~ msgstr ""
+#~ "Pidà vasenta painiketta pohjassa kÃyttÃÃksesi Wiimotea\n"
+#~ "Oikea painike avaa valikon"
+
+#~ msgid "Discovering Wiimote"
+#~ msgstr "EtsitÃÃn Wiimotea"
diff --git a/po/fr.po b/po/fr.po
index 5dbfe50..be43d5a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,105 +7,93 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wiican\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-13 14:38+0100\n"
-"PO-Revision-Date: 2011-02-13 16:33+0000\n"
-"Last-Translator: J. FÃlix OntaÃÃn <Unknown>\n"
+"POT-Creation-Date: 2012-08-16 14:27+0200\n"
+"PO-Revision-Date: 2012-01-11 07:19+0000\n"
+"Last-Translator: Mathieu Fontaine <Unknown>\n"
 "Language-Team: French <fr li org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-07 23:04+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
-"Language: fr\n"
+"X-Launchpad-Export-Date: 2012-08-16 12:08+0000\n"
+"X-Generator: Launchpad (build 15810)\n"
 
-#: ../bin/wiican:102
+#: ../bin/wiican:134
 msgid "Plug a bluetooth adapter"
 msgstr "Branchez un adaptateur bluetooth"
 
-#: ../bin/wiican:107
+#: ../bin/wiican:142
 msgid "Please load uinput module first"
-msgstr "Commencez par charger le module uinput"
-
-#: ../bin/wiican:113
-msgid ""
-"Hold left button for use wiimote\n"
-"Right button for menu"
-msgstr ""
-"Maintenez le bouton gauche enfoncà pour utiliser la wiimote\n"
-"Maintenez le bouton droit enfoncà pour le menu"
-
-#: ../bin/wiican:125
-msgid "Discovering Wiimote"
-msgstr "Recherche de Wiimotes"
+msgstr "Il semble que le module 'uinput' n'est pas chargÃ"
 
-#: ../bin/wiican:160
-msgid "Add visible mappings"
-msgstr "Ajouter des mappings visibles"
+#: ../bin/wiican:196
+msgid "Set some visible mappings"
+msgstr "DÃfinir des mappings visibles"
 
-#: ../bin/wiican:205 ../wiican/ui/editordlg.py:148
+#: ../bin/wiican:239 ../wiican/ui/editordlg.py:148
 msgid "Editing "
 msgstr "Ãdition "
 
-#: ../bin/wiican:218 ../wiican/ui/editordlg.py:266
+#: ../bin/wiican:252 ../wiican/ui/editordlg.py:267
 msgid "Press 1+2"
 msgstr "Appuyer sur les boutons 1 et 2"
 
-#: ../bin/wiican:219 ../wiican/ui/editordlg.py:267
+#: ../bin/wiican:253 ../wiican/ui/editordlg.py:268
 msgid "To put you Wiimote in discoverable mode now"
 msgstr "Pour passer la wiimote en mode de recherche"
 
-#: ../bin/wiican:239 ../wiican/mapping/manager.py:106
+#: ../bin/wiican:273 ../wiican/mapping/manager.py:106
 #, python-format
 msgid "Not %s file found on wiican package"
 msgstr "Le fichier %s n'a pas Ãtà trouvà dans le paquet wiican"
 
-#: ../bin/wiican:243 ../wiican/mapping/manager.py:110
+#: ../bin/wiican:277 ../wiican/mapping/manager.py:110
 #, python-format
 msgid "Not %s file found  on wiican package"
 msgstr "Le fichier %s n'a pas Ãtà trouvà  dans le paquet wiican"
 
-#: ../bin/wiican:282
+#: ../bin/wiican:316
 msgid "Wiican Mapping Package load failed!"
 msgstr "Le chargement du Paquet de Mapping pour wiican a ÃchouÃ!"
 
-#: ../bin/wiican:289
+#: ../bin/wiican:323
 msgid "usage: %prog [options] arg"
-msgstr "usage: %prog [options] arg"
+msgstr "utilisation : %prog [options] arg"
 
-#: ../bin/wiican:291
+#: ../bin/wiican:325
 msgid "loads mapping package from FILENAME"
 msgstr "Charger les paquets de mappings depuis NOMDEFICHIER"
 
-#: ../bin/wiican:310
+#: ../bin/wiican:344
 #, python-format
 msgid "No wiican package mapping found: %s"
 msgstr "Le paquet de mapping %s pour wiican n'a pas Ãtà trouvÃ"
 
-#: ../wiican/ui/managerdlg.py:38
+#: ../wiican/ui/managerdlg.py:43
 msgid "Wiican Mapping Package"
 msgstr "Paquet de Mapping pour Wiican"
 
-#: ../wiican/ui/managerdlg.py:88
+#: ../wiican/ui/managerdlg.py:111
 msgid "Editing new mapping"
 msgstr "Ãditer un nouveau mapping"
 
-#: ../wiican/ui/managerdlg.py:143
+#: ../wiican/ui/managerdlg.py:179
 msgid "Are you sure you want to completely remove this mapping?"
-msgstr "Ãtes vous sur de vouloir complÃtement enlever ce mapping?"
+msgstr "Ãtes vous sur de vouloir complÃtement enlever ce mapping ?"
 
-#: ../wiican/ui/managerdlg.py:152
+#: ../wiican/ui/managerdlg.py:188
 msgid "Deleting mappings"
 msgstr "Suppression des mappings"
 
-#: ../wiican/ui/managerdlg.py:179
+#: ../wiican/ui/managerdlg.py:217
 msgid "Import mapping..."
 msgstr "Importer un mapping..."
 
-#: ../wiican/ui/managerdlg.py:197
+#: ../wiican/ui/managerdlg.py:235
 msgid "Wiican Mapping Package import failed!"
 msgstr "Import du Paquet de Mapping pour wiican ÃchouÃ!"
 
-#: ../wiican/ui/managerdlg.py:227
+#: ../wiican/ui/managerdlg.py:265
 msgid "Exporting mapping..."
 msgstr "Exporter mapping..."
 
@@ -130,66 +118,125 @@ msgid "Ensure a bluetooth "
 msgstr "Assurez vous de votre bluetooth "
 
 #: ../wiican/mapping/manager.py:131 ../wiican/mapping/manager.py:171
-#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:184
-#: ../wiican/mapping/manager.py:192 ../wiican/mapping/manager.py:200
-#: ../wiican/mapping/manager.py:218 ../wiican/mapping/manager.py:232
-#: ../wiican/mapping/manager.py:238
+#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:193
+#: ../wiican/mapping/manager.py:201 ../wiican/mapping/manager.py:209
+#: ../wiican/mapping/manager.py:225 ../wiican/mapping/manager.py:248
+#: ../wiican/mapping/manager.py:262 ../wiican/mapping/manager.py:268
 msgid "Mapping not found:"
 msgstr "Mapping non trouvÃ:"
 
-#: ../wiican/mapping/manager.py:221
+#: ../wiican/mapping/manager.py:251
 msgid "Cannot remove a system installed mapping"
 msgstr "Nous ne pouvons pas retirer un mapping installà par le systÃme"
 
-#: ../data/mapping.ui:21
-msgid "Wiican mappings"
-msgstr "Mappings de Wiican"
+#: ../data/mapping.ui:5
+#, fuzzy
+msgid "Autostart running this mapping"
+msgstr "ExÃcuter ce mapping"
+
+#: ../data/mapping.ui:6 ../data/mapping.ui:651
+msgid "_Autostart"
+msgstr ""
+
+#: ../data/mapping.ui:7
+msgid "Launch this mapping automatically at desktop session start"
+msgstr ""
+
+#: ../data/mapping.ui:11
+msgid "Delete mapping"
+msgstr "Effacer le mapping"
+
+#: ../data/mapping.ui:12
+msgid "_Delete"
+msgstr "_Effacer"
+
+#: ../data/mapping.ui:13
+#, fuzzy
+msgid "Remove mapping from the catalog"
+msgstr "Retirer le mapping du catalogue"
+
+#: ../data/mapping.ui:18
+msgid "Edit mapping"
+msgstr "Ãditer le mapping"
+
+#: ../data/mapping.ui:19 ../data/mapping.ui:620
+msgid "_Edit"
+msgstr "_Ãditer"
+
+#: ../data/mapping.ui:20
+msgid "Edit mapping properties"
+msgstr "Ãditer les propriÃtÃs du mapping"
+
+#: ../data/mapping.ui:25
+msgid "_Export mapping"
+msgstr "_Exporter le mapping"
 
-#: ../data/mapping.ui:44
-msgid "toolbutton1"
-msgstr "outilbouton1"
+#: ../data/mapping.ui:26 ../data/mapping.ui:692
+msgid "E_xport"
+msgstr "E_xporter"
 
-#: ../data/mapping.ui:57
-msgid "toolbutton2"
-msgstr "outilbouton2"
+#: ../data/mapping.ui:27
+msgid "Export mapping as a .wii file"
+msgstr "Exporter un mapping en tant que fichier .wii"
 
-#: ../data/mapping.ui:70
-msgid "toolbutton3"
-msgstr "outilbouton3"
+#: ../data/mapping.ui:32
+msgid "Import mapping"
+msgstr "Importer le mapping"
 
-#: ../data/mapping.ui:92
-msgid "toolbutton4"
-msgstr "outilbouton4"
+#: ../data/mapping.ui:33 ../data/mapping.ui:676
+msgid "_Import"
+msgstr "_Importer"
 
-#: ../data/mapping.ui:105
-msgid "toolbutton5"
-msgstr "outilbouton5"
+#: ../data/mapping.ui:34
+msgid "Import a mapping from a .wii file"
+msgstr "Importer un mapping depuis un fichier .wii"
 
-#: ../data/mapping.ui:314
+#: ../data/mapping.ui:39
+msgid "New mapping"
+msgstr "Nouveau mapping"
+
+#: ../data/mapping.ui:40 ../data/mapping.ui:604
+msgid "_New"
+msgstr "_Nouveau"
+
+#: ../data/mapping.ui:41
+#, fuzzy
+msgid "Create a new mapping"
+msgstr "CrÃe un nouveau mapping"
+
+#: ../data/mapping.ui:146
 msgid "_Name:"
 msgstr "_Nom:"
 
-#: ../data/mapping.ui:326
+#: ../data/mapping.ui:160
 msgid "Co_mment:"
 msgstr "Co_mmentaire:"
 
-#: ../data/mapping.ui:337
+#: ../data/mapping.ui:174
 msgid "A_uthor/s:"
 msgstr "A_utheur/s"
 
-#: ../data/mapping.ui:348
+#: ../data/mapping.ui:188
 msgid "_Version:"
 msgstr "_Version:"
 
-#: ../data/mapping.ui:443
+#: ../data/mapping.ui:298
 msgid "_Icon:"
 msgstr "_IcÃne:"
 
-#: ../data/mapping.ui:466
+#: ../data/mapping.ui:325
 msgid "<b>General</b>"
 msgstr "<b>GÃnÃral</b>"
 
-#: ../data/mapping.ui:539
+#: ../data/mapping.ui:384
+msgid "Mapping programming help"
+msgstr "Aide à la programmation de mapping"
+
+#: ../data/mapping.ui:402
+msgid "Execute mapping"
+msgstr "ExÃcuter le mapping"
+
+#: ../data/mapping.ui:454
 msgid ""
 "This is a system installed mapping. \n"
 "Changes will be saved in a new mapping."
@@ -197,79 +244,23 @@ msgstr ""
 "Ceci est un mapping installà par le systÃme. \n"
 "Les changements seront sauvà sous un nouveau mapping."
 
-#: ../data/mapping.ui:565
-msgid "Execute mapping"
-msgstr "ExÃcuter le mapping"
-
-#: ../data/mapping.ui:586
-msgid "Mapping programming help"
-msgstr "Aide à la programmation de mapping"
-
-#: ../data/mapping.ui:620
+#: ../data/mapping.ui:496
 msgid "<b>Mapping</b>"
 msgstr "<b>Mapping</b>"
 
-#: ../data/mapping.ui:684
-msgid "Edit mapping"
-msgstr "Ãditer le mapping"
-
-#: ../data/mapping.ui:685
-msgid "_Edit"
-msgstr "_Ãditer"
-
-#: ../data/mapping.ui:686
-msgid "Edit mapping properties"
-msgstr "Ãditer les propriÃtÃs du mapping"
-
-#: ../data/mapping.ui:691
-msgid "Delete mapping"
-msgstr "Effacer le mapping"
-
-#: ../data/mapping.ui:692
-msgid "_Delete"
-msgstr "_Effacer"
-
-#: ../data/mapping.ui:693
-msgid "Removes the mapping from the catalog"
-msgstr "Retirer le mapping du catalogue"
-
-#: ../data/mapping.ui:698
-msgid "Import mapping"
-msgstr "Importer le mapping"
-
-#: ../data/mapping.ui:699
-msgid "_Import"
-msgstr "_Importer"
-
-#: ../data/mapping.ui:700
-msgid "Import a mapping from a .wii file"
-msgstr "Importer un mapping depuis un fichier .wii"
-
-#: ../data/mapping.ui:705
-msgid "_Export mapping"
-msgstr "_Exporter le mapping"
-
-#: ../data/mapping.ui:706
-msgid "E_xport"
-msgstr "E_xporter"
-
-#: ../data/mapping.ui:707
-msgid "Export mapping as a .wii file"
-msgstr "Exporter un mapping en tant que fichier .wii"
-
-#: ../data/mapping.ui:712
-msgid "New mapping"
-msgstr "Nouveau mapping"
+#: ../data/mapping.ui:540
+msgid "Wiican mappings"
+msgstr "Mappings de Wiican"
 
-#: ../data/mapping.ui:713
-msgid "_New"
-msgstr "_Nouveau"
+#: ../data/wiimotemanager.ui:7
+msgid "Mapping validation failed"
+msgstr "Validation du mapping ÃchouÃ"
 
-#: ../data/mapping.ui:714
-msgid "Creates a new mapping"
-msgstr "CrÃe un nouveau mapping"
+#: ../data/wiimotemanager.ui:87
+msgid "It looks the activated mapping contains errors."
+msgstr "Il semblerait que le mapping activà contienne des erreurs."
 
-#: ../data/wiimotemanager.ui:13
+#: ../data/wiimotemanager.ui:120
 msgid ""
 "Yes wii can\n"
 "Wiimote usage assistant and mapping manager"
@@ -277,17 +268,44 @@ msgstr ""
 "Oui nous pouvons\n"
 "Assistant d'utilisation de la wiimote et gestion des mappings"
 
-#: ../data/wiimotemanager.ui:726
+#: ../data/wiimotemanager.ui:921
 msgid "Edit mappings..."
 msgstr "Ãditer les mappings..."
 
-#: ../data/wiimotemanager.ui:759
-msgid "Mapping validation failed"
-msgstr "Validation du mapping ÃchouÃ"
+#: ../data/wiimotemanager.ui:935
+msgid "Show mappings on startup"
+msgstr "Montrer les mappings au dÃmarrage"
 
-#: ../data/wiimotemanager.ui:788
-msgid "It looks the activated mapping contains errors."
-msgstr "Il semblerait que le mapping activà contienne des erreurs."
+#~ msgid "toolbutton1"
+#~ msgstr "outilbouton1"
+
+#~ msgid "toolbutton2"
+#~ msgstr "outilbouton2"
+
+#~ msgid "toolbutton3"
+#~ msgstr "outilbouton3"
+
+#~ msgid "toolbutton4"
+#~ msgstr "outilbouton4"
+
+#~ msgid "toolbutton5"
+#~ msgstr "outilbouton5"
 
 #~ msgid "Wiimote mappings"
 #~ msgstr "Mappings de Wiimote"
+
+#~ msgid ""
+#~ "Hold left button for use wiimote\n"
+#~ "Right button for menu"
+#~ msgstr ""
+#~ "Maintenez le bouton gauche enfoncà pour utiliser la wiimote\n"
+#~ "Maintenez le bouton droit enfoncà pour le menu"
+
+#~ msgid "Discovering Wiimote"
+#~ msgstr "Recherche de Wiimotes"
+
+#~ msgid "Add visible mappings"
+#~ msgstr "Ajouter des mappings visibles"
+
+#~ msgid "<b>Mappings</b>"
+#~ msgstr "<b>Mappings</b>"
diff --git a/po/gl.po b/po/gl.po
index 997f2fa..59eb990 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,105 +6,94 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wiican\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL ADDRESS>\n"
-"POT-Creation-Date: 2010-11-13 14:38+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-16 14:27+0200\n"
 "PO-Revision-Date: 2011-07-24 03:23+0000\n"
 "Last-Translator: Gal_Escriban <Unknown>\n"
 "Language-Team: Galician <gl li org>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-07 23:04+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2012-08-16 12:08+0000\n"
+"X-Generator: Launchpad (build 15810)\n"
 
-#: ../bin/wiican:102
+#: ../bin/wiican:134
 msgid "Plug a bluetooth adapter"
 msgstr "Conecte un adaptador Bluetooth"
 
-#: ../bin/wiican:107
+#: ../bin/wiican:142
 msgid "Please load uinput module first"
 msgstr "Porfavor cargue primeiro o modulo de conexiÃn"
 
-#: ../bin/wiican:113
-msgid ""
-"Hold left button for use wiimote\n"
-"Right button for menu"
+#: ../bin/wiican:196
+msgid "Set some visible mappings"
 msgstr ""
-"Prema o botÃn esquerdo para usar o mando Wii. \n"
-"Prema o botÃn dereito para o menÃ."
-
-#: ../bin/wiican:125
-msgid "Discovering Wiimote"
-msgstr "Buscando o mando Wii"
 
-#: ../bin/wiican:160
-msgid "Add visible mappings"
-msgstr "Engadir os mapeados visibles"
-
-#: ../bin/wiican:205 ../wiican/ui/editordlg.py:148
+#: ../bin/wiican:239 ../wiican/ui/editordlg.py:148
 msgid "Editing "
 msgstr "Editando "
 
-#: ../bin/wiican:218 ../wiican/ui/editordlg.py:266
+#: ../bin/wiican:252 ../wiican/ui/editordlg.py:267
 msgid "Press 1+2"
 msgstr "Pulsar 1+2"
 
-#: ../bin/wiican:219 ../wiican/ui/editordlg.py:267
+#: ../bin/wiican:253 ../wiican/ui/editordlg.py:268
 msgid "To put you Wiimote in discoverable mode now"
 msgstr "Activa o modo rastreo no teu wiimote"
 
-#: ../bin/wiican:239 ../wiican/mapping/manager.py:106
+#: ../bin/wiican:273 ../wiican/mapping/manager.py:106
 #, python-format
 msgid "Not %s file found on wiican package"
 msgstr "Non se topou o arquivo %s nos paquetes wiican"
 
-#: ../bin/wiican:243 ../wiican/mapping/manager.py:110
+#: ../bin/wiican:277 ../wiican/mapping/manager.py:110
 #, python-format
 msgid "Not %s file found  on wiican package"
 msgstr "Non se topou o arquivo %s nos paquetes wiican"
 
-#: ../bin/wiican:282
+#: ../bin/wiican:316
 msgid "Wiican Mapping Package load failed!"
 msgstr "Fallo na carga do mapeado de paquetes de wiican!"
 
-#: ../bin/wiican:289
+#: ../bin/wiican:323
 msgid "usage: %prog [options] arg"
 msgstr "usar: %prog [options] arg"
 
-#: ../bin/wiican:291
+#: ../bin/wiican:325
 msgid "loads mapping package from FILENAME"
 msgstr "Cargar mapeado de paquetes de FILENAME"
 
-#: ../bin/wiican:310
+#: ../bin/wiican:344
 #, python-format
 msgid "No wiican package mapping found: %s"
 msgstr "Non se topou o mapeado de paquetes wiican: %s"
 
-#: ../wiican/ui/managerdlg.py:38
+#: ../wiican/ui/managerdlg.py:43
 msgid "Wiican Mapping Package"
 msgstr "Mapeador de paquetes Wiican"
 
-#: ../wiican/ui/managerdlg.py:88
+#: ../wiican/ui/managerdlg.py:111
 msgid "Editing new mapping"
 msgstr "Editar novo mapeador"
 
-#: ../wiican/ui/managerdlg.py:143
+#: ../wiican/ui/managerdlg.py:179
 msgid "Are you sure you want to completely remove this mapping?"
 msgstr "Està seguro de que quere eliminar por completo este mapeador?"
 
-#: ../wiican/ui/managerdlg.py:152
+#: ../wiican/ui/managerdlg.py:188
 msgid "Deleting mappings"
 msgstr "Eliminando mapeados"
 
-#: ../wiican/ui/managerdlg.py:179
+#: ../wiican/ui/managerdlg.py:217
 msgid "Import mapping..."
 msgstr "Importando mapeador..."
 
-#: ../wiican/ui/managerdlg.py:197
+#: ../wiican/ui/managerdlg.py:235
 msgid "Wiican Mapping Package import failed!"
 msgstr "Fallou a importaciÃn do mapeador de paquetes Wiican!"
 
-#: ../wiican/ui/managerdlg.py:227
+#: ../wiican/ui/managerdlg.py:265
 msgid "Exporting mapping..."
 msgstr "Exportando mapeador..."
 
@@ -129,66 +118,125 @@ msgid "Ensure a bluetooth "
 msgstr "Asegurar o bluetooth "
 
 #: ../wiican/mapping/manager.py:131 ../wiican/mapping/manager.py:171
-#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:184
-#: ../wiican/mapping/manager.py:192 ../wiican/mapping/manager.py:200
-#: ../wiican/mapping/manager.py:218 ../wiican/mapping/manager.py:232
-#: ../wiican/mapping/manager.py:238
+#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:193
+#: ../wiican/mapping/manager.py:201 ../wiican/mapping/manager.py:209
+#: ../wiican/mapping/manager.py:225 ../wiican/mapping/manager.py:248
+#: ../wiican/mapping/manager.py:262 ../wiican/mapping/manager.py:268
 msgid "Mapping not found:"
 msgstr "Mapeador non atopado"
 
-#: ../wiican/mapping/manager.py:221
+#: ../wiican/mapping/manager.py:251
 msgid "Cannot remove a system installed mapping"
 msgstr "Non se pode elimiar un mapeador do sistema"
 
-#: ../data/mapping.ui:21
-msgid "Wiican mappings"
-msgstr "Mapeador Wiican"
+#: ../data/mapping.ui:5
+#, fuzzy
+msgid "Autostart running this mapping"
+msgstr "Executar este mapeador"
+
+#: ../data/mapping.ui:6 ../data/mapping.ui:651
+msgid "_Autostart"
+msgstr ""
+
+#: ../data/mapping.ui:7
+msgid "Launch this mapping automatically at desktop session start"
+msgstr ""
+
+#: ../data/mapping.ui:11
+msgid "Delete mapping"
+msgstr "Borrar mapeador"
+
+#: ../data/mapping.ui:12
+msgid "_Delete"
+msgstr "_Borrar"
+
+#: ../data/mapping.ui:13
+#, fuzzy
+msgid "Remove mapping from the catalog"
+msgstr "Elimiar mapeador do catÃlogo"
+
+#: ../data/mapping.ui:18
+msgid "Edit mapping"
+msgstr "Editar mapeadores"
+
+#: ../data/mapping.ui:19 ../data/mapping.ui:620
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../data/mapping.ui:20
+msgid "Edit mapping properties"
+msgstr "Editar as propiedades do mapeador"
+
+#: ../data/mapping.ui:25
+msgid "_Export mapping"
+msgstr "_Exportar mapeador"
+
+#: ../data/mapping.ui:26 ../data/mapping.ui:692
+msgid "E_xport"
+msgstr "E_xportar"
 
-#: ../data/mapping.ui:44
-msgid "toolbutton1"
-msgstr "BotÃn 1"
+#: ../data/mapping.ui:27
+msgid "Export mapping as a .wii file"
+msgstr "Exportar mapeador como arquivo .wii"
 
-#: ../data/mapping.ui:57
-msgid "toolbutton2"
-msgstr "botÃn 2"
+#: ../data/mapping.ui:32
+msgid "Import mapping"
+msgstr "Importar mapeador"
+
+#: ../data/mapping.ui:33 ../data/mapping.ui:676
+msgid "_Import"
+msgstr "_Importar"
+
+#: ../data/mapping.ui:34
+msgid "Import a mapping from a .wii file"
+msgstr "Importar mapeador de arquivo .wii"
 
-#: ../data/mapping.ui:70
-msgid "toolbutton3"
-msgstr "botÃn 3"
+#: ../data/mapping.ui:39
+msgid "New mapping"
+msgstr "Novo mapeador"
 
-#: ../data/mapping.ui:92
-msgid "toolbutton4"
-msgstr "BotÃn Ãtil 4"
+#: ../data/mapping.ui:40 ../data/mapping.ui:604
+msgid "_New"
+msgstr "_Novo"
 
-#: ../data/mapping.ui:105
-msgid "toolbutton5"
-msgstr "BotÃn 5"
+#: ../data/mapping.ui:41
+#, fuzzy
+msgid "Create a new mapping"
+msgstr "Crear un novo mapeador"
 
-#: ../data/mapping.ui:314
+#: ../data/mapping.ui:146
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: ../data/mapping.ui:326
+#: ../data/mapping.ui:160
 msgid "Co_mment:"
 msgstr "Co_mentario:"
 
-#: ../data/mapping.ui:337
+#: ../data/mapping.ui:174
 msgid "A_uthor/s:"
 msgstr "A_utor/es:"
 
-#: ../data/mapping.ui:348
+#: ../data/mapping.ui:188
 msgid "_Version:"
 msgstr "_VersiÃn:"
 
-#: ../data/mapping.ui:443
+#: ../data/mapping.ui:298
 msgid "_Icon:"
 msgstr "_Icono"
 
-#: ../data/mapping.ui:466
+#: ../data/mapping.ui:325
 msgid "<b>General</b>"
 msgstr "<b>Xeral</b>"
 
-#: ../data/mapping.ui:539
+#: ../data/mapping.ui:384
+msgid "Mapping programming help"
+msgstr "Axuda programaciÃn de mapeadores"
+
+#: ../data/mapping.ui:402
+msgid "Execute mapping"
+msgstr "Esecutar mapeador"
+
+#: ../data/mapping.ui:454
 msgid ""
 "This is a system installed mapping. \n"
 "Changes will be saved in a new mapping."
@@ -196,79 +244,23 @@ msgstr ""
 "Este à un mapeador do sistema. \n"
 "Os cambios serÃn gardados nun novo mapeador."
 
-#: ../data/mapping.ui:565
-msgid "Execute mapping"
-msgstr "Esecutar mapeador"
-
-#: ../data/mapping.ui:586
-msgid "Mapping programming help"
-msgstr "Axuda programaciÃn de mapeadores"
-
-#: ../data/mapping.ui:620
+#: ../data/mapping.ui:496
 msgid "<b>Mapping</b>"
 msgstr "<b>Mapeador</b>"
 
-#: ../data/mapping.ui:684
-msgid "Edit mapping"
-msgstr "Editar mapeadores"
-
-#: ../data/mapping.ui:685
-msgid "_Edit"
-msgstr "_Editar"
-
-#: ../data/mapping.ui:686
-msgid "Edit mapping properties"
-msgstr "Editar as propiedades do mapeador"
-
-#: ../data/mapping.ui:691
-msgid "Delete mapping"
-msgstr "Borrar mapeador"
-
-#: ../data/mapping.ui:692
-msgid "_Delete"
-msgstr "_Borrar"
-
-#: ../data/mapping.ui:693
-msgid "Removes the mapping from the catalog"
-msgstr "Elimiar mapeador do catÃlogo"
-
-#: ../data/mapping.ui:698
-msgid "Import mapping"
-msgstr "Importar mapeador"
-
-#: ../data/mapping.ui:699
-msgid "_Import"
-msgstr "_Importar"
-
-#: ../data/mapping.ui:700
-msgid "Import a mapping from a .wii file"
-msgstr "Importar mapeador de arquivo .wii"
-
-#: ../data/mapping.ui:705
-msgid "_Export mapping"
-msgstr "_Exportar mapeador"
-
-#: ../data/mapping.ui:706
-msgid "E_xport"
-msgstr "E_xportar"
-
-#: ../data/mapping.ui:707
-msgid "Export mapping as a .wii file"
-msgstr "Exportar mapeador como arquivo .wii"
-
-#: ../data/mapping.ui:712
-msgid "New mapping"
-msgstr "Novo mapeador"
+#: ../data/mapping.ui:540
+msgid "Wiican mappings"
+msgstr "Mapeador Wiican"
 
-#: ../data/mapping.ui:713
-msgid "_New"
-msgstr "_Novo"
+#: ../data/wiimotemanager.ui:7
+msgid "Mapping validation failed"
+msgstr "Fallou a validaciÃn do mapeador"
 
-#: ../data/mapping.ui:714
-msgid "Creates a new mapping"
-msgstr "Crear un novo mapeador"
+#: ../data/wiimotemanager.ui:87
+msgid "It looks the activated mapping contains errors."
+msgstr "Està comprobando se o mapeador activo contÃn erros."
 
-#: ../data/wiimotemanager.ui:13
+#: ../data/wiimotemanager.ui:120
 msgid ""
 "Yes wii can\n"
 "Wiimote usage assistant and mapping manager"
@@ -276,14 +268,38 @@ msgstr ""
 "\"Yes wii can\"\n"
 "Wiimote usa un asistente e un administrador de mapeador"
 
-#: ../data/wiimotemanager.ui:726
+#: ../data/wiimotemanager.ui:921
 msgid "Edit mappings..."
 msgstr "Editar mapeadores..."
 
-#: ../data/wiimotemanager.ui:759
-msgid "Mapping validation failed"
-msgstr "Fallou a validaciÃn do mapeador"
+#: ../data/wiimotemanager.ui:935
+msgid "Show mappings on startup"
+msgstr ""
 
-#: ../data/wiimotemanager.ui:788
-msgid "It looks the activated mapping contains errors."
-msgstr "Està comprobando se o mapeador activo contÃn erros."
+#~ msgid "toolbutton1"
+#~ msgstr "BotÃn 1"
+
+#~ msgid "toolbutton2"
+#~ msgstr "botÃn 2"
+
+#~ msgid "toolbutton3"
+#~ msgstr "botÃn 3"
+
+#~ msgid "toolbutton4"
+#~ msgstr "BotÃn Ãtil 4"
+
+#~ msgid "toolbutton5"
+#~ msgstr "BotÃn 5"
+
+#~ msgid ""
+#~ "Hold left button for use wiimote\n"
+#~ "Right button for menu"
+#~ msgstr ""
+#~ "Prema o botÃn esquerdo para usar o mando Wii. \n"
+#~ "Prema o botÃn dereito para o menÃ."
+
+#~ msgid "Discovering Wiimote"
+#~ msgstr "Buscando o mando Wii"
+
+#~ msgid "Add visible mappings"
+#~ msgstr "Engadir os mapeados visibles"
diff --git a/po/it.po b/po/it.po
index 49c9e2e..adf8133 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,105 +7,93 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wiican\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-13 14:38+0100\n"
-"PO-Revision-Date: 2011-02-13 16:28+0000\n"
-"Last-Translator: J. FÃlix OntaÃÃn <Unknown>\n"
+"POT-Creation-Date: 2012-08-16 14:27+0200\n"
+"PO-Revision-Date: 2012-07-09 09:31+0000\n"
+"Last-Translator: Gianfranco Frisani <gfrisani libero it>\n"
 "Language-Team: Italian <it li org>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-07 23:04+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
-"Language: it\n"
+"X-Launchpad-Export-Date: 2012-08-16 12:08+0000\n"
+"X-Generator: Launchpad (build 15810)\n"
 
-#: ../bin/wiican:102
+#: ../bin/wiican:134
 msgid "Plug a bluetooth adapter"
 msgstr "Inserisci un adattatore bluetooth"
 
-#: ../bin/wiican:107
+#: ../bin/wiican:142
 msgid "Please load uinput module first"
 msgstr "Per favore carica il modulo uinput prima"
 
-#: ../bin/wiican:113
-msgid ""
-"Hold left button for use wiimote\n"
-"Right button for menu"
-msgstr ""
-"Premi il tasto sinistro per usare il wiimote\n"
-"Tasto destro per il menu"
-
-#: ../bin/wiican:125
-msgid "Discovering Wiimote"
-msgstr "Sto cercando il Wiimote"
-
-#: ../bin/wiican:160
-msgid "Add visible mappings"
-msgstr "Aggiungi mappature visibili"
+#: ../bin/wiican:196
+msgid "Set some visible mappings"
+msgstr "Imposta alcune mappature visibili"
 
-#: ../bin/wiican:205 ../wiican/ui/editordlg.py:148
+#: ../bin/wiican:239 ../wiican/ui/editordlg.py:148
 msgid "Editing "
 msgstr "Modifica "
 
-#: ../bin/wiican:218 ../wiican/ui/editordlg.py:266
+#: ../bin/wiican:252 ../wiican/ui/editordlg.py:267
 msgid "Press 1+2"
 msgstr "Premi 1+2"
 
-#: ../bin/wiican:219 ../wiican/ui/editordlg.py:267
+#: ../bin/wiican:253 ../wiican/ui/editordlg.py:268
 msgid "To put you Wiimote in discoverable mode now"
 msgstr "Per mettervi Wiimote in modalità rilevazione ora"
 
-#: ../bin/wiican:239 ../wiican/mapping/manager.py:106
+#: ../bin/wiican:273 ../wiican/mapping/manager.py:106
 #, python-format
 msgid "Not %s file found on wiican package"
 msgstr "Nessun %s file trovato nel pacchetto wiican"
 
-#: ../bin/wiican:243 ../wiican/mapping/manager.py:110
+#: ../bin/wiican:277 ../wiican/mapping/manager.py:110
 #, python-format
 msgid "Not %s file found  on wiican package"
 msgstr "Nessun %s dile trovato nel pacchetto wiican"
 
-#: ../bin/wiican:282
+#: ../bin/wiican:316
 msgid "Wiican Mapping Package load failed!"
 msgstr "Errore nel caricamento del Pacchetto delle Mappature di Wiican!"
 
-#: ../bin/wiican:289
+#: ../bin/wiican:323
 msgid "usage: %prog [options] arg"
 msgstr "utilizzo: %prog [options] arg"
 
-#: ../bin/wiican:291
+#: ../bin/wiican:325
 msgid "loads mapping package from FILENAME"
 msgstr "carica il pacchetto delle mappature da FILENAME"
 
-#: ../bin/wiican:310
+#: ../bin/wiican:344
 #, python-format
 msgid "No wiican package mapping found: %s"
 msgstr "Non ho trovato nessu pacchetto di mappatura wiican: %s"
 
-#: ../wiican/ui/managerdlg.py:38
+#: ../wiican/ui/managerdlg.py:43
 msgid "Wiican Mapping Package"
 msgstr "Pacchetto Mappatura Wiican"
 
-#: ../wiican/ui/managerdlg.py:88
+#: ../wiican/ui/managerdlg.py:111
 msgid "Editing new mapping"
 msgstr "Modifica nuova mappatura"
 
-#: ../wiican/ui/managerdlg.py:143
+#: ../wiican/ui/managerdlg.py:179
 msgid "Are you sure you want to completely remove this mapping?"
 msgstr "Sei sicuro di rimuovere completamente questa mappatura?"
 
-#: ../wiican/ui/managerdlg.py:152
+#: ../wiican/ui/managerdlg.py:188
 msgid "Deleting mappings"
 msgstr "Eliminazione impostazioni"
 
-#: ../wiican/ui/managerdlg.py:179
+#: ../wiican/ui/managerdlg.py:217
 msgid "Import mapping..."
 msgstr "Importa mappatura..."
 
-#: ../wiican/ui/managerdlg.py:197
+#: ../wiican/ui/managerdlg.py:235
 msgid "Wiican Mapping Package import failed!"
 msgstr "Importazione del pacchetto mappatura di Wiican fallita!"
 
-#: ../wiican/ui/managerdlg.py:227
+#: ../wiican/ui/managerdlg.py:265
 msgid "Exporting mapping..."
 msgstr "Esportando mappatura..."
 
@@ -130,144 +118,147 @@ msgid "Ensure a bluetooth "
 msgstr "Assicurati di avere il bluetooth "
 
 #: ../wiican/mapping/manager.py:131 ../wiican/mapping/manager.py:171
-#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:184
-#: ../wiican/mapping/manager.py:192 ../wiican/mapping/manager.py:200
-#: ../wiican/mapping/manager.py:218 ../wiican/mapping/manager.py:232
-#: ../wiican/mapping/manager.py:238
+#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:193
+#: ../wiican/mapping/manager.py:201 ../wiican/mapping/manager.py:209
+#: ../wiican/mapping/manager.py:225 ../wiican/mapping/manager.py:248
+#: ../wiican/mapping/manager.py:262 ../wiican/mapping/manager.py:268
 msgid "Mapping not found:"
 msgstr "Mappatura non trovata:"
 
-#: ../wiican/mapping/manager.py:221
+#: ../wiican/mapping/manager.py:251
 msgid "Cannot remove a system installed mapping"
 msgstr "Non à stato possibile rimuovere la mappatura installata nel sistema"
 
-#: ../data/mapping.ui:21
-msgid "Wiican mappings"
-msgstr "Mappature wiican"
-
-#: ../data/mapping.ui:44
-msgid "toolbutton1"
-msgstr "toolbutton1"
-
-#: ../data/mapping.ui:57
-msgid "toolbutton2"
-msgstr "toolbutton2"
-
-#: ../data/mapping.ui:70
-msgid "toolbutton3"
-msgstr "toolbutton3"
-
-#: ../data/mapping.ui:92
-msgid "toolbutton4"
-msgstr "toolbutton4"
-
-#: ../data/mapping.ui:105
-msgid "toolbutton5"
-msgstr "toolbutton5"
-
-#: ../data/mapping.ui:314
-msgid "_Name:"
-msgstr "_Nome:"
-
-#: ../data/mapping.ui:326
-msgid "Co_mment:"
-msgstr "Co_mmento:"
-
-#: ../data/mapping.ui:337
-msgid "A_uthor/s:"
-msgstr "Autore/i:"
-
-#: ../data/mapping.ui:348
-msgid "_Version:"
-msgstr "_Versione:"
-
-#: ../data/mapping.ui:443
-msgid "_Icon:"
-msgstr "_Icona:"
+#: ../data/mapping.ui:5
+#, fuzzy
+msgid "Autostart running this mapping"
+msgstr "Esegui questa mappatura"
 
-#: ../data/mapping.ui:466
-msgid "<b>General</b>"
-msgstr "<b>Generale</b>"
+#: ../data/mapping.ui:6 ../data/mapping.ui:651
+msgid "_Autostart"
+msgstr ""
 
-#: ../data/mapping.ui:539
-msgid ""
-"This is a system installed mapping. \n"
-"Changes will be saved in a new mapping."
-msgstr "Questa à una mappatura installata nel sistema."
+#: ../data/mapping.ui:7
+msgid "Launch this mapping automatically at desktop session start"
+msgstr ""
 
-#: ../data/mapping.ui:565
-msgid "Execute mapping"
-msgstr "Esegui mappatura"
+#: ../data/mapping.ui:11
+msgid "Delete mapping"
+msgstr "Cancella mappatura"
 
-#: ../data/mapping.ui:586
-msgid "Mapping programming help"
-msgstr "Aiuto nella programmazione della mappatura"
+#: ../data/mapping.ui:12
+msgid "_Delete"
+msgstr "Cancella"
 
-#: ../data/mapping.ui:620
-msgid "<b>Mapping</b>"
-msgstr "<b>Mappatura</b>"
+#: ../data/mapping.ui:13
+#, fuzzy
+msgid "Remove mapping from the catalog"
+msgstr "Rimuovi la mappatura dal catalogo"
 
-#: ../data/mapping.ui:684
+#: ../data/mapping.ui:18
 msgid "Edit mapping"
 msgstr "Modifica mappatura"
 
-#: ../data/mapping.ui:685
+#: ../data/mapping.ui:19 ../data/mapping.ui:620
 msgid "_Edit"
 msgstr "Modifica (_E)"
 
-#: ../data/mapping.ui:686
+#: ../data/mapping.ui:20
 msgid "Edit mapping properties"
 msgstr "Modifica le proprietà della mappatura"
 
-#: ../data/mapping.ui:691
-msgid "Delete mapping"
-msgstr "Cancella mappatura"
+#: ../data/mapping.ui:25
+msgid "_Export mapping"
+msgstr "_Esporta mappatura"
 
-#: ../data/mapping.ui:692
-msgid "_Delete"
-msgstr "Cancella"
+#: ../data/mapping.ui:26 ../data/mapping.ui:692
+msgid "E_xport"
+msgstr "E_sporta"
 
-#: ../data/mapping.ui:693
-msgid "Removes the mapping from the catalog"
-msgstr "Rimuovi la mappatura dal catalogo"
+#: ../data/mapping.ui:27
+msgid "Export mapping as a .wii file"
+msgstr "Esporta mappatura come file .wii"
 
-#: ../data/mapping.ui:698
+#: ../data/mapping.ui:32
 msgid "Import mapping"
 msgstr "Importa mappatura"
 
-#: ../data/mapping.ui:699
+#: ../data/mapping.ui:33 ../data/mapping.ui:676
 msgid "_Import"
 msgstr "_Importa"
 
-#: ../data/mapping.ui:700
+#: ../data/mapping.ui:34
 msgid "Import a mapping from a .wii file"
 msgstr "Importa una mappatura da un file .wii"
 
-#: ../data/mapping.ui:705
-msgid "_Export mapping"
-msgstr "_Esporta mappatura"
-
-#: ../data/mapping.ui:706
-msgid "E_xport"
-msgstr "E_sporta"
-
-#: ../data/mapping.ui:707
-msgid "Export mapping as a .wii file"
-msgstr "Esporta mappatura come file .wii"
-
-#: ../data/mapping.ui:712
+#: ../data/mapping.ui:39
 msgid "New mapping"
 msgstr "Nuova mappatura"
 
-#: ../data/mapping.ui:713
+#: ../data/mapping.ui:40 ../data/mapping.ui:604
 msgid "_New"
 msgstr "_Nuovo"
 
-#: ../data/mapping.ui:714
-msgid "Creates a new mapping"
+#: ../data/mapping.ui:41
+#, fuzzy
+msgid "Create a new mapping"
 msgstr "Crea una nuova mappatura"
 
-#: ../data/wiimotemanager.ui:13
+#: ../data/mapping.ui:146
+msgid "_Name:"
+msgstr "_Nome:"
+
+#: ../data/mapping.ui:160
+msgid "Co_mment:"
+msgstr "Co_mmento:"
+
+#: ../data/mapping.ui:174
+msgid "A_uthor/s:"
+msgstr "Autore/i:"
+
+#: ../data/mapping.ui:188
+msgid "_Version:"
+msgstr "_Versione:"
+
+#: ../data/mapping.ui:298
+msgid "_Icon:"
+msgstr "_Icona:"
+
+#: ../data/mapping.ui:325
+msgid "<b>General</b>"
+msgstr "<b>Generale</b>"
+
+#: ../data/mapping.ui:384
+msgid "Mapping programming help"
+msgstr "Aiuto nella programmazione della mappatura"
+
+#: ../data/mapping.ui:402
+msgid "Execute mapping"
+msgstr "Esegui mappatura"
+
+#: ../data/mapping.ui:454
+msgid ""
+"This is a system installed mapping. \n"
+"Changes will be saved in a new mapping."
+msgstr "Questa à una mappatura installata nel sistema."
+
+#: ../data/mapping.ui:496
+msgid "<b>Mapping</b>"
+msgstr "<b>Mappatura</b>"
+
+#: ../data/mapping.ui:540
+msgid "Wiican mappings"
+msgstr "Mappature wiican"
+
+#: ../data/wiimotemanager.ui:7
+msgid "Mapping validation failed"
+msgstr "Validazione delle mappature fallita"
+
+#: ../data/wiimotemanager.ui:87
+msgid "It looks the activated mapping contains errors."
+msgstr "Sembra che la mappatura attiva contenga errori."
+
+#: ../data/wiimotemanager.ui:120
 msgid ""
 "Yes wii can\n"
 "Wiimote usage assistant and mapping manager"
@@ -275,20 +266,44 @@ msgstr ""
 "Yes wii can\n"
 "Assistente all'utilizzo di Wiimote e gestore mappature"
 
-#: ../data/wiimotemanager.ui:726
+#: ../data/wiimotemanager.ui:921
 msgid "Edit mappings..."
 msgstr "Modifica mappature..."
 
-#: ../data/wiimotemanager.ui:759
-msgid "Mapping validation failed"
-msgstr "Validazione delle mappature fallita"
+#: ../data/wiimotemanager.ui:935
+msgid "Show mappings on startup"
+msgstr "Visualizza le mappature in partenza"
 
-#: ../data/wiimotemanager.ui:788
-msgid "It looks the activated mapping contains errors."
-msgstr "Sembra che la mappatura attiva contenga errori."
+#~ msgid "toolbutton1"
+#~ msgstr "toolbutton1"
+
+#~ msgid "toolbutton2"
+#~ msgstr "toolbutton2"
+
+#~ msgid "toolbutton3"
+#~ msgstr "toolbutton3"
+
+#~ msgid "toolbutton4"
+#~ msgstr "toolbutton4"
+
+#~ msgid "toolbutton5"
+#~ msgstr "toolbutton5"
+
+#~ msgid ""
+#~ "Hold left button for use wiimote\n"
+#~ "Right button for menu"
+#~ msgstr ""
+#~ "Premi il tasto sinistro per usare il wiimote\n"
+#~ "Tasto destro per il menu"
+
+#~ msgid "Discovering Wiimote"
+#~ msgstr "Sto cercando il Wiimote"
 
 #~ msgid "Wiimote mappings"
 #~ msgstr "Mappature di Wiimote"
 
+#~ msgid "Add visible mappings"
+#~ msgstr "Aggiungi mappature visibili"
+
 #~ msgid "<b>Mappings</b>"
 #~ msgstr "<b>Mappature</b>"
diff --git a/po/nl.po b/po/nl.po
index 6cd871b..01488e4 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,105 +7,93 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wiican\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-13 14:38+0100\n"
+"POT-Creation-Date: 2012-08-16 14:27+0200\n"
 "PO-Revision-Date: 2011-04-18 06:58+0000\n"
 "Last-Translator: Tico <Unknown>\n"
 "Language-Team: Dutch <nl li org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-07 23:04+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
-"Language: nl\n"
+"X-Launchpad-Export-Date: 2012-08-16 12:08+0000\n"
+"X-Generator: Launchpad (build 15810)\n"
 
-#: ../bin/wiican:102
+#: ../bin/wiican:134
 msgid "Plug a bluetooth adapter"
 msgstr "Sluit een bluetooth-adapter aan"
 
-#: ../bin/wiican:107
+#: ../bin/wiican:142
 msgid "Please load uinput module first"
 msgstr "Laad alstublieft eerst uinput module"
 
-#: ../bin/wiican:113
-msgid ""
-"Hold left button for use wiimote\n"
-"Right button for menu"
+#: ../bin/wiican:196
+msgid "Set some visible mappings"
 msgstr ""
-"Houd de linker muisknop ingedrukt om de wiimote te gebruiken\n"
-"Rechter muisknop voor menu"
-
-#: ../bin/wiican:125
-msgid "Discovering Wiimote"
-msgstr "Wiimote detecteren"
 
-#: ../bin/wiican:160
-msgid "Add visible mappings"
-msgstr "Zichtbare mappings toevoegen"
-
-#: ../bin/wiican:205 ../wiican/ui/editordlg.py:148
+#: ../bin/wiican:239 ../wiican/ui/editordlg.py:148
 msgid "Editing "
 msgstr "Bewerken van "
 
-#: ../bin/wiican:218 ../wiican/ui/editordlg.py:266
+#: ../bin/wiican:252 ../wiican/ui/editordlg.py:267
 msgid "Press 1+2"
 msgstr "Druk op 1+2"
 
-#: ../bin/wiican:219 ../wiican/ui/editordlg.py:267
+#: ../bin/wiican:253 ../wiican/ui/editordlg.py:268
 msgid "To put you Wiimote in discoverable mode now"
 msgstr "Om uw Wiimote in de waarneembare modus te zetten"
 
-#: ../bin/wiican:239 ../wiican/mapping/manager.py:106
+#: ../bin/wiican:273 ../wiican/mapping/manager.py:106
 #, python-format
 msgid "Not %s file found on wiican package"
 msgstr "Geen %s bestand gevonden in wiican package"
 
-#: ../bin/wiican:243 ../wiican/mapping/manager.py:110
+#: ../bin/wiican:277 ../wiican/mapping/manager.py:110
 #, python-format
 msgid "Not %s file found  on wiican package"
 msgstr "Geen %s-bestand gevonden in wiican package"
 
-#: ../bin/wiican:282
+#: ../bin/wiican:316
 msgid "Wiican Mapping Package load failed!"
 msgstr "Het laden van het Wiican Mapping Package is mislukt!"
 
-#: ../bin/wiican:289
+#: ../bin/wiican:323
 msgid "usage: %prog [options] arg"
 msgstr "gebruik: %prog [opties] arg"
 
-#: ../bin/wiican:291
+#: ../bin/wiican:325
 msgid "loads mapping package from FILENAME"
 msgstr "Laadt het mapping package uit BESTANDSNAAM"
 
-#: ../bin/wiican:310
+#: ../bin/wiican:344
 #, python-format
 msgid "No wiican package mapping found: %s"
 msgstr "Geen wiican package mapping gevonden: %s"
 
-#: ../wiican/ui/managerdlg.py:38
+#: ../wiican/ui/managerdlg.py:43
 msgid "Wiican Mapping Package"
 msgstr "Wiican Mapping Package"
 
-#: ../wiican/ui/managerdlg.py:88
+#: ../wiican/ui/managerdlg.py:111
 msgid "Editing new mapping"
 msgstr "Nieuwe mapping wordt bewerkt"
 
-#: ../wiican/ui/managerdlg.py:143
+#: ../wiican/ui/managerdlg.py:179
 msgid "Are you sure you want to completely remove this mapping?"
 msgstr "Bent u zeker dat u de mapping helemaal wil verwijderen?"
 
-#: ../wiican/ui/managerdlg.py:152
+#: ../wiican/ui/managerdlg.py:188
 msgid "Deleting mappings"
 msgstr "Mappings verwijderen"
 
-#: ../wiican/ui/managerdlg.py:179
+#: ../wiican/ui/managerdlg.py:217
 msgid "Import mapping..."
 msgstr "Importeer mapping..."
 
-#: ../wiican/ui/managerdlg.py:197
+#: ../wiican/ui/managerdlg.py:235
 msgid "Wiican Mapping Package import failed!"
 msgstr "Het importeren van het Wiican Mapping Package is mislukt!"
 
-#: ../wiican/ui/managerdlg.py:227
+#: ../wiican/ui/managerdlg.py:265
 msgid "Exporting mapping..."
 msgstr "Mapping wordt geÃxporteerd..."
 
@@ -130,146 +118,149 @@ msgid "Ensure a bluetooth "
 msgstr ""
 
 #: ../wiican/mapping/manager.py:131 ../wiican/mapping/manager.py:171
-#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:184
-#: ../wiican/mapping/manager.py:192 ../wiican/mapping/manager.py:200
-#: ../wiican/mapping/manager.py:218 ../wiican/mapping/manager.py:232
-#: ../wiican/mapping/manager.py:238
+#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:193
+#: ../wiican/mapping/manager.py:201 ../wiican/mapping/manager.py:209
+#: ../wiican/mapping/manager.py:225 ../wiican/mapping/manager.py:248
+#: ../wiican/mapping/manager.py:262 ../wiican/mapping/manager.py:268
 msgid "Mapping not found:"
 msgstr "Mapping niet gevonden:"
 
-#: ../wiican/mapping/manager.py:221
+#: ../wiican/mapping/manager.py:251
 msgid "Cannot remove a system installed mapping"
 msgstr "Kan systeemgeÃnstalleerde mapping niet verwijderen"
 
-#: ../data/mapping.ui:21
-msgid "Wiican mappings"
-msgstr "Wiican mappings"
-
-#: ../data/mapping.ui:44
-msgid "toolbutton1"
-msgstr "toolbutton1"
-
-#: ../data/mapping.ui:57
-msgid "toolbutton2"
-msgstr "toolbutton2"
-
-#: ../data/mapping.ui:70
-msgid "toolbutton3"
-msgstr "toolbutton3"
-
-#: ../data/mapping.ui:92
-msgid "toolbutton4"
-msgstr "toolbutton4"
-
-#: ../data/mapping.ui:105
-msgid "toolbutton5"
-msgstr "toolbutton5"
-
-#: ../data/mapping.ui:314
-msgid "_Name:"
-msgstr "_Naam:"
-
-#: ../data/mapping.ui:326
-msgid "Co_mment:"
-msgstr "_Opmerking:"
+#: ../data/mapping.ui:5
+#, fuzzy
+msgid "Autostart running this mapping"
+msgstr "Deze mapping uitvoeren"
 
-#: ../data/mapping.ui:337
-msgid "A_uthor/s:"
+#: ../data/mapping.ui:6 ../data/mapping.ui:651
+msgid "_Autostart"
 msgstr ""
 
-#: ../data/mapping.ui:348
-msgid "_Version:"
-msgstr "_Versie"
-
-#: ../data/mapping.ui:443
-msgid "_Icon:"
-msgstr "P_ictogram:"
-
-#: ../data/mapping.ui:466
-msgid "<b>General</b>"
-msgstr "<b>Algemeen</b>"
-
-#: ../data/mapping.ui:539
-msgid ""
-"This is a system installed mapping. \n"
-"Changes will be saved in a new mapping."
+#: ../data/mapping.ui:7
+msgid "Launch this mapping automatically at desktop session start"
 msgstr ""
-"Dit is een door het systeem geinstalleerde mapping. \n"
-"Aanpassingen worden opgeslagen in een nieuwe mapping."
 
-#: ../data/mapping.ui:565
-msgid "Execute mapping"
-msgstr "Mapping uitvoeren"
+#: ../data/mapping.ui:11
+msgid "Delete mapping"
+msgstr "Mapping verwijderen"
 
-#: ../data/mapping.ui:586
-msgid "Mapping programming help"
-msgstr "Mapping programmeerhulp"
+#: ../data/mapping.ui:12
+msgid "_Delete"
+msgstr "Verwij_deren"
 
-#: ../data/mapping.ui:620
-msgid "<b>Mapping</b>"
-msgstr "<b>Mapping</b>"
+#: ../data/mapping.ui:13
+#, fuzzy
+msgid "Remove mapping from the catalog"
+msgstr "Verwijdert de mapping uit de catalogus"
 
-#: ../data/mapping.ui:684
+#: ../data/mapping.ui:18
 msgid "Edit mapping"
 msgstr "Mapping bewerken"
 
-#: ../data/mapping.ui:685
+#: ../data/mapping.ui:19 ../data/mapping.ui:620
 msgid "_Edit"
 msgstr "B_ewerken"
 
-#: ../data/mapping.ui:686
+#: ../data/mapping.ui:20
 msgid "Edit mapping properties"
 msgstr "Instellingen van mapping bewerken"
 
-#: ../data/mapping.ui:691
-msgid "Delete mapping"
-msgstr "Mapping verwijderen"
+#: ../data/mapping.ui:25
+msgid "_Export mapping"
+msgstr "Mapping _exporteren"
 
-#: ../data/mapping.ui:692
-msgid "_Delete"
-msgstr "Verwij_deren"
+#: ../data/mapping.ui:26 ../data/mapping.ui:692
+msgid "E_xport"
+msgstr "E_xporteren"
 
-#: ../data/mapping.ui:693
-msgid "Removes the mapping from the catalog"
-msgstr "Verwijdert de mapping uit de catalogus"
+#: ../data/mapping.ui:27
+msgid "Export mapping as a .wii file"
+msgstr "Een mapping exporteren als een .wii-bestand"
 
-#: ../data/mapping.ui:698
+#: ../data/mapping.ui:32
 msgid "Import mapping"
 msgstr "Mapping importeren"
 
-#: ../data/mapping.ui:699
+#: ../data/mapping.ui:33 ../data/mapping.ui:676
 msgid "_Import"
 msgstr "_Importeren"
 
-#: ../data/mapping.ui:700
+#: ../data/mapping.ui:34
 msgid "Import a mapping from a .wii file"
 msgstr "Een mapping importeren uit een .wii-bestand"
 
-#: ../data/mapping.ui:705
-msgid "_Export mapping"
-msgstr "Mapping _exporteren"
-
-#: ../data/mapping.ui:706
-msgid "E_xport"
-msgstr "E_xporteren"
-
-#: ../data/mapping.ui:707
-msgid "Export mapping as a .wii file"
-msgstr "Een mapping exporteren als een .wii-bestand"
-
-#: ../data/mapping.ui:712
+#: ../data/mapping.ui:39
 msgid "New mapping"
 msgstr "Nieuwe mapping"
 
-#: ../data/mapping.ui:713
+#: ../data/mapping.ui:40 ../data/mapping.ui:604
 msgid "_New"
 msgstr "_Nieuw"
 
-#: ../data/mapping.ui:714
-msgid "Creates a new mapping"
+#: ../data/mapping.ui:41
+#, fuzzy
+msgid "Create a new mapping"
 msgstr "Maakt een nieuwe mapping aan"
 
-#: ../data/wiimotemanager.ui:13
+#: ../data/mapping.ui:146
+msgid "_Name:"
+msgstr "_Naam:"
+
+#: ../data/mapping.ui:160
+msgid "Co_mment:"
+msgstr "_Opmerking:"
+
+#: ../data/mapping.ui:174
+msgid "A_uthor/s:"
+msgstr ""
+
+#: ../data/mapping.ui:188
+msgid "_Version:"
+msgstr "_Versie"
+
+#: ../data/mapping.ui:298
+msgid "_Icon:"
+msgstr "P_ictogram:"
+
+#: ../data/mapping.ui:325
+msgid "<b>General</b>"
+msgstr "<b>Algemeen</b>"
+
+#: ../data/mapping.ui:384
+msgid "Mapping programming help"
+msgstr "Mapping programmeerhulp"
+
+#: ../data/mapping.ui:402
+msgid "Execute mapping"
+msgstr "Mapping uitvoeren"
+
+#: ../data/mapping.ui:454
+msgid ""
+"This is a system installed mapping. \n"
+"Changes will be saved in a new mapping."
+msgstr ""
+"Dit is een door het systeem geinstalleerde mapping. \n"
+"Aanpassingen worden opgeslagen in een nieuwe mapping."
+
+#: ../data/mapping.ui:496
+msgid "<b>Mapping</b>"
+msgstr "<b>Mapping</b>"
+
+#: ../data/mapping.ui:540
+msgid "Wiican mappings"
+msgstr "Wiican mappings"
+
+#: ../data/wiimotemanager.ui:7
+msgid "Mapping validation failed"
+msgstr "Validatie van mapping mislukt"
+
+#: ../data/wiimotemanager.ui:87
+msgid "It looks the activated mapping contains errors."
+msgstr "Waarschijnlijk bevat de geactiveerde mapping fouten."
+
+#: ../data/wiimotemanager.ui:120
 msgid ""
 "Yes wii can\n"
 "Wiimote usage assistant and mapping manager"
@@ -277,17 +268,41 @@ msgstr ""
 "Yes wii can\n"
 "Wiimote gebruikersondersteuning en mappingbeheer"
 
-#: ../data/wiimotemanager.ui:726
+#: ../data/wiimotemanager.ui:921
 msgid "Edit mappings..."
 msgstr "Mappings bewerken..."
 
-#: ../data/wiimotemanager.ui:759
-msgid "Mapping validation failed"
-msgstr "Validatie van mapping mislukt"
+#: ../data/wiimotemanager.ui:935
+msgid "Show mappings on startup"
+msgstr ""
 
-#: ../data/wiimotemanager.ui:788
-msgid "It looks the activated mapping contains errors."
-msgstr "Waarschijnlijk bevat de geactiveerde mapping fouten."
+#~ msgid "toolbutton1"
+#~ msgstr "toolbutton1"
+
+#~ msgid "toolbutton2"
+#~ msgstr "toolbutton2"
+
+#~ msgid "toolbutton3"
+#~ msgstr "toolbutton3"
+
+#~ msgid "toolbutton4"
+#~ msgstr "toolbutton4"
+
+#~ msgid "toolbutton5"
+#~ msgstr "toolbutton5"
+
+#~ msgid ""
+#~ "Hold left button for use wiimote\n"
+#~ "Right button for menu"
+#~ msgstr ""
+#~ "Houd de linker muisknop ingedrukt om de wiimote te gebruiken\n"
+#~ "Rechter muisknop voor menu"
+
+#~ msgid "Discovering Wiimote"
+#~ msgstr "Wiimote detecteren"
 
 #~ msgid "Wiimote mappings"
 #~ msgstr "Wiimote mappings"
+
+#~ msgid "Add visible mappings"
+#~ msgstr "Zichtbare mappings toevoegen"
diff --git a/po/pt.po b/po/pt.po
index d9671e2..e328ccc 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,105 +7,93 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wiican\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-13 14:38+0100\n"
+"POT-Creation-Date: 2012-08-16 14:27+0200\n"
 "PO-Revision-Date: 2011-02-13 16:19+0000\n"
 "Last-Translator: J. FÃlix OntaÃÃn <Unknown>\n"
 "Language-Team: Portuguese <pt li org>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-07 23:04+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
-"Language: pt\n"
+"X-Launchpad-Export-Date: 2012-08-16 12:08+0000\n"
+"X-Generator: Launchpad (build 15810)\n"
 
-#: ../bin/wiican:102
+#: ../bin/wiican:134
 msgid "Plug a bluetooth adapter"
 msgstr "Ligue um adaptador Bluetooth"
 
-#: ../bin/wiican:107
+#: ../bin/wiican:142
 msgid "Please load uinput module first"
 msgstr "Por favor carregue primeiro o mÃdulo uinput"
 
-#: ../bin/wiican:113
-msgid ""
-"Hold left button for use wiimote\n"
-"Right button for menu"
+#: ../bin/wiican:196
+msgid "Set some visible mappings"
 msgstr ""
-"Prima o botÃo esquerdo para usar o comando Wii\n"
-"Prima o botÃo direito para o menu"
 
-#: ../bin/wiican:125
-msgid "Discovering Wiimote"
-msgstr "A procurar o comando Wii"
-
-#: ../bin/wiican:160
-msgid "Add visible mappings"
-msgstr ""
-
-#: ../bin/wiican:205 ../wiican/ui/editordlg.py:148
+#: ../bin/wiican:239 ../wiican/ui/editordlg.py:148
 msgid "Editing "
 msgstr "A editar "
 
-#: ../bin/wiican:218 ../wiican/ui/editordlg.py:266
+#: ../bin/wiican:252 ../wiican/ui/editordlg.py:267
 msgid "Press 1+2"
 msgstr "Pressione 1+2"
 
-#: ../bin/wiican:219 ../wiican/ui/editordlg.py:267
+#: ../bin/wiican:253 ../wiican/ui/editordlg.py:268
 msgid "To put you Wiimote in discoverable mode now"
 msgstr ""
 
-#: ../bin/wiican:239 ../wiican/mapping/manager.py:106
+#: ../bin/wiican:273 ../wiican/mapping/manager.py:106
 #, python-format
 msgid "Not %s file found on wiican package"
 msgstr ""
 
-#: ../bin/wiican:243 ../wiican/mapping/manager.py:110
+#: ../bin/wiican:277 ../wiican/mapping/manager.py:110
 #, python-format
 msgid "Not %s file found  on wiican package"
 msgstr ""
 
-#: ../bin/wiican:282
+#: ../bin/wiican:316
 msgid "Wiican Mapping Package load failed!"
 msgstr ""
 
-#: ../bin/wiican:289
+#: ../bin/wiican:323
 msgid "usage: %prog [options] arg"
 msgstr ""
 
-#: ../bin/wiican:291
+#: ../bin/wiican:325
 msgid "loads mapping package from FILENAME"
 msgstr ""
 
-#: ../bin/wiican:310
+#: ../bin/wiican:344
 #, python-format
 msgid "No wiican package mapping found: %s"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:38
+#: ../wiican/ui/managerdlg.py:43
 msgid "Wiican Mapping Package"
 msgstr "Pacote de Mapeamento Wiican"
 
-#: ../wiican/ui/managerdlg.py:88
+#: ../wiican/ui/managerdlg.py:111
 msgid "Editing new mapping"
 msgstr "A editar novo mapeamento"
 
-#: ../wiican/ui/managerdlg.py:143
+#: ../wiican/ui/managerdlg.py:179
 msgid "Are you sure you want to completely remove this mapping?"
 msgstr "Tem a certeza que deseja remover este mapeamento?"
 
-#: ../wiican/ui/managerdlg.py:152
+#: ../wiican/ui/managerdlg.py:188
 msgid "Deleting mappings"
 msgstr "A eliminar mapeamentos"
 
-#: ../wiican/ui/managerdlg.py:179
+#: ../wiican/ui/managerdlg.py:217
 msgid "Import mapping..."
 msgstr "A importar mapeamento..."
 
-#: ../wiican/ui/managerdlg.py:197
+#: ../wiican/ui/managerdlg.py:235
 msgid "Wiican Mapping Package import failed!"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:227
+#: ../wiican/ui/managerdlg.py:265
 msgid "Exporting mapping..."
 msgstr "A exportar mapeamento..."
 
@@ -130,144 +118,145 @@ msgid "Ensure a bluetooth "
 msgstr ""
 
 #: ../wiican/mapping/manager.py:131 ../wiican/mapping/manager.py:171
-#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:184
-#: ../wiican/mapping/manager.py:192 ../wiican/mapping/manager.py:200
-#: ../wiican/mapping/manager.py:218 ../wiican/mapping/manager.py:232
-#: ../wiican/mapping/manager.py:238
+#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:193
+#: ../wiican/mapping/manager.py:201 ../wiican/mapping/manager.py:209
+#: ../wiican/mapping/manager.py:225 ../wiican/mapping/manager.py:248
+#: ../wiican/mapping/manager.py:262 ../wiican/mapping/manager.py:268
 msgid "Mapping not found:"
 msgstr "Mapeamento nÃo encontrado:"
 
-#: ../wiican/mapping/manager.py:221
+#: ../wiican/mapping/manager.py:251
 msgid "Cannot remove a system installed mapping"
 msgstr ""
 
-#: ../data/mapping.ui:21
-msgid "Wiican mappings"
+#: ../data/mapping.ui:5
+msgid "Autostart running this mapping"
 msgstr ""
 
-#: ../data/mapping.ui:44
-msgid "toolbutton1"
+#: ../data/mapping.ui:6 ../data/mapping.ui:651
+msgid "_Autostart"
 msgstr ""
 
-#: ../data/mapping.ui:57
-msgid "toolbutton2"
+#: ../data/mapping.ui:7
+msgid "Launch this mapping automatically at desktop session start"
 msgstr ""
 
-#: ../data/mapping.ui:70
-msgid "toolbutton3"
+#: ../data/mapping.ui:11
+msgid "Delete mapping"
 msgstr ""
 
-#: ../data/mapping.ui:92
-msgid "toolbutton4"
+#: ../data/mapping.ui:12
+msgid "_Delete"
 msgstr ""
 
-#: ../data/mapping.ui:105
-msgid "toolbutton5"
+#: ../data/mapping.ui:13
+msgid "Remove mapping from the catalog"
 msgstr ""
 
-#: ../data/mapping.ui:314
-msgid "_Name:"
+#: ../data/mapping.ui:18
+msgid "Edit mapping"
 msgstr ""
 
-#: ../data/mapping.ui:326
-msgid "Co_mment:"
+#: ../data/mapping.ui:19 ../data/mapping.ui:620
+msgid "_Edit"
 msgstr ""
 
-#: ../data/mapping.ui:337
-msgid "A_uthor/s:"
+#: ../data/mapping.ui:20
+msgid "Edit mapping properties"
 msgstr ""
 
-#: ../data/mapping.ui:348
-msgid "_Version:"
+#: ../data/mapping.ui:25
+msgid "_Export mapping"
 msgstr ""
 
-#: ../data/mapping.ui:443
-msgid "_Icon:"
+#: ../data/mapping.ui:26 ../data/mapping.ui:692
+msgid "E_xport"
 msgstr ""
 
-#: ../data/mapping.ui:466
-msgid "<b>General</b>"
+#: ../data/mapping.ui:27
+msgid "Export mapping as a .wii file"
 msgstr ""
 
-#: ../data/mapping.ui:539
-msgid ""
-"This is a system installed mapping. \n"
-"Changes will be saved in a new mapping."
+#: ../data/mapping.ui:32
+msgid "Import mapping"
 msgstr ""
 
-#: ../data/mapping.ui:565
-msgid "Execute mapping"
+#: ../data/mapping.ui:33 ../data/mapping.ui:676
+msgid "_Import"
 msgstr ""
 
-#: ../data/mapping.ui:586
-msgid "Mapping programming help"
+#: ../data/mapping.ui:34
+msgid "Import a mapping from a .wii file"
 msgstr ""
 
-#: ../data/mapping.ui:620
-msgid "<b>Mapping</b>"
+#: ../data/mapping.ui:39
+msgid "New mapping"
 msgstr ""
 
-#: ../data/mapping.ui:684
-msgid "Edit mapping"
+#: ../data/mapping.ui:40 ../data/mapping.ui:604
+msgid "_New"
 msgstr ""
 
-#: ../data/mapping.ui:685
-msgid "_Edit"
-msgstr ""
+#: ../data/mapping.ui:41
+#, fuzzy
+msgid "Create a new mapping"
+msgstr "A editar novo mapeamento"
 
-#: ../data/mapping.ui:686
-msgid "Edit mapping properties"
+#: ../data/mapping.ui:146
+msgid "_Name:"
 msgstr ""
 
-#: ../data/mapping.ui:691
-msgid "Delete mapping"
+#: ../data/mapping.ui:160
+msgid "Co_mment:"
 msgstr ""
 
-#: ../data/mapping.ui:692
-msgid "_Delete"
+#: ../data/mapping.ui:174
+msgid "A_uthor/s:"
 msgstr ""
 
-#: ../data/mapping.ui:693
-msgid "Removes the mapping from the catalog"
+#: ../data/mapping.ui:188
+msgid "_Version:"
 msgstr ""
 
-#: ../data/mapping.ui:698
-msgid "Import mapping"
+#: ../data/mapping.ui:298
+msgid "_Icon:"
 msgstr ""
 
-#: ../data/mapping.ui:699
-msgid "_Import"
+#: ../data/mapping.ui:325
+msgid "<b>General</b>"
 msgstr ""
 
-#: ../data/mapping.ui:700
-msgid "Import a mapping from a .wii file"
+#: ../data/mapping.ui:384
+msgid "Mapping programming help"
 msgstr ""
 
-#: ../data/mapping.ui:705
-msgid "_Export mapping"
+#: ../data/mapping.ui:402
+msgid "Execute mapping"
 msgstr ""
 
-#: ../data/mapping.ui:706
-msgid "E_xport"
+#: ../data/mapping.ui:454
+msgid ""
+"This is a system installed mapping. \n"
+"Changes will be saved in a new mapping."
 msgstr ""
 
-#: ../data/mapping.ui:707
-msgid "Export mapping as a .wii file"
+#: ../data/mapping.ui:496
+msgid "<b>Mapping</b>"
 msgstr ""
 
-#: ../data/mapping.ui:712
-msgid "New mapping"
+#: ../data/mapping.ui:540
+msgid "Wiican mappings"
 msgstr ""
 
-#: ../data/mapping.ui:713
-msgid "_New"
+#: ../data/wiimotemanager.ui:7
+msgid "Mapping validation failed"
 msgstr ""
 
-#: ../data/mapping.ui:714
-msgid "Creates a new mapping"
+#: ../data/wiimotemanager.ui:87
+msgid "It looks the activated mapping contains errors."
 msgstr ""
 
-#: ../data/wiimotemanager.ui:13
+#: ../data/wiimotemanager.ui:120
 msgid ""
 "Yes wii can\n"
 "Wiimote usage assistant and mapping manager"
@@ -275,17 +264,23 @@ msgstr ""
 "Sim nÃs (Wii) conseguimos\n"
 "Assistente e gestor de utilizaÃÃo do Comando Wii"
 
-#: ../data/wiimotemanager.ui:726
+#: ../data/wiimotemanager.ui:921
 msgid "Edit mappings..."
 msgstr ""
 
-#: ../data/wiimotemanager.ui:759
-msgid "Mapping validation failed"
+#: ../data/wiimotemanager.ui:935
+msgid "Show mappings on startup"
 msgstr ""
 
-#: ../data/wiimotemanager.ui:788
-msgid "It looks the activated mapping contains errors."
-msgstr ""
+#~ msgid "Discovering Wiimote"
+#~ msgstr "A procurar o comando Wii"
 
 #~ msgid "Wiimote mappings"
 #~ msgstr "Atalhos do comando Wii"
+
+#~ msgid ""
+#~ "Hold left button for use wiimote\n"
+#~ "Right button for menu"
+#~ msgstr ""
+#~ "Prima o botÃo esquerdo para usar o comando Wii\n"
+#~ "Prima o botÃo direito para o menu"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 204121c..12431df 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,105 +7,93 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wiican\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-13 14:38+0100\n"
-"PO-Revision-Date: 2011-02-13 16:32+0000\n"
-"Last-Translator: Sam Samuels <gemini_sam_samuels hotmail co uk>\n"
+"POT-Creation-Date: 2012-08-16 14:27+0200\n"
+"PO-Revision-Date: 2011-09-28 20:52+0000\n"
+"Last-Translator: Rafael Jannone <rafael jannone org>\n"
 "Language-Team: Brazilian Portuguese <pt_BR li org>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-07 23:04+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
-"Language: pt_BR\n"
+"X-Launchpad-Export-Date: 2012-08-16 12:08+0000\n"
+"X-Generator: Launchpad (build 15810)\n"
 
-#: ../bin/wiican:102
+#: ../bin/wiican:134
 msgid "Plug a bluetooth adapter"
 msgstr "Ative um adaptador bluetooth"
 
-#: ../bin/wiican:107
+#: ../bin/wiican:142
 msgid "Please load uinput module first"
 msgstr "Por favor, carregue primeiro o mÃdulo uinput"
 
-#: ../bin/wiican:113
-msgid ""
-"Hold left button for use wiimote\n"
-"Right button for menu"
-msgstr ""
-"Pressione e segure o botÃo esquerdo para usar o Wii Remote\n"
-"BotÃo direito para acessar opÃÃes"
-
-#: ../bin/wiican:125
-msgid "Discovering Wiimote"
-msgstr "Procurando o Wii Remote"
-
-#: ../bin/wiican:160
-msgid "Add visible mappings"
-msgstr "Adicionar mapeamentos visÃveis"
+#: ../bin/wiican:196
+msgid "Set some visible mappings"
+msgstr "Configurar alguns mapeamentos visÃveis"
 
-#: ../bin/wiican:205 ../wiican/ui/editordlg.py:148
+#: ../bin/wiican:239 ../wiican/ui/editordlg.py:148
 msgid "Editing "
 msgstr "Editando "
 
-#: ../bin/wiican:218 ../wiican/ui/editordlg.py:266
+#: ../bin/wiican:252 ../wiican/ui/editordlg.py:267
 msgid "Press 1+2"
 msgstr "Pressione 1+2"
 
-#: ../bin/wiican:219 ../wiican/ui/editordlg.py:267
+#: ../bin/wiican:253 ../wiican/ui/editordlg.py:268
 msgid "To put you Wiimote in discoverable mode now"
 msgstr "Colocar seu Wii Remote no modo de busca agora"
 
-#: ../bin/wiican:239 ../wiican/mapping/manager.py:106
+#: ../bin/wiican:273 ../wiican/mapping/manager.py:106
 #, python-format
 msgid "Not %s file found on wiican package"
 msgstr "Arquivo %s nÃo encontrado no pacote wiican"
 
-#: ../bin/wiican:243 ../wiican/mapping/manager.py:110
+#: ../bin/wiican:277 ../wiican/mapping/manager.py:110
 #, python-format
 msgid "Not %s file found  on wiican package"
 msgstr "Arquivo %s nÃo encontrado no pacote wiican"
 
-#: ../bin/wiican:282
+#: ../bin/wiican:316
 msgid "Wiican Mapping Package load failed!"
 msgstr "Falha ao carregar Pacote de Mapeamento do Wiican!"
 
-#: ../bin/wiican:289
+#: ../bin/wiican:323
 msgid "usage: %prog [options] arg"
 msgstr "uso: %prog [opÃÃes] arg"
 
-#: ../bin/wiican:291
+#: ../bin/wiican:325
 msgid "loads mapping package from FILENAME"
 msgstr "carrega pacote de mapeamento do FILENAME"
 
-#: ../bin/wiican:310
+#: ../bin/wiican:344
 #, python-format
 msgid "No wiican package mapping found: %s"
 msgstr "Nenhum mapeamento de pacote Wican encontrados: %s"
 
-#: ../wiican/ui/managerdlg.py:38
+#: ../wiican/ui/managerdlg.py:43
 msgid "Wiican Mapping Package"
 msgstr "Pacote de Mapeamento do Wiican"
 
-#: ../wiican/ui/managerdlg.py:88
+#: ../wiican/ui/managerdlg.py:111
 msgid "Editing new mapping"
 msgstr "Editando novo mapeamento"
 
-#: ../wiican/ui/managerdlg.py:143
+#: ../wiican/ui/managerdlg.py:179
 msgid "Are you sure you want to completely remove this mapping?"
 msgstr "Tem certeza que deseja remover este mapeamento?"
 
-#: ../wiican/ui/managerdlg.py:152
+#: ../wiican/ui/managerdlg.py:188
 msgid "Deleting mappings"
 msgstr "Deletando mapeamentos"
 
-#: ../wiican/ui/managerdlg.py:179
+#: ../wiican/ui/managerdlg.py:217
 msgid "Import mapping..."
 msgstr "Importar mapeamento..."
 
-#: ../wiican/ui/managerdlg.py:197
+#: ../wiican/ui/managerdlg.py:235
 msgid "Wiican Mapping Package import failed!"
 msgstr "Falha ao importar Pacote de Mapeamento do Wiican!"
 
-#: ../wiican/ui/managerdlg.py:227
+#: ../wiican/ui/managerdlg.py:265
 msgid "Exporting mapping..."
 msgstr "Exportando mapeamento..."
 
@@ -130,66 +118,125 @@ msgid "Ensure a bluetooth "
 msgstr "Confirma um bluetooth "
 
 #: ../wiican/mapping/manager.py:131 ../wiican/mapping/manager.py:171
-#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:184
-#: ../wiican/mapping/manager.py:192 ../wiican/mapping/manager.py:200
-#: ../wiican/mapping/manager.py:218 ../wiican/mapping/manager.py:232
-#: ../wiican/mapping/manager.py:238
+#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:193
+#: ../wiican/mapping/manager.py:201 ../wiican/mapping/manager.py:209
+#: ../wiican/mapping/manager.py:225 ../wiican/mapping/manager.py:248
+#: ../wiican/mapping/manager.py:262 ../wiican/mapping/manager.py:268
 msgid "Mapping not found:"
 msgstr "Mapeamento nÃo encontrado:"
 
-#: ../wiican/mapping/manager.py:221
+#: ../wiican/mapping/manager.py:251
 msgid "Cannot remove a system installed mapping"
 msgstr "ImpossÃvel remover um sistema de mapeamento instalado"
 
-#: ../data/mapping.ui:21
-msgid "Wiican mappings"
-msgstr "Mapeamentos Wiican"
+#: ../data/mapping.ui:5
+#, fuzzy
+msgid "Autostart running this mapping"
+msgstr "Execute este mapeamento"
 
-#: ../data/mapping.ui:44
-msgid "toolbutton1"
-msgstr "ferramenta de botÃo 1"
+#: ../data/mapping.ui:6 ../data/mapping.ui:651
+msgid "_Autostart"
+msgstr ""
 
-#: ../data/mapping.ui:57
-msgid "toolbutton2"
-msgstr "ferramenta de botÃo 2"
+#: ../data/mapping.ui:7
+msgid "Launch this mapping automatically at desktop session start"
+msgstr ""
 
-#: ../data/mapping.ui:70
-msgid "toolbutton3"
-msgstr "ferramenta de botÃo 3"
+#: ../data/mapping.ui:11
+msgid "Delete mapping"
+msgstr "Excluir mapeamento"
 
-#: ../data/mapping.ui:92
-msgid "toolbutton4"
-msgstr "ferramenta de botÃo 4"
+#: ../data/mapping.ui:12
+msgid "_Delete"
+msgstr "_Excluir"
+
+#: ../data/mapping.ui:13
+#, fuzzy
+msgid "Remove mapping from the catalog"
+msgstr "Remove o mapeamento a partir do catÃlogo"
+
+#: ../data/mapping.ui:18
+msgid "Edit mapping"
+msgstr "Editar mapeamento"
 
-#: ../data/mapping.ui:105
-msgid "toolbutton5"
-msgstr "ferramenta de botÃo 5"
+#: ../data/mapping.ui:19 ../data/mapping.ui:620
+msgid "_Edit"
+msgstr "_Editar"
 
-#: ../data/mapping.ui:314
+#: ../data/mapping.ui:20
+msgid "Edit mapping properties"
+msgstr "Editar propriedades de mapeamento"
+
+#: ../data/mapping.ui:25
+msgid "_Export mapping"
+msgstr "_Mapeamento de ExportaÃÃo"
+
+#: ../data/mapping.ui:26 ../data/mapping.ui:692
+msgid "E_xport"
+msgstr "_Exportar"
+
+#: ../data/mapping.ui:27
+msgid "Export mapping as a .wii file"
+msgstr "Exportar mapeamento como um arquivo. wii"
+
+#: ../data/mapping.ui:32
+msgid "Import mapping"
+msgstr "Mapeamento de ImportaÃÃo"
+
+#: ../data/mapping.ui:33 ../data/mapping.ui:676
+msgid "_Import"
+msgstr "_Importar"
+
+#: ../data/mapping.ui:34
+msgid "Import a mapping from a .wii file"
+msgstr "Importar um mapeamento de um arquivo. wii"
+
+#: ../data/mapping.ui:39
+msgid "New mapping"
+msgstr "Novo mapeamento"
+
+#: ../data/mapping.ui:40 ../data/mapping.ui:604
+msgid "_New"
+msgstr "_Novo"
+
+#: ../data/mapping.ui:41
+#, fuzzy
+msgid "Create a new mapping"
+msgstr "Cria um novo mapeamento"
+
+#: ../data/mapping.ui:146
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: ../data/mapping.ui:326
+#: ../data/mapping.ui:160
 msgid "Co_mment:"
 msgstr "Co_mentÃrio:"
 
-#: ../data/mapping.ui:337
+#: ../data/mapping.ui:174
 msgid "A_uthor/s:"
 msgstr "A_utor/es"
 
-#: ../data/mapping.ui:348
+#: ../data/mapping.ui:188
 msgid "_Version:"
 msgstr "_VersÃo:"
 
-#: ../data/mapping.ui:443
+#: ../data/mapping.ui:298
 msgid "_Icon:"
 msgstr "_Ãcone:"
 
-#: ../data/mapping.ui:466
+#: ../data/mapping.ui:325
 msgid "<b>General</b>"
 msgstr "<b>Geral</b>"
 
-#: ../data/mapping.ui:539
+#: ../data/mapping.ui:384
+msgid "Mapping programming help"
+msgstr "Ajuda de configuraÃÃo de mapeamento"
+
+#: ../data/mapping.ui:402
+msgid "Execute mapping"
+msgstr "Executar mapeamento"
+
+#: ../data/mapping.ui:454
 msgid ""
 "This is a system installed mapping. \n"
 "Changes will be saved in a new mapping."
@@ -197,79 +244,23 @@ msgstr ""
 "Este à um mapeamento prÃ-instalado pelo sistema. \n"
 "Qualquer mudanÃa serà salva em um novo mapeamento."
 
-#: ../data/mapping.ui:565
-msgid "Execute mapping"
-msgstr "Executar mapeamento"
-
-#: ../data/mapping.ui:586
-msgid "Mapping programming help"
-msgstr "Ajuda de configuraÃÃo de mapeamento"
-
-#: ../data/mapping.ui:620
+#: ../data/mapping.ui:496
 msgid "<b>Mapping</b>"
 msgstr "<b>Mapeamento</b>"
 
-#: ../data/mapping.ui:684
-msgid "Edit mapping"
-msgstr "Editar mapeamento"
-
-#: ../data/mapping.ui:685
-msgid "_Edit"
-msgstr "_Editar"
-
-#: ../data/mapping.ui:686
-msgid "Edit mapping properties"
-msgstr "Editar propriedades de mapeamento"
-
-#: ../data/mapping.ui:691
-msgid "Delete mapping"
-msgstr "Excluir mapeamento"
-
-#: ../data/mapping.ui:692
-msgid "_Delete"
-msgstr "_Excluir"
-
-#: ../data/mapping.ui:693
-msgid "Removes the mapping from the catalog"
-msgstr "Remove o mapeamento a partir do catÃlogo"
-
-#: ../data/mapping.ui:698
-msgid "Import mapping"
-msgstr "Mapeamento de ImportaÃÃo"
-
-#: ../data/mapping.ui:699
-msgid "_Import"
-msgstr "_Importar"
-
-#: ../data/mapping.ui:700
-msgid "Import a mapping from a .wii file"
-msgstr "Importar um mapeamento de um arquivo. wii"
-
-#: ../data/mapping.ui:705
-msgid "_Export mapping"
-msgstr "_Mapeamento de ExportaÃÃo"
-
-#: ../data/mapping.ui:706
-msgid "E_xport"
-msgstr "_Exportar"
-
-#: ../data/mapping.ui:707
-msgid "Export mapping as a .wii file"
-msgstr "Exportar mapeamento como um arquivo. wii"
-
-#: ../data/mapping.ui:712
-msgid "New mapping"
-msgstr "Novo mapeamento"
+#: ../data/mapping.ui:540
+msgid "Wiican mappings"
+msgstr "Mapeamentos Wiican"
 
-#: ../data/mapping.ui:713
-msgid "_New"
-msgstr "_Novo"
+#: ../data/wiimotemanager.ui:7
+msgid "Mapping validation failed"
+msgstr "Falha na validaÃÃo de mapeamento"
 
-#: ../data/mapping.ui:714
-msgid "Creates a new mapping"
-msgstr "Cria um novo mapeamento"
+#: ../data/wiimotemanager.ui:87
+msgid "It looks the activated mapping contains errors."
+msgstr "O mapeamento ativado parece conter erros."
 
-#: ../data/wiimotemanager.ui:13
+#: ../data/wiimotemanager.ui:120
 msgid ""
 "Yes wii can\n"
 "Wiimote usage assistant and mapping manager"
@@ -277,20 +268,44 @@ msgstr ""
 "Yes wii can\n"
 "Assistente de configuraÃÃo e utilizaÃÃo do Wii Remote"
 
-#: ../data/wiimotemanager.ui:726
+#: ../data/wiimotemanager.ui:921
 msgid "Edit mappings..."
 msgstr "Editar mapeamentos..."
 
-#: ../data/wiimotemanager.ui:759
-msgid "Mapping validation failed"
-msgstr "Falha na validaÃÃo de mapeamento"
+#: ../data/wiimotemanager.ui:935
+msgid "Show mappings on startup"
+msgstr "Mostrar mapeamentos ao iniciar"
 
-#: ../data/wiimotemanager.ui:788
-msgid "It looks the activated mapping contains errors."
-msgstr "O mapeamento ativado parece conter erros."
+#~ msgid "toolbutton1"
+#~ msgstr "ferramenta de botÃo 1"
+
+#~ msgid "toolbutton2"
+#~ msgstr "ferramenta de botÃo 2"
+
+#~ msgid "toolbutton3"
+#~ msgstr "ferramenta de botÃo 3"
+
+#~ msgid "toolbutton4"
+#~ msgstr "ferramenta de botÃo 4"
+
+#~ msgid "toolbutton5"
+#~ msgstr "ferramenta de botÃo 5"
+
+#~ msgid ""
+#~ "Hold left button for use wiimote\n"
+#~ "Right button for menu"
+#~ msgstr ""
+#~ "Pressione e segure o botÃo esquerdo para usar o Wii Remote\n"
+#~ "BotÃo direito para acessar opÃÃes"
+
+#~ msgid "Discovering Wiimote"
+#~ msgstr "Procurando o Wii Remote"
 
 #~ msgid "Wiimote mappings"
 #~ msgstr "Mapeamentos para o Wii Remote"
 
 #~ msgid "<b>Mappings</b>"
 #~ msgstr "<b>Mapeamentos</b>"
+
+#~ msgid "Add visible mappings"
+#~ msgstr "Adicionar mapeamentos visÃveis"
diff --git a/po/ru.po b/po/ru.po
index 6acdd87..43be9f6 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,105 +7,93 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wiican\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-13 14:38+0100\n"
+"POT-Creation-Date: 2012-08-16 14:27+0200\n"
 "PO-Revision-Date: 2011-02-13 16:34+0000\n"
 "Last-Translator: Alexander 'FONTER' Zinin <spore_09 mail ru>\n"
 "Language-Team: Russian <ru li org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-07 23:04+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
-"Language: ru\n"
+"X-Launchpad-Export-Date: 2012-08-16 12:08+0000\n"
+"X-Generator: Launchpad (build 15810)\n"
 
-#: ../bin/wiican:102
+#: ../bin/wiican:134
 msgid "Plug a bluetooth adapter"
 msgstr "ÐÐÐÐÐÑÑÐÑÐ bluetooth ÐÐÐÐÑÐÑ"
 
-#: ../bin/wiican:107
+#: ../bin/wiican:142
 msgid "Please load uinput module first"
 msgstr "ÐÐÐÐÐÑÐÑÑÐ, ÑÐÐÑÐÐÐ ÐÐÐÑÑÐÐÑÑ ÐÐÐÑÐÑ uinput"
 
-#: ../bin/wiican:113
-msgid ""
-"Hold left button for use wiimote\n"
-"Right button for menu"
+#: ../bin/wiican:196
+msgid "Set some visible mappings"
 msgstr ""
-"ÐÐÐÑÐÐÐÐÐÑÐ ÐÐÐÑÑ ÐÐÐÐÐÑ ÐÐÑ ÐÑÐÐÐÑÐÐÐÐÐÐÑ wiimote\n"
-"ÐÑÐÐÑÑ ÐÐÐÐÐÑ ÐÐÑ ÐÑÐÐÐÐ ÐÐÐÑ"
-
-#: ../bin/wiican:125
-msgid "Discovering Wiimote"
-msgstr "ÐÐÐÑÐ wiimote"
 
-#: ../bin/wiican:160
-msgid "Add visible mappings"
-msgstr "ÐÐÐÐÐÐÑÑ ÐÐÐÐÐÑÐ ÐÑÐÐÑÐÐÐ"
-
-#: ../bin/wiican:205 ../wiican/ui/editordlg.py:148
+#: ../bin/wiican:239 ../wiican/ui/editordlg.py:148
 msgid "Editing "
 msgstr "ÐÐÐÐÐÑÐÑÐÐÐÐÐÐ "
 
-#: ../bin/wiican:218 ../wiican/ui/editordlg.py:266
+#: ../bin/wiican:252 ../wiican/ui/editordlg.py:267
 msgid "Press 1+2"
 msgstr "ÐÐÐÐÐÑÐ ÐÐÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐ 1+2"
 
-#: ../bin/wiican:219 ../wiican/ui/editordlg.py:267
+#: ../bin/wiican:253 ../wiican/ui/editordlg.py:268
 msgid "To put you Wiimote in discoverable mode now"
 msgstr "ÐÑÐÐÑ ÐÐÑÐÐÐÑÑÐ ÐÐÑ Wiimote Ð ÑÐÐÐÐ ÐÐÐÐÑÑÐÐÐÐÑ ÑÐÐÑÐÑ"
 
-#: ../bin/wiican:239 ../wiican/mapping/manager.py:106
+#: ../bin/wiican:273 ../wiican/mapping/manager.py:106
 #, python-format
 msgid "Not %s file found on wiican package"
 msgstr "ÐÐÐÐ, ÐÑÐÐÑÐÑÐ ÐÑ %s, ÐÐÐÐÐÐ Ð ÐÐÐÐÑÐ wiican"
 
-#: ../bin/wiican:243 ../wiican/mapping/manager.py:110
+#: ../bin/wiican:277 ../wiican/mapping/manager.py:110
 #, python-format
 msgid "Not %s file found  on wiican package"
-msgstr ""
+msgstr "ÐÐÐÐ %s ÐÐ ÐÐÐÐÐÐ Ð ÐÐÐÐÑÐ wiican"
 
-#: ../bin/wiican:282
+#: ../bin/wiican:316
 msgid "Wiican Mapping Package load failed!"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÐÑÑ ÐÐÐÐÑ ÐÑÐÐÑÐÐÐ Wiican Mapping Package!"
 
-#: ../bin/wiican:289
+#: ../bin/wiican:323
 msgid "usage: %prog [options] arg"
 msgstr "ÐÑÐÐÐÑÐÐÐÐÐÐÐ: %prog [options] arg"
 
-#: ../bin/wiican:291
+#: ../bin/wiican:325
 msgid "loads mapping package from FILENAME"
 msgstr "ÐÐÐÑÑÐÐÑÑ ÐÐÐÐÑ ÐÑÐÐÑÐÐÐ Wiican  Mapping Package ÐÐ ÑÐÐÐÐ FILENAME"
 
-#: ../bin/wiican:310
+#: ../bin/wiican:344
 #, python-format
 msgid "No wiican package mapping found: %s"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:38
+#: ../wiican/ui/managerdlg.py:43
 msgid "Wiican Mapping Package"
 msgstr "ÐÐÐÐÑ ÐÑÐÐÑÐÐÐ Wiican Mapping Package"
 
-#: ../wiican/ui/managerdlg.py:88
+#: ../wiican/ui/managerdlg.py:111
 msgid "Editing new mapping"
 msgstr "ÐÐÐÐÐÑÐÑÐÐÐÑÑ ÐÐÐÑÐ ÐÑÐÐÑÐÐÐ"
 
-#: ../wiican/ui/managerdlg.py:143
+#: ../wiican/ui/managerdlg.py:179
 msgid "Are you sure you want to completely remove this mapping?"
 msgstr "ÐÑ ÐÐÐÑÑÐÐÑÐÐÑÐÐ ÑÐÑÐÑÐ ÑÐÐÐÐÑÑ ÑÑÑ ÐÐÐÑÐÐÑÑÐÑÐÑ ÐÑÐÐÑÐÐÐ?"
 
-#: ../wiican/ui/managerdlg.py:152
+#: ../wiican/ui/managerdlg.py:188
 msgid "Deleting mappings"
 msgstr "ÐÐÐÐÐÐÐÐ ÐÑÐÐÑÐÐÐ"
 
-#: ../wiican/ui/managerdlg.py:179
+#: ../wiican/ui/managerdlg.py:217
 msgid "Import mapping..."
 msgstr "ÐÐÐÐÑÑÐÑÐÐÐÑÑ ÑÐÐÐ ÐÑÐÐÑÐÐÐ..."
 
-#: ../wiican/ui/managerdlg.py:197
+#: ../wiican/ui/managerdlg.py:235
 msgid "Wiican Mapping Package import failed!"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÐÑÑ ÑÐÐÐ ÐÑÐÐÑÐÐÐ Wiican Mapping Package"
 
-#: ../wiican/ui/managerdlg.py:227
+#: ../wiican/ui/managerdlg.py:265
 msgid "Exporting mapping..."
 msgstr "ÐÐÑÐÐÑÑ ÐÑÐÐÑÐÐÐ..."
 
@@ -130,66 +118,124 @@ msgid "Ensure a bluetooth "
 msgstr "ÐÐÐÑÑÐÑÐ BlueTooth "
 
 #: ../wiican/mapping/manager.py:131 ../wiican/mapping/manager.py:171
-#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:184
-#: ../wiican/mapping/manager.py:192 ../wiican/mapping/manager.py:200
-#: ../wiican/mapping/manager.py:218 ../wiican/mapping/manager.py:232
-#: ../wiican/mapping/manager.py:238
+#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:193
+#: ../wiican/mapping/manager.py:201 ../wiican/mapping/manager.py:209
+#: ../wiican/mapping/manager.py:225 ../wiican/mapping/manager.py:248
+#: ../wiican/mapping/manager.py:262 ../wiican/mapping/manager.py:268
 msgid "Mapping not found:"
 msgstr "ÐÑÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐ:"
 
-#: ../wiican/mapping/manager.py:221
+#: ../wiican/mapping/manager.py:251
 msgid "Cannot remove a system installed mapping"
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑÑ ÑÐÑÑÐÐÐÑÑ ÐÑÐÐÑÐÐÑ"
 
-#: ../data/mapping.ui:21
-msgid "Wiican mappings"
+#: ../data/mapping.ui:5
+#, fuzzy
+msgid "Autostart running this mapping"
+msgstr "ÐÐÐÑÑÑÐÑÑ ÐÑÐÐÑÐÐÑ"
+
+#: ../data/mapping.ui:6 ../data/mapping.ui:651
+msgid "_Autostart"
 msgstr ""
 
-#: ../data/mapping.ui:44
-msgid "toolbutton1"
-msgstr "toolbutton1"
+#: ../data/mapping.ui:7
+msgid "Launch this mapping automatically at desktop session start"
+msgstr ""
+
+#: ../data/mapping.ui:11
+msgid "Delete mapping"
+msgstr "ÐÐÐÐÐÑÑ ÐÑÐÐÑÐÐÐÐÐÐ"
+
+#: ../data/mapping.ui:12
+msgid "_Delete"
+msgstr "_ÐÐÐÐÐÑÑ"
+
+#: ../data/mapping.ui:13
+msgid "Remove mapping from the catalog"
+msgstr ""
+
+#: ../data/mapping.ui:18
+msgid "Edit mapping"
+msgstr "ÐÐÐÐÐÐÑÑ ÐÑÐÐÑÐÐÐÐÐÐ"
+
+#: ../data/mapping.ui:19 ../data/mapping.ui:620
+msgid "_Edit"
+msgstr "_ÐÑÐÐÐÐ"
+
+#: ../data/mapping.ui:20
+msgid "Edit mapping properties"
+msgstr "ÐÐÐÐÐÐÑÑ ÑÐÐÐÑÑÐÐ ÐÑÐÐÑÐÐÐÐÐÑ"
+
+#: ../data/mapping.ui:25
+msgid "_Export mapping"
+msgstr "_ÐÐÑÐÐÑÑ ÐÑÐÐÑÐÐÐÐÐÑ"
 
-#: ../data/mapping.ui:57
-msgid "toolbutton2"
-msgstr "toolbutton2"
+#: ../data/mapping.ui:26 ../data/mapping.ui:692
+msgid "E_xport"
+msgstr "Ð_ÐÑÐÐÑÑ"
 
-#: ../data/mapping.ui:70
-msgid "toolbutton3"
-msgstr "toolbutton3"
+#: ../data/mapping.ui:27
+msgid "Export mapping as a .wii file"
+msgstr "ÐÐÑÐÐÑÑ ÐÑÐÐÑÐÐÐÐÐÑ ÐÐÐ *.wii ÑÐÐÐ"
 
-#: ../data/mapping.ui:92
-msgid "toolbutton4"
-msgstr "toolbutton4"
+#: ../data/mapping.ui:32
+msgid "Import mapping"
+msgstr "ÐÐÐÐÑÑ ÐÑÐÐÑÐÐÐÐÐÑ"
 
-#: ../data/mapping.ui:105
-msgid "toolbutton5"
-msgstr "toolbutton5"
+#: ../data/mapping.ui:33 ../data/mapping.ui:676
+msgid "_Import"
+msgstr "_ÐÐÐÐÑÑ"
 
-#: ../data/mapping.ui:314
+#: ../data/mapping.ui:34
+msgid "Import a mapping from a .wii file"
+msgstr ""
+
+#: ../data/mapping.ui:39
+msgid "New mapping"
+msgstr "ÐÐÐÐÐ ÐÑÐÐÑÐÐÐÐÐÐ"
+
+#: ../data/mapping.ui:40 ../data/mapping.ui:604
+msgid "_New"
+msgstr "_ÐÐÐÐÐÑÑ"
+
+#: ../data/mapping.ui:41
+#, fuzzy
+msgid "Create a new mapping"
+msgstr "ÐÐÐÐÐÑÐÑÐÐÐÑÑ ÐÐÐÑÐ ÐÑÐÐÑÐÐÐ"
+
+#: ../data/mapping.ui:146
 msgid "_Name:"
 msgstr "_ÐÐÐÐÐÐÐÐ"
 
-#: ../data/mapping.ui:326
+#: ../data/mapping.ui:160
 msgid "Co_mment:"
 msgstr "ÐÑÐ_ÐÐÑÐÐÐÐ:"
 
-#: ../data/mapping.ui:337
+#: ../data/mapping.ui:174
 msgid "A_uthor/s:"
 msgstr "Ð_ÐÑÐÑ(Ñ)"
 
-#: ../data/mapping.ui:348
+#: ../data/mapping.ui:188
 msgid "_Version:"
 msgstr "_ÐÐÑÑÐÑ:"
 
-#: ../data/mapping.ui:443
+#: ../data/mapping.ui:298
 msgid "_Icon:"
 msgstr "_ÐÐÐÑÐÐ:"
 
-#: ../data/mapping.ui:466
+#: ../data/mapping.ui:325
 msgid "<b>General</b>"
 msgstr "<b>ÐÐÑÐÐ</b>"
 
-#: ../data/mapping.ui:539
+#: ../data/mapping.ui:384
+msgid "Mapping programming help"
+msgstr "ÐÐÐÐÑÑ Ð ÐÑÐÐÑÐÐÐÐÑÐÐÐÐÐÐ ÐÑÐÐÑÐÐÐ wiican"
+
+#: ../data/mapping.ui:402
+msgid "Execute mapping"
+msgstr "ÐÑÐÐÐÐÐÑÑ ÐÑÐÐÑÐÐÑ"
+
+#: ../data/mapping.ui:454
 msgid ""
 "This is a system installed mapping. \n"
 "Changes will be saved in a new mapping."
@@ -197,95 +243,63 @@ msgstr ""
 "ÐÑÐ ÐÑÐÐÑÐÐÐ ÑÑÑÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ. \n"
 "ÐÐÐÐÐÐÐÐÑ ÐÑÐÑÑ ÑÐÑÑÐÐÐÐÑ Ð ÐÐÐÑÑ ÐÐÐÑÐÐÑÑÐÑÐÑ ÐÑÐÐÑÐÐÐ."
 
-#: ../data/mapping.ui:565
-msgid "Execute mapping"
-msgstr "ÐÑÐÐÐÐÐÑÑ ÐÑÐÐÑÐÐÑ"
-
-#: ../data/mapping.ui:586
-msgid "Mapping programming help"
-msgstr "ÐÐÐÐÑÑ Ð ÐÑÐÐÑÐÐÐÐÑÐÐÐÐÐÐ ÐÑÐÐÑÐÐÐ wiican"
-
-#: ../data/mapping.ui:620
+#: ../data/mapping.ui:496
 msgid "<b>Mapping</b>"
 msgstr "<b>ÐÑÐÐÑÐÐÐ</b>"
 
-#: ../data/mapping.ui:684
-msgid "Edit mapping"
-msgstr "ÐÐÐÐÐÐÑÑ ÐÑÐÐÑÐÐÐÐÐÐ"
-
-#: ../data/mapping.ui:685
-msgid "_Edit"
-msgstr "_ÐÑÐÐÐÐ"
-
-#: ../data/mapping.ui:686
-msgid "Edit mapping properties"
-msgstr "ÐÐÐÐÐÐÑÑ ÑÐÐÐÑÑÐÐ ÐÑÐÐÑÐÐÐÐÐÑ"
-
-#: ../data/mapping.ui:691
-msgid "Delete mapping"
-msgstr "ÐÐÐÐÐÑÑ ÐÑÐÐÑÐÐÐÐÐÐ"
-
-#: ../data/mapping.ui:692
-msgid "_Delete"
-msgstr "_ÐÐÐÐÐÑÑ"
-
-#: ../data/mapping.ui:693
-msgid "Removes the mapping from the catalog"
+#: ../data/mapping.ui:540
+msgid "Wiican mappings"
 msgstr ""
 
-#: ../data/mapping.ui:698
-msgid "Import mapping"
-msgstr "ÐÐÐÐÑÑ ÐÑÐÐÑÐÐÐÐÐÑ"
+#: ../data/wiimotemanager.ui:7
+msgid "Mapping validation failed"
+msgstr "ÐÑÐÐÐÑÐÐ ÐÑÐÐÐÐÑÐÐÑÑÑ ÐÑÐÐÑÐÐÐ ÐÐ ÑÐÐÐÐÑÑ"
 
-#: ../data/mapping.ui:699
-msgid "_Import"
-msgstr "_ÐÐÐÐÑÑ"
+#: ../data/wiimotemanager.ui:87
+msgid "It looks the activated mapping contains errors."
+msgstr "ÐÐÑÐÐÐ, ÐÐÑÐÐÐÑÐÐÐÐÐÐÑ ÐÑÐÐÑÐÐÐ ÑÐÐÐÑÐÐÑ ÐÑÐÐÐÐ."
 
-#: ../data/mapping.ui:700
-msgid "Import a mapping from a .wii file"
-msgstr ""
+#: ../data/wiimotemanager.ui:120
+msgid ""
+"Yes wii can\n"
+"Wiimote usage assistant and mapping manager"
+msgstr "ÐÐ, wii ÐÐÐÐÑ ÐÑÐÐÐÑÐÐÐÐÑÑ Wiimote"
 
-#: ../data/mapping.ui:705
-msgid "_Export mapping"
-msgstr "_ÐÐÑÐÐÑÑ ÐÑÐÐÑÐÐÐÐÐÑ"
+#: ../data/wiimotemanager.ui:921
+msgid "Edit mappings..."
+msgstr "ÐÐÐÐÐÐÑÑ ÐÐÑÑÑÐÐÐÐ..."
 
-#: ../data/mapping.ui:706
-msgid "E_xport"
-msgstr "Ð_ÐÑÐÐÑÑ"
+#: ../data/wiimotemanager.ui:935
+msgid "Show mappings on startup"
+msgstr ""
 
-#: ../data/mapping.ui:707
-msgid "Export mapping as a .wii file"
-msgstr "ÐÐÑÐÐÑÑ ÐÑÐÐÑÐÐÐÐÐÑ ÐÐÐ *.wii ÑÐÐÐ"
+#~ msgid "toolbutton1"
+#~ msgstr "toolbutton1"
 
-#: ../data/mapping.ui:712
-msgid "New mapping"
-msgstr "ÐÐÐÐÐ ÐÑÐÐÑÐÐÐÐÐÐ"
+#~ msgid "toolbutton2"
+#~ msgstr "toolbutton2"
 
-#: ../data/mapping.ui:713
-msgid "_New"
-msgstr "_ÐÐÐÐÐÑÑ"
+#~ msgid "toolbutton3"
+#~ msgstr "toolbutton3"
 
-#: ../data/mapping.ui:714
-msgid "Creates a new mapping"
-msgstr ""
+#~ msgid "toolbutton4"
+#~ msgstr "toolbutton4"
 
-#: ../data/wiimotemanager.ui:13
-msgid ""
-"Yes wii can\n"
-"Wiimote usage assistant and mapping manager"
-msgstr ""
+#~ msgid "toolbutton5"
+#~ msgstr "toolbutton5"
 
-#: ../data/wiimotemanager.ui:726
-msgid "Edit mappings..."
-msgstr "ÐÐÐÐÐÐÑÑ ÐÐÑÑÑÐÐÐÐ..."
+#~ msgid ""
+#~ "Hold left button for use wiimote\n"
+#~ "Right button for menu"
+#~ msgstr ""
+#~ "ÐÐÐÑÐÐÐÐÐÑÐ ÐÐÐÑÑ ÐÐÐÐÐÑ ÐÐÑ ÐÑÐÐÐÑÐÐÐÐÐÐÑ wiimote\n"
+#~ "ÐÑÐÐÑÑ ÐÐÐÐÐÑ ÐÐÑ ÐÑÐÐÐÐ ÐÐÐÑ"
 
-#: ../data/wiimotemanager.ui:759
-msgid "Mapping validation failed"
-msgstr "ÐÑÐÐÐÑÐÐ ÐÑÐÐÐÐÑÐÐÑÑÑ ÐÑÐÐÑÐÐÐ ÐÐ ÑÐÐÐÐÑÑ"
+#~ msgid "Discovering Wiimote"
+#~ msgstr "ÐÐÐÑÐ wiimote"
 
-#: ../data/wiimotemanager.ui:788
-msgid "It looks the activated mapping contains errors."
-msgstr "ÐÐÑÐÐÐ, ÐÐÑÐÐÐÑÐÐÐÐÐÐÑ ÐÑÐÐÑÐÐÐ ÑÐÐÐÑÐÐÑ ÐÑÐÐÐÐ."
+#~ msgid "Add visible mappings"
+#~ msgstr "ÐÐÐÐÐÐÑÑ ÐÐÐÐÐÑÐ ÐÑÐÐÑÐÐÐ"
 
 #~ msgid "Wiimote mappings"
 #~ msgstr "Wiimote ÐÑÐÐÐÑÐÐ"
diff --git a/po/sv.po b/po/sv.po
index ce9f356..36f7110 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,105 +7,93 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wiican\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-13 14:38+0100\n"
-"PO-Revision-Date: 2011-03-24 17:33+0000\n"
-"Last-Translator: Phoenix <Unknown>\n"
+"POT-Creation-Date: 2012-08-16 14:27+0200\n"
+"PO-Revision-Date: 2011-09-17 23:36+0000\n"
+"Last-Translator: Patrik Kullman <Unknown>\n"
 "Language-Team: Swedish <sv li org>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-07 23:04+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
-"Language: sv\n"
+"X-Launchpad-Export-Date: 2012-08-16 12:08+0000\n"
+"X-Generator: Launchpad (build 15810)\n"
 
-#: ../bin/wiican:102
+#: ../bin/wiican:134
 msgid "Plug a bluetooth adapter"
 msgstr "Anslut en bluetooth adapter"
 
-#: ../bin/wiican:107
+#: ../bin/wiican:142
 msgid "Please load uinput module first"
 msgstr "Var god lÃs in inmatningsmodulen fÃrst"
 
-#: ../bin/wiican:113
-msgid ""
-"Hold left button for use wiimote\n"
-"Right button for menu"
-msgstr ""
-"HÃll ned vÃnster knapp fÃr att anvÃnda Wiimote\n"
-"HÃger knapp fÃr meny"
-
-#: ../bin/wiican:125
-msgid "Discovering Wiimote"
-msgstr "SÃker efter Wii handkontroll"
-
-#: ../bin/wiican:160
-msgid "Add visible mappings"
-msgstr "LÃgg till synliga kartlÃggning"
+#: ../bin/wiican:196
+msgid "Set some visible mappings"
+msgstr "StÃll in nÃgra synliga mappningar"
 
-#: ../bin/wiican:205 ../wiican/ui/editordlg.py:148
+#: ../bin/wiican:239 ../wiican/ui/editordlg.py:148
 msgid "Editing "
 msgstr "Redigerar "
 
-#: ../bin/wiican:218 ../wiican/ui/editordlg.py:266
+#: ../bin/wiican:252 ../wiican/ui/editordlg.py:267
 msgid "Press 1+2"
 msgstr "Tryck 1+2"
 
-#: ../bin/wiican:219 ../wiican/ui/editordlg.py:267
+#: ../bin/wiican:253 ../wiican/ui/editordlg.py:268
 msgid "To put you Wiimote in discoverable mode now"
 msgstr "FÃr att sÃtta din Wiimote i synligt lÃge nu"
 
-#: ../bin/wiican:239 ../wiican/mapping/manager.py:106
+#: ../bin/wiican:273 ../wiican/mapping/manager.py:106
 #, python-format
 msgid "Not %s file found on wiican package"
 msgstr "Filen %s hittades inte i Wiican-paketet"
 
-#: ../bin/wiican:243 ../wiican/mapping/manager.py:110
+#: ../bin/wiican:277 ../wiican/mapping/manager.py:110
 #, python-format
 msgid "Not %s file found  on wiican package"
 msgstr "Filen %s hittades inte i Wiican-paketet"
 
-#: ../bin/wiican:282
+#: ../bin/wiican:316
 msgid "Wiican Mapping Package load failed!"
 msgstr "InlÃsningen av Wiican-kartlÃggningspaketet misslyckades!"
 
-#: ../bin/wiican:289
+#: ../bin/wiican:323
 msgid "usage: %prog [options] arg"
 msgstr "anvÃndning: %prog [instÃllningar] arg"
 
-#: ../bin/wiican:291
+#: ../bin/wiican:325
 msgid "loads mapping package from FILENAME"
 msgstr "lÃser in kartlÃggningspaket frÃn FILNAMN"
 
-#: ../bin/wiican:310
+#: ../bin/wiican:344
 #, python-format
 msgid "No wiican package mapping found: %s"
 msgstr "Inga Wiican-paketskartlÃggning hittades: %s"
 
-#: ../wiican/ui/managerdlg.py:38
+#: ../wiican/ui/managerdlg.py:43
 msgid "Wiican Mapping Package"
 msgstr "Wiican-kartlÃggningspaket"
 
-#: ../wiican/ui/managerdlg.py:88
+#: ../wiican/ui/managerdlg.py:111
 msgid "Editing new mapping"
 msgstr "Ãndra ny kartlÃggning"
 
-#: ../wiican/ui/managerdlg.py:143
+#: ../wiican/ui/managerdlg.py:179
 msgid "Are you sure you want to completely remove this mapping?"
 msgstr "Ãr du sÃker pà att du vill ta bort den hÃr kartlÃggningen?"
 
-#: ../wiican/ui/managerdlg.py:152
+#: ../wiican/ui/managerdlg.py:188
 msgid "Deleting mappings"
 msgstr "Raderar kartlÃggningar"
 
-#: ../wiican/ui/managerdlg.py:179
+#: ../wiican/ui/managerdlg.py:217
 msgid "Import mapping..."
 msgstr "Importera kartlÃggning..."
 
-#: ../wiican/ui/managerdlg.py:197
+#: ../wiican/ui/managerdlg.py:235
 msgid "Wiican Mapping Package import failed!"
 msgstr "Wiican-kartlÃggningspaketsimportering misslyckades!"
 
-#: ../wiican/ui/managerdlg.py:227
+#: ../wiican/ui/managerdlg.py:265
 msgid "Exporting mapping..."
 msgstr "Exportera kartlÃggning..."
 
@@ -130,66 +118,125 @@ msgid "Ensure a bluetooth "
 msgstr "Kontrollera bluetooth "
 
 #: ../wiican/mapping/manager.py:131 ../wiican/mapping/manager.py:171
-#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:184
-#: ../wiican/mapping/manager.py:192 ../wiican/mapping/manager.py:200
-#: ../wiican/mapping/manager.py:218 ../wiican/mapping/manager.py:232
-#: ../wiican/mapping/manager.py:238
+#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:193
+#: ../wiican/mapping/manager.py:201 ../wiican/mapping/manager.py:209
+#: ../wiican/mapping/manager.py:225 ../wiican/mapping/manager.py:248
+#: ../wiican/mapping/manager.py:262 ../wiican/mapping/manager.py:268
 msgid "Mapping not found:"
 msgstr "KartlÃggning hittades inte:"
 
-#: ../wiican/mapping/manager.py:221
+#: ../wiican/mapping/manager.py:251
 msgid "Cannot remove a system installed mapping"
 msgstr "Kan inte ta bort en systeminstallerad kartlÃggning"
 
-#: ../data/mapping.ui:21
-msgid "Wiican mappings"
-msgstr "Wiican-kartlÃggningar"
+#: ../data/mapping.ui:5
+#, fuzzy
+msgid "Autostart running this mapping"
+msgstr "VerkstÃll den hÃr kartlÃggningen"
 
-#: ../data/mapping.ui:44
-msgid "toolbutton1"
-msgstr "verktygsknapp1"
+#: ../data/mapping.ui:6 ../data/mapping.ui:651
+msgid "_Autostart"
+msgstr ""
 
-#: ../data/mapping.ui:57
-msgid "toolbutton2"
-msgstr "verktygsknapp2"
+#: ../data/mapping.ui:7
+msgid "Launch this mapping automatically at desktop session start"
+msgstr ""
 
-#: ../data/mapping.ui:70
-msgid "toolbutton3"
-msgstr "verktygsknapp3"
+#: ../data/mapping.ui:11
+msgid "Delete mapping"
+msgstr "Radera kartlÃggning"
 
-#: ../data/mapping.ui:92
-msgid "toolbutton4"
-msgstr "verktygsknapp4"
+#: ../data/mapping.ui:12
+msgid "_Delete"
+msgstr "_Radera"
+
+#: ../data/mapping.ui:13
+#, fuzzy
+msgid "Remove mapping from the catalog"
+msgstr "Tar bort kartlÃggningen frÃn kategorin"
+
+#: ../data/mapping.ui:18
+msgid "Edit mapping"
+msgstr "Ãndra kartlÃggning"
 
-#: ../data/mapping.ui:105
-msgid "toolbutton5"
-msgstr "verktygsknapp5"
+#: ../data/mapping.ui:19 ../data/mapping.ui:620
+msgid "_Edit"
+msgstr "_Redigera"
 
-#: ../data/mapping.ui:314
+#: ../data/mapping.ui:20
+msgid "Edit mapping properties"
+msgstr "Ãndra kartlÃggningsegenskaper"
+
+#: ../data/mapping.ui:25
+msgid "_Export mapping"
+msgstr "_Exportera kartlÃggning"
+
+#: ../data/mapping.ui:26 ../data/mapping.ui:692
+msgid "E_xport"
+msgstr "E_xportera"
+
+#: ../data/mapping.ui:27
+msgid "Export mapping as a .wii file"
+msgstr "Exportera kartlÃggning som en .wii-fil"
+
+#: ../data/mapping.ui:32
+msgid "Import mapping"
+msgstr "Importera kartlÃggning"
+
+#: ../data/mapping.ui:33 ../data/mapping.ui:676
+msgid "_Import"
+msgstr "_Importera"
+
+#: ../data/mapping.ui:34
+msgid "Import a mapping from a .wii file"
+msgstr "Importera en kartlÃggning frÃn en .wii-fil"
+
+#: ../data/mapping.ui:39
+msgid "New mapping"
+msgstr "Ny kartlÃggning"
+
+#: ../data/mapping.ui:40 ../data/mapping.ui:604
+msgid "_New"
+msgstr "_Ny"
+
+#: ../data/mapping.ui:41
+#, fuzzy
+msgid "Create a new mapping"
+msgstr "Skapar en ny kartlÃggning"
+
+#: ../data/mapping.ui:146
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: ../data/mapping.ui:326
+#: ../data/mapping.ui:160
 msgid "Co_mment:"
 msgstr "Ko_mmentar:"
 
-#: ../data/mapping.ui:337
+#: ../data/mapping.ui:174
 msgid "A_uthor/s:"
 msgstr "_FÃrfattare:"
 
-#: ../data/mapping.ui:348
+#: ../data/mapping.ui:188
 msgid "_Version:"
 msgstr "_Version:"
 
-#: ../data/mapping.ui:443
+#: ../data/mapping.ui:298
 msgid "_Icon:"
 msgstr "_Ikon:"
 
-#: ../data/mapping.ui:466
+#: ../data/mapping.ui:325
 msgid "<b>General</b>"
 msgstr "<b>AllmÃnt</b>"
 
-#: ../data/mapping.ui:539
+#: ../data/mapping.ui:384
+msgid "Mapping programming help"
+msgstr "HjÃlp fÃr kartlÃggningsprogrammering"
+
+#: ../data/mapping.ui:402
+msgid "Execute mapping"
+msgstr "VerkstÃll kartlÃggning"
+
+#: ../data/mapping.ui:454
 msgid ""
 "This is a system installed mapping. \n"
 "Changes will be saved in a new mapping."
@@ -197,79 +244,23 @@ msgstr ""
 "Den hÃr Ãr en systeminstallerad kartlÃggning. \n"
 "Ãndringar kommer att sparas i en ny kartlÃggning."
 
-#: ../data/mapping.ui:565
-msgid "Execute mapping"
-msgstr "VerkstÃll kartlÃggning"
-
-#: ../data/mapping.ui:586
-msgid "Mapping programming help"
-msgstr "HjÃlp fÃr kartlÃggningsprogrammering"
-
-#: ../data/mapping.ui:620
+#: ../data/mapping.ui:496
 msgid "<b>Mapping</b>"
 msgstr "<b>KartlÃggning</b>"
 
-#: ../data/mapping.ui:684
-msgid "Edit mapping"
-msgstr "Ãndra kartlÃggning"
-
-#: ../data/mapping.ui:685
-msgid "_Edit"
-msgstr "_Redigera"
-
-#: ../data/mapping.ui:686
-msgid "Edit mapping properties"
-msgstr "Ãndra kartlÃggningsegenskaper"
-
-#: ../data/mapping.ui:691
-msgid "Delete mapping"
-msgstr "Radera kartlÃggning"
-
-#: ../data/mapping.ui:692
-msgid "_Delete"
-msgstr "_Radera"
-
-#: ../data/mapping.ui:693
-msgid "Removes the mapping from the catalog"
-msgstr "Tar bort kartlÃggningen frÃn kategorin"
-
-#: ../data/mapping.ui:698
-msgid "Import mapping"
-msgstr "Importera kartlÃggning"
-
-#: ../data/mapping.ui:699
-msgid "_Import"
-msgstr "_Importera"
-
-#: ../data/mapping.ui:700
-msgid "Import a mapping from a .wii file"
-msgstr "Importera en kartlÃggning frÃn en .wii-fil"
-
-#: ../data/mapping.ui:705
-msgid "_Export mapping"
-msgstr "_Exportera kartlÃggning"
-
-#: ../data/mapping.ui:706
-msgid "E_xport"
-msgstr "E_xportera"
-
-#: ../data/mapping.ui:707
-msgid "Export mapping as a .wii file"
-msgstr "Exportera kartlÃggning som en .wii-fil"
-
-#: ../data/mapping.ui:712
-msgid "New mapping"
-msgstr "Ny kartlÃggning"
+#: ../data/mapping.ui:540
+msgid "Wiican mappings"
+msgstr "Wiican-kartlÃggningar"
 
-#: ../data/mapping.ui:713
-msgid "_New"
-msgstr "_Ny"
+#: ../data/wiimotemanager.ui:7
+msgid "Mapping validation failed"
+msgstr "KartlÃggningsgodkÃnnande misslyckades"
 
-#: ../data/mapping.ui:714
-msgid "Creates a new mapping"
-msgstr "Skapar en ny kartlÃggning"
+#: ../data/wiimotemanager.ui:87
+msgid "It looks the activated mapping contains errors."
+msgstr "Det verkar som om den aktiverade kartlÃggningen innehÃller fel."
 
-#: ../data/wiimotemanager.ui:13
+#: ../data/wiimotemanager.ui:120
 msgid ""
 "Yes wii can\n"
 "Wiimote usage assistant and mapping manager"
@@ -277,17 +268,41 @@ msgstr ""
 "Ja Wiican\n"
 "Wiimote anvÃndningsassistent och kartlÃggningshanterare"
 
-#: ../data/wiimotemanager.ui:726
+#: ../data/wiimotemanager.ui:921
 msgid "Edit mappings..."
 msgstr "Ãndra kartlÃggningar..."
 
-#: ../data/wiimotemanager.ui:759
-msgid "Mapping validation failed"
-msgstr "KartlÃggningsgodkÃnnande misslyckades"
+#: ../data/wiimotemanager.ui:935
+msgid "Show mappings on startup"
+msgstr "Visa mappningar vid uppstart"
 
-#: ../data/wiimotemanager.ui:788
-msgid "It looks the activated mapping contains errors."
-msgstr "Det verkar som om den aktiverade kartlÃggningen innehÃller fel."
+#~ msgid "toolbutton1"
+#~ msgstr "verktygsknapp1"
+
+#~ msgid "toolbutton2"
+#~ msgstr "verktygsknapp2"
+
+#~ msgid "toolbutton3"
+#~ msgstr "verktygsknapp3"
+
+#~ msgid "toolbutton4"
+#~ msgstr "verktygsknapp4"
+
+#~ msgid "toolbutton5"
+#~ msgstr "verktygsknapp5"
+
+#~ msgid "Discovering Wiimote"
+#~ msgstr "SÃker efter Wii handkontroll"
+
+#~ msgid "Add visible mappings"
+#~ msgstr "LÃgg till synliga kartlÃggning"
+
+#~ msgid ""
+#~ "Hold left button for use wiimote\n"
+#~ "Right button for menu"
+#~ msgstr ""
+#~ "HÃll ned vÃnster knapp fÃr att anvÃnda Wiimote\n"
+#~ "HÃger knapp fÃr meny"
 
 #~ msgid "Wiimote mappings"
 #~ msgstr "Wiimote-kartlÃggningar"
diff --git a/po/tr.po b/po/tr.po
index 81eb765..5fe9451 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,105 +7,93 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wiican\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-13 14:38+0100\n"
+"POT-Creation-Date: 2012-08-16 14:27+0200\n"
 "PO-Revision-Date: 2010-11-13 16:32+0000\n"
 "Last-Translator: J. FÃlix OntaÃÃn <Unknown>\n"
 "Language-Team: Turkish <tr li org>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-07 23:04+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
-"Language: tr\n"
+"X-Launchpad-Export-Date: 2012-08-16 12:08+0000\n"
+"X-Generator: Launchpad (build 15810)\n"
 
-#: ../bin/wiican:102
+#: ../bin/wiican:134
 msgid "Plug a bluetooth adapter"
 msgstr "Bir Bluetooht baÄdaÅtÄrÄcÄ takÄnÄz"
 
-#: ../bin/wiican:107
+#: ../bin/wiican:142
 msgid "Please load uinput module first"
 msgstr ""
 
-#: ../bin/wiican:113
-msgid ""
-"Hold left button for use wiimote\n"
-"Right button for menu"
+#: ../bin/wiican:196
+msgid "Set some visible mappings"
 msgstr ""
-"wiimote'u kullanmak iÃin sol tuÅa basÄnÄz\n"
-"menà iÃin saÄ tuÅa basÄnÄz"
 
-#: ../bin/wiican:125
-msgid "Discovering Wiimote"
-msgstr "Wimoote aygÄtlarÄ taranÄyor"
-
-#: ../bin/wiican:160
-msgid "Add visible mappings"
-msgstr ""
-
-#: ../bin/wiican:205 ../wiican/ui/editordlg.py:148
+#: ../bin/wiican:239 ../wiican/ui/editordlg.py:148
 msgid "Editing "
 msgstr "DÃzenleniyor "
 
-#: ../bin/wiican:218 ../wiican/ui/editordlg.py:266
+#: ../bin/wiican:252 ../wiican/ui/editordlg.py:267
 msgid "Press 1+2"
 msgstr ""
 
-#: ../bin/wiican:219 ../wiican/ui/editordlg.py:267
+#: ../bin/wiican:253 ../wiican/ui/editordlg.py:268
 msgid "To put you Wiimote in discoverable mode now"
 msgstr ""
 
-#: ../bin/wiican:239 ../wiican/mapping/manager.py:106
+#: ../bin/wiican:273 ../wiican/mapping/manager.py:106
 #, python-format
 msgid "Not %s file found on wiican package"
 msgstr ""
 
-#: ../bin/wiican:243 ../wiican/mapping/manager.py:110
+#: ../bin/wiican:277 ../wiican/mapping/manager.py:110
 #, python-format
 msgid "Not %s file found  on wiican package"
 msgstr ""
 
-#: ../bin/wiican:282
+#: ../bin/wiican:316
 msgid "Wiican Mapping Package load failed!"
 msgstr ""
 
-#: ../bin/wiican:289
+#: ../bin/wiican:323
 msgid "usage: %prog [options] arg"
 msgstr ""
 
-#: ../bin/wiican:291
+#: ../bin/wiican:325
 msgid "loads mapping package from FILENAME"
 msgstr ""
 
-#: ../bin/wiican:310
+#: ../bin/wiican:344
 #, python-format
 msgid "No wiican package mapping found: %s"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:38
+#: ../wiican/ui/managerdlg.py:43
 msgid "Wiican Mapping Package"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:88
+#: ../wiican/ui/managerdlg.py:111
 msgid "Editing new mapping"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:143
+#: ../wiican/ui/managerdlg.py:179
 msgid "Are you sure you want to completely remove this mapping?"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:152
+#: ../wiican/ui/managerdlg.py:188
 msgid "Deleting mappings"
 msgstr "EÅleÅtirmeler siliniyor"
 
-#: ../wiican/ui/managerdlg.py:179
+#: ../wiican/ui/managerdlg.py:217
 msgid "Import mapping..."
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:197
+#: ../wiican/ui/managerdlg.py:235
 msgid "Wiican Mapping Package import failed!"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:227
+#: ../wiican/ui/managerdlg.py:265
 msgid "Exporting mapping..."
 msgstr ""
 
@@ -130,144 +118,144 @@ msgid "Ensure a bluetooth "
 msgstr ""
 
 #: ../wiican/mapping/manager.py:131 ../wiican/mapping/manager.py:171
-#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:184
-#: ../wiican/mapping/manager.py:192 ../wiican/mapping/manager.py:200
-#: ../wiican/mapping/manager.py:218 ../wiican/mapping/manager.py:232
-#: ../wiican/mapping/manager.py:238
+#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:193
+#: ../wiican/mapping/manager.py:201 ../wiican/mapping/manager.py:209
+#: ../wiican/mapping/manager.py:225 ../wiican/mapping/manager.py:248
+#: ../wiican/mapping/manager.py:262 ../wiican/mapping/manager.py:268
 msgid "Mapping not found:"
 msgstr ""
 
-#: ../wiican/mapping/manager.py:221
+#: ../wiican/mapping/manager.py:251
 msgid "Cannot remove a system installed mapping"
 msgstr ""
 
-#: ../data/mapping.ui:21
-msgid "Wiican mappings"
+#: ../data/mapping.ui:5
+msgid "Autostart running this mapping"
 msgstr ""
 
-#: ../data/mapping.ui:44
-msgid "toolbutton1"
+#: ../data/mapping.ui:6 ../data/mapping.ui:651
+msgid "_Autostart"
 msgstr ""
 
-#: ../data/mapping.ui:57
-msgid "toolbutton2"
+#: ../data/mapping.ui:7
+msgid "Launch this mapping automatically at desktop session start"
 msgstr ""
 
-#: ../data/mapping.ui:70
-msgid "toolbutton3"
+#: ../data/mapping.ui:11
+msgid "Delete mapping"
 msgstr ""
 
-#: ../data/mapping.ui:92
-msgid "toolbutton4"
+#: ../data/mapping.ui:12
+msgid "_Delete"
 msgstr ""
 
-#: ../data/mapping.ui:105
-msgid "toolbutton5"
+#: ../data/mapping.ui:13
+msgid "Remove mapping from the catalog"
 msgstr ""
 
-#: ../data/mapping.ui:314
-msgid "_Name:"
+#: ../data/mapping.ui:18
+msgid "Edit mapping"
 msgstr ""
 
-#: ../data/mapping.ui:326
-msgid "Co_mment:"
+#: ../data/mapping.ui:19 ../data/mapping.ui:620
+msgid "_Edit"
 msgstr ""
 
-#: ../data/mapping.ui:337
-msgid "A_uthor/s:"
+#: ../data/mapping.ui:20
+msgid "Edit mapping properties"
 msgstr ""
 
-#: ../data/mapping.ui:348
-msgid "_Version:"
+#: ../data/mapping.ui:25
+msgid "_Export mapping"
 msgstr ""
 
-#: ../data/mapping.ui:443
-msgid "_Icon:"
+#: ../data/mapping.ui:26 ../data/mapping.ui:692
+msgid "E_xport"
 msgstr ""
 
-#: ../data/mapping.ui:466
-msgid "<b>General</b>"
+#: ../data/mapping.ui:27
+msgid "Export mapping as a .wii file"
 msgstr ""
 
-#: ../data/mapping.ui:539
-msgid ""
-"This is a system installed mapping. \n"
-"Changes will be saved in a new mapping."
+#: ../data/mapping.ui:32
+msgid "Import mapping"
 msgstr ""
 
-#: ../data/mapping.ui:565
-msgid "Execute mapping"
+#: ../data/mapping.ui:33 ../data/mapping.ui:676
+msgid "_Import"
 msgstr ""
 
-#: ../data/mapping.ui:586
-msgid "Mapping programming help"
+#: ../data/mapping.ui:34
+msgid "Import a mapping from a .wii file"
 msgstr ""
 
-#: ../data/mapping.ui:620
-msgid "<b>Mapping</b>"
+#: ../data/mapping.ui:39
+msgid "New mapping"
 msgstr ""
 
-#: ../data/mapping.ui:684
-msgid "Edit mapping"
+#: ../data/mapping.ui:40 ../data/mapping.ui:604
+msgid "_New"
 msgstr ""
 
-#: ../data/mapping.ui:685
-msgid "_Edit"
+#: ../data/mapping.ui:41
+msgid "Create a new mapping"
 msgstr ""
 
-#: ../data/mapping.ui:686
-msgid "Edit mapping properties"
+#: ../data/mapping.ui:146
+msgid "_Name:"
 msgstr ""
 
-#: ../data/mapping.ui:691
-msgid "Delete mapping"
+#: ../data/mapping.ui:160
+msgid "Co_mment:"
 msgstr ""
 
-#: ../data/mapping.ui:692
-msgid "_Delete"
+#: ../data/mapping.ui:174
+msgid "A_uthor/s:"
 msgstr ""
 
-#: ../data/mapping.ui:693
-msgid "Removes the mapping from the catalog"
+#: ../data/mapping.ui:188
+msgid "_Version:"
 msgstr ""
 
-#: ../data/mapping.ui:698
-msgid "Import mapping"
+#: ../data/mapping.ui:298
+msgid "_Icon:"
 msgstr ""
 
-#: ../data/mapping.ui:699
-msgid "_Import"
+#: ../data/mapping.ui:325
+msgid "<b>General</b>"
 msgstr ""
 
-#: ../data/mapping.ui:700
-msgid "Import a mapping from a .wii file"
+#: ../data/mapping.ui:384
+msgid "Mapping programming help"
 msgstr ""
 
-#: ../data/mapping.ui:705
-msgid "_Export mapping"
+#: ../data/mapping.ui:402
+msgid "Execute mapping"
 msgstr ""
 
-#: ../data/mapping.ui:706
-msgid "E_xport"
+#: ../data/mapping.ui:454
+msgid ""
+"This is a system installed mapping. \n"
+"Changes will be saved in a new mapping."
 msgstr ""
 
-#: ../data/mapping.ui:707
-msgid "Export mapping as a .wii file"
+#: ../data/mapping.ui:496
+msgid "<b>Mapping</b>"
 msgstr ""
 
-#: ../data/mapping.ui:712
-msgid "New mapping"
+#: ../data/mapping.ui:540
+msgid "Wiican mappings"
 msgstr ""
 
-#: ../data/mapping.ui:713
-msgid "_New"
+#: ../data/wiimotemanager.ui:7
+msgid "Mapping validation failed"
 msgstr ""
 
-#: ../data/mapping.ui:714
-msgid "Creates a new mapping"
+#: ../data/wiimotemanager.ui:87
+msgid "It looks the activated mapping contains errors."
 msgstr ""
 
-#: ../data/wiimotemanager.ui:13
+#: ../data/wiimotemanager.ui:120
 msgid ""
 "Yes wii can\n"
 "Wiimote usage assistant and mapping manager"
@@ -275,17 +263,23 @@ msgstr ""
 "Evet wii can\n"
 "Wiimote kullanÄm ve eÅleÅtirme yÃneticisi"
 
-#: ../data/wiimotemanager.ui:726
+#: ../data/wiimotemanager.ui:921
 msgid "Edit mappings..."
 msgstr ""
 
-#: ../data/wiimotemanager.ui:759
-msgid "Mapping validation failed"
+#: ../data/wiimotemanager.ui:935
+msgid "Show mappings on startup"
 msgstr ""
 
-#: ../data/wiimotemanager.ui:788
-msgid "It looks the activated mapping contains errors."
-msgstr ""
+#~ msgid ""
+#~ "Hold left button for use wiimote\n"
+#~ "Right button for menu"
+#~ msgstr ""
+#~ "wiimote'u kullanmak iÃin sol tuÅa basÄnÄz\n"
+#~ "menà iÃin saÄ tuÅa basÄnÄz"
+
+#~ msgid "Discovering Wiimote"
+#~ msgstr "Wimoote aygÄtlarÄ taranÄyor"
 
 #~ msgid "Wiimote mappings"
 #~ msgstr "Wiimote eÅleÅtirmeleri"
diff --git a/po/wiican.pot b/po/wiican.pot
index 1de0294..76e3208 100644
--- a/po/wiican.pot
+++ b/po/wiican.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-08 01:07+0200\n"
+"POT-Creation-Date: 2012-08-16 14:27+0200\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"
@@ -17,82 +17,82 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../bin/wiican:117
+#: ../bin/wiican:134
 msgid "Plug a bluetooth adapter"
 msgstr ""
 
-#: ../bin/wiican:125
+#: ../bin/wiican:142
 msgid "Please load uinput module first"
 msgstr ""
 
-#: ../bin/wiican:176
+#: ../bin/wiican:196
 msgid "Set some visible mappings"
 msgstr ""
 
-#: ../bin/wiican:216 ../wiican/ui/editordlg.py:148
+#: ../bin/wiican:239 ../wiican/ui/editordlg.py:148
 msgid "Editing "
 msgstr ""
 
-#: ../bin/wiican:229 ../wiican/ui/editordlg.py:266
+#: ../bin/wiican:252 ../wiican/ui/editordlg.py:267
 msgid "Press 1+2"
 msgstr ""
 
-#: ../bin/wiican:230 ../wiican/ui/editordlg.py:267
+#: ../bin/wiican:253 ../wiican/ui/editordlg.py:268
 msgid "To put you Wiimote in discoverable mode now"
 msgstr ""
 
-#: ../bin/wiican:250 ../wiican/mapping/manager.py:106
+#: ../bin/wiican:273 ../wiican/mapping/manager.py:106
 #, python-format
 msgid "Not %s file found on wiican package"
 msgstr ""
 
-#: ../bin/wiican:254 ../wiican/mapping/manager.py:110
+#: ../bin/wiican:277 ../wiican/mapping/manager.py:110
 #, python-format
 msgid "Not %s file found  on wiican package"
 msgstr ""
 
-#: ../bin/wiican:293
+#: ../bin/wiican:316
 msgid "Wiican Mapping Package load failed!"
 msgstr ""
 
-#: ../bin/wiican:300
+#: ../bin/wiican:323
 msgid "usage: %prog [options] arg"
 msgstr ""
 
-#: ../bin/wiican:302
+#: ../bin/wiican:325
 msgid "loads mapping package from FILENAME"
 msgstr ""
 
-#: ../bin/wiican:321
+#: ../bin/wiican:344
 #, python-format
 msgid "No wiican package mapping found: %s"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:38
+#: ../wiican/ui/managerdlg.py:43
 msgid "Wiican Mapping Package"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:96
+#: ../wiican/ui/managerdlg.py:111
 msgid "Editing new mapping"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:151
+#: ../wiican/ui/managerdlg.py:179
 msgid "Are you sure you want to completely remove this mapping?"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:160
+#: ../wiican/ui/managerdlg.py:188
 msgid "Deleting mappings"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:187
+#: ../wiican/ui/managerdlg.py:217
 msgid "Import mapping..."
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:205
+#: ../wiican/ui/managerdlg.py:235
 msgid "Wiican Mapping Package import failed!"
 msgstr ""
 
-#: ../wiican/ui/managerdlg.py:235
+#: ../wiican/ui/managerdlg.py:265
 msgid "Exporting mapping..."
 msgstr ""
 
@@ -119,159 +119,151 @@ msgstr ""
 #: ../wiican/mapping/manager.py:131 ../wiican/mapping/manager.py:171
 #: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:193
 #: ../wiican/mapping/manager.py:201 ../wiican/mapping/manager.py:209
-#: ../wiican/mapping/manager.py:227 ../wiican/mapping/manager.py:241
-#: ../wiican/mapping/manager.py:247
+#: ../wiican/mapping/manager.py:225 ../wiican/mapping/manager.py:248
+#: ../wiican/mapping/manager.py:262 ../wiican/mapping/manager.py:268
 msgid "Mapping not found:"
 msgstr ""
 
-#: ../wiican/mapping/manager.py:230
+#: ../wiican/mapping/manager.py:251
 msgid "Cannot remove a system installed mapping"
 msgstr ""
 
-#: ../data/mapping.ui:21
-msgid "Wiican mappings"
-msgstr ""
-
-#: ../data/mapping.ui:44
-msgid "toolbutton1"
-msgstr ""
-
-#: ../data/mapping.ui:57
-msgid "toolbutton2"
+#: ../data/mapping.ui:5
+msgid "Autostart running this mapping"
 msgstr ""
 
-#: ../data/mapping.ui:70
-msgid "toolbutton3"
+#: ../data/mapping.ui:6 ../data/mapping.ui:651
+msgid "_Autostart"
 msgstr ""
 
-#: ../data/mapping.ui:92
-msgid "toolbutton4"
+#: ../data/mapping.ui:7
+msgid "Launch this mapping automatically at desktop session start"
 msgstr ""
 
-#: ../data/mapping.ui:105
-msgid "toolbutton5"
+#: ../data/mapping.ui:11
+msgid "Delete mapping"
 msgstr ""
 
-#: ../data/mapping.ui:315
-msgid "_Name:"
+#: ../data/mapping.ui:12
+msgid "_Delete"
 msgstr ""
 
-#: ../data/mapping.ui:327
-msgid "Co_mment:"
+#: ../data/mapping.ui:13
+msgid "Remove mapping from the catalog"
 msgstr ""
 
-#: ../data/mapping.ui:338
-msgid "A_uthor/s:"
+#: ../data/mapping.ui:18
+msgid "Edit mapping"
 msgstr ""
 
-#: ../data/mapping.ui:349
-msgid "_Version:"
+#: ../data/mapping.ui:19 ../data/mapping.ui:620
+msgid "_Edit"
 msgstr ""
 
-#: ../data/mapping.ui:444
-msgid "_Icon:"
+#: ../data/mapping.ui:20
+msgid "Edit mapping properties"
 msgstr ""
 
-#: ../data/mapping.ui:467
-msgid "<b>General</b>"
+#: ../data/mapping.ui:25
+msgid "_Export mapping"
 msgstr ""
 
-#: ../data/mapping.ui:540
-msgid ""
-"This is a system installed mapping. \n"
-"Changes will be saved in a new mapping."
+#: ../data/mapping.ui:26 ../data/mapping.ui:692
+msgid "E_xport"
 msgstr ""
 
-#: ../data/mapping.ui:566
-msgid "Execute mapping"
+#: ../data/mapping.ui:27
+msgid "Export mapping as a .wii file"
 msgstr ""
 
-#: ../data/mapping.ui:587
-msgid "Mapping programming help"
+#: ../data/mapping.ui:32
+msgid "Import mapping"
 msgstr ""
 
-#: ../data/mapping.ui:621
-msgid "<b>Mapping</b>"
+#: ../data/mapping.ui:33 ../data/mapping.ui:676
+msgid "_Import"
 msgstr ""
 
-#: ../data/mapping.ui:685
-msgid "Edit mapping"
+#: ../data/mapping.ui:34
+msgid "Import a mapping from a .wii file"
 msgstr ""
 
-#: ../data/mapping.ui:686
-msgid "_Edit"
+#: ../data/mapping.ui:39
+msgid "New mapping"
 msgstr ""
 
-#: ../data/mapping.ui:687
-msgid "Edit mapping properties"
+#: ../data/mapping.ui:40 ../data/mapping.ui:604
+msgid "_New"
 msgstr ""
 
-#: ../data/mapping.ui:692
-msgid "Delete mapping"
+#: ../data/mapping.ui:41
+msgid "Create a new mapping"
 msgstr ""
 
-#: ../data/mapping.ui:693
-msgid "_Delete"
+#: ../data/mapping.ui:146
+msgid "_Name:"
 msgstr ""
 
-#: ../data/mapping.ui:694
-msgid "Removes the mapping from the catalog"
+#: ../data/mapping.ui:160
+msgid "Co_mment:"
 msgstr ""
 
-#: ../data/mapping.ui:699
-msgid "Import mapping"
+#: ../data/mapping.ui:174
+msgid "A_uthor/s:"
 msgstr ""
 
-#: ../data/mapping.ui:700
-msgid "_Import"
+#: ../data/mapping.ui:188
+msgid "_Version:"
 msgstr ""
 
-#: ../data/mapping.ui:701
-msgid "Import a mapping from a .wii file"
+#: ../data/mapping.ui:298
+msgid "_Icon:"
 msgstr ""
 
-#: ../data/mapping.ui:706
-msgid "_Export mapping"
+#: ../data/mapping.ui:325
+msgid "<b>General</b>"
 msgstr ""
 
-#: ../data/mapping.ui:707
-msgid "E_xport"
+#: ../data/mapping.ui:384
+msgid "Mapping programming help"
 msgstr ""
 
-#: ../data/mapping.ui:708
-msgid "Export mapping as a .wii file"
+#: ../data/mapping.ui:402
+msgid "Execute mapping"
 msgstr ""
 
-#: ../data/mapping.ui:713
-msgid "New mapping"
+#: ../data/mapping.ui:454
+msgid ""
+"This is a system installed mapping. \n"
+"Changes will be saved in a new mapping."
 msgstr ""
 
-#: ../data/mapping.ui:714
-msgid "_New"
+#: ../data/mapping.ui:496
+msgid "<b>Mapping</b>"
 msgstr ""
 
-#: ../data/mapping.ui:715
-msgid "Creates a new mapping"
+#: ../data/mapping.ui:540
+msgid "Wiican mappings"
 msgstr ""
 
-#: ../data/wiimotemanager.ui:8
+#: ../data/wiimotemanager.ui:7
 msgid "Mapping validation failed"
 msgstr ""
 
-#: ../data/wiimotemanager.ui:85
+#: ../data/wiimotemanager.ui:87
 msgid "It looks the activated mapping contains errors."
 msgstr ""
 
-#: ../data/wiimotemanager.ui:118
+#: ../data/wiimotemanager.ui:120
 msgid ""
 "Yes wii can\n"
 "Wiimote usage assistant and mapping manager"
 msgstr ""
 
-#: ../data/wiimotemanager.ui:873
+#: ../data/wiimotemanager.ui:921
 msgid "Edit mappings..."
 msgstr ""
 
-#: ../data/wiimotemanager.ui:887
+#: ../data/wiimotemanager.ui:935
 msgid "Show mappings on startup"
 msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index c864c00..ce49dd8 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,105 +6,94 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wiican\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL ADDRESS>\n"
-"POT-Creation-Date: 2010-11-13 14:38+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-16 14:27+0200\n"
 "PO-Revision-Date: 2011-04-16 01:55+0000\n"
 "Last-Translator: kentxchang <Unknown>\n"
 "Language-Team: Chinese (Traditional) <zh_TW li org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-07 23:04+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2012-08-16 12:08+0000\n"
+"X-Generator: Launchpad (build 15810)\n"
 
-#: ../bin/wiican:102
+#: ../bin/wiican:134
 msgid "Plug a bluetooth adapter"
 msgstr "æåèèèç"
 
-#: ../bin/wiican:107
+#: ../bin/wiican:142
 msgid "Please load uinput module first"
 msgstr "èåèåuinputæå(éååèmouseemuåä)"
 
-#: ../bin/wiican:113
-msgid ""
-"Hold left button for use wiimote\n"
-"Right button for menu"
+#: ../bin/wiican:196
+msgid "Set some visible mappings"
 msgstr ""
-"éææéåéåçwiimote\n"
-"éææéåéååçåéå"
-
-#: ../bin/wiican:125
-msgid "Discovering Wiimote"
-msgstr "æåææwiimoteä"
 
-#: ../bin/wiican:160
-msgid "Add visible mappings"
-msgstr "æååäççèåæ"
-
-#: ../bin/wiican:205 ../wiican/ui/editordlg.py:148
+#: ../bin/wiican:239 ../wiican/ui/editordlg.py:148
 msgid "Editing "
 msgstr "çèä "
 
-#: ../bin/wiican:218 ../wiican/ui/editordlg.py:266
+#: ../bin/wiican:252 ../wiican/ui/editordlg.py:267
 msgid "Press 1+2"
 msgstr "åææwiimote1+2é"
 
-#: ../bin/wiican:219 ../wiican/ui/editordlg.py:267
+#: ../bin/wiican:253 ../wiican/ui/editordlg.py:268
 msgid "To put you Wiimote in discoverable mode now"
 msgstr "çååwiimoteèççåçççæå"
 
-#: ../bin/wiican:239 ../wiican/mapping/manager.py:106
+#: ../bin/wiican:273 ../wiican/mapping/manager.py:106
 #, python-format
 msgid "Not %s file found on wiican package"
 msgstr "åwiicanæäåäæäå %s ææ"
 
-#: ../bin/wiican:243 ../wiican/mapping/manager.py:110
+#: ../bin/wiican:277 ../wiican/mapping/manager.py:110
 #, python-format
 msgid "Not %s file found  on wiican package"
 msgstr "åwiicanæäåäæäå %s ææ"
 
-#: ../bin/wiican:282
+#: ../bin/wiican:316
 msgid "Wiican Mapping Package load failed!"
 msgstr "wiicanèåææäåèååæï"
 
-#: ../bin/wiican:289
+#: ../bin/wiican:323
 msgid "usage: %prog [options] arg"
 msgstr "usage: %prog [options] arg"
 
-#: ../bin/wiican:291
+#: ../bin/wiican:325
 msgid "loads mapping package from FILENAME"
 msgstr "å FILENAME èåèåææäå"
 
-#: ../bin/wiican:310
+#: ../bin/wiican:344
 #, python-format
 msgid "No wiican package mapping found: %s"
 msgstr "æäåwiicanæäåèåæ: %s"
 
-#: ../wiican/ui/managerdlg.py:38
+#: ../wiican/ui/managerdlg.py:43
 msgid "Wiican Mapping Package"
 msgstr "Wiicanèåææäå"
 
-#: ../wiican/ui/managerdlg.py:88
+#: ../wiican/ui/managerdlg.py:111
 msgid "Editing new mapping"
 msgstr "çèæçèåæ"
 
-#: ../wiican/ui/managerdlg.py:143
+#: ../wiican/ui/managerdlg.py:179
 msgid "Are you sure you want to completely remove this mapping?"
 msgstr "äçåèååçééåèåæå?"
 
-#: ../wiican/ui/managerdlg.py:152
+#: ../wiican/ui/managerdlg.py:188
 msgid "Deleting mappings"
 msgstr "åéèåæ"
 
-#: ../wiican/ui/managerdlg.py:179
+#: ../wiican/ui/managerdlg.py:217
 msgid "Import mapping..."
 msgstr "ååèåæ..."
 
-#: ../wiican/ui/managerdlg.py:197
+#: ../wiican/ui/managerdlg.py:235
 msgid "Wiican Mapping Package import failed!"
 msgstr "ååWiicanèåææäååæï"
 
-#: ../wiican/ui/managerdlg.py:227
+#: ../wiican/ui/managerdlg.py:265
 msgid "Exporting mapping..."
 msgstr "ååèåæ..."
 
@@ -129,66 +118,125 @@ msgid "Ensure a bluetooth "
 msgstr "çäèèæéæä "
 
 #: ../wiican/mapping/manager.py:131 ../wiican/mapping/manager.py:171
-#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:184
-#: ../wiican/mapping/manager.py:192 ../wiican/mapping/manager.py:200
-#: ../wiican/mapping/manager.py:218 ../wiican/mapping/manager.py:232
-#: ../wiican/mapping/manager.py:238
+#: ../wiican/mapping/manager.py:174 ../wiican/mapping/manager.py:193
+#: ../wiican/mapping/manager.py:201 ../wiican/mapping/manager.py:209
+#: ../wiican/mapping/manager.py:225 ../wiican/mapping/manager.py:248
+#: ../wiican/mapping/manager.py:262 ../wiican/mapping/manager.py:268
 msgid "Mapping not found:"
 msgstr "æäåèåæ:"
 
-#: ../wiican/mapping/manager.py:221
+#: ../wiican/mapping/manager.py:251
 msgid "Cannot remove a system installed mapping"
 msgstr "çæçéççäååèçèåæ"
 
-#: ../data/mapping.ui:21
-msgid "Wiican mappings"
-msgstr "Wiicanèåæ"
+#: ../data/mapping.ui:5
+#, fuzzy
+msgid "Autostart running this mapping"
+msgstr "åèéåèåæ"
+
+#: ../data/mapping.ui:6 ../data/mapping.ui:651
+msgid "_Autostart"
+msgstr ""
+
+#: ../data/mapping.ui:7
+msgid "Launch this mapping automatically at desktop session start"
+msgstr ""
+
+#: ../data/mapping.ui:11
+msgid "Delete mapping"
+msgstr "åéèåæ"
+
+#: ../data/mapping.ui:12
+msgid "_Delete"
+msgstr "åé(_D)"
+
+#: ../data/mapping.ui:13
+#, fuzzy
+msgid "Remove mapping from the catalog"
+msgstr "åçéåéèåæ"
+
+#: ../data/mapping.ui:18
+msgid "Edit mapping"
+msgstr "çèèåæ"
+
+#: ../data/mapping.ui:19 ../data/mapping.ui:620
+msgid "_Edit"
+msgstr "çè(_E)"
+
+#: ../data/mapping.ui:20
+msgid "Edit mapping properties"
+msgstr "çèèåæåæ"
+
+#: ../data/mapping.ui:25
+msgid "_Export mapping"
+msgstr "ååèåæ(_E)"
+
+#: ../data/mapping.ui:26 ../data/mapping.ui:692
+msgid "E_xport"
+msgstr "åå(_X)"
 
-#: ../data/mapping.ui:44
-msgid "toolbutton1"
-msgstr "ååæé1"
+#: ../data/mapping.ui:27
+msgid "Export mapping as a .wii file"
+msgstr "åèåæååæ.wiiæ"
 
-#: ../data/mapping.ui:57
-msgid "toolbutton2"
-msgstr "ååæé2"
+#: ../data/mapping.ui:32
+msgid "Import mapping"
+msgstr "ååèåæ"
+
+#: ../data/mapping.ui:33 ../data/mapping.ui:676
+msgid "_Import"
+msgstr "åå(_I)"
+
+#: ../data/mapping.ui:34
+msgid "Import a mapping from a .wii file"
+msgstr "å.wiiæååèåæ"
 
-#: ../data/mapping.ui:70
-msgid "toolbutton3"
-msgstr "ååæé3"
+#: ../data/mapping.ui:39
+msgid "New mapping"
+msgstr "æçèåæ"
 
-#: ../data/mapping.ui:92
-msgid "toolbutton4"
-msgstr "ååæé4"
+#: ../data/mapping.ui:40 ../data/mapping.ui:604
+msgid "_New"
+msgstr "æå(_N)"
 
-#: ../data/mapping.ui:105
-msgid "toolbutton5"
-msgstr "ååæé5"
+#: ../data/mapping.ui:41
+#, fuzzy
+msgid "Create a new mapping"
+msgstr "åçæçèåæ"
 
-#: ../data/mapping.ui:314
+#: ../data/mapping.ui:146
 msgid "_Name:"
 msgstr "åç (_N):"
 
-#: ../data/mapping.ui:326
+#: ../data/mapping.ui:160
 msgid "Co_mment:"
 msgstr "åè(_M)ï"
 
-#: ../data/mapping.ui:337
+#: ../data/mapping.ui:174
 msgid "A_uthor/s:"
 msgstr "äè(_A):"
 
-#: ../data/mapping.ui:348
+#: ../data/mapping.ui:188
 msgid "_Version:"
 msgstr "çæ(_V)ï"
 
-#: ../data/mapping.ui:443
+#: ../data/mapping.ui:298
 msgid "_Icon:"
 msgstr "åç(_I)ï"
 
-#: ../data/mapping.ui:466
+#: ../data/mapping.ui:325
 msgid "<b>General</b>"
 msgstr "<b>äèèå</b>"
 
-#: ../data/mapping.ui:539
+#: ../data/mapping.ui:384
+msgid "Mapping programming help"
+msgstr "èåæççåå"
+
+#: ../data/mapping.ui:402
+msgid "Execute mapping"
+msgstr "åèèåæ"
+
+#: ../data/mapping.ui:454
 msgid ""
 "This is a system installed mapping. \n"
 "Changes will be saved in a new mapping."
@@ -196,79 +244,23 @@ msgstr ""
 "éæäåççååèçèåæã\n"
 "äæåæååçäåæçèåæã"
 
-#: ../data/mapping.ui:565
-msgid "Execute mapping"
-msgstr "åèèåæ"
-
-#: ../data/mapping.ui:586
-msgid "Mapping programming help"
-msgstr "èåæççåå"
-
-#: ../data/mapping.ui:620
+#: ../data/mapping.ui:496
 msgid "<b>Mapping</b>"
 msgstr "<b>èåæ</b>"
 
-#: ../data/mapping.ui:684
-msgid "Edit mapping"
-msgstr "çèèåæ"
-
-#: ../data/mapping.ui:685
-msgid "_Edit"
-msgstr "çè(_E)"
-
-#: ../data/mapping.ui:686
-msgid "Edit mapping properties"
-msgstr "çèèåæåæ"
-
-#: ../data/mapping.ui:691
-msgid "Delete mapping"
-msgstr "åéèåæ"
-
-#: ../data/mapping.ui:692
-msgid "_Delete"
-msgstr "åé(_D)"
-
-#: ../data/mapping.ui:693
-msgid "Removes the mapping from the catalog"
-msgstr "åçéåéèåæ"
-
-#: ../data/mapping.ui:698
-msgid "Import mapping"
-msgstr "ååèåæ"
-
-#: ../data/mapping.ui:699
-msgid "_Import"
-msgstr "åå(_I)"
-
-#: ../data/mapping.ui:700
-msgid "Import a mapping from a .wii file"
-msgstr "å.wiiæååèåæ"
-
-#: ../data/mapping.ui:705
-msgid "_Export mapping"
-msgstr "ååèåæ(_E)"
-
-#: ../data/mapping.ui:706
-msgid "E_xport"
-msgstr "åå(_X)"
-
-#: ../data/mapping.ui:707
-msgid "Export mapping as a .wii file"
-msgstr "åèåæååæ.wiiæ"
-
-#: ../data/mapping.ui:712
-msgid "New mapping"
-msgstr "æçèåæ"
+#: ../data/mapping.ui:540
+msgid "Wiican mappings"
+msgstr "Wiicanèåæ"
 
-#: ../data/mapping.ui:713
-msgid "_New"
-msgstr "æå(_N)"
+#: ../data/wiimotemanager.ui:7
+msgid "Mapping validation failed"
+msgstr "èåæéèåæ"
 
-#: ../data/mapping.ui:714
-msgid "Creates a new mapping"
-msgstr "åçæçèåæ"
+#: ../data/wiimotemanager.ui:87
+msgid "It looks the activated mapping contains errors."
+msgstr "åçèäæååççèåæååéèã"
 
-#: ../data/wiimotemanager.ui:13
+#: ../data/wiimotemanager.ui:120
 msgid ""
 "Yes wii can\n"
 "Wiimote usage assistant and mapping manager"
@@ -276,14 +268,38 @@ msgstr ""
 "Yes wii can\n"
 "Wiimoteäçææåèåæçç"
 
-#: ../data/wiimotemanager.ui:726
+#: ../data/wiimotemanager.ui:921
 msgid "Edit mappings..."
 msgstr "çèèåæ..."
 
-#: ../data/wiimotemanager.ui:759
-msgid "Mapping validation failed"
-msgstr "èåæéèåæ"
+#: ../data/wiimotemanager.ui:935
+msgid "Show mappings on startup"
+msgstr ""
 
-#: ../data/wiimotemanager.ui:788
-msgid "It looks the activated mapping contains errors."
-msgstr "åçèäæååççèåæååéèã"
+#~ msgid "toolbutton1"
+#~ msgstr "ååæé1"
+
+#~ msgid "toolbutton2"
+#~ msgstr "ååæé2"
+
+#~ msgid "toolbutton3"
+#~ msgstr "ååæé3"
+
+#~ msgid "toolbutton4"
+#~ msgstr "ååæé4"
+
+#~ msgid "toolbutton5"
+#~ msgstr "ååæé5"
+
+#~ msgid ""
+#~ "Hold left button for use wiimote\n"
+#~ "Right button for menu"
+#~ msgstr ""
+#~ "éææéåéåçwiimote\n"
+#~ "éææéåéååçåéå"
+
+#~ msgid "Discovering Wiimote"
+#~ msgstr "æåææwiimoteä"
+
+#~ msgid "Add visible mappings"
+#~ msgstr "æååäççèåæ"