24 files changed, 115 insertions, 208 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9cc42f5c5..63c478eaf 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -126,7 +126,6 @@ src/gui/windows/updaterwindow.cpp
 src/gui/windows/whoisonline.cpp
 src/gui/windows/worldselectdialog.cpp
 src/input/inputmanager.cpp
-src/input/inputmanager.cpp-orig
 src/input/keyboardconfig.cpp
 src/input/pages/basic.cpp
 src/input/pages/chat.cpp
diff --git a/po/ca.po b/po/ca.po
index 596af16cc..2066f39c1 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-10-10 13:57+0300\n"
+"POT-Creation-Date: 2015-10-10 15:04+0300\n"
 "PO-Revision-Date: 2015-09-27 08:24+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Catalan (http://www.transifex.com/akaras/manaplus/language/"
@@ -7053,29 +7053,26 @@ msgstr "Tria Món"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
-#. TRANSLATORS: long key name. must be short.
-#. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
 #: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
-#: src/input/inputmanager.cpp-orig:378 src/input/inputmanager.cpp-orig:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp-orig:384
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398 src/input/inputmanager.cpp-orig:398
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428 src/input/inputmanager.cpp-orig:428
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7083,8 +7080,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:442 src/input/inputmanager.cpp-orig:442
-#: src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index aeeb23dee..83a6a30e2 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-10-10 13:57+0300\n"
+"POT-Creation-Date: 2015-10-10 15:04+0300\n"
 "PO-Revision-Date: 2015-09-27 08:24+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.com/akaras/manaplus/language/"
@@ -7070,29 +7070,26 @@ msgstr "Vyber svět"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
-#. TRANSLATORS: long key name. must be short.
-#. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
 #: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
-#: src/input/inputmanager.cpp-orig:378 src/input/inputmanager.cpp-orig:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr "kl_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp-orig:384
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr "Jknoflík%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398 src/input/inputmanager.cpp-orig:398
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr "neznámá klávesa"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428 src/input/inputmanager.cpp-orig:428
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr "JK%d"
@@ -7100,8 +7097,7 @@ msgstr "JK%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:442 src/input/inputmanager.cpp-orig:442
-#: src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr "n kl"
 
diff --git a/po/de.po b/po/de.po
index e1e6c7417..9517cef5c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -33,7 +33,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-10-10 13:57+0300\n"
+"POT-Creation-Date: 2015-10-10 15:04+0300\n"
 "PO-Revision-Date: 2015-09-27 09:40+0000\n"
 "Last-Translator: Suni <kristin.joris@gmail.com>\n"
 "Language-Team: German (http://www.transifex.com/akaras/manaplus/language/"
@@ -7238,29 +7238,26 @@ msgstr "Welt auswählen"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
-#. TRANSLATORS: long key name. must be short.
-#. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
 #: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
-#: src/input/inputmanager.cpp-orig:378 src/input/inputmanager.cpp-orig:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr "Taste_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp-orig:384
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr "JKnopf%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398 src/input/inputmanager.cpp-orig:398
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr "Unbekannte Taste"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428 src/input/inputmanager.cpp-orig:428
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr "JK%d"
@@ -7268,8 +7265,7 @@ msgstr "JK%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:442 src/input/inputmanager.cpp-orig:442
-#: src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr "UTaste"
 
diff --git a/po/es.po b/po/es.po
index 19266d8df..faa6dda1b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-10-10 13:57+0300\n"
+"POT-Creation-Date: 2015-10-10 15:04+0300\n"
 "PO-Revision-Date: 2015-09-27 13:58+0000\n"
 "Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
 "Language-Team: Spanish (http://www.transifex.com/akaras/manaplus/language/"
@@ -7111,29 +7111,26 @@ msgstr "Escoger Mundo"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
-#. TRANSLATORS: long key name. must be short.
-#. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
 #: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
-#: src/input/inputmanager.cpp-orig:378 src/input/inputmanager.cpp-orig:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp-orig:384
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398 src/input/inputmanager.cpp-orig:398
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr "tecla desconocida"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428 src/input/inputmanager.cpp-orig:428
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7141,8 +7138,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:442 src/input/inputmanager.cpp-orig:442
-#: src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr "desc."
 
diff --git a/po/fi.po b/po/fi.po
index f5134fe57..0af907cab 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-10-10 13:57+0300\n"
+"POT-Creation-Date: 2015-10-10 15:04+0300\n"
 "PO-Revision-Date: 2015-09-27 08:24+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Finnish (http://www.transifex.com/akaras/manaplus/language/"
@@ -7047,29 +7047,26 @@ msgstr "Valitse pelimaailma"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
-#. TRANSLATORS: long key name. must be short.
-#. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
 #: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
-#: src/input/inputmanager.cpp-orig:378 src/input/inputmanager.cpp-orig:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp-orig:384
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398 src/input/inputmanager.cpp-orig:398
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428 src/input/inputmanager.cpp-orig:428
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7077,8 +7074,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:442 src/input/inputmanager.cpp-orig:442
-#: src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 8750ea6b2..5026df148 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-10-10 13:57+0300\n"
+"POT-Creation-Date: 2015-10-10 15:04+0300\n"
 "PO-Revision-Date: 2015-09-27 08:24+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.com/akaras/manaplus/language/"
@@ -7105,29 +7105,26 @@ msgstr "Choix du monde"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
-#. TRANSLATORS: long key name. must be short.
-#. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
 #: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
-#: src/input/inputmanager.cpp-orig:378 src/input/inputmanager.cpp-orig:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr "touche_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp-orig:384
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr "JBoutton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398 src/input/inputmanager.cpp-orig:398
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr "touche inconnue"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428 src/input/inputmanager.cpp-orig:428
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7135,8 +7132,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:442 src/input/inputmanager.cpp-orig:442
-#: src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr "touche u"
 
diff --git a/po/id.po b/po/id.po
index bdb259c20..67d8ce436 100644
--- a/po/id.po
+++ b/po/id.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-10-10 13:57+0300\n"
+"POT-Creation-Date: 2015-10-10 15:04+0300\n"
 "PO-Revision-Date: 2015-09-27 08:24+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.com/akaras/manaplus/language/"
@@ -7046,29 +7046,26 @@ msgstr ""
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
-#. TRANSLATORS: long key name. must be short.
-#. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
 #: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
-#: src/input/inputmanager.cpp-orig:378 src/input/inputmanager.cpp-orig:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp-orig:384
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398 src/input/inputmanager.cpp-orig:398
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428 src/input/inputmanager.cpp-orig:428
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7076,8 +7073,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:442 src/input/inputmanager.cpp-orig:442
-#: src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 40c049aad..a21984a05 100644
--- a/po/it.po
+++ b/po/it.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-10-10 13:57+0300\n"
+"POT-Creation-Date: 2015-10-10 15:04+0300\n"
 "PO-Revision-Date: 2015-09-27 08:24+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.com/akaras/manaplus/language/"
@@ -7069,29 +7069,26 @@ msgstr "Scegli parola"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
-#. TRANSLATORS: long key name. must be short.
-#. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
 #: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
-#: src/input/inputmanager.cpp-orig:378 src/input/inputmanager.cpp-orig:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp-orig:384
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398 src/input/inputmanager.cpp-orig:398
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr "pulsante sconosciuto"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428 src/input/inputmanager.cpp-orig:428
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7099,8 +7096,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:442 src/input/inputmanager.cpp-orig:442
-#: src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index a4bd207dd..c7d6845e6 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-10-10 13:57+0300\n"
+"POT-Creation-Date: 2015-10-10 15:04+0300\n"
 "PO-Revision-Date: 2015-09-27 08:24+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/language/"
@@ -7052,29 +7052,26 @@ msgstr "世界の選択"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
-#. TRANSLATORS: long key name. must be short.
-#. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
 #: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
-#: src/input/inputmanager.cpp-orig:378 src/input/inputmanager.cpp-orig:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr "キー_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp-orig:384
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr "ジョイスティックボタン%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398 src/input/inputmanager.cpp-orig:398
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr "不明なキー"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428 src/input/inputmanager.cpp-orig:428
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7082,8 +7079,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:442 src/input/inputmanager.cpp-orig:442
-#: src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr "u キー"
 
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 0baded02e..f5a4d29f6 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-10-10 13:57+0300\n"
+"POT-Creation-Date: 2015-10-10 15:04+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -7041,29 +7041,26 @@ msgstr ""
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
-#. TRANSLATORS: long key name. must be short.
-#. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
 #: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
-#: src/input/inputmanager.cpp-orig:378 src/input/inputmanager.cpp-orig:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp-orig:384
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398 src/input/inputmanager.cpp-orig:398
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428 src/input/inputmanager.cpp-orig:428
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7071,8 +7068,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:442 src/input/inputmanager.cpp-orig:442
-#: src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index fc5856662..7b28414cc 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-10-10 13:57+0300\n"
+"POT-Creation-Date: 2015-10-10 15:04+0300\n"
 "PO-Revision-Date: 2015-09-27 08:24+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
@@ -7055,29 +7055,26 @@ msgstr "Kies Wereld"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
-#. TRANSLATORS: long key name. must be short.
-#. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
 #: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
-#: src/input/inputmanager.cpp-orig:378 src/input/inputmanager.cpp-orig:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp-orig:384
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398 src/input/inputmanager.cpp-orig:398
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428 src/input/inputmanager.cpp-orig:428
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7085,8 +7082,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:442 src/input/inputmanager.cpp-orig:442
-#: src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr "u key"
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index fc5856662..7b28414cc 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-10-10 13:57+0300\n"
+"POT-Creation-Date: 2015-10-10 15:04+0300\n"
 "PO-Revision-Date: 2015-09-27 08:24+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
@@ -7055,29 +7055,26 @@ msgstr "Kies Wereld"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
-#. TRANSLATORS: long key name. must be short.
-#. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
 #: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
-#: src/input/inputmanager.cpp-orig:378 src/input/inputmanager.cpp-orig:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp-orig:384
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398 src/input/inputmanager.cpp-orig:398
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428 src/input/inputmanager.cpp-orig:428
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7085,8 +7082,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:442 src/input/inputmanager.cpp-orig:442
-#: src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr "u key"
 
diff --git a/po/pl.po b/po/pl.po
index eed20f207..c2ae7bcc0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-10-10 13:57+0300\n"
+"POT-Creation-Date: 2015-10-10 15:04+0300\n"
 "PO-Revision-Date: 2015-09-27 08:24+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.com/akaras/manaplus/language/"
@@ -7073,29 +7073,26 @@ msgstr "Wybierz świat"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
-#. TRANSLATORS: long key name. must be short.
-#. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
 #: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
-#: src/input/inputmanager.cpp-orig:378 src/input/inputmanager.cpp-orig:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr "key_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp-orig:384
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398 src/input/inputmanager.cpp-orig:398
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr "nieznany klawisz"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428 src/input/inputmanager.cpp-orig:428
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7103,8 +7100,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:442 src/input/inputmanager.cpp-orig:442
-#: src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr "(nieznany)"
 
diff --git a/po/pt.po b/po/pt.po
index 826494d65..fd38ae4ae 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-10-10 13:57+0300\n"
+"POT-Creation-Date: 2015-10-10 15:04+0300\n"
 "PO-Revision-Date: 2015-09-27 08:24+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.com/akaras/manaplus/language/"
@@ -7066,29 +7066,26 @@ msgstr "Escolher Mundo"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
-#. TRANSLATORS: long key name. must be short.
-#. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
 #: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
-#: src/input/inputmanager.cpp-orig:378 src/input/inputmanager.cpp-orig:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp-orig:384
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr "JBotão%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398 src/input/inputmanager.cpp-orig:398
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr "Tecla desconhecida"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428 src/input/inputmanager.cpp-orig:428
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7096,8 +7093,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:442 src/input/inputmanager.cpp-orig:442
-#: src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr "Tecla u"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f319eed7d..e597f7c84 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-10-10 13:57+0300\n"
+"POT-Creation-Date: 2015-10-10 15:04+0300\n"
 "PO-Revision-Date: 2015-09-27 08:24+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/akaras/manaplus/"
@@ -7082,29 +7082,26 @@ msgstr "Escolher Mundo"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
-#. TRANSLATORS: long key name. must be short.
-#. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
 #: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
-#: src/input/inputmanager.cpp-orig:378 src/input/inputmanager.cpp-orig:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp-orig:384
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr "BotãoJ%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398 src/input/inputmanager.cpp-orig:398
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr "Tecla desconhecida"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428 src/input/inputmanager.cpp-orig:428
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7112,8 +7109,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:442 src/input/inputmanager.cpp-orig:442
-#: src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr "tecla u"
 
diff --git a/po/ru.po b/po/ru.po
index 970b954dd..2cee7ded2 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-10-10 13:57+0300\n"
+"POT-Creation-Date: 2015-10-10 15:04+0300\n"
 "PO-Revision-Date: 2015-09-27 08:24+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/"
@@ -7088,29 +7088,26 @@ msgstr "Выберите сервер"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
-#. TRANSLATORS: long key name. must be short.
-#. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
 #: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
-#: src/input/inputmanager.cpp-orig:378 src/input/inputmanager.cpp-orig:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr "кнопка_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp-orig:384
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr "КнопДж%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398 src/input/inputmanager.cpp-orig:398
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr "неизвестная кнопка"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428 src/input/inputmanager.cpp-orig:428
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr "ДЖ%d"
@@ -7118,8 +7115,7 @@ msgstr "ДЖ%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:442 src/input/inputmanager.cpp-orig:442
-#: src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr "неиз."
 
diff --git a/po/sr.po b/po/sr.po
index 6f3d4560f..58795076f 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-10-10 13:57+0300\n"
+"POT-Creation-Date: 2015-10-10 15:04+0300\n"
 "PO-Revision-Date: 2015-09-27 08:24+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Serbian (http://www.transifex.com/akaras/manaplus/language/"
@@ -7049,29 +7049,26 @@ msgstr ""
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
-#. TRANSLATORS: long key name. must be short.
-#. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
 #: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
-#: src/input/inputmanager.cpp-orig:378 src/input/inputmanager.cpp-orig:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp-orig:384
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398 src/input/inputmanager.cpp-orig:398
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428 src/input/inputmanager.cpp-orig:428
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7079,8 +7076,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:442 src/input/inputmanager.cpp-orig:442
-#: src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 901099675..22afd6d91 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-10-10 13:57+0300\n"
+"POT-Creation-Date: 2015-10-10 15:04+0300\n"
 "PO-Revision-Date: 2015-09-27 08:24+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
@@ -7061,29 +7061,26 @@ msgstr "Välj värld"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
-#. TRANSLATORS: long key name. must be short.
-#. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
 #: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
-#: src/input/inputmanager.cpp-orig:378 src/input/inputmanager.cpp-orig:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr "key_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp-orig:384
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398 src/input/inputmanager.cpp-orig:398
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr "okänd eller borttappad tangent"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428 src/input/inputmanager.cpp-orig:428
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7091,8 +7088,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:442 src/input/inputmanager.cpp-orig:442
-#: src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr "u-tangenten"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 901099675..22afd6d91 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-10-10 13:57+0300\n"
+"POT-Creation-Date: 2015-10-10 15:04+0300\n"
 "PO-Revision-Date: 2015-09-27 08:24+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
@@ -7061,29 +7061,26 @@ msgstr "Välj värld"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
-#. TRANSLATORS: long key name. must be short.
-#. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
 #: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
-#: src/input/inputmanager.cpp-orig:378 src/input/inputmanager.cpp-orig:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr "key_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp-orig:384
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398 src/input/inputmanager.cpp-orig:398
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr "okänd eller borttappad tangent"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428 src/input/inputmanager.cpp-orig:428
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7091,8 +7088,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:442 src/input/inputmanager.cpp-orig:442
-#: src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr "u-tangenten"
 
diff --git a/po/tr.po b/po/tr.po
index 21c70ddf7..18a5be8bd 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-10-10 13:57+0300\n"
+"POT-Creation-Date: 2015-10-10 15:04+0300\n"
 "PO-Revision-Date: 2015-09-27 08:24+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Turkish (http://www.transifex.com/akaras/manaplus/language/"
@@ -7053,29 +7053,26 @@ msgstr "Dünya Seç"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
-#. TRANSLATORS: long key name. must be short.
-#. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
 #: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
-#: src/input/inputmanager.cpp-orig:378 src/input/inputmanager.cpp-orig:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp-orig:384
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398 src/input/inputmanager.cpp-orig:398
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428 src/input/inputmanager.cpp-orig:428
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7083,8 +7080,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:442 src/input/inputmanager.cpp-orig:442
-#: src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
index f30b38af0..4c1d94e1d 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-10-10 13:57+0300\n"
+"POT-Creation-Date: 2015-10-10 15:04+0300\n"
 "PO-Revision-Date: 2015-09-27 08:24+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/akaras/manaplus/language/"
@@ -7066,29 +7066,26 @@ msgstr "Оберіть світ"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
-#. TRANSLATORS: long key name. must be short.
-#. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
 #: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
-#: src/input/inputmanager.cpp-orig:378 src/input/inputmanager.cpp-orig:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr "клавіша_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp-orig:384
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr "КлавішаДж%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398 src/input/inputmanager.cpp-orig:398
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr "невідома клавіша"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428 src/input/inputmanager.cpp-orig:428
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr "ДЖ%d"
@@ -7096,8 +7093,7 @@ msgstr "ДЖ%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:442 src/input/inputmanager.cpp-orig:442
-#: src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr "невід."
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ff1f713bb..1dc9cc6aa 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-10-10 13:57+0300\n"
+"POT-Creation-Date: 2015-10-10 15:04+0300\n"
 "PO-Revision-Date: 2015-09-27 08:24+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
@@ -7046,29 +7046,26 @@ msgstr "选择世界"
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
-#. TRANSLATORS: long key name. must be short.
-#. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
 #: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
-#: src/input/inputmanager.cpp-orig:378 src/input/inputmanager.cpp-orig:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp-orig:384
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398 src/input/inputmanager.cpp-orig:398
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428 src/input/inputmanager.cpp-orig:428
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7076,8 +7073,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:442 src/input/inputmanager.cpp-orig:442
-#: src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 03a2321b0..90a21a2bc 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-10-10 13:57+0300\n"
+"POT-Creation-Date: 2015-10-10 15:04+0300\n"
 "PO-Revision-Date: 2015-09-27 08:24+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/akaras/manaplus/"
@@ -7040,29 +7040,26 @@ msgstr ""
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
-#. TRANSLATORS: long key name. must be short.
-#. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
 #: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
-#: src/input/inputmanager.cpp-orig:378 src/input/inputmanager.cpp-orig:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp-orig:384
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398 src/input/inputmanager.cpp-orig:398
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428 src/input/inputmanager.cpp-orig:428
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7070,8 +7067,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:442 src/input/inputmanager.cpp-orig:442
-#: src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""