From 7393f8faaf9606043b9f30f2bc3bce5044f7e51d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Burdukiewicz?= <dev.strikeu@gmail.com>
Date: Mon, 30 Aug 2010 17:31:42 +0000
Subject: [PATCH] Do not create wiimotedev interface by default

---
 src/translations/ar.po               | 14 ++++----
 src/translations/bg.po               | 14 ++++----
 src/translations/ca.po               | 18 +++++-----
 src/translations/cs.po               | 14 ++++----
 src/translations/da.po               | 14 ++++----
 src/translations/de.po               | 14 ++++----
 src/translations/el.po               | 14 ++++----
 src/translations/en_CA.po            | 14 ++++----
 src/translations/en_GB.po            | 14 ++++----
 src/translations/es.po               | 14 ++++----
 src/translations/fi.po               | 14 ++++----
 src/translations/fr.po               | 14 ++++----
 src/translations/gl.po               | 14 ++++----
 src/translations/hu.po               | 14 ++++----
 src/translations/it.po               | 14 ++++----
 src/translations/kk.po               | 14 ++++----
 src/translations/lt.po               | 14 ++++----
 src/translations/nb.po               | 14 ++++----
 src/translations/nl.po               | 14 ++++----
 src/translations/oc.po               | 14 ++++----
 src/translations/pl.po               | 14 ++++----
 src/translations/pt.po               | 14 ++++----
 src/translations/pt_BR.po            | 14 ++++----
 src/translations/ro.po               | 14 ++++----
 src/translations/ru.po               | 14 ++++----
 src/translations/sk.po               | 14 ++++----
 src/translations/sl.po               | 14 ++++----
 src/translations/sr.po               | 14 ++++----
 src/translations/sv.po               | 14 ++++----
 src/translations/tr.po               | 14 ++++----
 src/translations/translations.pot    | 12 +++----
 src/translations/uk.po               | 14 ++++----
 src/translations/zh_CN.po            | 14 ++++----
 src/translations/zh_TW.po            | 14 ++++----
 src/ui/mainwindow.cpp                |  4 +--
 src/ui/mainwindow.h                  |  2 +-
 src/ui/wiimotedevshortcutsconfig.cpp |  2 +-
 src/wiimotedev/shortcuts.cpp         | 37 ++++++++++++--------
 src/wiimotedev/shortcuts.h           | 52 +++++++++++++---------------
 39 files changed, 290 insertions(+), 285 deletions(-)

diff --git a/src/translations/ar.po b/src/translations/ar.po
index ed63d6c66..9cd6115a1 100644
--- a/src/translations/ar.po
+++ b/src/translations/ar.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-05-21 01:02+0000\n"
 "Last-Translator: EL7R <the-ghost@live.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
 "X-Launchpad-Export-Date: 2010-05-22 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -52,15 +52,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr ""
 
@@ -655,7 +655,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr ""
 
@@ -1912,7 +1912,7 @@ msgstr ""
 msgid "[click to edit]"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "أضِف %n أغاني\\أغنية"
 
@@ -1932,7 +1932,7 @@ msgstr "انقل الأغاني"
 msgid "options"
 msgstr "الخيارات"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "أزِل %n أغاني\\أغنية"
 
diff --git a/src/translations/bg.po b/src/translations/bg.po
index 08bc2f7a4..052140159 100644
--- a/src/translations/bg.po
+++ b/src/translations/bg.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-07-24 15:58+0000\n"
 "Last-Translator: David Sansome <me@davidsansome.com>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
 "X-Launchpad-Export-Date: 2010-07-25 04:25+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -52,15 +52,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr ""
 
@@ -655,7 +655,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr ""
 
@@ -1912,7 +1912,7 @@ msgstr ""
 msgid "[click to edit]"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr ""
 
@@ -1932,7 +1932,7 @@ msgstr ""
 msgid "options"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr ""
 
diff --git a/src/translations/ca.po b/src/translations/ca.po
index c0fbc3ad5..d4a849915 100644
--- a/src/translations/ca.po
+++ b/src/translations/ca.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-08-05 16:05+0000\n"
 "Last-Translator: txusko <Unknown>\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"
-"Language: ca\n"
 "X-Launchpad-Export-Date: 2010-08-06 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -52,15 +52,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr "%1 temes"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n han fallat"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n han acabat"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n restants"
 
@@ -97,8 +97,8 @@ msgid ""
 "<p>If you surround sections of text that contain a token with curly-braces, "
 "that section will be hidden if the token is empty.</p>"
 msgstr ""
-"<p>Les fitxes de reemplaçament comencen amb %, per exemple: %artist %album %"
-"title </p>\n"
+"<p>Les fitxes de reemplaçament comencen amb %, per exemple: %artist %album "
+"%title </p>\n"
 "\n"
 "<p>Si demarques entre claus una secció de text que contingui una fitxa de "
 "remplaçament, aquesta secció no es mostrarà si la fitxa de remplaçament es "
@@ -667,7 +667,7 @@ msgstr "Editar la informació de la pista..."
 msgid "Edit..."
 msgstr "Editar..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Editant %n pistes"
 
@@ -1933,7 +1933,7 @@ msgstr "Zero"
 msgid "[click to edit]"
 msgstr "[clickar per editar]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "afegeix %n cançons"
 
@@ -1953,7 +1953,7 @@ msgstr "moure cançons"
 msgid "options"
 msgstr "opcions"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "elimina %n cançons"
 
diff --git a/src/translations/cs.po b/src/translations/cs.po
index 48f1ba0cc..cd008f5ba 100644
--- a/src/translations/cs.po
+++ b/src/translations/cs.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-08-10 00:34+0000\n"
 "Last-Translator: David Sansome <me@davidsansome.com>\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"
-"Language: \n"
 "X-Launchpad-Export-Date: 2010-08-11 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Language: cs_CZ\n"
@@ -53,15 +53,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr ""
 
@@ -656,7 +656,7 @@ msgstr "Upravit informaci o skladbách..."
 msgid "Edit..."
 msgstr "Upravit..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Úprava %n stop"
 
@@ -1916,7 +1916,7 @@ msgstr "Vynulovat"
 msgid "[click to edit]"
 msgstr "[pro úpravy klikněte]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "Přidej %n skladby"
 
@@ -1936,7 +1936,7 @@ msgstr "Přesuň skladby"
 msgid "options"
 msgstr "Možnosti"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "Odeber %n skladeb"
 
diff --git a/src/translations/da.po b/src/translations/da.po
index 3d5d2ded1..8ff265de3 100644
--- a/src/translations/da.po
+++ b/src/translations/da.po
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2010-07-24 15:57+0000\n"
 "Last-Translator: Kabel <CaptainKabel@gmail.com>\n"
 "Language-Team: Danish <kde-i18n-doc@kde.org>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: da\n"
 "X-Launchpad-Export-Date: 2010-07-25 04:25+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -53,15 +53,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr ""
 
@@ -656,7 +656,7 @@ msgstr "Redigér sporinformation..."
 msgid "Edit..."
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Redigerer %n spor"
 
@@ -1919,7 +1919,7 @@ msgstr "Nul"
 msgid "[click to edit]"
 msgstr "[Klik for at redigere]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "tilføj %n sange"
 
@@ -1939,7 +1939,7 @@ msgstr "flyt sange"
 msgid "options"
 msgstr "indstillinger"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "fjern %n sange"
 
diff --git a/src/translations/de.po b/src/translations/de.po
index c428919fb..c651279d5 100644
--- a/src/translations/de.po
+++ b/src/translations/de.po
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2010-08-09 23:36+0000\n"
 "Last-Translator: Markus Fuchs <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"
-"Language: de\n"
 "X-Launchpad-Export-Date: 2010-08-11 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -53,15 +53,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr "%1 Stücke"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n fehlgeschlagen"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n konvertiert"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n verbleibend"
 
@@ -666,7 +666,7 @@ msgstr "Metadaten bearbeiten..."
 msgid "Edit..."
 msgstr "Bearbeiten..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "%n Stücke bearbeiten"
 
@@ -1947,7 +1947,7 @@ msgstr "Null"
 msgid "[click to edit]"
 msgstr "[zum Bearbeiten klicken]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "%n Stücke hinzufügen"
 
@@ -1967,7 +1967,7 @@ msgstr "Stücke verschieben"
 msgid "options"
 msgstr "Einstellungen"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "%n Stücke entfernen"
 
diff --git a/src/translations/el.po b/src/translations/el.po
index dcfe9264b..0a0b67afc 100644
--- a/src/translations/el.po
+++ b/src/translations/el.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-08-09 22:33+0000\n"
 "Last-Translator: firewalker <Unknown>\n"
 "Language-Team: <en@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Launchpad-Export-Date: 2010-08-11 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Language: el_GR\n"
@@ -54,15 +54,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr "%1 κομμάτια"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n απέτυχε"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n ολοκληρώθηκε"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n απομένει"
 
@@ -668,7 +668,7 @@ msgstr "Τροποποίηση πληροφοριών κομματιού..."
 msgid "Edit..."
 msgstr "Επεξεργασία..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Τροποποίηση %n κομματιών"
 
@@ -1952,7 +1952,7 @@ msgstr "Zero"
 msgid "[click to edit]"
 msgstr "[κλικ για τροποποίηση]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "προσθήκη %n τραγουδιών"
 
@@ -1972,7 +1972,7 @@ msgstr "μετακίνηση τραγουδιών"
 msgid "options"
 msgstr "επιλογές"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "αφαίρεση %n τραγουδιών"
 
diff --git a/src/translations/en_CA.po b/src/translations/en_CA.po
index bb9b731d0..d96179cef 100644
--- a/src/translations/en_CA.po
+++ b/src/translations/en_CA.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-06-17 01:37+0000\n"
 "Last-Translator: David Sansome <me@davidsansome.com>\n"
 "Language-Team: English (Canada) <en_CA@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Launchpad-Export-Date: 2010-06-18 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -52,15 +52,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n failed"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n finished"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n remaining"
 
@@ -657,7 +657,7 @@ msgstr "Edit track information..."
 msgid "Edit..."
 msgstr "Edit..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Editing %n tracks"
 
@@ -1917,7 +1917,7 @@ msgstr "Zero"
 msgid "[click to edit]"
 msgstr "[click to edit]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "add %n songs"
 
@@ -1937,7 +1937,7 @@ msgstr "move songs"
 msgid "options"
 msgstr "options"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "remove %n songs"
 
diff --git a/src/translations/en_GB.po b/src/translations/en_GB.po
index 94aeceebe..df1e8152e 100644
--- a/src/translations/en_GB.po
+++ b/src/translations/en_GB.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-06-17 01:38+0000\n"
 "Last-Translator: David Sansome <me@davidsansome.com>\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"
-"Language: \n"
 "X-Launchpad-Export-Date: 2010-06-18 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -52,15 +52,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr ""
 
@@ -655,7 +655,7 @@ msgstr "Edit track information..."
 msgid "Edit..."
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Editing %n tracks"
 
@@ -1914,7 +1914,7 @@ msgstr "Zero"
 msgid "[click to edit]"
 msgstr "[click to edit]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr ""
 
@@ -1934,7 +1934,7 @@ msgstr ""
 msgid "options"
 msgstr "options"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr ""
 
diff --git a/src/translations/es.po b/src/translations/es.po
index ed01b0665..0b0d02252 100644
--- a/src/translations/es.po
+++ b/src/translations/es.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-08-06 16:08+0000\n"
 "Last-Translator: Eduardo Durany Fernández <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"
-"Language: \n"
 "X-Launchpad-Export-Date: 2010-08-07 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Language: es_ES\n"
@@ -53,15 +53,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr "%1 pistas"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n completado(s)"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n pendiente(s)"
 
@@ -668,7 +668,7 @@ msgstr "Editar información de la pista..."
 msgid "Edit..."
 msgstr "Editar..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Editando %n pistas"
 
@@ -1951,7 +1951,7 @@ msgstr "Zero"
 msgid "[click to edit]"
 msgstr "[click para editar]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "agregar %n pistas"
 
@@ -1971,7 +1971,7 @@ msgstr "mover pistas"
 msgid "options"
 msgstr "opciones"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "remover %n pistas"
 
diff --git a/src/translations/fi.po b/src/translations/fi.po
index 8bbf84bb3..2d9014fba 100644
--- a/src/translations/fi.po
+++ b/src/translations/fi.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-08-07 10:10+0000\n"
 "Last-Translator: Jiri Grönroos <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"
-"Language: fi\n"
 "X-Launchpad-Export-Date: 2010-08-08 04:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -52,15 +52,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr "%1 kappaletta"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n epäonnistui"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n valmistui"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n jäljellä"
 
@@ -655,7 +655,7 @@ msgstr "Muokkaa kappaleen tietoja..."
 msgid "Edit..."
 msgstr "Muokkaa..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr ""
 
@@ -1914,7 +1914,7 @@ msgstr ""
 msgid "[click to edit]"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr ""
 
@@ -1934,7 +1934,7 @@ msgstr ""
 msgid "options"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr ""
 
diff --git a/src/translations/fr.po b/src/translations/fr.po
index 0cc84368e..e902dbabc 100644
--- a/src/translations/fr.po
+++ b/src/translations/fr.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-08-10 17:45+0000\n"
 "Last-Translator: Robin Wyss <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"
-"Language: \n"
 "X-Launchpad-Export-Date: 2010-08-11 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Language: fr_FR\n"
@@ -53,15 +53,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr "%1 pistes"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n échoué"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n terminé"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n manquant"
 
@@ -660,7 +660,7 @@ msgstr "Modifier la description de la piste..."
 msgid "Edit..."
 msgstr "Éditer..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Éditer %n pistes"
 
@@ -1930,7 +1930,7 @@ msgstr "Zéro"
 msgid "[click to edit]"
 msgstr "[cliquer pour modifier]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr ""
 
@@ -1950,7 +1950,7 @@ msgstr "déplacer les chansons"
 msgid "options"
 msgstr "options"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr ""
 
diff --git a/src/translations/gl.po b/src/translations/gl.po
index 297705fff..e5c7604bc 100644
--- a/src/translations/gl.po
+++ b/src/translations/gl.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-04-27 16:34+0000\n"
 "Last-Translator: andreout <andre@outeiro.com>\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"
-"Language: gl\n"
 "X-Launchpad-Export-Date: 2010-04-28 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -52,15 +52,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr ""
 
@@ -655,7 +655,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Editando %n faixas"
 
@@ -1914,7 +1914,7 @@ msgstr ""
 msgid "[click to edit]"
 msgstr "[clique para editar]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr ""
 
@@ -1934,7 +1934,7 @@ msgstr ""
 msgid "options"
 msgstr "Opzóns"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr ""
 
diff --git a/src/translations/hu.po b/src/translations/hu.po
index 5b0fbcfe3..257161f18 100644
--- a/src/translations/hu.po
+++ b/src/translations/hu.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-08-11 00:04+0000\n"
 "Last-Translator: ntomka <Unknown>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
 "X-Launchpad-Export-Date: 2010-08-11 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -52,15 +52,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr "%1 szám"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n meghiúsult"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n befejezve"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n hátralévő"
 
@@ -664,7 +664,7 @@ msgstr "Száminformáció szerkesztése..."
 msgid "Edit..."
 msgstr "Szerkesztés..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "%n szám szerkesztése"
 
@@ -1941,7 +1941,7 @@ msgstr "Nulla"
 msgid "[click to edit]"
 msgstr "[kattintson a szerkesztéshez]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "%n szám felvétele"
 
@@ -1961,7 +1961,7 @@ msgstr "számok mozgatása"
 msgid "options"
 msgstr "beállítások"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "%n szám eltávolítása"
 
diff --git a/src/translations/it.po b/src/translations/it.po
index df5471f60..43edc025b 100644
--- a/src/translations/it.po
+++ b/src/translations/it.po
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2010-08-10 05:09+0000\n"
 "Last-Translator: Vincenzo Reale <smart2128@baslug.org>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "X-Launchpad-Export-Date: 2010-08-11 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -53,15 +53,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr "%1 tracce"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n non riusciti"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n completati"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n rimanenti"
 
@@ -671,7 +671,7 @@ msgstr "Modifica informazioni traccia..."
 msgid "Edit..."
 msgstr "Modifica..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Modifica di %n tracce"
 
@@ -1960,7 +1960,7 @@ msgstr "Zero"
 msgid "[click to edit]"
 msgstr "[clic per modificare]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "aggiungi %n brani"
 
@@ -1980,7 +1980,7 @@ msgstr "sposta brani"
 msgid "options"
 msgstr "opzioni"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "rimuovi %n brani"
 
diff --git a/src/translations/kk.po b/src/translations/kk.po
index 26dc0bab1..59a930ba7 100644
--- a/src/translations/kk.po
+++ b/src/translations/kk.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-04-27 16:33+0000\n"
 "Last-Translator: David Sansome <me@davidsansome.com>\n"
 "Language-Team: Kazakh <kk@li.org>\n"
+"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: kk\n"
 "X-Launchpad-Export-Date: 2010-04-28 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -52,15 +52,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr ""
 
@@ -655,7 +655,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr ""
 
@@ -1914,7 +1914,7 @@ msgstr "Нөл"
 msgid "[click to edit]"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr ""
 
@@ -1934,7 +1934,7 @@ msgstr ""
 msgid "options"
 msgstr "опциялар"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr ""
 
diff --git a/src/translations/lt.po b/src/translations/lt.po
index f5feabf04..3f6913663 100644
--- a/src/translations/lt.po
+++ b/src/translations/lt.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-07-24 16:03+0000\n"
 "Last-Translator: David Sansome <me@davidsansome.com>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: lt\n"
 "X-Launchpad-Export-Date: 2010-07-25 04:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -52,15 +52,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr "%1 takeliai"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr ""
 
@@ -655,7 +655,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr ""
 
@@ -1912,7 +1912,7 @@ msgstr ""
 msgid "[click to edit]"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr ""
 
@@ -1932,7 +1932,7 @@ msgstr ""
 msgid "options"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr ""
 
diff --git a/src/translations/nb.po b/src/translations/nb.po
index f5037ce31..c2ee89f7c 100644
--- a/src/translations/nb.po
+++ b/src/translations/nb.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-08-04 18:45+0000\n"
 "Last-Translator: Simen Heggestøyl <simenheg@gmail.com>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nb\n"
 "X-Launchpad-Export-Date: 2010-08-05 03:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -52,15 +52,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr "%1 spor"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n gjenstående"
 
@@ -655,7 +655,7 @@ msgstr "Rediger informasjon om sporet..."
 msgid "Edit..."
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Endrer %n spor"
 
@@ -1916,7 +1916,7 @@ msgstr "Null"
 msgid "[click to edit]"
 msgstr "[klikk for å endre]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr ""
 
@@ -1936,7 +1936,7 @@ msgstr ""
 msgid "options"
 msgstr "innstillinger"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr ""
 
diff --git a/src/translations/nl.po b/src/translations/nl.po
index f3eed2df8..1cfa6aa1a 100644
--- a/src/translations/nl.po
+++ b/src/translations/nl.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-08-08 15:32+0000\n"
 "Last-Translator: Ward <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"
-"Language: nl\n"
 "X-Launchpad-Export-Date: 2010-08-09 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -52,15 +52,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr "%1 tracks"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n mislukt"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n voltooid"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n te gaan"
 
@@ -663,7 +663,7 @@ msgstr "Trackinformatie bewerken..."
 msgid "Edit..."
 msgstr "Bewerken..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "%n tracks bewerken"
 
@@ -1948,7 +1948,7 @@ msgstr "Nul"
 msgid "[click to edit]"
 msgstr "[klik om te bewerken:]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "%n nummers toevoegen"
 
@@ -1968,7 +1968,7 @@ msgstr "nummers verplaatsen"
 msgid "options"
 msgstr "opties"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "%n nummers verwijderen"
 
diff --git a/src/translations/oc.po b/src/translations/oc.po
index ef8aa1eb5..89b682795 100644
--- a/src/translations/oc.po
+++ b/src/translations/oc.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-05-21 01:01+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Launchpad-Export-Date: 2010-05-22 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -52,15 +52,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr ""
 
@@ -655,7 +655,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr ""
 
@@ -1912,7 +1912,7 @@ msgstr "Zèro"
 msgid "[click to edit]"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr ""
 
@@ -1932,7 +1932,7 @@ msgstr ""
 msgid "options"
 msgstr "opcions"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr ""
 
diff --git a/src/translations/pl.po b/src/translations/pl.po
index c1f7063b8..2da68c2dd 100644
--- a/src/translations/pl.po
+++ b/src/translations/pl.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-07-27 10:29+0000\n"
 "Last-Translator: Hunab.cu <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"
-"Language: \n"
 "X-Launchpad-Export-Date: 2010-07-28 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Language: pl_PL\n"
@@ -53,15 +53,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr "%1 ścieżek"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n zawiodło"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n zakończone"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "pozostało %n"
 
@@ -661,7 +661,7 @@ msgstr "Edytuj informacje o utworze..."
 msgid "Edit..."
 msgstr "Edytuj..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Edytowanie %n ścieżek"
 
@@ -1925,7 +1925,7 @@ msgstr "Zero"
 msgid "[click to edit]"
 msgstr "[kliknij aby edytować]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "dodaj %n utworów"
 
@@ -1945,7 +1945,7 @@ msgstr "przenieś utwory"
 msgid "options"
 msgstr "opcje"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "usuń %n utworów"
 
diff --git a/src/translations/pt.po b/src/translations/pt.po
index 659bada12..234c658ae 100644
--- a/src/translations/pt.po
+++ b/src/translations/pt.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-08-10 11:43+0000\n"
 "Last-Translator: Sérgio Marques <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"
-"Language: pt\n"
 "X-Launchpad-Export-Date: 2010-08-11 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -52,15 +52,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr "%1 faixas"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n falha(s)"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n concluída(s)"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n restante(s)"
 
@@ -665,7 +665,7 @@ msgstr "Editar a informação da faixa..."
 msgid "Edit..."
 msgstr "Editar..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Editando %n faixas"
 
@@ -1942,7 +1942,7 @@ msgstr "Zero"
 msgid "[click to edit]"
 msgstr "[clique para editar]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "adicionar %n canções"
 
@@ -1962,7 +1962,7 @@ msgstr "mover canções"
 msgid "options"
 msgstr "opções"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "remover %n canções"
 
diff --git a/src/translations/pt_BR.po b/src/translations/pt_BR.po
index 8d630bf23..1123ff764 100644
--- a/src/translations/pt_BR.po
+++ b/src/translations/pt_BR.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-06-26 18:01+0000\n"
 "Last-Translator: David Sansome <me@davidsansome.com>\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"
-"Language: pt_BR\n"
 "X-Launchpad-Export-Date: 2010-06-27 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -52,15 +52,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr "%1 faixas"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n falhou"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n fizalizado"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n faltando"
 
@@ -660,7 +660,7 @@ msgstr "Editar informações da faixa..."
 msgid "Edit..."
 msgstr "Editar..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Editando %n faixas"
 
@@ -1932,7 +1932,7 @@ msgstr "Zero"
 msgid "[click to edit]"
 msgstr "[clique para editar]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "Adicionar %n músicas"
 
@@ -1952,7 +1952,7 @@ msgstr "mover músicas"
 msgid "options"
 msgstr "opções"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "Remover %n músicas"
 
diff --git a/src/translations/ro.po b/src/translations/ro.po
index be8d9b15a..4d9987c6e 100644
--- a/src/translations/ro.po
+++ b/src/translations/ro.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-05-03 21:09+0000\n"
 "Last-Translator: David Sansome <me@davidsansome.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ro\n"
 "X-Launchpad-Export-Date: 2010-05-04 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -52,15 +52,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr ""
 
@@ -655,7 +655,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr ""
 
@@ -1913,7 +1913,7 @@ msgstr "Zero"
 msgid "[click to edit]"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr ""
 
@@ -1933,7 +1933,7 @@ msgstr ""
 msgid "options"
 msgstr "opțiuni"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr ""
 
diff --git a/src/translations/ru.po b/src/translations/ru.po
index a1ad718ad..fd9485830 100644
--- a/src/translations/ru.po
+++ b/src/translations/ru.po
@@ -10,10 +10,10 @@ msgstr ""
 "PO-Revision-Date: 2010-08-10 06:34+0000\n"
 "Last-Translator: Malody <Unknown>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
 "X-Launchpad-Export-Date: 2010-08-11 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -51,15 +51,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr "%1 композиций"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n с ошибкой"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n завершено"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n осталось"
 
@@ -662,7 +662,7 @@ msgstr "Изменить информацию о композиции..."
 msgid "Edit..."
 msgstr "Изменить..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Редактирую %n треков"
 
@@ -1938,7 +1938,7 @@ msgstr "По-умолчанию"
 msgid "[click to edit]"
 msgstr "[щелкните, чтобы изменить]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "добавить %n композиций"
 
@@ -1958,7 +1958,7 @@ msgstr "переместить композиции"
 msgid "options"
 msgstr "настройки"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "удалить %n композиций"
 
diff --git a/src/translations/sk.po b/src/translations/sk.po
index 67238fe09..a9cc0dacd 100644
--- a/src/translations/sk.po
+++ b/src/translations/sk.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-08-09 22:11+0000\n"
 "Last-Translator: DAG Software <Unknown>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Launchpad-Export-Date: 2010-08-11 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Language: sk_SK\n"
@@ -53,15 +53,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr "%1 skladieb"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n zlyhalo"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n dokončených"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n zostávajúcich"
 
@@ -664,7 +664,7 @@ msgstr "Upravť informácie o skladbe..."
 msgid "Edit..."
 msgstr "Upraviť..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Upravovanie %n skladieb"
 
@@ -1939,7 +1939,7 @@ msgstr "Vynulovať"
 msgid "[click to edit]"
 msgstr "[kliknite pre úpravu]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "pridať %n piesní"
 
@@ -1959,7 +1959,7 @@ msgstr "presunúť piesne"
 msgid "options"
 msgstr "možnosti"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "odstrániť %n piesní"
 
diff --git a/src/translations/sl.po b/src/translations/sl.po
index e53f16e08..69b1b539a 100644
--- a/src/translations/sl.po
+++ b/src/translations/sl.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-08-01 07:33+0000\n"
 "Last-Translator: R33D3M33R <Unknown>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
 "X-Launchpad-Export-Date: 2010-08-02 04:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -52,15 +52,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr "%1 skladb"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n spodletelih"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n končanih"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n preostaja"
 
@@ -663,7 +663,7 @@ msgstr "Uredi informacije o skladbi..."
 msgid "Edit..."
 msgstr "Uredi..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Urejanje %n skladb"
 
@@ -1939,7 +1939,7 @@ msgstr "Brez"
 msgid "[click to edit]"
 msgstr "[kliknite za urejanje]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "dodaj %n skladb"
 
@@ -1959,7 +1959,7 @@ msgstr "premakni skladbe"
 msgid "options"
 msgstr "možnosti"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "odstrani %n skladb"
 
diff --git a/src/translations/sr.po b/src/translations/sr.po
index 8e750c1d8..e51602c0c 100644
--- a/src/translations/sr.po
+++ b/src/translations/sr.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-07-24 16:03+0000\n"
 "Last-Translator: David Sansome <me@davidsansome.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sr\n"
 "X-Launchpad-Export-Date: 2010-07-25 04:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -52,15 +52,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr "%1 нумера"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n завршено"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n преостало"
 
@@ -657,7 +657,7 @@ msgstr "Уреди податке о нумери..."
 msgid "Edit..."
 msgstr "Уреди..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Уређивање %n нумера"
 
@@ -1919,7 +1919,7 @@ msgstr "Нулто"
 msgid "[click to edit]"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "додај %n песама"
 
@@ -1939,7 +1939,7 @@ msgstr ""
 msgid "options"
 msgstr "Опције"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "remove %n песама"
 
diff --git a/src/translations/sv.po b/src/translations/sv.po
index a3329cc38..98f4dffa0 100644
--- a/src/translations/sv.po
+++ b/src/translations/sv.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-08-10 16:24+0000\n"
 "Last-Translator: David Bengtsson <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"
-"Language: sv\n"
 "X-Launchpad-Export-Date: 2010-08-11 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -52,15 +52,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr "%1 spår"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n misslyckades"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n färdig"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n återstår"
 
@@ -659,7 +659,7 @@ msgstr "Redigera spårinformation..."
 msgid "Edit..."
 msgstr "Redigera..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Redigerar %n spår"
 
@@ -1934,7 +1934,7 @@ msgstr "Noll"
 msgid "[click to edit]"
 msgstr "[klicka för att redigera]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "Lägg till %n songer"
 
@@ -1954,7 +1954,7 @@ msgstr "Flytta songer"
 msgid "options"
 msgstr "alternativ"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "Ta bort %n songer"
 
diff --git a/src/translations/tr.po b/src/translations/tr.po
index 0c65a4e54..3e7f3612d 100644
--- a/src/translations/tr.po
+++ b/src/translations/tr.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-07-25 01:29+0000\n"
 "Last-Translator: ironic <fatih@ubuntu-tr.org>\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"
-"Language: tr\n"
 "X-Launchpad-Export-Date: 2010-07-26 04:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -52,15 +52,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr "%1 parça"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n başarısız"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n tamamlandı"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n kalan"
 
@@ -655,7 +655,7 @@ msgstr "Parça bilgisini düzenle..."
 msgid "Edit..."
 msgstr "Düzenle..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr ""
 
@@ -1918,7 +1918,7 @@ msgstr ""
 msgid "[click to edit]"
 msgstr "[düzenlemek için tıklayın]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "%n şakıyı ekle"
 
@@ -1938,7 +1938,7 @@ msgstr "Parçaları taşı"
 msgid "options"
 msgstr "seçenekler"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "%n şakıyı çıkart"
 
diff --git a/src/translations/translations.pot b/src/translations/translations.pot
index d9c4e1fa3..9269d5f22 100644
--- a/src/translations/translations.pot
+++ b/src/translations/translations.pot
@@ -42,15 +42,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr ""
 
@@ -645,7 +645,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr ""
 
@@ -1902,7 +1902,7 @@ msgstr ""
 msgid "[click to edit]"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr ""
 
@@ -1922,7 +1922,7 @@ msgstr ""
 msgid "options"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr ""
 
diff --git a/src/translations/uk.po b/src/translations/uk.po
index b3c667871..58eae7e19 100644
--- a/src/translations/uk.po
+++ b/src/translations/uk.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-08-03 09:12+0000\n"
 "Last-Translator: Sergiy Gavrylov <sergiovana@bigmir.net>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
 "X-Launchpad-Export-Date: 2010-08-04 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -52,15 +52,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr "%1 доріжок"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n з помилкою"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n завершено"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n залишилось"
 
@@ -663,7 +663,7 @@ msgstr "Редагувати дані про доріжку..."
 msgid "Edit..."
 msgstr "Змінити..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "Редагування %n доріжок"
 
@@ -1937,7 +1937,7 @@ msgstr "Zero"
 msgid "[click to edit]"
 msgstr "[клацніть, щоб змінити]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "додати %n композицій"
 
@@ -1957,7 +1957,7 @@ msgstr "перемістити композиції"
 msgid "options"
 msgstr "параметри"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "вилучити %n композицій"
 
diff --git a/src/translations/zh_CN.po b/src/translations/zh_CN.po
index ccc8b469b..4663640cb 100644
--- a/src/translations/zh_CN.po
+++ b/src/translations/zh_CN.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-06-07 01:43+0000\n"
 "Last-Translator: David Sansome <me@davidsansome.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Launchpad-Export-Date: 2010-06-08 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -52,15 +52,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr ""
 
@@ -655,7 +655,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr ""
 
@@ -1912,7 +1912,7 @@ msgstr ""
 msgid "[click to edit]"
 msgstr ""
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr ""
 
@@ -1932,7 +1932,7 @@ msgstr ""
 msgid "options"
 msgstr "选项"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr ""
 
diff --git a/src/translations/zh_TW.po b/src/translations/zh_TW.po
index 9978460f4..e50b1e4fe 100644
--- a/src/translations/zh_TW.po
+++ b/src/translations/zh_TW.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-08-10 00:39+0000\n"
 "Last-Translator: David Sansome <me@davidsansome.com>\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"
-"Language: \n"
 "X-Launchpad-Export-Date: 2010-08-11 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -52,15 +52,15 @@ msgstr ""
 msgid "%1 tracks"
 msgstr "%1 歌曲"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n failed"
 msgstr "%n 失敗的"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n finished"
 msgstr "%n 完成的"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "%n remaining"
 msgstr "%n 剩餘的"
 
@@ -659,7 +659,7 @@ msgstr "編輯歌曲資訊..."
 msgid "Edit..."
 msgstr "編輯..."
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "Editing %n tracks"
 msgstr "編輯 %n 歌曲"
 
@@ -1919,7 +1919,7 @@ msgstr ""
 msgid "[click to edit]"
 msgstr "[點擊以編輯]"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "add %n songs"
 msgstr "加入 %n 歌"
 
@@ -1939,7 +1939,7 @@ msgstr "移動歌曲"
 msgid "options"
 msgstr "選項"
 
-#, c-format
+#, c-format, qt-plural-format
 msgid "remove %n songs"
 msgstr "移除 %n 歌"
 
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 892dfecae..404e1c0f2 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -473,7 +473,7 @@ MainWindow::MainWindow(NetworkAccessManager* network, Engine::Type engine, QWidg
 #endif
 
 #ifdef ENABLE_WIIMOTEDEV
-  wiimotedev_shortcuts_ = new WiimotedevShortcuts(player_, this);
+  wiimotedev_shortcuts_.reset(new WiimotedevShortcuts(player_));
 #endif
 
   qDebug() << t.restart() << "tray";
@@ -1486,7 +1486,7 @@ void MainWindow::EnsureSettingsDialogCreated() {
   connect(settings_dialog_.get(), SIGNAL(accepted()), player_->GetEngine(), SLOT(ReloadSettings()));
   connect(settings_dialog_.get(), SIGNAL(accepted()), ui_->playlist->view(), SLOT(ReloadSettings()));
   #ifdef ENABLE_WIIMOTEDEV
-  connect(settings_dialog_.get(), SIGNAL(accepted()), wiimotedev_shortcuts_, SLOT(ReloadSettings()));
+  connect(settings_dialog_.get(), SIGNAL(accepted()), wiimotedev_shortcuts_.get(), SLOT(ReloadSettings()));
   #endif
 }
 
diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h
index da0b47b89..f33c3fa27 100644
--- a/src/ui/mainwindow.h
+++ b/src/ui/mainwindow.h
@@ -225,7 +225,7 @@ class MainWindow : public QMainWindow, public PlatformInterface {
 #endif
 
 #ifdef ENABLE_WIIMOTEDEV
-  WiimotedevShortcuts* wiimotedev_shortcuts_;
+  boost::scoped_ptr<WiimotedevShortcuts> wiimotedev_shortcuts_;
 #endif
 
   QMenu* playlist_menu_;
diff --git a/src/ui/wiimotedevshortcutsconfig.cpp b/src/ui/wiimotedevshortcutsconfig.cpp
index 393d3ec18..b8dde0dd4 100644
--- a/src/ui/wiimotedevshortcutsconfig.cpp
+++ b/src/ui/wiimotedevshortcutsconfig.cpp
@@ -107,7 +107,7 @@ WiimotedevShortcutsConfig::WiimotedevShortcutsConfig(QWidget* parent)
 
   settings_.beginGroup(WiimotedevShortcuts::kSettingsGroup);
   ui_->wiimotedev_enable->setChecked(settings_.value("enabled", true).toBool());
-  ui_->wiimotedev_groupbox->setChecked(settings_.value("enabled", true).toBool());
+  ui_->wiimotedev_groupbox->setEnabled(settings_.value("enabled", true).toBool());
   ui_->wiimotedev_active->setChecked(settings_.value("use_active_action", false).toBool());
   ui_->wiimotedev_focus->setChecked(settings_.value("only_when_focused", false).toBool());
   ui_->wiimotedev_notification->setChecked(settings_.value("use_notification", false).toBool());
diff --git a/src/wiimotedev/shortcuts.cpp b/src/wiimotedev/shortcuts.cpp
index 08f097968..0e66c92ef 100644
--- a/src/wiimotedev/shortcuts.cpp
+++ b/src/wiimotedev/shortcuts.cpp
@@ -17,34 +17,39 @@
 #include <QSettings>
 
 #include "wiimotedev/shortcuts.h"
-#include "wiimotedev/interface.h"
 
 const char* WiimotedevShortcuts::kActionsGroup = "WiimotedevActions";
 const char* WiimotedevShortcuts::kSettingsGroup = "WiimotedevSettings";
 
-WiimotedevShortcuts::WiimotedevShortcuts(Player* player, QObject* parent)
+WiimotedevShortcuts::WiimotedevShortcuts(QObject* parent)
  :QObject(parent),
-  player_(player),
-  wiimotedev_iface_(NULL),
+  player_(qobject_cast<Player*>(parent)),
+  wiimotedev_active_(true),
   wiimotedev_buttons_(0),
   wiimotedev_device_(1),
-  wiimotedev_active_(true),
   wiimotedev_enable_(true),
   wiimotedev_focus_(false),
+  wiimotedev_iface_(NULL),
   wiimotedev_notification_(true)
 {
   ReloadSettings();
+}
 
-  if (QDBusConnection::systemBus().isConnected()) {
-    wiimotedev_iface_ = new DBusDeviceEventsInterface(WIIMOTEDEV_DBUS_SERVICE_NAME,
-                                                      WIIMOTEDEV_DBUS_EVENTS_OBJECT,
-                                                      QDBusConnection::systemBus(),
-                                                      this);
-    qDebug() << "Wiimotedev interface valid" << wiimotedev_iface_->isValid();
+void WiimotedevShortcuts::SetWiimotedevInterfaceActived(bool actived) {
+  if (!QDBusConnection::systemBus().isConnected())
+    return;
 
-    connect(wiimotedev_iface_, SIGNAL(dbusWiimoteGeneralButtons(quint32,quint64)),
+  if (actived && !wiimotedev_iface_) {
+    wiimotedev_iface_.reset(new DBusDeviceEventsInterface(
+        WIIMOTEDEV_DBUS_SERVICE_NAME, WIIMOTEDEV_DBUS_EVENTS_OBJECT,
+        QDBusConnection::systemBus(), this));
+
+    connect(wiimotedev_iface_.get(), SIGNAL(dbusWiimoteGeneralButtons(quint32,quint64)),
             this, SLOT(DbusWiimoteGeneralButtons(quint32, quint64)));
   }
+
+  if (!actived && wiimotedev_iface_)
+    wiimotedev_iface_.reset();
 }
 
 void WiimotedevShortcuts::ReloadSettings() {
@@ -53,7 +58,7 @@ void WiimotedevShortcuts::ReloadSettings() {
   actions_.clear();
 
   if (!settings_.allKeys().count()) {
-    SetDefaultSettings();
+    RestoreSettings();
     settings_.sync();
   }
 
@@ -76,9 +81,11 @@ void WiimotedevShortcuts::ReloadSettings() {
   wiimotedev_notification_ = settings_.value("use_notification", wiimotedev_notification_).toBool();
 
   settings_.endGroup();
+
+  SetWiimotedevInterfaceActived(wiimotedev_enable_);
 }
 
-void WiimotedevShortcuts::SetDefaultSettings()
+void WiimotedevShortcuts::RestoreSettings()
 {
   QSettings settings;
   settings.beginGroup(WiimotedevShortcuts::kActionsGroup);
@@ -104,7 +111,7 @@ void WiimotedevShortcuts::SetDefaultSettings()
 }
 
 void WiimotedevShortcuts::DbusWiimoteGeneralButtons(quint32 id, quint64 value) {
-  if (id != wiimotedev_device_ || !wiimotedev_enable_) return;
+  if (id != wiimotedev_device_ || !wiimotedev_enable_ || !player_) return;
 
   quint64 buttons = value & ~(WIIMOTE_TILT_MASK | NUNCHUK_TILT_MASK);
 
diff --git a/src/wiimotedev/shortcuts.h b/src/wiimotedev/shortcuts.h
index 9b2057815..6bb16e6a8 100644
--- a/src/wiimotedev/shortcuts.h
+++ b/src/wiimotedev/shortcuts.h
@@ -17,11 +17,11 @@
 #ifndef WIIMOTEDEV_SHORTCUTS_H
 #define WIIMOTEDEV_SHORTCUTS_H
 
-#include <QObject>
-#include <QMap>
-#include "core/player.h"
+#include <boost/scoped_ptr.hpp>
+
+#include "core/player.h"
+#include "wiimotedev/interface.h"
 
-class DBusDeviceEventsInterface;
 class QSettings;
 
 class WiimotedevShortcuts :public QObject {
@@ -30,28 +30,8 @@ public:
   static const char* kActionsGroup;
   static const char* kSettingsGroup;
 
-  WiimotedevShortcuts(Player* player = 0, QObject* parent = 0);
+  WiimotedevShortcuts(QObject* parent = 0);
 
-public slots:
-  void ReloadSettings();
-  void SetDefaultSettings();
-
-private slots:
-  void DbusWiimoteGeneralButtons(quint32 id, quint64 value);
-
-private:
-  Player* player_;
-  DBusDeviceEventsInterface* wiimotedev_iface_;
-  quint64 wiimotedev_buttons_;
-  QSettings settings_;
-
-  quint32 wiimotedev_device_; 
-  bool wiimotedev_active_;
-  bool wiimotedev_enable_;
-  bool wiimotedev_focus_;
-  bool wiimotedev_notification_;
-
-public:
   enum Action {
     WiimotedevActive = 0,
     WiimotedevDeactive,
@@ -71,9 +51,27 @@ public:
     ActionNone  = 0xff
   };
 
-private:
-  QHash <quint64, quint32> actions_;
+public slots:
+  void SetWiimotedevInterfaceActived(bool actived);
+  void ReloadSettings();
+  void RestoreSettings();
 
+private slots:
+  void DbusWiimoteGeneralButtons(quint32 id, quint64 value);
+
+private:
+  Player* player_;
+
+  bool wiimotedev_active_;
+  quint64 wiimotedev_buttons_;
+  quint32 wiimotedev_device_;
+  bool wiimotedev_enable_;
+  bool wiimotedev_focus_;
+  boost::scoped_ptr<DBusDeviceEventsInterface> wiimotedev_iface_;
+  bool wiimotedev_notification_;
+
+  QHash <quint64, quint32> actions_;
+  QSettings settings_;
 };
 
 #endif // WIIMOTEDEV_SHORTCUTS_H