diff --git a/src/translations/ar.po b/src/translations/ar.po
index 3768a3c0a..15a99472f 100644
--- a/src/translations/ar.po
+++ b/src/translations/ar.po
@@ -114,6 +114,9 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr ""
 
@@ -528,6 +531,9 @@ msgstr "حُرِرَ بِتاريخ"
 msgid "De&fault"
 msgstr ""
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr "اخفض الصوت 4%"
 
@@ -935,11 +941,11 @@ msgid "Jump to the currently playing track"
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1626,6 +1632,9 @@ msgstr ""
 msgid "Stop"
 msgstr ""
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr ""
 
diff --git a/src/translations/bg.po b/src/translations/bg.po
index e466b9285..455b86cf6 100644
--- a/src/translations/bg.po
+++ b/src/translations/bg.po
@@ -114,6 +114,9 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr ""
 
@@ -528,6 +531,9 @@ msgstr ""
 msgid "De&fault"
 msgstr ""
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr ""
 
@@ -935,11 +941,11 @@ msgid "Jump to the currently playing track"
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1626,6 +1632,9 @@ msgstr ""
 msgid "Stop"
 msgstr ""
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr ""
 
diff --git a/src/translations/ca.po b/src/translations/ca.po
index b03200f21..bef1c165c 100644
--- a/src/translations/ca.po
+++ b/src/translations/ca.po
@@ -120,6 +120,9 @@ msgstr "Detalls del compte"
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr "Afegeix un flux de dades"
 
@@ -540,6 +543,9 @@ msgstr "Data de modificació"
 msgid "De&fault"
 msgstr "O&missió"
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr "Redueix el volum un 4%"
 
@@ -954,11 +960,11 @@ msgid "Jump to the currently playing track"
 msgstr "Salta a la pista que s'esta reproduint"
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1647,6 +1653,9 @@ msgstr "Iniciant..."
 msgid "Stop"
 msgstr "Atura"
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr ""
 
diff --git a/src/translations/cs.po b/src/translations/cs.po
index 31c288581..cbc969f08 100644
--- a/src/translations/cs.po
+++ b/src/translations/cs.po
@@ -115,6 +115,9 @@ msgstr "Podrobnosti o účtu"
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr "Přidat proud"
 
@@ -529,6 +532,9 @@ msgstr "Datum úprav"
 msgid "De&fault"
 msgstr "&Výchozí"
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr "Sniž hlasitosto 4%"
 
@@ -939,11 +945,11 @@ msgid "Jump to the currently playing track"
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1630,6 +1636,9 @@ msgstr "Spouští se..."
 msgid "Stop"
 msgstr "Zastavit"
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr "Zastavit po této skladbě"
 
diff --git a/src/translations/da.po b/src/translations/da.po
index 508931986..157c742b1 100644
--- a/src/translations/da.po
+++ b/src/translations/da.po
@@ -115,6 +115,9 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr "Tilføj stream"
 
@@ -529,6 +532,9 @@ msgstr "Ændringsdato"
 msgid "De&fault"
 msgstr ""
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr "Sænk lydstyrken med 4%"
 
@@ -940,11 +946,11 @@ msgid "Jump to the currently playing track"
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1633,6 +1639,9 @@ msgstr ""
 msgid "Stop"
 msgstr "Stop"
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr "Stop efter dette spor"
 
diff --git a/src/translations/de.po b/src/translations/de.po
index 8ab90a918..0ed707d74 100644
--- a/src/translations/de.po
+++ b/src/translations/de.po
@@ -119,6 +119,9 @@ msgstr "Benutzerkonto"
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr "Stream hinzufügen"
 
@@ -539,6 +542,9 @@ msgstr "Geändert"
 msgid "De&fault"
 msgstr "S&tandard"
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr "Lautstärke um 4% verringern"
 
@@ -953,11 +959,11 @@ msgid "Jump to the currently playing track"
 msgstr "Zum aktuellen Stück springen"
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1647,6 +1653,9 @@ msgstr "Starte..."
 msgid "Stop"
 msgstr "Anhalten"
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr "Wiedergabe nach diesem Stück beenden"
 
diff --git a/src/translations/el.po b/src/translations/el.po
index 27fdee210..423b0fae6 100644
--- a/src/translations/el.po
+++ b/src/translations/el.po
@@ -121,6 +121,9 @@ msgstr "Λεπτομέρειες λογαριασμού"
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr "Προσθήκη ροής"
 
@@ -541,6 +544,9 @@ msgstr "Ημερομηνία τροποποίησης"
 msgid "De&fault"
 msgstr "Προ&επιλογή"
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr "Μείωση της έντασης ήχου κατά 4%"
 
@@ -955,11 +961,11 @@ msgid "Jump to the currently playing track"
 msgstr "Μετάβαση στο τρέχον κομμάτι που παίζει"
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1648,6 +1654,9 @@ msgstr "Εκκίνηση..."
 msgid "Stop"
 msgstr "Σταμάτημα"
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr "Σταμάτημα μετά από αυτό το κομμάτι"
 
diff --git a/src/translations/en_CA.po b/src/translations/en_CA.po
index 1c5cf8de3..99433d64f 100644
--- a/src/translations/en_CA.po
+++ b/src/translations/en_CA.po
@@ -114,6 +114,9 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr "Add Stream"
 
@@ -530,6 +533,9 @@ msgstr "Date modified"
 msgid "De&fault"
 msgstr "De&fault"
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr "Decrease the volume by 4%"
 
@@ -939,11 +945,11 @@ msgid "Jump to the currently playing track"
 msgstr "Jump to the currently playing track"
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1631,6 +1637,9 @@ msgstr ""
 msgid "Stop"
 msgstr "Stop"
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr "Stop after this track"
 
diff --git a/src/translations/en_GB.po b/src/translations/en_GB.po
index 9f8a49d23..9a8e80184 100644
--- a/src/translations/en_GB.po
+++ b/src/translations/en_GB.po
@@ -114,6 +114,9 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr "Add Stream"
 
@@ -528,6 +531,9 @@ msgstr "Date modified"
 msgid "De&fault"
 msgstr ""
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr "Decrease the volume by 4%"
 
@@ -937,11 +943,11 @@ msgid "Jump to the currently playing track"
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1628,6 +1634,9 @@ msgstr ""
 msgid "Stop"
 msgstr "Stop"
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr "Stop after this track"
 
diff --git a/src/translations/es.po b/src/translations/es.po
index c92de75b8..1ce8356af 100644
--- a/src/translations/es.po
+++ b/src/translations/es.po
@@ -121,6 +121,9 @@ msgstr "Detalles de la cuenta"
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr "Añadir Flujo de Radio"
 
@@ -540,6 +543,9 @@ msgstr "Fecha de modificación"
 msgid "De&fault"
 msgstr "Por &defecto"
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr "Reducir el volumen en 4%"
 
@@ -956,11 +962,11 @@ msgid "Jump to the currently playing track"
 msgstr "Ir a la pista actualmente reproduciéndose"
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1651,6 +1657,9 @@ msgstr "Iniciando..."
 msgid "Stop"
 msgstr "Detener"
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr "Detener reproducción al finalizar la pista"
 
diff --git a/src/translations/fi.po b/src/translations/fi.po
index 0e23c4572..a47da652b 100644
--- a/src/translations/fi.po
+++ b/src/translations/fi.po
@@ -114,6 +114,9 @@ msgstr "Tilin tiedot"
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr "Lisää virta"
 
@@ -528,6 +531,9 @@ msgstr "Muokattu"
 msgid "De&fault"
 msgstr ""
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr ""
 
@@ -936,11 +942,11 @@ msgid "Jump to the currently playing track"
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1628,6 +1634,9 @@ msgstr ""
 msgid "Stop"
 msgstr "Pysäytä"
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr "Pysäytä toistettavan kappaleen jälkeen"
 
diff --git a/src/translations/fr.po b/src/translations/fr.po
index c53c78fdf..9936100fd 100644
--- a/src/translations/fr.po
+++ b/src/translations/fr.po
@@ -115,6 +115,9 @@ msgstr "Détails du compte"
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr "Ajouter un flux"
 
@@ -533,6 +536,9 @@ msgstr "Date de modification"
 msgid "De&fault"
 msgstr "Dé&faut"
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr "Baisser le volume de 4%"
 
@@ -945,11 +951,11 @@ msgid "Jump to the currently playing track"
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1640,6 +1646,9 @@ msgstr ""
 msgid "Stop"
 msgstr "Stop"
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr "Arrêter la lecture après cette piste"
 
diff --git a/src/translations/gl.po b/src/translations/gl.po
index 56c275304..8b0f487aa 100644
--- a/src/translations/gl.po
+++ b/src/translations/gl.po
@@ -114,6 +114,9 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr ""
 
@@ -528,6 +531,9 @@ msgstr "Data de alterazón"
 msgid "De&fault"
 msgstr ""
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr ""
 
@@ -936,11 +942,11 @@ msgid "Jump to the currently playing track"
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1628,6 +1634,9 @@ msgstr ""
 msgid "Stop"
 msgstr ""
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr "Parar a reproduzón despois da faixa actual"
 
diff --git a/src/translations/hu.po b/src/translations/hu.po
index b5f5adfe7..dcf32576f 100644
--- a/src/translations/hu.po
+++ b/src/translations/hu.po
@@ -119,6 +119,9 @@ msgstr "Fiók részletek"
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr "Adatfolyam hozzáadása"
 
@@ -537,6 +540,9 @@ msgstr "Módosítás dátuma"
 msgid "De&fault"
 msgstr "&alapértelmezés"
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr "Hangerő csökkentése 4%-kal"
 
@@ -949,11 +955,11 @@ msgid "Jump to the currently playing track"
 msgstr "Ugrás a most lejátszott számra"
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1643,6 +1649,9 @@ msgstr "Indítás…"
 msgid "Stop"
 msgstr "Leállít"
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr "Leállítás az aktuális szám után"
 
diff --git a/src/translations/it.po b/src/translations/it.po
index 13ba1b4d4..b9ee46a91 100644
--- a/src/translations/it.po
+++ b/src/translations/it.po
@@ -121,6 +121,9 @@ msgstr "Dettagli dell'account"
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr "Aggiungi flusso"
 
@@ -544,6 +547,9 @@ msgstr "Data di creazione"
 msgid "De&fault"
 msgstr "Prede&finita"
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr "Riduci il volume del 4%"
 
@@ -960,11 +966,11 @@ msgid "Jump to the currently playing track"
 msgstr "Salta alla traccia in riproduzione"
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1655,6 +1661,9 @@ msgstr "Avvio in corso..."
 msgid "Stop"
 msgstr "Ferma"
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr "Ferma dopo questa traccia"
 
diff --git a/src/translations/kk.po b/src/translations/kk.po
index 2c1bdf07b..b3ef3fc46 100644
--- a/src/translations/kk.po
+++ b/src/translations/kk.po
@@ -114,6 +114,9 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr ""
 
@@ -528,6 +531,9 @@ msgstr ""
 msgid "De&fault"
 msgstr ""
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr ""
 
@@ -937,11 +943,11 @@ msgid "Jump to the currently playing track"
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1628,6 +1634,9 @@ msgstr ""
 msgid "Stop"
 msgstr "Тоқтату"
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr ""
 
diff --git a/src/translations/lt.po b/src/translations/lt.po
index 558be9182..d37d2c245 100644
--- a/src/translations/lt.po
+++ b/src/translations/lt.po
@@ -114,6 +114,9 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr ""
 
@@ -528,6 +531,9 @@ msgstr ""
 msgid "De&fault"
 msgstr ""
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr ""
 
@@ -935,11 +941,11 @@ msgid "Jump to the currently playing track"
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1626,6 +1632,9 @@ msgstr ""
 msgid "Stop"
 msgstr ""
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr ""
 
diff --git a/src/translations/nb.po b/src/translations/nb.po
index 5f9431e7c..6f5b3cf6c 100644
--- a/src/translations/nb.po
+++ b/src/translations/nb.po
@@ -114,6 +114,9 @@ msgstr "Kontodetaljer"
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr "Legg til strøm"
 
@@ -528,6 +531,9 @@ msgstr "Endringsdato"
 msgid "De&fault"
 msgstr ""
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr ""
 
@@ -938,11 +944,11 @@ msgid "Jump to the currently playing track"
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1629,6 +1635,9 @@ msgstr "Starter …"
 msgid "Stop"
 msgstr "Stopp"
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr "Stopp etter denne sangen"
 
diff --git a/src/translations/nl.po b/src/translations/nl.po
index 28d66fc84..7870c2969 100644
--- a/src/translations/nl.po
+++ b/src/translations/nl.po
@@ -118,6 +118,9 @@ msgstr "Accountdetails"
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr "Radiostream toevoegen"
 
@@ -536,6 +539,9 @@ msgstr "Wijzigingsdatum"
 msgid "De&fault"
 msgstr "Stan&daard"
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr "Volume met 4% verlagen"
 
@@ -951,11 +957,11 @@ msgid "Jump to the currently playing track"
 msgstr "Spring naar de nu spelende track"
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1645,6 +1651,9 @@ msgstr "Opstarten..."
 msgid "Stop"
 msgstr "Stoppen"
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr "Stoppen na deze track"
 
diff --git a/src/translations/oc.po b/src/translations/oc.po
index 0bc0bb0d7..aec61b784 100644
--- a/src/translations/oc.po
+++ b/src/translations/oc.po
@@ -114,6 +114,9 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr "Apondre un flux"
 
@@ -528,6 +531,9 @@ msgstr "Data de modificacion"
 msgid "De&fault"
 msgstr "Per d&efaut"
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr ""
 
@@ -935,11 +941,11 @@ msgid "Jump to the currently playing track"
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1626,6 +1632,9 @@ msgstr ""
 msgid "Stop"
 msgstr "Arrestar"
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr ""
 
diff --git a/src/translations/pl.po b/src/translations/pl.po
index b31e42ec8..4864f6e9f 100644
--- a/src/translations/pl.po
+++ b/src/translations/pl.po
@@ -115,6 +115,9 @@ msgstr "Szczegóły konta"
 msgid "Action"
 msgstr "Akcja"
 
+msgid "Active Wiiremote"
+msgstr "Aktywuj wiiremote'a"
+
 msgid "Add Stream"
 msgstr "Dodaj URL"
 
@@ -534,6 +537,9 @@ msgstr "Data modyfikacji"
 msgid "De&fault"
 msgstr "&Domyślny"
 
+msgid "Deactive Wiiremote"
+msgstr "Deaktywuj wiiremote'a"
+
 msgid "Decrease the volume by 4%"
 msgstr "Zmniejsz głośność o 4%"
 
@@ -942,12 +948,12 @@ msgid "Jump to the currently playing track"
 msgstr "Przeskocz do teraz odtwarzanej ścieżki"
 
 #, qt-format
-msgid "Keep buttons for %1 second"
-msgstr "Przytrzymaj klawisze przez %1 sekunde"
+msgid "Keep buttons for %1 second..."
+msgstr "Przytrzymaj klawisze przez %1 sekunde..."
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
-msgstr "Przytrzymaj klawisze przez %1 sekundy"
+msgid "Keep buttons for %1 seconds..."
+msgstr "Przytrzymaj klawisze przez %1 sekundy..."
 
 msgid "Keep the original files"
 msgstr "Zachowaj oryginalne pliki"
@@ -1637,6 +1643,9 @@ msgstr "Uruchamianie..."
 msgid "Stop"
 msgstr "Zatrzymaj"
 
+msgid "Stop after"
+msgstr "Zatrzymaj po"
+
 msgid "Stop after this track"
 msgstr "Zatrzymaj po tym utworze"
 
@@ -1968,6 +1977,12 @@ msgstr "zatrzymaj"
 msgid "track %1"
 msgstr "utwór %1"
 
+#~ msgid "Keep buttons for %1 second"
+#~ msgstr "Przytrzymaj klawisze przez %1 sekunde"
+
+#~ msgid "Keep buttons for %1 seconds"
+#~ msgstr "Przytrzymaj klawisze przez %1 sekundy"
+
 #~ msgid "Use Wii remote id"
 #~ msgstr "Użyj Wii remote: "
 
diff --git a/src/translations/pt.po b/src/translations/pt.po
index d8ba23f3a..1d0a9095f 100644
--- a/src/translations/pt.po
+++ b/src/translations/pt.po
@@ -118,6 +118,9 @@ msgstr "Detalhes da conta"
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr "Adicionar Emissão"
 
@@ -538,6 +541,9 @@ msgstr "Data de modificação"
 msgid "De&fault"
 msgstr "O&missões"
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr "Diminuir o volume em 4%"
 
@@ -949,11 +955,11 @@ msgid "Jump to the currently playing track"
 msgstr "Ir para a faixa de reprodução actual"
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1643,6 +1649,9 @@ msgstr "A Iniciar..."
 msgid "Stop"
 msgstr "Parar"
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr "Parar depois desta faixa"
 
diff --git a/src/translations/pt_BR.po b/src/translations/pt_BR.po
index 9379828f8..184e99b4e 100644
--- a/src/translations/pt_BR.po
+++ b/src/translations/pt_BR.po
@@ -117,6 +117,9 @@ msgstr "Detalhes da conta"
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr "Adicionar Transmissão"
 
@@ -533,6 +536,9 @@ msgstr "Data de modificação"
 msgid "De&fault"
 msgstr "&Padrão"
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr "Diminuir volume em 4%"
 
@@ -943,11 +949,11 @@ msgid "Jump to the currently playing track"
 msgstr "Pular para a faixa em execução"
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1638,6 +1644,9 @@ msgstr "Iniciando..."
 msgid "Stop"
 msgstr "Parar"
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr "Parar depois desta música"
 
diff --git a/src/translations/ro.po b/src/translations/ro.po
index 8e9923e3f..386af07c5 100644
--- a/src/translations/ro.po
+++ b/src/translations/ro.po
@@ -114,6 +114,9 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr "Adaugă flux"
 
@@ -528,6 +531,9 @@ msgstr "Data modificării"
 msgid "De&fault"
 msgstr ""
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr "Scade volumul cu 4%"
 
@@ -936,11 +942,11 @@ msgid "Jump to the currently playing track"
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1627,6 +1633,9 @@ msgstr ""
 msgid "Stop"
 msgstr "Oprește"
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr "Oprește după pista aceasta"
 
diff --git a/src/translations/ru.po b/src/translations/ru.po
index b756c4cac..8240879bf 100644
--- a/src/translations/ru.po
+++ b/src/translations/ru.po
@@ -117,6 +117,9 @@ msgstr "Детали учётной записи"
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr "Добавить поток"
 
@@ -535,6 +538,9 @@ msgstr "Дата изменения"
 msgid "De&fault"
 msgstr "По &умолчанию"
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr "Уменьшить громкость на 4%"
 
@@ -946,11 +952,11 @@ msgid "Jump to the currently playing track"
 msgstr "Перейти к текущей композиции"
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1640,6 +1646,9 @@ msgstr "Запуск..."
 msgid "Stop"
 msgstr "Остановить"
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr "Остановить после этой композиции"
 
diff --git a/src/translations/sk.po b/src/translations/sk.po
index b8994d37e..5a7b591f9 100644
--- a/src/translations/sk.po
+++ b/src/translations/sk.po
@@ -119,6 +119,9 @@ msgstr "Detaily účtu"
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr "Pridať stream"
 
@@ -537,6 +540,9 @@ msgstr "Dátum zmeny"
 msgid "De&fault"
 msgstr "Pôvo&dná"
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr "Znížiť hlasitosť o 4%"
 
@@ -949,11 +955,11 @@ msgid "Jump to the currently playing track"
 msgstr "Skočiť na práve prehrávanú skladbu"
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1641,6 +1647,9 @@ msgstr "Začína sa ..."
 msgid "Stop"
 msgstr "Zastaviť"
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr "Zastaviť po tejto skladbe"
 
diff --git a/src/translations/sl.po b/src/translations/sl.po
index 37898e8de..ec303f2a0 100644
--- a/src/translations/sl.po
+++ b/src/translations/sl.po
@@ -118,6 +118,9 @@ msgstr "Podrobnosti računa"
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr "Dodaj tok"
 
@@ -536,6 +539,9 @@ msgstr "Spremenjena"
 msgid "De&fault"
 msgstr "&Privzeto"
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr "Zmanjšaj glasnost za 4%"
 
@@ -949,11 +955,11 @@ msgid "Jump to the currently playing track"
 msgstr "Skoči na skladbo, ki se trenutno predvaja"
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1643,6 +1649,9 @@ msgstr "Pričenjanje..."
 msgid "Stop"
 msgstr "Ustavi"
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr "Ustavi po tej skladbi"
 
diff --git a/src/translations/sr.po b/src/translations/sr.po
index a46ddb942..880d70942 100644
--- a/src/translations/sr.po
+++ b/src/translations/sr.po
@@ -114,6 +114,9 @@ msgstr "Детаљи о налогу"
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr "Додај ток"
 
@@ -530,6 +533,9 @@ msgstr "Измењено"
 msgid "De&fault"
 msgstr "Под&разумевано"
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr "Утишај јачину звука за 4%"
 
@@ -939,11 +945,11 @@ msgid "Jump to the currently playing track"
 msgstr "Скочи на нумеру која се тренутно пушта"
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1631,6 +1637,9 @@ msgstr "Почињем..."
 msgid "Stop"
 msgstr "Заустави"
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr ""
 
diff --git a/src/translations/sv.po b/src/translations/sv.po
index ff5a02ef9..f234f089c 100644
--- a/src/translations/sv.po
+++ b/src/translations/sv.po
@@ -114,6 +114,9 @@ msgstr "Kontodetaljer"
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr "Lägg till ström"
 
@@ -532,6 +535,9 @@ msgstr "Datum ändrat"
 msgid "De&fault"
 msgstr "S&tandard"
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr "Sänk volymen med 4%"
 
@@ -944,11 +950,11 @@ msgid "Jump to the currently playing track"
 msgstr "Hoppa till det spår som spelas för tillfället"
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1635,6 +1641,9 @@ msgstr "Startar..."
 msgid "Stop"
 msgstr "Stoppa"
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr "Stoppa efter nuvarande spår"
 
diff --git a/src/translations/tr.po b/src/translations/tr.po
index b980b1611..67c8c497b 100644
--- a/src/translations/tr.po
+++ b/src/translations/tr.po
@@ -114,6 +114,9 @@ msgstr "Hesap ayrıntıları"
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr "Müzik Yayını Ekle"
 
@@ -528,6 +531,9 @@ msgstr "Değiştirildiği tarih"
 msgid "De&fault"
 msgstr "&Öntanımlı"
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr "Ses seviyesini %4 azalt"
 
@@ -937,11 +943,11 @@ msgid "Jump to the currently playing track"
 msgstr "Şu anda çalınan parçaya atla"
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1632,6 +1638,9 @@ msgstr "Başlatılıyor..."
 msgid "Stop"
 msgstr "Durdur"
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr "Bu parçadan sonra durdur"
 
diff --git a/src/translations/translations.pot b/src/translations/translations.pot
index 1602e43e5..e7385752c 100644
--- a/src/translations/translations.pot
+++ b/src/translations/translations.pot
@@ -104,6 +104,9 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr ""
 
@@ -518,6 +521,9 @@ msgstr ""
 msgid "De&fault"
 msgstr ""
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr ""
 
@@ -925,11 +931,11 @@ msgid "Jump to the currently playing track"
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1616,6 +1622,9 @@ msgstr ""
 msgid "Stop"
 msgstr ""
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr ""
 
diff --git a/src/translations/uk.po b/src/translations/uk.po
index b3f4483ba..7d954fa21 100644
--- a/src/translations/uk.po
+++ b/src/translations/uk.po
@@ -118,6 +118,9 @@ msgstr "Параметри облікового запису"
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr "Додати потік"
 
@@ -536,6 +539,9 @@ msgstr "Дата зміни"
 msgid "De&fault"
 msgstr "Ти&пово"
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr "Зменшити гучність на 4%"
 
@@ -948,11 +954,11 @@ msgid "Jump to the currently playing track"
 msgstr "Перейти до відтворюваної доріжки"
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1641,6 +1647,9 @@ msgstr "Запуск..."
 msgid "Stop"
 msgstr "Зупинити"
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr "Зупинити після цієї доріжки"
 
diff --git a/src/translations/zh_CN.po b/src/translations/zh_CN.po
index 3a31bda1f..664f95a70 100644
--- a/src/translations/zh_CN.po
+++ b/src/translations/zh_CN.po
@@ -114,6 +114,9 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr ""
 
@@ -528,6 +531,9 @@ msgstr "修改日期"
 msgid "De&fault"
 msgstr ""
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr ""
 
@@ -935,11 +941,11 @@ msgid "Jump to the currently playing track"
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1626,6 +1632,9 @@ msgstr ""
 msgid "Stop"
 msgstr "停止"
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr ""
 
diff --git a/src/translations/zh_TW.po b/src/translations/zh_TW.po
index 172992ee0..db27235be 100644
--- a/src/translations/zh_TW.po
+++ b/src/translations/zh_TW.po
@@ -118,6 +118,9 @@ msgstr "帳號詳情"
 msgid "Action"
 msgstr ""
 
+msgid "Active Wiiremote"
+msgstr ""
+
 msgid "Add Stream"
 msgstr "加入網路串流"
 
@@ -532,6 +535,9 @@ msgstr "修改的日期"
 msgid "De&fault"
 msgstr "預設(&F)"
 
+msgid "Deactive Wiiremote"
+msgstr ""
+
 msgid "Decrease the volume by 4%"
 msgstr "減低音量4％"
 
@@ -940,11 +946,11 @@ msgid "Jump to the currently playing track"
 msgstr "跳轉到目前播放的歌曲"
 
 #, qt-format
-msgid "Keep buttons for %1 second"
+msgid "Keep buttons for %1 second..."
 msgstr ""
 
 #, qt-format
-msgid "Keep buttons for %1 seconds"
+msgid "Keep buttons for %1 seconds..."
 msgstr ""
 
 msgid "Keep the original files"
@@ -1631,6 +1637,9 @@ msgstr "開啟..."
 msgid "Stop"
 msgstr "停止"
 
+msgid "Stop after"
+msgstr ""
+
 msgid "Stop after this track"
 msgstr "在這首歌之後停止"
 
diff --git a/src/ui/wiimotedevshortcutgrabber.cpp b/src/ui/wiimotedevshortcutgrabber.cpp
index 883edbb00..ee18f21b8 100644
--- a/src/ui/wiimotedevshortcutgrabber.cpp
+++ b/src/ui/wiimotedevshortcutgrabber.cpp
@@ -20,6 +20,7 @@
 
 WiimotedevShortcutGrabber::WiimotedevShortcutGrabber(quint32 action, QWidget *parent)
  :QDialog(parent),
+  accepted_(false),
   pref_action_(action),
   ui_(new Ui_WiimotedevShortcutGrabber),
   config_(qobject_cast<WiimotedevShortcutsConfig*>(parent)),
@@ -41,10 +42,6 @@ WiimotedevShortcutGrabber::WiimotedevShortcutGrabber(quint32 action, QWidget *pa
             this, SLOT(DbusWiimoteGeneralButtons(uint,qulonglong)));
   }
 
-  shortcut.action = 0;
-  shortcut.button = 0;
-  shortcut.object = 0;
-
   foreach (const QString& name, config_->text_actions_.values())
     ui_->comboBox->addItem(name);
 
@@ -65,12 +62,15 @@ WiimotedevShortcutGrabber::~WiimotedevShortcutGrabber() {
 }
 
 void WiimotedevShortcutGrabber::Timeout(int secs) {
-  if (secs == 0)
+  if (secs == 0) {
+    pref_action_ = ui_->comboBox->currentIndex();
+    accepted_ = true;
     close();
+  }
 
   if (secs == 1)
-    ui_->keep_label->setText(QString(tr("Keep buttons for %1 second")).arg(QString::number(secs))); else
-    ui_->keep_label->setText(QString(tr("Keep buttons for %1 seconds")).arg(QString::number(secs)));
+    ui_->keep_label->setText(QString(tr("Keep buttons for %1 second...")).arg(QString::number(secs))); else
+    ui_->keep_label->setText(QString(tr("Keep buttons for %1 seconds...")).arg(QString::number(secs)));
 }
 
 void WiimotedevShortcutGrabber::RememberSwingChecked(bool checked) {
@@ -114,7 +114,7 @@ void WiimotedevShortcutGrabber::DbusWiimoteGeneralButtons(uint id, qulonglong va
   if (buttons) line_.start();
 
   ui_->keep_label->setVisible(buttons);
-  ui_->keep_label->setText(QString(tr("Keep buttons for %1 seconds")).arg(QString::number(line_.startFrame())));
+  ui_->keep_label->setText(QString(tr("Keep buttons for %1 seconds...")).arg(QString::number(line_.startFrame())));
   ui_->combo->setText(config_->GetReadableWiiremoteSequence(buttons));
 
   wiimotedev_buttons_ = buttons;
diff --git a/src/ui/wiimotedevshortcutgrabber.h b/src/ui/wiimotedevshortcutgrabber.h
index 6a111a941..105b6bd0f 100644
--- a/src/ui/wiimotedevshortcutgrabber.h
+++ b/src/ui/wiimotedevshortcutgrabber.h
@@ -27,12 +27,14 @@
 class Ui_WiimotedevShortcutGrabber;
 
 class WiimotedevShortcutGrabber : public QDialog {
-  Q_OBJECT  
+  Q_OBJECT
 public:
   WiimotedevShortcutGrabber(quint32 action = 0, QWidget* parent = 0);
   ~WiimotedevShortcutGrabber();
 
-  WiimotedevShortcutsConfig::Shortcut shortcut;
+  bool IsAccepted() { return accepted_; }
+  quint32 GetActionValue() { return pref_action_; }
+  quint64 GetButtonsValue() { return wiimotedev_buttons_; }
 
 private slots:
   void DbusWiimoteGeneralButtons(uint id, qulonglong value);
@@ -40,8 +42,9 @@ private slots:
   void Timeout(int);
 
 private:
-  QTimeLine line_;
+  bool accepted_;
 
+  QTimeLine line_;
   quint32 pref_action_;
 
   Ui_WiimotedevShortcutGrabber* ui_;
@@ -49,7 +52,6 @@ private:
   boost::scoped_ptr<OrgWiimotedevDeviceEventsInterface> wiimotedev_iface_;
   quint32 wiimotedev_device_;
   quint64 wiimotedev_buttons_;
-  quint32 action;
 
   quint64 remember_wiimote_shifts_;
   quint64 remember_nunchuk_shifts_;
diff --git a/src/ui/wiimotedevshortcutgrabber.ui b/src/ui/wiimotedevshortcutgrabber.ui
index ced460002..146f49236 100644
--- a/src/ui/wiimotedevshortcutgrabber.ui
+++ b/src/ui/wiimotedevshortcutgrabber.ui
@@ -94,7 +94,7 @@
      <item>
       <widget class="QLabel" name="keep_label">
        <property name="text">
-        <string>Keep buttons for %1 seconds</string>
+        <string>Keep buttons for %1 seconds...</string>
        </property>
       </widget>
      </item>
diff --git a/src/ui/wiimotedevshortcutsconfig.cpp b/src/ui/wiimotedevshortcutsconfig.cpp
index b83569052..d3a41d9b1 100644
--- a/src/ui/wiimotedevshortcutsconfig.cpp
+++ b/src/ui/wiimotedevshortcutsconfig.cpp
@@ -91,17 +91,20 @@ WiimotedevShortcutsConfig::WiimotedevShortcutsConfig(QWidget* parent)
   text_buttons_.insert(WIIMOTE_BTN_SHIFT_SHAKE, "Wiiremote Shift Shake");
   text_buttons_.insert(NUNCHUK_BTN_SHIFT_SHAKE, "Nunchuk Shift Shake");
 
-  text_actions_.insert(WiimotedevShortcuts::PlayerPlay, tr("Play"));
-  text_actions_.insert(WiimotedevShortcuts::PlayerStop, tr("Stop"));
+  text_actions_.insert(WiimotedevShortcuts::WiimotedevActive, tr("Active Wiiremote"));
+  text_actions_.insert(WiimotedevShortcuts::WiimotedevDeactive, tr("Deactive Wiiremote"));
   text_actions_.insert(WiimotedevShortcuts::PlayerNextTrack, tr("Next track"));
   text_actions_.insert(WiimotedevShortcuts::PlayerPreviousTrack, tr("Previous track"));
+  text_actions_.insert(WiimotedevShortcuts::PlayerPlay, tr("Play"));
+  text_actions_.insert(WiimotedevShortcuts::PlayerStop, tr("Stop"));
+  text_actions_.insert(WiimotedevShortcuts::PlayerIncVolume, tr("Increase volume"));
+  text_actions_.insert(WiimotedevShortcuts::PlayerDecVolume, tr("Decrease volume"));
   text_actions_.insert(WiimotedevShortcuts::PlayerMute, tr("Mute"));
   text_actions_.insert(WiimotedevShortcuts::PlayerPause, tr("Pause"));
   text_actions_.insert(WiimotedevShortcuts::PlayerTogglePause, tr("Play/Pause"));
   text_actions_.insert(WiimotedevShortcuts::PlayerSeekBackward, tr("Seek backward"));
   text_actions_.insert(WiimotedevShortcuts::PlayerSeekForward, tr("Seek forward"));
-  text_actions_.insert(WiimotedevShortcuts::PlayerIncVolume, tr("Increase volume"));
-  text_actions_.insert(WiimotedevShortcuts::PlayerDecVolume, tr("Decrease volume"));
+  text_actions_.insert(WiimotedevShortcuts::PlayerSeekForward, tr("Stop after"));
   text_actions_.insert(WiimotedevShortcuts::PlayerShowOSD, tr("Show OSD"));
 
 
@@ -204,6 +207,8 @@ void WiimotedevShortcutsConfig::AddAction() {
   emit SetWiimotedevInterfaceActived(false);
   WiimotedevShortcutGrabber grabber(0, this);
   grabber.exec();
+  if (grabber.IsAccepted())
+    AddShortcut(grabber.GetButtonsValue(), grabber.GetActionValue());
   emit SetWiimotedevInterfaceActived(true);
 }