I18N: Update translations templates

24 files changed, 1034 insertions, 818 deletions

diff --git a/po/be_BY.po b/po/be_BY.po
index 14b50e93ba..abb9d2bb5a 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-06-29 13:20+0200\n"
+"POT-Creation-Date: 2018-06-29 13:32+0200\n"
 "PO-Revision-Date: 2018-04-18 10:07+0000\n"
 "Last-Translator: Adrian Fruehwirth <bonki@scummvm.org>\n"
 "Language-Team: Belarusian <https://translations.scummvm.org/projects/scummvm/"
@@ -69,6 +69,9 @@ msgstr "ÃÒÕàå"
 #: engines/mohawk/myst_stacks/menu.cpp:256
 #: engines/mohawk/myst_stacks/menu.cpp:273
 #: engines/mohawk/myst_stacks/menu.cpp:291
+#: engines/mohawk/riven_stacks/aspit.cpp:395
+#: engines/mohawk/riven_stacks/aspit.cpp:417
+#: engines/mohawk/riven_stacks/aspit.cpp:501
 #: engines/parallaction/saveload.cpp:271 engines/scumm/dialogs.cpp:187
 #: engines/sword1/control.cpp:887
 msgid "Cancel"
@@ -593,7 +596,7 @@ msgstr "½ÐæöáÝöæÕ ÚÛÐÒöèã ÔÛï ßàë×ÝÐçíÝÝï"
 msgid "Choose an action to map"
 msgstr "°ÑïàëæÕ Ô×ÕïÝÝÕ ÔÛï ßàë×ÝÐçíÝÝï"
 
-#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:101
+#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:143
 msgid "~Q~uit"
 msgstr "~²~ëåÐÔ"
 
@@ -681,8 +684,8 @@ msgid "Search:"
 msgstr "¿ÞèãÚ:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:106 engines/mohawk/myst.cpp:884
-#: engines/mohawk/riven.cpp:553 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:884
+#: engines/mohawk/riven.cpp:629 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "·ÐÓàã×öæì ÓãÛìÝî:"
@@ -690,8 +693,8 @@ msgstr "·ÐÓàã×öæì ÓãÛìÝî:"
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
-#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:106
-#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:553
+#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:163
+#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:629
 #: 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
@@ -1823,11 +1826,11 @@ msgstr "<ÅöÑÝÐÕ ×ÝÐçíÝÝÕ>"
 msgid "~R~esume"
 msgstr "¿àÐæïÓ~Ý~ãæì"
 
-#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:99
+#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:141
 msgid "~L~oad"
 msgstr "·Ð~Ó~àã×öæì"
 
-#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:100
+#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:142
 msgid "~S~ave"
 msgstr "·Ð~ß~öáÐæì"
 
@@ -1858,8 +1861,8 @@ msgstr "³~Ð~ÛÞþÝÐÕ ÜÕÝî"
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
-#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:107
-#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:565
+#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:164
+#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:641
 #: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:658
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
@@ -1880,8 +1883,8 @@ msgstr "·ÐåÐÒÐæì ÓãÛìÝî:"
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
 #: engines/dreamweb/saveload.cpp:262 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
-#: engines/mohawk/dialogs.cpp:107 engines/mohawk/myst.cpp:896
-#: engines/mohawk/riven.cpp:565 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/dialogs.cpp:164 engines/mohawk/myst.cpp:896
+#: engines/mohawk/riven.cpp:641 engines/neverhood/menumodule.cpp:880
 #: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:659
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -1911,12 +1914,12 @@ msgstr ""
 "½Õ ÐâàëÜÐÛÐáï ×ÐåÐÒÐæì ÓãÛìÝî (%s)! ·ÒïàÝöæÕáï ÔÐ äÐÙÛÐ README ×Ð "
 "ßÐÔàÐÑï×ÝÐáæïÜö ö þÚÐ×ÐÝÝïÜö ÔÐ ÐâàëÜÐÝÝï ÔÐÛÕÙèÐÙ ÔÐßÐÜÞÓö."
 
-#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:103
+#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:99
 #: engines/tsage/dialogs.cpp:112
 msgid "~O~K"
 msgstr "~¾~º"
 
-#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:104
+#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:100
 #: engines/tsage/dialogs.cpp:113
 msgid "~C~ancel"
 msgstr "~°~ÔÜÕÝÐ"
@@ -2173,7 +2176,8 @@ msgstr "²ë áÐßàÐþÔë ÖÐÔÐÕæÕ ÒëÙáæö?"
 #: backends/platform/symbian/src/SymbianActions.cpp:52
 #: backends/platform/wince/CEActionsPocket.cpp:44
 #: backends/platform/wince/CEActionsSmartphone.cpp:52
-#: engines/mohawk/myst_stacks/menu.cpp:290 engines/scumm/dialogs.cpp:188
+#: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500 engines/scumm/dialogs.cpp:188
 #: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85
 msgid "Quit"
 msgstr "²ëåÐÔ"
@@ -3300,57 +3304,57 @@ msgstr "°ÝöÜÐÒÐÝë öÝâíàäÕÙá ÓãÛìÝö"
 msgid "Naughty game mode"
 msgstr "³Ðàí×Ýë àíÖëÜ ÓãÛìÝö"
 
-#: engines/mohawk/detection.cpp:162
+#: engines/mohawk/detection.cpp:154
 msgid "Play the Myst fly by movie"
 msgstr "¿àÐÙÓàÐÒÐæì àÞÛöÚ ßàÐÛñâã ÝÐÔ Myst"
 
-#: engines/mohawk/detection.cpp:163
+#: engines/mohawk/detection.cpp:155
 msgid "The Myst fly by movie was not played by the original engine."
 msgstr "ÀÞÛöÚ ßàÐÛñâã ÝÐÔ Myst ÝÕ ßàÐÙÓàÐÒÐþáï ÐàëÓöÝÐÛìÝëÜ àãåÐÒöçÚÞÜ."
 
 #. I18N: Option for fast scene switching
-#: engines/mohawk/dialogs.cpp:190 engines/mohawk/dialogs.cpp:289
+#: engines/mohawk/dialogs.cpp:146 engines/mohawk/dialogs.cpp:286
 msgid "~Z~ip Mode Activated"
 msgstr "~À~íÖëÜ åãâÚÐÓÐ ßÕàÐåÞÔã ÐÚâëÒÐÒÐÝë"
 
-#: engines/mohawk/dialogs.cpp:191
+#: engines/mohawk/dialogs.cpp:147
 msgid "~T~ransitions Enabled"
 msgstr "~¿~ÕàÐåÞÔë ÐÚâëÒÐÒÐÝë"
 
 #. I18N: Drop book page
-#: engines/mohawk/dialogs.cpp:193
+#: engines/mohawk/dialogs.cpp:149
 msgid "~D~rop Page"
 msgstr "~²~ëÚöÝãæì áâÐàÞÝÚã"
 
-#: engines/mohawk/dialogs.cpp:197
+#: engines/mohawk/dialogs.cpp:153
 msgid "Show ~M~ap"
 msgstr "¿ÐÚÐ×Ðæì ~Ú~Ðàâã"
 
-#: engines/mohawk/dialogs.cpp:203
+#: engines/mohawk/dialogs.cpp:159
 msgid "Main Men~u~"
 msgstr "³ÐÛÞþÝÐÕ ÜÕÝ~î~"
 
-#: engines/mohawk/dialogs.cpp:290
+#: engines/mohawk/dialogs.cpp:287
 msgid "~W~ater Effect Enabled"
 msgstr "~Í~äÕÚâë ÒÐÔë þÚÛîçÐÝë"
 
-#: engines/mohawk/dialogs.cpp:292
+#: engines/mohawk/dialogs.cpp:289
 msgid "Transitions:"
 msgstr "¿ÕàÐåÞÔë:"
 
-#: engines/mohawk/dialogs.cpp:294
+#: engines/mohawk/dialogs.cpp:291
 msgid "Disabled"
 msgstr "²ëÛãçÐÝë"
 
-#: engines/mohawk/dialogs.cpp:295
+#: engines/mohawk/dialogs.cpp:292
 msgid "Fastest"
 msgstr "ÅãâÚöï"
 
-#: engines/mohawk/dialogs.cpp:296
+#: engines/mohawk/dialogs.cpp:293
 msgid "Normal"
 msgstr "·ÒëçÐÙÝëï"
 
-#: engines/mohawk/dialogs.cpp:297
+#: engines/mohawk/dialogs.cpp:294
 msgid "Best"
 msgstr "»Õßèëï"
 
@@ -3359,32 +3363,37 @@ msgid "The game is paused. Press any key to continue."
 msgstr "³ãÛìÝï ßàëßëÝÕÝÐ. ºÐÑ ßàÐæïÓÝãæì, ÝÐæöáÝöæÕ ÛîÑãî ÚÝÞßÚã."
 
 #: engines/mohawk/myst_stacks/menu.cpp:255
+#: engines/mohawk/riven_stacks/aspit.cpp:394
 msgid ""
 "Are you sure you want to load a saved game? All unsaved progress will be "
 "lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:256
+#: engines/mohawk/riven_stacks/aspit.cpp:395
 #, fuzzy
 msgid "Load game"
 msgstr "·ÐÓàã×öæì ÓãÛìÝî:"
 
 #: engines/mohawk/myst_stacks/menu.cpp:272
+#: engines/mohawk/riven_stacks/aspit.cpp:416
 msgid ""
 "Are you sure you want to start a new game? All unsaved progress will be lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:273
+#: engines/mohawk/riven_stacks/aspit.cpp:417
 #, fuzzy
 msgid "New game"
 msgstr "½ÞÒÐÕ ×ÐåÐÒÐÝÝÕ"
 
 #: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500
 #, fuzzy
 msgid "Are you sure you want to quit? All unsaved progress will be lost."
 msgstr "   ²ë þßíþÝÕÝë, èâÞ ÖÐÔÐÕæÕ ÒëÙáæö?   "
 
-#: engines/mohawk/riven.cpp:154
+#: engines/mohawk/riven.cpp:158
 msgid ""
 "You're missing a Riven executable. The Windows executable is 'riven.exe' or "
 "'rivendmo.exe'. "
@@ -3392,7 +3401,7 @@ msgstr ""
 "±àÐÚãÕ ÒëÚÐÝÐÛìÝÐÓÐ äÐÙÛÐ Riven. ²ëÚÐÝÐÛìÝë äÐÙÛ ÔÛï Windows ×ÐÒÕææÐ 'riven."
 "exe' æö 'rivendmo.exe'. "
 
-#: engines/mohawk/riven.cpp:155
+#: engines/mohawk/riven.cpp:159
 msgid ""
 "Using the 'arcriven.z' installer file also works. In addition, you can use "
 "the Mac 'Riven' executable."
@@ -3400,18 +3409,18 @@ msgstr ""
 "·ÐÜÕáâ ïÓÞ ßÐÔëÔ×Õ äÐÙÛ ãáâÐÛñþÝöÚÐ 'arcriven.z'. ÂÐÚáÐÜÐ ÜÞÖÝÐ áÚÐàëáâÐæì "
 "ÒëÚÐÝÐÛìÝë äÐÙÛ 'Riven' ÔÛï Mac."
 
-#: engines/mohawk/riven.cpp:166
+#: engines/mohawk/riven.cpp:170
 msgid ""
 "You're missing 'extras.mhk'. Using the 'arcriven.z' installer file also "
 "works."
 msgstr ""
 "±àÐÚãÕ äÐÙÛÐ 'extras.mhk'. ·ÐÜÕáâ ïÓÞ ÜÞÖÝÐ áÚÐàëáâÐæì äÐÙÛ 'arcriven.z'."
 
-#: engines/mohawk/riven.cpp:452
+#: engines/mohawk/riven.cpp:498
 msgid "You are missing the following required Riven data files:\n"
 msgstr "±àÐÚãÕ ÝÐáâãßÝëå äÐÙÛÐþ ÓãÛìÝö Riven:\n"
 
-#: engines/mohawk/riven_stack.cpp:182
+#: engines/mohawk/riven_stack.cpp:204
 msgid ""
 "Exploration beyond this point available only within the full version of\n"
 "the game."
@@ -3419,7 +3428,7 @@ msgstr ""
 "´ÐáÛÕÔÒÐÝÝÕ ÔÐÛÕÙ æïßÕàÐèÝïÙ ÜïÖë ÔÐáâãßÝÐ âÞÛìÚö\n"
 "þ ßÞþÝÐÙ ÒÕàáöö ÓãÛìÝö."
 
-#: engines/mohawk/riven_stacks/aspit.cpp:309
+#: engines/mohawk/riven_stacks/aspit.cpp:474
 msgid ""
 "At this point, the Riven Demo would\n"
 "ask if you would like to open a web browser\n"
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 8ebf2400ba..2de6c5a186 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-06-29 13:20+0200\n"
+"POT-Creation-Date: 2018-06-29 13:32+0200\n"
 "PO-Revision-Date: 2018-04-18 10:09+0000\n"
 "Last-Translator: Adrian Frühwirth <bonki@scummvm.org>\n"
 "Language-Team: Catalan <https://translations.scummvm.org/projects/scummvm/"
@@ -69,6 +69,9 @@ msgstr "Amunt"
 #: engines/mohawk/myst_stacks/menu.cpp:256
 #: engines/mohawk/myst_stacks/menu.cpp:273
 #: engines/mohawk/myst_stacks/menu.cpp:291
+#: engines/mohawk/riven_stacks/aspit.cpp:395
+#: engines/mohawk/riven_stacks/aspit.cpp:417
+#: engines/mohawk/riven_stacks/aspit.cpp:501
 #: engines/parallaction/saveload.cpp:271 engines/scumm/dialogs.cpp:187
 #: engines/sword1/control.cpp:887
 msgid "Cancel"
@@ -594,7 +597,7 @@ msgstr "Premeu la tecla a associar"
 msgid "Choose an action to map"
 msgstr "Sel·leccioneu una acció a assignar"
 
-#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:101
+#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:143
 msgid "~Q~uit"
 msgstr "~T~anca"
 
@@ -684,8 +687,8 @@ msgid "Search:"
 msgstr "Cerca:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:106 engines/mohawk/myst.cpp:884
-#: engines/mohawk/riven.cpp:553 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:884
+#: engines/mohawk/riven.cpp:629 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Carrega partida:"
@@ -693,8 +696,8 @@ msgstr "Carrega partida:"
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
-#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:106
-#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:553
+#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:163
+#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:629
 #: 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
@@ -1823,11 +1826,11 @@ msgstr "<Valor incorrecte>"
 msgid "~R~esume"
 msgstr "~C~ontinua"
 
-#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:99
+#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:141
 msgid "~L~oad"
 msgstr "C~a~rrega"
 
-#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:100
+#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:142
 msgid "~S~ave"
 msgstr "~D~esa"
 
@@ -1858,8 +1861,8 @@ msgstr "~R~etorna al Llançador"
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
-#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:107
-#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:565
+#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:164
+#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:641
 #: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:658
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
@@ -1880,8 +1883,8 @@ msgstr "Desa la partida:"
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
 #: engines/dreamweb/saveload.cpp:262 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
-#: engines/mohawk/dialogs.cpp:107 engines/mohawk/myst.cpp:896
-#: engines/mohawk/riven.cpp:565 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/dialogs.cpp:164 engines/mohawk/myst.cpp:896
+#: engines/mohawk/riven.cpp:641 engines/neverhood/menumodule.cpp:880
 #: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:659
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -1910,12 +1913,12 @@ msgstr ""
 "No s'ha pogut desar la partida (%s)! Consulteu el fitxer README per a la "
 "informació bàsica i les instruccions sobre com obtenir més assistència."
 
-#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:103
+#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:99
 #: engines/tsage/dialogs.cpp:112
 msgid "~O~K"
 msgstr "~D~'acord"
 
-#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:104
+#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:100
 #: engines/tsage/dialogs.cpp:113
 msgid "~C~ancel"
 msgstr "~C~ancel·la"
@@ -2163,7 +2166,8 @@ msgstr "Estàs segur de voler sortir?"
 #: backends/platform/symbian/src/SymbianActions.cpp:52
 #: backends/platform/wince/CEActionsPocket.cpp:44
 #: backends/platform/wince/CEActionsSmartphone.cpp:52
-#: engines/mohawk/myst_stacks/menu.cpp:290 engines/scumm/dialogs.cpp:188
+#: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500 engines/scumm/dialogs.cpp:188
 #: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85
 msgid "Quit"
 msgstr "Surt"
@@ -3280,63 +3284,63 @@ msgstr ""
 msgid "Naughty game mode"
 msgstr ""
 
-#: engines/mohawk/detection.cpp:162
+#: engines/mohawk/detection.cpp:154
 msgid "Play the Myst fly by movie"
 msgstr ""
 
-#: engines/mohawk/detection.cpp:163
+#: engines/mohawk/detection.cpp:155
 msgid "The Myst fly by movie was not played by the original engine."
 msgstr ""
 
 #. I18N: Option for fast scene switching
-#: engines/mohawk/dialogs.cpp:190 engines/mohawk/dialogs.cpp:289
+#: engines/mohawk/dialogs.cpp:146 engines/mohawk/dialogs.cpp:286
 msgid "~Z~ip Mode Activated"
 msgstr "Mode ~Z~ip activat"
 
-#: engines/mohawk/dialogs.cpp:191
+#: engines/mohawk/dialogs.cpp:147
 msgid "~T~ransitions Enabled"
 msgstr "~T~ransicions activades"
 
 #. I18N: Drop book page
-#: engines/mohawk/dialogs.cpp:193
+#: engines/mohawk/dialogs.cpp:149
 msgid "~D~rop Page"
 msgstr "~D~escarta la pàgina"
 
-#: engines/mohawk/dialogs.cpp:197
+#: engines/mohawk/dialogs.cpp:153
 #, fuzzy
 msgid "Show ~M~ap"
 msgstr "~M~ostra el mapa"
 
-#: engines/mohawk/dialogs.cpp:203
+#: engines/mohawk/dialogs.cpp:159
 #, fuzzy
 msgid "Main Men~u~"
 msgstr "~M~enú Principal"
 
-#: engines/mohawk/dialogs.cpp:290
+#: engines/mohawk/dialogs.cpp:287
 msgid "~W~ater Effect Enabled"
 msgstr "~E~fecte de l'aigua activat"
 
-#: engines/mohawk/dialogs.cpp:292
+#: engines/mohawk/dialogs.cpp:289
 #, fuzzy
 msgid "Transitions:"
 msgstr "~T~ransicions activades"
 
-#: engines/mohawk/dialogs.cpp:294
+#: engines/mohawk/dialogs.cpp:291
 #, fuzzy
 msgid "Disabled"
 msgstr "GFX desactivats"
 
-#: engines/mohawk/dialogs.cpp:295
+#: engines/mohawk/dialogs.cpp:292
 #, fuzzy
 msgid "Fastest"
 msgstr "Mode ràpid"
 
-#: engines/mohawk/dialogs.cpp:296
+#: engines/mohawk/dialogs.cpp:293
 #, fuzzy
 msgid "Normal"
 msgstr "OpenGL Normal"
 
-#: engines/mohawk/dialogs.cpp:297
+#: engines/mohawk/dialogs.cpp:294
 msgid "Best"
 msgstr ""
 
@@ -3346,60 +3350,65 @@ msgid "The game is paused. Press any key to continue."
 msgstr "Joc pausat.  Premeu ESPAI per continuar."
 
 #: engines/mohawk/myst_stacks/menu.cpp:255
+#: engines/mohawk/riven_stacks/aspit.cpp:394
 msgid ""
 "Are you sure you want to load a saved game? All unsaved progress will be "
 "lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:256
+#: engines/mohawk/riven_stacks/aspit.cpp:395
 #, fuzzy
 msgid "Load game"
 msgstr "Carrega partida:"
 
 #: engines/mohawk/myst_stacks/menu.cpp:272
+#: engines/mohawk/riven_stacks/aspit.cpp:416
 msgid ""
 "Are you sure you want to start a new game? All unsaved progress will be lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:273
+#: engines/mohawk/riven_stacks/aspit.cpp:417
 #, fuzzy
 msgid "New game"
 msgstr "Nova partida desada"
 
 #: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500
 #, fuzzy
 msgid "Are you sure you want to quit? All unsaved progress will be lost."
 msgstr "   Esteu segur de voler sortir?   "
 
-#: engines/mohawk/riven.cpp:154
+#: engines/mohawk/riven.cpp:158
 msgid ""
 "You're missing a Riven executable. The Windows executable is 'riven.exe' or "
 "'rivendmo.exe'. "
 msgstr ""
 
-#: engines/mohawk/riven.cpp:155
+#: engines/mohawk/riven.cpp:159
 msgid ""
 "Using the 'arcriven.z' installer file also works. In addition, you can use "
 "the Mac 'Riven' executable."
 msgstr ""
 
-#: engines/mohawk/riven.cpp:166
+#: engines/mohawk/riven.cpp:170
 msgid ""
 "You're missing 'extras.mhk'. Using the 'arcriven.z' installer file also "
 "works."
 msgstr ""
 
-#: engines/mohawk/riven.cpp:452
+#: engines/mohawk/riven.cpp:498
 msgid "You are missing the following required Riven data files:\n"
 msgstr ""
 
-#: engines/mohawk/riven_stack.cpp:182
+#: engines/mohawk/riven_stack.cpp:204
 msgid ""
 "Exploration beyond this point available only within the full version of\n"
 "the game."
 msgstr ""
 
-#: engines/mohawk/riven_stacks/aspit.cpp:309
+#: engines/mohawk/riven_stacks/aspit.cpp:474
 msgid ""
 "At this point, the Riven Demo would\n"
 "ask if you would like to open a web browser\n"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 0f5d8abc9a..4cd3f2a248 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-06-29 13:20+0200\n"
+"POT-Creation-Date: 2018-06-29 13:32+0200\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/"
@@ -71,6 +71,9 @@ msgstr "Jít nahoru"
 #: engines/mohawk/myst_stacks/menu.cpp:256
 #: engines/mohawk/myst_stacks/menu.cpp:273
 #: engines/mohawk/myst_stacks/menu.cpp:291
+#: engines/mohawk/riven_stacks/aspit.cpp:395
+#: engines/mohawk/riven_stacks/aspit.cpp:417
+#: engines/mohawk/riven_stacks/aspit.cpp:501
 #: engines/parallaction/saveload.cpp:271 engines/scumm/dialogs.cpp:187
 #: engines/sword1/control.cpp:887
 msgid "Cancel"
@@ -595,7 +598,7 @@ msgstr "Zmáèknìte klávesu pro pøiøazení"
 msgid "Choose an action to map"
 msgstr "Zvolte èinnost k mapování"
 
-#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:101
+#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:143
 msgid "~Q~uit"
 msgstr "~U~konèit"
 
@@ -683,8 +686,8 @@ msgid "Search:"
 msgstr "Hledat:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:106 engines/mohawk/myst.cpp:884
-#: engines/mohawk/riven.cpp:553 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:884
+#: engines/mohawk/riven.cpp:629 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Nahrát hru:"
@@ -692,8 +695,8 @@ msgstr "Nahrát hru:"
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
-#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:106
-#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:553
+#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:163
+#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:629
 #: 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
@@ -1826,11 +1829,11 @@ msgstr "<©patná hodnota>"
 msgid "~R~esume"
 msgstr "~P~okraèovat"
 
-#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:99
+#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:141
 msgid "~L~oad"
 msgstr "~N~ahrát"
 
-#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:100
+#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:142
 msgid "~S~ave"
 msgstr "~U~lo¾it"
 
@@ -1861,8 +1864,8 @@ msgstr "~N~ávrat do Spou¹tìèe"
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
-#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:107
-#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:565
+#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:164
+#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:641
 #: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:658
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
@@ -1883,8 +1886,8 @@ msgstr "Ulo¾it hru:"
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
 #: engines/dreamweb/saveload.cpp:262 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
-#: engines/mohawk/dialogs.cpp:107 engines/mohawk/myst.cpp:896
-#: engines/mohawk/riven.cpp:565 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/dialogs.cpp:164 engines/mohawk/myst.cpp:896
+#: engines/mohawk/riven.cpp:641 engines/neverhood/menumodule.cpp:880
 #: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:659
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -1914,12 +1917,12 @@ msgstr ""
 "Ulo¾ení hry selhalo (%s)! Prosím pøeètìte si dokumentaci pro základní "
 "informace a pokyny k získání dal¹í podpory."
 
-#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:103
+#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:99
 #: engines/tsage/dialogs.cpp:112
 msgid "~O~K"
 msgstr "~O~K"
 
-#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:104
+#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:100
 #: engines/tsage/dialogs.cpp:113
 msgid "~C~ancel"
 msgstr "~Z~ru¹it"
@@ -2176,7 +2179,8 @@ msgstr "Opravdu chcete skonèit?"
 #: backends/platform/symbian/src/SymbianActions.cpp:52
 #: backends/platform/wince/CEActionsPocket.cpp:44
 #: backends/platform/wince/CEActionsSmartphone.cpp:52
-#: engines/mohawk/myst_stacks/menu.cpp:290 engines/scumm/dialogs.cpp:188
+#: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500 engines/scumm/dialogs.cpp:188
 #: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85
 msgid "Quit"
 msgstr "Ukonèit"
@@ -3300,57 +3304,57 @@ msgstr "Animované herní rozhraní"
 msgid "Naughty game mode"
 msgstr "Hanbatý herní re¾im"
 
-#: engines/mohawk/detection.cpp:162
+#: engines/mohawk/detection.cpp:154
 msgid "Play the Myst fly by movie"
 msgstr "Pøehrát video pøeletu v the Myst"
 
-#: engines/mohawk/detection.cpp:163
+#: engines/mohawk/detection.cpp:155
 msgid "The Myst fly by movie was not played by the original engine."
 msgstr "Video pøeletu v The Myst pùvodní jádro nepøehrávalo."
 
 #. I18N: Option for fast scene switching
-#: engines/mohawk/dialogs.cpp:190 engines/mohawk/dialogs.cpp:289
+#: engines/mohawk/dialogs.cpp:146 engines/mohawk/dialogs.cpp:286
 msgid "~Z~ip Mode Activated"
 msgstr "~R~e¾im Svi¹tìní Aktivován"
 
-#: engines/mohawk/dialogs.cpp:191
+#: engines/mohawk/dialogs.cpp:147
 msgid "~T~ransitions Enabled"
 msgstr "~P~øechody zapnuty"
 
 #. I18N: Drop book page
-#: engines/mohawk/dialogs.cpp:193
+#: engines/mohawk/dialogs.cpp:149
 msgid "~D~rop Page"
 msgstr "~Z~ahodit Stránku"
 
-#: engines/mohawk/dialogs.cpp:197
+#: engines/mohawk/dialogs.cpp:153
 msgid "Show ~M~ap"
 msgstr "~Z~obrazit mapu"
 
-#: engines/mohawk/dialogs.cpp:203
+#: engines/mohawk/dialogs.cpp:159
 msgid "Main Men~u~"
 msgstr "~H~lavní nabídka"
 
-#: engines/mohawk/dialogs.cpp:290
+#: engines/mohawk/dialogs.cpp:287
 msgid "~W~ater Effect Enabled"
 msgstr "~E~fekt Vody Zapnut"
 
-#: engines/mohawk/dialogs.cpp:292
+#: engines/mohawk/dialogs.cpp:289
 msgid "Transitions:"
 msgstr "Pøechody:"
 
-#: engines/mohawk/dialogs.cpp:294
+#: engines/mohawk/dialogs.cpp:291
 msgid "Disabled"
 msgstr "Zakázáno"
 
-#: engines/mohawk/dialogs.cpp:295
+#: engines/mohawk/dialogs.cpp:292
 msgid "Fastest"
 msgstr "Nejrychlej¹í"
 
-#: engines/mohawk/dialogs.cpp:296
+#: engines/mohawk/dialogs.cpp:293
 msgid "Normal"
 msgstr "Normální"
 
-#: engines/mohawk/dialogs.cpp:297
+#: engines/mohawk/dialogs.cpp:294
 msgid "Best"
 msgstr "Nejlep¹í"
 
@@ -3359,32 +3363,37 @@ msgid "The game is paused. Press any key to continue."
 msgstr "Hra je pozastavena. Pro pokraèovaní stisknìte libovolnou klávesu."
 
 #: engines/mohawk/myst_stacks/menu.cpp:255
+#: engines/mohawk/riven_stacks/aspit.cpp:394
 msgid ""
 "Are you sure you want to load a saved game? All unsaved progress will be "
 "lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:256
+#: engines/mohawk/riven_stacks/aspit.cpp:395
 #, fuzzy
 msgid "Load game"
 msgstr "Nahrát hru:"
 
 #: engines/mohawk/myst_stacks/menu.cpp:272
+#: engines/mohawk/riven_stacks/aspit.cpp:416
 msgid ""
 "Are you sure you want to start a new game? All unsaved progress will be lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:273
+#: engines/mohawk/riven_stacks/aspit.cpp:417
 #, fuzzy
 msgid "New game"
 msgstr "Nová ulo¾ená pozice"
 
 #: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500
 #, fuzzy
 msgid "Are you sure you want to quit? All unsaved progress will be lost."
 msgstr "   Jste si jisti, ¾e chcete odejít ?   "
 
-#: engines/mohawk/riven.cpp:154
+#: engines/mohawk/riven.cpp:158
 msgid ""
 "You're missing a Riven executable. The Windows executable is 'riven.exe' or "
 "'rivendmo.exe'. "
@@ -3392,7 +3401,7 @@ msgstr ""
 "Schází vám spustitelný soubor Riven. Ve Windows se soubor jmenuje 'riven."
 "exe' nebo 'rivendmo.exe'. "
 
-#: engines/mohawk/riven.cpp:155
+#: engines/mohawk/riven.cpp:159
 msgid ""
 "Using the 'arcriven.z' installer file also works. In addition, you can use "
 "the Mac 'Riven' executable."
@@ -3400,7 +3409,7 @@ msgstr ""
 "Nebo mù¾ete také pou¾ít soubor instalace 'arcriven.z'. Dále lze také vyu¾ít "
 "spustitelný soubor ze systému Mac 'Riven'."
 
-#: engines/mohawk/riven.cpp:166
+#: engines/mohawk/riven.cpp:170
 msgid ""
 "You're missing 'extras.mhk'. Using the 'arcriven.z' installer file also "
 "works."
@@ -3408,17 +3417,17 @@ msgstr ""
 "Schází vám soubor 'extras.mhk'. Místo toho lze pou¾ít soubor instalace "
 "'arcriven.z'."
 
-#: engines/mohawk/riven.cpp:452
+#: engines/mohawk/riven.cpp:498
 msgid "You are missing the following required Riven data files:\n"
 msgstr "Chybí vám následující potøebné datové soubory Riven:\n"
 
-#: engines/mohawk/riven_stack.cpp:182
+#: engines/mohawk/riven_stack.cpp:204
 msgid ""
 "Exploration beyond this point available only within the full version of\n"
 "the game."
 msgstr "Pøístup k následující èástí hry je dostupný pouze v její plné verzi."
 
-#: engines/mohawk/riven_stacks/aspit.cpp:309
+#: engines/mohawk/riven_stacks/aspit.cpp:474
 msgid ""
 "At this point, the Riven Demo would\n"
 "ask if you would like to open a web browser\n"
diff --git a/po/da_DK.po b/po/da_DK.po
index 57a5ab1b53..6a957f9209 100644
--- a/po/da_DK.po
+++ b/po/da_DK.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-06-29 13:20+0200\n"
+"POT-Creation-Date: 2018-06-29 13:32+0200\n"
 "PO-Revision-Date: 2018-04-18 10:10+0000\n"
 "Last-Translator: Adrian Frühwirth <bonki@scummvm.org>\n"
 "Language-Team: Danish <https://translations.scummvm.org/projects/scummvm/"
@@ -69,6 +69,9 @@ msgstr "Gå op"
 #: engines/mohawk/myst_stacks/menu.cpp:256
 #: engines/mohawk/myst_stacks/menu.cpp:273
 #: engines/mohawk/myst_stacks/menu.cpp:291
+#: engines/mohawk/riven_stacks/aspit.cpp:395
+#: engines/mohawk/riven_stacks/aspit.cpp:417
+#: engines/mohawk/riven_stacks/aspit.cpp:501
 #: engines/parallaction/saveload.cpp:271 engines/scumm/dialogs.cpp:187
 #: engines/sword1/control.cpp:887
 msgid "Cancel"
@@ -595,7 +598,7 @@ msgstr "Tryk tasten for at tilknytte"
 msgid "Choose an action to map"
 msgstr "Vælg en handling at kortlægge"
 
-#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:101
+#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:143
 msgid "~Q~uit"
 msgstr "~A~fslut"
 
@@ -683,8 +686,8 @@ msgid "Search:"
 msgstr "Søg:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:106 engines/mohawk/myst.cpp:884
-#: engines/mohawk/riven.cpp:553 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:884
+#: engines/mohawk/riven.cpp:629 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Indlæs spil:"
@@ -692,8 +695,8 @@ msgstr "Indlæs spil:"
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
-#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:106
-#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:553
+#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:163
+#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:629
 #: 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
@@ -1821,11 +1824,11 @@ msgstr "<Forkert værdi>"
 msgid "~R~esume"
 msgstr "Gen~o~ptag"
 
-#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:99
+#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:141
 msgid "~L~oad"
 msgstr "~H~ent"
 
-#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:100
+#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:142
 msgid "~S~ave"
 msgstr "~G~em"
 
@@ -1856,8 +1859,8 @@ msgstr "~R~etur til oversigt"
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
-#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:107
-#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:565
+#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:164
+#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:641
 #: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:658
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
@@ -1878,8 +1881,8 @@ msgstr "Gemmer:"
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
 #: engines/dreamweb/saveload.cpp:262 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
-#: engines/mohawk/dialogs.cpp:107 engines/mohawk/myst.cpp:896
-#: engines/mohawk/riven.cpp:565 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/dialogs.cpp:164 engines/mohawk/myst.cpp:896
+#: engines/mohawk/riven.cpp:641 engines/neverhood/menumodule.cpp:880
 #: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:659
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -1909,12 +1912,12 @@ msgstr ""
 "Gemning af spil fejlede (%s)! Se venligst README for grundlæggende "
 "oplysninger, og for at få instruktioner om, hvordan man får yderligere hjælp."
 
-#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:103
+#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:99
 #: engines/tsage/dialogs.cpp:112
 msgid "~O~K"
 msgstr "~O~K"
 
-#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:104
+#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:100
 #: engines/tsage/dialogs.cpp:113
 msgid "~C~ancel"
 msgstr "~F~ortryd"
@@ -2169,7 +2172,8 @@ msgstr "Vil du virkelig afslutte?"
 #: backends/platform/symbian/src/SymbianActions.cpp:52
 #: backends/platform/wince/CEActionsPocket.cpp:44
 #: backends/platform/wince/CEActionsSmartphone.cpp:52
-#: engines/mohawk/myst_stacks/menu.cpp:290 engines/scumm/dialogs.cpp:188
+#: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500 engines/scumm/dialogs.cpp:188
 #: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85
 msgid "Quit"
 msgstr "Afslut"
@@ -3295,57 +3299,57 @@ msgstr "Animeret spil brugerflade"
 msgid "Naughty game mode"
 msgstr "Uhyggelig spiltilstand"
 
-#: engines/mohawk/detection.cpp:162
+#: engines/mohawk/detection.cpp:154
 msgid "Play the Myst fly by movie"
 msgstr "Afspil Myst \"fly by\" film"
 
-#: engines/mohawk/detection.cpp:163
+#: engines/mohawk/detection.cpp:155
 msgid "The Myst fly by movie was not played by the original engine."
 msgstr "Myst \"fly by\" filmen blev ikke afspillet af den originale \"motor\"."
 
 #. I18N: Option for fast scene switching
-#: engines/mohawk/dialogs.cpp:190 engines/mohawk/dialogs.cpp:289
+#: engines/mohawk/dialogs.cpp:146 engines/mohawk/dialogs.cpp:286
 msgid "~Z~ip Mode Activated"
 msgstr "~Z~ip tilstand aktiveret"
 
-#: engines/mohawk/dialogs.cpp:191
+#: engines/mohawk/dialogs.cpp:147
 msgid "~T~ransitions Enabled"
 msgstr "~O~vergange aktiveret"
 
 #. I18N: Drop book page
-#: engines/mohawk/dialogs.cpp:193
+#: engines/mohawk/dialogs.cpp:149
 msgid "~D~rop Page"
 msgstr "Smi~d~ side"
 
-#: engines/mohawk/dialogs.cpp:197
+#: engines/mohawk/dialogs.cpp:153
 msgid "Show ~M~ap"
 msgstr "Vis ~K~ort"
 
-#: engines/mohawk/dialogs.cpp:203
+#: engines/mohawk/dialogs.cpp:159
 msgid "Main Men~u~"
 msgstr "Hovedmen~u~"
 
-#: engines/mohawk/dialogs.cpp:290
+#: engines/mohawk/dialogs.cpp:287
 msgid "~W~ater Effect Enabled"
 msgstr "~V~andeffekter aktiveret"
 
-#: engines/mohawk/dialogs.cpp:292
+#: engines/mohawk/dialogs.cpp:289
 msgid "Transitions:"
 msgstr "Overgange:"
 
-#: engines/mohawk/dialogs.cpp:294
+#: engines/mohawk/dialogs.cpp:291
 msgid "Disabled"
 msgstr "Deaktiveret"
 
-#: engines/mohawk/dialogs.cpp:295
+#: engines/mohawk/dialogs.cpp:292
 msgid "Fastest"
 msgstr "Hurtigst"
 
-#: engines/mohawk/dialogs.cpp:296
+#: engines/mohawk/dialogs.cpp:293
 msgid "Normal"
 msgstr "Normal"
 
-#: engines/mohawk/dialogs.cpp:297
+#: engines/mohawk/dialogs.cpp:294
 msgid "Best"
 msgstr "Bedst"
 
@@ -3354,32 +3358,37 @@ msgid "The game is paused. Press any key to continue."
 msgstr "Spillet er sat på pause. Tryk en tast for at fortsætte."
 
 #: engines/mohawk/myst_stacks/menu.cpp:255
+#: engines/mohawk/riven_stacks/aspit.cpp:394
 msgid ""
 "Are you sure you want to load a saved game? All unsaved progress will be "
 "lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:256
+#: engines/mohawk/riven_stacks/aspit.cpp:395
 #, fuzzy
 msgid "Load game"
 msgstr "Indlæs spil:"
 
 #: engines/mohawk/myst_stacks/menu.cpp:272
+#: engines/mohawk/riven_stacks/aspit.cpp:416
 msgid ""
 "Are you sure you want to start a new game? All unsaved progress will be lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:273
+#: engines/mohawk/riven_stacks/aspit.cpp:417
 #, fuzzy
 msgid "New game"
 msgstr "Ny Gemmer"
 
 #: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500
 #, fuzzy
 msgid "Are you sure you want to quit? All unsaved progress will be lost."
 msgstr "   Er du sikker på at du vil afslutte?   "
 
-#: engines/mohawk/riven.cpp:154
+#: engines/mohawk/riven.cpp:158
 msgid ""
 "You're missing a Riven executable. The Windows executable is 'riven.exe' or "
 "'rivendmo.exe'. "
@@ -3387,7 +3396,7 @@ msgstr ""
 "Du mangler en Riven eksekverbar fil. Den Windows eksekverbare fil er 'riven."
 "exe' eller 'rivendmo.exe'. "
 
-#: engines/mohawk/riven.cpp:155
+#: engines/mohawk/riven.cpp:159
 msgid ""
 "Using the 'arcriven.z' installer file also works. In addition, you can use "
 "the Mac 'Riven' executable."
@@ -3395,7 +3404,7 @@ msgstr ""
 "Brug af 'arcriven.z' installationsfilen fungerer også. Derudover kan du "
 "bruge Mac 'Riven' eksekverbar."
 
-#: engines/mohawk/riven.cpp:166
+#: engines/mohawk/riven.cpp:170
 msgid ""
 "You're missing 'extras.mhk'. Using the 'arcriven.z' installer file also "
 "works."
@@ -3403,11 +3412,11 @@ msgstr ""
 "Du mangler 'extras.mhk'. Brug af 'arcriven.z' installationsfilen fungerer "
 "også."
 
-#: engines/mohawk/riven.cpp:452
+#: engines/mohawk/riven.cpp:498
 msgid "You are missing the following required Riven data files:\n"
 msgstr "Du mangler følgende krævede Riven data filer:\n"
 
-#: engines/mohawk/riven_stack.cpp:182
+#: engines/mohawk/riven_stack.cpp:204
 msgid ""
 "Exploration beyond this point available only within the full version of\n"
 "the game."
@@ -3415,7 +3424,7 @@ msgstr ""
 "Undersøgelse ud over dette punkt er kun tilgængelig i den fulde version af\n"
 "spillet."
 
-#: engines/mohawk/riven_stacks/aspit.cpp:309
+#: engines/mohawk/riven_stacks/aspit.cpp:474
 msgid ""
 "At this point, the Riven Demo would\n"
 "ask if you would like to open a web browser\n"
diff --git a/po/de_DE.po b/po/de_DE.po
index 8bd9bd401e..5920f470f7 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.10.0git\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2018-06-29 13:20+0200\n"
+"POT-Creation-Date: 2018-06-29 13:32+0200\n"
 "PO-Revision-Date: 2018-06-29 11:29+0000\n"
 "Last-Translator: Lothar Serra Mari <serra@scummvm.org>\n"
-"Language-Team: German "
-"<https://translations.scummvm.org/projects/scummvm/scummvm/de/>\n"
+"Language-Team: German <https://translations.scummvm.org/projects/scummvm/"
+"scummvm/de/>\n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
@@ -70,6 +70,9 @@ msgstr "Pfad hoch"
 #: engines/mohawk/myst_stacks/menu.cpp:256
 #: engines/mohawk/myst_stacks/menu.cpp:273
 #: engines/mohawk/myst_stacks/menu.cpp:291
+#: engines/mohawk/riven_stacks/aspit.cpp:395
+#: engines/mohawk/riven_stacks/aspit.cpp:417
+#: engines/mohawk/riven_stacks/aspit.cpp:501
 #: engines/parallaction/saveload.cpp:271 engines/scumm/dialogs.cpp:187
 #: engines/sword1/control.cpp:887
 msgid "Cancel"
@@ -599,7 +602,7 @@ msgstr "Taste drücken, um sie zuzuweisen"
 msgid "Choose an action to map"
 msgstr "Eine Aktion zum Zuweisen auswählen"
 
-#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:101
+#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:143
 msgid "~Q~uit"
 msgstr "~B~eenden"
 
@@ -689,8 +692,8 @@ msgid "Search:"
 msgstr "Suchen:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:106 engines/mohawk/myst.cpp:884
-#: engines/mohawk/riven.cpp:553 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:884
+#: engines/mohawk/riven.cpp:629 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Spiel laden:"
@@ -698,8 +701,8 @@ msgstr "Spiel laden:"
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
-#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:106
-#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:553
+#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:163
+#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:629
 #: 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
@@ -1848,11 +1851,11 @@ msgstr "<Fehlerhafter Wert>"
 msgid "~R~esume"
 msgstr "~F~ortsetzen"
 
-#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:99
+#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:141
 msgid "~L~oad"
 msgstr "~L~aden"
 
-#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:100
+#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:142
 msgid "~S~ave"
 msgstr "~S~peichern"
 
@@ -1883,8 +1886,8 @@ msgstr "Zur Spiele~l~iste"
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
-#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:107
-#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:565
+#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:164
+#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:641
 #: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:658
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
@@ -1905,8 +1908,8 @@ msgstr "Speichern:"
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
 #: engines/dreamweb/saveload.cpp:262 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
-#: engines/mohawk/dialogs.cpp:107 engines/mohawk/myst.cpp:896
-#: engines/mohawk/riven.cpp:565 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/dialogs.cpp:164 engines/mohawk/myst.cpp:896
+#: engines/mohawk/riven.cpp:641 engines/neverhood/menumodule.cpp:880
 #: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:659
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -1935,12 +1938,12 @@ msgstr ""
 "Speichern des Spielstands %s fehlgeschlagen! Bitte lesen Sie die LIESMICH-"
 "Datei für grundlegende Informationen und Anweisungen zu weiterer Hilfe."
 
-#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:103
+#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:99
 #: engines/tsage/dialogs.cpp:112
 msgid "~O~K"
 msgstr "~O~K"
 
-#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:104
+#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:100
 #: engines/tsage/dialogs.cpp:113
 msgid "~C~ancel"
 msgstr "~A~bbrechen"
@@ -2201,7 +2204,8 @@ msgstr "Möchten Sie wirklich beenden?"
 #: backends/platform/symbian/src/SymbianActions.cpp:52
 #: backends/platform/wince/CEActionsPocket.cpp:44
 #: backends/platform/wince/CEActionsSmartphone.cpp:52
-#: engines/mohawk/myst_stacks/menu.cpp:290 engines/scumm/dialogs.cpp:188
+#: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500 engines/scumm/dialogs.cpp:188
 #: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85
 msgid "Quit"
 msgstr "Beenden"
@@ -3335,59 +3339,59 @@ msgstr "Animierte Spieloberfläche"
 msgid "Naughty game mode"
 msgstr "Unanständiger Spielmodus"
 
-#: engines/mohawk/detection.cpp:162
+#: engines/mohawk/detection.cpp:154
 msgid "Play the Myst fly by movie"
 msgstr "Video vom Anflug auf Myst abspielen"
 
-#: engines/mohawk/detection.cpp:163
+#: engines/mohawk/detection.cpp:155
 msgid "The Myst fly by movie was not played by the original engine."
 msgstr ""
 "Das Video, welches den Anflug auf Myst zeigt, wurde in der ursprünglichen "
 "Engine nicht abgespielt."
 
 #. I18N: Option for fast scene switching
-#: engines/mohawk/dialogs.cpp:190 engines/mohawk/dialogs.cpp:289
+#: engines/mohawk/dialogs.cpp:146 engines/mohawk/dialogs.cpp:286
 msgid "~Z~ip Mode Activated"
 msgstr "~Z~ip-Modus aktiviert"
 
-#: engines/mohawk/dialogs.cpp:191
+#: engines/mohawk/dialogs.cpp:147
 msgid "~T~ransitions Enabled"
 msgstr "Über~g~änge aktiviert"
 
 #. I18N: Drop book page
-#: engines/mohawk/dialogs.cpp:193
+#: engines/mohawk/dialogs.cpp:149
 msgid "~D~rop Page"
 msgstr "Seite ~a~blegen"
 
-#: engines/mohawk/dialogs.cpp:197
+#: engines/mohawk/dialogs.cpp:153
 msgid "Show ~M~ap"
 msgstr "~K~arte anzeigen"
 
-#: engines/mohawk/dialogs.cpp:203
+#: engines/mohawk/dialogs.cpp:159
 msgid "Main Men~u~"
 msgstr "Haupt~m~enü"
 
-#: engines/mohawk/dialogs.cpp:290
+#: engines/mohawk/dialogs.cpp:287
 msgid "~W~ater Effect Enabled"
 msgstr "~W~assereffekt aktiviert"
 
-#: engines/mohawk/dialogs.cpp:292
+#: engines/mohawk/dialogs.cpp:289
 msgid "Transitions:"
 msgstr "Übergänge:"
 
-#: engines/mohawk/dialogs.cpp:294
+#: engines/mohawk/dialogs.cpp:291
 msgid "Disabled"
 msgstr "Ausgeschaltet"
 
-#: engines/mohawk/dialogs.cpp:295
+#: engines/mohawk/dialogs.cpp:292
 msgid "Fastest"
 msgstr "Schnellste"
 
-#: engines/mohawk/dialogs.cpp:296
+#: engines/mohawk/dialogs.cpp:293
 msgid "Normal"
 msgstr "Normal"
 
-#: engines/mohawk/dialogs.cpp:297
+#: engines/mohawk/dialogs.cpp:294
 msgid "Best"
 msgstr "Beste"
 
@@ -3396,6 +3400,7 @@ msgid "The game is paused. Press any key to continue."
 msgstr "Das Spiel ist pausiert. Zum Weiterspielen beliebige Taste drücken."
 
 #: engines/mohawk/myst_stacks/menu.cpp:255
+#: engines/mohawk/riven_stacks/aspit.cpp:394
 msgid ""
 "Are you sure you want to load a saved game? All unsaved progress will be "
 "lost."
@@ -3404,10 +3409,12 @@ msgstr ""
 "gespeicherte Fortschritt geht dabei verloren."
 
 #: engines/mohawk/myst_stacks/menu.cpp:256
+#: engines/mohawk/riven_stacks/aspit.cpp:395
 msgid "Load game"
 msgstr "Spiel laden"
 
 #: engines/mohawk/myst_stacks/menu.cpp:272
+#: engines/mohawk/riven_stacks/aspit.cpp:416
 msgid ""
 "Are you sure you want to start a new game? All unsaved progress will be lost."
 msgstr ""
@@ -3415,16 +3422,18 @@ msgstr ""
 "gespeicherte Fortschritt geht dabei verloren."
 
 #: engines/mohawk/myst_stacks/menu.cpp:273
+#: engines/mohawk/riven_stacks/aspit.cpp:417
 msgid "New game"
 msgstr "Neues Spiel"
 
 #: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500
 msgid "Are you sure you want to quit? All unsaved progress will be lost."
 msgstr ""
 "Möchten Sie das Spiel wirklich beenden? Jeder nicht gespeicherte Fortschritt "
 "geht dabei verloren."
 
-#: engines/mohawk/riven.cpp:154
+#: engines/mohawk/riven.cpp:158
 msgid ""
 "You're missing a Riven executable. The Windows executable is 'riven.exe' or "
 "'rivendmo.exe'. "
@@ -3432,7 +3441,7 @@ msgstr ""
 "Ihnen fehlt eine Programmdatei von Riven. Die Windows-Programmdatei ist "
 "'riven.exe' oder 'rivendmo.exe'. "
 
-#: engines/mohawk/riven.cpp:155
+#: engines/mohawk/riven.cpp:159
 msgid ""
 "Using the 'arcriven.z' installer file also works. In addition, you can use "
 "the Mac 'Riven' executable."
@@ -3440,7 +3449,7 @@ msgstr ""
 "Die Installationsdatei 'arcriven.z' kann ebenfalls verwendet werden. "
 "Zusätzlich können Sie auch die Mac-Programmdatei 'Riven' verwenden."
 
-#: engines/mohawk/riven.cpp:166
+#: engines/mohawk/riven.cpp:170
 msgid ""
 "You're missing 'extras.mhk'. Using the 'arcriven.z' installer file also "
 "works."
@@ -3448,11 +3457,11 @@ msgstr ""
 "Die Datei 'extras.mhk' fehlt. Sie können auch die Installationsdatei "
 "'arcriven.z verwenden."
 
-#: engines/mohawk/riven.cpp:452
+#: engines/mohawk/riven.cpp:498
 msgid "You are missing the following required Riven data files:\n"
 msgstr "Ihnen fehlen die folgenden Spieldateien für Riven:\n"
 
-#: engines/mohawk/riven_stack.cpp:182
+#: engines/mohawk/riven_stack.cpp:204
 msgid ""
 "Exploration beyond this point available only within the full version of\n"
 "the game."
@@ -3460,7 +3469,7 @@ msgstr ""
 "Die weitere Erkundung über diesen Punkt hinaus ist nur in der Vollversion\n"
 "des Spiels möglich."
 
-#: engines/mohawk/riven_stacks/aspit.cpp:309
+#: engines/mohawk/riven_stacks/aspit.cpp:474
 msgid ""
 "At this point, the Riven Demo would\n"
 "ask if you would like to open a web browser\n"
diff --git a/po/el.po b/po/el.po
index 562169ab87..1757a08fb5 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-06-29 13:20+0200\n"
+"POT-Creation-Date: 2018-06-29 13:32+0200\n"
 "PO-Revision-Date: 2018-04-18 10:19+0000\n"
 "Last-Translator: Adrian Fruehwirth <bonki@scummvm.org>\n"
 "Language-Team: Greek <https://translations.scummvm.org/projects/scummvm/"
@@ -68,6 +68,9 @@ msgstr "ÌåôÜâáóç ðÜíù"
 #: engines/mohawk/myst_stacks/menu.cpp:256
 #: engines/mohawk/myst_stacks/menu.cpp:273
 #: engines/mohawk/myst_stacks/menu.cpp:291
+#: engines/mohawk/riven_stacks/aspit.cpp:395
+#: engines/mohawk/riven_stacks/aspit.cpp:417
+#: engines/mohawk/riven_stacks/aspit.cpp:501
 #: engines/parallaction/saveload.cpp:271 engines/scumm/dialogs.cpp:187
 #: engines/sword1/control.cpp:887
 msgid "Cancel"
@@ -600,7 +603,7 @@ msgstr "ÐáôÞóôå ôï ðëÞêôñï ãéá óõó÷Ýôéóç"
 msgid "Choose an action to map"
 msgstr "ÅðéëÝîôå ìéá åíÝñãåéá ãéá áíôéóôïß÷éóç"
 
-#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:101
+#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:143
 msgid "~Q~uit"
 msgstr "¸~î~ïäïò"
 
@@ -690,8 +693,8 @@ msgid "Search:"
 msgstr "ÁíáæÞôçóç:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:106 engines/mohawk/myst.cpp:884
-#: engines/mohawk/riven.cpp:553 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:884
+#: engines/mohawk/riven.cpp:629 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Öüñôùóç ðáé÷íéäéïý:"
@@ -699,8 +702,8 @@ msgstr "Öüñôùóç ðáé÷íéäéïý:"
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
-#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:106
-#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:553
+#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:163
+#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:629
 #: 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
@@ -1853,11 +1856,11 @@ msgstr "<ÅóöáëìÝíç ôéìÞ>"
 msgid "~R~esume"
 msgstr "~Ó~õíÝ÷åéá"
 
-#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:99
+#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:141
 msgid "~L~oad"
 msgstr "~Ö~üñôùóç"
 
-#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:100
+#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:142
 msgid "~S~ave"
 msgstr "~Á~ðïèÞêåõóç"
 
@@ -1888,8 +1891,8 @@ msgstr "Åðéó~ô~ñ. óôïí ÏäçãçôÞ"
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
-#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:107
-#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:565
+#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:164
+#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:641
 #: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:658
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
@@ -1910,8 +1913,8 @@ msgstr "ÁðïèÞêåõóç ðáé÷íéäéïý:"
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
 #: engines/dreamweb/saveload.cpp:262 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
-#: engines/mohawk/dialogs.cpp:107 engines/mohawk/myst.cpp:896
-#: engines/mohawk/riven.cpp:565 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/dialogs.cpp:164 engines/mohawk/myst.cpp:896
+#: engines/mohawk/riven.cpp:641 engines/neverhood/menumodule.cpp:880
 #: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:659
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -1943,12 +1946,12 @@ msgstr ""
 "áñ÷åßï README ãéá âáóéêÝò ðëçñïöïñßåò, êáèþò êáé ãéá ïäçãßåò ó÷åôéêÜ ìå ôï "
 "ðþò íá ëÜâåôå ðåñáéôÝñù âïÞèåéá."
 
-#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:103
+#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:99
 #: engines/tsage/dialogs.cpp:112
 msgid "~O~K"
 msgstr "~Ï~Ê"
 
-#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:104
+#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:100
 #: engines/tsage/dialogs.cpp:113
 msgid "~C~ancel"
 msgstr "~Á~êýñùóç"
@@ -2207,7 +2210,8 @@ msgstr "Åßóôå óßãïõñïé üôé èÝëåôå íá âãåßôå áðü ôï ðñüãñáììá;"
 #: backends/platform/symbian/src/SymbianActions.cpp:52
 #: backends/platform/wince/CEActionsPocket.cpp:44
 #: backends/platform/wince/CEActionsSmartphone.cpp:52
-#: engines/mohawk/myst_stacks/menu.cpp:290 engines/scumm/dialogs.cpp:188
+#: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500 engines/scumm/dialogs.cpp:188
 #: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85
 msgid "Quit"
 msgstr "¸îïäïò"
@@ -3340,62 +3344,62 @@ msgstr "Êéíïýìåíç äéåðáöÞ ðáé÷íéäéïý"
 msgid "Naughty game mode"
 msgstr "Ëåéôïõñãßá ðáé÷íéäéïý ãéá Üôáêôïõò"
 
-#: engines/mohawk/detection.cpp:162
+#: engines/mohawk/detection.cpp:154
 msgid "Play the Myst fly by movie"
 msgstr "ÁíáðáñáãùãÞ ôçò ôáéíßáò åíáÝñéáò åðéóêüðçóçò ôïõ Myst"
 
-#: engines/mohawk/detection.cpp:163
+#: engines/mohawk/detection.cpp:155
 msgid "The Myst fly by movie was not played by the original engine."
 msgstr ""
 "Ç ôáéíßá åíáÝñéáò åðéóêüðçóçò ôïõ Myst äåí áíáðáñÜ÷èçêå áðü ôçí ðñùôüôõðç "
 "ìç÷áíÞ."
 
 #. I18N: Option for fast scene switching
-#: engines/mohawk/dialogs.cpp:190 engines/mohawk/dialogs.cpp:289
+#: engines/mohawk/dialogs.cpp:146 engines/mohawk/dialogs.cpp:286
 msgid "~Z~ip Mode Activated"
 msgstr "Ëåéôïõñãßá ~Z~ip ÅíåñãïðïéçìÝíç"
 
-#: engines/mohawk/dialogs.cpp:191
+#: engines/mohawk/dialogs.cpp:147
 msgid "~T~ransitions Enabled"
 msgstr "~Ì~åôáâÜóåéò ÅíåñãïðïéçìÝíåò"
 
 #. I18N: Drop book page
-#: engines/mohawk/dialogs.cpp:193
+#: engines/mohawk/dialogs.cpp:149
 msgid "~D~rop Page"
 msgstr "~Ñ~ßîéìï Óåëßäáò"
 
-#: engines/mohawk/dialogs.cpp:197
+#: engines/mohawk/dialogs.cpp:153
 msgid "Show ~M~ap"
 msgstr "ÅìöÜíéóç ~×~Üñôç"
 
-#: engines/mohawk/dialogs.cpp:203
+#: engines/mohawk/dialogs.cpp:159
 msgid "Main Men~u~"
 msgstr "Êåíôñéêü Ìåíï~ý~"
 
-#: engines/mohawk/dialogs.cpp:290
+#: engines/mohawk/dialogs.cpp:287
 msgid "~W~ater Effect Enabled"
 msgstr "ÅöÝ ~Í~åñïý ÅíåñãïðïéçìÝíï"
 
-#: engines/mohawk/dialogs.cpp:292
+#: engines/mohawk/dialogs.cpp:289
 #, fuzzy
 msgid "Transitions:"
 msgstr "~Ì~åôáâÜóåéò ÅíåñãïðïéçìÝíåò"
 
-#: engines/mohawk/dialogs.cpp:294
+#: engines/mohawk/dialogs.cpp:291
 #, fuzzy
 msgid "Disabled"
 msgstr "ÁðåíåñãïðïéçìÝíá ãñáöéêÜ"
 
-#: engines/mohawk/dialogs.cpp:295
+#: engines/mohawk/dialogs.cpp:292
 #, fuzzy
 msgid "Fastest"
 msgstr "Åðéêüëëçóç"
 
-#: engines/mohawk/dialogs.cpp:296
+#: engines/mohawk/dialogs.cpp:293
 msgid "Normal"
 msgstr ""
 
-#: engines/mohawk/dialogs.cpp:297
+#: engines/mohawk/dialogs.cpp:294
 msgid "Best"
 msgstr ""
 
@@ -3405,32 +3409,37 @@ msgstr ""
 "Ôï ðáé÷íßäé âñßóêåôáé óå ðáýóç. ÐáôÞóôå ïðïéïäÞðïôå êïõìðß ãéá íá óõíå÷ßóåôå."
 
 #: engines/mohawk/myst_stacks/menu.cpp:255
+#: engines/mohawk/riven_stacks/aspit.cpp:394
 msgid ""
 "Are you sure you want to load a saved game? All unsaved progress will be "
 "lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:256
+#: engines/mohawk/riven_stacks/aspit.cpp:395
 #, fuzzy
 msgid "Load game"
 msgstr "Öüñôùóç ðáé÷íéäéïý:"
 
 #: engines/mohawk/myst_stacks/menu.cpp:272
+#: engines/mohawk/riven_stacks/aspit.cpp:416
 msgid ""
 "Are you sure you want to start a new game? All unsaved progress will be lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:273
+#: engines/mohawk/riven_stacks/aspit.cpp:417
 #, fuzzy
 msgid "New game"
 msgstr "ÍÝá ÁðïèÞêåõóç"
 
 #: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500
 #, fuzzy
 msgid "Are you sure you want to quit? All unsaved progress will be lost."
 msgstr "   Åßóôå óßãïõñïé üôé èÝëåôå íá âãåßôå áðü ôï ðñüãñáììá ;   "
 
-#: engines/mohawk/riven.cpp:154
+#: engines/mohawk/riven.cpp:158
 msgid ""
 "You're missing a Riven executable. The Windows executable is 'riven.exe' or "
 "'rivendmo.exe'. "
@@ -3438,7 +3447,7 @@ msgstr ""
 "Ëåßðåé ôï åêôåëÝóéìï ôïõ Riven. Ôï åêôåëÝóéìï ãéá Windows åßíáé 'riven.exe' "
 "Þ 'rivendemo.exe'. "
 
-#: engines/mohawk/riven.cpp:155
+#: engines/mohawk/riven.cpp:159
 msgid ""
 "Using the 'arcriven.z' installer file also works. In addition, you can use "
 "the Mac 'Riven' executable."
@@ -3446,7 +3455,7 @@ msgstr ""
 "Ç ÷ñÞóç ôïõ áñ÷åßïõ åãêáôÜóôáóçò 'arcriven.z' ëåéôïõñãåß åðßóçò. ÅðéðëÝïí, "
 "ìðïñåßôå íá ÷ñçóéìïðïéÞóåôå ôï åêôåëÝóéìï ôïõ Mac 'Riven'."
 
-#: engines/mohawk/riven.cpp:166
+#: engines/mohawk/riven.cpp:170
 msgid ""
 "You're missing 'extras.mhk'. Using the 'arcriven.z' installer file also "
 "works."
@@ -3454,11 +3463,11 @@ msgstr ""
 "Óáò ëåßðåé ôï 'extras.mhk'. Ç ÷ñÞóç ôïõ áñ÷åßïõ åãêáôÜóôáóçò 'arcriven.z' "
 "ëåéôïõñãåß åðßóçò."
 
-#: engines/mohawk/riven.cpp:452
+#: engines/mohawk/riven.cpp:498
 msgid "You are missing the following required Riven data files:\n"
 msgstr ""
 
-#: engines/mohawk/riven_stack.cpp:182
+#: engines/mohawk/riven_stack.cpp:204
 msgid ""
 "Exploration beyond this point available only within the full version of\n"
 "the game."
@@ -3466,7 +3475,7 @@ msgstr ""
 "Ç åîåñåýíçóç ðÝñá áðü áõôü ôï óçìåßï åßíáé äéáèÝóéìç ìüíï ìÝóù ôçò\n"
 "ðëÞñïõò Ýêäïóçò ôïõ ðáé÷íéäéïý."
 
-#: engines/mohawk/riven_stacks/aspit.cpp:309
+#: engines/mohawk/riven_stacks/aspit.cpp:474
 msgid ""
 "At this point, the Riven Demo would\n"
 "ask if you would like to open a web browser\n"
diff --git a/po/es_ES.po b/po/es_ES.po
index 8d3ca31623..97d8d8f0d9 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-06-29 13:20+0200\n"
+"POT-Creation-Date: 2018-06-29 13:32+0200\n"
 "PO-Revision-Date: 2018-04-18 10:10+0000\n"
 "Last-Translator: Adrian Frühwirth <bonki@scummvm.org>\n"
 "Language-Team: Spanish <https://translations.scummvm.org/projects/scummvm/"
@@ -69,6 +69,9 @@ msgstr "Arriba"
 #: engines/mohawk/myst_stacks/menu.cpp:256
 #: engines/mohawk/myst_stacks/menu.cpp:273
 #: engines/mohawk/myst_stacks/menu.cpp:291
+#: engines/mohawk/riven_stacks/aspit.cpp:395
+#: engines/mohawk/riven_stacks/aspit.cpp:417
+#: engines/mohawk/riven_stacks/aspit.cpp:501
 #: engines/parallaction/saveload.cpp:271 engines/scumm/dialogs.cpp:187
 #: engines/sword1/control.cpp:887
 msgid "Cancel"
@@ -595,7 +598,7 @@ msgstr "Pulsa una tecla para asignarla"
 msgid "Choose an action to map"
 msgstr "Elige una acción para asociarla"
 
-#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:101
+#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:143
 msgid "~Q~uit"
 msgstr "~S~alir"
 
@@ -683,8 +686,8 @@ msgid "Search:"
 msgstr "Buscar:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:106 engines/mohawk/myst.cpp:884
-#: engines/mohawk/riven.cpp:553 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:884
+#: engines/mohawk/riven.cpp:629 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Cargar juego:"
@@ -692,8 +695,8 @@ msgstr "Cargar juego:"
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
-#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:106
-#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:553
+#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:163
+#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:629
 #: 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
@@ -1836,11 +1839,11 @@ msgstr "<Valor incorrecto>"
 msgid "~R~esume"
 msgstr "~R~eanudar"
 
-#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:99
+#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:141
 msgid "~L~oad"
 msgstr "~C~argar"
 
-#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:100
+#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:142
 msgid "~S~ave"
 msgstr "~G~uardar"
 
@@ -1871,8 +1874,8 @@ msgstr "~V~olver al lanzador"
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
-#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:107
-#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:565
+#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:164
+#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:641
 #: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:658
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
@@ -1893,8 +1896,8 @@ msgstr "Guardar partida:"
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
 #: engines/dreamweb/saveload.cpp:262 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
-#: engines/mohawk/dialogs.cpp:107 engines/mohawk/myst.cpp:896
-#: engines/mohawk/riven.cpp:565 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/dialogs.cpp:164 engines/mohawk/myst.cpp:896
+#: engines/mohawk/riven.cpp:641 engines/neverhood/menumodule.cpp:880
 #: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:659
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -1924,12 +1927,12 @@ msgstr ""
 "Ha habido un fallo al guardar la partida (%s). Consulte el archivo README "
 "con información básica y como obtener más ayuda."
 
-#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:103
+#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:99
 #: engines/tsage/dialogs.cpp:112
 msgid "~O~K"
 msgstr "~S~í"
 
-#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:104
+#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:100
 #: engines/tsage/dialogs.cpp:113
 msgid "~C~ancel"
 msgstr "~C~ancelar"
@@ -2186,7 +2189,8 @@ msgstr "¿Seguro que quieres salir?"
 #: backends/platform/symbian/src/SymbianActions.cpp:52
 #: backends/platform/wince/CEActionsPocket.cpp:44
 #: backends/platform/wince/CEActionsSmartphone.cpp:52
-#: engines/mohawk/myst_stacks/menu.cpp:290 engines/scumm/dialogs.cpp:188
+#: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500 engines/scumm/dialogs.cpp:188
 #: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85
 msgid "Quit"
 msgstr "Salir"
@@ -3309,58 +3313,58 @@ msgstr "Interfaz de juego animada"
 msgid "Naughty game mode"
 msgstr "Modo de juego picante"
 
-#: engines/mohawk/detection.cpp:162
+#: engines/mohawk/detection.cpp:154
 msgid "Play the Myst fly by movie"
 msgstr "Reproducir el vuelo de reconocimiento de Myst"
 
-#: engines/mohawk/detection.cpp:163
+#: engines/mohawk/detection.cpp:155
 msgid "The Myst fly by movie was not played by the original engine."
 msgstr ""
 "El vuelo de reconocimiento de Myst no se mostraba en el motor original."
 
 #. I18N: Option for fast scene switching
-#: engines/mohawk/dialogs.cpp:190 engines/mohawk/dialogs.cpp:289
+#: engines/mohawk/dialogs.cpp:146 engines/mohawk/dialogs.cpp:286
 msgid "~Z~ip Mode Activated"
 msgstr "Modo ~Z~ip activado"
 
-#: engines/mohawk/dialogs.cpp:191
+#: engines/mohawk/dialogs.cpp:147
 msgid "~T~ransitions Enabled"
 msgstr "Tra~n~siciones activadas"
 
 #. I18N: Drop book page
-#: engines/mohawk/dialogs.cpp:193
+#: engines/mohawk/dialogs.cpp:149
 msgid "~D~rop Page"
 msgstr "~T~irar página"
 
-#: engines/mohawk/dialogs.cpp:197
+#: engines/mohawk/dialogs.cpp:153
 msgid "Show ~M~ap"
 msgstr "~M~ostrar el mapa"
 
-#: engines/mohawk/dialogs.cpp:203
+#: engines/mohawk/dialogs.cpp:159
 msgid "Main Men~u~"
 msgstr "Menú ~p~rincipal"
 
-#: engines/mohawk/dialogs.cpp:290
+#: engines/mohawk/dialogs.cpp:287
 msgid "~W~ater Effect Enabled"
 msgstr "Efecto ag~u~a activado"
 
-#: engines/mohawk/dialogs.cpp:292
+#: engines/mohawk/dialogs.cpp:289
 msgid "Transitions:"
 msgstr "Transiciones:"
 
-#: engines/mohawk/dialogs.cpp:294
+#: engines/mohawk/dialogs.cpp:291
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: engines/mohawk/dialogs.cpp:295
+#: engines/mohawk/dialogs.cpp:292
 msgid "Fastest"
 msgstr "Rápido"
 
-#: engines/mohawk/dialogs.cpp:296
+#: engines/mohawk/dialogs.cpp:293
 msgid "Normal"
 msgstr "Normal"
 
-#: engines/mohawk/dialogs.cpp:297
+#: engines/mohawk/dialogs.cpp:294
 msgid "Best"
 msgstr "Mejor"
 
@@ -3369,32 +3373,37 @@ msgid "The game is paused. Press any key to continue."
 msgstr "Juego pausado. Pulsa cualquier tecla para continuar."
 
 #: engines/mohawk/myst_stacks/menu.cpp:255
+#: engines/mohawk/riven_stacks/aspit.cpp:394
 msgid ""
 "Are you sure you want to load a saved game? All unsaved progress will be "
 "lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:256
+#: engines/mohawk/riven_stacks/aspit.cpp:395
 #, fuzzy
 msgid "Load game"
 msgstr "Cargar juego:"
 
 #: engines/mohawk/myst_stacks/menu.cpp:272
+#: engines/mohawk/riven_stacks/aspit.cpp:416
 msgid ""
 "Are you sure you want to start a new game? All unsaved progress will be lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:273
+#: engines/mohawk/riven_stacks/aspit.cpp:417
 #, fuzzy
 msgid "New game"
 msgstr "Guardar"
 
 #: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500
 #, fuzzy
 msgid "Are you sure you want to quit? All unsaved progress will be lost."
 msgstr "   ¿Seguro que quieres salir?   "
 
-#: engines/mohawk/riven.cpp:154
+#: engines/mohawk/riven.cpp:158
 msgid ""
 "You're missing a Riven executable. The Windows executable is 'riven.exe' or "
 "'rivendmo.exe'. "
@@ -3402,7 +3411,7 @@ msgstr ""
 "El ejecutable de Riven no ha sido encontrado. El ejecutable de Windows es "
 "'riven.exe' o 'rivendmo.exe'. "
 
-#: engines/mohawk/riven.cpp:155
+#: engines/mohawk/riven.cpp:159
 msgid ""
 "Using the 'arcriven.z' installer file also works. In addition, you can use "
 "the Mac 'Riven' executable."
@@ -3410,7 +3419,7 @@ msgstr ""
 "Usar el archivo de instalacion 'arcriven.z' es funcional. Tambien puedes "
 "utilizar el ejecutable de Mac."
 
-#: engines/mohawk/riven.cpp:166
+#: engines/mohawk/riven.cpp:170
 msgid ""
 "You're missing 'extras.mhk'. Using the 'arcriven.z' installer file also "
 "works."
@@ -3418,18 +3427,18 @@ msgstr ""
 "Falta el fichero 'extras.mhk'. También es posible usar el fichero instalador "
 "'arcriven.z'."
 
-#: engines/mohawk/riven.cpp:452
+#: engines/mohawk/riven.cpp:498
 msgid "You are missing the following required Riven data files:\n"
 msgstr "Te faltan estos archivos de Riven:\n"
 
-#: engines/mohawk/riven_stack.cpp:182
+#: engines/mohawk/riven_stack.cpp:204
 msgid ""
 "Exploration beyond this point available only within the full version of\n"
 "the game."
 msgstr ""
 "Exploracion mas alla de aquí solo esta disponible en la version completa."
 
-#: engines/mohawk/riven_stacks/aspit.cpp:309
+#: engines/mohawk/riven_stacks/aspit.cpp:474
 msgid ""
 "At this point, the Riven Demo would\n"
 "ask if you would like to open a web browser\n"
diff --git a/po/eu.po b/po/eu.po
index 30d117f3d1..964b012f43 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-06-29 13:20+0200\n"
+"POT-Creation-Date: 2018-06-29 13:32+0200\n"
 "PO-Revision-Date: 2018-04-18 10:12+0000\n"
 "Last-Translator: Adrian Frühwirth <bonki@scummvm.org>\n"
 "Language-Team: Basque <https://translations.scummvm.org/projects/scummvm/"
@@ -69,6 +69,9 @@ msgstr "Joan gora"
 #: engines/mohawk/myst_stacks/menu.cpp:256
 #: engines/mohawk/myst_stacks/menu.cpp:273
 #: engines/mohawk/myst_stacks/menu.cpp:291
+#: engines/mohawk/riven_stacks/aspit.cpp:395
+#: engines/mohawk/riven_stacks/aspit.cpp:417
+#: engines/mohawk/riven_stacks/aspit.cpp:501
 #: engines/parallaction/saveload.cpp:271 engines/scumm/dialogs.cpp:187
 #: engines/sword1/control.cpp:887
 msgid "Cancel"
@@ -585,7 +588,7 @@ msgstr "Sakatu esleituko den tekla"
 msgid "Choose an action to map"
 msgstr "Aukeratu esleituko den ekintza"
 
-#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:101
+#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:143
 msgid "~Q~uit"
 msgstr "~I~rten"
 
@@ -673,8 +676,8 @@ msgid "Search:"
 msgstr "Bilatu:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:106 engines/mohawk/myst.cpp:884
-#: engines/mohawk/riven.cpp:553 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:884
+#: engines/mohawk/riven.cpp:629 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Jokoa kargatu:"
@@ -682,8 +685,8 @@ msgstr "Jokoa kargatu:"
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
-#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:106
-#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:553
+#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:163
+#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:629
 #: 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
@@ -1828,11 +1831,11 @@ msgstr "Balioa kendu:"
 msgid "~R~esume"
 msgstr "~J~arraitu"
 
-#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:99
+#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:141
 msgid "~L~oad"
 msgstr "Ka~r~gatu"
 
-#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:100
+#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:142
 msgid "~S~ave"
 msgstr "~G~orde"
 
@@ -1863,8 +1866,8 @@ msgstr "It~z~uli abiarazlera"
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
-#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:107
-#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:565
+#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:164
+#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:641
 #: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:658
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
@@ -1885,8 +1888,8 @@ msgstr "Gorde jokoa:"
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
 #: engines/dreamweb/saveload.cpp:262 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
-#: engines/mohawk/dialogs.cpp:107 engines/mohawk/myst.cpp:896
-#: engines/mohawk/riven.cpp:565 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/dialogs.cpp:164 engines/mohawk/myst.cpp:896
+#: engines/mohawk/riven.cpp:641 engines/neverhood/menumodule.cpp:880
 #: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:659
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -1915,12 +1918,12 @@ msgstr ""
 "Jokoaren egoera gordetzeak huts egin du (%s)! Jo ezazu README-ra oinarrizko "
 "informaziorako eta laguntza gehiago nola jaso jakiteko."
 
-#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:103
+#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:99
 #: engines/tsage/dialogs.cpp:112
 msgid "~O~K"
 msgstr "~A~dos"
 
-#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:104
+#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:100
 #: engines/tsage/dialogs.cpp:113
 msgid "~C~ancel"
 msgstr "~U~tzi"
@@ -2172,7 +2175,8 @@ msgstr "Benetan irten?"
 #: backends/platform/symbian/src/SymbianActions.cpp:52
 #: backends/platform/wince/CEActionsPocket.cpp:44
 #: backends/platform/wince/CEActionsSmartphone.cpp:52
-#: engines/mohawk/myst_stacks/menu.cpp:290 engines/scumm/dialogs.cpp:188
+#: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500 engines/scumm/dialogs.cpp:188
 #: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85
 msgid "Quit"
 msgstr "Irten"
@@ -3308,63 +3312,63 @@ msgstr ""
 msgid "Naughty game mode"
 msgstr ""
 
-#: engines/mohawk/detection.cpp:162
+#: engines/mohawk/detection.cpp:154
 msgid "Play the Myst fly by movie"
 msgstr ""
 
-#: engines/mohawk/detection.cpp:163
+#: engines/mohawk/detection.cpp:155
 msgid "The Myst fly by movie was not played by the original engine."
 msgstr ""
 
 #. I18N: Option for fast scene switching
-#: engines/mohawk/dialogs.cpp:190 engines/mohawk/dialogs.cpp:289
+#: engines/mohawk/dialogs.cpp:146 engines/mohawk/dialogs.cpp:286
 msgid "~Z~ip Mode Activated"
 msgstr "~Z~ip modua aktibaturik"
 
-#: engines/mohawk/dialogs.cpp:191
+#: engines/mohawk/dialogs.cpp:147
 msgid "~T~ransitions Enabled"
 msgstr "~T~rantsizioak gaituta"
 
 #. I18N: Drop book page
-#: engines/mohawk/dialogs.cpp:193
+#: engines/mohawk/dialogs.cpp:149
 msgid "~D~rop Page"
 msgstr "Orria ~b~ota"
 
-#: engines/mohawk/dialogs.cpp:197
+#: engines/mohawk/dialogs.cpp:153
 #, fuzzy
 msgid "Show ~M~ap"
 msgstr "~M~apa erakutsi"
 
-#: engines/mohawk/dialogs.cpp:203
+#: engines/mohawk/dialogs.cpp:159
 #, fuzzy
 msgid "Main Men~u~"
 msgstr "Menu ~n~agusia"
 
-#: engines/mohawk/dialogs.cpp:290
+#: engines/mohawk/dialogs.cpp:287
 msgid "~W~ater Effect Enabled"
 msgstr "~U~r-efektua gaituta"
 
-#: engines/mohawk/dialogs.cpp:292
+#: engines/mohawk/dialogs.cpp:289
 #, fuzzy
 msgid "Transitions:"
 msgstr "~T~rantsizioak gaituta"
 
-#: engines/mohawk/dialogs.cpp:294
+#: engines/mohawk/dialogs.cpp:291
 #, fuzzy
 msgid "Disabled"
 msgstr "GFX desgaituta"
 
-#: engines/mohawk/dialogs.cpp:295
+#: engines/mohawk/dialogs.cpp:292
 #, fuzzy
 msgid "Fastest"
 msgstr "Modu bizkorra"
 
-#: engines/mohawk/dialogs.cpp:296
+#: engines/mohawk/dialogs.cpp:293
 #, fuzzy
 msgid "Normal"
 msgstr "OpenGL normala"
 
-#: engines/mohawk/dialogs.cpp:297
+#: engines/mohawk/dialogs.cpp:294
 msgid "Best"
 msgstr ""
 
@@ -3374,60 +3378,65 @@ msgid "The game is paused. Press any key to continue."
 msgstr "Joko pausatua. Sakatu ZURIUNEA jarraitzeko."
 
 #: engines/mohawk/myst_stacks/menu.cpp:255
+#: engines/mohawk/riven_stacks/aspit.cpp:394
 msgid ""
 "Are you sure you want to load a saved game? All unsaved progress will be "
 "lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:256
+#: engines/mohawk/riven_stacks/aspit.cpp:395
 #, fuzzy
 msgid "Load game"
 msgstr "Jokoa kargatu:"
 
 #: engines/mohawk/myst_stacks/menu.cpp:272
+#: engines/mohawk/riven_stacks/aspit.cpp:416
 msgid ""
 "Are you sure you want to start a new game? All unsaved progress will be lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:273
+#: engines/mohawk/riven_stacks/aspit.cpp:417
 #, fuzzy
 msgid "New game"
 msgstr "Gorde"
 
 #: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500
 #, fuzzy
 msgid "Are you sure you want to quit? All unsaved progress will be lost."
 msgstr "   Ziur irten nahi duzula?   "
 
-#: engines/mohawk/riven.cpp:154
+#: engines/mohawk/riven.cpp:158
 msgid ""
 "You're missing a Riven executable. The Windows executable is 'riven.exe' or "
 "'rivendmo.exe'. "
 msgstr ""
 
-#: engines/mohawk/riven.cpp:155
+#: engines/mohawk/riven.cpp:159
 msgid ""
 "Using the 'arcriven.z' installer file also works. In addition, you can use "
 "the Mac 'Riven' executable."
 msgstr ""
 
-#: engines/mohawk/riven.cpp:166
+#: engines/mohawk/riven.cpp:170
 msgid ""
 "You're missing 'extras.mhk'. Using the 'arcriven.z' installer file also "
 "works."
 msgstr ""
 
-#: engines/mohawk/riven.cpp:452
+#: engines/mohawk/riven.cpp:498
 msgid "You are missing the following required Riven data files:\n"
 msgstr ""
 
-#: engines/mohawk/riven_stack.cpp:182
+#: engines/mohawk/riven_stack.cpp:204
 msgid ""
 "Exploration beyond this point available only within the full version of\n"
 "the game."
 msgstr ""
 
-#: engines/mohawk/riven_stacks/aspit.cpp:309
+#: engines/mohawk/riven_stacks/aspit.cpp:474
 msgid ""
 "At this point, the Riven Demo would\n"
 "ask if you would like to open a web browser\n"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index b44ff40fd3..008d14dbdb 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-06-29 13:20+0200\n"
+"POT-Creation-Date: 2018-06-29 13:32+0200\n"
 "PO-Revision-Date: 2018-06-09 09:14+0000\n"
 "Last-Translator: jepael <kermespersialainen@gmail.com>\n"
 "Language-Team: Finnish <https://translations.scummvm.org/projects/scummvm/"
@@ -69,6 +69,9 @@ msgstr "Siirry ylös"
 #: engines/mohawk/myst_stacks/menu.cpp:256
 #: engines/mohawk/myst_stacks/menu.cpp:273
 #: engines/mohawk/myst_stacks/menu.cpp:291
+#: engines/mohawk/riven_stacks/aspit.cpp:395
+#: engines/mohawk/riven_stacks/aspit.cpp:417
+#: engines/mohawk/riven_stacks/aspit.cpp:501
 #: engines/parallaction/saveload.cpp:271 engines/scumm/dialogs.cpp:187
 #: engines/sword1/control.cpp:887
 msgid "Cancel"
@@ -592,7 +595,7 @@ msgstr "Paina haluamaasi nappia"
 msgid "Choose an action to map"
 msgstr "Valitse toiminto"
 
-#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:101
+#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:143
 msgid "~Q~uit"
 msgstr "~L~opeta"
 
@@ -680,8 +683,8 @@ msgid "Search:"
 msgstr "Etsi:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:106 engines/mohawk/myst.cpp:884
-#: engines/mohawk/riven.cpp:553 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:884
+#: engines/mohawk/riven.cpp:629 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Lataa peli:"
@@ -689,8 +692,8 @@ msgstr "Lataa peli:"
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
-#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:106
-#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:553
+#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:163
+#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:629
 #: 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
@@ -1824,11 +1827,11 @@ msgstr "<Huono arvo>"
 msgid "~R~esume"
 msgstr "~J~atka"
 
-#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:99
+#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:141
 msgid "~L~oad"
 msgstr "~L~ataa"
 
-#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:100
+#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:142
 msgid "~S~ave"
 msgstr "~T~allenna"
 
@@ -1859,8 +1862,8 @@ msgstr "Palaa p~e~livalitsimeen"
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
-#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:107
-#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:565
+#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:164
+#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:641
 #: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:658
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
@@ -1881,8 +1884,8 @@ msgstr "Tallenna peli:"
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
 #: engines/dreamweb/saveload.cpp:262 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
-#: engines/mohawk/dialogs.cpp:107 engines/mohawk/myst.cpp:896
-#: engines/mohawk/riven.cpp:565 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/dialogs.cpp:164 engines/mohawk/myst.cpp:896
+#: engines/mohawk/riven.cpp:641 engines/neverhood/menumodule.cpp:880
 #: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:659
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -1911,12 +1914,12 @@ msgstr ""
 "Pelitilan tallennus epäonnistui (%s)! Konsultoi README-tiedostoa saadaksesi "
 "lisätietoa ja ohjeita avun hankkimiseen."
 
-#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:103
+#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:99
 #: engines/tsage/dialogs.cpp:112
 msgid "~O~K"
 msgstr "~H~yväksy"
 
-#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:104
+#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:100
 #: engines/tsage/dialogs.cpp:113
 msgid "~C~ancel"
 msgstr "~P~eruuta"
@@ -2170,7 +2173,8 @@ msgstr "Haluatko varmasti lopettaa?"
 #: backends/platform/symbian/src/SymbianActions.cpp:52
 #: backends/platform/wince/CEActionsPocket.cpp:44
 #: backends/platform/wince/CEActionsSmartphone.cpp:52
-#: engines/mohawk/myst_stacks/menu.cpp:290 engines/scumm/dialogs.cpp:188
+#: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500 engines/scumm/dialogs.cpp:188
 #: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85
 msgid "Quit"
 msgstr "Lopeta"
@@ -3294,57 +3298,57 @@ msgstr "Animoitu pelikäyttöliittymä"
 msgid "Naughty game mode"
 msgstr "Tuhma pelitila"
 
-#: engines/mohawk/detection.cpp:162
+#: engines/mohawk/detection.cpp:154
 msgid "Play the Myst fly by movie"
 msgstr "Soita Myst fly by-video"
 
-#: engines/mohawk/detection.cpp:163
+#: engines/mohawk/detection.cpp:155
 msgid "The Myst fly by movie was not played by the original engine."
 msgstr "Alkuperäinen pelimoottori ei toistanut Myst fly by-videota."
 
 #. I18N: Option for fast scene switching
-#: engines/mohawk/dialogs.cpp:190 engines/mohawk/dialogs.cpp:289
+#: engines/mohawk/dialogs.cpp:146 engines/mohawk/dialogs.cpp:286
 msgid "~Z~ip Mode Activated"
 msgstr "~Z~ip moodi valittu"
 
-#: engines/mohawk/dialogs.cpp:191
+#: engines/mohawk/dialogs.cpp:147
 msgid "~T~ransitions Enabled"
 msgstr "Siir~t~ymät päällä"
 
 #. I18N: Drop book page
-#: engines/mohawk/dialogs.cpp:193
+#: engines/mohawk/dialogs.cpp:149
 msgid "~D~rop Page"
 msgstr "Pu~d~ota sivu"
 
-#: engines/mohawk/dialogs.cpp:197
+#: engines/mohawk/dialogs.cpp:153
 msgid "Show ~M~ap"
 msgstr "Näytä ~K~artta"
 
-#: engines/mohawk/dialogs.cpp:203
+#: engines/mohawk/dialogs.cpp:159
 msgid "Main Men~u~"
 msgstr "Päävalikko ~u~"
 
-#: engines/mohawk/dialogs.cpp:290
+#: engines/mohawk/dialogs.cpp:287
 msgid "~W~ater Effect Enabled"
 msgstr "~V~esiefekti päällä"
 
-#: engines/mohawk/dialogs.cpp:292
+#: engines/mohawk/dialogs.cpp:289
 msgid "Transitions:"
 msgstr "Siirtymät:"
 
-#: engines/mohawk/dialogs.cpp:294
+#: engines/mohawk/dialogs.cpp:291
 msgid "Disabled"
 msgstr "Pois päältä"
 
-#: engines/mohawk/dialogs.cpp:295
+#: engines/mohawk/dialogs.cpp:292
 msgid "Fastest"
 msgstr "Nopein"
 
-#: engines/mohawk/dialogs.cpp:296
+#: engines/mohawk/dialogs.cpp:293
 msgid "Normal"
 msgstr "Normaali"
 
-#: engines/mohawk/dialogs.cpp:297
+#: engines/mohawk/dialogs.cpp:294
 msgid "Best"
 msgstr "Paras"
 
@@ -3353,32 +3357,37 @@ msgid "The game is paused. Press any key to continue."
 msgstr "Pause. Paina mitä tahansa nappia jatkaaksesi."
 
 #: engines/mohawk/myst_stacks/menu.cpp:255
+#: engines/mohawk/riven_stacks/aspit.cpp:394
 msgid ""
 "Are you sure you want to load a saved game? All unsaved progress will be "
 "lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:256
+#: engines/mohawk/riven_stacks/aspit.cpp:395
 #, fuzzy
 msgid "Load game"
 msgstr "Lataa peli:"
 
 #: engines/mohawk/myst_stacks/menu.cpp:272
+#: engines/mohawk/riven_stacks/aspit.cpp:416
 msgid ""
 "Are you sure you want to start a new game? All unsaved progress will be lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:273
+#: engines/mohawk/riven_stacks/aspit.cpp:417
 #, fuzzy
 msgid "New game"
 msgstr "Uusi pelitallennus"
 
 #: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500
 #, fuzzy
 msgid "Are you sure you want to quit? All unsaved progress will be lost."
 msgstr "   Haluatko varmasti lopettaa?   "
 
-#: engines/mohawk/riven.cpp:154
+#: engines/mohawk/riven.cpp:158
 msgid ""
 "You're missing a Riven executable. The Windows executable is 'riven.exe' or "
 "'rivendmo.exe'. "
@@ -3386,7 +3395,7 @@ msgstr ""
 "Sinulta puuttuu Riven ohjelmatiedosto. WIndowsissa tiedosto on nimeltään "
 "\"riven.exe\" tai \"rivendmo.exe\". "
 
-#: engines/mohawk/riven.cpp:155
+#: engines/mohawk/riven.cpp:159
 msgid ""
 "Using the 'arcriven.z' installer file also works. In addition, you can use "
 "the Mac 'Riven' executable."
@@ -3394,7 +3403,7 @@ msgstr ""
 "\"archriven.z\" asennustiedoston käyttö toimii myös. Lisäksi voit käyttää "
 "Macin \"Riven\"-ohjelmatiedostoa."
 
-#: engines/mohawk/riven.cpp:166
+#: engines/mohawk/riven.cpp:170
 msgid ""
 "You're missing 'extras.mhk'. Using the 'arcriven.z' installer file also "
 "works."
@@ -3402,17 +3411,17 @@ msgstr ""
 "Sinulta puuttuu \"extras.mhk\". \"archriven.z\" asennustiedoston käyttö "
 "toimii myös."
 
-#: engines/mohawk/riven.cpp:452
+#: engines/mohawk/riven.cpp:498
 msgid "You are missing the following required Riven data files:\n"
 msgstr "Sinulta puuttuu seuraavat vaaditut Rivenin datatiedostot:\n"
 
-#: engines/mohawk/riven_stack.cpp:182
+#: engines/mohawk/riven_stack.cpp:204
 msgid ""
 "Exploration beyond this point available only within the full version of\n"
 "the game."
 msgstr "Tutkiminen tätä pidemmälle on mahdollista vain pelin täysversiossa."
 
-#: engines/mohawk/riven_stacks/aspit.cpp:309
+#: engines/mohawk/riven_stacks/aspit.cpp:474
 msgid ""
 "At this point, the Riven Demo would\n"
 "ask if you would like to open a web browser\n"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 1923bab2f6..bcba1e1391 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-06-29 13:20+0200\n"
+"POT-Creation-Date: 2018-06-29 13:32+0200\n"
 "PO-Revision-Date: 2018-06-05 19:36+0000\n"
 "Last-Translator: Thierry Crozat <criezy@scummvm.org>\n"
 "Language-Team: French <https://translations.scummvm.org/projects/scummvm/"
@@ -69,6 +69,9 @@ msgstr "Remonter"
 #: engines/mohawk/myst_stacks/menu.cpp:256
 #: engines/mohawk/myst_stacks/menu.cpp:273
 #: engines/mohawk/myst_stacks/menu.cpp:291
+#: engines/mohawk/riven_stacks/aspit.cpp:395
+#: engines/mohawk/riven_stacks/aspit.cpp:417
+#: engines/mohawk/riven_stacks/aspit.cpp:501
 #: engines/parallaction/saveload.cpp:271 engines/scumm/dialogs.cpp:187
 #: engines/sword1/control.cpp:887
 msgid "Cancel"
@@ -597,7 +600,7 @@ msgstr "Appuyez sur la touche à associer"
 msgid "Choose an action to map"
 msgstr "Sélectionnez une action à affecter"
 
-#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:101
+#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:143
 msgid "~Q~uit"
 msgstr "~Q~uitter"
 
@@ -686,8 +689,8 @@ msgid "Search:"
 msgstr "Filtre :"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:106 engines/mohawk/myst.cpp:884
-#: engines/mohawk/riven.cpp:553 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:884
+#: engines/mohawk/riven.cpp:629 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Charger le jeu :"
@@ -695,8 +698,8 @@ msgstr "Charger le jeu :"
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
-#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:106
-#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:553
+#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:163
+#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:629
 #: 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
@@ -1847,11 +1850,11 @@ msgstr "<Valeur invalide>"
 msgid "~R~esume"
 msgstr "~R~eprendre"
 
-#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:99
+#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:141
 msgid "~L~oad"
 msgstr "~C~harger"
 
-#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:100
+#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:142
 msgid "~S~ave"
 msgstr "~S~auver"
 
@@ -1882,8 +1885,8 @@ msgstr "Retour au ~L~anceur"
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
-#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:107
-#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:565
+#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:164
+#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:641
 #: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:658
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
@@ -1904,8 +1907,8 @@ msgstr "Sauvegarde :"
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
 #: engines/dreamweb/saveload.cpp:262 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
-#: engines/mohawk/dialogs.cpp:107 engines/mohawk/myst.cpp:896
-#: engines/mohawk/riven.cpp:565 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/dialogs.cpp:164 engines/mohawk/myst.cpp:896
+#: engines/mohawk/riven.cpp:641 engines/neverhood/menumodule.cpp:880
 #: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:659
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -1935,12 +1938,12 @@ msgstr ""
 "Echec de la sauvegarde (%s) ! Lisez le fichier README pour les informations "
 "de base et les instructions pour obtenir de l'aide supplémentaire."
 
-#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:103
+#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:99
 #: engines/tsage/dialogs.cpp:112
 msgid "~O~K"
 msgstr "~O~K"
 
-#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:104
+#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:100
 #: engines/tsage/dialogs.cpp:113
 msgid "~C~ancel"
 msgstr "~A~nnuler"
@@ -2197,7 +2200,8 @@ msgstr "Voulez-vous vraiment quitter ?"
 #: backends/platform/symbian/src/SymbianActions.cpp:52
 #: backends/platform/wince/CEActionsPocket.cpp:44
 #: backends/platform/wince/CEActionsSmartphone.cpp:52
-#: engines/mohawk/myst_stacks/menu.cpp:290 engines/scumm/dialogs.cpp:188
+#: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500 engines/scumm/dialogs.cpp:188
 #: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85
 msgid "Quit"
 msgstr "Quitter"
@@ -3326,57 +3330,57 @@ msgstr "Interface du jeu animée"
 msgid "Naughty game mode"
 msgstr "Mode coquin"
 
-#: engines/mohawk/detection.cpp:162
+#: engines/mohawk/detection.cpp:154
 msgid "Play the Myst fly by movie"
 msgstr "Jouer la vidéo du survol de Myst"
 
-#: engines/mohawk/detection.cpp:163
+#: engines/mohawk/detection.cpp:155
 msgid "The Myst fly by movie was not played by the original engine."
 msgstr "La vidéo du survol de Myst n'était pas jouée par le moteur originel."
 
 #. I18N: Option for fast scene switching
-#: engines/mohawk/dialogs.cpp:190 engines/mohawk/dialogs.cpp:289
+#: engines/mohawk/dialogs.cpp:146 engines/mohawk/dialogs.cpp:286
 msgid "~Z~ip Mode Activated"
 msgstr "Mode ~Z~ip Activé"
 
-#: engines/mohawk/dialogs.cpp:191
+#: engines/mohawk/dialogs.cpp:147
 msgid "~T~ransitions Enabled"
 msgstr "T~r~ansitions activées"
 
 #. I18N: Drop book page
-#: engines/mohawk/dialogs.cpp:193
+#: engines/mohawk/dialogs.cpp:149
 msgid "~D~rop Page"
 msgstr "~L~acher la Page"
 
-#: engines/mohawk/dialogs.cpp:197
+#: engines/mohawk/dialogs.cpp:153
 msgid "Show ~M~ap"
 msgstr "Afficher la ~C~arte"
 
-#: engines/mohawk/dialogs.cpp:203
+#: engines/mohawk/dialogs.cpp:159
 msgid "Main Men~u~"
 msgstr "~M~enu Principal"
 
-#: engines/mohawk/dialogs.cpp:290
+#: engines/mohawk/dialogs.cpp:287
 msgid "~W~ater Effect Enabled"
 msgstr "~E~ffets de l'Eau Activés"
 
-#: engines/mohawk/dialogs.cpp:292
+#: engines/mohawk/dialogs.cpp:289
 msgid "Transitions:"
 msgstr "Transitions :"
 
-#: engines/mohawk/dialogs.cpp:294
+#: engines/mohawk/dialogs.cpp:291
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: engines/mohawk/dialogs.cpp:295
+#: engines/mohawk/dialogs.cpp:292
 msgid "Fastest"
 msgstr "Rapide"
 
-#: engines/mohawk/dialogs.cpp:296
+#: engines/mohawk/dialogs.cpp:293
 msgid "Normal"
 msgstr "Normal"
 
-#: engines/mohawk/dialogs.cpp:297
+#: engines/mohawk/dialogs.cpp:294
 msgid "Best"
 msgstr "Meilleur"
 
@@ -3385,32 +3389,37 @@ msgid "The game is paused. Press any key to continue."
 msgstr "Jeu en pause. Appuyer sur une touche pour Reprendre."
 
 #: engines/mohawk/myst_stacks/menu.cpp:255
+#: engines/mohawk/riven_stacks/aspit.cpp:394
 msgid ""
 "Are you sure you want to load a saved game? All unsaved progress will be "
 "lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:256
+#: engines/mohawk/riven_stacks/aspit.cpp:395
 #, fuzzy
 msgid "Load game"
 msgstr "Charger le jeu :"
 
 #: engines/mohawk/myst_stacks/menu.cpp:272
+#: engines/mohawk/riven_stacks/aspit.cpp:416
 msgid ""
 "Are you sure you want to start a new game? All unsaved progress will be lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:273
+#: engines/mohawk/riven_stacks/aspit.cpp:417
 #, fuzzy
 msgid "New game"
 msgstr "Nouvelle Sauvegarde"
 
 #: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500
 #, fuzzy
 msgid "Are you sure you want to quit? All unsaved progress will be lost."
 msgstr "   Voulez-vous vraiment quitter ?   "
 
-#: engines/mohawk/riven.cpp:154
+#: engines/mohawk/riven.cpp:158
 msgid ""
 "You're missing a Riven executable. The Windows executable is 'riven.exe' or "
 "'rivendmo.exe'. "
@@ -3418,7 +3427,7 @@ msgstr ""
 "Il vous manque l'exécutable de Riven. L'exécutable pour Windows se nomme "
 "'rivent.exe' ou 'rivendmo.exe'. "
 
-#: engines/mohawk/riven.cpp:155
+#: engines/mohawk/riven.cpp:159
 msgid ""
 "Using the 'arcriven.z' installer file also works. In addition, you can use "
 "the Mac 'Riven' executable."
@@ -3426,7 +3435,7 @@ msgstr ""
 "Utiliser le fichier archive 'arcriven.z' marche également. Vous pouvez "
 "également utiliser l'exécutable pour Mac qui se nomme 'Riven'."
 
-#: engines/mohawk/riven.cpp:166
+#: engines/mohawk/riven.cpp:170
 msgid ""
 "You're missing 'extras.mhk'. Using the 'arcriven.z' installer file also "
 "works."
@@ -3434,18 +3443,18 @@ msgstr ""
 "Il vous manque le fichier 'extras.mhk'. Utiliser le fichier archive "
 "'arcriven.z' marche également."
 
-#: engines/mohawk/riven.cpp:452
+#: engines/mohawk/riven.cpp:498
 msgid "You are missing the following required Riven data files:\n"
 msgstr ""
 "Il vous manque les fichiers de données obligatoires suivants pour Riven :\n"
 
-#: engines/mohawk/riven_stack.cpp:182
+#: engines/mohawk/riven_stack.cpp:204
 msgid ""
 "Exploration beyond this point available only within the full version of\n"
 "the game."
 msgstr "L'exploration au delà de ce point nécessite d'avoir le jeu complet."
 
-#: engines/mohawk/riven_stacks/aspit.cpp:309
+#: engines/mohawk/riven_stacks/aspit.cpp:474
 msgid ""
 "At this point, the Riven Demo would\n"
 "ask if you would like to open a web browser\n"
diff --git a/po/gl_ES.po b/po/gl_ES.po
index d07ae1aaf7..b94560a8b9 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-06-29 13:20+0200\n"
+"POT-Creation-Date: 2018-06-29 13:32+0200\n"
 "PO-Revision-Date: 2018-04-18 10:12+0000\n"
 "Last-Translator: Adrian Frühwirth <bonki@scummvm.org>\n"
 "Language-Team: Galician <https://translations.scummvm.org/projects/scummvm/"
@@ -69,6 +69,9 @@ msgstr "Arriba"
 #: engines/mohawk/myst_stacks/menu.cpp:256
 #: engines/mohawk/myst_stacks/menu.cpp:273
 #: engines/mohawk/myst_stacks/menu.cpp:291
+#: engines/mohawk/riven_stacks/aspit.cpp:395
+#: engines/mohawk/riven_stacks/aspit.cpp:417
+#: engines/mohawk/riven_stacks/aspit.cpp:501
 #: engines/parallaction/saveload.cpp:271 engines/scumm/dialogs.cpp:187
 #: engines/sword1/control.cpp:887
 msgid "Cancel"
@@ -595,7 +598,7 @@ msgstr "Preme a tecla para asociala"
 msgid "Choose an action to map"
 msgstr "Elixe unha acción para asignala"
 
-#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:101
+#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:143
 msgid "~Q~uit"
 msgstr "~S~aír"
 
@@ -683,8 +686,8 @@ msgid "Search:"
 msgstr "Buscar:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:106 engines/mohawk/myst.cpp:884
-#: engines/mohawk/riven.cpp:553 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:884
+#: engines/mohawk/riven.cpp:629 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Cargar partida:"
@@ -692,8 +695,8 @@ msgstr "Cargar partida:"
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
-#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:106
-#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:553
+#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:163
+#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:629
 #: 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
@@ -1830,11 +1833,11 @@ msgstr "<Valor erróneo>"
 msgid "~R~esume"
 msgstr "~R~etomar"
 
-#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:99
+#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:141
 msgid "~L~oad"
 msgstr "~C~argar"
 
-#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:100
+#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:142
 msgid "~S~ave"
 msgstr "~G~ardar"
 
@@ -1865,8 +1868,8 @@ msgstr "~V~olver ao Iniciador"
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
-#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:107
-#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:565
+#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:164
+#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:641
 #: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:658
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
@@ -1887,8 +1890,8 @@ msgstr "Gardar partida:"
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
 #: engines/dreamweb/saveload.cpp:262 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
-#: engines/mohawk/dialogs.cpp:107 engines/mohawk/myst.cpp:896
-#: engines/mohawk/riven.cpp:565 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/dialogs.cpp:164 engines/mohawk/myst.cpp:896
+#: engines/mohawk/riven.cpp:641 engines/neverhood/menumodule.cpp:880
 #: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:659
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -1918,12 +1921,12 @@ msgstr ""
 "Erro ao gardar (%s)! Consulta o ficheiro README para obter información "
 "básica e máis instrucións para acadar asistencia adicional."
 
-#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:103
+#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:99
 #: engines/tsage/dialogs.cpp:112
 msgid "~O~K"
 msgstr "~A~ceptar"
 
-#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:104
+#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:100
 #: engines/tsage/dialogs.cpp:113
 msgid "~C~ancel"
 msgstr "~C~ancelar"
@@ -2179,7 +2182,8 @@ msgstr "Seguro que queres saír?"
 #: backends/platform/symbian/src/SymbianActions.cpp:52
 #: backends/platform/wince/CEActionsPocket.cpp:44
 #: backends/platform/wince/CEActionsSmartphone.cpp:52
-#: engines/mohawk/myst_stacks/menu.cpp:290 engines/scumm/dialogs.cpp:188
+#: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500 engines/scumm/dialogs.cpp:188
 #: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85
 msgid "Quit"
 msgstr "Saír"
@@ -3305,57 +3309,57 @@ msgstr "Interface de xogo animada"
 msgid "Naughty game mode"
 msgstr "Modo de xogo rebelde"
 
-#: engines/mohawk/detection.cpp:162
+#: engines/mohawk/detection.cpp:154
 msgid "Play the Myst fly by movie"
 msgstr "Reproducir o filme de imaxes aéreas de Myst"
 
-#: engines/mohawk/detection.cpp:163
+#: engines/mohawk/detection.cpp:155
 msgid "The Myst fly by movie was not played by the original engine."
 msgstr "O filme de imaxes aéreas de Myst non se reproduciu co motor orixinal."
 
 #. I18N: Option for fast scene switching
-#: engines/mohawk/dialogs.cpp:190 engines/mohawk/dialogs.cpp:289
+#: engines/mohawk/dialogs.cpp:146 engines/mohawk/dialogs.cpp:286
 msgid "~Z~ip Mode Activated"
 msgstr "Modo ~C~omprimido activado"
 
-#: engines/mohawk/dialogs.cpp:191
+#: engines/mohawk/dialogs.cpp:147
 msgid "~T~ransitions Enabled"
 msgstr "~T~ransicións activadas"
 
 #. I18N: Drop book page
-#: engines/mohawk/dialogs.cpp:193
+#: engines/mohawk/dialogs.cpp:149
 msgid "~D~rop Page"
 msgstr "~D~eixar folla"
 
-#: engines/mohawk/dialogs.cpp:197
+#: engines/mohawk/dialogs.cpp:153
 msgid "Show ~M~ap"
 msgstr "Mostrar ~m~apa"
 
-#: engines/mohawk/dialogs.cpp:203
+#: engines/mohawk/dialogs.cpp:159
 msgid "Main Men~u~"
 msgstr "Menú ~p~rincipal"
 
-#: engines/mohawk/dialogs.cpp:290
+#: engines/mohawk/dialogs.cpp:287
 msgid "~W~ater Effect Enabled"
 msgstr "Efecto de ~a~uga activado"
 
-#: engines/mohawk/dialogs.cpp:292
+#: engines/mohawk/dialogs.cpp:289
 msgid "Transitions:"
 msgstr "Transicións:"
 
-#: engines/mohawk/dialogs.cpp:294
+#: engines/mohawk/dialogs.cpp:291
 msgid "Disabled"
 msgstr "Desactivados"
 
-#: engines/mohawk/dialogs.cpp:295
+#: engines/mohawk/dialogs.cpp:292
 msgid "Fastest"
 msgstr "Máis rápido"
 
-#: engines/mohawk/dialogs.cpp:296
+#: engines/mohawk/dialogs.cpp:293
 msgid "Normal"
 msgstr "Normal"
 
-#: engines/mohawk/dialogs.cpp:297
+#: engines/mohawk/dialogs.cpp:294
 msgid "Best"
 msgstr "Mellor"
 
@@ -3364,32 +3368,37 @@ msgid "The game is paused. Press any key to continue."
 msgstr "Xogo en pausa. Pulsa calquera tecla para continuar."
 
 #: engines/mohawk/myst_stacks/menu.cpp:255
+#: engines/mohawk/riven_stacks/aspit.cpp:394
 msgid ""
 "Are you sure you want to load a saved game? All unsaved progress will be "
 "lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:256
+#: engines/mohawk/riven_stacks/aspit.cpp:395
 #, fuzzy
 msgid "Load game"
 msgstr "Cargar partida:"
 
 #: engines/mohawk/myst_stacks/menu.cpp:272
+#: engines/mohawk/riven_stacks/aspit.cpp:416
 msgid ""
 "Are you sure you want to start a new game? All unsaved progress will be lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:273
+#: engines/mohawk/riven_stacks/aspit.cpp:417
 #, fuzzy
 msgid "New game"
 msgstr "Novo ficheiro"
 
 #: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500
 #, fuzzy
 msgid "Are you sure you want to quit? All unsaved progress will be lost."
 msgstr "   Seguro que queres saír?   "
 
-#: engines/mohawk/riven.cpp:154
+#: engines/mohawk/riven.cpp:158
 msgid ""
 "You're missing a Riven executable. The Windows executable is 'riven.exe' or "
 "'rivendmo.exe'. "
@@ -3397,7 +3406,7 @@ msgstr ""
 "Falta un executable de Riven. O executable de Windows é riven.exe ou "
 "rivendmo.exe. "
 
-#: engines/mohawk/riven.cpp:155
+#: engines/mohawk/riven.cpp:159
 msgid ""
 "Using the 'arcriven.z' installer file also works. In addition, you can use "
 "the Mac 'Riven' executable."
@@ -3405,7 +3414,7 @@ msgstr ""
 "Tamén podes empregar o ficheiro do instalador arcriven.z ou o executable de "
 "Mac."
 
-#: engines/mohawk/riven.cpp:166
+#: engines/mohawk/riven.cpp:170
 msgid ""
 "You're missing 'extras.mhk'. Using the 'arcriven.z' installer file also "
 "works."
@@ -3413,11 +3422,11 @@ msgstr ""
 "Falta o ficheiro extras.mhk. Tamén podes empregar o ficheiro do instalador "
 "arcriven.z."
 
-#: engines/mohawk/riven.cpp:452
+#: engines/mohawk/riven.cpp:498
 msgid "You are missing the following required Riven data files:\n"
 msgstr "Faltan os seguintes ficheiros de datos requiridos de Riven:\n"
 
-#: engines/mohawk/riven_stack.cpp:182
+#: engines/mohawk/riven_stack.cpp:204
 msgid ""
 "Exploration beyond this point available only within the full version of\n"
 "the game."
@@ -3425,7 +3434,7 @@ msgstr ""
 "A exploración alén deste punto só está dispoñible coa versión\n"
 "completa do xogo.\n"
 
-#: engines/mohawk/riven_stacks/aspit.cpp:309
+#: engines/mohawk/riven_stacks/aspit.cpp:474
 msgid ""
 "At this point, the Riven Demo would\n"
 "ask if you would like to open a web browser\n"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 7a04a2ada8..953fbb9f88 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-06-29 13:20+0200\n"
+"POT-Creation-Date: 2018-06-29 13:32+0200\n"
 "PO-Revision-Date: 2018-06-08 02:32+0000\n"
 "Last-Translator: George Kormendi <grubycza@hotmail.com>\n"
 "Language-Team: Hungarian <https://translations.scummvm.org/projects/scummvm/"
@@ -69,6 +69,9 @@ msgstr "Feljebb"
 #: engines/mohawk/myst_stacks/menu.cpp:256
 #: engines/mohawk/myst_stacks/menu.cpp:273
 #: engines/mohawk/myst_stacks/menu.cpp:291
+#: engines/mohawk/riven_stacks/aspit.cpp:395
+#: engines/mohawk/riven_stacks/aspit.cpp:417
+#: engines/mohawk/riven_stacks/aspit.cpp:501
 #: engines/parallaction/saveload.cpp:271 engines/scumm/dialogs.cpp:187
 #: engines/sword1/control.cpp:887
 msgid "Cancel"
@@ -592,7 +595,7 @@ msgstr "Nyomj egy billentyût a társításhoz"
 msgid "Choose an action to map"
 msgstr "Válassz mûveletet a kiosztáshoz"
 
-#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:101
+#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:143
 msgid "~Q~uit"
 msgstr "Kilépés"
 
@@ -680,8 +683,8 @@ msgid "Search:"
 msgstr "Keresés:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:106 engines/mohawk/myst.cpp:884
-#: engines/mohawk/riven.cpp:553 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:884
+#: engines/mohawk/riven.cpp:629 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:"
@@ -689,8 +692,8 @@ msgstr "Játék betöltése:"
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
-#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:106
-#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:553
+#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:163
+#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:629
 #: 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
@@ -1820,11 +1823,11 @@ msgstr "<Rossz érték>"
 msgid "~R~esume"
 msgstr "Folytatás"
 
-#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:99
+#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:141
 msgid "~L~oad"
 msgstr "~B~etöltés"
 
-#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:100
+#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:142
 msgid "~S~ave"
 msgstr "Mentés"
 
@@ -1855,8 +1858,8 @@ msgstr "Visszatérés az indítóba"
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
-#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:107
-#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:565
+#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:164
+#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:641
 #: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:658
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
@@ -1877,8 +1880,8 @@ msgstr "Játék mentése:"
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
 #: engines/dreamweb/saveload.cpp:262 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
-#: engines/mohawk/dialogs.cpp:107 engines/mohawk/myst.cpp:896
-#: engines/mohawk/riven.cpp:565 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/dialogs.cpp:164 engines/mohawk/myst.cpp:896
+#: engines/mohawk/riven.cpp:641 engines/neverhood/menumodule.cpp:880
 #: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:659
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -1907,12 +1910,12 @@ msgstr ""
 "A (%s)! játék mentése nem sikerült. Kérlek olvasd el a README-t az alap "
 "információkról és az utasításokat, hogy hogyan segíthetsz a késõbbiekben.."
 
-#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:103
+#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:99
 #: engines/tsage/dialogs.cpp:112
 msgid "~O~K"
 msgstr "~O~K"
 
-#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:104
+#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:100
 #: engines/tsage/dialogs.cpp:113
 msgid "~C~ancel"
 msgstr "~M~égse"
@@ -2167,7 +2170,8 @@ msgstr "Biztos hogy ki akarsz lépni ?"
 #: backends/platform/symbian/src/SymbianActions.cpp:52
 #: backends/platform/wince/CEActionsPocket.cpp:44
 #: backends/platform/wince/CEActionsSmartphone.cpp:52
-#: engines/mohawk/myst_stacks/menu.cpp:290 engines/scumm/dialogs.cpp:188
+#: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500 engines/scumm/dialogs.cpp:188
 #: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85
 msgid "Quit"
 msgstr "Kilépés"
@@ -3288,57 +3292,57 @@ msgstr "Animált játék felület"
 msgid "Naughty game mode"
 msgstr "Pajkos játékmód"
 
-#: engines/mohawk/detection.cpp:162
+#: engines/mohawk/detection.cpp:154
 msgid "Play the Myst fly by movie"
 msgstr "Myst bevezetõ film lejátszása"
 
-#: engines/mohawk/detection.cpp:163
+#: engines/mohawk/detection.cpp:155
 msgid "The Myst fly by movie was not played by the original engine."
 msgstr "A Myst bevezetõ filmet nem játszotta le az eredeti motor."
 
 #. I18N: Option for fast scene switching
-#: engines/mohawk/dialogs.cpp:190 engines/mohawk/dialogs.cpp:289
+#: engines/mohawk/dialogs.cpp:146 engines/mohawk/dialogs.cpp:286
 msgid "~Z~ip Mode Activated"
 msgstr "~Z~ip Mód aktiválva"
 
-#: engines/mohawk/dialogs.cpp:191
+#: engines/mohawk/dialogs.cpp:147
 msgid "~T~ransitions Enabled"
 msgstr "~Á~tmenetek engedélyezve"
 
 #. I18N: Drop book page
-#: engines/mohawk/dialogs.cpp:193
+#: engines/mohawk/dialogs.cpp:149
 msgid "~D~rop Page"
 msgstr "Oldal~D~obás"
 
-#: engines/mohawk/dialogs.cpp:197
+#: engines/mohawk/dialogs.cpp:153
 msgid "Show ~M~ap"
 msgstr "~M~ Térkép nézet"
 
-#: engines/mohawk/dialogs.cpp:203
+#: engines/mohawk/dialogs.cpp:159
 msgid "Main Men~u~"
 msgstr "Fõ Menü ~u~"
 
-#: engines/mohawk/dialogs.cpp:290
+#: engines/mohawk/dialogs.cpp:287
 msgid "~W~ater Effect Enabled"
 msgstr "Vízeffektus engedélyezve"
 
-#: engines/mohawk/dialogs.cpp:292
+#: engines/mohawk/dialogs.cpp:289
 msgid "Transitions:"
 msgstr "Átmenetek:"
 
-#: engines/mohawk/dialogs.cpp:294
+#: engines/mohawk/dialogs.cpp:291
 msgid "Disabled"
 msgstr "Letiltva"
 
-#: engines/mohawk/dialogs.cpp:295
+#: engines/mohawk/dialogs.cpp:292
 msgid "Fastest"
 msgstr "Leggyorsabb"
 
-#: engines/mohawk/dialogs.cpp:296
+#: engines/mohawk/dialogs.cpp:293
 msgid "Normal"
 msgstr "Normál"
 
-#: engines/mohawk/dialogs.cpp:297
+#: engines/mohawk/dialogs.cpp:294
 msgid "Best"
 msgstr "Legjobb"
 
@@ -3347,32 +3351,37 @@ msgid "The game is paused. Press any key to continue."
 msgstr "A játék szünetel. Nyomj egy gombot a folytatáshoz."
 
 #: engines/mohawk/myst_stacks/menu.cpp:255
+#: engines/mohawk/riven_stacks/aspit.cpp:394
 msgid ""
 "Are you sure you want to load a saved game? All unsaved progress will be "
 "lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:256
+#: engines/mohawk/riven_stacks/aspit.cpp:395
 #, fuzzy
 msgid "Load game"
 msgstr "Játék betöltése:"
 
 #: engines/mohawk/myst_stacks/menu.cpp:272
+#: engines/mohawk/riven_stacks/aspit.cpp:416
 msgid ""
 "Are you sure you want to start a new game? All unsaved progress will be lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:273
+#: engines/mohawk/riven_stacks/aspit.cpp:417
 #, fuzzy
 msgid "New game"
 msgstr "Új Mentés"
 
 #: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500
 #, fuzzy
 msgid "Are you sure you want to quit? All unsaved progress will be lost."
 msgstr "   Biztos hogy ki akarsz lépni ?   "
 
-#: engines/mohawk/riven.cpp:154
+#: engines/mohawk/riven.cpp:158
 msgid ""
 "You're missing a Riven executable. The Windows executable is 'riven.exe' or "
 "'rivendmo.exe'. "
@@ -3380,7 +3389,7 @@ msgstr ""
 "Hiányzik a Riven futtatható állomány. A Windows fájlok neve 'riven.exe' vagy "
 "'rivendmo.exe'. "
 
-#: engines/mohawk/riven.cpp:155
+#: engines/mohawk/riven.cpp:159
 msgid ""
 "Using the 'arcriven.z' installer file also works. In addition, you can use "
 "the Mac 'Riven' executable."
@@ -3388,18 +3397,18 @@ msgstr ""
 "Az 'arcriven.z' telepítõ fájl is használható. Ezen felül használható még a "
 "'Riven' Mac indítófájl."
 
-#: engines/mohawk/riven.cpp:166
+#: engines/mohawk/riven.cpp:170
 msgid ""
 "You're missing 'extras.mhk'. Using the 'arcriven.z' installer file also "
 "works."
 msgstr ""
 "Hiányzik az 'extras.mhk'. A telepítõ 'arcriven.z' fájlja is használható még."
 
-#: engines/mohawk/riven.cpp:452
+#: engines/mohawk/riven.cpp:498
 msgid "You are missing the following required Riven data files:\n"
 msgstr "A következõ szükséges Riven adatfájlok hiányoznak:\n"
 
-#: engines/mohawk/riven_stack.cpp:182
+#: engines/mohawk/riven_stack.cpp:204
 msgid ""
 "Exploration beyond this point available only within the full version of\n"
 "the game."
@@ -3407,7 +3416,7 @@ msgstr ""
 "Kutatás ezen a ponton túl csak a játék teljes verziójával\n"
 "elérhetõ."
 
-#: engines/mohawk/riven_stacks/aspit.cpp:309
+#: engines/mohawk/riven_stacks/aspit.cpp:474
 msgid ""
 "At this point, the Riven Demo would\n"
 "ask if you would like to open a web browser\n"
diff --git a/po/it_IT.po b/po/it_IT.po
index e7bbe9694f..03a6f1e059 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-06-29 13:20+0200\n"
+"POT-Creation-Date: 2018-06-29 13:32+0200\n"
 "PO-Revision-Date: 2018-06-11 20:27+0000\n"
 "Last-Translator: Paolo Bossi <pbossi86@gmail.com>\n"
 "Language-Team: Italian <https://translations.scummvm.org/projects/scummvm/"
@@ -69,6 +69,9 @@ msgstr "Su"
 #: engines/mohawk/myst_stacks/menu.cpp:256
 #: engines/mohawk/myst_stacks/menu.cpp:273
 #: engines/mohawk/myst_stacks/menu.cpp:291
+#: engines/mohawk/riven_stacks/aspit.cpp:395
+#: engines/mohawk/riven_stacks/aspit.cpp:417
+#: engines/mohawk/riven_stacks/aspit.cpp:501
 #: engines/parallaction/saveload.cpp:271 engines/scumm/dialogs.cpp:187
 #: engines/sword1/control.cpp:887
 msgid "Cancel"
@@ -596,7 +599,7 @@ msgstr "Premi il tasto da associare"
 msgid "Choose an action to map"
 msgstr "Scegli un'azione da mappare"
 
-#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:101
+#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:143
 msgid "~Q~uit"
 msgstr "C~h~iudi"
 
@@ -684,8 +687,8 @@ msgid "Search:"
 msgstr "Cerca:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:106 engines/mohawk/myst.cpp:884
-#: engines/mohawk/riven.cpp:553 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:884
+#: engines/mohawk/riven.cpp:629 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Carica gioco:"
@@ -693,8 +696,8 @@ msgstr "Carica gioco:"
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
-#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:106
-#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:553
+#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:163
+#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:629
 #: 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
@@ -1838,11 +1841,11 @@ msgstr "<Valore non valido>"
 msgid "~R~esume"
 msgstr "~R~ipristina"
 
-#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:99
+#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:141
 msgid "~L~oad"
 msgstr "~C~arica"
 
-#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:100
+#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:142
 msgid "~S~ave"
 msgstr "~S~alva"
 
@@ -1873,8 +1876,8 @@ msgstr "~V~ai a elenco giochi"
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
-#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:107
-#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:565
+#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:164
+#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:641
 #: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:658
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
@@ -1895,8 +1898,8 @@ msgstr "Salva gioco:"
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
 #: engines/dreamweb/saveload.cpp:262 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
-#: engines/mohawk/dialogs.cpp:107 engines/mohawk/myst.cpp:896
-#: engines/mohawk/riven.cpp:565 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/dialogs.cpp:164 engines/mohawk/myst.cpp:896
+#: engines/mohawk/riven.cpp:641 engines/neverhood/menumodule.cpp:880
 #: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:659
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -1926,12 +1929,12 @@ msgstr ""
 "Salvataggio non riuscito (%s). Consultare il file README per le informazioni "
 "di base e per le istruzioni su come ottenere ulteriore assistenza."
 
-#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:103
+#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:99
 #: engines/tsage/dialogs.cpp:112
 msgid "~O~K"
 msgstr "~O~K"
 
-#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:104
+#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:100
 #: engines/tsage/dialogs.cpp:113
 msgid "~C~ancel"
 msgstr "~A~nnulla"
@@ -2188,7 +2191,8 @@ msgstr "Sei sicuro di voler uscire?"
 #: backends/platform/symbian/src/SymbianActions.cpp:52
 #: backends/platform/wince/CEActionsPocket.cpp:44
 #: backends/platform/wince/CEActionsSmartphone.cpp:52
-#: engines/mohawk/myst_stacks/menu.cpp:290 engines/scumm/dialogs.cpp:188
+#: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500 engines/scumm/dialogs.cpp:188
 #: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85
 msgid "Quit"
 msgstr "Esci"
@@ -3313,59 +3317,59 @@ msgstr "Animazioni interfaccia di gioco"
 msgid "Naughty game mode"
 msgstr "Modalità osé"
 
-#: engines/mohawk/detection.cpp:162
+#: engines/mohawk/detection.cpp:154
 msgid "Play the Myst fly by movie"
 msgstr "Riproduci il volo panoramico di Myst"
 
-#: engines/mohawk/detection.cpp:163
+#: engines/mohawk/detection.cpp:155
 msgid "The Myst fly by movie was not played by the original engine."
 msgstr ""
 "Il filmato del volo panoramico di Myst non veniva riprodotto dal motore "
 "originale del gioco."
 
 #. I18N: Option for fast scene switching
-#: engines/mohawk/dialogs.cpp:190 engines/mohawk/dialogs.cpp:289
+#: engines/mohawk/dialogs.cpp:146 engines/mohawk/dialogs.cpp:286
 msgid "~Z~ip Mode Activated"
 msgstr "Modalità ~Z~ip attivata"
 
-#: engines/mohawk/dialogs.cpp:191
+#: engines/mohawk/dialogs.cpp:147
 msgid "~T~ransitions Enabled"
 msgstr "~T~ransizioni attive"
 
 #. I18N: Drop book page
-#: engines/mohawk/dialogs.cpp:193
+#: engines/mohawk/dialogs.cpp:149
 msgid "~D~rop Page"
 msgstr "~L~ascia pagina"
 
-#: engines/mohawk/dialogs.cpp:197
+#: engines/mohawk/dialogs.cpp:153
 msgid "Show ~M~ap"
 msgstr "Mostra ~M~appa"
 
-#: engines/mohawk/dialogs.cpp:203
+#: engines/mohawk/dialogs.cpp:159
 msgid "Main Men~u~"
 msgstr "~M~enu principale"
 
-#: engines/mohawk/dialogs.cpp:290
+#: engines/mohawk/dialogs.cpp:287
 msgid "~W~ater Effect Enabled"
 msgstr "~E~ffetto acqua attivo"
 
-#: engines/mohawk/dialogs.cpp:292
+#: engines/mohawk/dialogs.cpp:289
 msgid "Transitions:"
 msgstr "Transizioni:"
 
-#: engines/mohawk/dialogs.cpp:294
+#: engines/mohawk/dialogs.cpp:291
 msgid "Disabled"
 msgstr "Disattivato"
 
-#: engines/mohawk/dialogs.cpp:295
+#: engines/mohawk/dialogs.cpp:292
 msgid "Fastest"
 msgstr "II più veloce possibile"
 
-#: engines/mohawk/dialogs.cpp:296
+#: engines/mohawk/dialogs.cpp:293
 msgid "Normal"
 msgstr "Normale"
 
-#: engines/mohawk/dialogs.cpp:297
+#: engines/mohawk/dialogs.cpp:294
 msgid "Best"
 msgstr "Migliore"
 
@@ -3374,32 +3378,37 @@ msgid "The game is paused. Press any key to continue."
 msgstr "Gioco in pausa. Premi un tasto per continuare."
 
 #: engines/mohawk/myst_stacks/menu.cpp:255
+#: engines/mohawk/riven_stacks/aspit.cpp:394
 msgid ""
 "Are you sure you want to load a saved game? All unsaved progress will be "
 "lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:256
+#: engines/mohawk/riven_stacks/aspit.cpp:395
 #, fuzzy
 msgid "Load game"
 msgstr "Carica gioco:"
 
 #: engines/mohawk/myst_stacks/menu.cpp:272
+#: engines/mohawk/riven_stacks/aspit.cpp:416
 msgid ""
 "Are you sure you want to start a new game? All unsaved progress will be lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:273
+#: engines/mohawk/riven_stacks/aspit.cpp:417
 #, fuzzy
 msgid "New game"
 msgstr "Nuovo salvataggio"
 
 #: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500
 #, fuzzy
 msgid "Are you sure you want to quit? All unsaved progress will be lost."
 msgstr "   Sei sicuro di voler uscire?   "
 
-#: engines/mohawk/riven.cpp:154
+#: engines/mohawk/riven.cpp:158
 msgid ""
 "You're missing a Riven executable. The Windows executable is 'riven.exe' or "
 "'rivendmo.exe'. "
@@ -3407,7 +3416,7 @@ msgstr ""
 "File eseguibile di Riven non trovato. L'eseguibile per la versione Windows è "
 "'riven.exe' o 'rivendmo.exe'. "
 
-#: engines/mohawk/riven.cpp:155
+#: engines/mohawk/riven.cpp:159
 msgid ""
 "Using the 'arcriven.z' installer file also works. In addition, you can use "
 "the Mac 'Riven' executable."
@@ -3415,7 +3424,7 @@ msgstr ""
 "È anche possibile usare il file di installazione 'arcriven.z', o "
 "l'eseguibile 'Riven' per la versione Mac."
 
-#: engines/mohawk/riven.cpp:166
+#: engines/mohawk/riven.cpp:170
 msgid ""
 "You're missing 'extras.mhk'. Using the 'arcriven.z' installer file also "
 "works."
@@ -3423,17 +3432,17 @@ msgstr ""
 "File 'extras.mhk' non trovato. È anche possibile usare il file di "
 "installazione 'arcriven.z'."
 
-#: engines/mohawk/riven.cpp:452
+#: engines/mohawk/riven.cpp:498
 msgid "You are missing the following required Riven data files:\n"
 msgstr "I seguenti file di dati di Riven non sono stati trovati:\n"
 
-#: engines/mohawk/riven_stack.cpp:182
+#: engines/mohawk/riven_stack.cpp:204
 msgid ""
 "Exploration beyond this point available only within the full version of\n"
 "the game."
 msgstr "Le aree oltre questo punto sono disponibili solo nel gioco completo."
 
-#: engines/mohawk/riven_stacks/aspit.cpp:309
+#: engines/mohawk/riven_stacks/aspit.cpp:474
 msgid ""
 "At this point, the Riven Demo would\n"
 "ask if you would like to open a web browser\n"
diff --git a/po/nb_NO.po b/po/nb_NO.po
index d1d51bceab..4772d089bd 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-06-29 13:20+0200\n"
+"POT-Creation-Date: 2018-06-29 13:32+0200\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/"
@@ -70,6 +70,9 @@ msgstr "Oppover"
 #: engines/mohawk/myst_stacks/menu.cpp:256
 #: engines/mohawk/myst_stacks/menu.cpp:273
 #: engines/mohawk/myst_stacks/menu.cpp:291
+#: engines/mohawk/riven_stacks/aspit.cpp:395
+#: engines/mohawk/riven_stacks/aspit.cpp:417
+#: engines/mohawk/riven_stacks/aspit.cpp:501
 #: engines/parallaction/saveload.cpp:271 engines/scumm/dialogs.cpp:187
 #: engines/sword1/control.cpp:887
 msgid "Cancel"
@@ -595,7 +598,7 @@ msgstr "Trykk tasten som skal kobles"
 msgid "Choose an action to map"
 msgstr "Velg en handling for kobling"
 
-#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:101
+#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:143
 msgid "~Q~uit"
 msgstr "~A~vslutt"
 
@@ -683,8 +686,8 @@ msgid "Search:"
 msgstr "Søk:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:106 engines/mohawk/myst.cpp:884
-#: engines/mohawk/riven.cpp:553 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:884
+#: engines/mohawk/riven.cpp:629 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Åpne spill:"
@@ -692,8 +695,8 @@ msgstr "Åpne spill:"
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
-#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:106
-#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:553
+#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:163
+#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:629
 #: 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
@@ -1827,11 +1830,11 @@ msgstr "<Ugyldig verdi>"
 msgid "~R~esume"
 msgstr "~F~ortsett"
 
-#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:99
+#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:141
 msgid "~L~oad"
 msgstr "~Å~pne"
 
-#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:100
+#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:142
 msgid "~S~ave"
 msgstr "~L~agre"
 
@@ -1862,8 +1865,8 @@ msgstr "~T~ilbake til oppstarter"
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
-#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:107
-#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:565
+#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:164
+#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:641
 #: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:658
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
@@ -1884,8 +1887,8 @@ msgstr "Lagret spill:"
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
 #: engines/dreamweb/saveload.cpp:262 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
-#: engines/mohawk/dialogs.cpp:107 engines/mohawk/myst.cpp:896
-#: engines/mohawk/riven.cpp:565 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/dialogs.cpp:164 engines/mohawk/myst.cpp:896
+#: engines/mohawk/riven.cpp:641 engines/neverhood/menumodule.cpp:880
 #: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:659
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -1915,12 +1918,12 @@ msgstr ""
 "Lagring av spilltilstand feilet (%s)! Vennligst konsulter README-filen for "
 "grunnleggende informasjon og instruksjon om hvordan du får ytterligere hjelp."
 
-#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:103
+#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:99
 #: engines/tsage/dialogs.cpp:112
 msgid "~O~K"
 msgstr "~O~K"
 
-#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:104
+#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:100
 #: engines/tsage/dialogs.cpp:113
 msgid "~C~ancel"
 msgstr "~A~vbryt"
@@ -2172,7 +2175,8 @@ msgstr "Vil du virkelig avslutte?"
 #: backends/platform/symbian/src/SymbianActions.cpp:52
 #: backends/platform/wince/CEActionsPocket.cpp:44
 #: backends/platform/wince/CEActionsSmartphone.cpp:52
-#: engines/mohawk/myst_stacks/menu.cpp:290 engines/scumm/dialogs.cpp:188
+#: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500 engines/scumm/dialogs.cpp:188
 #: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85
 msgid "Quit"
 msgstr "Avslutt"
@@ -3300,62 +3304,62 @@ msgstr ""
 msgid "Naughty game mode"
 msgstr ""
 
-#: engines/mohawk/detection.cpp:162
+#: engines/mohawk/detection.cpp:154
 msgid "Play the Myst fly by movie"
 msgstr ""
 
-#: engines/mohawk/detection.cpp:163
+#: engines/mohawk/detection.cpp:155
 msgid "The Myst fly by movie was not played by the original engine."
 msgstr ""
 
 #. I18N: Option for fast scene switching
-#: engines/mohawk/dialogs.cpp:190 engines/mohawk/dialogs.cpp:289
+#: engines/mohawk/dialogs.cpp:146 engines/mohawk/dialogs.cpp:286
 msgid "~Z~ip Mode Activated"
 msgstr "~Z~ipmodus aktivert"
 
-#: engines/mohawk/dialogs.cpp:191
+#: engines/mohawk/dialogs.cpp:147
 msgid "~T~ransitions Enabled"
 msgstr "~O~verganger aktivert"
 
 #. I18N: Drop book page
-#: engines/mohawk/dialogs.cpp:193
+#: engines/mohawk/dialogs.cpp:149
 msgid "~D~rop Page"
 msgstr "~D~ropp Side"
 
-#: engines/mohawk/dialogs.cpp:197
+#: engines/mohawk/dialogs.cpp:153
 msgid "Show ~M~ap"
 msgstr "Vi~s~ Kart"
 
-#: engines/mohawk/dialogs.cpp:203
+#: engines/mohawk/dialogs.cpp:159
 #, fuzzy
 msgid "Main Men~u~"
 msgstr "Hoved~m~eny"
 
-#: engines/mohawk/dialogs.cpp:290
+#: engines/mohawk/dialogs.cpp:287
 msgid "~W~ater Effect Enabled"
 msgstr "~V~anneffekt aktivert"
 
-#: engines/mohawk/dialogs.cpp:292
+#: engines/mohawk/dialogs.cpp:289
 #, fuzzy
 msgid "Transitions:"
 msgstr "~O~verganger aktivert"
 
-#: engines/mohawk/dialogs.cpp:294
+#: engines/mohawk/dialogs.cpp:291
 #, fuzzy
 msgid "Disabled"
 msgstr "Deaktivert GFX"
 
-#: engines/mohawk/dialogs.cpp:295
+#: engines/mohawk/dialogs.cpp:292
 #, fuzzy
 msgid "Fastest"
 msgstr "Lim inn"
 
-#: engines/mohawk/dialogs.cpp:296
+#: engines/mohawk/dialogs.cpp:293
 #, fuzzy
 msgid "Normal"
 msgstr "OpenGL Normal"
 
-#: engines/mohawk/dialogs.cpp:297
+#: engines/mohawk/dialogs.cpp:294
 msgid "Best"
 msgstr ""
 
@@ -3364,60 +3368,65 @@ msgid "The game is paused. Press any key to continue."
 msgstr "Spillet er satt på pause. Trykk en tast for å fortsette."
 
 #: engines/mohawk/myst_stacks/menu.cpp:255
+#: engines/mohawk/riven_stacks/aspit.cpp:394
 msgid ""
 "Are you sure you want to load a saved game? All unsaved progress will be "
 "lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:256
+#: engines/mohawk/riven_stacks/aspit.cpp:395
 #, fuzzy
 msgid "Load game"
 msgstr "Åpne spill:"
 
 #: engines/mohawk/myst_stacks/menu.cpp:272
+#: engines/mohawk/riven_stacks/aspit.cpp:416
 msgid ""
 "Are you sure you want to start a new game? All unsaved progress will be lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:273
+#: engines/mohawk/riven_stacks/aspit.cpp:417
 #, fuzzy
 msgid "New game"
 msgstr "Nytt lagret spill"
 
 #: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500
 #, fuzzy
 msgid "Are you sure you want to quit? All unsaved progress will be lost."
 msgstr "   Er du sikker på at du vil avslutte ?   "
 
-#: engines/mohawk/riven.cpp:154
+#: engines/mohawk/riven.cpp:158
 msgid ""
 "You're missing a Riven executable. The Windows executable is 'riven.exe' or "
 "'rivendmo.exe'. "
 msgstr ""
 
-#: engines/mohawk/riven.cpp:155
+#: engines/mohawk/riven.cpp:159
 msgid ""
 "Using the 'arcriven.z' installer file also works. In addition, you can use "
 "the Mac 'Riven' executable."
 msgstr ""
 
-#: engines/mohawk/riven.cpp:166
+#: engines/mohawk/riven.cpp:170
 msgid ""
 "You're missing 'extras.mhk'. Using the 'arcriven.z' installer file also "
 "works."
 msgstr ""
 
-#: engines/mohawk/riven.cpp:452
+#: engines/mohawk/riven.cpp:498
 msgid "You are missing the following required Riven data files:\n"
 msgstr ""
 
-#: engines/mohawk/riven_stack.cpp:182
+#: engines/mohawk/riven_stack.cpp:204
 msgid ""
 "Exploration beyond this point available only within the full version of\n"
 "the game."
 msgstr ""
 
-#: engines/mohawk/riven_stacks/aspit.cpp:309
+#: engines/mohawk/riven_stacks/aspit.cpp:474
 msgid ""
 "At this point, the Riven Demo would\n"
 "ask if you would like to open a web browser\n"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index f71790eeac..8d59ca39f5 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-06-29 13:20+0200\n"
+"POT-Creation-Date: 2018-06-29 13:32+0200\n"
 "PO-Revision-Date: 2018-06-18 18:28+0000\n"
 "Last-Translator: Ben Castricum <github@bencastricum.nl>\n"
 "Language-Team: Dutch <https://translations.scummvm.org/projects/scummvm/"
@@ -70,6 +70,9 @@ msgstr "Ga omhoog"
 #: engines/mohawk/myst_stacks/menu.cpp:256
 #: engines/mohawk/myst_stacks/menu.cpp:273
 #: engines/mohawk/myst_stacks/menu.cpp:291
+#: engines/mohawk/riven_stacks/aspit.cpp:395
+#: engines/mohawk/riven_stacks/aspit.cpp:417
+#: engines/mohawk/riven_stacks/aspit.cpp:501
 #: engines/parallaction/saveload.cpp:271 engines/scumm/dialogs.cpp:187
 #: engines/sword1/control.cpp:887
 msgid "Cancel"
@@ -594,7 +597,7 @@ msgstr "Druk op de te associëren toets"
 msgid "Choose an action to map"
 msgstr "Selecteer een actie om te koppelen"
 
-#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:101
+#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:143
 msgid "~Q~uit"
 msgstr "~S~toppen"
 
@@ -682,8 +685,8 @@ msgid "Search:"
 msgstr "Zoeken:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:106 engines/mohawk/myst.cpp:884
-#: engines/mohawk/riven.cpp:553 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:884
+#: engines/mohawk/riven.cpp:629 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Laad spel:"
@@ -691,8 +694,8 @@ msgstr "Laad spel:"
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
-#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:106
-#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:553
+#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:163
+#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:629
 #: 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
@@ -1830,11 +1833,11 @@ msgstr "<Ongeldige waarde>"
 msgid "~R~esume"
 msgstr "~H~ervatten"
 
-#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:99
+#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:141
 msgid "~L~oad"
 msgstr "~L~aden"
 
-#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:100
+#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:142
 msgid "~S~ave"
 msgstr "Op~s~laan"
 
@@ -1865,8 +1868,8 @@ msgstr "S~t~artmenu"
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
-#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:107
-#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:565
+#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:164
+#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:641
 #: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:658
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
@@ -1887,8 +1890,8 @@ msgstr "Spel opslaan:"
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
 #: engines/dreamweb/saveload.cpp:262 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
-#: engines/mohawk/dialogs.cpp:107 engines/mohawk/myst.cpp:896
-#: engines/mohawk/riven.cpp:565 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/dialogs.cpp:164 engines/mohawk/myst.cpp:896
+#: engines/mohawk/riven.cpp:641 engines/neverhood/menumodule.cpp:880
 #: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:659
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -1919,12 +1922,12 @@ msgstr ""
 "basisinformatie, en voor instructies voor het verkrijgen van verdere "
 "assistentie."
 
-#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:103
+#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:99
 #: engines/tsage/dialogs.cpp:112
 msgid "~O~K"
 msgstr "~O~K"
 
-#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:104
+#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:100
 #: engines/tsage/dialogs.cpp:113
 msgid "~C~ancel"
 msgstr "~A~nnuleer"
@@ -2182,7 +2185,8 @@ msgstr "Wilt u echt stoppen?"
 #: backends/platform/symbian/src/SymbianActions.cpp:52
 #: backends/platform/wince/CEActionsPocket.cpp:44
 #: backends/platform/wince/CEActionsSmartphone.cpp:52
-#: engines/mohawk/myst_stacks/menu.cpp:290 engines/scumm/dialogs.cpp:188
+#: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500 engines/scumm/dialogs.cpp:188
 #: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85
 msgid "Quit"
 msgstr "Stoppen"
@@ -3311,57 +3315,57 @@ msgstr "Geanimeerde spel interface"
 msgid "Naughty game mode"
 msgstr "Ondeugende spelmodus"
 
-#: engines/mohawk/detection.cpp:162
+#: engines/mohawk/detection.cpp:154
 msgid "Play the Myst fly by movie"
 msgstr "Speel de Myst fly by film"
 
-#: engines/mohawk/detection.cpp:163
+#: engines/mohawk/detection.cpp:155
 msgid "The Myst fly by movie was not played by the original engine."
 msgstr "De Myst fly by file werd niet door de originele engine afgespeeld."
 
 #. I18N: Option for fast scene switching
-#: engines/mohawk/dialogs.cpp:190 engines/mohawk/dialogs.cpp:289
+#: engines/mohawk/dialogs.cpp:146 engines/mohawk/dialogs.cpp:286
 msgid "~Z~ip Mode Activated"
 msgstr "~Z~ip Modus Aangezet"
 
-#: engines/mohawk/dialogs.cpp:191
+#: engines/mohawk/dialogs.cpp:147
 msgid "~T~ransitions Enabled"
 msgstr "~O~vergangen Aangezet"
 
 #. I18N: Drop book page
-#: engines/mohawk/dialogs.cpp:193
+#: engines/mohawk/dialogs.cpp:149
 msgid "~D~rop Page"
 msgstr "Laat Pagina ~V~allen"
 
-#: engines/mohawk/dialogs.cpp:197
+#: engines/mohawk/dialogs.cpp:153
 msgid "Show ~M~ap"
 msgstr "~T~oon Map"
 
-#: engines/mohawk/dialogs.cpp:203
+#: engines/mohawk/dialogs.cpp:159
 msgid "Main Men~u~"
 msgstr "~H~oofdmenu"
 
-#: engines/mohawk/dialogs.cpp:290
+#: engines/mohawk/dialogs.cpp:287
 msgid "~W~ater Effect Enabled"
 msgstr "~W~ater Effect Aangezet"
 
-#: engines/mohawk/dialogs.cpp:292
+#: engines/mohawk/dialogs.cpp:289
 msgid "Transitions:"
 msgstr "~O~vergangen:"
 
-#: engines/mohawk/dialogs.cpp:294
+#: engines/mohawk/dialogs.cpp:291
 msgid "Disabled"
 msgstr "Uitgeschakeld"
 
-#: engines/mohawk/dialogs.cpp:295
+#: engines/mohawk/dialogs.cpp:292
 msgid "Fastest"
 msgstr "Snelst"
 
-#: engines/mohawk/dialogs.cpp:296
+#: engines/mohawk/dialogs.cpp:293
 msgid "Normal"
 msgstr "Normaal"
 
-#: engines/mohawk/dialogs.cpp:297
+#: engines/mohawk/dialogs.cpp:294
 msgid "Best"
 msgstr "Beste"
 
@@ -3370,32 +3374,37 @@ msgid "The game is paused. Press any key to continue."
 msgstr "Spel is gepauzeerd. Druk op een toets om verder te gaan."
 
 #: engines/mohawk/myst_stacks/menu.cpp:255
+#: engines/mohawk/riven_stacks/aspit.cpp:394
 msgid ""
 "Are you sure you want to load a saved game? All unsaved progress will be "
 "lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:256
+#: engines/mohawk/riven_stacks/aspit.cpp:395
 #, fuzzy
 msgid "Load game"
 msgstr "Laad spel:"
 
 #: engines/mohawk/myst_stacks/menu.cpp:272
+#: engines/mohawk/riven_stacks/aspit.cpp:416
 msgid ""
 "Are you sure you want to start a new game? All unsaved progress will be lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:273
+#: engines/mohawk/riven_stacks/aspit.cpp:417
 #, fuzzy
 msgid "New game"
 msgstr "Nieuw spel opslaan"
 
 #: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500
 #, fuzzy
 msgid "Are you sure you want to quit? All unsaved progress will be lost."
 msgstr "   Weet u zeker dat u wilt stoppen?   "
 
-#: engines/mohawk/riven.cpp:154
+#: engines/mohawk/riven.cpp:158
 msgid ""
 "You're missing a Riven executable. The Windows executable is 'riven.exe' or "
 "'rivendmo.exe'. "
@@ -3403,7 +3412,7 @@ msgstr ""
 "Een Riven executable ontbreekt. De Windows executable heet 'riven.exe' of "
 "'rivendmo.exe'. "
 
-#: engines/mohawk/riven.cpp:155
+#: engines/mohawk/riven.cpp:159
 msgid ""
 "Using the 'arcriven.z' installer file also works. In addition, you can use "
 "the Mac 'Riven' executable."
@@ -3411,7 +3420,7 @@ msgstr ""
 "Het installatiebestand 'arcriven.z' werkt ook. U kunt ook de Mac executable "
 "'Riven' gebruiken."
 
-#: engines/mohawk/riven.cpp:166
+#: engines/mohawk/riven.cpp:170
 msgid ""
 "You're missing 'extras.mhk'. Using the 'arcriven.z' installer file also "
 "works."
@@ -3419,18 +3428,18 @@ msgstr ""
 "Het bestand 'extras.mhk' ontbreekt. Het installatiebestand 'arcriven.z' kan "
 "ook gebruikt worden."
 
-#: engines/mohawk/riven.cpp:452
+#: engines/mohawk/riven.cpp:498
 msgid "You are missing the following required Riven data files:\n"
 msgstr "U mist de volgende vereiste Riven gegevensbestanden:\n"
 
-#: engines/mohawk/riven_stack.cpp:182
+#: engines/mohawk/riven_stack.cpp:204
 msgid ""
 "Exploration beyond this point available only within the full version of\n"
 "the game."
 msgstr ""
 "Verder ontdekken is alleen mogelijk met de volledige versie van het spel."
 
-#: engines/mohawk/riven_stacks/aspit.cpp:309
+#: engines/mohawk/riven_stacks/aspit.cpp:474
 msgid ""
 "At this point, the Riven Demo would\n"
 "ask if you would like to open a web browser\n"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 8147845763..fd5a19da52 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-06-29 13:20+0200\n"
+"POT-Creation-Date: 2018-06-29 13:32+0200\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/"
@@ -70,6 +70,9 @@ msgstr "Oppover"
 #: engines/mohawk/myst_stacks/menu.cpp:256
 #: engines/mohawk/myst_stacks/menu.cpp:273
 #: engines/mohawk/myst_stacks/menu.cpp:291
+#: engines/mohawk/riven_stacks/aspit.cpp:395
+#: engines/mohawk/riven_stacks/aspit.cpp:417
+#: engines/mohawk/riven_stacks/aspit.cpp:501
 #: engines/parallaction/saveload.cpp:271 engines/scumm/dialogs.cpp:187
 #: engines/sword1/control.cpp:887
 msgid "Cancel"
@@ -588,7 +591,7 @@ msgstr "Trykk tasten du vil kople"
 msgid "Choose an action to map"
 msgstr "Vel ei handling for kopling"
 
-#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:101
+#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:143
 msgid "~Q~uit"
 msgstr "~A~vslutt"
 
@@ -676,8 +679,8 @@ msgid "Search:"
 msgstr "Søk:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:106 engines/mohawk/myst.cpp:884
-#: engines/mohawk/riven.cpp:553 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:884
+#: engines/mohawk/riven.cpp:629 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Åpne spel:"
@@ -685,8 +688,8 @@ msgstr "Åpne spel:"
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
-#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:106
-#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:553
+#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:163
+#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:629
 #: 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
@@ -1821,11 +1824,11 @@ msgstr "Tøm verdi"
 msgid "~R~esume"
 msgstr "~F~ortsett"
 
-#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:99
+#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:141
 msgid "~L~oad"
 msgstr "~Å~pne"
 
-#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:100
+#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:142
 msgid "~S~ave"
 msgstr "~L~agre"
 
@@ -1856,8 +1859,8 @@ msgstr "Tilbake til Oppsta~r~tar"
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
-#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:107
-#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:565
+#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:164
+#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:641
 #: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:658
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
@@ -1878,8 +1881,8 @@ msgstr "Lagra spel:"
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
 #: engines/dreamweb/saveload.cpp:262 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
-#: engines/mohawk/dialogs.cpp:107 engines/mohawk/myst.cpp:896
-#: engines/mohawk/riven.cpp:565 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/dialogs.cpp:164 engines/mohawk/myst.cpp:896
+#: engines/mohawk/riven.cpp:641 engines/neverhood/menumodule.cpp:880
 #: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:659
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -1910,12 +1913,12 @@ msgstr ""
 "grunnlegjande informasjon, og for instruskjonar om korleis du kan få "
 "ytterlegare hjelp."
 
-#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:103
+#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:99
 #: engines/tsage/dialogs.cpp:112
 msgid "~O~K"
 msgstr "~O~K"
 
-#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:104
+#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:100
 #: engines/tsage/dialogs.cpp:113
 msgid "~C~ancel"
 msgstr "~A~vbryt"
@@ -2163,7 +2166,8 @@ msgstr "Vil du verkeleg avslutte?"
 #: backends/platform/symbian/src/SymbianActions.cpp:52
 #: backends/platform/wince/CEActionsPocket.cpp:44
 #: backends/platform/wince/CEActionsSmartphone.cpp:52
-#: engines/mohawk/myst_stacks/menu.cpp:290 engines/scumm/dialogs.cpp:188
+#: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500 engines/scumm/dialogs.cpp:188
 #: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85
 msgid "Quit"
 msgstr "Avslutt"
@@ -3266,63 +3270,63 @@ msgstr ""
 msgid "Naughty game mode"
 msgstr ""
 
-#: engines/mohawk/detection.cpp:162
+#: engines/mohawk/detection.cpp:154
 msgid "Play the Myst fly by movie"
 msgstr ""
 
-#: engines/mohawk/detection.cpp:163
+#: engines/mohawk/detection.cpp:155
 msgid "The Myst fly by movie was not played by the original engine."
 msgstr ""
 
 #. I18N: Option for fast scene switching
-#: engines/mohawk/dialogs.cpp:190 engines/mohawk/dialogs.cpp:289
+#: engines/mohawk/dialogs.cpp:146 engines/mohawk/dialogs.cpp:286
 msgid "~Z~ip Mode Activated"
 msgstr "~Z~ipmodus aktivert"
 
-#: engines/mohawk/dialogs.cpp:191
+#: engines/mohawk/dialogs.cpp:147
 msgid "~T~ransitions Enabled"
 msgstr "~O~vergangar aktivert"
 
 #. I18N: Drop book page
-#: engines/mohawk/dialogs.cpp:193
+#: engines/mohawk/dialogs.cpp:149
 msgid "~D~rop Page"
 msgstr ""
 
-#: engines/mohawk/dialogs.cpp:197
+#: engines/mohawk/dialogs.cpp:153
 #, fuzzy
 msgid "Show ~M~ap"
 msgstr "~S~yn Kart"
 
-#: engines/mohawk/dialogs.cpp:203
+#: engines/mohawk/dialogs.cpp:159
 #, fuzzy
 msgid "Main Men~u~"
 msgstr "Hoved~m~eny"
 
-#: engines/mohawk/dialogs.cpp:290
+#: engines/mohawk/dialogs.cpp:287
 msgid "~W~ater Effect Enabled"
 msgstr "~V~anneffekt aktivert"
 
-#: engines/mohawk/dialogs.cpp:292
+#: engines/mohawk/dialogs.cpp:289
 #, fuzzy
 msgid "Transitions:"
 msgstr "~O~vergangar aktivert"
 
-#: engines/mohawk/dialogs.cpp:294
+#: engines/mohawk/dialogs.cpp:291
 #, fuzzy
 msgid "Disabled"
 msgstr "Deaktivert GFX"
 
-#: engines/mohawk/dialogs.cpp:295
+#: engines/mohawk/dialogs.cpp:292
 #, fuzzy
 msgid "Fastest"
 msgstr "Rask modus"
 
-#: engines/mohawk/dialogs.cpp:296
+#: engines/mohawk/dialogs.cpp:293
 #, fuzzy
 msgid "Normal"
 msgstr "OpenGL Normal"
 
-#: engines/mohawk/dialogs.cpp:297
+#: engines/mohawk/dialogs.cpp:294
 msgid "Best"
 msgstr ""
 
@@ -3332,60 +3336,65 @@ msgid "The game is paused. Press any key to continue."
 msgstr "Spelet er pausa. Trykk MELLOMROM for å fortsette."
 
 #: engines/mohawk/myst_stacks/menu.cpp:255
+#: engines/mohawk/riven_stacks/aspit.cpp:394
 msgid ""
 "Are you sure you want to load a saved game? All unsaved progress will be "
 "lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:256
+#: engines/mohawk/riven_stacks/aspit.cpp:395
 #, fuzzy
 msgid "Load game"
 msgstr "Åpne spel:"
 
 #: engines/mohawk/myst_stacks/menu.cpp:272
+#: engines/mohawk/riven_stacks/aspit.cpp:416
 msgid ""
 "Are you sure you want to start a new game? All unsaved progress will be lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:273
+#: engines/mohawk/riven_stacks/aspit.cpp:417
 #, fuzzy
 msgid "New game"
 msgstr "Ny Lagring"
 
 #: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500
 #, fuzzy
 msgid "Are you sure you want to quit? All unsaved progress will be lost."
 msgstr "   Er du sikker på at du vil avslutte?   "
 
-#: engines/mohawk/riven.cpp:154
+#: engines/mohawk/riven.cpp:158
 msgid ""
 "You're missing a Riven executable. The Windows executable is 'riven.exe' or "
 "'rivendmo.exe'. "
 msgstr ""
 
-#: engines/mohawk/riven.cpp:155
+#: engines/mohawk/riven.cpp:159
 msgid ""
 "Using the 'arcriven.z' installer file also works. In addition, you can use "
 "the Mac 'Riven' executable."
 msgstr ""
 
-#: engines/mohawk/riven.cpp:166
+#: engines/mohawk/riven.cpp:170
 msgid ""
 "You're missing 'extras.mhk'. Using the 'arcriven.z' installer file also "
 "works."
 msgstr ""
 
-#: engines/mohawk/riven.cpp:452
+#: engines/mohawk/riven.cpp:498
 msgid "You are missing the following required Riven data files:\n"
 msgstr ""
 
-#: engines/mohawk/riven_stack.cpp:182
+#: engines/mohawk/riven_stack.cpp:204
 msgid ""
 "Exploration beyond this point available only within the full version of\n"
 "the game."
 msgstr ""
 
-#: engines/mohawk/riven_stacks/aspit.cpp:309
+#: engines/mohawk/riven_stacks/aspit.cpp:474
 msgid ""
 "At this point, the Riven Demo would\n"
 "ask if you would like to open a web browser\n"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 37ef81bf57..71bf498dd5 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-06-29 13:20+0200\n"
+"POT-Creation-Date: 2018-06-29 13:32+0200\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/"
@@ -74,6 +74,9 @@ msgstr "W górê"
 #: engines/mohawk/myst_stacks/menu.cpp:256
 #: engines/mohawk/myst_stacks/menu.cpp:273
 #: engines/mohawk/myst_stacks/menu.cpp:291
+#: engines/mohawk/riven_stacks/aspit.cpp:395
+#: engines/mohawk/riven_stacks/aspit.cpp:417
+#: engines/mohawk/riven_stacks/aspit.cpp:501
 #: engines/parallaction/saveload.cpp:271 engines/scumm/dialogs.cpp:187
 #: engines/sword1/control.cpp:887
 msgid "Cancel"
@@ -597,7 +600,7 @@ msgstr "Wci¶nij klawisz do przypisania"
 msgid "Choose an action to map"
 msgstr "Wybierz akcjê do przypisania"
 
-#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:101
+#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:143
 msgid "~Q~uit"
 msgstr "~Z~akoñcz"
 
@@ -685,8 +688,8 @@ msgid "Search:"
 msgstr "Szukaj:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:106 engines/mohawk/myst.cpp:884
-#: engines/mohawk/riven.cpp:553 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:884
+#: engines/mohawk/riven.cpp:629 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Wczytaj grê:"
@@ -694,8 +697,8 @@ msgstr "Wczytaj grê:"
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
-#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:106
-#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:553
+#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:163
+#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:629
 #: 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
@@ -1830,11 +1833,11 @@ msgstr "<Nieprawid³owa warto¶æ>"
 msgid "~R~esume"
 msgstr "~W~znów"
 
-#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:99
+#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:141
 msgid "~L~oad"
 msgstr "~W~czytaj"
 
-#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:100
+#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:142
 msgid "~S~ave"
 msgstr "~Z~apisz"
 
@@ -1865,8 +1868,8 @@ msgstr "~P~owrót do launchera"
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
-#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:107
-#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:565
+#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:164
+#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:641
 #: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:658
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
@@ -1887,8 +1890,8 @@ msgstr "Zapis:"
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
 #: engines/dreamweb/saveload.cpp:262 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
-#: engines/mohawk/dialogs.cpp:107 engines/mohawk/myst.cpp:896
-#: engines/mohawk/riven.cpp:565 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/dialogs.cpp:164 engines/mohawk/myst.cpp:896
+#: engines/mohawk/riven.cpp:641 engines/neverhood/menumodule.cpp:880
 #: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:659
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -1918,12 +1921,12 @@ msgstr ""
 "Zapis stanu gry nie powiód³ siê (%s)! Aby uzyskaæ podstawowe informacje oraz "
 "dowiedzieæ jak szukaæ dalszej pomocy, sprawd¼ plik README."
 
-#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:103
+#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:99
 #: engines/tsage/dialogs.cpp:112
 msgid "~O~K"
 msgstr "~O~K"
 
-#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:104
+#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:100
 #: engines/tsage/dialogs.cpp:113
 msgid "~C~ancel"
 msgstr "~A~nuluj"
@@ -2174,7 +2177,8 @@ msgstr "Na pewno chcesz wyj¶æ?"
 #: backends/platform/symbian/src/SymbianActions.cpp:52
 #: backends/platform/wince/CEActionsPocket.cpp:44
 #: backends/platform/wince/CEActionsSmartphone.cpp:52
-#: engines/mohawk/myst_stacks/menu.cpp:290 engines/scumm/dialogs.cpp:188
+#: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500 engines/scumm/dialogs.cpp:188
 #: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85
 msgid "Quit"
 msgstr "Zakoñcz"
@@ -3303,63 +3307,63 @@ msgstr ""
 msgid "Naughty game mode"
 msgstr ""
 
-#: engines/mohawk/detection.cpp:162
+#: engines/mohawk/detection.cpp:154
 msgid "Play the Myst fly by movie"
 msgstr ""
 
-#: engines/mohawk/detection.cpp:163
+#: engines/mohawk/detection.cpp:155
 msgid "The Myst fly by movie was not played by the original engine."
 msgstr ""
 
 #. I18N: Option for fast scene switching
-#: engines/mohawk/dialogs.cpp:190 engines/mohawk/dialogs.cpp:289
+#: engines/mohawk/dialogs.cpp:146 engines/mohawk/dialogs.cpp:286
 msgid "~Z~ip Mode Activated"
 msgstr "~T~ryb turbo aktywny"
 
-#: engines/mohawk/dialogs.cpp:191
+#: engines/mohawk/dialogs.cpp:147
 msgid "~T~ransitions Enabled"
 msgstr "~P~rzej¶cia w³±czone"
 
 #. I18N: Drop book page
-#: engines/mohawk/dialogs.cpp:193
+#: engines/mohawk/dialogs.cpp:149
 msgid "~D~rop Page"
 msgstr "~O~pu¶æ stronê"
 
-#: engines/mohawk/dialogs.cpp:197
+#: engines/mohawk/dialogs.cpp:153
 #, fuzzy
 msgid "Show ~M~ap"
 msgstr "~P~oka¿ mapê"
 
-#: engines/mohawk/dialogs.cpp:203
+#: engines/mohawk/dialogs.cpp:159
 #, fuzzy
 msgid "Main Men~u~"
 msgstr "~M~enu g³ówne"
 
-#: engines/mohawk/dialogs.cpp:290
+#: engines/mohawk/dialogs.cpp:287
 msgid "~W~ater Effect Enabled"
 msgstr "~E~fekty wody w³±czone"
 
-#: engines/mohawk/dialogs.cpp:292
+#: engines/mohawk/dialogs.cpp:289
 #, fuzzy
 msgid "Transitions:"
 msgstr "~P~rzej¶cia w³±czone"
 
-#: engines/mohawk/dialogs.cpp:294
+#: engines/mohawk/dialogs.cpp:291
 #, fuzzy
 msgid "Disabled"
 msgstr "Wy³±czona grafika"
 
-#: engines/mohawk/dialogs.cpp:295
+#: engines/mohawk/dialogs.cpp:292
 #, fuzzy
 msgid "Fastest"
 msgstr "Wklej"
 
-#: engines/mohawk/dialogs.cpp:296
+#: engines/mohawk/dialogs.cpp:293
 #, fuzzy
 msgid "Normal"
 msgstr "OpenGL (normalny)"
 
-#: engines/mohawk/dialogs.cpp:297
+#: engines/mohawk/dialogs.cpp:294
 msgid "Best"
 msgstr ""
 
@@ -3369,60 +3373,65 @@ msgid "The game is paused. Press any key to continue."
 msgstr "Gra wstrzymana. Naci¶nij spacjê, aby wznowiæ."
 
 #: engines/mohawk/myst_stacks/menu.cpp:255
+#: engines/mohawk/riven_stacks/aspit.cpp:394
 msgid ""
 "Are you sure you want to load a saved game? All unsaved progress will be "
 "lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:256
+#: engines/mohawk/riven_stacks/aspit.cpp:395
 #, fuzzy
 msgid "Load game"
 msgstr "Wczytaj grê:"
 
 #: engines/mohawk/myst_stacks/menu.cpp:272
+#: engines/mohawk/riven_stacks/aspit.cpp:416
 msgid ""
 "Are you sure you want to start a new game? All unsaved progress will be lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:273
+#: engines/mohawk/riven_stacks/aspit.cpp:417
 #, fuzzy
 msgid "New game"
 msgstr "Nowy zapis"
 
 #: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500
 #, fuzzy
 msgid "Are you sure you want to quit? All unsaved progress will be lost."
 msgstr "   Na pewno chcesz wyj¶æ?   "
 
-#: engines/mohawk/riven.cpp:154
+#: engines/mohawk/riven.cpp:158
 msgid ""
 "You're missing a Riven executable. The Windows executable is 'riven.exe' or "
 "'rivendmo.exe'. "
 msgstr ""
 
-#: engines/mohawk/riven.cpp:155
+#: engines/mohawk/riven.cpp:159
 msgid ""
 "Using the 'arcriven.z' installer file also works. In addition, you can use "
 "the Mac 'Riven' executable."
 msgstr ""
 
-#: engines/mohawk/riven.cpp:166
+#: engines/mohawk/riven.cpp:170
 msgid ""
 "You're missing 'extras.mhk'. Using the 'arcriven.z' installer file also "
 "works."
 msgstr ""
 
-#: engines/mohawk/riven.cpp:452
+#: engines/mohawk/riven.cpp:498
 msgid "You are missing the following required Riven data files:\n"
 msgstr ""
 
-#: engines/mohawk/riven_stack.cpp:182
+#: engines/mohawk/riven_stack.cpp:204
 msgid ""
 "Exploration beyond this point available only within the full version of\n"
 "the game."
 msgstr ""
 
-#: engines/mohawk/riven_stacks/aspit.cpp:309
+#: engines/mohawk/riven_stacks/aspit.cpp:474
 msgid ""
 "At this point, the Riven Demo would\n"
 "ask if you would like to open a web browser\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 179c1b736c..ba4d2bde76 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-06-29 13:20+0200\n"
+"POT-Creation-Date: 2018-06-29 13:32+0200\n"
 "PO-Revision-Date: 2018-04-18 10:13+0000\n"
 "Last-Translator: Adrian Frühwirth <bonki@scummvm.org>\n"
 "Language-Team: Portuguese (Brazil) <https://translations.scummvm.org/"
@@ -72,6 +72,9 @@ msgstr "Acima"
 #: engines/mohawk/myst_stacks/menu.cpp:256
 #: engines/mohawk/myst_stacks/menu.cpp:273
 #: engines/mohawk/myst_stacks/menu.cpp:291
+#: engines/mohawk/riven_stacks/aspit.cpp:395
+#: engines/mohawk/riven_stacks/aspit.cpp:417
+#: engines/mohawk/riven_stacks/aspit.cpp:501
 #: engines/parallaction/saveload.cpp:271 engines/scumm/dialogs.cpp:187
 #: engines/sword1/control.cpp:887
 msgid "Cancel"
@@ -597,7 +600,7 @@ msgstr "Pressione a tecla para associar"
 msgid "Choose an action to map"
 msgstr "Selecione uma ação para mapear"
 
-#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:101
+#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:143
 msgid "~Q~uit"
 msgstr "~S~air"
 
@@ -686,8 +689,8 @@ msgid "Search:"
 msgstr "Pesquisar:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:106 engines/mohawk/myst.cpp:884
-#: engines/mohawk/riven.cpp:553 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:884
+#: engines/mohawk/riven.cpp:629 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Carregar jogo:"
@@ -695,8 +698,8 @@ msgstr "Carregar jogo:"
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
-#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:106
-#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:553
+#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:163
+#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:629
 #: 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
@@ -1858,11 +1861,11 @@ msgstr "Limpar valor"
 msgid "~R~esume"
 msgstr "~V~oltar ao jogo"
 
-#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:99
+#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:141
 msgid "~L~oad"
 msgstr "~C~arregar"
 
-#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:100
+#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:142
 msgid "~S~ave"
 msgstr "~S~alvar"
 
@@ -1893,8 +1896,8 @@ msgstr "~V~oltar ao menu"
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
-#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:107
-#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:565
+#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:164
+#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:641
 #: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:658
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
@@ -1915,8 +1918,8 @@ msgstr "Salvar jogo:"
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
 #: engines/dreamweb/saveload.cpp:262 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
-#: engines/mohawk/dialogs.cpp:107 engines/mohawk/myst.cpp:896
-#: engines/mohawk/riven.cpp:565 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/dialogs.cpp:164 engines/mohawk/myst.cpp:896
+#: engines/mohawk/riven.cpp:641 engines/neverhood/menumodule.cpp:880
 #: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:659
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -1947,12 +1950,12 @@ msgstr ""
 "Por favor, consulte o README para obter informações básicas, e para obter "
 "instruções sobre como obter assistência adicional."
 
-#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:103
+#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:99
 #: engines/tsage/dialogs.cpp:112
 msgid "~O~K"
 msgstr "~O~K"
 
-#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:104
+#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:100
 #: engines/tsage/dialogs.cpp:113
 msgid "~C~ancel"
 msgstr "~C~ancelar"
@@ -2207,7 +2210,8 @@ msgstr "Você realmente deseja sair?"
 #: backends/platform/symbian/src/SymbianActions.cpp:52
 #: backends/platform/wince/CEActionsPocket.cpp:44
 #: backends/platform/wince/CEActionsSmartphone.cpp:52
-#: engines/mohawk/myst_stacks/menu.cpp:290 engines/scumm/dialogs.cpp:188
+#: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500 engines/scumm/dialogs.cpp:188
 #: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85
 msgid "Quit"
 msgstr "Sair"
@@ -3344,63 +3348,63 @@ msgstr ""
 msgid "Naughty game mode"
 msgstr ""
 
-#: engines/mohawk/detection.cpp:162
+#: engines/mohawk/detection.cpp:154
 msgid "Play the Myst fly by movie"
 msgstr ""
 
-#: engines/mohawk/detection.cpp:163
+#: engines/mohawk/detection.cpp:155
 msgid "The Myst fly by movie was not played by the original engine."
 msgstr ""
 
 #. I18N: Option for fast scene switching
-#: engines/mohawk/dialogs.cpp:190 engines/mohawk/dialogs.cpp:289
+#: engines/mohawk/dialogs.cpp:146 engines/mohawk/dialogs.cpp:286
 msgid "~Z~ip Mode Activated"
 msgstr "Modo ~Z~ip ativado"
 
-#: engines/mohawk/dialogs.cpp:191
+#: engines/mohawk/dialogs.cpp:147
 msgid "~T~ransitions Enabled"
 msgstr "Modo ~T~ransições ativado"
 
 #. I18N: Drop book page
-#: engines/mohawk/dialogs.cpp:193
+#: engines/mohawk/dialogs.cpp:149
 msgid "~D~rop Page"
 msgstr "~S~oltar Página"
 
-#: engines/mohawk/dialogs.cpp:197
+#: engines/mohawk/dialogs.cpp:153
 #, fuzzy
 msgid "Show ~M~ap"
 msgstr "~E~xibir Mapa"
 
-#: engines/mohawk/dialogs.cpp:203
+#: engines/mohawk/dialogs.cpp:159
 #, fuzzy
 msgid "Main Men~u~"
 msgstr "~M~enu Principal ScummVM"
 
-#: engines/mohawk/dialogs.cpp:290
+#: engines/mohawk/dialogs.cpp:287
 msgid "~W~ater Effect Enabled"
 msgstr "Modo ~E~feitos de água ativado"
 
-#: engines/mohawk/dialogs.cpp:292
+#: engines/mohawk/dialogs.cpp:289
 #, fuzzy
 msgid "Transitions:"
 msgstr "Modo ~T~ransições ativado"
 
-#: engines/mohawk/dialogs.cpp:294
+#: engines/mohawk/dialogs.cpp:291
 #, fuzzy
 msgid "Disabled"
 msgstr "GFX desabilitado"
 
-#: engines/mohawk/dialogs.cpp:295
+#: engines/mohawk/dialogs.cpp:292
 #, fuzzy
 msgid "Fastest"
 msgstr "Modo rápido"
 
-#: engines/mohawk/dialogs.cpp:296
+#: engines/mohawk/dialogs.cpp:293
 #, fuzzy
 msgid "Normal"
 msgstr "OpenGL Normal"
 
-#: engines/mohawk/dialogs.cpp:297
+#: engines/mohawk/dialogs.cpp:294
 msgid "Best"
 msgstr ""
 
@@ -3410,60 +3414,65 @@ msgid "The game is paused. Press any key to continue."
 msgstr "Jogo pausado. Pressione ESPAÇO para continuar."
 
 #: engines/mohawk/myst_stacks/menu.cpp:255
+#: engines/mohawk/riven_stacks/aspit.cpp:394
 msgid ""
 "Are you sure you want to load a saved game? All unsaved progress will be "
 "lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:256
+#: engines/mohawk/riven_stacks/aspit.cpp:395
 #, fuzzy
 msgid "Load game"
 msgstr "Carregar jogo:"
 
 #: engines/mohawk/myst_stacks/menu.cpp:272
+#: engines/mohawk/riven_stacks/aspit.cpp:416
 msgid ""
 "Are you sure you want to start a new game? All unsaved progress will be lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:273
+#: engines/mohawk/riven_stacks/aspit.cpp:417
 #, fuzzy
 msgid "New game"
 msgstr "Salvar"
 
 #: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500
 #, fuzzy
 msgid "Are you sure you want to quit? All unsaved progress will be lost."
 msgstr "   Tem certeza de que deseja sair?   "
 
-#: engines/mohawk/riven.cpp:154
+#: engines/mohawk/riven.cpp:158
 msgid ""
 "You're missing a Riven executable. The Windows executable is 'riven.exe' or "
 "'rivendmo.exe'. "
 msgstr ""
 
-#: engines/mohawk/riven.cpp:155
+#: engines/mohawk/riven.cpp:159
 msgid ""
 "Using the 'arcriven.z' installer file also works. In addition, you can use "
 "the Mac 'Riven' executable."
 msgstr ""
 
-#: engines/mohawk/riven.cpp:166
+#: engines/mohawk/riven.cpp:170
 msgid ""
 "You're missing 'extras.mhk'. Using the 'arcriven.z' installer file also "
 "works."
 msgstr ""
 
-#: engines/mohawk/riven.cpp:452
+#: engines/mohawk/riven.cpp:498
 msgid "You are missing the following required Riven data files:\n"
 msgstr ""
 
-#: engines/mohawk/riven_stack.cpp:182
+#: engines/mohawk/riven_stack.cpp:204
 msgid ""
 "Exploration beyond this point available only within the full version of\n"
 "the game."
 msgstr ""
 
-#: engines/mohawk/riven_stacks/aspit.cpp:309
+#: engines/mohawk/riven_stacks/aspit.cpp:474
 msgid ""
 "At this point, the Riven Demo would\n"
 "ask if you would like to open a web browser\n"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 82926b8fa9..b36754a626 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-06-29 13:20+0200\n"
+"POT-Creation-Date: 2018-06-29 13:32+0200\n"
 "PO-Revision-Date: 2018-04-18 14:10+0000\n"
 "Last-Translator: Fred Almeida <fred_pj@hotmail.com>\n"
 "Language-Team: Portuguese (Portugal) <https://translations.scummvm.org/"
@@ -69,6 +69,9 @@ msgstr "Acima"
 #: engines/mohawk/myst_stacks/menu.cpp:256
 #: engines/mohawk/myst_stacks/menu.cpp:273
 #: engines/mohawk/myst_stacks/menu.cpp:291
+#: engines/mohawk/riven_stacks/aspit.cpp:395
+#: engines/mohawk/riven_stacks/aspit.cpp:417
+#: engines/mohawk/riven_stacks/aspit.cpp:501
 #: engines/parallaction/saveload.cpp:271 engines/scumm/dialogs.cpp:187
 #: engines/sword1/control.cpp:887
 msgid "Cancel"
@@ -598,7 +601,7 @@ msgstr "Pressione a tecla para associar"
 msgid "Choose an action to map"
 msgstr "Escolha uma acção para definir"
 
-#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:101
+#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:143
 msgid "~Q~uit"
 msgstr "~S~air"
 
@@ -687,8 +690,8 @@ msgid "Search:"
 msgstr "Pesquisar:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:106 engines/mohawk/myst.cpp:884
-#: engines/mohawk/riven.cpp:553 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:884
+#: engines/mohawk/riven.cpp:629 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Carregar jogo:"
@@ -696,8 +699,8 @@ msgstr "Carregar jogo:"
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
-#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:106
-#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:553
+#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:163
+#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:629
 #: 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
@@ -1817,11 +1820,11 @@ msgstr ""
 msgid "~R~esume"
 msgstr ""
 
-#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:99
+#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:141
 msgid "~L~oad"
 msgstr ""
 
-#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:100
+#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:142
 msgid "~S~ave"
 msgstr ""
 
@@ -1852,8 +1855,8 @@ msgstr ""
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
-#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:107
-#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:565
+#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:164
+#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:641
 #: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:658
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
@@ -1874,8 +1877,8 @@ msgstr ""
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
 #: engines/dreamweb/saveload.cpp:262 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
-#: engines/mohawk/dialogs.cpp:107 engines/mohawk/myst.cpp:896
-#: engines/mohawk/riven.cpp:565 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/dialogs.cpp:164 engines/mohawk/myst.cpp:896
+#: engines/mohawk/riven.cpp:641 engines/neverhood/menumodule.cpp:880
 #: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:659
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -1900,12 +1903,12 @@ msgid ""
 "and for instructions on how to obtain further assistance."
 msgstr ""
 
-#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:103
+#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:99
 #: engines/tsage/dialogs.cpp:112
 msgid "~O~K"
 msgstr ""
 
-#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:104
+#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:100
 #: engines/tsage/dialogs.cpp:113
 msgid "~C~ancel"
 msgstr ""
@@ -2130,7 +2133,8 @@ msgstr ""
 #: backends/platform/symbian/src/SymbianActions.cpp:52
 #: backends/platform/wince/CEActionsPocket.cpp:44
 #: backends/platform/wince/CEActionsSmartphone.cpp:52
-#: engines/mohawk/myst_stacks/menu.cpp:290 engines/scumm/dialogs.cpp:188
+#: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500 engines/scumm/dialogs.cpp:188
 #: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85
 msgid "Quit"
 msgstr ""
@@ -3208,57 +3212,57 @@ msgstr ""
 msgid "Naughty game mode"
 msgstr ""
 
-#: engines/mohawk/detection.cpp:162
+#: engines/mohawk/detection.cpp:154
 msgid "Play the Myst fly by movie"
 msgstr ""
 
-#: engines/mohawk/detection.cpp:163
+#: engines/mohawk/detection.cpp:155
 msgid "The Myst fly by movie was not played by the original engine."
 msgstr ""
 
 #. I18N: Option for fast scene switching
-#: engines/mohawk/dialogs.cpp:190 engines/mohawk/dialogs.cpp:289
+#: engines/mohawk/dialogs.cpp:146 engines/mohawk/dialogs.cpp:286
 msgid "~Z~ip Mode Activated"
 msgstr ""
 
-#: engines/mohawk/dialogs.cpp:191
+#: engines/mohawk/dialogs.cpp:147
 msgid "~T~ransitions Enabled"
 msgstr ""
 
 #. I18N: Drop book page
-#: engines/mohawk/dialogs.cpp:193
+#: engines/mohawk/dialogs.cpp:149
 msgid "~D~rop Page"
 msgstr ""
 
-#: engines/mohawk/dialogs.cpp:197
+#: engines/mohawk/dialogs.cpp:153
 msgid "Show ~M~ap"
 msgstr ""
 
-#: engines/mohawk/dialogs.cpp:203
+#: engines/mohawk/dialogs.cpp:159
 msgid "Main Men~u~"
 msgstr ""
 
-#: engines/mohawk/dialogs.cpp:290
+#: engines/mohawk/dialogs.cpp:287
 msgid "~W~ater Effect Enabled"
 msgstr ""
 
-#: engines/mohawk/dialogs.cpp:292
+#: engines/mohawk/dialogs.cpp:289
 msgid "Transitions:"
 msgstr ""
 
-#: engines/mohawk/dialogs.cpp:294
+#: engines/mohawk/dialogs.cpp:291
 msgid "Disabled"
 msgstr ""
 
-#: engines/mohawk/dialogs.cpp:295
+#: engines/mohawk/dialogs.cpp:292
 msgid "Fastest"
 msgstr ""
 
-#: engines/mohawk/dialogs.cpp:296
+#: engines/mohawk/dialogs.cpp:293
 msgid "Normal"
 msgstr ""
 
-#: engines/mohawk/dialogs.cpp:297
+#: engines/mohawk/dialogs.cpp:294
 msgid "Best"
 msgstr ""
 
@@ -3267,58 +3271,63 @@ msgid "The game is paused. Press any key to continue."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:255
+#: engines/mohawk/riven_stacks/aspit.cpp:394
 msgid ""
 "Are you sure you want to load a saved game? All unsaved progress will be "
 "lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:256
+#: engines/mohawk/riven_stacks/aspit.cpp:395
 #, fuzzy
 msgid "Load game"
 msgstr "Carregar jogo:"
 
 #: engines/mohawk/myst_stacks/menu.cpp:272
+#: engines/mohawk/riven_stacks/aspit.cpp:416
 msgid ""
 "Are you sure you want to start a new game? All unsaved progress will be lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:273
+#: engines/mohawk/riven_stacks/aspit.cpp:417
 msgid "New game"
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500
 msgid "Are you sure you want to quit? All unsaved progress will be lost."
 msgstr ""
 
-#: engines/mohawk/riven.cpp:154
+#: engines/mohawk/riven.cpp:158
 msgid ""
 "You're missing a Riven executable. The Windows executable is 'riven.exe' or "
 "'rivendmo.exe'. "
 msgstr ""
 
-#: engines/mohawk/riven.cpp:155
+#: engines/mohawk/riven.cpp:159
 msgid ""
 "Using the 'arcriven.z' installer file also works. In addition, you can use "
 "the Mac 'Riven' executable."
 msgstr ""
 
-#: engines/mohawk/riven.cpp:166
+#: engines/mohawk/riven.cpp:170
 msgid ""
 "You're missing 'extras.mhk'. Using the 'arcriven.z' installer file also "
 "works."
 msgstr ""
 
-#: engines/mohawk/riven.cpp:452
+#: engines/mohawk/riven.cpp:498
 msgid "You are missing the following required Riven data files:\n"
 msgstr ""
 
-#: engines/mohawk/riven_stack.cpp:182
+#: engines/mohawk/riven_stack.cpp:204
 msgid ""
 "Exploration beyond this point available only within the full version of\n"
 "the game."
 msgstr ""
 
-#: engines/mohawk/riven_stacks/aspit.cpp:309
+#: engines/mohawk/riven_stacks/aspit.cpp:474
 msgid ""
 "At this point, the Riven Demo would\n"
 "ask if you would like to open a web browser\n"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 66a4404993..049951e028 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-06-29 13:20+0200\n"
+"POT-Creation-Date: 2018-06-29 13:32+0200\n"
 "PO-Revision-Date: 2018-04-18 10:17+0000\n"
 "Last-Translator: Adrian Fruehwirth <bonki@scummvm.org>\n"
 "Language-Team: Russian <https://translations.scummvm.org/projects/scummvm/"
@@ -69,6 +69,9 @@ msgstr "²ÒÕàå"
 #: engines/mohawk/myst_stacks/menu.cpp:256
 #: engines/mohawk/myst_stacks/menu.cpp:273
 #: engines/mohawk/myst_stacks/menu.cpp:291
+#: engines/mohawk/riven_stacks/aspit.cpp:395
+#: engines/mohawk/riven_stacks/aspit.cpp:417
+#: engines/mohawk/riven_stacks/aspit.cpp:501
 #: engines/parallaction/saveload.cpp:271 engines/scumm/dialogs.cpp:187
 #: engines/sword1/control.cpp:887
 msgid "Cancel"
@@ -595,7 +598,7 @@ msgstr "½ÐÖÜØâÕ ÚÛÐÒØèã ÔÛï ÝÐ×ÝÐçÕÝØï"
 msgid "Choose an action to map"
 msgstr "²ëÑÕàØâÕ ÔÕÙáâÒØÕ ÔÛï ÝÐ×ÝÐçÕÝØï"
 
-#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:101
+#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:143
 msgid "~Q~uit"
 msgstr "~²~ëåÞÔ"
 
@@ -683,8 +686,8 @@ msgid "Search:"
 msgstr "¿ÞØáÚ:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:106 engines/mohawk/myst.cpp:884
-#: engines/mohawk/riven.cpp:553 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:884
+#: engines/mohawk/riven.cpp:629 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "·ÐÓàã×Øâì ØÓàã:"
@@ -692,8 +695,8 @@ msgstr "·ÐÓàã×Øâì ØÓàã:"
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
-#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:106
-#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:553
+#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:163
+#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:629
 #: 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
@@ -1827,11 +1830,11 @@ msgstr "<½ÕßàÐÒØÛìÝÞÕ ×ÝÐçÕÝØÕ>"
 msgid "~R~esume"
 msgstr "¿àÞÔÞÛ~Ö~Øâì"
 
-#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:99
+#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:141
 msgid "~L~oad"
 msgstr "~·~ÐÓàã×Øâì"
 
-#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:100
+#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:142
 msgid "~S~ave"
 msgstr "·~Ð~ßØáÐâì"
 
@@ -1862,8 +1865,8 @@ msgstr "~²~ ÓÛÐÒÝÞÕ ÜÕÝî"
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
-#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:107
-#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:565
+#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:164
+#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:641
 #: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:658
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
@@ -1884,8 +1887,8 @@ msgstr "ÁÞåàÐÝØâì ØÓàã:"
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
 #: engines/dreamweb/saveload.cpp:262 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
-#: engines/mohawk/dialogs.cpp:107 engines/mohawk/myst.cpp:896
-#: engines/mohawk/riven.cpp:565 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/dialogs.cpp:164 engines/mohawk/myst.cpp:896
+#: engines/mohawk/riven.cpp:641 engines/neverhood/menumodule.cpp:880
 #: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:659
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -1915,12 +1918,12 @@ msgstr ""
 "½Õ ãÔÐÛÞáì áÞåàÐÝØâì ØÓàã (%s)! ¿ÞÖÐÛãÙáâÐ, ÞÑàÐâØâÕáì Ú äÐÙÛã README ×Ð "
 "ßÞÔàÞÑÝÞáâïÜØ Ø ãÚÐ×ÐÝØïÜØ Ú ßÞÛãçÕÝØî ÔÐÛìÝÕÙèÕÙ ßÞÜÞéØ."
 
-#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:103
+#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:99
 #: engines/tsage/dialogs.cpp:112
 msgid "~O~K"
 msgstr "~O~K"
 
-#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:104
+#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:100
 #: engines/tsage/dialogs.cpp:113
 msgid "~C~ancel"
 msgstr "¾~â~ÜÕÝÐ"
@@ -2177,7 +2180,8 @@ msgstr "²ë ÔÕÙáâÒØâÕÛìÝÞ åÞâØâÕ ÒëÙâØ?"
 #: backends/platform/symbian/src/SymbianActions.cpp:52
 #: backends/platform/wince/CEActionsPocket.cpp:44
 #: backends/platform/wince/CEActionsSmartphone.cpp:52
-#: engines/mohawk/myst_stacks/menu.cpp:290 engines/scumm/dialogs.cpp:188
+#: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500 engines/scumm/dialogs.cpp:188
 #: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85
 msgid "Quit"
 msgstr "²ëåÞÔ"
@@ -3304,57 +3308,57 @@ msgstr "°ÝØÜØàÞÒÐÝÝëÙ ØÝâÕàäÕÙá ØÓàë"
 msgid "Naughty game mode"
 msgstr "¾âÚàÞÒÕÝÝëÙ àÕÖØÜ ØÓàë"
 
-#: engines/mohawk/detection.cpp:162
+#: engines/mohawk/detection.cpp:154
 msgid "Play the Myst fly by movie"
 msgstr "¿àÞØÓàëÒÐâì àÞÛØÚ ßàÞÛñâÐ ÝÐÔ Myst"
 
-#: engines/mohawk/detection.cpp:163
+#: engines/mohawk/detection.cpp:155
 msgid "The Myst fly by movie was not played by the original engine."
 msgstr "ÀÞÛØÚ ßàÞÛñâÐ ÝÐÔ Myst ÝÕ ßàÞØÓàëÒÐÛáï ÞàØÓØÝÐÛìÝëÜ ÔÒØÖÚÞÜ."
 
 #. I18N: Option for fast scene switching
-#: engines/mohawk/dialogs.cpp:190 engines/mohawk/dialogs.cpp:289
+#: engines/mohawk/dialogs.cpp:146 engines/mohawk/dialogs.cpp:286
 msgid "~Z~ip Mode Activated"
 msgstr "~À~ÕÖØÜ ÑëáâàÞÓÞ ßÕàÕåÞÔÐ ÐÚâØÒØàÞÒÐÝ"
 
-#: engines/mohawk/dialogs.cpp:191
+#: engines/mohawk/dialogs.cpp:147
 msgid "~T~ransitions Enabled"
 msgstr "~¿~ÕàÕåÞÔë ÐÚâØÒØàÞÒÐÝë"
 
 #. I18N: Drop book page
-#: engines/mohawk/dialogs.cpp:193
+#: engines/mohawk/dialogs.cpp:149
 msgid "~D~rop Page"
 msgstr "~²~ëÑàÞáØâì áâàÐÝØæã"
 
-#: engines/mohawk/dialogs.cpp:197
+#: engines/mohawk/dialogs.cpp:153
 msgid "Show ~M~ap"
 msgstr "¿ÞÚÐ×Ðâì ~Ú~Ðàâã"
 
-#: engines/mohawk/dialogs.cpp:203
+#: engines/mohawk/dialogs.cpp:159
 msgid "Main Men~u~"
 msgstr "³ÛÐÒÝÞÕ ÜÕÝ~î~"
 
-#: engines/mohawk/dialogs.cpp:290
+#: engines/mohawk/dialogs.cpp:287
 msgid "~W~ater Effect Enabled"
 msgstr "~Í~ääÕÚâë ÒÞÔë ÒÚÛîçÕÝë"
 
-#: engines/mohawk/dialogs.cpp:292
+#: engines/mohawk/dialogs.cpp:289
 msgid "Transitions:"
 msgstr "¿ÕàÕåÞÔë:"
 
-#: engines/mohawk/dialogs.cpp:294
+#: engines/mohawk/dialogs.cpp:291
 msgid "Disabled"
 msgstr "²ëÚÛîçÕÝë"
 
-#: engines/mohawk/dialogs.cpp:295
+#: engines/mohawk/dialogs.cpp:292
 msgid "Fastest"
 msgstr "±ëáâàëÕ"
 
-#: engines/mohawk/dialogs.cpp:296
+#: engines/mohawk/dialogs.cpp:293
 msgid "Normal"
 msgstr "¾ÑëçÝëÕ"
 
-#: engines/mohawk/dialogs.cpp:297
+#: engines/mohawk/dialogs.cpp:294
 msgid "Best"
 msgstr "»ãçèØÕ"
 
@@ -3363,32 +3367,37 @@ msgid "The game is paused. Press any key to continue."
 msgstr "¸ÓàÐ ßàØÞáâÐÝÞÒÛÕÝÐ. ´Ûï ßàÞÔÞÛÖÕÝØï ÝÐÖÜØâÕ ÛîÑãî ÚÝÞßÚã."
 
 #: engines/mohawk/myst_stacks/menu.cpp:255
+#: engines/mohawk/riven_stacks/aspit.cpp:394
 msgid ""
 "Are you sure you want to load a saved game? All unsaved progress will be "
 "lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:256
+#: engines/mohawk/riven_stacks/aspit.cpp:395
 #, fuzzy
 msgid "Load game"
 msgstr "·ÐÓàã×Øâì ØÓàã:"
 
 #: engines/mohawk/myst_stacks/menu.cpp:272
+#: engines/mohawk/riven_stacks/aspit.cpp:416
 msgid ""
 "Are you sure you want to start a new game? All unsaved progress will be lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:273
+#: engines/mohawk/riven_stacks/aspit.cpp:417
 #, fuzzy
 msgid "New game"
 msgstr "½ÞÒÞÕ áÞåàÐÝÕÝØÕ"
 
 #: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500
 #, fuzzy
 msgid "Are you sure you want to quit? All unsaved progress will be lost."
 msgstr "   ²ë ãÒÕàÕÝë, çâÞ åÞâØâÕ ÒëÙâØ?   "
 
-#: engines/mohawk/riven.cpp:154
+#: engines/mohawk/riven.cpp:158
 msgid ""
 "You're missing a Riven executable. The Windows executable is 'riven.exe' or "
 "'rivendmo.exe'. "
@@ -3396,7 +3405,7 @@ msgstr ""
 "½Õ åÒÐâÐÕâ ØáßÞÛÝïÕÜÞÓÞ äÐÙÛÐ Riven. Windows-äÐÙÛ ÝÐ×ëÒÐÕâáï 'riven.exe' "
 "ÛØÑÞ 'rivendmo.exe'. "
 
-#: engines/mohawk/riven.cpp:155
+#: engines/mohawk/riven.cpp:159
 msgid ""
 "Using the 'arcriven.z' installer file also works. In addition, you can use "
 "the Mac 'Riven' executable."
@@ -3404,7 +3413,7 @@ msgstr ""
 "²ÜÕáâÞ ÝÕÓÞ ßÞÔÞÙÔñâ äÐÙÛ ãáâÐÝÞÒéØÚÐ 'arcriven.z'. ÂÐÚÖÕ ÜÞÖÝÞ ØáßÞÛì×ÞÒÐâì "
 "ØáßÞÛÝïÕÜëÙ äÐÙÛ 'Riven' ÔÛï Mac."
 
-#: engines/mohawk/riven.cpp:166
+#: engines/mohawk/riven.cpp:170
 msgid ""
 "You're missing 'extras.mhk'. Using the 'arcriven.z' installer file also "
 "works."
@@ -3412,11 +3421,11 @@ msgstr ""
 "½Õ åÒÐâÐÕâ äÐÙÛÐ 'extras.mhk'. ²ÜÕáâÞ ÝÕÓÞ ÜÞÖÝÞ ØáßÞÛì×ÞÒÐâì äÐÙÛ 'arcriven."
 "z'."
 
-#: engines/mohawk/riven.cpp:452
+#: engines/mohawk/riven.cpp:498
 msgid "You are missing the following required Riven data files:\n"
 msgstr "½Õ åÒÐâÐÕâ áÛÕÔãîéØå äÐÙÛÞÒ ØÓàë Riven:\n"
 
-#: engines/mohawk/riven_stack.cpp:182
+#: engines/mohawk/riven_stack.cpp:204
 msgid ""
 "Exploration beyond this point available only within the full version of\n"
 "the game."
@@ -3424,7 +3433,7 @@ msgstr ""
 "´ÐÛìÝÕÙèÕÕ ØááÛÕÔÞÒÐÝØÕ ÒÞ×ÜÞÖÝÞ âÞÛìÚÞ\n"
 "Ò ßÞÛÝÞÙ ÒÕàáØØ ØÓàë."
 
-#: engines/mohawk/riven_stacks/aspit.cpp:309
+#: engines/mohawk/riven_stacks/aspit.cpp:474
 msgid ""
 "At this point, the Riven Demo would\n"
 "ask if you would like to open a web browser\n"
diff --git a/po/scummvm.pot b/po/scummvm.pot
index 40204b4d14..c46bc1c352 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-06-29 13:20+0200\n"
+"POT-Creation-Date: 2018-06-29 13:32+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -66,6 +66,9 @@ msgstr ""
 #: engines/mohawk/myst_stacks/menu.cpp:256
 #: engines/mohawk/myst_stacks/menu.cpp:273
 #: engines/mohawk/myst_stacks/menu.cpp:291
+#: engines/mohawk/riven_stacks/aspit.cpp:395
+#: engines/mohawk/riven_stacks/aspit.cpp:417
+#: engines/mohawk/riven_stacks/aspit.cpp:501
 #: engines/parallaction/saveload.cpp:271 engines/scumm/dialogs.cpp:187
 #: engines/sword1/control.cpp:887
 msgid "Cancel"
@@ -578,7 +581,7 @@ msgstr ""
 msgid "Choose an action to map"
 msgstr ""
 
-#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:101
+#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:143
 msgid "~Q~uit"
 msgstr ""
 
@@ -666,8 +669,8 @@ msgid "Search:"
 msgstr ""
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:106 engines/mohawk/myst.cpp:884
-#: engines/mohawk/riven.cpp:553 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:884
+#: engines/mohawk/riven.cpp:629 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr ""
@@ -675,8 +678,8 @@ msgstr ""
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
-#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:106
-#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:553
+#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:163
+#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:629
 #: 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
@@ -1782,11 +1785,11 @@ msgstr ""
 msgid "~R~esume"
 msgstr ""
 
-#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:99
+#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:141
 msgid "~L~oad"
 msgstr ""
 
-#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:100
+#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:142
 msgid "~S~ave"
 msgstr ""
 
@@ -1817,8 +1820,8 @@ msgstr ""
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
-#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:107
-#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:565
+#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:164
+#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:641
 #: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:658
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
@@ -1839,8 +1842,8 @@ msgstr ""
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
 #: engines/dreamweb/saveload.cpp:262 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
-#: engines/mohawk/dialogs.cpp:107 engines/mohawk/myst.cpp:896
-#: engines/mohawk/riven.cpp:565 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/dialogs.cpp:164 engines/mohawk/myst.cpp:896
+#: engines/mohawk/riven.cpp:641 engines/neverhood/menumodule.cpp:880
 #: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:659
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -1865,12 +1868,12 @@ msgid ""
 "and for instructions on how to obtain further assistance."
 msgstr ""
 
-#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:103
+#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:99
 #: engines/tsage/dialogs.cpp:112
 msgid "~O~K"
 msgstr ""
 
-#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:104
+#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:100
 #: engines/tsage/dialogs.cpp:113
 msgid "~C~ancel"
 msgstr ""
@@ -2095,7 +2098,8 @@ msgstr ""
 #: backends/platform/symbian/src/SymbianActions.cpp:52
 #: backends/platform/wince/CEActionsPocket.cpp:44
 #: backends/platform/wince/CEActionsSmartphone.cpp:52
-#: engines/mohawk/myst_stacks/menu.cpp:290 engines/scumm/dialogs.cpp:188
+#: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500 engines/scumm/dialogs.cpp:188
 #: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85
 msgid "Quit"
 msgstr ""
@@ -3173,57 +3177,57 @@ msgstr ""
 msgid "Naughty game mode"
 msgstr ""
 
-#: engines/mohawk/detection.cpp:162
+#: engines/mohawk/detection.cpp:154
 msgid "Play the Myst fly by movie"
 msgstr ""
 
-#: engines/mohawk/detection.cpp:163
+#: engines/mohawk/detection.cpp:155
 msgid "The Myst fly by movie was not played by the original engine."
 msgstr ""
 
 #. I18N: Option for fast scene switching
-#: engines/mohawk/dialogs.cpp:190 engines/mohawk/dialogs.cpp:289
+#: engines/mohawk/dialogs.cpp:146 engines/mohawk/dialogs.cpp:286
 msgid "~Z~ip Mode Activated"
 msgstr ""
 
-#: engines/mohawk/dialogs.cpp:191
+#: engines/mohawk/dialogs.cpp:147
 msgid "~T~ransitions Enabled"
 msgstr ""
 
 #. I18N: Drop book page
-#: engines/mohawk/dialogs.cpp:193
+#: engines/mohawk/dialogs.cpp:149
 msgid "~D~rop Page"
 msgstr ""
 
-#: engines/mohawk/dialogs.cpp:197
+#: engines/mohawk/dialogs.cpp:153
 msgid "Show ~M~ap"
 msgstr ""
 
-#: engines/mohawk/dialogs.cpp:203
+#: engines/mohawk/dialogs.cpp:159
 msgid "Main Men~u~"
 msgstr ""
 
-#: engines/mohawk/dialogs.cpp:290
+#: engines/mohawk/dialogs.cpp:287
 msgid "~W~ater Effect Enabled"
 msgstr ""
 
-#: engines/mohawk/dialogs.cpp:292
+#: engines/mohawk/dialogs.cpp:289
 msgid "Transitions:"
 msgstr ""
 
-#: engines/mohawk/dialogs.cpp:294
+#: engines/mohawk/dialogs.cpp:291
 msgid "Disabled"
 msgstr ""
 
-#: engines/mohawk/dialogs.cpp:295
+#: engines/mohawk/dialogs.cpp:292
 msgid "Fastest"
 msgstr ""
 
-#: engines/mohawk/dialogs.cpp:296
+#: engines/mohawk/dialogs.cpp:293
 msgid "Normal"
 msgstr ""
 
-#: engines/mohawk/dialogs.cpp:297
+#: engines/mohawk/dialogs.cpp:294
 msgid "Best"
 msgstr ""
 
@@ -3232,57 +3236,62 @@ msgid "The game is paused. Press any key to continue."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:255
+#: engines/mohawk/riven_stacks/aspit.cpp:394
 msgid ""
 "Are you sure you want to load a saved game? All unsaved progress will be "
 "lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:256
+#: engines/mohawk/riven_stacks/aspit.cpp:395
 msgid "Load game"
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:272
+#: engines/mohawk/riven_stacks/aspit.cpp:416
 msgid ""
 "Are you sure you want to start a new game? All unsaved progress will be lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:273
+#: engines/mohawk/riven_stacks/aspit.cpp:417
 msgid "New game"
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500
 msgid "Are you sure you want to quit? All unsaved progress will be lost."
 msgstr ""
 
-#: engines/mohawk/riven.cpp:154
+#: engines/mohawk/riven.cpp:158
 msgid ""
 "You're missing a Riven executable. The Windows executable is 'riven.exe' or "
 "'rivendmo.exe'. "
 msgstr ""
 
-#: engines/mohawk/riven.cpp:155
+#: engines/mohawk/riven.cpp:159
 msgid ""
 "Using the 'arcriven.z' installer file also works. In addition, you can use "
 "the Mac 'Riven' executable."
 msgstr ""
 
-#: engines/mohawk/riven.cpp:166
+#: engines/mohawk/riven.cpp:170
 msgid ""
 "You're missing 'extras.mhk'. Using the 'arcriven.z' installer file also "
 "works."
 msgstr ""
 
-#: engines/mohawk/riven.cpp:452
+#: engines/mohawk/riven.cpp:498
 msgid "You are missing the following required Riven data files:\n"
 msgstr ""
 
-#: engines/mohawk/riven_stack.cpp:182
+#: engines/mohawk/riven_stack.cpp:204
 msgid ""
 "Exploration beyond this point available only within the full version of\n"
 "the game."
 msgstr ""
 
-#: engines/mohawk/riven_stacks/aspit.cpp:309
+#: engines/mohawk/riven_stacks/aspit.cpp:474
 msgid ""
 "At this point, the Riven Demo would\n"
 "ask if you would like to open a web browser\n"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index f58174cd50..aeb1f0b98c 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-06-29 13:20+0200\n"
+"POT-Creation-Date: 2018-06-29 13:32+0200\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/"
@@ -70,6 +70,9 @@ msgstr "Uppåt"
 #: engines/mohawk/myst_stacks/menu.cpp:256
 #: engines/mohawk/myst_stacks/menu.cpp:273
 #: engines/mohawk/myst_stacks/menu.cpp:291
+#: engines/mohawk/riven_stacks/aspit.cpp:395
+#: engines/mohawk/riven_stacks/aspit.cpp:417
+#: engines/mohawk/riven_stacks/aspit.cpp:501
 #: engines/parallaction/saveload.cpp:271 engines/scumm/dialogs.cpp:187
 #: engines/sword1/control.cpp:887
 msgid "Cancel"
@@ -597,7 +600,7 @@ msgstr "Tryck på en tangent för att ställa in"
 msgid "Choose an action to map"
 msgstr "Välj en handling att ställa in"
 
-#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:101
+#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:143
 msgid "~Q~uit"
 msgstr "~A~vsluta"
 
@@ -685,8 +688,8 @@ msgid "Search:"
 msgstr "Sök:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:106 engines/mohawk/myst.cpp:884
-#: engines/mohawk/riven.cpp:553 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:884
+#: engines/mohawk/riven.cpp:629 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Ladda spel:"
@@ -694,8 +697,8 @@ msgstr "Ladda spel:"
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
-#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:106
-#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:553
+#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:163
+#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:629
 #: 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
@@ -1829,11 +1832,11 @@ msgstr "<Dåligt värde>"
 msgid "~R~esume"
 msgstr "~F~ortsätt"
 
-#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:99
+#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:141
 msgid "~L~oad"
 msgstr "~L~adda"
 
-#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:100
+#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:142
 msgid "~S~ave"
 msgstr "~S~para"
 
@@ -1864,8 +1867,8 @@ msgstr "Åte~r~vänd till launcher"
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
-#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:107
-#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:565
+#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:164
+#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:641
 #: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:658
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
@@ -1886,8 +1889,8 @@ msgstr "Spara spelet:"
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
 #: engines/dreamweb/saveload.cpp:262 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
-#: engines/mohawk/dialogs.cpp:107 engines/mohawk/myst.cpp:896
-#: engines/mohawk/riven.cpp:565 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/dialogs.cpp:164 engines/mohawk/myst.cpp:896
+#: engines/mohawk/riven.cpp:641 engines/neverhood/menumodule.cpp:880
 #: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:659
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -1917,12 +1920,12 @@ msgstr ""
 "Kunde inte spara data (%s)! Läs README-filen för grundläggande information "
 "och instruktioner för hur du kan få mer hjälp."
 
-#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:103
+#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:99
 #: engines/tsage/dialogs.cpp:112
 msgid "~O~K"
 msgstr "~O~K"
 
-#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:104
+#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:100
 #: engines/tsage/dialogs.cpp:113
 msgid "~C~ancel"
 msgstr "A~v~bryt"
@@ -2178,7 +2181,8 @@ msgstr "Vill du verkligen avsluta?"
 #: backends/platform/symbian/src/SymbianActions.cpp:52
 #: backends/platform/wince/CEActionsPocket.cpp:44
 #: backends/platform/wince/CEActionsSmartphone.cpp:52
-#: engines/mohawk/myst_stacks/menu.cpp:290 engines/scumm/dialogs.cpp:188
+#: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500 engines/scumm/dialogs.cpp:188
 #: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85
 msgid "Quit"
 msgstr "Avsluta"
@@ -3305,57 +3309,57 @@ msgstr "Animerat spelgränssnitt"
 msgid "Naughty game mode"
 msgstr "\"Busigt\" spelläge"
 
-#: engines/mohawk/detection.cpp:162
+#: engines/mohawk/detection.cpp:154
 msgid "Play the Myst fly by movie"
 msgstr "Spela flygvideon i Myst"
 
-#: engines/mohawk/detection.cpp:163
+#: engines/mohawk/detection.cpp:155
 msgid "The Myst fly by movie was not played by the original engine."
 msgstr "Flygvideon i Myst visades inte i originalspelet."
 
 #. I18N: Option for fast scene switching
-#: engines/mohawk/dialogs.cpp:190 engines/mohawk/dialogs.cpp:289
+#: engines/mohawk/dialogs.cpp:146 engines/mohawk/dialogs.cpp:286
 msgid "~Z~ip Mode Activated"
 msgstr "~Z~ipläge aktiverat"
 
-#: engines/mohawk/dialogs.cpp:191
+#: engines/mohawk/dialogs.cpp:147
 msgid "~T~ransitions Enabled"
 msgstr "Öv~e~rgångar aktiverade"
 
 #. I18N: Drop book page
-#: engines/mohawk/dialogs.cpp:193
+#: engines/mohawk/dialogs.cpp:149
 msgid "~D~rop Page"
 msgstr "Släpp si~d~a"
 
-#: engines/mohawk/dialogs.cpp:197
+#: engines/mohawk/dialogs.cpp:153
 msgid "Show ~M~ap"
 msgstr "~V~isa karta"
 
-#: engines/mohawk/dialogs.cpp:203
+#: engines/mohawk/dialogs.cpp:159
 msgid "Main Men~u~"
 msgstr "Huvud~m~eny"
 
-#: engines/mohawk/dialogs.cpp:290
+#: engines/mohawk/dialogs.cpp:287
 msgid "~W~ater Effect Enabled"
 msgstr "~V~atteneffekt aktiverad"
 
-#: engines/mohawk/dialogs.cpp:292
+#: engines/mohawk/dialogs.cpp:289
 msgid "Transitions:"
 msgstr "Övergångar:"
 
-#: engines/mohawk/dialogs.cpp:294
+#: engines/mohawk/dialogs.cpp:291
 msgid "Disabled"
 msgstr "Inaktiverad"
 
-#: engines/mohawk/dialogs.cpp:295
+#: engines/mohawk/dialogs.cpp:292
 msgid "Fastest"
 msgstr "Snabbast"
 
-#: engines/mohawk/dialogs.cpp:296
+#: engines/mohawk/dialogs.cpp:293
 msgid "Normal"
 msgstr "Normal"
 
-#: engines/mohawk/dialogs.cpp:297
+#: engines/mohawk/dialogs.cpp:294
 msgid "Best"
 msgstr "Bästa"
 
@@ -3364,32 +3368,37 @@ msgid "The game is paused. Press any key to continue."
 msgstr "Spelet pausat. Tryck på valfri tangent för att fortsätta."
 
 #: engines/mohawk/myst_stacks/menu.cpp:255
+#: engines/mohawk/riven_stacks/aspit.cpp:394
 msgid ""
 "Are you sure you want to load a saved game? All unsaved progress will be "
 "lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:256
+#: engines/mohawk/riven_stacks/aspit.cpp:395
 #, fuzzy
 msgid "Load game"
 msgstr "Ladda spel:"
 
 #: engines/mohawk/myst_stacks/menu.cpp:272
+#: engines/mohawk/riven_stacks/aspit.cpp:416
 msgid ""
 "Are you sure you want to start a new game? All unsaved progress will be lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:273
+#: engines/mohawk/riven_stacks/aspit.cpp:417
 #, fuzzy
 msgid "New game"
 msgstr "Ny sparning"
 
 #: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500
 #, fuzzy
 msgid "Are you sure you want to quit? All unsaved progress will be lost."
 msgstr "   Är du säker på att du vill avsluta?   "
 
-#: engines/mohawk/riven.cpp:154
+#: engines/mohawk/riven.cpp:158
 msgid ""
 "You're missing a Riven executable. The Windows executable is 'riven.exe' or "
 "'rivendmo.exe'. "
@@ -3397,7 +3406,7 @@ msgstr ""
 "Rivens huvudprogram saknas. Windowsprogrammet heter 'riven.exe' eller "
 "'rivendmo.exe'. "
 
-#: engines/mohawk/riven.cpp:155
+#: engines/mohawk/riven.cpp:159
 msgid ""
 "Using the 'arcriven.z' installer file also works. In addition, you can use "
 "the Mac 'Riven' executable."
@@ -3405,7 +3414,7 @@ msgstr ""
 "Det går även bra med installationsfilen 'arcriven.z', eller "
 "Macintoshprogrammet 'Riven'."
 
-#: engines/mohawk/riven.cpp:166
+#: engines/mohawk/riven.cpp:170
 msgid ""
 "You're missing 'extras.mhk'. Using the 'arcriven.z' installer file also "
 "works."
@@ -3413,17 +3422,17 @@ msgstr ""
 "Filen 'extras.mhk' saknas. Det går även bra att använda installationsfilen "
 "'arcriven.z' i stället."
 
-#: engines/mohawk/riven.cpp:452
+#: engines/mohawk/riven.cpp:498
 msgid "You are missing the following required Riven data files:\n"
 msgstr "Du saknar följande obligatoriska datafiler för Riven:\n"
 
-#: engines/mohawk/riven_stack.cpp:182
+#: engines/mohawk/riven_stack.cpp:204
 msgid ""
 "Exploration beyond this point available only within the full version of\n"
 "the game."
 msgstr "För fortsatt utforskande krävs den fullständiga versionen av spelet."
 
-#: engines/mohawk/riven_stacks/aspit.cpp:309
+#: engines/mohawk/riven_stacks/aspit.cpp:474
 msgid ""
 "At this point, the Riven Demo would\n"
 "ask if you would like to open a web browser\n"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 4bd2f402f8..4ca7c2d394 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-06-29 13:20+0200\n"
+"POT-Creation-Date: 2018-06-29 13:32+0200\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/"
@@ -71,6 +71,9 @@ msgstr "²ÓÞàã"
 #: engines/mohawk/myst_stacks/menu.cpp:256
 #: engines/mohawk/myst_stacks/menu.cpp:273
 #: engines/mohawk/myst_stacks/menu.cpp:291
+#: engines/mohawk/riven_stacks/aspit.cpp:395
+#: engines/mohawk/riven_stacks/aspit.cpp:417
+#: engines/mohawk/riven_stacks/aspit.cpp:501
 #: engines/parallaction/saveload.cpp:271 engines/scumm/dialogs.cpp:187
 #: engines/sword1/control.cpp:887
 msgid "Cancel"
@@ -598,7 +601,7 @@ msgstr "½ÐâØáÝöâì ÚÛÐÒöèã ÔÛï ßàØ×ÝÐçÕÝÝï"
 msgid "Choose an action to map"
 msgstr "²ØÑÕàöâì Ôöî ÔÛï ßàØ×ÝÐçÕÝÝï"
 
-#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:101
+#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:143
 msgid "~Q~uit"
 msgstr "~²~ØåöÔ"
 
@@ -686,8 +689,8 @@ msgid "Search:"
 msgstr "¿ÞèãÚ:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:106 engines/mohawk/myst.cpp:884
-#: engines/mohawk/riven.cpp:553 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:884
+#: engines/mohawk/riven.cpp:629 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "·ÐÒÐÝâÐÖØâØ Óàã:"
@@ -695,8 +698,8 @@ msgstr "·ÐÒÐÝâÐÖØâØ Óàã:"
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
-#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:106
-#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:553
+#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:163
+#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:629
 #: 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
@@ -1830,11 +1833,11 @@ msgstr "<½ÕÒöàÝÕ ×ÝÐçÕÝÝï>"
 msgid "~R~esume"
 msgstr "¿àÞÔÞÒ~Ö~ØâØ"
 
-#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:99
+#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:141
 msgid "~L~oad"
 msgstr "~·~ÐÒÐÝâÐÖØâØ"
 
-#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:100
+#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:142
 msgid "~S~ave"
 msgstr "~·~ÐßØáÐâØ"
 
@@ -1865,8 +1868,8 @@ msgstr "~¿~ÞÒÕà.Ò ÓÞÛÞÒÝÕ ÜÕÝî"
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
-#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:107
-#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:565
+#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:164
+#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:641
 #: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:658
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
@@ -1887,8 +1890,8 @@ msgstr "·ÑÕàÕÓâØ Óàã:"
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
 #: engines/dreamweb/saveload.cpp:262 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
-#: engines/mohawk/dialogs.cpp:107 engines/mohawk/myst.cpp:896
-#: engines/mohawk/riven.cpp:565 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/dialogs.cpp:164 engines/mohawk/myst.cpp:896
+#: engines/mohawk/riven.cpp:641 engines/neverhood/menumodule.cpp:880
 #: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:659
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -1918,12 +1921,12 @@ msgstr ""
 "½Õ ÒÔÐÛÞáï ×ÑÕàÕÓâØ Óàã (%s)!. ±ãÔì-ÛÐáÚÐ, ÔØÒöâìáï äÐÙÛ README ÔÛï ÞáÝÞÒÝÞ÷ "
 "öÝäÞàÜÐæö÷, Ð âÐÚÞÖ öÝáâàãÚæöÙ, ïÚ ÞâàØÜÐâØ ßÞÔÐÛìèã ÔÞßÞÜÞÓã."
 
-#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:103
+#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:99
 #: engines/tsage/dialogs.cpp:112
 msgid "~O~K"
 msgstr "~O~K"
 
-#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:104
+#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:100
 #: engines/tsage/dialogs.cpp:113
 msgid "~C~ancel"
 msgstr "²ö~Ô~ÜöÝÐ"
@@ -2178,7 +2181,8 @@ msgstr "²Ø ÔöÙáÝÞ åÞçÕâÕ ÒØÙâØ?"
 #: backends/platform/symbian/src/SymbianActions.cpp:52
 #: backends/platform/wince/CEActionsPocket.cpp:44
 #: backends/platform/wince/CEActionsSmartphone.cpp:52
-#: engines/mohawk/myst_stacks/menu.cpp:290 engines/scumm/dialogs.cpp:188
+#: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500 engines/scumm/dialogs.cpp:188
 #: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85
 msgid "Quit"
 msgstr "²ØåöÔ"
@@ -3304,60 +3308,60 @@ msgstr "°ÝöÜÞÒÐÝØÙ öÝâÕàäÕÙá ÓàØ"
 msgid "Naughty game mode"
 msgstr "²öÔÒÕàâØÙ àÕÖØÜ ÓàØ"
 
-#: engines/mohawk/detection.cpp:162
+#: engines/mohawk/detection.cpp:154
 msgid "Play the Myst fly by movie"
 msgstr "¿ÞÚÐ×ãÒÐâØ àÞÛöÚ ßÞÛìÞâã ÝÐÔ Myst"
 
-#: engines/mohawk/detection.cpp:163
+#: engines/mohawk/detection.cpp:155
 msgid "The Myst fly by movie was not played by the original engine."
 msgstr "ÀÞÛöÚ ßÞÛìÞâã ÝÐÔ Myst ÝÕ ßÞÚÐ×ãÒÐÒáï ÞàØÓöÝÐÛìÝØÜ ÔÒØÖÚÞÜ."
 
 #. I18N: Option for fast scene switching
-#: engines/mohawk/dialogs.cpp:190 engines/mohawk/dialogs.cpp:289
+#: engines/mohawk/dialogs.cpp:146 engines/mohawk/dialogs.cpp:286
 msgid "~Z~ip Mode Activated"
 msgstr "ÀÕÖØÜ èÒØÔÚÞÓÞ ßÕàÕåÞÔã ÐÚâØÒÞÒÐÝÞ"
 
-#: engines/mohawk/dialogs.cpp:191
+#: engines/mohawk/dialogs.cpp:147
 msgid "~T~ransitions Enabled"
 msgstr "¿ÕàÕåÞÔØ ÐÚâØÒÞÒÐÝÞ"
 
 #. I18N: Drop book page
-#: engines/mohawk/dialogs.cpp:193
+#: engines/mohawk/dialogs.cpp:149
 msgid "~D~rop Page"
 msgstr "²ØÚØÝãâØ áâÞàöÝÚã"
 
-#: engines/mohawk/dialogs.cpp:197
+#: engines/mohawk/dialogs.cpp:153
 msgid "Show ~M~ap"
 msgstr "¿ÞÚÐ×ÐâØ ÜÐßã"
 
-#: engines/mohawk/dialogs.cpp:203
+#: engines/mohawk/dialogs.cpp:159
 msgid "Main Men~u~"
 msgstr "³ÞÛÞÒÝÕ ÜÕÝî"
 
-#: engines/mohawk/dialogs.cpp:290
+#: engines/mohawk/dialogs.cpp:287
 msgid "~W~ater Effect Enabled"
 msgstr "µäÕÚâØ ÒÞÔØ ãÒöÜÚÝÕÝÞ"
 
-#: engines/mohawk/dialogs.cpp:292
+#: engines/mohawk/dialogs.cpp:289
 #, fuzzy
 msgid "Transitions:"
 msgstr "¿ÕàÕåÞÔØ ÐÚâØÒÞÒÐÝÞ"
 
-#: engines/mohawk/dialogs.cpp:294
+#: engines/mohawk/dialogs.cpp:291
 #, fuzzy
 msgid "Disabled"
 msgstr "±Õ× ÓàÐäöÚØ"
 
-#: engines/mohawk/dialogs.cpp:295
+#: engines/mohawk/dialogs.cpp:292
 #, fuzzy
 msgid "Fastest"
 msgstr "²áâÐÒØâØ"
 
-#: engines/mohawk/dialogs.cpp:296
+#: engines/mohawk/dialogs.cpp:293
 msgid "Normal"
 msgstr ""
 
-#: engines/mohawk/dialogs.cpp:297
+#: engines/mohawk/dialogs.cpp:294
 msgid "Best"
 msgstr ""
 
@@ -3366,32 +3370,37 @@ msgid "The game is paused. Press any key to continue."
 msgstr "¦Óàã ßàØ×ãßØÝÕÝÞ. ½ÐâØáÝöâì ÑãÔì-ïÚã ÚÛÐÒöèã ÔÛï ßàÞÔÞÒÖÕÝÝï."
 
 #: engines/mohawk/myst_stacks/menu.cpp:255
+#: engines/mohawk/riven_stacks/aspit.cpp:394
 msgid ""
 "Are you sure you want to load a saved game? All unsaved progress will be "
 "lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:256
+#: engines/mohawk/riven_stacks/aspit.cpp:395
 #, fuzzy
 msgid "Load game"
 msgstr "·ÐÒÐÝâÐÖØâØ Óàã:"
 
 #: engines/mohawk/myst_stacks/menu.cpp:272
+#: engines/mohawk/riven_stacks/aspit.cpp:416
 msgid ""
 "Are you sure you want to start a new game? All unsaved progress will be lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:273
+#: engines/mohawk/riven_stacks/aspit.cpp:417
 #, fuzzy
 msgid "New game"
 msgstr "½ÞÒØÙ áâÐÝ"
 
 #: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500
 #, fuzzy
 msgid "Are you sure you want to quit? All unsaved progress will be lost."
 msgstr "   ²Ø ãßÕÒÝÕÝö, éÞ åÞçÕâÕ ÒØÙâØ?   "
 
-#: engines/mohawk/riven.cpp:154
+#: engines/mohawk/riven.cpp:158
 msgid ""
 "You're missing a Riven executable. The Windows executable is 'riven.exe' or "
 "'rivendmo.exe'. "
@@ -3399,7 +3408,7 @@ msgstr ""
 "à ÒÐÜ ÝÕÜÐô äÐÙÛã ÔÛï ÒØÚÞÝÐÝÝï Riven. ÄÐÙÛ ÒØÚÞÝÐÝÝï ÔÛï Windows ÜÐô ÝÐ×Òã "
 "'riven.exe' ÐÑÞ 'rivendmo.exe'. "
 
-#: engines/mohawk/riven.cpp:155
+#: engines/mohawk/riven.cpp:159
 msgid ""
 "Using the 'arcriven.z' installer file also works. In addition, you can use "
 "the Mac 'Riven' executable."
@@ -3407,7 +3416,7 @@ msgstr ""
 "²ØÚÞàØáâÐÝÝï äÐÙÛã 'arcriven.z' âÐÚÞÖ ô ßàØßãáâØÜØÜ. ÂÐÚÞÖ ÒØ ÜÞÖÕâÕ "
 "ÒØÚÞàØáâÞÒãÒÐâØ äÐÙÛ 'Riven' ÔÛï Mac."
 
-#: engines/mohawk/riven.cpp:166
+#: engines/mohawk/riven.cpp:170
 msgid ""
 "You're missing 'extras.mhk'. Using the 'arcriven.z' installer file also "
 "works."
@@ -3415,17 +3424,17 @@ msgstr ""
 "à ÒÐá ÝÕÜÐô äÐÙÛã 'extras.mhk'. ²ØÚÞàØáâÐÝÝï äÐÙÛã 'arcriven.z' âÐÚÞÖ "
 "ÔÞáâÐâÝìÞ."
 
-#: engines/mohawk/riven.cpp:452
+#: engines/mohawk/riven.cpp:498
 msgid "You are missing the following required Riven data files:\n"
 msgstr ""
 
-#: engines/mohawk/riven_stack.cpp:182
+#: engines/mohawk/riven_stack.cpp:204
 msgid ""
 "Exploration beyond this point available only within the full version of\n"
 "the game."
 msgstr "´ÞáÛöÔãÒÐÝÝï ßÞ×Ð æöôî ÜÕÖÞî ÔÞáâãßÝÕ âöÛìÚØ ã ßÞÒÝö÷ ÒÕàáö÷ ÓàØ."
 
-#: engines/mohawk/riven_stacks/aspit.cpp:309
+#: engines/mohawk/riven_stacks/aspit.cpp:474
 msgid ""
 "At this point, the Riven Demo would\n"
 "ask if you would like to open a web browser\n"
diff --git a/po/zh-Latn_CN.po b/po/zh-Latn_CN.po
index e6a7388a58..db7c0b3e4d 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-06-29 13:20+0200\n"
+"POT-Creation-Date: 2018-06-29 13:32+0200\n"
 "PO-Revision-Date: 2018-04-18 10:18+0000\n"
 "Last-Translator: Adrian Frühwirth <bonki@scummvm.org>\n"
 "Language-Team: Chinese <https://translations.scummvm.org/projects/scummvm/"
@@ -69,6 +69,9 @@ msgstr "ShangYiJi"
 #: engines/mohawk/myst_stacks/menu.cpp:256
 #: engines/mohawk/myst_stacks/menu.cpp:273
 #: engines/mohawk/myst_stacks/menu.cpp:291
+#: engines/mohawk/riven_stacks/aspit.cpp:395
+#: engines/mohawk/riven_stacks/aspit.cpp:417
+#: engines/mohawk/riven_stacks/aspit.cpp:501
 #: engines/parallaction/saveload.cpp:271 engines/scumm/dialogs.cpp:187
 #: engines/sword1/control.cpp:887
 msgid "Cancel"
@@ -585,7 +588,7 @@ msgstr "Anxia Anjian lai Guanlian"
 msgid "Choose an action to map"
 msgstr "Xuanze yao Yingshe de Xingwei"
 
-#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:101
+#: gui/launcher.cpp:142 engines/dialogs.cpp:111 engines/mohawk/dialogs.cpp:143
 msgid "~Q~uit"
 msgstr "~Q~Tuichu"
 
@@ -673,8 +676,8 @@ msgid "Search:"
 msgstr "Sousuo:"
 
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:106 engines/mohawk/myst.cpp:884
-#: engines/mohawk/riven.cpp:553 engines/pegasus/pegasus.cpp:355
+#: engines/mohawk/dialogs.cpp:163 engines/mohawk/myst.cpp:884
+#: engines/mohawk/riven.cpp:629 engines/pegasus/pegasus.cpp:355
 #: engines/tsage/scenes.cpp:601 engines/wage/saveload.cpp:748
 msgid "Load game:"
 msgstr "Jiazai Youxi:"
@@ -682,8 +685,8 @@ msgstr "Jiazai Youxi:"
 #: gui/launcher.cpp:201 engines/dialogs.cpp:115
 #: backends/platform/wince/CEActionsPocket.cpp:267
 #: backends/platform/wince/CEActionsSmartphone.cpp:231
-#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:106
-#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:553
+#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:163
+#: engines/mohawk/myst.cpp:884 engines/mohawk/riven.cpp:629
 #: 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
@@ -1821,11 +1824,11 @@ msgstr "Qingchu Zhi"
 msgid "~R~esume"
 msgstr "~R~Jixu"
 
-#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:99
+#: engines/dialogs.cpp:87 engines/mohawk/dialogs.cpp:141
 msgid "~L~oad"
 msgstr "~L~Zairu"
 
-#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:100
+#: engines/dialogs.cpp:91 engines/mohawk/dialogs.cpp:142
 msgid "~S~ave"
 msgstr "~S~Baocun"
 
@@ -1856,8 +1859,8 @@ msgstr "~R~Fanhui Qidongqi"
 #: engines/cruise/menu.cpp:212 engines/dm/loadsave.cpp:199
 #: engines/drascula/saveload.cpp:383 engines/dreamweb/saveload.cpp:262
 #: engines/gnap/menu.cpp:464 engines/hugo/file.cpp:298
-#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:107
-#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:565
+#: engines/mads/nebular/dialogs_nebular.cpp:350 engines/mohawk/dialogs.cpp:164
+#: engines/mohawk/myst.cpp:896 engines/mohawk/riven.cpp:641
 #: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:658
 #: engines/sci/engine/kfile.cpp:1054 engines/sherlock/scalpel/scalpel.cpp:1250
@@ -1878,8 +1881,8 @@ msgstr "Baocun Youxi:"
 #: engines/dm/loadsave.cpp:199 engines/drascula/saveload.cpp:383
 #: engines/dreamweb/saveload.cpp:262 engines/gnap/menu.cpp:464
 #: engines/hugo/file.cpp:298 engines/mads/nebular/dialogs_nebular.cpp:350
-#: engines/mohawk/dialogs.cpp:107 engines/mohawk/myst.cpp:896
-#: engines/mohawk/riven.cpp:565 engines/neverhood/menumodule.cpp:880
+#: engines/mohawk/dialogs.cpp:164 engines/mohawk/myst.cpp:896
+#: engines/mohawk/riven.cpp:641 engines/neverhood/menumodule.cpp:880
 #: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
 #: engines/sci/engine/guest_additions.cpp:659
 #: engines/sci/engine/kfile.cpp:1054 engines/scumm/dialogs.cpp:184
@@ -1908,12 +1911,12 @@ msgstr ""
 "Cundang Baocun Shibai (%s)! Qing Chayue README Huode Jiben Xinxi, Yiji "
 "Gengduo Xinxi"
 
-#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:103
+#: engines/dialogs.cpp:307 engines/mohawk/dialogs.cpp:99
 #: engines/tsage/dialogs.cpp:112
 msgid "~O~K"
 msgstr "~O~Queding"
 
-#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:104
+#: engines/dialogs.cpp:308 engines/mohawk/dialogs.cpp:100
 #: engines/tsage/dialogs.cpp:113
 msgid "~C~ancel"
 msgstr "~C~Quxiao"
@@ -2165,7 +2168,8 @@ msgstr "Nin Zhende Yao Tuichu Ma?"
 #: backends/platform/symbian/src/SymbianActions.cpp:52
 #: backends/platform/wince/CEActionsPocket.cpp:44
 #: backends/platform/wince/CEActionsSmartphone.cpp:52
-#: engines/mohawk/myst_stacks/menu.cpp:290 engines/scumm/dialogs.cpp:188
+#: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500 engines/scumm/dialogs.cpp:188
 #: engines/scumm/help.cpp:83 engines/scumm/help.cpp:85
 msgid "Quit"
 msgstr "Tuichu"
@@ -3295,62 +3299,62 @@ msgstr ""
 msgid "Naughty game mode"
 msgstr ""
 
-#: engines/mohawk/detection.cpp:162
+#: engines/mohawk/detection.cpp:154
 msgid "Play the Myst fly by movie"
 msgstr ""
 
-#: engines/mohawk/detection.cpp:163
+#: engines/mohawk/detection.cpp:155
 msgid "The Myst fly by movie was not played by the original engine."
 msgstr ""
 
 #. I18N: Option for fast scene switching
-#: engines/mohawk/dialogs.cpp:190 engines/mohawk/dialogs.cpp:289
+#: engines/mohawk/dialogs.cpp:146 engines/mohawk/dialogs.cpp:286
 msgid "~Z~ip Mode Activated"
 msgstr "~Z~Yasuo Moshi Qidong"
 
-#: engines/mohawk/dialogs.cpp:191
+#: engines/mohawk/dialogs.cpp:147
 msgid "~T~ransitions Enabled"
 msgstr "~T~Qiyong Zhuanyi"
 
 #. I18N: Drop book page
-#: engines/mohawk/dialogs.cpp:193
+#: engines/mohawk/dialogs.cpp:149
 msgid "~D~rop Page"
 msgstr "~D~shanchu Yemian"
 
-#: engines/mohawk/dialogs.cpp:197
+#: engines/mohawk/dialogs.cpp:153
 #, fuzzy
 msgid "Show ~M~ap"
 msgstr "~S~Xianshi Ditu"
 
-#: engines/mohawk/dialogs.cpp:203
+#: engines/mohawk/dialogs.cpp:159
 #, fuzzy
 msgid "Main Men~u~"
 msgstr "~M~Zhucaidan"
 
-#: engines/mohawk/dialogs.cpp:290
+#: engines/mohawk/dialogs.cpp:287
 msgid "~W~ater Effect Enabled"
 msgstr "~W~Qiyong Shuimian Xiaoguo"
 
-#: engines/mohawk/dialogs.cpp:292
+#: engines/mohawk/dialogs.cpp:289
 #, fuzzy
 msgid "Transitions:"
 msgstr "~T~Qiyong Zhuanyi"
 
-#: engines/mohawk/dialogs.cpp:294
+#: engines/mohawk/dialogs.cpp:291
 #, fuzzy
 msgid "Disabled"
 msgstr "Jinyong GFX"
 
-#: engines/mohawk/dialogs.cpp:295
+#: engines/mohawk/dialogs.cpp:292
 #, fuzzy
 msgid "Fastest"
 msgstr "Kuaisu Moshi"
 
-#: engines/mohawk/dialogs.cpp:296
+#: engines/mohawk/dialogs.cpp:293
 msgid "Normal"
 msgstr ""
 
-#: engines/mohawk/dialogs.cpp:297
+#: engines/mohawk/dialogs.cpp:294
 msgid "Best"
 msgstr ""
 
@@ -3360,60 +3364,65 @@ msgid "The game is paused. Press any key to continue."
 msgstr "Youxi Zanting. An Kongge Yi jixu."
 
 #: engines/mohawk/myst_stacks/menu.cpp:255
+#: engines/mohawk/riven_stacks/aspit.cpp:394
 msgid ""
 "Are you sure you want to load a saved game? All unsaved progress will be "
 "lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:256
+#: engines/mohawk/riven_stacks/aspit.cpp:395
 #, fuzzy
 msgid "Load game"
 msgstr "Jiazai Youxi:"
 
 #: engines/mohawk/myst_stacks/menu.cpp:272
+#: engines/mohawk/riven_stacks/aspit.cpp:416
 msgid ""
 "Are you sure you want to start a new game? All unsaved progress will be lost."
 msgstr ""
 
 #: engines/mohawk/myst_stacks/menu.cpp:273
+#: engines/mohawk/riven_stacks/aspit.cpp:417
 #, fuzzy
 msgid "New game"
 msgstr "Xinjian Cundang"
 
 #: engines/mohawk/myst_stacks/menu.cpp:290
+#: engines/mohawk/riven_stacks/aspit.cpp:500
 #, fuzzy
 msgid "Are you sure you want to quit? All unsaved progress will be lost."
 msgstr "   Nin Queding Tuichu ma ?   "
 
-#: engines/mohawk/riven.cpp:154
+#: engines/mohawk/riven.cpp:158
 msgid ""
 "You're missing a Riven executable. The Windows executable is 'riven.exe' or "
 "'rivendmo.exe'. "
 msgstr ""
 
-#: engines/mohawk/riven.cpp:155
+#: engines/mohawk/riven.cpp:159
 msgid ""
 "Using the 'arcriven.z' installer file also works. In addition, you can use "
 "the Mac 'Riven' executable."
 msgstr ""
 
-#: engines/mohawk/riven.cpp:166
+#: engines/mohawk/riven.cpp:170
 msgid ""
 "You're missing 'extras.mhk'. Using the 'arcriven.z' installer file also "
 "works."
 msgstr ""
 
-#: engines/mohawk/riven.cpp:452
+#: engines/mohawk/riven.cpp:498
 msgid "You are missing the following required Riven data files:\n"
 msgstr ""
 
-#: engines/mohawk/riven_stack.cpp:182
+#: engines/mohawk/riven_stack.cpp:204
 msgid ""
 "Exploration beyond this point available only within the full version of\n"
 "the game."
 msgstr ""
 
-#: engines/mohawk/riven_stacks/aspit.cpp:309
+#: engines/mohawk/riven_stacks/aspit.cpp:474
 msgid ""
 "At this point, the Riven Demo would\n"
 "ask if you would like to open a web browser\n"