From e07b5670f2454866c2ffeea783bbbc7a1946c498 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Wed, 6 Feb 2019 20:18:36 +0100
Subject: I18N: Update translations templates

---
 po/be_BY.po      | 77 +++++++++++++++++++++++++++++++-------------------------
 po/ca_ES.po      | 77 +++++++++++++++++++++++++++++++-------------------------
 po/cs_CZ.po      | 77 +++++++++++++++++++++++++++++++-------------------------
 po/da.po         | 77 +++++++++++++++++++++++++++++++-------------------------
 po/de_DE.po      | 77 +++++++++++++++++++++++++++++++-------------------------
 po/el.po         | 77 +++++++++++++++++++++++++++++++-------------------------
 po/es_ES.po      | 77 +++++++++++++++++++++++++++++++-------------------------
 po/eu.po         | 77 +++++++++++++++++++++++++++++++-------------------------
 po/fi_FI.po      | 77 +++++++++++++++++++++++++++++++-------------------------
 po/fr_FR.po      | 77 +++++++++++++++++++++++++++++++-------------------------
 po/gl_ES.po      | 77 +++++++++++++++++++++++++++++++-------------------------
 po/he.po         | 77 +++++++++++++++++++++++++++++++-------------------------
 po/hu_HU.po      | 77 +++++++++++++++++++++++++++++++-------------------------
 po/it_IT.po      | 77 +++++++++++++++++++++++++++++++-------------------------
 po/nb_NO.po      | 77 +++++++++++++++++++++++++++++++-------------------------
 po/nl_NL.po      | 77 +++++++++++++++++++++++++++++++-------------------------
 po/nn_NO.po      | 77 +++++++++++++++++++++++++++++++-------------------------
 po/pl_PL.po      | 77 +++++++++++++++++++++++++++++++-------------------------
 po/pt_BR.po      | 77 +++++++++++++++++++++++++++++++-------------------------
 po/pt_PT.po      | 77 +++++++++++++++++++++++++++++++-------------------------
 po/ru_RU.po      | 77 +++++++++++++++++++++++++++++++-------------------------
 po/scummvm.pot   | 77 +++++++++++++++++++++++++++++++-------------------------
 po/sv_SE.po      | 77 +++++++++++++++++++++++++++++++-------------------------
 po/uk_UA.po      | 77 +++++++++++++++++++++++++++++++-------------------------
 po/zh-Latn_CN.po | 77 +++++++++++++++++++++++++++++++-------------------------
 25 files changed, 1075 insertions(+), 850 deletions(-)

(limited to 'po')

diff --git a/po/be_BY.po b/po/be_BY.po
index 9bb2a8db3c..83b5b39517 100644
--- a/po/be_BY.po
+++ b/po/be_BY.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.8.0git\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2018-12-19 07:31+0100\n"
+"POT-Creation-Date: 2019-02-06 20:18+0100\n"
 "PO-Revision-Date: 2018-08-06 21:35+0000\n"
 "Last-Translator: Fiodar <fedor_qd@mail.ru>\n"
 "Language-Team: Belarusian <https://translations.scummvm.org/projects/scummvm/"
@@ -687,7 +687,7 @@ msgstr "
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
 #: engines/mohawk/dialogs.cpp:162 engines/mohawk/myst.cpp:942
-#: engines/mohawk/riven.cpp:662 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/riven.cpp:673 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "·ÐÓàã×öæì ÓãÛìÝî:"
@@ -696,7 +696,7 @@ msgstr "
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
 #: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:162
-#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:662
+#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:673
 #: engines/parallaction/saveload.cpp:194 engines/pegasus/pegasus.cpp:355
 #: engines/scumm/dialogs.cpp:185 engines/tsage/scenes.cpp:601
 #: engines/wage/saveload.cpp:748
@@ -1910,10 +1910,10 @@ msgstr "
 #: engines/cge2/events.cpp:64 engines/cine/various.cpp:348
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
-#: engines/glk/streams.cpp:1485 engines/gnap/menu.cpp:464
+#: engines/glk/streams.cpp:1481 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
 #: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:954
-#: engines/mohawk/riven.cpp:674 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/riven.cpp:685 engines/neverhood/menumodule.cpp:880
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:675
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/startrek/saveload.cpp:42
@@ -1932,10 +1932,10 @@ msgstr "
 #: engines/cge/events.cpp:72 engines/cge2/events.cpp:64
 #: engines/cine/various.cpp:348 engines/cruise/menu.cpp:212
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
-#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1485
+#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1481
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
 #: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:163
-#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:674
+#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:685
 #: engines/neverhood/menumodule.cpp:880 engines/parallaction/saveload.cpp:209
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:676
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -2965,7 +2965,7 @@ msgstr "
 #: engines/access/resources.cpp:44 engines/drascula/drascula.cpp:966
 #: engines/hugo/hugo.cpp:437 engines/lure/lure.cpp:64
 #: engines/mortevielle/mortevielle.cpp:306 engines/sky/compact.cpp:131
-#: engines/supernova/supernova.cpp:175 engines/teenagent/resources.cpp:97
+#: engines/supernova/supernova.cpp:178 engines/teenagent/resources.cpp:97
 #: engines/tony/tony.cpp:198 engines/toon/toon.cpp:4926
 #, c-format
 msgid "Unable to locate the '%s' engine data file."
@@ -2973,7 +2973,7 @@ msgstr "
 
 #: engines/access/resources.cpp:52 engines/drascula/drascula.cpp:980
 #: engines/hugo/hugo.cpp:448 engines/lure/lure.cpp:73
-#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:184
+#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:187
 #: engines/tony/tony.cpp:210 engines/toon/toon.cpp:4938
 #, c-format
 msgid "The '%s' engine data file is corrupt."
@@ -3072,7 +3072,7 @@ msgstr ""
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3088,7 +3088,7 @@ msgstr "
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3386,24 +3386,24 @@ msgstr ""
 msgid "It's beyond my power to do that.\n"
 msgstr ""
 
-#: engines/glk/frotz/detection.cpp:154
+#: engines/glk/frotz/detection.cpp:166
 #, fuzzy
 msgid "Unnamed savegame"
 msgstr "·ÐåÐÒÐÝÐï ÓãÛìÝï ÑÕ× öÜï"
 
-#: engines/glk/glulxe/glulxe.cpp:55
+#: engines/glk/glulxe/glulxe.cpp:53
 msgid "This is too short to be a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:60
+#: engines/glk/glulxe/glulxe.cpp:58
 msgid "This is not a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:67
+#: engines/glk/glulxe/glulxe.cpp:65
 msgid "This Glulx file is too old a version to execute."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:71
+#: engines/glk/glulxe/glulxe.cpp:69
 msgid "This Glulx file is too new a version to execute."
 msgstr ""
 
@@ -3499,69 +3499,78 @@ msgstr "
 msgid "Enable hit point bar graphs"
 msgstr "ÃÚÛîçëæì ÐÔÛîáâàÐÒÐÝÝÕ ßÐÛÞáÐÚ ×ÔÐàÞþï"
 
-#: engines/kyra/eobcommon.cpp:342 engines/kyra/lol.cpp:481
+#. I18N: L/R stands for Left/Right
+#: engines/kyra/detection.cpp:138
+msgid "Fight Button L/R Swap"
+msgstr ""
+
+#: engines/kyra/detection.cpp:139
+msgid "Left button to attack, right button to pick up items"
+msgstr ""
+
+#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr "¦áæö ÝÐßÕàÐÔ"
 
-#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:482
+#: engines/kyra/eobcommon.cpp:344 engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr "¦áæö ÝÐ×ÐÔ"
 
-#: engines/kyra/eobcommon.cpp:344
+#: engines/kyra/eobcommon.cpp:345
 msgid "Move Left"
 msgstr "¦áæö ÝÐÛÕÒÐ"
 
-#: engines/kyra/eobcommon.cpp:345
+#: engines/kyra/eobcommon.cpp:346
 msgid "Move Right"
 msgstr "¦áæö ÝÐßàÐÒÐ"
 
-#: engines/kyra/eobcommon.cpp:346 engines/kyra/lol.cpp:485
+#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:485
 #: engines/pegasus/pegasus.cpp:2514
 msgid "Turn Left"
 msgstr "¿ÐÒÐàÞâ ÝÐÛÕÒÐ"
 
-#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:486
+#: engines/kyra/eobcommon.cpp:348 engines/kyra/lol.cpp:486
 #: engines/pegasus/pegasus.cpp:2515
 msgid "Turn Right"
 msgstr "¿ÐÒÐàÞâ ÝÐßàÐÒÐ"
 
-#: engines/kyra/eobcommon.cpp:348
+#: engines/kyra/eobcommon.cpp:349
 msgid "Open/Close Inventory"
 msgstr "°ÔÚàëæì/·ÐÚàëæì öÝÒÕÝâÐà"
 
-#: engines/kyra/eobcommon.cpp:349
+#: engines/kyra/eobcommon.cpp:350
 msgid "Switch Inventory/Character screen"
 msgstr "¿ÕàÐÚÛîçëæì íÚàÐÝ ¦ÝÒÕÝâÐà/³ÕàÞÙ"
 
-#: engines/kyra/eobcommon.cpp:350
+#: engines/kyra/eobcommon.cpp:351
 msgid "Camp"
 msgstr "»ÐÓÕà"
 
-#: engines/kyra/eobcommon.cpp:351
+#: engines/kyra/eobcommon.cpp:352
 msgid "Cast Spell"
 msgstr "ÃÖëæì ×ÐÓÐÒÞà"
 
-#: engines/kyra/eobcommon.cpp:354
+#: engines/kyra/eobcommon.cpp:355
 msgid "Spell Level 1"
 msgstr "·ÐÓÐÒÞà 1-ÓÐ þ×àÞþÝî"
 
-#: engines/kyra/eobcommon.cpp:355
+#: engines/kyra/eobcommon.cpp:356
 msgid "Spell Level 2"
 msgstr "·ÐÓÐÒÞà 2-ÓÐ þ×àÞþÝî"
 
-#: engines/kyra/eobcommon.cpp:356
+#: engines/kyra/eobcommon.cpp:357
 msgid "Spell Level 3"
 msgstr "·ÐÓÐÒÞà 3-ÓÐ þ×àÞþÝî"
 
-#: engines/kyra/eobcommon.cpp:357
+#: engines/kyra/eobcommon.cpp:358
 msgid "Spell Level 4"
 msgstr "·ÐÓÐÒÞà 4-ÓÐ þ×àÞþÝî"
 
-#: engines/kyra/eobcommon.cpp:358
+#: engines/kyra/eobcommon.cpp:359
 msgid "Spell Level 5"
 msgstr "·ÐÓÐÒÞà 5-ÓÐ þ×àÞþÝî"
 
-#: engines/kyra/eobcommon.cpp:367
+#: engines/kyra/eobcommon.cpp:368
 msgid "Spell Level 6"
 msgstr "·ÐÓÐÒÞà 6-ÓÐ þ×àÞþÝî"
 
@@ -4938,13 +4947,13 @@ msgstr "
 msgid "Use the floppy version's intro (CD version only)"
 msgstr "²ëÚÐàëáâÞþÒÐæì ãáâãß × ÓÝãâÚöå ÔëáÚÐþ (âÞÛìÚö ÔÛï CD-ÒÕàáöö ÓãÛìÝö)"
 
-#: engines/supernova/supernova.cpp:191
+#: engines/supernova/supernova.cpp:194
 #, c-format
 msgid ""
 "Incorrect version of the '%s' engine data file found. Expected %d but got %d."
 msgstr "½ïáÛãèÝÐï ÒÕàáöï äÐÙÛÐ ÔÐÔ×ÕÝëå %s. ÇÐÚÐÛÐáï %d, ÐÛÕ ×ÝÞÙÔ×ÕÝÐ %d."
 
-#: engines/supernova/supernova.cpp:217
+#: engines/supernova/supernova.cpp:220
 #, c-format
 msgid "Unable to locate the text for %s language in '%s' engine data file."
 msgstr "½Õ ÐâàëÜÐÛÐáï ×ÝÐÙáæö âíÚáâ ÔÛï %s ÜÞÒë þ %s äÐÙÛÕ ÔÐÔ×ÕÝëå."
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 5183a5f124..efae5bad24 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.6.0git\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2018-12-19 07:31+0100\n"
+"POT-Creation-Date: 2019-02-06 20:18+0100\n"
 "PO-Revision-Date: 2018-08-06 21:31+0000\n"
 "Last-Translator: Pere Orga <gotrunks@gmail.com>\n"
 "Language-Team: Catalan <https://translations.scummvm.org/projects/scummvm/"
@@ -690,7 +690,7 @@ msgstr "Cerca:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
 #: engines/mohawk/dialogs.cpp:162 engines/mohawk/myst.cpp:942
-#: engines/mohawk/riven.cpp:662 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/riven.cpp:673 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Carrega partida:"
@@ -699,7 +699,7 @@ msgstr "Carrega partida:"
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
 #: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:162
-#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:662
+#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:673
 #: engines/parallaction/saveload.cpp:194 engines/pegasus/pegasus.cpp:355
 #: engines/scumm/dialogs.cpp:185 engines/tsage/scenes.cpp:601
 #: engines/wage/saveload.cpp:748
@@ -1907,10 +1907,10 @@ msgstr "~R~etorna al Llan
 #: engines/cge2/events.cpp:64 engines/cine/various.cpp:348
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
-#: engines/glk/streams.cpp:1485 engines/gnap/menu.cpp:464
+#: engines/glk/streams.cpp:1481 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
 #: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:954
-#: engines/mohawk/riven.cpp:674 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/riven.cpp:685 engines/neverhood/menumodule.cpp:880
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:675
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/startrek/saveload.cpp:42
@@ -1929,10 +1929,10 @@ msgstr "Desa la partida:"
 #: engines/cge/events.cpp:72 engines/cge2/events.cpp:64
 #: engines/cine/various.cpp:348 engines/cruise/menu.cpp:212
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
-#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1485
+#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1481
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
 #: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:163
-#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:674
+#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:685
 #: engines/neverhood/menumodule.cpp:880 engines/parallaction/saveload.cpp:209
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:676
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -2950,7 +2950,7 @@ msgstr "Comprova les actualitzacions..."
 #: engines/access/resources.cpp:44 engines/drascula/drascula.cpp:966
 #: engines/hugo/hugo.cpp:437 engines/lure/lure.cpp:64
 #: engines/mortevielle/mortevielle.cpp:306 engines/sky/compact.cpp:131
-#: engines/supernova/supernova.cpp:175 engines/teenagent/resources.cpp:97
+#: engines/supernova/supernova.cpp:178 engines/teenagent/resources.cpp:97
 #: engines/tony/tony.cpp:198 engines/toon/toon.cpp:4926
 #, c-format
 msgid "Unable to locate the '%s' engine data file."
@@ -2958,7 +2958,7 @@ msgstr ""
 
 #: engines/access/resources.cpp:52 engines/drascula/drascula.cpp:980
 #: engines/hugo/hugo.cpp:448 engines/lure/lure.cpp:73
-#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:184
+#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:187
 #: engines/tony/tony.cpp:210 engines/toon/toon.cpp:4938
 #, c-format
 msgid "The '%s' engine data file is corrupt."
@@ -3052,7 +3052,7 @@ msgstr ""
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3068,7 +3068,7 @@ msgstr "Recupera la partida:"
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3369,24 +3369,24 @@ msgstr ""
 msgid "It's beyond my power to do that.\n"
 msgstr ""
 
-#: engines/glk/frotz/detection.cpp:154
+#: engines/glk/frotz/detection.cpp:166
 #, fuzzy
 msgid "Unnamed savegame"
 msgstr "Partida sense nom"
 
-#: engines/glk/glulxe/glulxe.cpp:55
+#: engines/glk/glulxe/glulxe.cpp:53
 msgid "This is too short to be a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:60
+#: engines/glk/glulxe/glulxe.cpp:58
 msgid "This is not a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:67
+#: engines/glk/glulxe/glulxe.cpp:65
 msgid "This Glulx file is too old a version to execute."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:71
+#: engines/glk/glulxe/glulxe.cpp:69
 msgid "This Glulx file is too new a version to execute."
 msgstr ""
 
@@ -3484,73 +3484,82 @@ msgstr "Barra gr
 msgid "Enable hit point bar graphs"
 msgstr "Activa la barra gràfica dels punts d'impacte"
 
-#: engines/kyra/eobcommon.cpp:342 engines/kyra/lol.cpp:481
+#. I18N: L/R stands for Left/Right
+#: engines/kyra/detection.cpp:138
+msgid "Fight Button L/R Swap"
+msgstr ""
+
+#: engines/kyra/detection.cpp:139
+msgid "Left button to attack, right button to pick up items"
+msgstr ""
+
+#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr "Mou endavant"
 
-#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:482
+#: engines/kyra/eobcommon.cpp:344 engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr "Mou enrere"
 
-#: engines/kyra/eobcommon.cpp:344
+#: engines/kyra/eobcommon.cpp:345
 #, fuzzy
 msgid "Move Left"
 msgstr "Mou a l'esquerra"
 
-#: engines/kyra/eobcommon.cpp:345
+#: engines/kyra/eobcommon.cpp:346
 #, fuzzy
 msgid "Move Right"
 msgstr "Mou a la dreta"
 
-#: engines/kyra/eobcommon.cpp:346 engines/kyra/lol.cpp:485
+#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:485
 #: engines/pegasus/pegasus.cpp:2514
 msgid "Turn Left"
 msgstr "Gira a l'esquerra"
 
-#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:486
+#: engines/kyra/eobcommon.cpp:348 engines/kyra/lol.cpp:486
 #: engines/pegasus/pegasus.cpp:2515
 msgid "Turn Right"
 msgstr "Gira a la dreta"
 
-#: engines/kyra/eobcommon.cpp:348
+#: engines/kyra/eobcommon.cpp:349
 #, fuzzy
 msgid "Open/Close Inventory"
 msgstr "Inventari"
 
-#: engines/kyra/eobcommon.cpp:349
+#: engines/kyra/eobcommon.cpp:350
 msgid "Switch Inventory/Character screen"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:350
+#: engines/kyra/eobcommon.cpp:351
 msgid "Camp"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:351
+#: engines/kyra/eobcommon.cpp:352
 #, fuzzy
 msgid "Cast Spell"
 msgstr "Escull l'encanteri"
 
-#: engines/kyra/eobcommon.cpp:354
+#: engines/kyra/eobcommon.cpp:355
 msgid "Spell Level 1"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:355
+#: engines/kyra/eobcommon.cpp:356
 msgid "Spell Level 2"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:356
+#: engines/kyra/eobcommon.cpp:357
 msgid "Spell Level 3"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:357
+#: engines/kyra/eobcommon.cpp:358
 msgid "Spell Level 4"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:358
+#: engines/kyra/eobcommon.cpp:359
 msgid "Spell Level 5"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:367
+#: engines/kyra/eobcommon.cpp:368
 msgid "Spell Level 6"
 msgstr ""
 
@@ -4883,13 +4892,13 @@ msgid "Use the floppy version's intro (CD version only)"
 msgstr ""
 "Utilitza la introducció de la versió de disquets (només per a la versió CD)"
 
-#: engines/supernova/supernova.cpp:191
+#: engines/supernova/supernova.cpp:194
 #, c-format
 msgid ""
 "Incorrect version of the '%s' engine data file found. Expected %d but got %d."
 msgstr ""
 
-#: engines/supernova/supernova.cpp:217
+#: engines/supernova/supernova.cpp:220
 #, c-format
 msgid "Unable to locate the text for %s language in '%s' engine data file."
 msgstr ""
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 8460252a24..3c03f81e64 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.7.0git\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2018-12-19 07:31+0100\n"
+"POT-Creation-Date: 2019-02-06 20:18+0100\n"
 "PO-Revision-Date: 2018-04-18 10:09+0000\n"
 "Last-Translator: Adrian Frühwirth <bonki@scummvm.org>\n"
 "Language-Team: Czech <https://translations.scummvm.org/projects/scummvm/"
@@ -689,7 +689,7 @@ msgstr "Hledat:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
 #: engines/mohawk/dialogs.cpp:162 engines/mohawk/myst.cpp:942
-#: engines/mohawk/riven.cpp:662 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/riven.cpp:673 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Nahrát hru:"
@@ -698,7 +698,7 @@ msgstr "Nahr
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
 #: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:162
-#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:662
+#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:673
 #: engines/parallaction/saveload.cpp:194 engines/pegasus/pegasus.cpp:355
 #: engines/scumm/dialogs.cpp:185 engines/tsage/scenes.cpp:601
 #: engines/wage/saveload.cpp:748
@@ -1913,10 +1913,10 @@ msgstr "~N~
 #: engines/cge2/events.cpp:64 engines/cine/various.cpp:348
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
-#: engines/glk/streams.cpp:1485 engines/gnap/menu.cpp:464
+#: engines/glk/streams.cpp:1481 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
 #: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:954
-#: engines/mohawk/riven.cpp:674 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/riven.cpp:685 engines/neverhood/menumodule.cpp:880
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:675
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/startrek/saveload.cpp:42
@@ -1935,10 +1935,10 @@ msgstr "Ulo
 #: engines/cge/events.cpp:72 engines/cge2/events.cpp:64
 #: engines/cine/various.cpp:348 engines/cruise/menu.cpp:212
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
-#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1485
+#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1481
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
 #: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:163
-#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:674
+#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:685
 #: engines/neverhood/menumodule.cpp:880 engines/parallaction/saveload.cpp:209
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:676
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -2969,7 +2969,7 @@ msgstr "Zkontrolovat Aktualizace..."
 #: engines/access/resources.cpp:44 engines/drascula/drascula.cpp:966
 #: engines/hugo/hugo.cpp:437 engines/lure/lure.cpp:64
 #: engines/mortevielle/mortevielle.cpp:306 engines/sky/compact.cpp:131
-#: engines/supernova/supernova.cpp:175 engines/teenagent/resources.cpp:97
+#: engines/supernova/supernova.cpp:178 engines/teenagent/resources.cpp:97
 #: engines/tony/tony.cpp:198 engines/toon/toon.cpp:4926
 #, c-format
 msgid "Unable to locate the '%s' engine data file."
@@ -2977,7 +2977,7 @@ msgstr "Nelze naj
 
 #: engines/access/resources.cpp:52 engines/drascula/drascula.cpp:980
 #: engines/hugo/hugo.cpp:448 engines/lure/lure.cpp:73
-#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:184
+#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:187
 #: engines/tony/tony.cpp:210 engines/toon/toon.cpp:4938
 #, c-format
 msgid "The '%s' engine data file is corrupt."
@@ -3073,7 +3073,7 @@ msgstr ""
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3089,7 +3089,7 @@ msgstr "Obnovit hru:"
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3388,24 +3388,24 @@ msgstr ""
 msgid "It's beyond my power to do that.\n"
 msgstr ""
 
-#: engines/glk/frotz/detection.cpp:154
+#: engines/glk/frotz/detection.cpp:166
 #, fuzzy
 msgid "Unnamed savegame"
 msgstr "Bezejmenná ulo¾ená hra"
 
-#: engines/glk/glulxe/glulxe.cpp:55
+#: engines/glk/glulxe/glulxe.cpp:53
 msgid "This is too short to be a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:60
+#: engines/glk/glulxe/glulxe.cpp:58
 msgid "This is not a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:67
+#: engines/glk/glulxe/glulxe.cpp:65
 msgid "This Glulx file is too old a version to execute."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:71
+#: engines/glk/glulxe/glulxe.cpp:69
 msgid "This Glulx file is too new a version to execute."
 msgstr ""
 
@@ -3501,69 +3501,78 @@ msgstr "Sloupcov
 msgid "Enable hit point bar graphs"
 msgstr "Povolit sloupcový indikátor zdraví"
 
-#: engines/kyra/eobcommon.cpp:342 engines/kyra/lol.cpp:481
+#. I18N: L/R stands for Left/Right
+#: engines/kyra/detection.cpp:138
+msgid "Fight Button L/R Swap"
+msgstr ""
+
+#: engines/kyra/detection.cpp:139
+msgid "Left button to attack, right button to pick up items"
+msgstr ""
+
+#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr "Vpøed"
 
-#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:482
+#: engines/kyra/eobcommon.cpp:344 engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr "Vzad"
 
-#: engines/kyra/eobcommon.cpp:344
+#: engines/kyra/eobcommon.cpp:345
 msgid "Move Left"
 msgstr "Pøesunout se doleva"
 
-#: engines/kyra/eobcommon.cpp:345
+#: engines/kyra/eobcommon.cpp:346
 msgid "Move Right"
 msgstr "Pøesunout se doprava"
 
-#: engines/kyra/eobcommon.cpp:346 engines/kyra/lol.cpp:485
+#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:485
 #: engines/pegasus/pegasus.cpp:2514
 msgid "Turn Left"
 msgstr "Otoèit se doleva"
 
-#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:486
+#: engines/kyra/eobcommon.cpp:348 engines/kyra/lol.cpp:486
 #: engines/pegasus/pegasus.cpp:2515
 msgid "Turn Right"
 msgstr "Otoèit se doprava"
 
-#: engines/kyra/eobcommon.cpp:348
+#: engines/kyra/eobcommon.cpp:349
 msgid "Open/Close Inventory"
 msgstr "Otevøít/Zavøít Inventáø"
 
-#: engines/kyra/eobcommon.cpp:349
+#: engines/kyra/eobcommon.cpp:350
 msgid "Switch Inventory/Character screen"
 msgstr "Zamìnit obrazovku Postavy/Inventáøe"
 
-#: engines/kyra/eobcommon.cpp:350
+#: engines/kyra/eobcommon.cpp:351
 msgid "Camp"
 msgstr "Táboøit"
 
-#: engines/kyra/eobcommon.cpp:351
+#: engines/kyra/eobcommon.cpp:352
 msgid "Cast Spell"
 msgstr "Seslat kouzlo"
 
-#: engines/kyra/eobcommon.cpp:354
+#: engines/kyra/eobcommon.cpp:355
 msgid "Spell Level 1"
 msgstr "Kouzlo úrovnì 1"
 
-#: engines/kyra/eobcommon.cpp:355
+#: engines/kyra/eobcommon.cpp:356
 msgid "Spell Level 2"
 msgstr "Kouzlo úrovnì 2"
 
-#: engines/kyra/eobcommon.cpp:356
+#: engines/kyra/eobcommon.cpp:357
 msgid "Spell Level 3"
 msgstr "Kouzlo úrovnì 3"
 
-#: engines/kyra/eobcommon.cpp:357
+#: engines/kyra/eobcommon.cpp:358
 msgid "Spell Level 4"
 msgstr "Kouzlo úrovnì 4"
 
-#: engines/kyra/eobcommon.cpp:358
+#: engines/kyra/eobcommon.cpp:359
 msgid "Spell Level 5"
 msgstr "Kouzlo úrovnì 5"
 
-#: engines/kyra/eobcommon.cpp:367
+#: engines/kyra/eobcommon.cpp:368
 msgid "Spell Level 6"
 msgstr "Kouzlo úrovnì 6"
 
@@ -4931,14 +4940,14 @@ msgstr "
 msgid "Use the floppy version's intro (CD version only)"
 msgstr "Pou¾ít verzi úvodu z diskety (Pouze verze CD)"
 
-#: engines/supernova/supernova.cpp:191
+#: engines/supernova/supernova.cpp:194
 #, fuzzy, c-format
 msgid ""
 "Incorrect version of the '%s' engine data file found. Expected %d but got %d."
 msgstr ""
 "Nalezena data jádra '%s' s nesprávnou verzí. Oèekávána %d.%d, ale byla %d.%d."
 
-#: engines/supernova/supernova.cpp:217
+#: engines/supernova/supernova.cpp:220
 #, fuzzy, c-format
 msgid "Unable to locate the text for %s language in '%s' engine data file."
 msgstr "Nelze najít datové soubory jádra '%s'."
diff --git a/po/da.po b/po/da.po
index f11bcb52c7..b4c02c4644 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.3.0svn\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2018-12-19 07:31+0100\n"
+"POT-Creation-Date: 2019-02-06 20:18+0100\n"
 "PO-Revision-Date: 2018-12-22 09:14+0000\n"
 "Last-Translator: scootergrisen <scootergrisen@gmail.com>\n"
 "Language-Team: Danish <https://translations.scummvm.org/projects/scummvm/"
@@ -688,7 +688,7 @@ msgstr "S
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
 #: engines/mohawk/dialogs.cpp:162 engines/mohawk/myst.cpp:942
-#: engines/mohawk/riven.cpp:662 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/riven.cpp:673 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Indlæs spil:"
@@ -697,7 +697,7 @@ msgstr "Indl
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
 #: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:162
-#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:662
+#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:673
 #: engines/parallaction/saveload.cpp:194 engines/pegasus/pegasus.cpp:355
 #: engines/scumm/dialogs.cpp:185 engines/tsage/scenes.cpp:601
 #: engines/wage/saveload.cpp:748
@@ -1894,10 +1894,10 @@ msgstr "~R~etur til oversigt"
 #: engines/cge2/events.cpp:64 engines/cine/various.cpp:348
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
-#: engines/glk/streams.cpp:1485 engines/gnap/menu.cpp:464
+#: engines/glk/streams.cpp:1481 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
 #: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:954
-#: engines/mohawk/riven.cpp:674 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/riven.cpp:685 engines/neverhood/menumodule.cpp:880
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:675
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/startrek/saveload.cpp:42
@@ -1916,10 +1916,10 @@ msgstr "Gemt spil:"
 #: engines/cge/events.cpp:72 engines/cge2/events.cpp:64
 #: engines/cine/various.cpp:348 engines/cruise/menu.cpp:212
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
-#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1485
+#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1481
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
 #: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:163
-#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:674
+#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:685
 #: engines/neverhood/menumodule.cpp:880 engines/parallaction/saveload.cpp:209
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:676
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -2936,7 +2936,7 @@ msgstr "S
 #: engines/access/resources.cpp:44 engines/drascula/drascula.cpp:966
 #: engines/hugo/hugo.cpp:437 engines/lure/lure.cpp:64
 #: engines/mortevielle/mortevielle.cpp:306 engines/sky/compact.cpp:131
-#: engines/supernova/supernova.cpp:175 engines/teenagent/resources.cpp:97
+#: engines/supernova/supernova.cpp:178 engines/teenagent/resources.cpp:97
 #: engines/tony/tony.cpp:198 engines/toon/toon.cpp:4926
 #, c-format
 msgid "Unable to locate the '%s' engine data file."
@@ -2944,7 +2944,7 @@ msgstr "Kan ikke finde '%s'-motorens datafil."
 
 #: engines/access/resources.cpp:52 engines/drascula/drascula.cpp:980
 #: engines/hugo/hugo.cpp:448 engines/lure/lure.cpp:73
-#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:184
+#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:187
 #: engines/tony/tony.cpp:210 engines/toon/toon.cpp:4938
 #, c-format
 msgid "The '%s' engine data file is corrupt."
@@ -3041,7 +3041,7 @@ msgstr ""
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3057,7 +3057,7 @@ msgstr "Gendan spil:"
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3356,23 +3356,23 @@ msgstr "Det er ikke i din magt at g
 msgid "It's beyond my power to do that.\n"
 msgstr "Det er ikke i min magt at gøre det.\n"
 
-#: engines/glk/frotz/detection.cpp:154
+#: engines/glk/frotz/detection.cpp:166
 msgid "Unnamed savegame"
 msgstr "Unavngivet savegame"
 
-#: engines/glk/glulxe/glulxe.cpp:55
+#: engines/glk/glulxe/glulxe.cpp:53
 msgid "This is too short to be a valid Glulx file."
 msgstr "Det er for kort til at være en gyldig Glulx-fil."
 
-#: engines/glk/glulxe/glulxe.cpp:60
+#: engines/glk/glulxe/glulxe.cpp:58
 msgid "This is not a valid Glulx file."
 msgstr "Det er ikke en gyldig Glulx-fil."
 
-#: engines/glk/glulxe/glulxe.cpp:67
+#: engines/glk/glulxe/glulxe.cpp:65
 msgid "This Glulx file is too old a version to execute."
 msgstr "Glulx-filen er for gammel en version til at blive udført."
 
-#: engines/glk/glulxe/glulxe.cpp:71
+#: engines/glk/glulxe/glulxe.cpp:69
 msgid "This Glulx file is too new a version to execute."
 msgstr "Glulx-filen er for ny en version til at blive udført."
 
@@ -3468,69 +3468,78 @@ msgstr "HP s
 msgid "Enable hit point bar graphs"
 msgstr "Aktivér træfpoint (HP) søjlediagrammer"
 
-#: engines/kyra/eobcommon.cpp:342 engines/kyra/lol.cpp:481
+#. I18N: L/R stands for Left/Right
+#: engines/kyra/detection.cpp:138
+msgid "Fight Button L/R Swap"
+msgstr ""
+
+#: engines/kyra/detection.cpp:139
+msgid "Left button to attack, right button to pick up items"
+msgstr ""
+
+#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr "Flyt fremad"
 
-#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:482
+#: engines/kyra/eobcommon.cpp:344 engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr "Flyt bagud"
 
-#: engines/kyra/eobcommon.cpp:344
+#: engines/kyra/eobcommon.cpp:345
 msgid "Move Left"
 msgstr "Flyt til venstre"
 
-#: engines/kyra/eobcommon.cpp:345
+#: engines/kyra/eobcommon.cpp:346
 msgid "Move Right"
 msgstr "Flyt til højre"
 
-#: engines/kyra/eobcommon.cpp:346 engines/kyra/lol.cpp:485
+#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:485
 #: engines/pegasus/pegasus.cpp:2514
 msgid "Turn Left"
 msgstr "Drej til venstre"
 
-#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:486
+#: engines/kyra/eobcommon.cpp:348 engines/kyra/lol.cpp:486
 #: engines/pegasus/pegasus.cpp:2515
 msgid "Turn Right"
 msgstr "Drej til højre"
 
-#: engines/kyra/eobcommon.cpp:348
+#: engines/kyra/eobcommon.cpp:349
 msgid "Open/Close Inventory"
 msgstr "Åbn/luk inventar"
 
-#: engines/kyra/eobcommon.cpp:349
+#: engines/kyra/eobcommon.cpp:350
 msgid "Switch Inventory/Character screen"
 msgstr "Skift inventar-/karakterskærm"
 
-#: engines/kyra/eobcommon.cpp:350
+#: engines/kyra/eobcommon.cpp:351
 msgid "Camp"
 msgstr "Hvil"
 
-#: engines/kyra/eobcommon.cpp:351
+#: engines/kyra/eobcommon.cpp:352
 msgid "Cast Spell"
 msgstr "Brug Magi"
 
-#: engines/kyra/eobcommon.cpp:354
+#: engines/kyra/eobcommon.cpp:355
 msgid "Spell Level 1"
 msgstr "Maginiveau 1"
 
-#: engines/kyra/eobcommon.cpp:355
+#: engines/kyra/eobcommon.cpp:356
 msgid "Spell Level 2"
 msgstr "Maginiveau 2"
 
-#: engines/kyra/eobcommon.cpp:356
+#: engines/kyra/eobcommon.cpp:357
 msgid "Spell Level 3"
 msgstr "Maginiveau 3"
 
-#: engines/kyra/eobcommon.cpp:357
+#: engines/kyra/eobcommon.cpp:358
 msgid "Spell Level 4"
 msgstr "Maginiveau 4"
 
-#: engines/kyra/eobcommon.cpp:358
+#: engines/kyra/eobcommon.cpp:359
 msgid "Spell Level 5"
 msgstr "Maginiveau 5"
 
-#: engines/kyra/eobcommon.cpp:367
+#: engines/kyra/eobcommon.cpp:368
 msgid "Spell Level 6"
 msgstr "Maginiveau 6"
 
@@ -4909,14 +4918,14 @@ msgstr "Diskette intro"
 msgid "Use the floppy version's intro (CD version only)"
 msgstr "Brug diskette versionens intro (kun CD-version)"
 
-#: engines/supernova/supernova.cpp:191
+#: engines/supernova/supernova.cpp:194
 #, c-format
 msgid ""
 "Incorrect version of the '%s' engine data file found. Expected %d but got %d."
 msgstr ""
 "Ukorrekt version af '%s'-motorens datafil fundet. Forventet %d, men fandt %d."
 
-#: engines/supernova/supernova.cpp:217
+#: engines/supernova/supernova.cpp:220
 #, c-format
 msgid "Unable to locate the text for %s language in '%s' engine data file."
 msgstr "Kan ikke finde teksten til %s sproget i '%s'-motorens datafil."
diff --git a/po/de_DE.po b/po/de_DE.po
index fffa6b4941..0895c3af68 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.10.0git\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2018-12-19 07:31+0100\n"
+"POT-Creation-Date: 2019-02-06 20:18+0100\n"
 "PO-Revision-Date: 2019-01-29 12:03+0000\n"
 "Last-Translator: Lothar Serra Mari <serra@scummvm.org>\n"
 "Language-Team: German <https://translations.scummvm.org/projects/scummvm/"
@@ -695,7 +695,7 @@ msgstr "Suchen:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
 #: engines/mohawk/dialogs.cpp:162 engines/mohawk/myst.cpp:942
-#: engines/mohawk/riven.cpp:662 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/riven.cpp:673 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Spiel laden:"
@@ -704,7 +704,7 @@ msgstr "Spiel laden:"
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
 #: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:162
-#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:662
+#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:673
 #: engines/parallaction/saveload.cpp:194 engines/pegasus/pegasus.cpp:355
 #: engines/scumm/dialogs.cpp:185 engines/tsage/scenes.cpp:601
 #: engines/wage/saveload.cpp:748
@@ -1922,10 +1922,10 @@ msgstr "Zur Spiele~l~iste"
 #: engines/cge2/events.cpp:64 engines/cine/various.cpp:348
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
-#: engines/glk/streams.cpp:1485 engines/gnap/menu.cpp:464
+#: engines/glk/streams.cpp:1481 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
 #: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:954
-#: engines/mohawk/riven.cpp:674 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/riven.cpp:685 engines/neverhood/menumodule.cpp:880
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:675
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/startrek/saveload.cpp:42
@@ -1944,10 +1944,10 @@ msgstr "Speichern:"
 #: engines/cge/events.cpp:72 engines/cge2/events.cpp:64
 #: engines/cine/various.cpp:348 engines/cruise/menu.cpp:212
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
-#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1485
+#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1481
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
 #: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:163
-#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:674
+#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:685
 #: engines/neverhood/menumodule.cpp:880 engines/parallaction/saveload.cpp:209
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:676
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -2970,7 +2970,7 @@ msgstr "Suche nach Aktualisierungen..."
 #: engines/access/resources.cpp:44 engines/drascula/drascula.cpp:966
 #: engines/hugo/hugo.cpp:437 engines/lure/lure.cpp:64
 #: engines/mortevielle/mortevielle.cpp:306 engines/sky/compact.cpp:131
-#: engines/supernova/supernova.cpp:175 engines/teenagent/resources.cpp:97
+#: engines/supernova/supernova.cpp:178 engines/teenagent/resources.cpp:97
 #: engines/tony/tony.cpp:198 engines/toon/toon.cpp:4926
 #, c-format
 msgid "Unable to locate the '%s' engine data file."
@@ -2978,7 +2978,7 @@ msgstr "Engine-Datendatei '%s' kann nicht gefunden werden."
 
 #: engines/access/resources.cpp:52 engines/drascula/drascula.cpp:980
 #: engines/hugo/hugo.cpp:448 engines/lure/lure.cpp:73
-#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:184
+#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:187
 #: engines/tony/tony.cpp:210 engines/toon/toon.cpp:4938
 #, c-format
 msgid "The '%s' engine data file is corrupt."
@@ -3078,7 +3078,7 @@ msgstr ""
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3094,7 +3094,7 @@ msgstr "Spiel laden:"
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3393,23 +3393,23 @@ msgstr "Es 
 msgid "It's beyond my power to do that.\n"
 msgstr "Es übersteigt meine Kraft, dies zu tun.\n"
 
-#: engines/glk/frotz/detection.cpp:154
+#: engines/glk/frotz/detection.cpp:166
 msgid "Unnamed savegame"
 msgstr "Unbenannter Spielstand"
 
-#: engines/glk/glulxe/glulxe.cpp:55
+#: engines/glk/glulxe/glulxe.cpp:53
 msgid "This is too short to be a valid Glulx file."
 msgstr "Das ist zu kurz, um eine gültige Glulx-Datei zu sein."
 
-#: engines/glk/glulxe/glulxe.cpp:60
+#: engines/glk/glulxe/glulxe.cpp:58
 msgid "This is not a valid Glulx file."
 msgstr "Dies ist keine gültige Glulx-Datei."
 
-#: engines/glk/glulxe/glulxe.cpp:67
+#: engines/glk/glulxe/glulxe.cpp:65
 msgid "This Glulx file is too old a version to execute."
 msgstr "Die Version dieser Glulx-Datei ist zu alt, um sie ausführen zu können."
 
-#: engines/glk/glulxe/glulxe.cpp:71
+#: engines/glk/glulxe/glulxe.cpp:69
 msgid "This Glulx file is too new a version to execute."
 msgstr "Diese Glulx-Datei ist zu neu, um Sie ausführen zu können."
 
@@ -3505,69 +3505,78 @@ msgstr "Trefferpunkte-Balken"
 msgid "Enable hit point bar graphs"
 msgstr "Aktiviert grafische Trefferpunkte-Balken"
 
-#: engines/kyra/eobcommon.cpp:342 engines/kyra/lol.cpp:481
+#. I18N: L/R stands for Left/Right
+#: engines/kyra/detection.cpp:138
+msgid "Fight Button L/R Swap"
+msgstr ""
+
+#: engines/kyra/detection.cpp:139
+msgid "Left button to attack, right button to pick up items"
+msgstr ""
+
+#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr "Nach vorn bewegen"
 
-#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:482
+#: engines/kyra/eobcommon.cpp:344 engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr "Nach hinten bewegen"
 
-#: engines/kyra/eobcommon.cpp:344
+#: engines/kyra/eobcommon.cpp:345
 msgid "Move Left"
 msgstr "Nach links gehen"
 
-#: engines/kyra/eobcommon.cpp:345
+#: engines/kyra/eobcommon.cpp:346
 msgid "Move Right"
 msgstr "Nach rechts gehen"
 
-#: engines/kyra/eobcommon.cpp:346 engines/kyra/lol.cpp:485
+#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:485
 #: engines/pegasus/pegasus.cpp:2514
 msgid "Turn Left"
 msgstr "Nach links drehen"
 
-#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:486
+#: engines/kyra/eobcommon.cpp:348 engines/kyra/lol.cpp:486
 #: engines/pegasus/pegasus.cpp:2515
 msgid "Turn Right"
 msgstr "Nach rechts drehen"
 
-#: engines/kyra/eobcommon.cpp:348
+#: engines/kyra/eobcommon.cpp:349
 msgid "Open/Close Inventory"
 msgstr "Inventar öffnen/schließen"
 
-#: engines/kyra/eobcommon.cpp:349
+#: engines/kyra/eobcommon.cpp:350
 msgid "Switch Inventory/Character screen"
 msgstr "Zwischen Inventar/Figurenbildschirm wechseln"
 
-#: engines/kyra/eobcommon.cpp:350
+#: engines/kyra/eobcommon.cpp:351
 msgid "Camp"
 msgstr "Camp"
 
-#: engines/kyra/eobcommon.cpp:351
+#: engines/kyra/eobcommon.cpp:352
 msgid "Cast Spell"
 msgstr "Zauber anwenden"
 
-#: engines/kyra/eobcommon.cpp:354
+#: engines/kyra/eobcommon.cpp:355
 msgid "Spell Level 1"
 msgstr "Zauberspruch Stufe 1"
 
-#: engines/kyra/eobcommon.cpp:355
+#: engines/kyra/eobcommon.cpp:356
 msgid "Spell Level 2"
 msgstr "Zauberspruch Stufe 2"
 
-#: engines/kyra/eobcommon.cpp:356
+#: engines/kyra/eobcommon.cpp:357
 msgid "Spell Level 3"
 msgstr "Zauberspruch Stufe 3"
 
-#: engines/kyra/eobcommon.cpp:357
+#: engines/kyra/eobcommon.cpp:358
 msgid "Spell Level 4"
 msgstr "Zauberspruch Stufe 4"
 
-#: engines/kyra/eobcommon.cpp:358
+#: engines/kyra/eobcommon.cpp:359
 msgid "Spell Level 5"
 msgstr "Zauberspruch Stufe 5"
 
-#: engines/kyra/eobcommon.cpp:367
+#: engines/kyra/eobcommon.cpp:368
 msgid "Spell Level 6"
 msgstr "Zauberspruch Stufe 6"
 
@@ -4966,7 +4975,7 @@ msgstr "Vorspann der Diskettenversion"
 msgid "Use the floppy version's intro (CD version only)"
 msgstr "Verwendet den Vorspann der Diskettenversion (nur bei CD-Version)"
 
-#: engines/supernova/supernova.cpp:191
+#: engines/supernova/supernova.cpp:194
 #, c-format
 msgid ""
 "Incorrect version of the '%s' engine data file found. Expected %d but got %d."
@@ -4974,7 +4983,7 @@ msgstr ""
 "Falsche Version der Engine-Datendatei '%s' gefunden. %d erwartet, aber %d "
 "bekommen."
 
-#: engines/supernova/supernova.cpp:217
+#: engines/supernova/supernova.cpp:220
 #, c-format
 msgid "Unable to locate the text for %s language in '%s' engine data file."
 msgstr ""
diff --git a/po/el.po b/po/el.po
index 06cba0fa10..4cd2cec993 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.10.0git\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2018-12-19 07:31+0100\n"
+"POT-Creation-Date: 2019-02-06 20:18+0100\n"
 "PO-Revision-Date: 2019-01-09 20:57+0000\n"
 "Last-Translator: Antoniou Athanasios <a.antoniou79@gmail.com>\n"
 "Language-Team: Greek <https://translations.scummvm.org/projects/scummvm/"
@@ -696,7 +696,7 @@ msgstr "
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
 #: engines/mohawk/dialogs.cpp:162 engines/mohawk/myst.cpp:942
-#: engines/mohawk/riven.cpp:662 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/riven.cpp:673 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Öüñôùóç ðáé÷íéäéïý:"
@@ -705,7 +705,7 @@ msgstr "
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
 #: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:162
-#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:662
+#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:673
 #: engines/parallaction/saveload.cpp:194 engines/pegasus/pegasus.cpp:355
 #: engines/scumm/dialogs.cpp:185 engines/tsage/scenes.cpp:601
 #: engines/wage/saveload.cpp:748
@@ -1930,10 +1930,10 @@ msgstr "
 #: engines/cge2/events.cpp:64 engines/cine/various.cpp:348
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
-#: engines/glk/streams.cpp:1485 engines/gnap/menu.cpp:464
+#: engines/glk/streams.cpp:1481 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
 #: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:954
-#: engines/mohawk/riven.cpp:674 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/riven.cpp:685 engines/neverhood/menumodule.cpp:880
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:675
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/startrek/saveload.cpp:42
@@ -1952,10 +1952,10 @@ msgstr "
 #: engines/cge/events.cpp:72 engines/cge2/events.cpp:64
 #: engines/cine/various.cpp:348 engines/cruise/menu.cpp:212
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
-#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1485
+#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1481
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
 #: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:163
-#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:674
+#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:685
 #: engines/neverhood/menumodule.cpp:880 engines/parallaction/saveload.cpp:209
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:676
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -2979,7 +2979,7 @@ msgstr "
 #: engines/access/resources.cpp:44 engines/drascula/drascula.cpp:966
 #: engines/hugo/hugo.cpp:437 engines/lure/lure.cpp:64
 #: engines/mortevielle/mortevielle.cpp:306 engines/sky/compact.cpp:131
-#: engines/supernova/supernova.cpp:175 engines/teenagent/resources.cpp:97
+#: engines/supernova/supernova.cpp:178 engines/teenagent/resources.cpp:97
 #: engines/tony/tony.cpp:198 engines/toon/toon.cpp:4926
 #, c-format
 msgid "Unable to locate the '%s' engine data file."
@@ -2987,7 +2987,7 @@ msgstr "
 
 #: engines/access/resources.cpp:52 engines/drascula/drascula.cpp:980
 #: engines/hugo/hugo.cpp:448 engines/lure/lure.cpp:73
-#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:184
+#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:187
 #: engines/tony/tony.cpp:210 engines/toon/toon.cpp:4938
 #, c-format
 msgid "The '%s' engine data file is corrupt."
@@ -3087,7 +3087,7 @@ msgstr ""
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3103,7 +3103,7 @@ msgstr "
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3402,23 +3402,23 @@ msgstr "
 msgid "It's beyond my power to do that.\n"
 msgstr "Åßíáé ðÝñá áðü ôç äýíáìÞ ìïõ íá ôï êÜíù áõôü.\n"
 
-#: engines/glk/frotz/detection.cpp:154
+#: engines/glk/frotz/detection.cpp:166
 msgid "Unnamed savegame"
 msgstr "ÁðïèçêåõìÝíï ðáé÷íßäé ÷ùñßò üíïìá"
 
-#: engines/glk/glulxe/glulxe.cpp:55
+#: engines/glk/glulxe/glulxe.cpp:53
 msgid "This is too short to be a valid Glulx file."
 msgstr "Áõôü åßíáé ðïëý óýíôïìï ãéá íá åßíáé Ýãêõñï áñ÷åßï Glulx."
 
-#: engines/glk/glulxe/glulxe.cpp:60
+#: engines/glk/glulxe/glulxe.cpp:58
 msgid "This is not a valid Glulx file."
 msgstr "Áõôü äåí åßíáé Ýíá Ýãêõñï áñ÷åßï Glulx."
 
-#: engines/glk/glulxe/glulxe.cpp:67
+#: engines/glk/glulxe/glulxe.cpp:65
 msgid "This Glulx file is too old a version to execute."
 msgstr "ÁõôÞ ç Ýêäïóç áñ÷åßïõ Glulx åßíáé ðïëý ðáëéÜ ãéá íá åêôåëåóôåß."
 
-#: engines/glk/glulxe/glulxe.cpp:71
+#: engines/glk/glulxe/glulxe.cpp:69
 msgid "This Glulx file is too new a version to execute."
 msgstr "ÁõôÞ ç Ýêäïóç áñ÷åßïõ Glulx åßíáé ðïëý íÝá ãéá íá åêôåëåóôåß."
 
@@ -3514,69 +3514,78 @@ msgstr "
 msgid "Enable hit point bar graphs"
 msgstr "Åíåñãïðïßçóç ñáâäïãñáììÜôùí ãéá hit points"
 
-#: engines/kyra/eobcommon.cpp:342 engines/kyra/lol.cpp:481
+#. I18N: L/R stands for Left/Right
+#: engines/kyra/detection.cpp:138
+msgid "Fight Button L/R Swap"
+msgstr ""
+
+#: engines/kyra/detection.cpp:139
+msgid "Left button to attack, right button to pick up items"
+msgstr ""
+
+#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr "Ðñï÷þñçóå ÌðñïóôÜ"
 
-#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:482
+#: engines/kyra/eobcommon.cpp:344 engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr "Ðñï÷þñçóå Ðßóù"
 
-#: engines/kyra/eobcommon.cpp:344
+#: engines/kyra/eobcommon.cpp:345
 msgid "Move Left"
 msgstr "Ðñï÷þñçóå ÁñéóôåñÜ"
 
-#: engines/kyra/eobcommon.cpp:345
+#: engines/kyra/eobcommon.cpp:346
 msgid "Move Right"
 msgstr "Ðñï÷þñçóå ÄåîéÜ"
 
-#: engines/kyra/eobcommon.cpp:346 engines/kyra/lol.cpp:485
+#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:485
 #: engines/pegasus/pegasus.cpp:2514
 msgid "Turn Left"
 msgstr "Óôñßøå ÁñéóôåñÜ"
 
-#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:486
+#: engines/kyra/eobcommon.cpp:348 engines/kyra/lol.cpp:486
 #: engines/pegasus/pegasus.cpp:2515
 msgid "Turn Right"
 msgstr "Óôñßøå ÄåîéÜ"
 
-#: engines/kyra/eobcommon.cpp:348
+#: engines/kyra/eobcommon.cpp:349
 msgid "Open/Close Inventory"
 msgstr "¶íïéãìá/Êëåßóéìï ÁíôéêåéìÝíùí"
 
-#: engines/kyra/eobcommon.cpp:349
+#: engines/kyra/eobcommon.cpp:350
 msgid "Switch Inventory/Character screen"
 msgstr "ÅíáëëáãÞ ïèüíçò ÁíôéêåéìÝíùí/×áñáêôÞñùí"
 
-#: engines/kyra/eobcommon.cpp:350
+#: engines/kyra/eobcommon.cpp:351
 msgid "Camp"
 msgstr "ÊáôáóêÞíùóå"
 
-#: engines/kyra/eobcommon.cpp:351
+#: engines/kyra/eobcommon.cpp:352
 msgid "Cast Spell"
 msgstr "ÊÜíå Îüñêé"
 
-#: engines/kyra/eobcommon.cpp:354
+#: engines/kyra/eobcommon.cpp:355
 msgid "Spell Level 1"
 msgstr "Îüñêé ÅðéðÝäïõ 1"
 
-#: engines/kyra/eobcommon.cpp:355
+#: engines/kyra/eobcommon.cpp:356
 msgid "Spell Level 2"
 msgstr "Îüñêé ÅðéðÝäïõ 2"
 
-#: engines/kyra/eobcommon.cpp:356
+#: engines/kyra/eobcommon.cpp:357
 msgid "Spell Level 3"
 msgstr "Îüñêé ÅðéðÝäïõ 3"
 
-#: engines/kyra/eobcommon.cpp:357
+#: engines/kyra/eobcommon.cpp:358
 msgid "Spell Level 4"
 msgstr "Îüñêé ÅðéðÝäïõ 4"
 
-#: engines/kyra/eobcommon.cpp:358
+#: engines/kyra/eobcommon.cpp:359
 msgid "Spell Level 5"
 msgstr "Îüñêé ÅðéðÝäïõ 5"
 
-#: engines/kyra/eobcommon.cpp:367
+#: engines/kyra/eobcommon.cpp:368
 msgid "Spell Level 6"
 msgstr "Îüñêé ÅðéðÝäïõ 6"
 
@@ -4984,7 +4993,7 @@ msgstr "
 msgid "Use the floppy version's intro (CD version only)"
 msgstr "×ñÞóç ôçò åéóáãùãÞò áðü ôçí Ýêäïóç äéóêÝôáò (Ýêäïóç CD ìüíï)"
 
-#: engines/supernova/supernova.cpp:191
+#: engines/supernova/supernova.cpp:194
 #, c-format
 msgid ""
 "Incorrect version of the '%s' engine data file found. Expected %d but got %d."
@@ -4992,7 +5001,7 @@ msgstr ""
 "ÂñÝèçêå ëáíèáóìÝíç Ýêäïóç ôïõ '%s' áñ÷åßïõ ìç÷áíÞò ðáé÷íéäéïý. Áíáìåíüìåíç ç "
 "%d áëëÜ âñÝèçêå ç %d."
 
-#: engines/supernova/supernova.cpp:217
+#: engines/supernova/supernova.cpp:220
 #, c-format
 msgid "Unable to locate the text for %s language in '%s' engine data file."
 msgstr ""
diff --git a/po/es_ES.po b/po/es_ES.po
index 5c80bc7099..8bf88117e4 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.4.0svn\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2018-12-19 07:31+0100\n"
+"POT-Creation-Date: 2019-02-06 20:18+0100\n"
 "PO-Revision-Date: 2018-11-16 05:19+0000\n"
 "Last-Translator: Thunderforge <wjherrmann@gmail.com>\n"
 "Language-Team: Spanish <https://translations.scummvm.org/projects/scummvm/"
@@ -689,7 +689,7 @@ msgstr "Buscar:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
 #: engines/mohawk/dialogs.cpp:162 engines/mohawk/myst.cpp:942
-#: engines/mohawk/riven.cpp:662 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/riven.cpp:673 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Cargar juego:"
@@ -698,7 +698,7 @@ msgstr "Cargar juego:"
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
 #: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:162
-#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:662
+#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:673
 #: engines/parallaction/saveload.cpp:194 engines/pegasus/pegasus.cpp:355
 #: engines/scumm/dialogs.cpp:185 engines/tsage/scenes.cpp:601
 #: engines/wage/saveload.cpp:748
@@ -1912,10 +1912,10 @@ msgstr "~V~olver al lanzador"
 #: engines/cge2/events.cpp:64 engines/cine/various.cpp:348
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
-#: engines/glk/streams.cpp:1485 engines/gnap/menu.cpp:464
+#: engines/glk/streams.cpp:1481 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
 #: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:954
-#: engines/mohawk/riven.cpp:674 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/riven.cpp:685 engines/neverhood/menumodule.cpp:880
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:675
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/startrek/saveload.cpp:42
@@ -1934,10 +1934,10 @@ msgstr "Guardar partida:"
 #: engines/cge/events.cpp:72 engines/cge2/events.cpp:64
 #: engines/cine/various.cpp:348 engines/cruise/menu.cpp:212
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
-#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1485
+#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1481
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
 #: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:163
-#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:674
+#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:685
 #: engines/neverhood/menumodule.cpp:880 engines/parallaction/saveload.cpp:209
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:676
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -2967,7 +2967,7 @@ msgstr "Buscar actualizaciones..."
 #: engines/access/resources.cpp:44 engines/drascula/drascula.cpp:966
 #: engines/hugo/hugo.cpp:437 engines/lure/lure.cpp:64
 #: engines/mortevielle/mortevielle.cpp:306 engines/sky/compact.cpp:131
-#: engines/supernova/supernova.cpp:175 engines/teenagent/resources.cpp:97
+#: engines/supernova/supernova.cpp:178 engines/teenagent/resources.cpp:97
 #: engines/tony/tony.cpp:198 engines/toon/toon.cpp:4926
 #, c-format
 msgid "Unable to locate the '%s' engine data file."
@@ -2975,7 +2975,7 @@ msgstr "No se puede localizar el archivo de datos del motor '%s'."
 
 #: engines/access/resources.cpp:52 engines/drascula/drascula.cpp:980
 #: engines/hugo/hugo.cpp:448 engines/lure/lure.cpp:73
-#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:184
+#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:187
 #: engines/tony/tony.cpp:210 engines/toon/toon.cpp:4938
 #, c-format
 msgid "The '%s' engine data file is corrupt."
@@ -3072,7 +3072,7 @@ msgstr ""
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3088,7 +3088,7 @@ msgstr "Cargar partida:"
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3386,24 +3386,24 @@ msgstr ""
 msgid "It's beyond my power to do that.\n"
 msgstr ""
 
-#: engines/glk/frotz/detection.cpp:154
+#: engines/glk/frotz/detection.cpp:166
 #, fuzzy
 msgid "Unnamed savegame"
 msgstr "Partida sin nombre"
 
-#: engines/glk/glulxe/glulxe.cpp:55
+#: engines/glk/glulxe/glulxe.cpp:53
 msgid "This is too short to be a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:60
+#: engines/glk/glulxe/glulxe.cpp:58
 msgid "This is not a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:67
+#: engines/glk/glulxe/glulxe.cpp:65
 msgid "This Glulx file is too old a version to execute."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:71
+#: engines/glk/glulxe/glulxe.cpp:69
 msgid "This Glulx file is too new a version to execute."
 msgstr ""
 
@@ -3499,69 +3499,78 @@ msgstr "Barras de energ
 msgid "Enable hit point bar graphs"
 msgstr "Activar las barras de energía"
 
-#: engines/kyra/eobcommon.cpp:342 engines/kyra/lol.cpp:481
+#. I18N: L/R stands for Left/Right
+#: engines/kyra/detection.cpp:138
+msgid "Fight Button L/R Swap"
+msgstr ""
+
+#: engines/kyra/detection.cpp:139
+msgid "Left button to attack, right button to pick up items"
+msgstr ""
+
+#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr "Avanzar"
 
-#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:482
+#: engines/kyra/eobcommon.cpp:344 engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr "Retroceder"
 
-#: engines/kyra/eobcommon.cpp:344
+#: engines/kyra/eobcommon.cpp:345
 msgid "Move Left"
 msgstr "Mover a la izquierda"
 
-#: engines/kyra/eobcommon.cpp:345
+#: engines/kyra/eobcommon.cpp:346
 msgid "Move Right"
 msgstr "Mover a la derecha"
 
-#: engines/kyra/eobcommon.cpp:346 engines/kyra/lol.cpp:485
+#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:485
 #: engines/pegasus/pegasus.cpp:2514
 msgid "Turn Left"
 msgstr "Girar a la izquierda"
 
-#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:486
+#: engines/kyra/eobcommon.cpp:348 engines/kyra/lol.cpp:486
 #: engines/pegasus/pegasus.cpp:2515
 msgid "Turn Right"
 msgstr "Girar a la derecha"
 
-#: engines/kyra/eobcommon.cpp:348
+#: engines/kyra/eobcommon.cpp:349
 msgid "Open/Close Inventory"
 msgstr "Abrir/Cerrar Inventario"
 
-#: engines/kyra/eobcommon.cpp:349
+#: engines/kyra/eobcommon.cpp:350
 msgid "Switch Inventory/Character screen"
 msgstr "Cambiar pantalla de Inventario/Personaje"
 
-#: engines/kyra/eobcommon.cpp:350
+#: engines/kyra/eobcommon.cpp:351
 msgid "Camp"
 msgstr "Acampar"
 
-#: engines/kyra/eobcommon.cpp:351
+#: engines/kyra/eobcommon.cpp:352
 msgid "Cast Spell"
 msgstr "Invocar hechizo"
 
-#: engines/kyra/eobcommon.cpp:354
+#: engines/kyra/eobcommon.cpp:355
 msgid "Spell Level 1"
 msgstr "Nivel de Hechizo 1"
 
-#: engines/kyra/eobcommon.cpp:355
+#: engines/kyra/eobcommon.cpp:356
 msgid "Spell Level 2"
 msgstr "Nivel de Hechizo 2"
 
-#: engines/kyra/eobcommon.cpp:356
+#: engines/kyra/eobcommon.cpp:357
 msgid "Spell Level 3"
 msgstr "Nivel de Hechizo 3"
 
-#: engines/kyra/eobcommon.cpp:357
+#: engines/kyra/eobcommon.cpp:358
 msgid "Spell Level 4"
 msgstr "Nivel de Hechizo 4"
 
-#: engines/kyra/eobcommon.cpp:358
+#: engines/kyra/eobcommon.cpp:359
 msgid "Spell Level 5"
 msgstr "Nivel de Hechizo 5"
 
-#: engines/kyra/eobcommon.cpp:367
+#: engines/kyra/eobcommon.cpp:368
 msgid "Spell Level 6"
 msgstr "Nivel de Hechizo 6"
 
@@ -4943,7 +4952,7 @@ msgid "Use the floppy version's intro (CD version only)"
 msgstr ""
 "Usa la introducción de la versión en disquete (solo para la versión CD)"
 
-#: engines/supernova/supernova.cpp:191
+#: engines/supernova/supernova.cpp:194
 #, fuzzy, c-format
 msgid ""
 "Incorrect version of the '%s' engine data file found. Expected %d but got %d."
@@ -4951,7 +4960,7 @@ msgstr ""
 "Se ha encontrado una versión incorrecta del archivo de datos del motor '%s'. "
 "Se esperaba %d.%d pero se encontró %d.%d."
 
-#: engines/supernova/supernova.cpp:217
+#: engines/supernova/supernova.cpp:220
 #, fuzzy, c-format
 msgid "Unable to locate the text for %s language in '%s' engine data file."
 msgstr "No se puede localizar el archivo de datos del motor '%s'."
diff --git a/po/eu.po b/po/eu.po
index 19305b8b72..1a2966d002 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.5.0git\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2018-12-19 07:31+0100\n"
+"POT-Creation-Date: 2019-02-06 20:18+0100\n"
 "PO-Revision-Date: 2018-08-06 21:35+0000\n"
 "Last-Translator: Erik Zubiria <zubiriaerik@hotmail.com>\n"
 "Language-Team: Basque <https://translations.scummvm.org/projects/scummvm/"
@@ -678,7 +678,7 @@ msgstr "Bilatu:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
 #: engines/mohawk/dialogs.cpp:162 engines/mohawk/myst.cpp:942
-#: engines/mohawk/riven.cpp:662 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/riven.cpp:673 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Jokoa kargatu:"
@@ -687,7 +687,7 @@ msgstr "Jokoa kargatu:"
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
 #: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:162
-#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:662
+#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:673
 #: engines/parallaction/saveload.cpp:194 engines/pegasus/pegasus.cpp:355
 #: engines/scumm/dialogs.cpp:185 engines/tsage/scenes.cpp:601
 #: engines/wage/saveload.cpp:748
@@ -1914,10 +1914,10 @@ msgstr "It~z~uli abiarazlera"
 #: engines/cge2/events.cpp:64 engines/cine/various.cpp:348
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
-#: engines/glk/streams.cpp:1485 engines/gnap/menu.cpp:464
+#: engines/glk/streams.cpp:1481 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
 #: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:954
-#: engines/mohawk/riven.cpp:674 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/riven.cpp:685 engines/neverhood/menumodule.cpp:880
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:675
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/startrek/saveload.cpp:42
@@ -1936,10 +1936,10 @@ msgstr "Gorde jokoa:"
 #: engines/cge/events.cpp:72 engines/cge2/events.cpp:64
 #: engines/cine/various.cpp:348 engines/cruise/menu.cpp:212
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
-#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1485
+#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1481
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
 #: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:163
-#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:674
+#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:685
 #: engines/neverhood/menumodule.cpp:880 engines/parallaction/saveload.cpp:209
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:676
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -2965,7 +2965,7 @@ msgstr "Eguneraketak bilatzen..."
 #: engines/access/resources.cpp:44 engines/drascula/drascula.cpp:966
 #: engines/hugo/hugo.cpp:437 engines/lure/lure.cpp:64
 #: engines/mortevielle/mortevielle.cpp:306 engines/sky/compact.cpp:131
-#: engines/supernova/supernova.cpp:175 engines/teenagent/resources.cpp:97
+#: engines/supernova/supernova.cpp:178 engines/teenagent/resources.cpp:97
 #: engines/tony/tony.cpp:198 engines/toon/toon.cpp:4926
 #, c-format
 msgid "Unable to locate the '%s' engine data file."
@@ -2973,7 +2973,7 @@ msgstr ""
 
 #: engines/access/resources.cpp:52 engines/drascula/drascula.cpp:980
 #: engines/hugo/hugo.cpp:448 engines/lure/lure.cpp:73
-#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:184
+#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:187
 #: engines/tony/tony.cpp:210 engines/toon/toon.cpp:4938
 #, c-format
 msgid "The '%s' engine data file is corrupt."
@@ -3071,7 +3071,7 @@ msgstr ""
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3087,7 +3087,7 @@ msgstr "Jokoa kargatu:"
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3386,24 +3386,24 @@ msgstr ""
 msgid "It's beyond my power to do that.\n"
 msgstr ""
 
-#: engines/glk/frotz/detection.cpp:154
+#: engines/glk/frotz/detection.cpp:166
 #, fuzzy
 msgid "Unnamed savegame"
 msgstr "Titulurik gabeko joko gordea"
 
-#: engines/glk/glulxe/glulxe.cpp:55
+#: engines/glk/glulxe/glulxe.cpp:53
 msgid "This is too short to be a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:60
+#: engines/glk/glulxe/glulxe.cpp:58
 msgid "This is not a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:67
+#: engines/glk/glulxe/glulxe.cpp:65
 msgid "This Glulx file is too old a version to execute."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:71
+#: engines/glk/glulxe/glulxe.cpp:69
 msgid "This Glulx file is too new a version to execute."
 msgstr ""
 
@@ -3501,73 +3501,82 @@ msgstr "HP barrak"
 msgid "Enable hit point bar graphs"
 msgstr "Gaitu bizitza barrak"
 
-#: engines/kyra/eobcommon.cpp:342 engines/kyra/lol.cpp:481
+#. I18N: L/R stands for Left/Right
+#: engines/kyra/detection.cpp:138
+msgid "Fight Button L/R Swap"
+msgstr ""
+
+#: engines/kyra/detection.cpp:139
+msgid "Left button to attack, right button to pick up items"
+msgstr ""
+
+#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr "Aurrera mugitu"
 
-#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:482
+#: engines/kyra/eobcommon.cpp:344 engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr "Atzera mugitu"
 
-#: engines/kyra/eobcommon.cpp:344
+#: engines/kyra/eobcommon.cpp:345
 #, fuzzy
 msgid "Move Left"
 msgstr "Ezkerrera irristatu"
 
-#: engines/kyra/eobcommon.cpp:345
+#: engines/kyra/eobcommon.cpp:346
 #, fuzzy
 msgid "Move Right"
 msgstr "Eskuinera irristatu"
 
-#: engines/kyra/eobcommon.cpp:346 engines/kyra/lol.cpp:485
+#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:485
 #: engines/pegasus/pegasus.cpp:2514
 msgid "Turn Left"
 msgstr "Ezkerrera biratu"
 
-#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:486
+#: engines/kyra/eobcommon.cpp:348 engines/kyra/lol.cpp:486
 #: engines/pegasus/pegasus.cpp:2515
 msgid "Turn Right"
 msgstr "Eskuinera biratu"
 
-#: engines/kyra/eobcommon.cpp:348
+#: engines/kyra/eobcommon.cpp:349
 #, fuzzy
 msgid "Open/Close Inventory"
 msgstr "Inbentarioa"
 
-#: engines/kyra/eobcommon.cpp:349
+#: engines/kyra/eobcommon.cpp:350
 msgid "Switch Inventory/Character screen"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:350
+#: engines/kyra/eobcommon.cpp:351
 msgid "Camp"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:351
+#: engines/kyra/eobcommon.cpp:352
 #, fuzzy
 msgid "Cast Spell"
 msgstr "Sorginkeria aukeratu"
 
-#: engines/kyra/eobcommon.cpp:354
+#: engines/kyra/eobcommon.cpp:355
 msgid "Spell Level 1"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:355
+#: engines/kyra/eobcommon.cpp:356
 msgid "Spell Level 2"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:356
+#: engines/kyra/eobcommon.cpp:357
 msgid "Spell Level 3"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:357
+#: engines/kyra/eobcommon.cpp:358
 msgid "Spell Level 4"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:358
+#: engines/kyra/eobcommon.cpp:359
 msgid "Spell Level 5"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:367
+#: engines/kyra/eobcommon.cpp:368
 msgid "Spell Level 6"
 msgstr ""
 
@@ -4908,13 +4917,13 @@ msgstr "Floppy introa"
 msgid "Use the floppy version's intro (CD version only)"
 msgstr "Erabili floppy bertsioko sarrera (CD bertsioa soilik)"
 
-#: engines/supernova/supernova.cpp:191
+#: engines/supernova/supernova.cpp:194
 #, c-format
 msgid ""
 "Incorrect version of the '%s' engine data file found. Expected %d but got %d."
 msgstr ""
 
-#: engines/supernova/supernova.cpp:217
+#: engines/supernova/supernova.cpp:220
 #, c-format
 msgid "Unable to locate the text for %s language in '%s' engine data file."
 msgstr ""
diff --git a/po/fi_FI.po b/po/fi_FI.po
index bcfbf5588d..79d28ddd68 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.6.0git\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2018-12-19 07:31+0100\n"
+"POT-Creation-Date: 2019-02-06 20:18+0100\n"
 "PO-Revision-Date: 2018-12-20 04:34+0000\n"
 "Last-Translator: Timo Mikkolainen <tmikkola@gmail.com>\n"
 "Language-Team: Finnish <https://translations.scummvm.org/projects/scummvm/"
@@ -686,7 +686,7 @@ msgstr "Etsi:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
 #: engines/mohawk/dialogs.cpp:162 engines/mohawk/myst.cpp:942
-#: engines/mohawk/riven.cpp:662 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/riven.cpp:673 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Lataa peli:"
@@ -695,7 +695,7 @@ msgstr "Lataa peli:"
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
 #: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:162
-#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:662
+#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:673
 #: engines/parallaction/saveload.cpp:194 engines/pegasus/pegasus.cpp:355
 #: engines/scumm/dialogs.cpp:185 engines/tsage/scenes.cpp:601
 #: engines/wage/saveload.cpp:748
@@ -1897,10 +1897,10 @@ msgstr "Palaa p~e~livalitsimeen"
 #: engines/cge2/events.cpp:64 engines/cine/various.cpp:348
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
-#: engines/glk/streams.cpp:1485 engines/gnap/menu.cpp:464
+#: engines/glk/streams.cpp:1481 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
 #: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:954
-#: engines/mohawk/riven.cpp:674 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/riven.cpp:685 engines/neverhood/menumodule.cpp:880
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:675
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/startrek/saveload.cpp:42
@@ -1919,10 +1919,10 @@ msgstr "Tallenna peli:"
 #: engines/cge/events.cpp:72 engines/cge2/events.cpp:64
 #: engines/cine/various.cpp:348 engines/cruise/menu.cpp:212
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
-#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1485
+#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1481
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
 #: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:163
-#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:674
+#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:685
 #: engines/neverhood/menumodule.cpp:880 engines/parallaction/saveload.cpp:209
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:676
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -2940,7 +2940,7 @@ msgstr "Tarkista p
 #: engines/access/resources.cpp:44 engines/drascula/drascula.cpp:966
 #: engines/hugo/hugo.cpp:437 engines/lure/lure.cpp:64
 #: engines/mortevielle/mortevielle.cpp:306 engines/sky/compact.cpp:131
-#: engines/supernova/supernova.cpp:175 engines/teenagent/resources.cpp:97
+#: engines/supernova/supernova.cpp:178 engines/teenagent/resources.cpp:97
 #: engines/tony/tony.cpp:198 engines/toon/toon.cpp:4926
 #, c-format
 msgid "Unable to locate the '%s' engine data file."
@@ -2948,7 +2948,7 @@ msgstr "\"%s\" pelimoottorin datatiedostoa ei l
 
 #: engines/access/resources.cpp:52 engines/drascula/drascula.cpp:980
 #: engines/hugo/hugo.cpp:448 engines/lure/lure.cpp:73
-#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:184
+#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:187
 #: engines/tony/tony.cpp:210 engines/toon/toon.cpp:4938
 #, c-format
 msgid "The '%s' engine data file is corrupt."
@@ -3044,7 +3044,7 @@ msgstr ""
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3060,7 +3060,7 @@ msgstr "Lataa pelitallenne:"
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3357,23 +3357,23 @@ msgstr "Se on kykyjesi ulkopuolella.\n"
 msgid "It's beyond my power to do that.\n"
 msgstr "Se on kykyjeni ulkopuolella.\n"
 
-#: engines/glk/frotz/detection.cpp:154
+#: engines/glk/frotz/detection.cpp:166
 msgid "Unnamed savegame"
 msgstr "Nimetön pelitallennus"
 
-#: engines/glk/glulxe/glulxe.cpp:55
+#: engines/glk/glulxe/glulxe.cpp:53
 msgid "This is too short to be a valid Glulx file."
 msgstr "Tämä on liian lyhyt ollakseen validi Glulx-tiedosto."
 
-#: engines/glk/glulxe/glulxe.cpp:60
+#: engines/glk/glulxe/glulxe.cpp:58
 msgid "This is not a valid Glulx file."
 msgstr "Tämä ei ole validi Glulx-tiedosto."
 
-#: engines/glk/glulxe/glulxe.cpp:67
+#: engines/glk/glulxe/glulxe.cpp:65
 msgid "This Glulx file is too old a version to execute."
 msgstr "Tämä Glulx-tiedosto on versioltaan liian vanha ajettavaksi."
 
-#: engines/glk/glulxe/glulxe.cpp:71
+#: engines/glk/glulxe/glulxe.cpp:69
 msgid "This Glulx file is too new a version to execute."
 msgstr "Tämä Glulx-tiedosto on versioltaan liian uusi ajettavaksi."
 
@@ -3469,69 +3469,78 @@ msgstr "Kestopisteet (HP) graafisina palkkeina"
 msgid "Enable hit point bar graphs"
 msgstr "Käytä kestopisteissä värillisiä grafiikkapalkkeja numeroiden sijaan"
 
-#: engines/kyra/eobcommon.cpp:342 engines/kyra/lol.cpp:481
+#. I18N: L/R stands for Left/Right
+#: engines/kyra/detection.cpp:138
+msgid "Fight Button L/R Swap"
+msgstr ""
+
+#: engines/kyra/detection.cpp:139
+msgid "Left button to attack, right button to pick up items"
+msgstr ""
+
+#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr "Liiku eteenpäin"
 
-#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:482
+#: engines/kyra/eobcommon.cpp:344 engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr "Liiku taaksepäin"
 
-#: engines/kyra/eobcommon.cpp:344
+#: engines/kyra/eobcommon.cpp:345
 msgid "Move Left"
 msgstr "Liiku vasemmalle"
 
-#: engines/kyra/eobcommon.cpp:345
+#: engines/kyra/eobcommon.cpp:346
 msgid "Move Right"
 msgstr "Liiku oikealle"
 
-#: engines/kyra/eobcommon.cpp:346 engines/kyra/lol.cpp:485
+#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:485
 #: engines/pegasus/pegasus.cpp:2514
 msgid "Turn Left"
 msgstr "Käänny vasemmalle"
 
-#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:486
+#: engines/kyra/eobcommon.cpp:348 engines/kyra/lol.cpp:486
 #: engines/pegasus/pegasus.cpp:2515
 msgid "Turn Right"
 msgstr "Käänny oikealle"
 
-#: engines/kyra/eobcommon.cpp:348
+#: engines/kyra/eobcommon.cpp:349
 msgid "Open/Close Inventory"
 msgstr "Avaa/Sulje Inventorio"
 
-#: engines/kyra/eobcommon.cpp:349
+#: engines/kyra/eobcommon.cpp:350
 msgid "Switch Inventory/Character screen"
 msgstr "Vaihda Inventorio/Hahmo näyttö"
 
-#: engines/kyra/eobcommon.cpp:350
+#: engines/kyra/eobcommon.cpp:351
 msgid "Camp"
 msgstr "Leiriydy"
 
-#: engines/kyra/eobcommon.cpp:351
+#: engines/kyra/eobcommon.cpp:352
 msgid "Cast Spell"
 msgstr "Lue loitsu"
 
-#: engines/kyra/eobcommon.cpp:354
+#: engines/kyra/eobcommon.cpp:355
 msgid "Spell Level 1"
 msgstr "Loitsutaso 1"
 
-#: engines/kyra/eobcommon.cpp:355
+#: engines/kyra/eobcommon.cpp:356
 msgid "Spell Level 2"
 msgstr "Loitsutaso 2"
 
-#: engines/kyra/eobcommon.cpp:356
+#: engines/kyra/eobcommon.cpp:357
 msgid "Spell Level 3"
 msgstr "Loitsutaso 3"
 
-#: engines/kyra/eobcommon.cpp:357
+#: engines/kyra/eobcommon.cpp:358
 msgid "Spell Level 4"
 msgstr "Loitsutaso 4"
 
-#: engines/kyra/eobcommon.cpp:358
+#: engines/kyra/eobcommon.cpp:359
 msgid "Spell Level 5"
 msgstr "Loitsutaso 5"
 
-#: engines/kyra/eobcommon.cpp:367
+#: engines/kyra/eobcommon.cpp:368
 msgid "Spell Level 6"
 msgstr "Loitsutaso 6"
 
@@ -4900,7 +4909,7 @@ msgstr "Levykeversion intro"
 msgid "Use the floppy version's intro (CD version only)"
 msgstr "Käytä levykeversion introa (vain CD versiossa)"
 
-#: engines/supernova/supernova.cpp:191
+#: engines/supernova/supernova.cpp:194
 #, c-format
 msgid ""
 "Incorrect version of the '%s' engine data file found. Expected %d but got %d."
@@ -4908,7 +4917,7 @@ msgstr ""
 "Pelimoottorin \"%s\" datatiedostosta löytyi väärä versio. Odotettu versio "
 "%d, löytynyt versio %d."
 
-#: engines/supernova/supernova.cpp:217
+#: engines/supernova/supernova.cpp:220
 #, c-format
 msgid "Unable to locate the text for %s language in '%s' engine data file."
 msgstr "Kielen %s tekstejä ei löydetty tiedostosta '%s'."
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 8badde0d34..abb7d270bd 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.8.0git\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2018-12-19 07:31+0100\n"
+"POT-Creation-Date: 2019-02-06 20:18+0100\n"
 "PO-Revision-Date: 2018-12-17 23:07+0000\n"
 "Last-Translator: Thierry Crozat <criezy@scummvm.org>\n"
 "Language-Team: French <https://translations.scummvm.org/projects/scummvm/"
@@ -692,7 +692,7 @@ msgstr "Filtre :"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
 #: engines/mohawk/dialogs.cpp:162 engines/mohawk/myst.cpp:942
-#: engines/mohawk/riven.cpp:662 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/riven.cpp:673 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Charger le jeu :"
@@ -701,7 +701,7 @@ msgstr "Charger le jeu :"
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
 #: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:162
-#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:662
+#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:673
 #: engines/parallaction/saveload.cpp:194 engines/pegasus/pegasus.cpp:355
 #: engines/scumm/dialogs.cpp:185 engines/tsage/scenes.cpp:601
 #: engines/wage/saveload.cpp:748
@@ -1920,10 +1920,10 @@ msgstr "Retour au ~L~anceur"
 #: engines/cge2/events.cpp:64 engines/cine/various.cpp:348
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
-#: engines/glk/streams.cpp:1485 engines/gnap/menu.cpp:464
+#: engines/glk/streams.cpp:1481 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
 #: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:954
-#: engines/mohawk/riven.cpp:674 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/riven.cpp:685 engines/neverhood/menumodule.cpp:880
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:675
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/startrek/saveload.cpp:42
@@ -1942,10 +1942,10 @@ msgstr "Sauvegarde :"
 #: engines/cge/events.cpp:72 engines/cge2/events.cpp:64
 #: engines/cine/various.cpp:348 engines/cruise/menu.cpp:212
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
-#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1485
+#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1481
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
 #: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:163
-#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:674
+#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:685
 #: engines/neverhood/menumodule.cpp:880 engines/parallaction/saveload.cpp:209
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:676
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -2965,7 +2965,7 @@ msgstr "Recherche des mises 
 #: engines/access/resources.cpp:44 engines/drascula/drascula.cpp:966
 #: engines/hugo/hugo.cpp:437 engines/lure/lure.cpp:64
 #: engines/mortevielle/mortevielle.cpp:306 engines/sky/compact.cpp:131
-#: engines/supernova/supernova.cpp:175 engines/teenagent/resources.cpp:97
+#: engines/supernova/supernova.cpp:178 engines/teenagent/resources.cpp:97
 #: engines/tony/tony.cpp:198 engines/toon/toon.cpp:4926
 #, c-format
 msgid "Unable to locate the '%s' engine data file."
@@ -2973,7 +2973,7 @@ msgstr "Le fichier de donn
 
 #: engines/access/resources.cpp:52 engines/drascula/drascula.cpp:980
 #: engines/hugo/hugo.cpp:448 engines/lure/lure.cpp:73
-#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:184
+#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:187
 #: engines/tony/tony.cpp:210 engines/toon/toon.cpp:4938
 #, c-format
 msgid "The '%s' engine data file is corrupt."
@@ -3073,7 +3073,7 @@ msgstr ""
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3089,7 +3089,7 @@ msgstr "Charger le jeu :"
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3388,23 +3388,23 @@ msgstr "Vous n'avez pas le pouvoir de faire 
 msgid "It's beyond my power to do that.\n"
 msgstr "Je n'ai pas le pouvoir de faire ça.\n"
 
-#: engines/glk/frotz/detection.cpp:154
+#: engines/glk/frotz/detection.cpp:166
 msgid "Unnamed savegame"
 msgstr "Sauvegarde sans nom"
 
-#: engines/glk/glulxe/glulxe.cpp:55
+#: engines/glk/glulxe/glulxe.cpp:53
 msgid "This is too short to be a valid Glulx file."
 msgstr "C'est trop court pour être un fichier Glulx valide."
 
-#: engines/glk/glulxe/glulxe.cpp:60
+#: engines/glk/glulxe/glulxe.cpp:58
 msgid "This is not a valid Glulx file."
 msgstr "Ce n'est pas un fichier Glulx valide."
 
-#: engines/glk/glulxe/glulxe.cpp:67
+#: engines/glk/glulxe/glulxe.cpp:65
 msgid "This Glulx file is too old a version to execute."
 msgstr "Ce fichier Glulx est une version trop ancienne pour être exécutée."
 
-#: engines/glk/glulxe/glulxe.cpp:71
+#: engines/glk/glulxe/glulxe.cpp:69
 msgid "This Glulx file is too new a version to execute."
 msgstr "Ce fichier Glulx est une version trop récente pour être exécutée."
 
@@ -3500,69 +3500,78 @@ msgstr "Barres HP"
 msgid "Enable hit point bar graphs"
 msgstr "Activer les barres de santé (Hit Point)"
 
-#: engines/kyra/eobcommon.cpp:342 engines/kyra/lol.cpp:481
+#. I18N: L/R stands for Left/Right
+#: engines/kyra/detection.cpp:138
+msgid "Fight Button L/R Swap"
+msgstr ""
+
+#: engines/kyra/detection.cpp:139
+msgid "Left button to attack, right button to pick up items"
+msgstr ""
+
+#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr "Avancer"
 
-#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:482
+#: engines/kyra/eobcommon.cpp:344 engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr "Reculer"
 
-#: engines/kyra/eobcommon.cpp:344
+#: engines/kyra/eobcommon.cpp:345
 msgid "Move Left"
 msgstr "Aller vers la Gauche"
 
-#: engines/kyra/eobcommon.cpp:345
+#: engines/kyra/eobcommon.cpp:346
 msgid "Move Right"
 msgstr "Aller vers la Droite"
 
-#: engines/kyra/eobcommon.cpp:346 engines/kyra/lol.cpp:485
+#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:485
 #: engines/pegasus/pegasus.cpp:2514
 msgid "Turn Left"
 msgstr "Tourner vers la Gauche"
 
-#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:486
+#: engines/kyra/eobcommon.cpp:348 engines/kyra/lol.cpp:486
 #: engines/pegasus/pegasus.cpp:2515
 msgid "Turn Right"
 msgstr "Tourner vers la Droite"
 
-#: engines/kyra/eobcommon.cpp:348
+#: engines/kyra/eobcommon.cpp:349
 msgid "Open/Close Inventory"
 msgstr "Ouvrir/fermer l'inventaire"
 
-#: engines/kyra/eobcommon.cpp:349
+#: engines/kyra/eobcommon.cpp:350
 msgid "Switch Inventory/Character screen"
 msgstr "Inventaire/Écran de personnage"
 
-#: engines/kyra/eobcommon.cpp:350
+#: engines/kyra/eobcommon.cpp:351
 msgid "Camp"
 msgstr "Campement"
 
-#: engines/kyra/eobcommon.cpp:351
+#: engines/kyra/eobcommon.cpp:352
 msgid "Cast Spell"
 msgstr "Lancer un Sort"
 
-#: engines/kyra/eobcommon.cpp:354
+#: engines/kyra/eobcommon.cpp:355
 msgid "Spell Level 1"
 msgstr "Sort Niveau 1"
 
-#: engines/kyra/eobcommon.cpp:355
+#: engines/kyra/eobcommon.cpp:356
 msgid "Spell Level 2"
 msgstr "Sort Niveau 2"
 
-#: engines/kyra/eobcommon.cpp:356
+#: engines/kyra/eobcommon.cpp:357
 msgid "Spell Level 3"
 msgstr "Sort Niveau 3"
 
-#: engines/kyra/eobcommon.cpp:357
+#: engines/kyra/eobcommon.cpp:358
 msgid "Spell Level 4"
 msgstr "Sort Niveau 4"
 
-#: engines/kyra/eobcommon.cpp:358
+#: engines/kyra/eobcommon.cpp:359
 msgid "Spell Level 5"
 msgstr "Sort Niveau 5"
 
-#: engines/kyra/eobcommon.cpp:367
+#: engines/kyra/eobcommon.cpp:368
 msgid "Spell Level 6"
 msgstr "Sort Niveau 6"
 
@@ -4960,7 +4969,7 @@ msgstr "Intro disquette"
 msgid "Use the floppy version's intro (CD version only)"
 msgstr "Utiliser l'intro de la version disquette (version CD uniquement)"
 
-#: engines/supernova/supernova.cpp:191
+#: engines/supernova/supernova.cpp:194
 #, c-format
 msgid ""
 "Incorrect version of the '%s' engine data file found. Expected %d but got %d."
@@ -4968,7 +4977,7 @@ msgstr ""
 "La bonne version du fichier de données '%s' n'a pu être trouvée. Version "
 "attendue : %d ; version trouvée : %d."
 
-#: engines/supernova/supernova.cpp:217
+#: engines/supernova/supernova.cpp:220
 #, c-format
 msgid "Unable to locate the text for %s language in '%s' engine data file."
 msgstr ""
diff --git a/po/gl_ES.po b/po/gl_ES.po
index 265bdd7603..673f7a72b0 100644
--- a/po/gl_ES.po
+++ b/po/gl_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.8.0git\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2018-12-19 07:31+0100\n"
+"POT-Creation-Date: 2019-02-06 20:18+0100\n"
 "PO-Revision-Date: 2018-10-10 04:23+0000\n"
 "Last-Translator: scootergrisen <scootergrisen@gmail.com>\n"
 "Language-Team: Galician <https://translations.scummvm.org/projects/scummvm/"
@@ -689,7 +689,7 @@ msgstr "Buscar:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
 #: engines/mohawk/dialogs.cpp:162 engines/mohawk/myst.cpp:942
-#: engines/mohawk/riven.cpp:662 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/riven.cpp:673 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Cargar partida:"
@@ -698,7 +698,7 @@ msgstr "Cargar partida:"
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
 #: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:162
-#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:662
+#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:673
 #: engines/parallaction/saveload.cpp:194 engines/pegasus/pegasus.cpp:355
 #: engines/scumm/dialogs.cpp:185 engines/tsage/scenes.cpp:601
 #: engines/wage/saveload.cpp:748
@@ -1917,10 +1917,10 @@ msgstr "~V~olver ao Iniciador"
 #: engines/cge2/events.cpp:64 engines/cine/various.cpp:348
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
-#: engines/glk/streams.cpp:1485 engines/gnap/menu.cpp:464
+#: engines/glk/streams.cpp:1481 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
 #: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:954
-#: engines/mohawk/riven.cpp:674 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/riven.cpp:685 engines/neverhood/menumodule.cpp:880
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:675
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/startrek/saveload.cpp:42
@@ -1939,10 +1939,10 @@ msgstr "Gardar partida:"
 #: engines/cge/events.cpp:72 engines/cge2/events.cpp:64
 #: engines/cine/various.cpp:348 engines/cruise/menu.cpp:212
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
-#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1485
+#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1481
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
 #: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:163
-#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:674
+#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:685
 #: engines/neverhood/menumodule.cpp:880 engines/parallaction/saveload.cpp:209
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:676
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -2970,7 +2970,7 @@ msgstr "Buscar actualizaci
 #: engines/access/resources.cpp:44 engines/drascula/drascula.cpp:966
 #: engines/hugo/hugo.cpp:437 engines/lure/lure.cpp:64
 #: engines/mortevielle/mortevielle.cpp:306 engines/sky/compact.cpp:131
-#: engines/supernova/supernova.cpp:175 engines/teenagent/resources.cpp:97
+#: engines/supernova/supernova.cpp:178 engines/teenagent/resources.cpp:97
 #: engines/tony/tony.cpp:198 engines/toon/toon.cpp:4926
 #, c-format
 msgid "Unable to locate the '%s' engine data file."
@@ -2978,7 +2978,7 @@ msgstr "Non se puido localizar o ficheiro de datos do motor %s."
 
 #: engines/access/resources.cpp:52 engines/drascula/drascula.cpp:980
 #: engines/hugo/hugo.cpp:448 engines/lure/lure.cpp:73
-#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:184
+#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:187
 #: engines/tony/tony.cpp:210 engines/toon/toon.cpp:4938
 #, c-format
 msgid "The '%s' engine data file is corrupt."
@@ -3076,7 +3076,7 @@ msgstr ""
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3092,7 +3092,7 @@ msgstr "Restaurar xogo:"
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3391,24 +3391,24 @@ msgstr ""
 msgid "It's beyond my power to do that.\n"
 msgstr ""
 
-#: engines/glk/frotz/detection.cpp:154
+#: engines/glk/frotz/detection.cpp:166
 #, fuzzy
 msgid "Unnamed savegame"
 msgstr "Partida gardada sen título"
 
-#: engines/glk/glulxe/glulxe.cpp:55
+#: engines/glk/glulxe/glulxe.cpp:53
 msgid "This is too short to be a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:60
+#: engines/glk/glulxe/glulxe.cpp:58
 msgid "This is not a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:67
+#: engines/glk/glulxe/glulxe.cpp:65
 msgid "This Glulx file is too old a version to execute."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:71
+#: engines/glk/glulxe/glulxe.cpp:69
 msgid "This Glulx file is too new a version to execute."
 msgstr ""
 
@@ -3504,69 +3504,78 @@ msgstr "Barras de vida"
 msgid "Enable hit point bar graphs"
 msgstr "Activa as barras de vida."
 
-#: engines/kyra/eobcommon.cpp:342 engines/kyra/lol.cpp:481
+#. I18N: L/R stands for Left/Right
+#: engines/kyra/detection.cpp:138
+msgid "Fight Button L/R Swap"
+msgstr ""
+
+#: engines/kyra/detection.cpp:139
+msgid "Left button to attack, right button to pick up items"
+msgstr ""
+
+#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr "Mover cara diante"
 
-#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:482
+#: engines/kyra/eobcommon.cpp:344 engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr "Mover cara atrás"
 
-#: engines/kyra/eobcommon.cpp:344
+#: engines/kyra/eobcommon.cpp:345
 msgid "Move Left"
 msgstr "Mover á esquerda"
 
-#: engines/kyra/eobcommon.cpp:345
+#: engines/kyra/eobcommon.cpp:346
 msgid "Move Right"
 msgstr "Mover á dereita"
 
-#: engines/kyra/eobcommon.cpp:346 engines/kyra/lol.cpp:485
+#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:485
 #: engines/pegasus/pegasus.cpp:2514
 msgid "Turn Left"
 msgstr "Xirar á esquerda"
 
-#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:486
+#: engines/kyra/eobcommon.cpp:348 engines/kyra/lol.cpp:486
 #: engines/pegasus/pegasus.cpp:2515
 msgid "Turn Right"
 msgstr "Xirar á dereita"
 
-#: engines/kyra/eobcommon.cpp:348
+#: engines/kyra/eobcommon.cpp:349
 msgid "Open/Close Inventory"
 msgstr "Abrir/Pechar inventario"
 
-#: engines/kyra/eobcommon.cpp:349
+#: engines/kyra/eobcommon.cpp:350
 msgid "Switch Inventory/Character screen"
 msgstr "Cambiar pantalla de inventario/personaxe"
 
-#: engines/kyra/eobcommon.cpp:350
+#: engines/kyra/eobcommon.cpp:351
 msgid "Camp"
 msgstr "Acampar"
 
-#: engines/kyra/eobcommon.cpp:351
+#: engines/kyra/eobcommon.cpp:352
 msgid "Cast Spell"
 msgstr "Lanzar feitizo"
 
-#: engines/kyra/eobcommon.cpp:354
+#: engines/kyra/eobcommon.cpp:355
 msgid "Spell Level 1"
 msgstr "Nivel de feitizos 1"
 
-#: engines/kyra/eobcommon.cpp:355
+#: engines/kyra/eobcommon.cpp:356
 msgid "Spell Level 2"
 msgstr "Nivel de feitizos 2"
 
-#: engines/kyra/eobcommon.cpp:356
+#: engines/kyra/eobcommon.cpp:357
 msgid "Spell Level 3"
 msgstr "Nivel de feitizos 3"
 
-#: engines/kyra/eobcommon.cpp:357
+#: engines/kyra/eobcommon.cpp:358
 msgid "Spell Level 4"
 msgstr "Nivel de feitizos 4"
 
-#: engines/kyra/eobcommon.cpp:358
+#: engines/kyra/eobcommon.cpp:359
 msgid "Spell Level 5"
 msgstr "Nivel de feitizos 5"
 
-#: engines/kyra/eobcommon.cpp:367
+#: engines/kyra/eobcommon.cpp:368
 msgid "Spell Level 6"
 msgstr "Nivel de feitizos 6"
 
@@ -4944,7 +4953,7 @@ msgstr "Intro de disquete"
 msgid "Use the floppy version's intro (CD version only)"
 msgstr "Emprega a introdución da versión en disquete (só versión en CD)."
 
-#: engines/supernova/supernova.cpp:191
+#: engines/supernova/supernova.cpp:194
 #, fuzzy, c-format
 msgid ""
 "Incorrect version of the '%s' engine data file found. Expected %d but got %d."
@@ -4952,7 +4961,7 @@ msgstr ""
 "Atopouse unha versión incorrecta do ficheiro de datos do motor %s. Ficheiro "
 "esperado: %d.%d. Ficheiro atopado: %d.%d."
 
-#: engines/supernova/supernova.cpp:217
+#: engines/supernova/supernova.cpp:220
 #, fuzzy, c-format
 msgid "Unable to locate the text for %s language in '%s' engine data file."
 msgstr "Non se puido localizar o ficheiro de datos do motor %s."
diff --git a/po/he.po b/po/he.po
index 11ebd2d9b2..e857b87a77 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 2.1.0git\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2018-12-19 07:31+0100\n"
+"POT-Creation-Date: 2019-02-06 20:18+0100\n"
 "PO-Revision-Date: 2018-12-18 21:54+0000\n"
 "Last-Translator: Matan Bareket <mataniko@gmail.com>\n"
 "Language-Team: Hebrew <https://translations.scummvm.org/projects/scummvm/"
@@ -688,7 +688,7 @@ msgstr "
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
 #: engines/mohawk/dialogs.cpp:162 engines/mohawk/myst.cpp:942
-#: engines/mohawk/riven.cpp:662 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/riven.cpp:673 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "èòï îùç÷:"
@@ -697,7 +697,7 @@ msgstr "
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
 #: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:162
-#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:662
+#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:673
 #: engines/parallaction/saveload.cpp:194 engines/pegasus/pegasus.cpp:355
 #: engines/scumm/dialogs.cpp:185 engines/tsage/scenes.cpp:601
 #: engines/wage/saveload.cpp:748
@@ -1878,10 +1878,10 @@ msgstr ""
 #: engines/cge2/events.cpp:64 engines/cine/various.cpp:348
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
-#: engines/glk/streams.cpp:1485 engines/gnap/menu.cpp:464
+#: engines/glk/streams.cpp:1481 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
 #: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:954
-#: engines/mohawk/riven.cpp:674 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/riven.cpp:685 engines/neverhood/menumodule.cpp:880
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:675
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/startrek/saveload.cpp:42
@@ -1900,10 +1900,10 @@ msgstr ""
 #: engines/cge/events.cpp:72 engines/cge2/events.cpp:64
 #: engines/cine/various.cpp:348 engines/cruise/menu.cpp:212
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
-#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1485
+#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1481
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
 #: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:163
-#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:674
+#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:685
 #: engines/neverhood/menumodule.cpp:880 engines/parallaction/saveload.cpp:209
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:676
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -2880,7 +2880,7 @@ msgstr ""
 #: engines/access/resources.cpp:44 engines/drascula/drascula.cpp:966
 #: engines/hugo/hugo.cpp:437 engines/lure/lure.cpp:64
 #: engines/mortevielle/mortevielle.cpp:306 engines/sky/compact.cpp:131
-#: engines/supernova/supernova.cpp:175 engines/teenagent/resources.cpp:97
+#: engines/supernova/supernova.cpp:178 engines/teenagent/resources.cpp:97
 #: engines/tony/tony.cpp:198 engines/toon/toon.cpp:4926
 #, c-format
 msgid "Unable to locate the '%s' engine data file."
@@ -2888,7 +2888,7 @@ msgstr ""
 
 #: engines/access/resources.cpp:52 engines/drascula/drascula.cpp:980
 #: engines/hugo/hugo.cpp:448 engines/lure/lure.cpp:73
-#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:184
+#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:187
 #: engines/tony/tony.cpp:210 engines/toon/toon.cpp:4938
 #, c-format
 msgid "The '%s' engine data file is corrupt."
@@ -2977,7 +2977,7 @@ msgstr ""
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -2993,7 +2993,7 @@ msgstr ""
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3270,23 +3270,23 @@ msgstr ""
 msgid "It's beyond my power to do that.\n"
 msgstr ""
 
-#: engines/glk/frotz/detection.cpp:154
+#: engines/glk/frotz/detection.cpp:166
 msgid "Unnamed savegame"
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:55
+#: engines/glk/glulxe/glulxe.cpp:53
 msgid "This is too short to be a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:60
+#: engines/glk/glulxe/glulxe.cpp:58
 msgid "This is not a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:67
+#: engines/glk/glulxe/glulxe.cpp:65
 msgid "This Glulx file is too old a version to execute."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:71
+#: engines/glk/glulxe/glulxe.cpp:69
 msgid "This Glulx file is too new a version to execute."
 msgstr ""
 
@@ -3382,69 +3382,78 @@ msgstr ""
 msgid "Enable hit point bar graphs"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:342 engines/kyra/lol.cpp:481
+#. I18N: L/R stands for Left/Right
+#: engines/kyra/detection.cpp:138
+msgid "Fight Button L/R Swap"
+msgstr ""
+
+#: engines/kyra/detection.cpp:139
+msgid "Left button to attack, right button to pick up items"
+msgstr ""
+
+#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:482
+#: engines/kyra/eobcommon.cpp:344 engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:344
+#: engines/kyra/eobcommon.cpp:345
 msgid "Move Left"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:345
+#: engines/kyra/eobcommon.cpp:346
 msgid "Move Right"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:346 engines/kyra/lol.cpp:485
+#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:485
 #: engines/pegasus/pegasus.cpp:2514
 msgid "Turn Left"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:486
+#: engines/kyra/eobcommon.cpp:348 engines/kyra/lol.cpp:486
 #: engines/pegasus/pegasus.cpp:2515
 msgid "Turn Right"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:348
+#: engines/kyra/eobcommon.cpp:349
 msgid "Open/Close Inventory"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:349
+#: engines/kyra/eobcommon.cpp:350
 msgid "Switch Inventory/Character screen"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:350
+#: engines/kyra/eobcommon.cpp:351
 msgid "Camp"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:351
+#: engines/kyra/eobcommon.cpp:352
 msgid "Cast Spell"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:354
+#: engines/kyra/eobcommon.cpp:355
 msgid "Spell Level 1"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:355
+#: engines/kyra/eobcommon.cpp:356
 msgid "Spell Level 2"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:356
+#: engines/kyra/eobcommon.cpp:357
 msgid "Spell Level 3"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:357
+#: engines/kyra/eobcommon.cpp:358
 msgid "Spell Level 4"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:358
+#: engines/kyra/eobcommon.cpp:359
 msgid "Spell Level 5"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:367
+#: engines/kyra/eobcommon.cpp:368
 msgid "Spell Level 6"
 msgstr ""
 
@@ -4713,13 +4722,13 @@ msgstr ""
 msgid "Use the floppy version's intro (CD version only)"
 msgstr ""
 
-#: engines/supernova/supernova.cpp:191
+#: engines/supernova/supernova.cpp:194
 #, c-format
 msgid ""
 "Incorrect version of the '%s' engine data file found. Expected %d but got %d."
 msgstr ""
 
-#: engines/supernova/supernova.cpp:217
+#: engines/supernova/supernova.cpp:220
 #, c-format
 msgid "Unable to locate the text for %s language in '%s' engine data file."
 msgstr ""
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 14d254fba5..ac3fd55c52 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.3.0svn\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2018-12-19 07:31+0100\n"
+"POT-Creation-Date: 2019-02-06 20:18+0100\n"
 "PO-Revision-Date: 2018-12-22 09:14+0000\n"
 "Last-Translator: George Kormendi <grubycza@hotmail.com>\n"
 "Language-Team: Hungarian <https://translations.scummvm.org/projects/scummvm/"
@@ -686,7 +686,7 @@ msgstr "Keres
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
 #: engines/mohawk/dialogs.cpp:162 engines/mohawk/myst.cpp:942
-#: engines/mohawk/riven.cpp:662 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/riven.cpp:673 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Játék betöltése:"
@@ -695,7 +695,7 @@ msgstr "J
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
 #: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:162
-#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:662
+#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:673
 #: engines/parallaction/saveload.cpp:194 engines/pegasus/pegasus.cpp:355
 #: engines/scumm/dialogs.cpp:185 engines/tsage/scenes.cpp:601
 #: engines/wage/saveload.cpp:748
@@ -1893,10 +1893,10 @@ msgstr "Visszat
 #: engines/cge2/events.cpp:64 engines/cine/various.cpp:348
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
-#: engines/glk/streams.cpp:1485 engines/gnap/menu.cpp:464
+#: engines/glk/streams.cpp:1481 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
 #: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:954
-#: engines/mohawk/riven.cpp:674 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/riven.cpp:685 engines/neverhood/menumodule.cpp:880
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:675
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/startrek/saveload.cpp:42
@@ -1915,10 +1915,10 @@ msgstr "J
 #: engines/cge/events.cpp:72 engines/cge2/events.cpp:64
 #: engines/cine/various.cpp:348 engines/cruise/menu.cpp:212
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
-#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1485
+#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1481
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
 #: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:163
-#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:674
+#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:685
 #: engines/neverhood/menumodule.cpp:880 engines/parallaction/saveload.cpp:209
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:676
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -2931,7 +2931,7 @@ msgstr "Friss
 #: engines/access/resources.cpp:44 engines/drascula/drascula.cpp:966
 #: engines/hugo/hugo.cpp:437 engines/lure/lure.cpp:64
 #: engines/mortevielle/mortevielle.cpp:306 engines/sky/compact.cpp:131
-#: engines/supernova/supernova.cpp:175 engines/teenagent/resources.cpp:97
+#: engines/supernova/supernova.cpp:178 engines/teenagent/resources.cpp:97
 #: engines/tony/tony.cpp:198 engines/toon/toon.cpp:4926
 #, c-format
 msgid "Unable to locate the '%s' engine data file."
@@ -2939,7 +2939,7 @@ msgstr "Nem tal
 
 #: engines/access/resources.cpp:52 engines/drascula/drascula.cpp:980
 #: engines/hugo/hugo.cpp:448 engines/lure/lure.cpp:73
-#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:184
+#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:187
 #: engines/tony/tony.cpp:210 engines/toon/toon.cpp:4938
 #, c-format
 msgid "The '%s' engine data file is corrupt."
@@ -3036,7 +3036,7 @@ msgstr ""
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3052,7 +3052,7 @@ msgstr "J
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3350,23 +3350,23 @@ msgstr "Ez k
 msgid "It's beyond my power to do that.\n"
 msgstr "Ez kívül esik a lehetõségeimtõl.\n"
 
-#: engines/glk/frotz/detection.cpp:154
+#: engines/glk/frotz/detection.cpp:166
 msgid "Unnamed savegame"
 msgstr "Névtelen játékmentés"
 
-#: engines/glk/glulxe/glulxe.cpp:55
+#: engines/glk/glulxe/glulxe.cpp:53
 msgid "This is too short to be a valid Glulx file."
 msgstr "Ez túl rövid hogy érvényes Glulx fájl legyen."
 
-#: engines/glk/glulxe/glulxe.cpp:60
+#: engines/glk/glulxe/glulxe.cpp:58
 msgid "This is not a valid Glulx file."
 msgstr "Ez nem egy valós Glulx fájl."
 
-#: engines/glk/glulxe/glulxe.cpp:67
+#: engines/glk/glulxe/glulxe.cpp:65
 msgid "This Glulx file is too old a version to execute."
 msgstr "Ez a Glulx fájl túl régi verziójú a végrehajtáshoz."
 
-#: engines/glk/glulxe/glulxe.cpp:71
+#: engines/glk/glulxe/glulxe.cpp:69
 msgid "This Glulx file is too new a version to execute."
 msgstr "Ez a Glulx fájl túl új verziójú a végrehajtáshoz."
 
@@ -3462,69 +3462,78 @@ msgstr "HP s
 msgid "Enable hit point bar graphs"
 msgstr "Hit point sáv grafika engedélyezése"
 
-#: engines/kyra/eobcommon.cpp:342 engines/kyra/lol.cpp:481
+#. I18N: L/R stands for Left/Right
+#: engines/kyra/detection.cpp:138
+msgid "Fight Button L/R Swap"
+msgstr ""
+
+#: engines/kyra/detection.cpp:139
+msgid "Left button to attack, right button to pick up items"
+msgstr ""
+
+#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr "Mozgás elõre"
 
-#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:482
+#: engines/kyra/eobcommon.cpp:344 engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr "Mozgás hátra"
 
-#: engines/kyra/eobcommon.cpp:344
+#: engines/kyra/eobcommon.cpp:345
 msgid "Move Left"
 msgstr "Mozgás balra"
 
-#: engines/kyra/eobcommon.cpp:345
+#: engines/kyra/eobcommon.cpp:346
 msgid "Move Right"
 msgstr "Mozgás jobbra"
 
-#: engines/kyra/eobcommon.cpp:346 engines/kyra/lol.cpp:485
+#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:485
 #: engines/pegasus/pegasus.cpp:2514
 msgid "Turn Left"
 msgstr "Balra fordul"
 
-#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:486
+#: engines/kyra/eobcommon.cpp:348 engines/kyra/lol.cpp:486
 #: engines/pegasus/pegasus.cpp:2515
 msgid "Turn Right"
 msgstr "Jobbra fordul"
 
-#: engines/kyra/eobcommon.cpp:348
+#: engines/kyra/eobcommon.cpp:349
 msgid "Open/Close Inventory"
 msgstr "Tárgylista Kinyit/Bezár"
 
-#: engines/kyra/eobcommon.cpp:349
+#: engines/kyra/eobcommon.cpp:350
 msgid "Switch Inventory/Character screen"
 msgstr "Tárgylista/Karakter kép átkapcsoló"
 
-#: engines/kyra/eobcommon.cpp:350
+#: engines/kyra/eobcommon.cpp:351
 msgid "Camp"
 msgstr "Tábor"
 
-#: engines/kyra/eobcommon.cpp:351
+#: engines/kyra/eobcommon.cpp:352
 msgid "Cast Spell"
 msgstr "Varázsol"
 
-#: engines/kyra/eobcommon.cpp:354
+#: engines/kyra/eobcommon.cpp:355
 msgid "Spell Level 1"
 msgstr "1. Szintû varázslat"
 
-#: engines/kyra/eobcommon.cpp:355
+#: engines/kyra/eobcommon.cpp:356
 msgid "Spell Level 2"
 msgstr "2. Szintû varázslat"
 
-#: engines/kyra/eobcommon.cpp:356
+#: engines/kyra/eobcommon.cpp:357
 msgid "Spell Level 3"
 msgstr "3. Szintû varázslat"
 
-#: engines/kyra/eobcommon.cpp:357
+#: engines/kyra/eobcommon.cpp:358
 msgid "Spell Level 4"
 msgstr "4. Szintû varázslat"
 
-#: engines/kyra/eobcommon.cpp:358
+#: engines/kyra/eobcommon.cpp:359
 msgid "Spell Level 5"
 msgstr "5. Szintû varázslat"
 
-#: engines/kyra/eobcommon.cpp:367
+#: engines/kyra/eobcommon.cpp:368
 msgid "Spell Level 6"
 msgstr "6. Szintû varázslat"
 
@@ -4897,7 +4906,7 @@ msgstr "Floppy intro"
 msgid "Use the floppy version's intro (CD version only)"
 msgstr "A floppy verzió intro használata (csak CD verziónál)"
 
-#: engines/supernova/supernova.cpp:191
+#: engines/supernova/supernova.cpp:194
 #, c-format
 msgid ""
 "Incorrect version of the '%s' engine data file found. Expected %d but got %d."
@@ -4905,7 +4914,7 @@ msgstr ""
 "Hibás verziójú '%s' motor adatfájlt találtam. Elvárt %d helyett ez %d "
 "található."
 
-#: engines/supernova/supernova.cpp:217
+#: engines/supernova/supernova.cpp:220
 #, c-format
 msgid "Unable to locate the text for %s language in '%s' engine data file."
 msgstr ""
diff --git a/po/it_IT.po b/po/it_IT.po
index 949fe5d400..d0ba03376c 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.3.0svn\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2018-12-19 07:31+0100\n"
+"POT-Creation-Date: 2019-02-06 20:18+0100\n"
 "PO-Revision-Date: 2019-01-21 03:20+0000\n"
 "Last-Translator: Paolo Bossi <pbossi86@gmail.com>\n"
 "Language-Team: Italian <https://translations.scummvm.org/projects/scummvm/"
@@ -690,7 +690,7 @@ msgstr "Cerca:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
 #: engines/mohawk/dialogs.cpp:162 engines/mohawk/myst.cpp:942
-#: engines/mohawk/riven.cpp:662 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/riven.cpp:673 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Carica gioco:"
@@ -699,7 +699,7 @@ msgstr "Carica gioco:"
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
 #: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:162
-#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:662
+#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:673
 #: engines/parallaction/saveload.cpp:194 engines/pegasus/pegasus.cpp:355
 #: engines/scumm/dialogs.cpp:185 engines/tsage/scenes.cpp:601
 #: engines/wage/saveload.cpp:748
@@ -1912,10 +1912,10 @@ msgstr "~V~ai a elenco giochi"
 #: engines/cge2/events.cpp:64 engines/cine/various.cpp:348
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
-#: engines/glk/streams.cpp:1485 engines/gnap/menu.cpp:464
+#: engines/glk/streams.cpp:1481 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
 #: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:954
-#: engines/mohawk/riven.cpp:674 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/riven.cpp:685 engines/neverhood/menumodule.cpp:880
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:675
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/startrek/saveload.cpp:42
@@ -1934,10 +1934,10 @@ msgstr "Salva gioco:"
 #: engines/cge/events.cpp:72 engines/cge2/events.cpp:64
 #: engines/cine/various.cpp:348 engines/cruise/menu.cpp:212
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
-#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1485
+#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1481
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
 #: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:163
-#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:674
+#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:685
 #: engines/neverhood/menumodule.cpp:880 engines/parallaction/saveload.cpp:209
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:676
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -2955,7 +2955,7 @@ msgstr "Cerca aggiornamenti..."
 #: engines/access/resources.cpp:44 engines/drascula/drascula.cpp:966
 #: engines/hugo/hugo.cpp:437 engines/lure/lure.cpp:64
 #: engines/mortevielle/mortevielle.cpp:306 engines/sky/compact.cpp:131
-#: engines/supernova/supernova.cpp:175 engines/teenagent/resources.cpp:97
+#: engines/supernova/supernova.cpp:178 engines/teenagent/resources.cpp:97
 #: engines/tony/tony.cpp:198 engines/toon/toon.cpp:4926
 #, c-format
 msgid "Unable to locate the '%s' engine data file."
@@ -2963,7 +2963,7 @@ msgstr "File dati del motore '%s' non trovato."
 
 #: engines/access/resources.cpp:52 engines/drascula/drascula.cpp:980
 #: engines/hugo/hugo.cpp:448 engines/lure/lure.cpp:73
-#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:184
+#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:187
 #: engines/tony/tony.cpp:210 engines/toon/toon.cpp:4938
 #, c-format
 msgid "The '%s' engine data file is corrupt."
@@ -3062,7 +3062,7 @@ msgstr ""
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3078,7 +3078,7 @@ msgstr "Ripristina partita:"
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3377,23 +3377,23 @@ msgstr "Fare ci
 msgid "It's beyond my power to do that.\n"
 msgstr "Fare ciò è oltre le mie possibilità.\n"
 
-#: engines/glk/frotz/detection.cpp:154
+#: engines/glk/frotz/detection.cpp:166
 msgid "Unnamed savegame"
 msgstr "Salvataggio senza nome"
 
-#: engines/glk/glulxe/glulxe.cpp:55
+#: engines/glk/glulxe/glulxe.cpp:53
 msgid "This is too short to be a valid Glulx file."
 msgstr "E' troppo corto per essere un file Glulx valido."
 
-#: engines/glk/glulxe/glulxe.cpp:60
+#: engines/glk/glulxe/glulxe.cpp:58
 msgid "This is not a valid Glulx file."
 msgstr "Questo non è un file Glulx valido."
 
-#: engines/glk/glulxe/glulxe.cpp:67
+#: engines/glk/glulxe/glulxe.cpp:65
 msgid "This Glulx file is too old a version to execute."
 msgstr "La versione di questo file Glulx è troppo vecchia per essere eseguita."
 
-#: engines/glk/glulxe/glulxe.cpp:71
+#: engines/glk/glulxe/glulxe.cpp:69
 msgid "This Glulx file is too new a version to execute."
 msgstr ""
 "La versione di questo file Glulx è troppo aggiornata per essere eseguita."
@@ -3490,69 +3490,78 @@ msgstr "Barre HP"
 msgid "Enable hit point bar graphs"
 msgstr "Attiva le barre di energia (Hit Points)"
 
-#: engines/kyra/eobcommon.cpp:342 engines/kyra/lol.cpp:481
+#. I18N: L/R stands for Left/Right
+#: engines/kyra/detection.cpp:138
+msgid "Fight Button L/R Swap"
+msgstr ""
+
+#: engines/kyra/detection.cpp:139
+msgid "Left button to attack, right button to pick up items"
+msgstr ""
+
+#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr "Vai avanti"
 
-#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:482
+#: engines/kyra/eobcommon.cpp:344 engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr "Vai indietro"
 
-#: engines/kyra/eobcommon.cpp:344
+#: engines/kyra/eobcommon.cpp:345
 msgid "Move Left"
 msgstr "Vai a sinistra"
 
-#: engines/kyra/eobcommon.cpp:345
+#: engines/kyra/eobcommon.cpp:346
 msgid "Move Right"
 msgstr "Vai a destra"
 
-#: engines/kyra/eobcommon.cpp:346 engines/kyra/lol.cpp:485
+#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:485
 #: engines/pegasus/pegasus.cpp:2514
 msgid "Turn Left"
 msgstr "Gira a sinistra"
 
-#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:486
+#: engines/kyra/eobcommon.cpp:348 engines/kyra/lol.cpp:486
 #: engines/pegasus/pegasus.cpp:2515
 msgid "Turn Right"
 msgstr "Gira a destra"
 
-#: engines/kyra/eobcommon.cpp:348
+#: engines/kyra/eobcommon.cpp:349
 msgid "Open/Close Inventory"
 msgstr "Apri/Chiudi l'inventario"
 
-#: engines/kyra/eobcommon.cpp:349
+#: engines/kyra/eobcommon.cpp:350
 msgid "Switch Inventory/Character screen"
 msgstr "Alterna schermata Inventario/Personaggio"
 
-#: engines/kyra/eobcommon.cpp:350
+#: engines/kyra/eobcommon.cpp:351
 msgid "Camp"
 msgstr "Accampamento"
 
-#: engines/kyra/eobcommon.cpp:351
+#: engines/kyra/eobcommon.cpp:352
 msgid "Cast Spell"
 msgstr "Lancia incantesimo"
 
-#: engines/kyra/eobcommon.cpp:354
+#: engines/kyra/eobcommon.cpp:355
 msgid "Spell Level 1"
 msgstr "Incantesimo di livello 1"
 
-#: engines/kyra/eobcommon.cpp:355
+#: engines/kyra/eobcommon.cpp:356
 msgid "Spell Level 2"
 msgstr "Incantesimo di livello 2"
 
-#: engines/kyra/eobcommon.cpp:356
+#: engines/kyra/eobcommon.cpp:357
 msgid "Spell Level 3"
 msgstr "Incantesimo di livello 3"
 
-#: engines/kyra/eobcommon.cpp:357
+#: engines/kyra/eobcommon.cpp:358
 msgid "Spell Level 4"
 msgstr "Incantesimo di livello 4"
 
-#: engines/kyra/eobcommon.cpp:358
+#: engines/kyra/eobcommon.cpp:359
 msgid "Spell Level 5"
 msgstr "Incantesimo di livello 5"
 
-#: engines/kyra/eobcommon.cpp:367
+#: engines/kyra/eobcommon.cpp:368
 msgid "Spell Level 6"
 msgstr "Incantesimo di livello 6"
 
@@ -4941,7 +4950,7 @@ msgstr "Intro floppy"
 msgid "Use the floppy version's intro (CD version only)"
 msgstr "Usa la versione floppy dell'intro (solo versione CD)"
 
-#: engines/supernova/supernova.cpp:191
+#: engines/supernova/supernova.cpp:194
 #, c-format
 msgid ""
 "Incorrect version of the '%s' engine data file found. Expected %d but got %d."
@@ -4949,7 +4958,7 @@ msgstr ""
 "Versione del file di dati del motore '%s' non corretta. La versione "
 "compatibile è la %d ma è stata  rilevata la %d."
 
-#: engines/supernova/supernova.cpp:217
+#: engines/supernova/supernova.cpp:220
 #, c-format
 msgid "Unable to locate the text for %s language in '%s' engine data file."
 msgstr ""
diff --git a/po/nb_NO.po b/po/nb_NO.po
index edb08bd98a..c3293d077a 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.3.0svn\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2018-12-19 07:31+0100\n"
+"POT-Creation-Date: 2019-02-06 20:18+0100\n"
 "PO-Revision-Date: 2018-04-18 10:01+0000\n"
 "Last-Translator: Adrian Frühwirth <bonki@scummvm.org>\n"
 "Language-Team: Norwegian Bokmål <https://translations.scummvm.org/projects/"
@@ -689,7 +689,7 @@ msgstr "S
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
 #: engines/mohawk/dialogs.cpp:162 engines/mohawk/myst.cpp:942
-#: engines/mohawk/riven.cpp:662 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/riven.cpp:673 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Åpne spill:"
@@ -698,7 +698,7 @@ msgstr "
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
 #: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:162
-#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:662
+#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:673
 #: engines/parallaction/saveload.cpp:194 engines/pegasus/pegasus.cpp:355
 #: engines/scumm/dialogs.cpp:185 engines/tsage/scenes.cpp:601
 #: engines/wage/saveload.cpp:748
@@ -1914,10 +1914,10 @@ msgstr "~T~ilbake til oppstarter"
 #: engines/cge2/events.cpp:64 engines/cine/various.cpp:348
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
-#: engines/glk/streams.cpp:1485 engines/gnap/menu.cpp:464
+#: engines/glk/streams.cpp:1481 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
 #: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:954
-#: engines/mohawk/riven.cpp:674 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/riven.cpp:685 engines/neverhood/menumodule.cpp:880
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:675
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/startrek/saveload.cpp:42
@@ -1936,10 +1936,10 @@ msgstr "Lagret spill:"
 #: engines/cge/events.cpp:72 engines/cge2/events.cpp:64
 #: engines/cine/various.cpp:348 engines/cruise/menu.cpp:212
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
-#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1485
+#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1481
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
 #: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:163
-#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:674
+#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:685
 #: engines/neverhood/menumodule.cpp:880 engines/parallaction/saveload.cpp:209
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:676
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -2964,7 +2964,7 @@ msgstr "Sjekk for oppdateringer..."
 #: engines/access/resources.cpp:44 engines/drascula/drascula.cpp:966
 #: engines/hugo/hugo.cpp:437 engines/lure/lure.cpp:64
 #: engines/mortevielle/mortevielle.cpp:306 engines/sky/compact.cpp:131
-#: engines/supernova/supernova.cpp:175 engines/teenagent/resources.cpp:97
+#: engines/supernova/supernova.cpp:178 engines/teenagent/resources.cpp:97
 #: engines/tony/tony.cpp:198 engines/toon/toon.cpp:4926
 #, c-format
 msgid "Unable to locate the '%s' engine data file."
@@ -2972,7 +2972,7 @@ msgstr ""
 
 #: engines/access/resources.cpp:52 engines/drascula/drascula.cpp:980
 #: engines/hugo/hugo.cpp:448 engines/lure/lure.cpp:73
-#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:184
+#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:187
 #: engines/tony/tony.cpp:210 engines/toon/toon.cpp:4938
 #, c-format
 msgid "The '%s' engine data file is corrupt."
@@ -3065,7 +3065,7 @@ msgstr ""
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3081,7 +3081,7 @@ msgstr "Gjennopprett spill:"
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3381,24 +3381,24 @@ msgstr ""
 msgid "It's beyond my power to do that.\n"
 msgstr ""
 
-#: engines/glk/frotz/detection.cpp:154
+#: engines/glk/frotz/detection.cpp:166
 #, fuzzy
 msgid "Unnamed savegame"
 msgstr "Ikke navngitt spilltilstand"
 
-#: engines/glk/glulxe/glulxe.cpp:55
+#: engines/glk/glulxe/glulxe.cpp:53
 msgid "This is too short to be a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:60
+#: engines/glk/glulxe/glulxe.cpp:58
 msgid "This is not a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:67
+#: engines/glk/glulxe/glulxe.cpp:65
 msgid "This Glulx file is too old a version to execute."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:71
+#: engines/glk/glulxe/glulxe.cpp:69
 msgid "This Glulx file is too new a version to execute."
 msgstr ""
 
@@ -3496,73 +3496,82 @@ msgstr "HP bar grafer"
 msgid "Enable hit point bar graphs"
 msgstr "Aktiver hit point-bar grafer"
 
-#: engines/kyra/eobcommon.cpp:342 engines/kyra/lol.cpp:481
+#. I18N: L/R stands for Left/Right
+#: engines/kyra/detection.cpp:138
+msgid "Fight Button L/R Swap"
+msgstr ""
+
+#: engines/kyra/detection.cpp:139
+msgid "Left button to attack, right button to pick up items"
+msgstr ""
+
+#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr "Beveg Fremover"
 
-#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:482
+#: engines/kyra/eobcommon.cpp:344 engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr "Beveg Bakover"
 
-#: engines/kyra/eobcommon.cpp:344
+#: engines/kyra/eobcommon.cpp:345
 #, fuzzy
 msgid "Move Left"
 msgstr "Skli mot Venstre"
 
-#: engines/kyra/eobcommon.cpp:345
+#: engines/kyra/eobcommon.cpp:346
 #, fuzzy
 msgid "Move Right"
 msgstr "Skli mot Høyre"
 
-#: engines/kyra/eobcommon.cpp:346 engines/kyra/lol.cpp:485
+#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:485
 #: engines/pegasus/pegasus.cpp:2514
 msgid "Turn Left"
 msgstr "Svin til Venstre"
 
-#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:486
+#: engines/kyra/eobcommon.cpp:348 engines/kyra/lol.cpp:486
 #: engines/pegasus/pegasus.cpp:2515
 msgid "Turn Right"
 msgstr "Sving til Høyre"
 
-#: engines/kyra/eobcommon.cpp:348
+#: engines/kyra/eobcommon.cpp:349
 #, fuzzy
 msgid "Open/Close Inventory"
 msgstr "Inventar"
 
-#: engines/kyra/eobcommon.cpp:349
+#: engines/kyra/eobcommon.cpp:350
 msgid "Switch Inventory/Character screen"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:350
+#: engines/kyra/eobcommon.cpp:351
 msgid "Camp"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:351
+#: engines/kyra/eobcommon.cpp:352
 #, fuzzy
 msgid "Cast Spell"
 msgstr "Velg Trolldom"
 
-#: engines/kyra/eobcommon.cpp:354
+#: engines/kyra/eobcommon.cpp:355
 msgid "Spell Level 1"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:355
+#: engines/kyra/eobcommon.cpp:356
 msgid "Spell Level 2"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:356
+#: engines/kyra/eobcommon.cpp:357
 msgid "Spell Level 3"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:357
+#: engines/kyra/eobcommon.cpp:358
 msgid "Spell Level 4"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:358
+#: engines/kyra/eobcommon.cpp:359
 msgid "Spell Level 5"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:367
+#: engines/kyra/eobcommon.cpp:368
 msgid "Spell Level 6"
 msgstr ""
 
@@ -4892,13 +4901,13 @@ msgstr "Diskett-intro"
 msgid "Use the floppy version's intro (CD version only)"
 msgstr "Bruk diskettversjonens intro (Kun for CD-versjon)"
 
-#: engines/supernova/supernova.cpp:191
+#: engines/supernova/supernova.cpp:194
 #, c-format
 msgid ""
 "Incorrect version of the '%s' engine data file found. Expected %d but got %d."
 msgstr ""
 
-#: engines/supernova/supernova.cpp:217
+#: engines/supernova/supernova.cpp:220
 #, c-format
 msgid "Unable to locate the text for %s language in '%s' engine data file."
 msgstr ""
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 3cdbe706c1..12689dc028 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.9.0git\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2018-12-19 07:31+0100\n"
+"POT-Creation-Date: 2019-02-06 20:18+0100\n"
 "PO-Revision-Date: 2018-09-24 18:39+0000\n"
 "Last-Translator: Ben Castricum <github@bencastricum.nl>\n"
 "Language-Team: Dutch <https://translations.scummvm.org/projects/scummvm/"
@@ -688,7 +688,7 @@ msgstr "Zoeken:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
 #: engines/mohawk/dialogs.cpp:162 engines/mohawk/myst.cpp:942
-#: engines/mohawk/riven.cpp:662 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/riven.cpp:673 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Laad spel:"
@@ -697,7 +697,7 @@ msgstr "Laad spel:"
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
 #: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:162
-#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:662
+#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:673
 #: engines/parallaction/saveload.cpp:194 engines/pegasus/pegasus.cpp:355
 #: engines/scumm/dialogs.cpp:185 engines/tsage/scenes.cpp:601
 #: engines/wage/saveload.cpp:748
@@ -1898,10 +1898,10 @@ msgstr "S~t~artmenu"
 #: engines/cge2/events.cpp:64 engines/cine/various.cpp:348
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
-#: engines/glk/streams.cpp:1485 engines/gnap/menu.cpp:464
+#: engines/glk/streams.cpp:1481 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
 #: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:954
-#: engines/mohawk/riven.cpp:674 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/riven.cpp:685 engines/neverhood/menumodule.cpp:880
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:675
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/startrek/saveload.cpp:42
@@ -1920,10 +1920,10 @@ msgstr "Spel opslaan:"
 #: engines/cge/events.cpp:72 engines/cge2/events.cpp:64
 #: engines/cine/various.cpp:348 engines/cruise/menu.cpp:212
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
-#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1485
+#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1481
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
 #: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:163
-#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:674
+#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:685
 #: engines/neverhood/menumodule.cpp:880 engines/parallaction/saveload.cpp:209
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:676
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -2946,7 +2946,7 @@ msgstr "Controleren op updates..."
 #: engines/access/resources.cpp:44 engines/drascula/drascula.cpp:966
 #: engines/hugo/hugo.cpp:437 engines/lure/lure.cpp:64
 #: engines/mortevielle/mortevielle.cpp:306 engines/sky/compact.cpp:131
-#: engines/supernova/supernova.cpp:175 engines/teenagent/resources.cpp:97
+#: engines/supernova/supernova.cpp:178 engines/teenagent/resources.cpp:97
 #: engines/tony/tony.cpp:198 engines/toon/toon.cpp:4926
 #, c-format
 msgid "Unable to locate the '%s' engine data file."
@@ -2954,7 +2954,7 @@ msgstr "Kon de '%s' engine data file niet vinden."
 
 #: engines/access/resources.cpp:52 engines/drascula/drascula.cpp:980
 #: engines/hugo/hugo.cpp:448 engines/lure/lure.cpp:73
-#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:184
+#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:187
 #: engines/tony/tony.cpp:210 engines/toon/toon.cpp:4938
 #, c-format
 msgid "The '%s' engine data file is corrupt."
@@ -3054,7 +3054,7 @@ msgstr ""
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3070,7 +3070,7 @@ msgstr "Laad opgeslagen spel:"
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3369,24 +3369,24 @@ msgstr ""
 msgid "It's beyond my power to do that.\n"
 msgstr ""
 
-#: engines/glk/frotz/detection.cpp:154
+#: engines/glk/frotz/detection.cpp:166
 #, fuzzy
 msgid "Unnamed savegame"
 msgstr "Naamloos opgeslagen spel"
 
-#: engines/glk/glulxe/glulxe.cpp:55
+#: engines/glk/glulxe/glulxe.cpp:53
 msgid "This is too short to be a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:60
+#: engines/glk/glulxe/glulxe.cpp:58
 msgid "This is not a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:67
+#: engines/glk/glulxe/glulxe.cpp:65
 msgid "This Glulx file is too old a version to execute."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:71
+#: engines/glk/glulxe/glulxe.cpp:69
 msgid "This Glulx file is too new a version to execute."
 msgstr ""
 
@@ -3482,69 +3482,78 @@ msgstr "HP balk grafieken"
 msgid "Enable hit point bar graphs"
 msgstr "Hitpoints balkgrafieken inschakelen"
 
-#: engines/kyra/eobcommon.cpp:342 engines/kyra/lol.cpp:481
+#. I18N: L/R stands for Left/Right
+#: engines/kyra/detection.cpp:138
+msgid "Fight Button L/R Swap"
+msgstr ""
+
+#: engines/kyra/detection.cpp:139
+msgid "Left button to attack, right button to pick up items"
+msgstr ""
+
+#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr "Beweeg Vooruit"
 
-#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:482
+#: engines/kyra/eobcommon.cpp:344 engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr "Beweeg Terug"
 
-#: engines/kyra/eobcommon.cpp:344
+#: engines/kyra/eobcommon.cpp:345
 msgid "Move Left"
 msgstr "Verplaats naar links"
 
-#: engines/kyra/eobcommon.cpp:345
+#: engines/kyra/eobcommon.cpp:346
 msgid "Move Right"
 msgstr "Verplaats naar rechts"
 
-#: engines/kyra/eobcommon.cpp:346 engines/kyra/lol.cpp:485
+#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:485
 #: engines/pegasus/pegasus.cpp:2514
 msgid "Turn Left"
 msgstr "Draai Linksom"
 
-#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:486
+#: engines/kyra/eobcommon.cpp:348 engines/kyra/lol.cpp:486
 #: engines/pegasus/pegasus.cpp:2515
 msgid "Turn Right"
 msgstr "Draai Rechtsom"
 
-#: engines/kyra/eobcommon.cpp:348
+#: engines/kyra/eobcommon.cpp:349
 msgid "Open/Close Inventory"
 msgstr "Open/Sluit Inventaris"
 
-#: engines/kyra/eobcommon.cpp:349
+#: engines/kyra/eobcommon.cpp:350
 msgid "Switch Inventory/Character screen"
 msgstr "Wissel Inventaris/Personage scherm"
 
-#: engines/kyra/eobcommon.cpp:350
+#: engines/kyra/eobcommon.cpp:351
 msgid "Camp"
 msgstr "Kamp"
 
-#: engines/kyra/eobcommon.cpp:351
+#: engines/kyra/eobcommon.cpp:352
 msgid "Cast Spell"
 msgstr "Spreek spreuk uit"
 
-#: engines/kyra/eobcommon.cpp:354
+#: engines/kyra/eobcommon.cpp:355
 msgid "Spell Level 1"
 msgstr "Spreuk Niveau 1"
 
-#: engines/kyra/eobcommon.cpp:355
+#: engines/kyra/eobcommon.cpp:356
 msgid "Spell Level 2"
 msgstr "Spreuk Niveau 2"
 
-#: engines/kyra/eobcommon.cpp:356
+#: engines/kyra/eobcommon.cpp:357
 msgid "Spell Level 3"
 msgstr "Spreuk Niveau 3"
 
-#: engines/kyra/eobcommon.cpp:357
+#: engines/kyra/eobcommon.cpp:358
 msgid "Spell Level 4"
 msgstr "Spreuk Niveau 4"
 
-#: engines/kyra/eobcommon.cpp:358
+#: engines/kyra/eobcommon.cpp:359
 msgid "Spell Level 5"
 msgstr "Spreuk Niveau 5"
 
-#: engines/kyra/eobcommon.cpp:367
+#: engines/kyra/eobcommon.cpp:368
 msgid "Spell Level 6"
 msgstr "Spreuk Niveau 6"
 
@@ -4933,7 +4942,7 @@ msgstr "Floppy intro"
 msgid "Use the floppy version's intro (CD version only)"
 msgstr "Gebruik de floppy versie van de intro (alleen voor de CD versie)"
 
-#: engines/supernova/supernova.cpp:191
+#: engines/supernova/supernova.cpp:194
 #, c-format
 msgid ""
 "Incorrect version of the '%s' engine data file found. Expected %d but got %d."
@@ -4941,7 +4950,7 @@ msgstr ""
 "Verkeerde versie van de '%s' engine data file gevonden. Verwacht werd %d "
 "maar vond %d."
 
-#: engines/supernova/supernova.cpp:217
+#: engines/supernova/supernova.cpp:220
 #, c-format
 msgid "Unable to locate the text for %s language in '%s' engine data file."
 msgstr ""
diff --git a/po/nn_NO.po b/po/nn_NO.po
index e763c9037f..9b3ff26c31 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.3.0svn\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2018-12-19 07:31+0100\n"
+"POT-Creation-Date: 2019-02-06 20:18+0100\n"
 "PO-Revision-Date: 2018-04-18 10:13+0000\n"
 "Last-Translator: Adrian Frühwirth <bonki@scummvm.org>\n"
 "Language-Team: Norwegian Nynorsk <https://translations.scummvm.org/projects/"
@@ -682,7 +682,7 @@ msgstr "S
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
 #: engines/mohawk/dialogs.cpp:162 engines/mohawk/myst.cpp:942
-#: engines/mohawk/riven.cpp:662 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/riven.cpp:673 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Åpne spel:"
@@ -691,7 +691,7 @@ msgstr "
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
 #: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:162
-#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:662
+#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:673
 #: engines/parallaction/saveload.cpp:194 engines/pegasus/pegasus.cpp:355
 #: engines/scumm/dialogs.cpp:185 engines/tsage/scenes.cpp:601
 #: engines/wage/saveload.cpp:748
@@ -1907,10 +1907,10 @@ msgstr "Tilbake til Oppsta~r~tar"
 #: engines/cge2/events.cpp:64 engines/cine/various.cpp:348
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
-#: engines/glk/streams.cpp:1485 engines/gnap/menu.cpp:464
+#: engines/glk/streams.cpp:1481 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
 #: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:954
-#: engines/mohawk/riven.cpp:674 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/riven.cpp:685 engines/neverhood/menumodule.cpp:880
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:675
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/startrek/saveload.cpp:42
@@ -1929,10 +1929,10 @@ msgstr "Lagra spel:"
 #: engines/cge/events.cpp:72 engines/cge2/events.cpp:64
 #: engines/cine/various.cpp:348 engines/cruise/menu.cpp:212
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
-#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1485
+#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1481
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
 #: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:163
-#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:674
+#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:685
 #: engines/neverhood/menumodule.cpp:880 engines/parallaction/saveload.cpp:209
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:676
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -2954,7 +2954,7 @@ msgstr "SJ
 #: engines/access/resources.cpp:44 engines/drascula/drascula.cpp:966
 #: engines/hugo/hugo.cpp:437 engines/lure/lure.cpp:64
 #: engines/mortevielle/mortevielle.cpp:306 engines/sky/compact.cpp:131
-#: engines/supernova/supernova.cpp:175 engines/teenagent/resources.cpp:97
+#: engines/supernova/supernova.cpp:178 engines/teenagent/resources.cpp:97
 #: engines/tony/tony.cpp:198 engines/toon/toon.cpp:4926
 #, c-format
 msgid "Unable to locate the '%s' engine data file."
@@ -2962,7 +2962,7 @@ msgstr ""
 
 #: engines/access/resources.cpp:52 engines/drascula/drascula.cpp:980
 #: engines/hugo/hugo.cpp:448 engines/lure/lure.cpp:73
-#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:184
+#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:187
 #: engines/tony/tony.cpp:210 engines/toon/toon.cpp:4938
 #, c-format
 msgid "The '%s' engine data file is corrupt."
@@ -3057,7 +3057,7 @@ msgstr ""
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3073,7 +3073,7 @@ msgstr "Gjenopprett spel:"
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3363,24 +3363,24 @@ msgstr ""
 msgid "It's beyond my power to do that.\n"
 msgstr ""
 
-#: engines/glk/frotz/detection.cpp:154
+#: engines/glk/frotz/detection.cpp:166
 #, fuzzy
 msgid "Unnamed savegame"
 msgstr "Ikkje navngjeven speltilstand"
 
-#: engines/glk/glulxe/glulxe.cpp:55
+#: engines/glk/glulxe/glulxe.cpp:53
 msgid "This is too short to be a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:60
+#: engines/glk/glulxe/glulxe.cpp:58
 msgid "This is not a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:67
+#: engines/glk/glulxe/glulxe.cpp:65
 msgid "This Glulx file is too old a version to execute."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:71
+#: engines/glk/glulxe/glulxe.cpp:69
 msgid "This Glulx file is too new a version to execute."
 msgstr ""
 
@@ -3478,72 +3478,81 @@ msgstr ""
 msgid "Enable hit point bar graphs"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:342 engines/kyra/lol.cpp:481
+#. I18N: L/R stands for Left/Right
+#: engines/kyra/detection.cpp:138
+msgid "Fight Button L/R Swap"
+msgstr ""
+
+#: engines/kyra/detection.cpp:139
+msgid "Left button to attack, right button to pick up items"
+msgstr ""
+
+#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr "Beveg Framover"
 
-#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:482
+#: engines/kyra/eobcommon.cpp:344 engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr "Beveg Bakover"
 
-#: engines/kyra/eobcommon.cpp:344
+#: engines/kyra/eobcommon.cpp:345
 #, fuzzy
 msgid "Move Left"
 msgstr "Skli til Venstre"
 
-#: engines/kyra/eobcommon.cpp:345
+#: engines/kyra/eobcommon.cpp:346
 #, fuzzy
 msgid "Move Right"
 msgstr "Skli til Høyre"
 
-#: engines/kyra/eobcommon.cpp:346 engines/kyra/lol.cpp:485
+#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:485
 #: engines/pegasus/pegasus.cpp:2514
 msgid "Turn Left"
 msgstr "Snu til Venstre"
 
-#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:486
+#: engines/kyra/eobcommon.cpp:348 engines/kyra/lol.cpp:486
 #: engines/pegasus/pegasus.cpp:2515
 msgid "Turn Right"
 msgstr "Snu til Høyre"
 
-#: engines/kyra/eobcommon.cpp:348
+#: engines/kyra/eobcommon.cpp:349
 #, fuzzy
 msgid "Open/Close Inventory"
 msgstr "Inventar"
 
-#: engines/kyra/eobcommon.cpp:349
+#: engines/kyra/eobcommon.cpp:350
 msgid "Switch Inventory/Character screen"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:350
+#: engines/kyra/eobcommon.cpp:351
 msgid "Camp"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:351
+#: engines/kyra/eobcommon.cpp:352
 msgid "Cast Spell"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:354
+#: engines/kyra/eobcommon.cpp:355
 msgid "Spell Level 1"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:355
+#: engines/kyra/eobcommon.cpp:356
 msgid "Spell Level 2"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:356
+#: engines/kyra/eobcommon.cpp:357
 msgid "Spell Level 3"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:357
+#: engines/kyra/eobcommon.cpp:358
 msgid "Spell Level 4"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:358
+#: engines/kyra/eobcommon.cpp:359
 msgid "Spell Level 5"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:367
+#: engines/kyra/eobcommon.cpp:368
 msgid "Spell Level 6"
 msgstr ""
 
@@ -4850,13 +4859,13 @@ msgstr "Diskettintro"
 msgid "Use the floppy version's intro (CD version only)"
 msgstr "Nytt diskettversjonens åpning (Kun CD-versjon)"
 
-#: engines/supernova/supernova.cpp:191
+#: engines/supernova/supernova.cpp:194
 #, c-format
 msgid ""
 "Incorrect version of the '%s' engine data file found. Expected %d but got %d."
 msgstr ""
 
-#: engines/supernova/supernova.cpp:217
+#: engines/supernova/supernova.cpp:220
 #, c-format
 msgid "Unable to locate the text for %s language in '%s' engine data file."
 msgstr ""
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 7136e11f8c..d302f26338 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.3.0\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2018-12-19 07:31+0100\n"
+"POT-Creation-Date: 2019-02-06 20:18+0100\n"
 "PO-Revision-Date: 2018-04-18 10:13+0000\n"
 "Last-Translator: Adrian Frühwirth <bonki@scummvm.org>\n"
 "Language-Team: Polish <https://translations.scummvm.org/projects/scummvm/"
@@ -691,7 +691,7 @@ msgstr "Szukaj:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
 #: engines/mohawk/dialogs.cpp:162 engines/mohawk/myst.cpp:942
-#: engines/mohawk/riven.cpp:662 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/riven.cpp:673 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Wczytaj grê:"
@@ -700,7 +700,7 @@ msgstr "Wczytaj gr
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
 #: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:162
-#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:662
+#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:673
 #: engines/parallaction/saveload.cpp:194 engines/pegasus/pegasus.cpp:355
 #: engines/scumm/dialogs.cpp:185 engines/tsage/scenes.cpp:601
 #: engines/wage/saveload.cpp:748
@@ -1917,10 +1917,10 @@ msgstr "~P~owr
 #: engines/cge2/events.cpp:64 engines/cine/various.cpp:348
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
-#: engines/glk/streams.cpp:1485 engines/gnap/menu.cpp:464
+#: engines/glk/streams.cpp:1481 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
 #: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:954
-#: engines/mohawk/riven.cpp:674 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/riven.cpp:685 engines/neverhood/menumodule.cpp:880
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:675
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/startrek/saveload.cpp:42
@@ -1939,10 +1939,10 @@ msgstr "Zapis:"
 #: engines/cge/events.cpp:72 engines/cge2/events.cpp:64
 #: engines/cine/various.cpp:348 engines/cruise/menu.cpp:212
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
-#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1485
+#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1481
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
 #: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:163
-#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:674
+#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:685
 #: engines/neverhood/menumodule.cpp:880 engines/parallaction/saveload.cpp:209
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:676
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -2965,7 +2965,7 @@ msgstr "Sprawd
 #: engines/access/resources.cpp:44 engines/drascula/drascula.cpp:966
 #: engines/hugo/hugo.cpp:437 engines/lure/lure.cpp:64
 #: engines/mortevielle/mortevielle.cpp:306 engines/sky/compact.cpp:131
-#: engines/supernova/supernova.cpp:175 engines/teenagent/resources.cpp:97
+#: engines/supernova/supernova.cpp:178 engines/teenagent/resources.cpp:97
 #: engines/tony/tony.cpp:198 engines/toon/toon.cpp:4926
 #, c-format
 msgid "Unable to locate the '%s' engine data file."
@@ -2973,7 +2973,7 @@ msgstr ""
 
 #: engines/access/resources.cpp:52 engines/drascula/drascula.cpp:980
 #: engines/hugo/hugo.cpp:448 engines/lure/lure.cpp:73
-#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:184
+#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:187
 #: engines/tony/tony.cpp:210 engines/toon/toon.cpp:4938
 #, c-format
 msgid "The '%s' engine data file is corrupt."
@@ -3070,7 +3070,7 @@ msgstr ""
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3086,7 +3086,7 @@ msgstr "Wzn
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3385,24 +3385,24 @@ msgstr ""
 msgid "It's beyond my power to do that.\n"
 msgstr ""
 
-#: engines/glk/frotz/detection.cpp:154
+#: engines/glk/frotz/detection.cpp:166
 #, fuzzy
 msgid "Unnamed savegame"
 msgstr "Nienazwany stan gry"
 
-#: engines/glk/glulxe/glulxe.cpp:55
+#: engines/glk/glulxe/glulxe.cpp:53
 msgid "This is too short to be a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:60
+#: engines/glk/glulxe/glulxe.cpp:58
 msgid "This is not a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:67
+#: engines/glk/glulxe/glulxe.cpp:65
 msgid "This Glulx file is too old a version to execute."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:71
+#: engines/glk/glulxe/glulxe.cpp:69
 msgid "This Glulx file is too new a version to execute."
 msgstr ""
 
@@ -3500,73 +3500,82 @@ msgstr "Histogramy HP"
 msgid "Enable hit point bar graphs"
 msgstr "W³±cz histogramy punktów ¿ycia"
 
-#: engines/kyra/eobcommon.cpp:342 engines/kyra/lol.cpp:481
+#. I18N: L/R stands for Left/Right
+#: engines/kyra/detection.cpp:138
+msgid "Fight Button L/R Swap"
+msgstr ""
+
+#: engines/kyra/detection.cpp:139
+msgid "Left button to attack, right button to pick up items"
+msgstr ""
+
+#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr "Ruch naprzód"
 
-#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:482
+#: engines/kyra/eobcommon.cpp:344 engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr "Ruch wstecz"
 
-#: engines/kyra/eobcommon.cpp:344
+#: engines/kyra/eobcommon.cpp:345
 #, fuzzy
 msgid "Move Left"
 msgstr "¦lizg w lewo"
 
-#: engines/kyra/eobcommon.cpp:345
+#: engines/kyra/eobcommon.cpp:346
 #, fuzzy
 msgid "Move Right"
 msgstr "¦lizg w prawo"
 
-#: engines/kyra/eobcommon.cpp:346 engines/kyra/lol.cpp:485
+#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:485
 #: engines/pegasus/pegasus.cpp:2514
 msgid "Turn Left"
 msgstr "Obrót w lewo"
 
-#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:486
+#: engines/kyra/eobcommon.cpp:348 engines/kyra/lol.cpp:486
 #: engines/pegasus/pegasus.cpp:2515
 msgid "Turn Right"
 msgstr "Obrót w prawo"
 
-#: engines/kyra/eobcommon.cpp:348
+#: engines/kyra/eobcommon.cpp:349
 #, fuzzy
 msgid "Open/Close Inventory"
 msgstr "Ekwipunek"
 
-#: engines/kyra/eobcommon.cpp:349
+#: engines/kyra/eobcommon.cpp:350
 msgid "Switch Inventory/Character screen"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:350
+#: engines/kyra/eobcommon.cpp:351
 msgid "Camp"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:351
+#: engines/kyra/eobcommon.cpp:352
 #, fuzzy
 msgid "Cast Spell"
 msgstr "Wybierz zaklêcie"
 
-#: engines/kyra/eobcommon.cpp:354
+#: engines/kyra/eobcommon.cpp:355
 msgid "Spell Level 1"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:355
+#: engines/kyra/eobcommon.cpp:356
 msgid "Spell Level 2"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:356
+#: engines/kyra/eobcommon.cpp:357
 msgid "Spell Level 3"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:357
+#: engines/kyra/eobcommon.cpp:358
 msgid "Spell Level 4"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:358
+#: engines/kyra/eobcommon.cpp:359
 msgid "Spell Level 5"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:367
+#: engines/kyra/eobcommon.cpp:368
 msgid "Spell Level 6"
 msgstr ""
 
@@ -4901,13 +4910,13 @@ msgstr "Intro z wersji dyskietkowej"
 msgid "Use the floppy version's intro (CD version only)"
 msgstr "U¿yj intra z wersji dyskietkowej (tylko dla wersji CD)"
 
-#: engines/supernova/supernova.cpp:191
+#: engines/supernova/supernova.cpp:194
 #, c-format
 msgid ""
 "Incorrect version of the '%s' engine data file found. Expected %d but got %d."
 msgstr ""
 
-#: engines/supernova/supernova.cpp:217
+#: engines/supernova/supernova.cpp:220
 #, c-format
 msgid "Unable to locate the text for %s language in '%s' engine data file."
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 29939dfc90..b537ba17ee 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.3.0svn\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2018-12-19 07:31+0100\n"
+"POT-Creation-Date: 2019-02-06 20:18+0100\n"
 "PO-Revision-Date: 2018-08-06 21:33+0000\n"
 "Last-Translator: Alexandre Folle de Menezes <afmenez@terra.com.br>\n"
 "Language-Team: Portuguese (Brazil) <https://translations.scummvm.org/"
@@ -692,7 +692,7 @@ msgstr "Pesquisar:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
 #: engines/mohawk/dialogs.cpp:162 engines/mohawk/myst.cpp:942
-#: engines/mohawk/riven.cpp:662 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/riven.cpp:673 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Carregar jogo:"
@@ -701,7 +701,7 @@ msgstr "Carregar jogo:"
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
 #: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:162
-#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:662
+#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:673
 #: engines/parallaction/saveload.cpp:194 engines/pegasus/pegasus.cpp:355
 #: engines/scumm/dialogs.cpp:185 engines/tsage/scenes.cpp:601
 #: engines/wage/saveload.cpp:748
@@ -1941,10 +1941,10 @@ msgstr "~V~oltar ao menu"
 #: engines/cge2/events.cpp:64 engines/cine/various.cpp:348
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
-#: engines/glk/streams.cpp:1485 engines/gnap/menu.cpp:464
+#: engines/glk/streams.cpp:1481 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
 #: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:954
-#: engines/mohawk/riven.cpp:674 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/riven.cpp:685 engines/neverhood/menumodule.cpp:880
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:675
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/startrek/saveload.cpp:42
@@ -1963,10 +1963,10 @@ msgstr "Salvar jogo:"
 #: engines/cge/events.cpp:72 engines/cge2/events.cpp:64
 #: engines/cine/various.cpp:348 engines/cruise/menu.cpp:212
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
-#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1485
+#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1481
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
 #: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:163
-#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:674
+#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:685
 #: engines/neverhood/menumodule.cpp:880 engines/parallaction/saveload.cpp:209
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:676
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -3002,7 +3002,7 @@ msgstr "Procurar por Atualiza
 #: engines/access/resources.cpp:44 engines/drascula/drascula.cpp:966
 #: engines/hugo/hugo.cpp:437 engines/lure/lure.cpp:64
 #: engines/mortevielle/mortevielle.cpp:306 engines/sky/compact.cpp:131
-#: engines/supernova/supernova.cpp:175 engines/teenagent/resources.cpp:97
+#: engines/supernova/supernova.cpp:178 engines/teenagent/resources.cpp:97
 #: engines/tony/tony.cpp:198 engines/toon/toon.cpp:4926
 #, c-format
 msgid "Unable to locate the '%s' engine data file."
@@ -3010,7 +3010,7 @@ msgstr ""
 
 #: engines/access/resources.cpp:52 engines/drascula/drascula.cpp:980
 #: engines/hugo/hugo.cpp:448 engines/lure/lure.cpp:73
-#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:184
+#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:187
 #: engines/tony/tony.cpp:210 engines/toon/toon.cpp:4938
 #, c-format
 msgid "The '%s' engine data file is corrupt."
@@ -3100,7 +3100,7 @@ msgstr ""
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3116,7 +3116,7 @@ msgstr "Restaurar jogo:"
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3416,24 +3416,24 @@ msgstr ""
 msgid "It's beyond my power to do that.\n"
 msgstr ""
 
-#: engines/glk/frotz/detection.cpp:154
+#: engines/glk/frotz/detection.cpp:166
 #, fuzzy
 msgid "Unnamed savegame"
 msgstr "Não-titulado arquivo de save"
 
-#: engines/glk/glulxe/glulxe.cpp:55
+#: engines/glk/glulxe/glulxe.cpp:53
 msgid "This is too short to be a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:60
+#: engines/glk/glulxe/glulxe.cpp:58
 msgid "This is not a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:67
+#: engines/glk/glulxe/glulxe.cpp:65
 msgid "This Glulx file is too old a version to execute."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:71
+#: engines/glk/glulxe/glulxe.cpp:69
 msgid "This Glulx file is too new a version to execute."
 msgstr ""
 
@@ -3540,75 +3540,84 @@ msgstr ""
 msgid "Enable hit point bar graphs"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:342 engines/kyra/lol.cpp:481
+#. I18N: L/R stands for Left/Right
+#: engines/kyra/detection.cpp:138
+msgid "Fight Button L/R Swap"
+msgstr ""
+
+#: engines/kyra/detection.cpp:139
+msgid "Left button to attack, right button to pick up items"
+msgstr ""
+
+#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:482
+#: engines/kyra/eobcommon.cpp:344 engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:344
+#: engines/kyra/eobcommon.cpp:345
 #, fuzzy
 msgid "Move Left"
 msgstr "Esquerda"
 
-#: engines/kyra/eobcommon.cpp:345
+#: engines/kyra/eobcommon.cpp:346
 #, fuzzy
 msgid "Move Right"
 msgstr "Direita"
 
-#: engines/kyra/eobcommon.cpp:346 engines/kyra/lol.cpp:485
+#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:485
 #: engines/pegasus/pegasus.cpp:2514
 #, fuzzy
 msgid "Turn Left"
 msgstr "Desligar"
 
-#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:486
+#: engines/kyra/eobcommon.cpp:348 engines/kyra/lol.cpp:486
 #: engines/pegasus/pegasus.cpp:2515
 #, fuzzy
 msgid "Turn Right"
 msgstr "Cursor para a direita"
 
-#: engines/kyra/eobcommon.cpp:348
+#: engines/kyra/eobcommon.cpp:349
 #, fuzzy
 msgid "Open/Close Inventory"
 msgstr "Inventário"
 
-#: engines/kyra/eobcommon.cpp:349
+#: engines/kyra/eobcommon.cpp:350
 msgid "Switch Inventory/Character screen"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:350
+#: engines/kyra/eobcommon.cpp:351
 msgid "Camp"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:351
+#: engines/kyra/eobcommon.cpp:352
 #, fuzzy
 msgid "Cast Spell"
 msgstr "Escolher"
 
-#: engines/kyra/eobcommon.cpp:354
+#: engines/kyra/eobcommon.cpp:355
 msgid "Spell Level 1"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:355
+#: engines/kyra/eobcommon.cpp:356
 msgid "Spell Level 2"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:356
+#: engines/kyra/eobcommon.cpp:357
 msgid "Spell Level 3"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:357
+#: engines/kyra/eobcommon.cpp:358
 msgid "Spell Level 4"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:358
+#: engines/kyra/eobcommon.cpp:359
 msgid "Spell Level 5"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:367
+#: engines/kyra/eobcommon.cpp:368
 msgid "Spell Level 6"
 msgstr ""
 
@@ -4935,13 +4944,13 @@ msgstr ""
 msgid "Use the floppy version's intro (CD version only)"
 msgstr ""
 
-#: engines/supernova/supernova.cpp:191
+#: engines/supernova/supernova.cpp:194
 #, c-format
 msgid ""
 "Incorrect version of the '%s' engine data file found. Expected %d but got %d."
 msgstr ""
 
-#: engines/supernova/supernova.cpp:217
+#: engines/supernova/supernova.cpp:220
 #, c-format
 msgid "Unable to locate the text for %s language in '%s' engine data file."
 msgstr ""
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 3bc1d879d9..36a58c3df5 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.10.0git\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2018-12-19 07:31+0100\n"
+"POT-Creation-Date: 2019-02-06 20:18+0100\n"
 "PO-Revision-Date: 2018-08-06 21:24+0000\n"
 "Last-Translator: Fred Almeida <fred_pj@hotmail.com>\n"
 "Language-Team: Portuguese (Portugal) <https://translations.scummvm.org/"
@@ -693,7 +693,7 @@ msgstr "Pesquisar:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
 #: engines/mohawk/dialogs.cpp:162 engines/mohawk/myst.cpp:942
-#: engines/mohawk/riven.cpp:662 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/riven.cpp:673 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Carregar jogo:"
@@ -702,7 +702,7 @@ msgstr "Carregar jogo:"
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
 #: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:162
-#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:662
+#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:673
 #: engines/parallaction/saveload.cpp:194 engines/pegasus/pegasus.cpp:355
 #: engines/scumm/dialogs.cpp:185 engines/tsage/scenes.cpp:601
 #: engines/wage/saveload.cpp:748
@@ -1898,10 +1898,10 @@ msgstr ""
 #: engines/cge2/events.cpp:64 engines/cine/various.cpp:348
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
-#: engines/glk/streams.cpp:1485 engines/gnap/menu.cpp:464
+#: engines/glk/streams.cpp:1481 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
 #: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:954
-#: engines/mohawk/riven.cpp:674 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/riven.cpp:685 engines/neverhood/menumodule.cpp:880
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:675
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/startrek/saveload.cpp:42
@@ -1920,10 +1920,10 @@ msgstr ""
 #: engines/cge/events.cpp:72 engines/cge2/events.cpp:64
 #: engines/cine/various.cpp:348 engines/cruise/menu.cpp:212
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
-#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1485
+#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1481
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
 #: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:163
-#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:674
+#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:685
 #: engines/neverhood/menumodule.cpp:880 engines/parallaction/saveload.cpp:209
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:676
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -2905,7 +2905,7 @@ msgstr ""
 #: engines/access/resources.cpp:44 engines/drascula/drascula.cpp:966
 #: engines/hugo/hugo.cpp:437 engines/lure/lure.cpp:64
 #: engines/mortevielle/mortevielle.cpp:306 engines/sky/compact.cpp:131
-#: engines/supernova/supernova.cpp:175 engines/teenagent/resources.cpp:97
+#: engines/supernova/supernova.cpp:178 engines/teenagent/resources.cpp:97
 #: engines/tony/tony.cpp:198 engines/toon/toon.cpp:4926
 #, c-format
 msgid "Unable to locate the '%s' engine data file."
@@ -2913,7 +2913,7 @@ msgstr ""
 
 #: engines/access/resources.cpp:52 engines/drascula/drascula.cpp:980
 #: engines/hugo/hugo.cpp:448 engines/lure/lure.cpp:73
-#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:184
+#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:187
 #: engines/tony/tony.cpp:210 engines/toon/toon.cpp:4938
 #, c-format
 msgid "The '%s' engine data file is corrupt."
@@ -3002,7 +3002,7 @@ msgstr ""
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3018,7 +3018,7 @@ msgstr ""
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3296,23 +3296,23 @@ msgstr ""
 msgid "It's beyond my power to do that.\n"
 msgstr ""
 
-#: engines/glk/frotz/detection.cpp:154
+#: engines/glk/frotz/detection.cpp:166
 msgid "Unnamed savegame"
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:55
+#: engines/glk/glulxe/glulxe.cpp:53
 msgid "This is too short to be a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:60
+#: engines/glk/glulxe/glulxe.cpp:58
 msgid "This is not a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:67
+#: engines/glk/glulxe/glulxe.cpp:65
 msgid "This Glulx file is too old a version to execute."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:71
+#: engines/glk/glulxe/glulxe.cpp:69
 msgid "This Glulx file is too new a version to execute."
 msgstr ""
 
@@ -3408,69 +3408,78 @@ msgstr ""
 msgid "Enable hit point bar graphs"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:342 engines/kyra/lol.cpp:481
+#. I18N: L/R stands for Left/Right
+#: engines/kyra/detection.cpp:138
+msgid "Fight Button L/R Swap"
+msgstr ""
+
+#: engines/kyra/detection.cpp:139
+msgid "Left button to attack, right button to pick up items"
+msgstr ""
+
+#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:482
+#: engines/kyra/eobcommon.cpp:344 engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:344
+#: engines/kyra/eobcommon.cpp:345
 msgid "Move Left"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:345
+#: engines/kyra/eobcommon.cpp:346
 msgid "Move Right"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:346 engines/kyra/lol.cpp:485
+#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:485
 #: engines/pegasus/pegasus.cpp:2514
 msgid "Turn Left"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:486
+#: engines/kyra/eobcommon.cpp:348 engines/kyra/lol.cpp:486
 #: engines/pegasus/pegasus.cpp:2515
 msgid "Turn Right"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:348
+#: engines/kyra/eobcommon.cpp:349
 msgid "Open/Close Inventory"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:349
+#: engines/kyra/eobcommon.cpp:350
 msgid "Switch Inventory/Character screen"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:350
+#: engines/kyra/eobcommon.cpp:351
 msgid "Camp"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:351
+#: engines/kyra/eobcommon.cpp:352
 msgid "Cast Spell"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:354
+#: engines/kyra/eobcommon.cpp:355
 msgid "Spell Level 1"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:355
+#: engines/kyra/eobcommon.cpp:356
 msgid "Spell Level 2"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:356
+#: engines/kyra/eobcommon.cpp:357
 msgid "Spell Level 3"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:357
+#: engines/kyra/eobcommon.cpp:358
 msgid "Spell Level 4"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:358
+#: engines/kyra/eobcommon.cpp:359
 msgid "Spell Level 5"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:367
+#: engines/kyra/eobcommon.cpp:368
 msgid "Spell Level 6"
 msgstr ""
 
@@ -4741,13 +4750,13 @@ msgstr ""
 msgid "Use the floppy version's intro (CD version only)"
 msgstr ""
 
-#: engines/supernova/supernova.cpp:191
+#: engines/supernova/supernova.cpp:194
 #, c-format
 msgid ""
 "Incorrect version of the '%s' engine data file found. Expected %d but got %d."
 msgstr ""
 
-#: engines/supernova/supernova.cpp:217
+#: engines/supernova/supernova.cpp:220
 #, c-format
 msgid "Unable to locate the text for %s language in '%s' engine data file."
 msgstr ""
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 1e9735292d..ec4c9bb7d6 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.8.0svn\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2018-12-19 07:31+0100\n"
+"POT-Creation-Date: 2019-02-06 20:18+0100\n"
 "PO-Revision-Date: 2018-12-18 21:54+0000\n"
 "Last-Translator: Alex ASP <hshunt@questzone.ru>\n"
 "Language-Team: Russian <https://translations.scummvm.org/projects/scummvm/"
@@ -689,7 +689,7 @@ msgstr "
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
 #: engines/mohawk/dialogs.cpp:162 engines/mohawk/myst.cpp:942
-#: engines/mohawk/riven.cpp:662 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/riven.cpp:673 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "·ÐÓàã×Øâì ØÓàã:"
@@ -698,7 +698,7 @@ msgstr "
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
 #: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:162
-#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:662
+#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:673
 #: engines/parallaction/saveload.cpp:194 engines/pegasus/pegasus.cpp:355
 #: engines/scumm/dialogs.cpp:185 engines/tsage/scenes.cpp:601
 #: engines/wage/saveload.cpp:748
@@ -1901,10 +1901,10 @@ msgstr "~
 #: engines/cge2/events.cpp:64 engines/cine/various.cpp:348
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
-#: engines/glk/streams.cpp:1485 engines/gnap/menu.cpp:464
+#: engines/glk/streams.cpp:1481 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
 #: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:954
-#: engines/mohawk/riven.cpp:674 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/riven.cpp:685 engines/neverhood/menumodule.cpp:880
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:675
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/startrek/saveload.cpp:42
@@ -1923,10 +1923,10 @@ msgstr "
 #: engines/cge/events.cpp:72 engines/cge2/events.cpp:64
 #: engines/cine/various.cpp:348 engines/cruise/menu.cpp:212
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
-#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1485
+#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1481
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
 #: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:163
-#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:674
+#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:685
 #: engines/neverhood/menumodule.cpp:880 engines/parallaction/saveload.cpp:209
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:676
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -2945,7 +2945,7 @@ msgstr "
 #: engines/access/resources.cpp:44 engines/drascula/drascula.cpp:966
 #: engines/hugo/hugo.cpp:437 engines/lure/lure.cpp:64
 #: engines/mortevielle/mortevielle.cpp:306 engines/sky/compact.cpp:131
-#: engines/supernova/supernova.cpp:175 engines/teenagent/resources.cpp:97
+#: engines/supernova/supernova.cpp:178 engines/teenagent/resources.cpp:97
 #: engines/tony/tony.cpp:198 engines/toon/toon.cpp:4926
 #, c-format
 msgid "Unable to locate the '%s' engine data file."
@@ -2953,7 +2953,7 @@ msgstr "
 
 #: engines/access/resources.cpp:52 engines/drascula/drascula.cpp:980
 #: engines/hugo/hugo.cpp:448 engines/lure/lure.cpp:73
-#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:184
+#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:187
 #: engines/tony/tony.cpp:210 engines/toon/toon.cpp:4938
 #, c-format
 msgid "The '%s' engine data file is corrupt."
@@ -3050,7 +3050,7 @@ msgstr ""
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3066,7 +3066,7 @@ msgstr "
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3365,23 +3365,23 @@ msgstr "
 msgid "It's beyond my power to do that.\n"
 msgstr "ÍâÞ ÒÝÕ ÜÞØå ÒÞ×ÜÞÖÝÞáâÕÙ.\n"
 
-#: engines/glk/frotz/detection.cpp:154
+#: engines/glk/frotz/detection.cpp:166
 msgid "Unnamed savegame"
 msgstr "ÁÞåàÐÝñÝÝÐï ØÓàÐ ÑÕ× ØÜÕÝØ"
 
-#: engines/glk/glulxe/glulxe.cpp:55
+#: engines/glk/glulxe/glulxe.cpp:53
 msgid "This is too short to be a valid Glulx file."
 msgstr "ÄÐÙÛ áÛØèÚÞÜ ÚÞàÞâÚØÙ, çâÞÑë Ñëâì ßàÐÒØÛìÝëÜ Glulx-äÐÙÛÞÜ."
 
-#: engines/glk/glulxe/glulxe.cpp:60
+#: engines/glk/glulxe/glulxe.cpp:58
 msgid "This is not a valid Glulx file."
 msgstr "ÍâÞ ÝÕßàÐÒØÛìÝëÙ Glulx-äÐÙÛ."
 
-#: engines/glk/glulxe/glulxe.cpp:67
+#: engines/glk/glulxe/glulxe.cpp:65
 msgid "This Glulx file is too old a version to execute."
 msgstr "²ÕàáØï Glulx-äÐÙÛÐ áÛØèÚÞÜ áâÐàÐ, Õñ ÝÕ ßÞÛãçØâáï ×ÐßãáâØâì."
 
-#: engines/glk/glulxe/glulxe.cpp:71
+#: engines/glk/glulxe/glulxe.cpp:69
 msgid "This Glulx file is too new a version to execute."
 msgstr "²ÕàáØï Glulx-äÐÙÛÐ áÛØèÚÞÜ ÝÞÒÐï, Õñ ÝÕ ßÞÛãçØâáï ×ÐßãáâØâì."
 
@@ -3477,69 +3477,78 @@ msgstr "
 msgid "Enable hit point bar graphs"
 msgstr "²ÚÛîçØâì ÞâÞÑàÐÖÕÝØÕ ßÞÛÞáÞÚ ×ÔÞàÞÒìï"
 
-#: engines/kyra/eobcommon.cpp:342 engines/kyra/lol.cpp:481
+#. I18N: L/R stands for Left/Right
+#: engines/kyra/detection.cpp:138
+msgid "Fight Button L/R Swap"
+msgstr ""
+
+#: engines/kyra/detection.cpp:139
+msgid "Left button to attack, right button to pick up items"
+msgstr ""
+
+#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr "¸ÔâØ ÒßÕàñÔ"
 
-#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:482
+#: engines/kyra/eobcommon.cpp:344 engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr "¸ÔâØ ÝÐ×ÐÔ"
 
-#: engines/kyra/eobcommon.cpp:344
+#: engines/kyra/eobcommon.cpp:345
 msgid "Move Left"
 msgstr "¸ÔâØ ÒÛÕÒÞ"
 
-#: engines/kyra/eobcommon.cpp:345
+#: engines/kyra/eobcommon.cpp:346
 msgid "Move Right"
 msgstr "¸ÔâØ ÒßàÐÒÞ"
 
-#: engines/kyra/eobcommon.cpp:346 engines/kyra/lol.cpp:485
+#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:485
 #: engines/pegasus/pegasus.cpp:2514
 msgid "Turn Left"
 msgstr "¿ÞÒÞàÞâ ÝÐÛÕÒÞ"
 
-#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:486
+#: engines/kyra/eobcommon.cpp:348 engines/kyra/lol.cpp:486
 #: engines/pegasus/pegasus.cpp:2515
 msgid "Turn Right"
 msgstr "¿ÞÒÞàÞâ ÝÐßàÐÒÞ"
 
-#: engines/kyra/eobcommon.cpp:348
+#: engines/kyra/eobcommon.cpp:349
 msgid "Open/Close Inventory"
 msgstr "¾âÚàëâì/×ÐÚàëâì ØÝÒÕÝâÐàì"
 
-#: engines/kyra/eobcommon.cpp:349
+#: engines/kyra/eobcommon.cpp:350
 msgid "Switch Inventory/Character screen"
 msgstr "¿ÕàÕÚÛîçØâì ØÝÒÕÝâÐàì/íÚàÐÝ ßÕàáÞÝÐÖÐ"
 
-#: engines/kyra/eobcommon.cpp:350
+#: engines/kyra/eobcommon.cpp:351
 msgid "Camp"
 msgstr "»ÐÓÕàì"
 
-#: engines/kyra/eobcommon.cpp:351
+#: engines/kyra/eobcommon.cpp:352
 msgid "Cast Spell"
 msgstr "¿àØÜÕÝØâì ×ÐÚÛØÝÐÝØÕ"
 
-#: engines/kyra/eobcommon.cpp:354
+#: engines/kyra/eobcommon.cpp:355
 msgid "Spell Level 1"
 msgstr "·ÐÚÛØÝÐÝØÕ 1-ÓÞ ãàÞÒÝï"
 
-#: engines/kyra/eobcommon.cpp:355
+#: engines/kyra/eobcommon.cpp:356
 msgid "Spell Level 2"
 msgstr "·ÐÚÛØÝÐÝØÕ 2-ÓÞ ãàÞÒÝï"
 
-#: engines/kyra/eobcommon.cpp:356
+#: engines/kyra/eobcommon.cpp:357
 msgid "Spell Level 3"
 msgstr "·ÐÚÛØÝÐÝØÕ 3-ÓÞ ãàÞÒÝï"
 
-#: engines/kyra/eobcommon.cpp:357
+#: engines/kyra/eobcommon.cpp:358
 msgid "Spell Level 4"
 msgstr "·ÐÚÛØÝÐÝØÕ 4-ÓÞ ãàÞÒÝï"
 
-#: engines/kyra/eobcommon.cpp:358
+#: engines/kyra/eobcommon.cpp:359
 msgid "Spell Level 5"
 msgstr "·ÐÚÛØÝÐÝØÕ 5-ÓÞ ãàÞÒÝï"
 
-#: engines/kyra/eobcommon.cpp:367
+#: engines/kyra/eobcommon.cpp:368
 msgid "Spell Level 6"
 msgstr "·ÐÚÛØÝÐÝØÕ 6-ÓÞ ãàÞÒÝï"
 
@@ -4920,13 +4929,13 @@ msgstr "
 msgid "Use the floppy version's intro (CD version only)"
 msgstr "¸áßÞÛì×ÞÒÐâì ÒáâãßÛÕÝØÕ á ÓØÑÚØå ÔØáÚÞÒ (âÞÛìÚÞ ÔÛï CD-ÒÕàáØØ ØÓàë)"
 
-#: engines/supernova/supernova.cpp:191
+#: engines/supernova/supernova.cpp:194
 #, c-format
 msgid ""
 "Incorrect version of the '%s' engine data file found. Expected %d but got %d."
 msgstr "½ÕÒÕàÝÐï ÒÕàáØï äÐÙÛÐ ÔÒØÖÚÐ %s. ¾ÖØÔÐÛÐáì %d, Ð ÝÐÙÔÕÝÐ %d."
 
-#: engines/supernova/supernova.cpp:217
+#: engines/supernova/supernova.cpp:220
 #, c-format
 msgid "Unable to locate the text for %s language in '%s' engine data file."
 msgstr "½Õ ãÔÐÛÞáì ÝÐÙâØ âÕÚáâ ÔÛï ï×ëÚÐ %s Ò äÐÙÛÐå ÔÒØÖÚÐ %s."
diff --git a/po/scummvm.pot b/po/scummvm.pot
index f3fde448c0..3cf2736cac 100644
--- a/po/scummvm.pot
+++ b/po/scummvm.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 2.1.0git\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2018-12-19 07:31+0100\n"
+"POT-Creation-Date: 2019-02-06 20:18+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -672,7 +672,7 @@ msgstr ""
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
 #: engines/mohawk/dialogs.cpp:162 engines/mohawk/myst.cpp:942
-#: engines/mohawk/riven.cpp:662 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/riven.cpp:673 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr ""
@@ -681,7 +681,7 @@ msgstr ""
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
 #: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:162
-#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:662
+#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:673
 #: engines/parallaction/saveload.cpp:194 engines/pegasus/pegasus.cpp:355
 #: engines/scumm/dialogs.cpp:185 engines/tsage/scenes.cpp:601
 #: engines/wage/saveload.cpp:748
@@ -1850,10 +1850,10 @@ msgstr ""
 #: engines/cge2/events.cpp:64 engines/cine/various.cpp:348
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
-#: engines/glk/streams.cpp:1485 engines/gnap/menu.cpp:464
+#: engines/glk/streams.cpp:1481 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
 #: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:954
-#: engines/mohawk/riven.cpp:674 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/riven.cpp:685 engines/neverhood/menumodule.cpp:880
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:675
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/startrek/saveload.cpp:42
@@ -1872,10 +1872,10 @@ msgstr ""
 #: engines/cge/events.cpp:72 engines/cge2/events.cpp:64
 #: engines/cine/various.cpp:348 engines/cruise/menu.cpp:212
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
-#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1485
+#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1481
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
 #: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:163
-#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:674
+#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:685
 #: engines/neverhood/menumodule.cpp:880 engines/parallaction/saveload.cpp:209
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:676
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -2852,7 +2852,7 @@ msgstr ""
 #: engines/access/resources.cpp:44 engines/drascula/drascula.cpp:966
 #: engines/hugo/hugo.cpp:437 engines/lure/lure.cpp:64
 #: engines/mortevielle/mortevielle.cpp:306 engines/sky/compact.cpp:131
-#: engines/supernova/supernova.cpp:175 engines/teenagent/resources.cpp:97
+#: engines/supernova/supernova.cpp:178 engines/teenagent/resources.cpp:97
 #: engines/tony/tony.cpp:198 engines/toon/toon.cpp:4926
 #, c-format
 msgid "Unable to locate the '%s' engine data file."
@@ -2860,7 +2860,7 @@ msgstr ""
 
 #: engines/access/resources.cpp:52 engines/drascula/drascula.cpp:980
 #: engines/hugo/hugo.cpp:448 engines/lure/lure.cpp:73
-#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:184
+#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:187
 #: engines/tony/tony.cpp:210 engines/toon/toon.cpp:4938
 #, c-format
 msgid "The '%s' engine data file is corrupt."
@@ -2949,7 +2949,7 @@ msgstr ""
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -2965,7 +2965,7 @@ msgstr ""
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3242,23 +3242,23 @@ msgstr ""
 msgid "It's beyond my power to do that.\n"
 msgstr ""
 
-#: engines/glk/frotz/detection.cpp:154
+#: engines/glk/frotz/detection.cpp:166
 msgid "Unnamed savegame"
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:55
+#: engines/glk/glulxe/glulxe.cpp:53
 msgid "This is too short to be a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:60
+#: engines/glk/glulxe/glulxe.cpp:58
 msgid "This is not a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:67
+#: engines/glk/glulxe/glulxe.cpp:65
 msgid "This Glulx file is too old a version to execute."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:71
+#: engines/glk/glulxe/glulxe.cpp:69
 msgid "This Glulx file is too new a version to execute."
 msgstr ""
 
@@ -3354,69 +3354,78 @@ msgstr ""
 msgid "Enable hit point bar graphs"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:342 engines/kyra/lol.cpp:481
+#. I18N: L/R stands for Left/Right
+#: engines/kyra/detection.cpp:138
+msgid "Fight Button L/R Swap"
+msgstr ""
+
+#: engines/kyra/detection.cpp:139
+msgid "Left button to attack, right button to pick up items"
+msgstr ""
+
+#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:482
+#: engines/kyra/eobcommon.cpp:344 engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:344
+#: engines/kyra/eobcommon.cpp:345
 msgid "Move Left"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:345
+#: engines/kyra/eobcommon.cpp:346
 msgid "Move Right"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:346 engines/kyra/lol.cpp:485
+#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:485
 #: engines/pegasus/pegasus.cpp:2514
 msgid "Turn Left"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:486
+#: engines/kyra/eobcommon.cpp:348 engines/kyra/lol.cpp:486
 #: engines/pegasus/pegasus.cpp:2515
 msgid "Turn Right"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:348
+#: engines/kyra/eobcommon.cpp:349
 msgid "Open/Close Inventory"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:349
+#: engines/kyra/eobcommon.cpp:350
 msgid "Switch Inventory/Character screen"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:350
+#: engines/kyra/eobcommon.cpp:351
 msgid "Camp"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:351
+#: engines/kyra/eobcommon.cpp:352
 msgid "Cast Spell"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:354
+#: engines/kyra/eobcommon.cpp:355
 msgid "Spell Level 1"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:355
+#: engines/kyra/eobcommon.cpp:356
 msgid "Spell Level 2"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:356
+#: engines/kyra/eobcommon.cpp:357
 msgid "Spell Level 3"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:357
+#: engines/kyra/eobcommon.cpp:358
 msgid "Spell Level 4"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:358
+#: engines/kyra/eobcommon.cpp:359
 msgid "Spell Level 5"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:367
+#: engines/kyra/eobcommon.cpp:368
 msgid "Spell Level 6"
 msgstr ""
 
@@ -4685,13 +4694,13 @@ msgstr ""
 msgid "Use the floppy version's intro (CD version only)"
 msgstr ""
 
-#: engines/supernova/supernova.cpp:191
+#: engines/supernova/supernova.cpp:194
 #, c-format
 msgid ""
 "Incorrect version of the '%s' engine data file found. Expected %d but got %d."
 msgstr ""
 
-#: engines/supernova/supernova.cpp:217
+#: engines/supernova/supernova.cpp:220
 #, c-format
 msgid "Unable to locate the text for %s language in '%s' engine data file."
 msgstr ""
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 77667d912b..1406497a5b 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.5.0svn\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2018-12-19 07:31+0100\n"
+"POT-Creation-Date: 2019-02-06 20:18+0100\n"
 "PO-Revision-Date: 2018-06-11 21:45+0000\n"
 "Last-Translator: Adrian Frühwirth <bonki@scummvm.org>\n"
 "Language-Team: Swedish <https://translations.scummvm.org/projects/scummvm/"
@@ -691,7 +691,7 @@ msgstr "S
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
 #: engines/mohawk/dialogs.cpp:162 engines/mohawk/myst.cpp:942
-#: engines/mohawk/riven.cpp:662 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/riven.cpp:673 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Ladda spel:"
@@ -700,7 +700,7 @@ msgstr "Ladda spel:"
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
 #: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:162
-#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:662
+#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:673
 #: engines/parallaction/saveload.cpp:194 engines/pegasus/pegasus.cpp:355
 #: engines/scumm/dialogs.cpp:185 engines/tsage/scenes.cpp:601
 #: engines/wage/saveload.cpp:748
@@ -1916,10 +1916,10 @@ msgstr "
 #: engines/cge2/events.cpp:64 engines/cine/various.cpp:348
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
-#: engines/glk/streams.cpp:1485 engines/gnap/menu.cpp:464
+#: engines/glk/streams.cpp:1481 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
 #: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:954
-#: engines/mohawk/riven.cpp:674 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/riven.cpp:685 engines/neverhood/menumodule.cpp:880
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:675
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/startrek/saveload.cpp:42
@@ -1938,10 +1938,10 @@ msgstr "Spara spelet:"
 #: engines/cge/events.cpp:72 engines/cge2/events.cpp:64
 #: engines/cine/various.cpp:348 engines/cruise/menu.cpp:212
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
-#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1485
+#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1481
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
 #: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:163
-#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:674
+#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:685
 #: engines/neverhood/menumodule.cpp:880 engines/parallaction/saveload.cpp:209
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:676
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -2970,7 +2970,7 @@ msgstr "S
 #: engines/access/resources.cpp:44 engines/drascula/drascula.cpp:966
 #: engines/hugo/hugo.cpp:437 engines/lure/lure.cpp:64
 #: engines/mortevielle/mortevielle.cpp:306 engines/sky/compact.cpp:131
-#: engines/supernova/supernova.cpp:175 engines/teenagent/resources.cpp:97
+#: engines/supernova/supernova.cpp:178 engines/teenagent/resources.cpp:97
 #: engines/tony/tony.cpp:198 engines/toon/toon.cpp:4926
 #, c-format
 msgid "Unable to locate the '%s' engine data file."
@@ -2978,7 +2978,7 @@ msgstr "Kunde inte hitta spelmotorns datafil '%s'."
 
 #: engines/access/resources.cpp:52 engines/drascula/drascula.cpp:980
 #: engines/hugo/hugo.cpp:448 engines/lure/lure.cpp:73
-#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:184
+#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:187
 #: engines/tony/tony.cpp:210 engines/toon/toon.cpp:4938
 #, c-format
 msgid "The '%s' engine data file is corrupt."
@@ -3076,7 +3076,7 @@ msgstr ""
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3092,7 +3092,7 @@ msgstr "Ladda sparfil:"
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3391,24 +3391,24 @@ msgstr ""
 msgid "It's beyond my power to do that.\n"
 msgstr ""
 
-#: engines/glk/frotz/detection.cpp:154
+#: engines/glk/frotz/detection.cpp:166
 #, fuzzy
 msgid "Unnamed savegame"
 msgstr "Namnlös sparfil"
 
-#: engines/glk/glulxe/glulxe.cpp:55
+#: engines/glk/glulxe/glulxe.cpp:53
 msgid "This is too short to be a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:60
+#: engines/glk/glulxe/glulxe.cpp:58
 msgid "This is not a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:67
+#: engines/glk/glulxe/glulxe.cpp:65
 msgid "This Glulx file is too old a version to execute."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:71
+#: engines/glk/glulxe/glulxe.cpp:69
 msgid "This Glulx file is too new a version to execute."
 msgstr ""
 
@@ -3504,69 +3504,78 @@ msgstr "Livm
 msgid "Enable hit point bar graphs"
 msgstr "Aktivera livmätare"
 
-#: engines/kyra/eobcommon.cpp:342 engines/kyra/lol.cpp:481
+#. I18N: L/R stands for Left/Right
+#: engines/kyra/detection.cpp:138
+msgid "Fight Button L/R Swap"
+msgstr ""
+
+#: engines/kyra/detection.cpp:139
+msgid "Left button to attack, right button to pick up items"
+msgstr ""
+
+#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr "Steg framåt"
 
-#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:482
+#: engines/kyra/eobcommon.cpp:344 engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr "Steg bakåt"
 
-#: engines/kyra/eobcommon.cpp:344
+#: engines/kyra/eobcommon.cpp:345
 msgid "Move Left"
 msgstr "Flytta åt vänster"
 
-#: engines/kyra/eobcommon.cpp:345
+#: engines/kyra/eobcommon.cpp:346
 msgid "Move Right"
 msgstr "Flytta till höger"
 
-#: engines/kyra/eobcommon.cpp:346 engines/kyra/lol.cpp:485
+#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:485
 #: engines/pegasus/pegasus.cpp:2514
 msgid "Turn Left"
 msgstr "Sväng vänster"
 
-#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:486
+#: engines/kyra/eobcommon.cpp:348 engines/kyra/lol.cpp:486
 #: engines/pegasus/pegasus.cpp:2515
 msgid "Turn Right"
 msgstr "Sväng höger"
 
-#: engines/kyra/eobcommon.cpp:348
+#: engines/kyra/eobcommon.cpp:349
 msgid "Open/Close Inventory"
 msgstr "Öppna/Stäng Inventarie"
 
-#: engines/kyra/eobcommon.cpp:349
+#: engines/kyra/eobcommon.cpp:350
 msgid "Switch Inventory/Character screen"
 msgstr "Växla Inventarie/Karaktär skärm"
 
-#: engines/kyra/eobcommon.cpp:350
+#: engines/kyra/eobcommon.cpp:351
 msgid "Camp"
 msgstr "Läger"
 
-#: engines/kyra/eobcommon.cpp:351
+#: engines/kyra/eobcommon.cpp:352
 msgid "Cast Spell"
 msgstr "Kasta besvärjelse"
 
-#: engines/kyra/eobcommon.cpp:354
+#: engines/kyra/eobcommon.cpp:355
 msgid "Spell Level 1"
 msgstr "Besvärjelse Nivå 1"
 
-#: engines/kyra/eobcommon.cpp:355
+#: engines/kyra/eobcommon.cpp:356
 msgid "Spell Level 2"
 msgstr "Besvärjelse Nivå 2"
 
-#: engines/kyra/eobcommon.cpp:356
+#: engines/kyra/eobcommon.cpp:357
 msgid "Spell Level 3"
 msgstr "Besvärjelse Nivå 3"
 
-#: engines/kyra/eobcommon.cpp:357
+#: engines/kyra/eobcommon.cpp:358
 msgid "Spell Level 4"
 msgstr "Besvärjelse Nivå 4"
 
-#: engines/kyra/eobcommon.cpp:358
+#: engines/kyra/eobcommon.cpp:359
 msgid "Spell Level 5"
 msgstr "Besvärjelse Nivå 5"
 
-#: engines/kyra/eobcommon.cpp:367
+#: engines/kyra/eobcommon.cpp:368
 msgid "Spell Level 6"
 msgstr "Besvärjelse Nivå 6"
 
@@ -4939,14 +4948,14 @@ msgstr "Diskettintro"
 msgid "Use the floppy version's intro (CD version only)"
 msgstr "Använd diskettversionens intro (endast CD-version)"
 
-#: engines/supernova/supernova.cpp:191
+#: engines/supernova/supernova.cpp:194
 #, c-format
 msgid ""
 "Incorrect version of the '%s' engine data file found. Expected %d but got %d."
 msgstr ""
 "Felaktig version av datafilen '%s' hittades. Version %d krävs, hittade %d."
 
-#: engines/supernova/supernova.cpp:217
+#: engines/supernova/supernova.cpp:220
 #, c-format
 msgid "Unable to locate the text for %s language in '%s' engine data file."
 msgstr "Kunde inte hitta språk %s i spelmotorns datafil '%s'."
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 1c0311b800..0533ee2f38 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.9.0git\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2018-12-19 07:31+0100\n"
+"POT-Creation-Date: 2019-02-06 20:18+0100\n"
 "PO-Revision-Date: 2018-04-18 10:18+0000\n"
 "Last-Translator: Adrian Fruehwirth <bonki@scummvm.org>\n"
 "Language-Team: Ukrainian <https://translations.scummvm.org/projects/scummvm/"
@@ -692,7 +692,7 @@ msgstr "
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
 #: engines/mohawk/dialogs.cpp:162 engines/mohawk/myst.cpp:942
-#: engines/mohawk/riven.cpp:662 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/riven.cpp:673 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "·ÐÒÐÝâÐÖØâØ Óàã:"
@@ -701,7 +701,7 @@ msgstr "
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
 #: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:162
-#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:662
+#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:673
 #: engines/parallaction/saveload.cpp:194 engines/pegasus/pegasus.cpp:355
 #: engines/scumm/dialogs.cpp:185 engines/tsage/scenes.cpp:601
 #: engines/wage/saveload.cpp:748
@@ -1917,10 +1917,10 @@ msgstr "~
 #: engines/cge2/events.cpp:64 engines/cine/various.cpp:348
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
-#: engines/glk/streams.cpp:1485 engines/gnap/menu.cpp:464
+#: engines/glk/streams.cpp:1481 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
 #: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:954
-#: engines/mohawk/riven.cpp:674 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/riven.cpp:685 engines/neverhood/menumodule.cpp:880
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:675
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/startrek/saveload.cpp:42
@@ -1939,10 +1939,10 @@ msgstr "
 #: engines/cge/events.cpp:72 engines/cge2/events.cpp:64
 #: engines/cine/various.cpp:348 engines/cruise/menu.cpp:212
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
-#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1485
+#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1481
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
 #: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:163
-#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:674
+#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:685
 #: engines/neverhood/menumodule.cpp:880 engines/parallaction/saveload.cpp:209
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:676
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -2969,7 +2969,7 @@ msgstr "
 #: engines/access/resources.cpp:44 engines/drascula/drascula.cpp:966
 #: engines/hugo/hugo.cpp:437 engines/lure/lure.cpp:64
 #: engines/mortevielle/mortevielle.cpp:306 engines/sky/compact.cpp:131
-#: engines/supernova/supernova.cpp:175 engines/teenagent/resources.cpp:97
+#: engines/supernova/supernova.cpp:178 engines/teenagent/resources.cpp:97
 #: engines/tony/tony.cpp:198 engines/toon/toon.cpp:4926
 #, c-format
 msgid "Unable to locate the '%s' engine data file."
@@ -2977,7 +2977,7 @@ msgstr "
 
 #: engines/access/resources.cpp:52 engines/drascula/drascula.cpp:980
 #: engines/hugo/hugo.cpp:448 engines/lure/lure.cpp:73
-#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:184
+#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:187
 #: engines/tony/tony.cpp:210 engines/toon/toon.cpp:4938
 #, c-format
 msgid "The '%s' engine data file is corrupt."
@@ -3076,7 +3076,7 @@ msgstr ""
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3092,7 +3092,7 @@ msgstr "
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3390,24 +3390,24 @@ msgstr ""
 msgid "It's beyond my power to do that.\n"
 msgstr ""
 
-#: engines/glk/frotz/detection.cpp:154
+#: engines/glk/frotz/detection.cpp:166
 #, fuzzy
 msgid "Unnamed savegame"
 msgstr "·ÑÕàÕÖÕÝÐ ÓàÐ ÑÕ× öÜÕÝö"
 
-#: engines/glk/glulxe/glulxe.cpp:55
+#: engines/glk/glulxe/glulxe.cpp:53
 msgid "This is too short to be a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:60
+#: engines/glk/glulxe/glulxe.cpp:58
 msgid "This is not a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:67
+#: engines/glk/glulxe/glulxe.cpp:65
 msgid "This Glulx file is too old a version to execute."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:71
+#: engines/glk/glulxe/glulxe.cpp:69
 msgid "This Glulx file is too new a version to execute."
 msgstr ""
 
@@ -3503,69 +3503,78 @@ msgstr "
 msgid "Enable hit point bar graphs"
 msgstr "ÃØöÜÚÝãâØ ÓàÐäöçÝö áâÞÒßçØÚØ ×ÔÞàÞÒ'ï"
 
-#: engines/kyra/eobcommon.cpp:342 engines/kyra/lol.cpp:481
+#. I18N: L/R stands for Left/Right
+#: engines/kyra/detection.cpp:138
+msgid "Fight Button L/R Swap"
+msgstr ""
+
+#: engines/kyra/detection.cpp:139
+msgid "Left button to attack, right button to pick up items"
+msgstr ""
+
+#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr "ÀãåÐâØáì ãßÕàÕÔ"
 
-#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:482
+#: engines/kyra/eobcommon.cpp:344 engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr "ÀãåÐâØáì ÝÐ×ÐÔ"
 
-#: engines/kyra/eobcommon.cpp:344
+#: engines/kyra/eobcommon.cpp:345
 msgid "Move Left"
 msgstr "ÀãåÐâØáì ÝÐÛöÒÞ"
 
-#: engines/kyra/eobcommon.cpp:345
+#: engines/kyra/eobcommon.cpp:346
 msgid "Move Right"
 msgstr "ÀãåÐâØáì ÝÐßàÐÒÞ"
 
-#: engines/kyra/eobcommon.cpp:346 engines/kyra/lol.cpp:485
+#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:485
 #: engines/pegasus/pegasus.cpp:2514
 msgid "Turn Left"
 msgstr "¿ÞÒÕàÝãâØáï ÝÐÛöÒÞ"
 
-#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:486
+#: engines/kyra/eobcommon.cpp:348 engines/kyra/lol.cpp:486
 #: engines/pegasus/pegasus.cpp:2515
 msgid "Turn Right"
 msgstr "¿ÞÒÕàÝãâØáï ÝÐßàÐÒÞ"
 
-#: engines/kyra/eobcommon.cpp:348
+#: engines/kyra/eobcommon.cpp:349
 msgid "Open/Close Inventory"
 msgstr "²öÔÚàØâØ/×ÐÚàØâØ öÝÒÕÝâÐà"
 
-#: engines/kyra/eobcommon.cpp:349
+#: engines/kyra/eobcommon.cpp:350
 msgid "Switch Inventory/Character screen"
 msgstr "¿ÕàÕÚÛîçØâØ ÕÚàÐÝ ¦ÝÒÕÝâÐà/³ÕàÞÙ"
 
-#: engines/kyra/eobcommon.cpp:350
+#: engines/kyra/eobcommon.cpp:351
 msgid "Camp"
 msgstr "ÂÐÑöà"
 
-#: engines/kyra/eobcommon.cpp:351
+#: engines/kyra/eobcommon.cpp:352
 msgid "Cast Spell"
 msgstr "²ØÚÞàØáâÐâØ ×ÐÚÛïââï"
 
-#: engines/kyra/eobcommon.cpp:354
+#: engines/kyra/eobcommon.cpp:355
 msgid "Spell Level 1"
 msgstr "·ÐÚÛïââï 1-ÓÞ àöÒÝï"
 
-#: engines/kyra/eobcommon.cpp:355
+#: engines/kyra/eobcommon.cpp:356
 msgid "Spell Level 2"
 msgstr "·ÐÚÛïââï 2-ÓÞ àöÒÝï"
 
-#: engines/kyra/eobcommon.cpp:356
+#: engines/kyra/eobcommon.cpp:357
 msgid "Spell Level 3"
 msgstr "·ÐÚÛïââï 3-ÓÞ àöÒÝï"
 
-#: engines/kyra/eobcommon.cpp:357
+#: engines/kyra/eobcommon.cpp:358
 msgid "Spell Level 4"
 msgstr "·ÐÚÛïââï 4-ÓÞ àöÒÝï"
 
-#: engines/kyra/eobcommon.cpp:358
+#: engines/kyra/eobcommon.cpp:359
 msgid "Spell Level 5"
 msgstr "·ÐÚÛïââï 5-ÓÞ àöÒÝï"
 
-#: engines/kyra/eobcommon.cpp:367
+#: engines/kyra/eobcommon.cpp:368
 msgid "Spell Level 6"
 msgstr "·ÐÚÛïââï 6-ÓÞ àöÒÝï"
 
@@ -4918,14 +4927,14 @@ msgstr "
 msgid "Use the floppy version's intro (CD version only)"
 msgstr "²ØÚÞàØáâÞÒãÒÐâØ ÒÒÕÔÕÝÝï × äÛÞßßö-ÒÕàáö÷ (âöÛìÚØ ÔÛï CD ÒÕàáö÷ ÓàØ)"
 
-#: engines/supernova/supernova.cpp:191
+#: engines/supernova/supernova.cpp:194
 #, fuzzy, c-format
 msgid ""
 "Incorrect version of the '%s' engine data file found. Expected %d but got %d."
 msgstr ""
 "·ÝÐÙÔÕÝÞ ÝÕÒöàÝã ÒÕàáöî ÔÐÝØå ÔÒØÖÚÐ %s. ¾çöÚãÒÐÝÐ %d.%d, ÐÛÕ ×ÝÐÙÔÕÝÞ %d.%d."
 
-#: engines/supernova/supernova.cpp:217
+#: engines/supernova/supernova.cpp:220
 #, fuzzy, c-format
 msgid "Unable to locate the text for %s language in '%s' engine data file."
 msgstr "½Õ ÒÔÐÛÞáï ×ÝÐÙâØ äÐÙÛ ÔÐÝØå ÔÒØÖÚÐ %s."
diff --git a/po/zh-Latn_CN.po b/po/zh-Latn_CN.po
index 8928292f38..198fe925bf 100644
--- a/po/zh-Latn_CN.po
+++ b/po/zh-Latn_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.9.0git\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2018-12-19 07:31+0100\n"
+"POT-Creation-Date: 2019-02-06 20:18+0100\n"
 "PO-Revision-Date: 2018-08-06 21:28+0000\n"
 "Last-Translator: monkeymadness <ihave13redsox@hotmail.com>\n"
 "Language-Team: Chinese <https://translations.scummvm.org/projects/scummvm/"
@@ -678,7 +678,7 @@ msgstr "Sousuo:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
 #: engines/mohawk/dialogs.cpp:162 engines/mohawk/myst.cpp:942
-#: engines/mohawk/riven.cpp:662 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/riven.cpp:673 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Jiazai Youxi:"
@@ -687,7 +687,7 @@ msgstr "Jiazai Youxi:"
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
 #: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:162
-#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:662
+#: engines/mohawk/myst.cpp:942 engines/mohawk/riven.cpp:673
 #: engines/parallaction/saveload.cpp:194 engines/pegasus/pegasus.cpp:355
 #: engines/scumm/dialogs.cpp:185 engines/tsage/scenes.cpp:601
 #: engines/wage/saveload.cpp:748
@@ -1905,10 +1905,10 @@ msgstr "~R~Fanhui Qidongqi"
 #: engines/cge2/events.cpp:64 engines/cine/various.cpp:348
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
-#: engines/glk/streams.cpp:1485 engines/gnap/menu.cpp:464
+#: engines/glk/streams.cpp:1481 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
 #: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:954
-#: engines/mohawk/riven.cpp:674 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/riven.cpp:685 engines/neverhood/menumodule.cpp:880
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:675
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
 #: engines/sherlock/tattoo/widget_files.cpp:75 engines/startrek/saveload.cpp:42
@@ -1927,10 +1927,10 @@ msgstr "Baocun Youxi:"
 #: engines/cge/events.cpp:72 engines/cge2/events.cpp:64
 #: engines/cine/various.cpp:348 engines/cruise/menu.cpp:212
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
-#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1485
+#: engines/dreamweb/saveload.cpp:262 engines/glk/streams.cpp:1481
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
 #: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:163
-#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:674
+#: engines/mohawk/myst.cpp:954 engines/mohawk/riven.cpp:685
 #: engines/neverhood/menumodule.cpp:880 engines/parallaction/saveload.cpp:209
 #: engines/pegasus/pegasus.cpp:379 engines/sci/engine/guest_additions.cpp:676
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -2953,7 +2953,7 @@ msgstr "Jiancha Gengxin..."
 #: engines/access/resources.cpp:44 engines/drascula/drascula.cpp:966
 #: engines/hugo/hugo.cpp:437 engines/lure/lure.cpp:64
 #: engines/mortevielle/mortevielle.cpp:306 engines/sky/compact.cpp:131
-#: engines/supernova/supernova.cpp:175 engines/teenagent/resources.cpp:97
+#: engines/supernova/supernova.cpp:178 engines/teenagent/resources.cpp:97
 #: engines/tony/tony.cpp:198 engines/toon/toon.cpp:4926
 #, c-format
 msgid "Unable to locate the '%s' engine data file."
@@ -2961,7 +2961,7 @@ msgstr ""
 
 #: engines/access/resources.cpp:52 engines/drascula/drascula.cpp:980
 #: engines/hugo/hugo.cpp:448 engines/lure/lure.cpp:73
-#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:184
+#: engines/mortevielle/mortevielle.cpp:314 engines/supernova/supernova.cpp:187
 #: engines/tony/tony.cpp:210 engines/toon/toon.cpp:4938
 #, c-format
 msgid "The '%s' engine data file is corrupt."
@@ -3056,7 +3056,7 @@ msgstr ""
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3072,7 +3072,7 @@ msgstr "Huifu Youxi:"
 #: engines/cge/events.cpp:83 engines/cge2/events.cpp:75
 #: engines/cine/various.cpp:359 engines/dm/dm.cpp:276
 #: engines/dm/loadsave.cpp:187 engines/drascula/saveload.cpp:396
-#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1494
+#: engines/dreamweb/saveload.cpp:170 engines/glk/streams.cpp:1490
 #: engines/gnap/menu.cpp:473 engines/hugo/file.cpp:400
 #: engines/mads/nebular/dialogs_nebular.cpp:377
 #: engines/neverhood/menumodule.cpp:893
@@ -3371,24 +3371,24 @@ msgstr ""
 msgid "It's beyond my power to do that.\n"
 msgstr ""
 
-#: engines/glk/frotz/detection.cpp:154
+#: engines/glk/frotz/detection.cpp:166
 #, fuzzy
 msgid "Unnamed savegame"
 msgstr "Wuming Baocun Zhuangtai"
 
-#: engines/glk/glulxe/glulxe.cpp:55
+#: engines/glk/glulxe/glulxe.cpp:53
 msgid "This is too short to be a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:60
+#: engines/glk/glulxe/glulxe.cpp:58
 msgid "This is not a valid Glulx file."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:67
+#: engines/glk/glulxe/glulxe.cpp:65
 msgid "This Glulx file is too old a version to execute."
 msgstr ""
 
-#: engines/glk/glulxe/glulxe.cpp:71
+#: engines/glk/glulxe/glulxe.cpp:69
 msgid "This Glulx file is too new a version to execute."
 msgstr ""
 
@@ -3486,73 +3486,82 @@ msgstr "HP Tiao Tu"
 msgid "Enable hit point bar graphs"
 msgstr "Qiyong Jida Dian Tiao Tu"
 
-#: engines/kyra/eobcommon.cpp:342 engines/kyra/lol.cpp:481
+#. I18N: L/R stands for Left/Right
+#: engines/kyra/detection.cpp:138
+msgid "Fight Button L/R Swap"
+msgstr ""
+
+#: engines/kyra/detection.cpp:139
+msgid "Left button to attack, right button to pick up items"
+msgstr ""
+
+#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:481
 msgid "Move Forward"
 msgstr "Xiangqian Yidong"
 
-#: engines/kyra/eobcommon.cpp:343 engines/kyra/lol.cpp:482
+#: engines/kyra/eobcommon.cpp:344 engines/kyra/lol.cpp:482
 msgid "Move Back"
 msgstr "Xinaghou Yidong"
 
-#: engines/kyra/eobcommon.cpp:344
+#: engines/kyra/eobcommon.cpp:345
 #, fuzzy
 msgid "Move Left"
 msgstr "Xiangzuo Huadong"
 
-#: engines/kyra/eobcommon.cpp:345
+#: engines/kyra/eobcommon.cpp:346
 #, fuzzy
 msgid "Move Right"
 msgstr "Xiangyou Huadong"
 
-#: engines/kyra/eobcommon.cpp:346 engines/kyra/lol.cpp:485
+#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:485
 #: engines/pegasus/pegasus.cpp:2514
 msgid "Turn Left"
 msgstr "Zuozhuan"
 
-#: engines/kyra/eobcommon.cpp:347 engines/kyra/lol.cpp:486
+#: engines/kyra/eobcommon.cpp:348 engines/kyra/lol.cpp:486
 #: engines/pegasus/pegasus.cpp:2515
 msgid "Turn Right"
 msgstr "Youzhuan"
 
-#: engines/kyra/eobcommon.cpp:348
+#: engines/kyra/eobcommon.cpp:349
 #, fuzzy
 msgid "Open/Close Inventory"
 msgstr "Wupin"
 
-#: engines/kyra/eobcommon.cpp:349
+#: engines/kyra/eobcommon.cpp:350
 msgid "Switch Inventory/Character screen"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:350
+#: engines/kyra/eobcommon.cpp:351
 msgid "Camp"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:351
+#: engines/kyra/eobcommon.cpp:352
 #, fuzzy
 msgid "Cast Spell"
 msgstr "Xuanze Pinxie"
 
-#: engines/kyra/eobcommon.cpp:354
+#: engines/kyra/eobcommon.cpp:355
 msgid "Spell Level 1"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:355
+#: engines/kyra/eobcommon.cpp:356
 msgid "Spell Level 2"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:356
+#: engines/kyra/eobcommon.cpp:357
 msgid "Spell Level 3"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:357
+#: engines/kyra/eobcommon.cpp:358
 msgid "Spell Level 4"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:358
+#: engines/kyra/eobcommon.cpp:359
 msgid "Spell Level 5"
 msgstr ""
 
-#: engines/kyra/eobcommon.cpp:367
+#: engines/kyra/eobcommon.cpp:368
 msgid "Spell Level 6"
 msgstr ""
 
@@ -4880,13 +4889,13 @@ msgstr "Ruanpan Jieshao"
 msgid "Use the floppy version's intro (CD version only)"
 msgstr "Shiyong Ruanpan Banben JIeshao (jin CD banben)"
 
-#: engines/supernova/supernova.cpp:191
+#: engines/supernova/supernova.cpp:194
 #, c-format
 msgid ""
 "Incorrect version of the '%s' engine data file found. Expected %d but got %d."
 msgstr ""
 
-#: engines/supernova/supernova.cpp:217
+#: engines/supernova/supernova.cpp:220
 #, c-format
 msgid "Unable to locate the text for %s language in '%s' engine data file."
 msgstr ""
-- 
cgit v1.2.3