aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--COPYRIGHT2
-rw-r--r--README2
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/Analog.cpp0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/Analog.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/BReverbModel.cpp0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/BReverbModel.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/Enumerations.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/File.cpp0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/File.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/FileStream.cpp0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/FileStream.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/LA32FloatWaveGenerator.cpp0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/LA32FloatWaveGenerator.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/LA32Ramp.cpp0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/LA32Ramp.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/LA32WaveGenerator.cpp0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/LA32WaveGenerator.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/MemoryRegion.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/MidiEventQueue.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/MidiStreamParser.cpp0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/MidiStreamParser.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/Part.cpp0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/Part.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/Partial.cpp0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/Partial.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/PartialManager.cpp0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/PartialManager.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/Poly.cpp0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/Poly.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/ROMInfo.cpp0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/ROMInfo.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/Structures.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/Synth.cpp0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/Synth.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/TVA.cpp0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/TVA.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/TVF.cpp0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/TVF.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/TVP.cpp0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/TVP.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/Tables.cpp0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/Tables.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/Types.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/c_interface/c_interface.cpp0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/c_interface/c_interface.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/c_interface/c_types.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/c_interface/cpp_interface.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/globals.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/internals.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/mmath.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/mt32emu.h0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/sha1/sha1.cpp0
-rw-r--r--[-rwxr-xr-x]audio/softsynth/mt32/sha1/sha1.h0
-rw-r--r--backends/events/ps3sdl/ps3sdl-events.cpp138
-rw-r--r--backends/events/ps3sdl/ps3sdl-events.h2
-rw-r--r--backends/events/psp2sdl/psp2sdl-events.cpp277
-rw-r--r--backends/events/psp2sdl/psp2sdl-events.h3
-rw-r--r--backends/events/sdl/sdl-events.cpp309
-rw-r--r--backends/events/sdl/sdl-events.h32
-rw-r--r--backends/events/symbiansdl/symbiansdl-events.cpp36
-rw-r--r--backends/events/symbiansdl/symbiansdl-events.h2
-rw-r--r--backends/platform/psp/display_manager.cpp29
-rw-r--r--backends/platform/psp/display_manager.h3
-rw-r--r--backends/platform/sdl/psp2/psp2.cpp14
-rw-r--r--backends/platform/sdl/sdl.cpp20
-rw-r--r--backends/platform/symbian/README2
-rw-r--r--backends/platform/symbian/src/SymbianOS.cpp7
-rw-r--r--backends/platform/symbian/src/SymbianOS.h1
-rwxr-xr-xconfigure2
-rw-r--r--devtools/create_project/create_project.cpp2
-rw-r--r--devtools/scumm-md5.txt7
-rw-r--r--dists/macosx/Info.plist4
-rw-r--r--dists/macosx/Info.plist.in4
-rw-r--r--dists/macosx/dockplugin/Info.plist2
-rw-r--r--dists/macosx/dockplugin/Info.plist.in2
-rw-r--r--dists/ps3/readme-ps3.md23
-rw-r--r--dists/scummvm.rc2
-rw-r--r--dists/scummvm.rc.in2
-rw-r--r--dists/win32/ScummVM.iss2
-rw-r--r--dists/win32/migration.bat2
-rw-r--r--doc/de/LIESMICH2
-rw-r--r--engines/bladerunner/detection_tables.h15
-rw-r--r--engines/kyra/detection_tables.h68
-rw-r--r--engines/mohawk/dialogs.cpp24
-rw-r--r--engines/mohawk/dialogs.h6
-rw-r--r--engines/mohawk/myst.cpp2
-rw-r--r--engines/mohawk/riven.cpp45
-rw-r--r--engines/mohawk/riven.h8
-rw-r--r--engines/mohawk/riven_video.cpp1
-rw-r--r--engines/neverhood/neverhood.cpp3
-rw-r--r--engines/saga/detection_tables.h30
-rw-r--r--engines/sci/detection_tables.h32
-rw-r--r--engines/sci/engine/workarounds.cpp1
-rw-r--r--engines/sci/resource.cpp3
-rw-r--r--engines/scumm/detection_tables.h2
-rw-r--r--engines/scumm/scumm-md5.h9
-rw-r--r--engines/sherlock/resources.cpp17
-rw-r--r--engines/sludge/backdrop.cpp4
-rw-r--r--engines/sludge/builtin.cpp44
-rw-r--r--engines/sludge/floor.cpp4
-rw-r--r--engines/sludge/fonttext.cpp4
-rw-r--r--engines/sludge/freeze.cpp24
-rw-r--r--engines/sludge/language.cpp4
-rw-r--r--engines/sludge/loadsave.cpp40
-rw-r--r--engines/sludge/loadsave.h4
-rw-r--r--engines/sludge/main_loop.cpp2
-rw-r--r--engines/sludge/module.mk2
-rw-r--r--engines/sludge/movie.cpp4
-rw-r--r--engines/sludge/newfatal.cpp2
-rw-r--r--engines/sludge/objtypes.cpp8
-rw-r--r--engines/sludge/people.cpp26
-rw-r--r--engines/sludge/savedata.cpp4
-rw-r--r--engines/sludge/sludge.cpp6
-rw-r--r--engines/sludge/sludge.h2
-rw-r--r--engines/sludge/sludger.cpp19
-rw-r--r--engines/sludge/sound.cpp6
-rw-r--r--engines/sludge/speech.cpp (renamed from engines/sludge/talk.cpp)179
-rw-r--r--engines/sludge/speech.h (renamed from engines/sludge/talk.h)47
-rw-r--r--engines/sludge/sprbanks.cpp2
-rw-r--r--engines/sludge/sprites.cpp10
-rw-r--r--engines/sludge/statusba.cpp2
-rw-r--r--engines/sludge/thumbnail.cpp4
-rw-r--r--engines/sludge/variable.cpp4
-rw-r--r--engines/sludge/zbuffer.cpp2
-rw-r--r--engines/xeen/character.cpp163
-rw-r--r--engines/xeen/character.h102
-rw-r--r--engines/xeen/debugger.cpp41
-rw-r--r--engines/xeen/debugger.h2
-rw-r--r--engines/xeen/detection.cpp4
-rw-r--r--engines/xeen/dialogs.cpp25
-rw-r--r--engines/xeen/dialogs.h14
-rw-r--r--engines/xeen/dialogs_awards.cpp2
-rw-r--r--engines/xeen/dialogs_input.cpp11
-rw-r--r--engines/xeen/dialogs_party.cpp2
-rw-r--r--engines/xeen/dialogs_quests.cpp8
-rw-r--r--engines/xeen/files.cpp281
-rw-r--r--engines/xeen/files.h155
-rw-r--r--engines/xeen/font.cpp7
-rw-r--r--engines/xeen/font.h7
-rw-r--r--engines/xeen/interface.cpp1
-rw-r--r--engines/xeen/items.h34
-rw-r--r--engines/xeen/locations.cpp3
-rw-r--r--engines/xeen/map.cpp230
-rw-r--r--engines/xeen/map.h40
-rw-r--r--engines/xeen/music.cpp10
-rw-r--r--engines/xeen/music.h2
-rw-r--r--engines/xeen/party.cpp133
-rw-r--r--engines/xeen/party.h6
-rw-r--r--engines/xeen/resources.cpp8
-rw-r--r--engines/xeen/resources.h2
-rw-r--r--engines/xeen/saves.cpp259
-rw-r--r--engines/xeen/saves.h74
-rw-r--r--engines/xeen/scripts.cpp91
-rw-r--r--engines/xeen/scripts.h6
-rw-r--r--engines/xeen/spells.cpp2
-rw-r--r--engines/xeen/sprites.cpp4
-rw-r--r--engines/xeen/sprites.h2
-rw-r--r--engines/xeen/window.h8
-rw-r--r--engines/xeen/worldofxeen/clouds_cutscenes.cpp4
-rw-r--r--engines/xeen/xeen.cpp126
-rw-r--r--engines/xeen/xeen.h22
-rw-r--r--graphics/VectorRendererSpec.cpp136
-rw-r--r--gui/about.cpp2
-rw-r--r--gui/options.cpp20
-rw-r--r--gui/themes/translations.datbin744855 -> 745148 bytes
-rw-r--r--po/be_BY.po352
-rw-r--r--po/ca_ES.po352
-rw-r--r--po/cs_CZ.po352
-rw-r--r--po/da_DK.po352
-rw-r--r--po/de_DE.po352
-rw-r--r--po/el.po352
-rw-r--r--po/es_ES.po352
-rw-r--r--po/eu.po352
-rw-r--r--po/fi_FI.po352
-rw-r--r--po/fr_FR.po352
-rw-r--r--po/gl_ES.po352
-rw-r--r--po/hu_HU.po352
-rw-r--r--po/it_IT.po356
-rw-r--r--po/nb_NO.po352
-rw-r--r--po/nl_NL.po352
-rw-r--r--po/nn_NO.po352
-rw-r--r--po/pl_PL.po352
-rw-r--r--po/pt_BR.po352
-rw-r--r--po/pt_PT.po352
-rw-r--r--po/ru_RU.po352
-rw-r--r--po/scummvm.pot352
-rw-r--r--po/sv_SE.po352
-rw-r--r--po/uk_UA.po352
-rw-r--r--po/zh-Latn_CN.po352
189 files changed, 6418 insertions, 5743 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index 531606a93e..fe8159f8e9 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
ScummVM
-Copyright (C) 2001-2017 by the following:
+Copyright (C) 2001-2018 by the following:
If you have contributed to this project then you deserve to be on this
list. Contact us (see: AUTHORS) and we'll add you.
diff --git a/README b/README
index 764e7d788d..09cad021e5 100644
--- a/README
+++ b/README
@@ -944,6 +944,8 @@ Page Down: Look down
Space: Pause the game
Esc: Skip cutscene
F5: Menu
+Ctrl-o: Load game
+Ctrl-s: Save game
3.18) Simon the Sorcerer games notes:
diff --git a/audio/softsynth/mt32/Analog.cpp b/audio/softsynth/mt32/Analog.cpp
index 31e88561c4..31e88561c4 100755..100644
--- a/audio/softsynth/mt32/Analog.cpp
+++ b/audio/softsynth/mt32/Analog.cpp
diff --git a/audio/softsynth/mt32/Analog.h b/audio/softsynth/mt32/Analog.h
index ee642f280d..ee642f280d 100755..100644
--- a/audio/softsynth/mt32/Analog.h
+++ b/audio/softsynth/mt32/Analog.h
diff --git a/audio/softsynth/mt32/BReverbModel.cpp b/audio/softsynth/mt32/BReverbModel.cpp
index 2be1b418a2..2be1b418a2 100755..100644
--- a/audio/softsynth/mt32/BReverbModel.cpp
+++ b/audio/softsynth/mt32/BReverbModel.cpp
diff --git a/audio/softsynth/mt32/BReverbModel.h b/audio/softsynth/mt32/BReverbModel.h
index 8cfc5da8a3..8cfc5da8a3 100755..100644
--- a/audio/softsynth/mt32/BReverbModel.h
+++ b/audio/softsynth/mt32/BReverbModel.h
diff --git a/audio/softsynth/mt32/Enumerations.h b/audio/softsynth/mt32/Enumerations.h
index 9b0a35d0bf..9b0a35d0bf 100755..100644
--- a/audio/softsynth/mt32/Enumerations.h
+++ b/audio/softsynth/mt32/Enumerations.h
diff --git a/audio/softsynth/mt32/File.cpp b/audio/softsynth/mt32/File.cpp
index 07164823d3..07164823d3 100755..100644
--- a/audio/softsynth/mt32/File.cpp
+++ b/audio/softsynth/mt32/File.cpp
diff --git a/audio/softsynth/mt32/File.h b/audio/softsynth/mt32/File.h
index c9a7d582b4..c9a7d582b4 100755..100644
--- a/audio/softsynth/mt32/File.h
+++ b/audio/softsynth/mt32/File.h
diff --git a/audio/softsynth/mt32/FileStream.cpp b/audio/softsynth/mt32/FileStream.cpp
index 768c5fcdab..768c5fcdab 100755..100644
--- a/audio/softsynth/mt32/FileStream.cpp
+++ b/audio/softsynth/mt32/FileStream.cpp
diff --git a/audio/softsynth/mt32/FileStream.h b/audio/softsynth/mt32/FileStream.h
index 2de6e801ff..2de6e801ff 100755..100644
--- a/audio/softsynth/mt32/FileStream.h
+++ b/audio/softsynth/mt32/FileStream.h
diff --git a/audio/softsynth/mt32/LA32FloatWaveGenerator.cpp b/audio/softsynth/mt32/LA32FloatWaveGenerator.cpp
index 824204e81b..824204e81b 100755..100644
--- a/audio/softsynth/mt32/LA32FloatWaveGenerator.cpp
+++ b/audio/softsynth/mt32/LA32FloatWaveGenerator.cpp
diff --git a/audio/softsynth/mt32/LA32FloatWaveGenerator.h b/audio/softsynth/mt32/LA32FloatWaveGenerator.h
index 89b6fe479a..89b6fe479a 100755..100644
--- a/audio/softsynth/mt32/LA32FloatWaveGenerator.h
+++ b/audio/softsynth/mt32/LA32FloatWaveGenerator.h
diff --git a/audio/softsynth/mt32/LA32Ramp.cpp b/audio/softsynth/mt32/LA32Ramp.cpp
index a4da4f57a8..a4da4f57a8 100755..100644
--- a/audio/softsynth/mt32/LA32Ramp.cpp
+++ b/audio/softsynth/mt32/LA32Ramp.cpp
diff --git a/audio/softsynth/mt32/LA32Ramp.h b/audio/softsynth/mt32/LA32Ramp.h
index 5e4ddf720e..5e4ddf720e 100755..100644
--- a/audio/softsynth/mt32/LA32Ramp.h
+++ b/audio/softsynth/mt32/LA32Ramp.h
diff --git a/audio/softsynth/mt32/LA32WaveGenerator.cpp b/audio/softsynth/mt32/LA32WaveGenerator.cpp
index a9c425beac..a9c425beac 100755..100644
--- a/audio/softsynth/mt32/LA32WaveGenerator.cpp
+++ b/audio/softsynth/mt32/LA32WaveGenerator.cpp
diff --git a/audio/softsynth/mt32/LA32WaveGenerator.h b/audio/softsynth/mt32/LA32WaveGenerator.h
index 6a40e44c98..6a40e44c98 100755..100644
--- a/audio/softsynth/mt32/LA32WaveGenerator.h
+++ b/audio/softsynth/mt32/LA32WaveGenerator.h
diff --git a/audio/softsynth/mt32/MemoryRegion.h b/audio/softsynth/mt32/MemoryRegion.h
index f8d7da18f8..f8d7da18f8 100755..100644
--- a/audio/softsynth/mt32/MemoryRegion.h
+++ b/audio/softsynth/mt32/MemoryRegion.h
diff --git a/audio/softsynth/mt32/MidiEventQueue.h b/audio/softsynth/mt32/MidiEventQueue.h
index 1a5ff0ad33..1a5ff0ad33 100755..100644
--- a/audio/softsynth/mt32/MidiEventQueue.h
+++ b/audio/softsynth/mt32/MidiEventQueue.h
diff --git a/audio/softsynth/mt32/MidiStreamParser.cpp b/audio/softsynth/mt32/MidiStreamParser.cpp
index f9ead3369c..f9ead3369c 100755..100644
--- a/audio/softsynth/mt32/MidiStreamParser.cpp
+++ b/audio/softsynth/mt32/MidiStreamParser.cpp
diff --git a/audio/softsynth/mt32/MidiStreamParser.h b/audio/softsynth/mt32/MidiStreamParser.h
index bd31b77c89..bd31b77c89 100755..100644
--- a/audio/softsynth/mt32/MidiStreamParser.h
+++ b/audio/softsynth/mt32/MidiStreamParser.h
diff --git a/audio/softsynth/mt32/Part.cpp b/audio/softsynth/mt32/Part.cpp
index 9b5119ee8b..9b5119ee8b 100755..100644
--- a/audio/softsynth/mt32/Part.cpp
+++ b/audio/softsynth/mt32/Part.cpp
diff --git a/audio/softsynth/mt32/Part.h b/audio/softsynth/mt32/Part.h
index f5171589d6..f5171589d6 100755..100644
--- a/audio/softsynth/mt32/Part.h
+++ b/audio/softsynth/mt32/Part.h
diff --git a/audio/softsynth/mt32/Partial.cpp b/audio/softsynth/mt32/Partial.cpp
index 6afef364df..6afef364df 100755..100644
--- a/audio/softsynth/mt32/Partial.cpp
+++ b/audio/softsynth/mt32/Partial.cpp
diff --git a/audio/softsynth/mt32/Partial.h b/audio/softsynth/mt32/Partial.h
index 187665de51..187665de51 100755..100644
--- a/audio/softsynth/mt32/Partial.h
+++ b/audio/softsynth/mt32/Partial.h
diff --git a/audio/softsynth/mt32/PartialManager.cpp b/audio/softsynth/mt32/PartialManager.cpp
index 7c702f7582..7c702f7582 100755..100644
--- a/audio/softsynth/mt32/PartialManager.cpp
+++ b/audio/softsynth/mt32/PartialManager.cpp
diff --git a/audio/softsynth/mt32/PartialManager.h b/audio/softsynth/mt32/PartialManager.h
index b2908a5c21..b2908a5c21 100755..100644
--- a/audio/softsynth/mt32/PartialManager.h
+++ b/audio/softsynth/mt32/PartialManager.h
diff --git a/audio/softsynth/mt32/Poly.cpp b/audio/softsynth/mt32/Poly.cpp
index 9a3948cf11..9a3948cf11 100755..100644
--- a/audio/softsynth/mt32/Poly.cpp
+++ b/audio/softsynth/mt32/Poly.cpp
diff --git a/audio/softsynth/mt32/Poly.h b/audio/softsynth/mt32/Poly.h
index 4b283231c8..4b283231c8 100755..100644
--- a/audio/softsynth/mt32/Poly.h
+++ b/audio/softsynth/mt32/Poly.h
diff --git a/audio/softsynth/mt32/ROMInfo.cpp b/audio/softsynth/mt32/ROMInfo.cpp
index ce78e693aa..ce78e693aa 100755..100644
--- a/audio/softsynth/mt32/ROMInfo.cpp
+++ b/audio/softsynth/mt32/ROMInfo.cpp
diff --git a/audio/softsynth/mt32/ROMInfo.h b/audio/softsynth/mt32/ROMInfo.h
index 8a5ad141b6..8a5ad141b6 100755..100644
--- a/audio/softsynth/mt32/ROMInfo.h
+++ b/audio/softsynth/mt32/ROMInfo.h
diff --git a/audio/softsynth/mt32/Structures.h b/audio/softsynth/mt32/Structures.h
index 6dcb9c86a9..6dcb9c86a9 100755..100644
--- a/audio/softsynth/mt32/Structures.h
+++ b/audio/softsynth/mt32/Structures.h
diff --git a/audio/softsynth/mt32/Synth.cpp b/audio/softsynth/mt32/Synth.cpp
index 3a478b5b62..3a478b5b62 100755..100644
--- a/audio/softsynth/mt32/Synth.cpp
+++ b/audio/softsynth/mt32/Synth.cpp
diff --git a/audio/softsynth/mt32/Synth.h b/audio/softsynth/mt32/Synth.h
index fe31d99f02..fe31d99f02 100755..100644
--- a/audio/softsynth/mt32/Synth.h
+++ b/audio/softsynth/mt32/Synth.h
diff --git a/audio/softsynth/mt32/TVA.cpp b/audio/softsynth/mt32/TVA.cpp
index c20b8b6393..c20b8b6393 100755..100644
--- a/audio/softsynth/mt32/TVA.cpp
+++ b/audio/softsynth/mt32/TVA.cpp
diff --git a/audio/softsynth/mt32/TVA.h b/audio/softsynth/mt32/TVA.h
index f593b4e7d1..f593b4e7d1 100755..100644
--- a/audio/softsynth/mt32/TVA.h
+++ b/audio/softsynth/mt32/TVA.h
diff --git a/audio/softsynth/mt32/TVF.cpp b/audio/softsynth/mt32/TVF.cpp
index b296c34132..b296c34132 100755..100644
--- a/audio/softsynth/mt32/TVF.cpp
+++ b/audio/softsynth/mt32/TVF.cpp
diff --git a/audio/softsynth/mt32/TVF.h b/audio/softsynth/mt32/TVF.h
index 38dcef708c..38dcef708c 100755..100644
--- a/audio/softsynth/mt32/TVF.h
+++ b/audio/softsynth/mt32/TVF.h
diff --git a/audio/softsynth/mt32/TVP.cpp b/audio/softsynth/mt32/TVP.cpp
index dca0003843..dca0003843 100755..100644
--- a/audio/softsynth/mt32/TVP.cpp
+++ b/audio/softsynth/mt32/TVP.cpp
diff --git a/audio/softsynth/mt32/TVP.h b/audio/softsynth/mt32/TVP.h
index be90f0ff08..be90f0ff08 100755..100644
--- a/audio/softsynth/mt32/TVP.h
+++ b/audio/softsynth/mt32/TVP.h
diff --git a/audio/softsynth/mt32/Tables.cpp b/audio/softsynth/mt32/Tables.cpp
index cb3493285a..cb3493285a 100755..100644
--- a/audio/softsynth/mt32/Tables.cpp
+++ b/audio/softsynth/mt32/Tables.cpp
diff --git a/audio/softsynth/mt32/Tables.h b/audio/softsynth/mt32/Tables.h
index 249e32919a..249e32919a 100755..100644
--- a/audio/softsynth/mt32/Tables.h
+++ b/audio/softsynth/mt32/Tables.h
diff --git a/audio/softsynth/mt32/Types.h b/audio/softsynth/mt32/Types.h
index f90dce19a4..f90dce19a4 100755..100644
--- a/audio/softsynth/mt32/Types.h
+++ b/audio/softsynth/mt32/Types.h
diff --git a/audio/softsynth/mt32/c_interface/c_interface.cpp b/audio/softsynth/mt32/c_interface/c_interface.cpp
index 6ae252bea5..6ae252bea5 100755..100644
--- a/audio/softsynth/mt32/c_interface/c_interface.cpp
+++ b/audio/softsynth/mt32/c_interface/c_interface.cpp
diff --git a/audio/softsynth/mt32/c_interface/c_interface.h b/audio/softsynth/mt32/c_interface/c_interface.h
index a2bdcb1254..a2bdcb1254 100755..100644
--- a/audio/softsynth/mt32/c_interface/c_interface.h
+++ b/audio/softsynth/mt32/c_interface/c_interface.h
diff --git a/audio/softsynth/mt32/c_interface/c_types.h b/audio/softsynth/mt32/c_interface/c_types.h
index 3cd8744235..3cd8744235 100755..100644
--- a/audio/softsynth/mt32/c_interface/c_types.h
+++ b/audio/softsynth/mt32/c_interface/c_types.h
diff --git a/audio/softsynth/mt32/c_interface/cpp_interface.h b/audio/softsynth/mt32/c_interface/cpp_interface.h
index 3e86322faa..3e86322faa 100755..100644
--- a/audio/softsynth/mt32/c_interface/cpp_interface.h
+++ b/audio/softsynth/mt32/c_interface/cpp_interface.h
diff --git a/audio/softsynth/mt32/globals.h b/audio/softsynth/mt32/globals.h
index 49a5ecc250..49a5ecc250 100755..100644
--- a/audio/softsynth/mt32/globals.h
+++ b/audio/softsynth/mt32/globals.h
diff --git a/audio/softsynth/mt32/internals.h b/audio/softsynth/mt32/internals.h
index c64ba39212..c64ba39212 100755..100644
--- a/audio/softsynth/mt32/internals.h
+++ b/audio/softsynth/mt32/internals.h
diff --git a/audio/softsynth/mt32/mmath.h b/audio/softsynth/mt32/mmath.h
index f233bedcbb..f233bedcbb 100755..100644
--- a/audio/softsynth/mt32/mmath.h
+++ b/audio/softsynth/mt32/mmath.h
diff --git a/audio/softsynth/mt32/mt32emu.h b/audio/softsynth/mt32/mt32emu.h
index 3f3b6af344..3f3b6af344 100755..100644
--- a/audio/softsynth/mt32/mt32emu.h
+++ b/audio/softsynth/mt32/mt32emu.h
diff --git a/audio/softsynth/mt32/sha1/sha1.cpp b/audio/softsynth/mt32/sha1/sha1.cpp
index 9b91cd9f29..9b91cd9f29 100755..100644
--- a/audio/softsynth/mt32/sha1/sha1.cpp
+++ b/audio/softsynth/mt32/sha1/sha1.cpp
diff --git a/audio/softsynth/mt32/sha1/sha1.h b/audio/softsynth/mt32/sha1/sha1.h
index 96d8ce4da6..96d8ce4da6 100755..100644
--- a/audio/softsynth/mt32/sha1/sha1.h
+++ b/audio/softsynth/mt32/sha1/sha1.h
diff --git a/backends/events/ps3sdl/ps3sdl-events.cpp b/backends/events/ps3sdl/ps3sdl-events.cpp
index 01cdc2f0f6..2aa2adbac6 100644
--- a/backends/events/ps3sdl/ps3sdl-events.cpp
+++ b/backends/events/ps3sdl/ps3sdl-events.cpp
@@ -31,128 +31,34 @@
#include "common/util.h"
#include "common/events.h"
-enum {
- BTN_LEFT = 0,
- BTN_DOWN = 1,
- BTN_RIGHT = 2,
- BTN_UP = 3,
-
- BTN_START = 4,
- BTN_R3 = 5,
- BTN_L3 = 6,
- BTN_SELECT = 7,
-
- BTN_SQUARE = 8,
- BTN_CROSS = 9,
- BTN_CIRCLE = 10,
- BTN_TRIANGLE = 11,
-
- BTN_R1 = 12,
- BTN_L1 = 13,
- BTN_R2 = 14,
- BTN_L2 = 15
-};
-
-bool PS3SdlEventSource::handleJoyButtonDown(SDL_Event &ev, Common::Event &event) {
-
- event.kbd.flags = 0;
-
- switch (ev.jbutton.button) {
- case BTN_CROSS: // Left mouse button
- event.type = Common::EVENT_LBUTTONDOWN;
- processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER);
- break;
- case BTN_CIRCLE: // Right mouse button
- event.type = Common::EVENT_RBUTTONDOWN;
- processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER);
- break;
- case BTN_TRIANGLE: // Game menu
- event.type = Common::EVENT_KEYDOWN;
- event.kbd.keycode = Common::KEYCODE_F5;
- event.kbd.ascii = mapKey(SDLK_F5, (SDLMod) ev.key.keysym.mod, 0);
- break;
- case BTN_SELECT: // Virtual keyboard
-#ifdef ENABLE_VKEYBD
- event.type = Common::EVENT_VIRTUAL_KEYBOARD;
-#endif
- break;
- case BTN_SQUARE: // Escape
- event.type = Common::EVENT_KEYDOWN;
- event.kbd.keycode = Common::KEYCODE_ESCAPE;
- event.kbd.ascii = mapKey(SDLK_ESCAPE, (SDLMod) ev.key.keysym.mod, 0);
- break;
- case BTN_L1: // Predictive input dialog
- event.type = Common::EVENT_PREDICTIVE_DIALOG;
- break;
- case BTN_START: // ScummVM in game menu
- event.type = Common::EVENT_MAINMENU;
- break;
- }
- return true;
-}
-
-bool PS3SdlEventSource::handleJoyButtonUp(SDL_Event &ev, Common::Event &event) {
-
- event.kbd.flags = 0;
-
- switch (ev.jbutton.button) {
- case BTN_CROSS: // Left mouse button
- event.type = Common::EVENT_LBUTTONUP;
- processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER);
- break;
- case BTN_CIRCLE: // Right mouse button
- event.type = Common::EVENT_RBUTTONUP;
- processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER);
- break;
- case BTN_TRIANGLE: // Game menu
- event.type = Common::EVENT_KEYUP;
- event.kbd.keycode = Common::KEYCODE_F5;
- event.kbd.ascii = mapKey(SDLK_F5, (SDLMod) ev.key.keysym.mod, 0);
- break;
- case BTN_SELECT: // Virtual keyboard
- // Handled in key down
- break;
- case BTN_SQUARE: // Escape
- event.type = Common::EVENT_KEYUP;
- event.kbd.keycode = Common::KEYCODE_ESCAPE;
- event.kbd.ascii = mapKey(SDLK_ESCAPE, (SDLMod) ev.key.keysym.mod, 0);
- break;
- }
- return true;
-}
-
/**
* The XMB (PS3 in game menu) needs the screen buffers to be constantly flip while open.
* This pauses execution and keeps redrawing the screen until the XMB is closed.
*/
void PS3SdlEventSource::preprocessEvents(SDL_Event *event) {
- if (event->type == SDL_WINDOWEVENT) {
- if (event->window.event == SDL_WINDOWEVENT_LEAVE) {
- // XMB opened
- if (g_engine)
- g_engine->pauseEngine(true);
-
- for (;;) {
- if (!SDL_PollEvent(event)) {
- // Locking the screen forces a full redraw
- Graphics::Surface* screen = g_system->lockScreen();
- if (screen) {
- g_system->unlockScreen();
- g_system->updateScreen();
- }
- SDL_Delay(10);
- continue;
- }
- if (event->type == SDL_QUIT)
- return;
- if (event->type != SDL_WINDOWEVENT)
- continue;
- if (event->window.event == SDL_WINDOWEVENT_ENTER) {
- // XMB closed
- if (g_engine)
- g_engine->pauseEngine(false);
- return;
+ if (event->type == SDL_APP_DIDENTERBACKGROUND) {
+ // XMB opened
+ if (g_engine)
+ g_engine->pauseEngine(true);
+
+ for (;;) {
+ if (!SDL_PollEvent(event)) {
+ // Locking the screen forces a full redraw
+ Graphics::Surface* screen = g_system->lockScreen();
+ if (screen) {
+ g_system->unlockScreen();
+ g_system->updateScreen();
}
+ SDL_Delay(10);
+ continue;
+ }
+ if (event->type == SDL_QUIT)
+ return;
+ if (event->type == SDL_APP_DIDENTERFOREGROUND) {
+ // XMB closed
+ if (g_engine)
+ g_engine->pauseEngine(false);
+ return;
}
}
}
diff --git a/backends/events/ps3sdl/ps3sdl-events.h b/backends/events/ps3sdl/ps3sdl-events.h
index d28ce7fcf8..340af49102 100644
--- a/backends/events/ps3sdl/ps3sdl-events.h
+++ b/backends/events/ps3sdl/ps3sdl-events.h
@@ -31,8 +31,6 @@
class PS3SdlEventSource : public SdlEventSource {
protected:
void preprocessEvents(SDL_Event *event);
- bool handleJoyButtonDown(SDL_Event &ev, Common::Event &event);
- bool handleJoyButtonUp(SDL_Event &ev, Common::Event &event);
};
#endif /* BACKEND_EVENTS_PS3_H */
diff --git a/backends/events/psp2sdl/psp2sdl-events.cpp b/backends/events/psp2sdl/psp2sdl-events.cpp
index e58e49d9a8..4ea528b00f 100644
--- a/backends/events/psp2sdl/psp2sdl-events.cpp
+++ b/backends/events/psp2sdl/psp2sdl-events.cpp
@@ -36,283 +36,6 @@
#include "math.h"
-#define JOY_DEADZONE 2000
-#define JOY_ANALOG
-#define JOY_XAXIS 0
-#define JOY_YAXIS 1
-#define JOY_XAXISR 2
-#define JOY_YAXISR 3
-
-enum {
- BTN_LEFT = 7,
- BTN_DOWN = 6,
- BTN_RIGHT = 9,
- BTN_UP = 8,
-
- BTN_START = 11,
- BTN_SELECT = 10,
-
- BTN_SQUARE = 3,
- BTN_CROSS = 2,
- BTN_CIRCLE = 1,
- BTN_TRIANGLE = 0,
-
- BTN_R1 = 5,
- BTN_L1 = 4
-};
-
-bool PSP2EventSource::handleJoyButtonDown(SDL_Event &ev, Common::Event &event) {
-
- event.kbd.flags = 0;
-
- switch (ev.jbutton.button) {
-// Dpad
- case BTN_LEFT: // Left (+R_trigger: Up+Left)
- if (!_km.modifier) {
- event.type = Common::EVENT_KEYDOWN;
- event.kbd.keycode = Common::KEYCODE_KP4;
- event.kbd.ascii = mapKey(SDLK_KP4, (SDLMod) ev.key.keysym.mod, 0);
- } else {
- event.type = Common::EVENT_KEYDOWN;
- event.kbd.keycode = Common::KEYCODE_KP7;
- event.kbd.ascii = mapKey(SDLK_KP7, (SDLMod) ev.key.keysym.mod, 0);
- }
- break;
- case BTN_RIGHT: // Right (+R_trigger: Down+Right)
- if (!_km.modifier) {
- event.type = Common::EVENT_KEYDOWN;
- event.kbd.keycode = Common::KEYCODE_KP6;
- event.kbd.ascii = mapKey(SDLK_KP6, (SDLMod) ev.key.keysym.mod, 0);
- } else {
- event.type = Common::EVENT_KEYDOWN;
- event.kbd.keycode = Common::KEYCODE_KP3;
- event.kbd.ascii = mapKey(SDLK_KP3, (SDLMod) ev.key.keysym.mod, 0);
- }
- break;
- case BTN_UP: // Up (+R_trigger: Up+Right)
- if (!_km.modifier) {
- event.type = Common::EVENT_KEYDOWN;
- event.kbd.keycode = Common::KEYCODE_KP8;
- event.kbd.ascii = mapKey(SDLK_KP8, (SDLMod) ev.key.keysym.mod, 0);
- } else {
- event.type = Common::EVENT_KEYDOWN;
- event.kbd.keycode = Common::KEYCODE_KP9;
- event.kbd.ascii = mapKey(SDLK_KP9, (SDLMod) ev.key.keysym.mod, 0);
- }
- break;
- case BTN_DOWN: // Down (+R_trigger: Down+Left)
- if (!_km.modifier) {
- event.type = Common::EVENT_KEYDOWN;
- event.kbd.keycode = Common::KEYCODE_KP2;
- event.kbd.ascii = mapKey(SDLK_KP2, (SDLMod) ev.key.keysym.mod, 0);
- } else {
- event.type = Common::EVENT_KEYDOWN;
- event.kbd.keycode = Common::KEYCODE_KP1;
- event.kbd.ascii = mapKey(SDLK_KP1, (SDLMod) ev.key.keysym.mod, 0);
- }
- break;
-// Buttons
- case BTN_CROSS: // Left mouse button
- event.type = Common::EVENT_LBUTTONDOWN;
- processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER);
- break;
- case BTN_CIRCLE: // Right mouse button
- event.type = Common::EVENT_RBUTTONDOWN;
- processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER);
- break;
- case BTN_TRIANGLE: // Escape (+R_trigger: Return)
- if (!_km.modifier) {
- event.type = Common::EVENT_KEYDOWN;
- event.kbd.keycode = Common::KEYCODE_ESCAPE;
- event.kbd.ascii = mapKey(SDLK_ESCAPE, (SDLMod) ev.key.keysym.mod, 0);
- } else {
- event.type = Common::EVENT_KEYDOWN;
- event.kbd.keycode = Common::KEYCODE_RETURN;
- event.kbd.ascii = mapKey(SDLK_RETURN, (SDLMod) ev.key.keysym.mod, 0);
- }
- break;
- case BTN_SQUARE: // Period (+R_trigger: Space)
- if (!_km.modifier) {
- event.type = Common::EVENT_KEYDOWN;
- event.kbd.keycode = Common::KEYCODE_PERIOD;
- event.kbd.ascii = mapKey(SDLK_PERIOD, (SDLMod) ev.key.keysym.mod, 0);
- } else {
- event.type = Common::EVENT_KEYDOWN;
- event.kbd.keycode = Common::KEYCODE_SPACE;
- event.kbd.ascii = mapKey(SDLK_SPACE, (SDLMod) ev.key.keysym.mod, 0);
- }
- break;
- case BTN_L1: // Game menu
- event.type = Common::EVENT_KEYDOWN;
- event.kbd.keycode = Common::KEYCODE_F5;
- event.kbd.ascii = mapKey(SDLK_F5, (SDLMod) ev.key.keysym.mod, 0);
- break;
- case BTN_R1: // Modifier + Shift
- _km.modifier=true; // slow mouse
- event.type = Common::EVENT_KEYDOWN;
- event.kbd.keycode = Common::KEYCODE_INVALID;
- event.kbd.ascii = 0;
- event.kbd.flags = Common::KBD_SHIFT;
- break;
- case BTN_START: // ScummVM in game menu
- event.type = Common::EVENT_MAINMENU;
- break;
- case BTN_SELECT: // Virtual keyboard (+R_trigger: Predictive Input Dialog)
- if (!_km.modifier) {
-#ifdef ENABLE_VKEYBD
- event.type = Common::EVENT_VIRTUAL_KEYBOARD;
-#endif
- } else {
- event.type = Common::EVENT_PREDICTIVE_DIALOG;
- }
- break;
- }
- return true;
-}
-
-bool PSP2EventSource::handleJoyButtonUp(SDL_Event &ev, Common::Event &event) {
-
- event.kbd.flags = 0;
-
- switch (ev.jbutton.button) {
-// Dpad
- case BTN_LEFT: // Left (+R_trigger: Up+Left)
- if (!_km.modifier) {
- event.type = Common::EVENT_KEYUP;
- event.kbd.keycode = Common::KEYCODE_KP4;
- event.kbd.ascii = mapKey(SDLK_KP4, (SDLMod) ev.key.keysym.mod, 0);
- } else {
- event.type = Common::EVENT_KEYUP;
- event.kbd.keycode = Common::KEYCODE_KP7;
- event.kbd.ascii = mapKey(SDLK_KP7, (SDLMod) ev.key.keysym.mod, 0);
- }
- break;
- case BTN_RIGHT: // Right (+R_trigger: Down+Right)
- if (!_km.modifier) {
- event.type = Common::EVENT_KEYUP;
- event.kbd.keycode = Common::KEYCODE_KP6;
- event.kbd.ascii = mapKey(SDLK_KP6, (SDLMod) ev.key.keysym.mod, 0);
- } else {
- event.type = Common::EVENT_KEYUP;
- event.kbd.keycode = Common::KEYCODE_KP3;
- event.kbd.ascii = mapKey(SDLK_KP3, (SDLMod) ev.key.keysym.mod, 0);
- }
- break;
- case BTN_UP: // Up (+R_trigger: Up+Right)
- if (!_km.modifier) {
- event.type = Common::EVENT_KEYUP;
- event.kbd.keycode = Common::KEYCODE_KP8;
- event.kbd.ascii = mapKey(SDLK_KP8, (SDLMod) ev.key.keysym.mod, 0);
- } else {
- event.type = Common::EVENT_KEYUP;
- event.kbd.keycode = Common::KEYCODE_KP9;
- event.kbd.ascii = mapKey(SDLK_KP9, (SDLMod) ev.key.keysym.mod, 0);
- }
- break;
- case BTN_DOWN: // Down (+R_trigger: Down+Left)
- if (!_km.modifier) {
- event.type = Common::EVENT_KEYUP;
- event.kbd.keycode = Common::KEYCODE_KP2;
- event.kbd.ascii = mapKey(SDLK_KP2, (SDLMod) ev.key.keysym.mod, 0);
- } else {
- event.type = Common::EVENT_KEYUP;
- event.kbd.keycode = Common::KEYCODE_KP1;
- event.kbd.ascii = mapKey(SDLK_KP1, (SDLMod) ev.key.keysym.mod, 0);
- }
- break;
-// Buttons
- case BTN_CROSS: // Left mouse button
- event.type = Common::EVENT_LBUTTONUP;
- processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER);
- break;
- case BTN_CIRCLE: // Right mouse button
- event.type = Common::EVENT_RBUTTONUP;
- processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER);
- break;
- case BTN_TRIANGLE: // Escape (+R_trigger: Return)
- if (!_km.modifier) {
- event.type = Common::EVENT_KEYUP;
- event.kbd.keycode = Common::KEYCODE_ESCAPE;
- event.kbd.ascii = mapKey(SDLK_ESCAPE, (SDLMod) ev.key.keysym.mod, 0);
- } else {
- event.type = Common::EVENT_KEYUP;
- event.kbd.keycode = Common::KEYCODE_RETURN;
- event.kbd.ascii = mapKey(SDLK_RETURN, (SDLMod) ev.key.keysym.mod, 0);
- }
- break;
- case BTN_SQUARE: // Period (+R_trigger: Space)
- if (!_km.modifier) {
- event.type = Common::EVENT_KEYUP;
- event.kbd.keycode = Common::KEYCODE_PERIOD;
- event.kbd.ascii = mapKey(SDLK_PERIOD, (SDLMod) ev.key.keysym.mod, 0);
- } else {
- event.type = Common::EVENT_KEYUP;
- event.kbd.keycode = Common::KEYCODE_SPACE;
- event.kbd.ascii = mapKey(SDLK_SPACE, (SDLMod) ev.key.keysym.mod, 0);
- }
- break;
- case BTN_L1: // Game menu
- event.type = Common::EVENT_KEYUP;
- event.kbd.keycode = Common::KEYCODE_F5;
- event.kbd.ascii = mapKey(SDLK_F5, (SDLMod) ev.key.keysym.mod, 0);
- break;
- case BTN_R1: // Modifier + SHIFT Key
- _km.modifier = false; // slow mouse
- event.type = Common::EVENT_KEYUP;
- event.kbd.keycode = Common::KEYCODE_INVALID;
- event.kbd.ascii = 0;
- event.kbd.flags = 0;
- break;
- case BTN_START: // ScummVM in game menu
- // Handled in key down
- break;
- case BTN_SELECT: // Virtual keyboard (+R_trigger: Predictive Input Dialog)
- // Handled in key down
- break;
- }
- return true;
-}
-
-bool PSP2EventSource::handleJoyAxisMotion(SDL_Event &ev, Common::Event &event) {
-
- int axis = ev.jaxis.value;
-
- // conversion factor between keyboard mouse and joy axis value
- int vel_to_axis = (1500 / MULTIPLIER);
-
- if (ev.jaxis.axis == JOY_XAXIS) {
- _km.joy_x = axis;
- } else if (ev.jaxis.axis == JOY_YAXIS) {
- axis = -axis;
- _km.joy_y = -axis;
- }
-
- // radial and scaled deadzone
-
- float analogX = (float)_km.joy_x;
- float analogY = (float)_km.joy_y;
- float deadZone = (float)JOY_DEADZONE;
- if (g_system->hasFeature(OSystem::kFeatureJoystickDeadzone))
- deadZone = (float)ConfMan.getInt("joystick_deadzone") * 1000.0f;
- float scalingFactor = 1.0f;
- float magnitude = 0.0f;
-
- magnitude = sqrt(analogX * analogX + analogY * analogY);
-
- if (magnitude >= deadZone) {
- _km.x_down_count = 0;
- _km.y_down_count = 0;
- scalingFactor = 1.0f / magnitude * (magnitude - deadZone) / (32769.0f - deadZone);
- _km.x_vel = (int16)(analogX * scalingFactor * 32768.0f / (float) vel_to_axis);
- _km.y_vel = (int16)(analogY * scalingFactor * 32768.0f / (float) vel_to_axis);
- } else {
- _km.x_vel = 0;
- _km.y_vel = 0;
- }
-
- return false;
-}
-
void PSP2EventSource::preprocessEvents(SDL_Event *event) {
// prevent suspend (scummvm games contains a lot of cutscenes..)
diff --git a/backends/events/psp2sdl/psp2sdl-events.h b/backends/events/psp2sdl/psp2sdl-events.h
index 001312e1d5..5593e8a504 100644
--- a/backends/events/psp2sdl/psp2sdl-events.h
+++ b/backends/events/psp2sdl/psp2sdl-events.h
@@ -30,9 +30,6 @@
*/
class PSP2EventSource : public SdlEventSource {
protected:
- bool handleJoyButtonDown(SDL_Event &ev, Common::Event &event);
- bool handleJoyButtonUp(SDL_Event &ev, Common::Event &event);
- bool handleJoyAxisMotion(SDL_Event &ev, Common::Event &event);
void preprocessEvents(SDL_Event *event);
};
diff --git a/backends/events/sdl/sdl-events.cpp b/backends/events/sdl/sdl-events.cpp
index 48854437ad..a3dee67f22 100644
--- a/backends/events/sdl/sdl-events.cpp
+++ b/backends/events/sdl/sdl-events.cpp
@@ -30,17 +30,8 @@
#include "common/config-manager.h"
#include "common/textconsole.h"
-#ifdef JOY_ANALOG
-#include "math.h"
-#endif
-
// FIXME move joystick defines out and replace with confile file options
// we should really allow users to map any key to a joystick button
-#define JOY_DEADZONE 3200
-
-#ifndef __SYMBIAN32__ // Symbian wants dialog joystick i.e cursor for movement/selection
- #define JOY_ANALOG
-#endif
// #define JOY_INVERT_Y
#define JOY_XAXIS 0
@@ -77,7 +68,7 @@ static uint32 convUTF8ToUTF32(const char *src) {
SdlEventSource::SdlEventSource()
: EventSource(), _scrollLock(false), _joystick(0), _lastScreenID(0), _graphicsManager(0), _queuedFakeMouseMove(false)
#if SDL_VERSION_ATLEAST(2, 0, 0)
- , _queuedFakeKeyUp(false), _fakeKeyUp()
+ , _queuedFakeKeyUp(false), _fakeKeyUp(), _controller(nullptr)
#endif
{
// Reset mouse state
@@ -90,25 +81,18 @@ SdlEventSource::SdlEventSource()
error("Could not initialize SDL: %s", SDL_GetError());
}
- // Enable joystick
- if (SDL_NumJoysticks() > joystick_num) {
- _joystick = SDL_JoystickOpen(joystick_num);
- debug("Using joystick: %s",
#if SDL_VERSION_ATLEAST(2, 0, 0)
- SDL_JoystickName(_joystick)
-#else
- SDL_JoystickName(joystick_num)
-#endif
- );
- } else {
- warning("Invalid joystick: %d", joystick_num);
+ if (SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER) == -1) {
+ error("Could not initialize SDL: %s", SDL_GetError());
}
+#endif
+
+ openJoystick(joystick_num);
}
}
SdlEventSource::~SdlEventSource() {
- if (_joystick)
- SDL_JoystickClose(_joystick);
+ closeJoystick();
}
int SdlEventSource::mapKey(SDLKey sdlKey, SDLMod mod, Uint16 unicode) {
@@ -534,12 +518,6 @@ bool SdlEventSource::dispatchSDLEvent(SDL_Event &ev, Common::Event &event) {
return handleMouseButtonDown(ev, event);
case SDL_MOUSEBUTTONUP:
return handleMouseButtonUp(ev, event);
- case SDL_JOYBUTTONDOWN:
- return handleJoyButtonDown(ev, event);
- case SDL_JOYBUTTONUP:
- return handleJoyButtonUp(ev, event);
- case SDL_JOYAXISMOTION:
- return handleJoyAxisMotion(ev, event);
#if SDL_VERSION_ATLEAST(2, 0, 0)
case SDL_MOUSEWHEEL: {
@@ -607,6 +585,12 @@ bool SdlEventSource::dispatchSDLEvent(SDL_Event &ev, Common::Event &event) {
default:
return false;
}
+
+ case SDL_JOYDEVICEADDED:
+ return handleJoystickAdded(ev.jdevice);
+
+ case SDL_JOYDEVICEREMOVED:
+ return handleJoystickRemoved(ev.jdevice);
#else
case SDL_VIDEOEXPOSE:
if (_graphicsManager)
@@ -623,6 +607,30 @@ bool SdlEventSource::dispatchSDLEvent(SDL_Event &ev, Common::Event &event) {
}
+ if (_joystick) {
+ switch (ev.type) {
+ case SDL_JOYBUTTONDOWN:
+ return handleJoyButtonDown(ev, event);
+ case SDL_JOYBUTTONUP:
+ return handleJoyButtonUp(ev, event);
+ case SDL_JOYAXISMOTION:
+ return handleJoyAxisMotion(ev, event);
+ }
+ }
+
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+ if (_controller) {
+ switch (ev.type) {
+ case SDL_CONTROLLERBUTTONDOWN:
+ return handleControllerButton(ev, event, false);
+ case SDL_CONTROLLERBUTTONUP:
+ return handleControllerButton(ev, event, true);
+ case SDL_CONTROLLERAXISMOTION:
+ return handleControllerAxisMotion(ev, event);
+ }
+ }
+#endif
+
return false;
}
@@ -797,6 +805,42 @@ bool SdlEventSource::handleMouseButtonUp(SDL_Event &ev, Common::Event &event) {
return processMouseEvent(event, ev.button.x, ev.button.y);
}
+void SdlEventSource::openJoystick(int joystickIndex) {
+ if (SDL_NumJoysticks() > joystickIndex) {
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+ if (SDL_IsGameController(joystickIndex)) {
+ _controller = SDL_GameControllerOpen(joystickIndex);
+ debug("Using game controller: %s", SDL_GameControllerName(_controller));
+ } else
+#endif
+ {
+ _joystick = SDL_JoystickOpen(joystickIndex);
+ debug("Using joystick: %s",
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+ SDL_JoystickName(_joystick)
+#else
+ SDL_JoystickName(joystickIndex)
+#endif
+ );
+ }
+ } else {
+ warning("Invalid joystick: %d", joystickIndex);
+ }
+}
+
+void SdlEventSource::closeJoystick() {
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+ if (_controller) {
+ SDL_GameControllerClose(_controller);
+ _controller = nullptr;
+ }
+#endif
+ if (_joystick) {
+ SDL_JoystickClose(_joystick);
+ _joystick = nullptr;
+ }
+}
+
bool SdlEventSource::handleJoyButtonDown(SDL_Event &ev, Common::Event &event) {
if (ev.jbutton.button == JOY_BUT_LMOUSE) {
event.type = Common::EVENT_LBUTTONDOWN;
@@ -860,71 +904,184 @@ bool SdlEventSource::handleJoyButtonUp(SDL_Event &ev, Common::Event &event) {
}
bool SdlEventSource::handleJoyAxisMotion(SDL_Event &ev, Common::Event &event) {
+ if (ev.jaxis.axis == JOY_XAXIS) {
+ _km.joy_x = ev.jaxis.value;
+ return handleAxisToMouseMotion(_km.joy_x, _km.joy_y);
+ } else if (ev.jaxis.axis == JOY_YAXIS) {
+ _km.joy_y = ev.jaxis.value;
+ return handleAxisToMouseMotion(_km.joy_x, _km.joy_y);
+ }
- int axis = ev.jaxis.value;
-#ifdef JOY_ANALOG
- // conversion factor between keyboard mouse and joy axis value
- int vel_to_axis = (1500 / MULTIPLIER);
+ return false;
+}
+
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+bool SdlEventSource::handleJoystickAdded(const SDL_JoyDeviceEvent &device) {
+ debug(5, "SdlEventSource: Received joystick added event for index '%d'", device.which);
+
+ int joystick_num = ConfMan.getInt("joystick_num");
+ if (joystick_num == device.which) {
+ debug(5, "SdlEventSource: Newly added joystick with index '%d' matches 'joysticky_num', trying to use it", device.which);
+
+ closeJoystick();
+ openJoystick(joystick_num);
+ }
+
+ return false;
+}
+
+bool SdlEventSource::handleJoystickRemoved(const SDL_JoyDeviceEvent &device) {
+ debug(5, "SdlEventSource: Received joystick removed event for instance id '%d'", device.which);
+
+ SDL_Joystick *joystick;
+ if (_controller) {
+ joystick = SDL_GameControllerGetJoystick(_controller);
+ } else {
+ joystick = _joystick;
+ }
+
+ if (!joystick) {
+ return false;
+ }
+
+ if (SDL_JoystickInstanceID(joystick) == device.which) {
+ debug(5, "SdlEventSource: Newly removed joystick with instance id '%d' matches currently used joystick, closing current joystick", device.which);
+
+ closeJoystick();
+ }
+
+ return false;
+}
+
+bool SdlEventSource::handleControllerButton(const SDL_Event &ev, Common::Event &event, bool buttonUp) {
+ using namespace Common;
+
+ struct ControllerEventMapping {
+ EventType normalType;
+ KeyState normalKeystate;
+ EventType modifierType;
+ KeyState modifierKeystate;
+ };
+
+ static const ControllerEventMapping mapping[] = {
+ // SDL_CONTROLLER_BUTTON_A: Left mouse button
+ { EVENT_LBUTTONDOWN, KeyState(), EVENT_LBUTTONDOWN, KeyState() },
+ // SDL_CONTROLLER_BUTTON_B: Right mouse button
+ { EVENT_RBUTTONDOWN, KeyState(), EVENT_RBUTTONDOWN, KeyState() },
+ // SDL_CONTROLLER_BUTTON_X: Period (+R_trigger: Space)
+ { EVENT_KEYDOWN, KeyState(KEYCODE_PERIOD, '.'), EVENT_KEYDOWN, KeyState(KEYCODE_SPACE, ASCII_SPACE) },
+ // SDL_CONTROLLER_BUTTON_Y: Escape (+R_trigger: Return)
+ { EVENT_KEYDOWN, KeyState(KEYCODE_ESCAPE, ASCII_ESCAPE), EVENT_KEYDOWN, KeyState(KEYCODE_RETURN, ASCII_RETURN) },
+ // SDL_CONTROLLER_BUTTON_BACK: Virtual keyboard (+R_trigger: Predictive Input Dialog)
+#ifdef ENABLE_VKEYBD
+ { EVENT_VIRTUAL_KEYBOARD, KeyState(), EVENT_PREDICTIVE_DIALOG, KeyState() },
#else
- if (axis > JOY_DEADZONE) {
- axis -= JOY_DEADZONE;
- } else if (axis < -JOY_DEADZONE) {
- axis += JOY_DEADZONE;
- } else
- axis = 0;
+ { EVENT_INVALID, KeyState(), EVENT_PREDICTIVE_DIALOG, KeyState() },
#endif
+ // SDL_CONTROLLER_BUTTON_GUIDE: Unmapped
+ { EVENT_INVALID, KeyState(), EVENT_INVALID, KeyState() },
+ // SDL_CONTROLLER_BUTTON_START: ScummVM in game menu
+ { EVENT_MAINMENU, KeyState(), EVENT_MAINMENU, KeyState() },
+ // SDL_CONTROLLER_BUTTON_LEFTSTICK: Unmapped
+ { EVENT_INVALID, KeyState(), EVENT_INVALID, KeyState() },
+ // SDL_CONTROLLER_BUTTON_RIGHTSTICK: Unmapped
+ { EVENT_INVALID, KeyState(), EVENT_INVALID, KeyState() },
+ // SDL_CONTROLLER_BUTTON_LEFTSHOULDER: Game menu
+ { EVENT_KEYDOWN, KeyState(KEYCODE_F5, ASCII_F5), EVENT_KEYDOWN, KeyState(KEYCODE_F5, ASCII_F5) },
+ // SDL_CONTROLLER_BUTTON_RIGHTSHOULDER: Modifier + Shift
+ { EVENT_KEYDOWN, KeyState(KEYCODE_INVALID, 0, KBD_SHIFT), EVENT_KEYDOWN, KeyState(KEYCODE_INVALID, 0, 0) },
+ // SDL_CONTROLLER_BUTTON_DPAD_UP: Up (+R_trigger: Up+Right)
+ { EVENT_KEYDOWN, KeyState(KEYCODE_KP8, 0), EVENT_KEYDOWN, KeyState(KEYCODE_KP9, 0) },
+ // SDL_CONTROLLER_BUTTON_DPAD_DOWN: Down (+R_trigger: Down+Left)
+ { EVENT_KEYDOWN, KeyState(KEYCODE_KP2, 0), EVENT_KEYDOWN, KeyState(KEYCODE_KP1, 0) },
+ // SDL_CONTROLLER_BUTTON_DPAD_LEFT: Left (+R_trigger: Up+Left)
+ { EVENT_KEYDOWN, KeyState(KEYCODE_KP4, 0), EVENT_KEYDOWN, KeyState(KEYCODE_KP7, 0) },
+ // SDL_CONTROLLER_BUTTON_DPAD_RIGHT: Right (+R_trigger: Down+Right)
+ { EVENT_KEYDOWN, KeyState(KEYCODE_KP6, 0), EVENT_KEYDOWN, KeyState(KEYCODE_KP3, 0) }
+ };
+
+ if (ev.cbutton.button > SDL_CONTROLLER_BUTTON_DPAD_RIGHT) {
+ warning("Unknown SDL controller button: '%d'", ev.cbutton.button);
+ return false;
+ }
- if (ev.jaxis.axis == JOY_XAXIS) {
-#ifdef JOY_ANALOG
- _km.joy_x = axis;
-#else
- if (axis != 0) {
- _km.x_vel = (axis > 0) ? 1 * MULTIPLIER:-1 * MULTIPLIER;
- _km.x_down_count = 1;
+ if (!_km.modifier) {
+ event.type = mapping[ev.cbutton.button].normalType;
+ event.kbd = mapping[ev.cbutton.button].normalKeystate;
+ } else {
+ event.type = mapping[ev.cbutton.button].modifierType;
+ event.kbd = mapping[ev.cbutton.button].modifierKeystate;
+ }
+
+ // Setting the mouse speed modifier after filling the event structure above
+ // ensures that the shift key events are correctly handled
+ if (ev.cbutton.button == SDL_CONTROLLER_BUTTON_RIGHTSHOULDER) {
+ // Right shoulder is the modifier button that makes the mouse go slower
+ // and allows access to an extended layout while pressed.
+ _km.modifier = !buttonUp;
+ }
+
+ if (event.type == EVENT_LBUTTONDOWN || event.type == EVENT_RBUTTONDOWN) {
+ processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER);
+ }
+
+ if (buttonUp) {
+ // The event mapping table is for button down events. If we received a button up event,
+ // transform the event type to the corresponding up type.
+ if (event.type == EVENT_KEYDOWN) {
+ event.type = EVENT_KEYUP;
+ } else if (event.type == EVENT_LBUTTONDOWN) {
+ event.type = EVENT_LBUTTONUP;
+ } else if (event.type == EVENT_RBUTTONDOWN) {
+ event.type = EVENT_RBUTTONUP;
} else {
- _km.x_vel = 0;
- _km.x_down_count = 0;
+ // Handled in key down
+ event.type = EVENT_INVALID;
}
+ }
+
+ return event.type != EVENT_INVALID;
+}
+
+bool SdlEventSource::handleControllerAxisMotion(const SDL_Event &ev, Common::Event &event) {
+ if (ev.caxis.axis == SDL_CONTROLLER_AXIS_LEFTX) {
+ _km.joy_x = ev.caxis.value;
+ return handleAxisToMouseMotion(_km.joy_x, _km.joy_y);
+ } else if (ev.caxis.axis == SDL_CONTROLLER_AXIS_LEFTY) {
+ _km.joy_y = ev.caxis.value;
+ return handleAxisToMouseMotion(_km.joy_x, _km.joy_y);
+ }
+
+ return false;
+}
#endif
- } else if (ev.jaxis.axis == JOY_YAXIS) {
-#ifndef JOY_INVERT_Y
- axis = -axis;
-#endif
-#ifdef JOY_ANALOG
- _km.joy_y = -axis;
-#else
- if (axis != 0) {
- _km.y_vel = (-axis > 0) ? 1 * MULTIPLIER: -1 * MULTIPLIER;
- _km.y_down_count = 1;
- } else {
- _km.y_vel = 0;
- _km.y_down_count = 0;
- }
+
+bool SdlEventSource::handleAxisToMouseMotion(int16 xAxis, int16 yAxis) {
+#ifdef JOY_INVERT_Y
+ yAxis = -yAxis;
#endif
- }
-#ifdef JOY_ANALOG
- // radial and scaled analog joystick deadzone
- float analogX = (float)_km.joy_x;
- float analogY = (float)_km.joy_y;
- float deadZone = (float)JOY_DEADZONE;
- if (g_system->hasFeature(OSystem::kFeatureJoystickDeadzone))
- deadZone = (float)ConfMan.getInt("joystick_deadzone") * 1000.0f;
- float scalingFactor = 1.0f;
- float magnitude = 0.0f;
-
- magnitude = sqrt(analogX * analogX + analogY * analogY);
+
+ // conversion factor between keyboard mouse and joy axis value
+ int vel_to_axis = (1500 / MULTIPLIER);
+
+ // radial and scaled deadzone
+
+ float analogX = (float)xAxis;
+ float analogY = (float)yAxis;
+ float deadZone = (float)ConfMan.getInt("joystick_deadzone") * 1000.0f;
+
+ float magnitude = sqrt(analogX * analogX + analogY * analogY);
if (magnitude >= deadZone) {
_km.x_down_count = 0;
_km.y_down_count = 0;
- scalingFactor = 1.0f / magnitude * (magnitude - deadZone) / (32769.0f - deadZone);
+ float scalingFactor = 1.0f / magnitude * (magnitude - deadZone) / (32769.0f - deadZone);
_km.x_vel = (int16)(analogX * scalingFactor * 32768.0f / vel_to_axis);
_km.y_vel = (int16)(analogY * scalingFactor * 32768.0f / vel_to_axis);
} else {
_km.x_vel = 0;
_km.y_vel = 0;
}
-#endif
return false;
}
diff --git a/backends/events/sdl/sdl-events.h b/backends/events/sdl/sdl-events.h
index 5fd3cb7ea5..f5bbfeb15c 100644
--- a/backends/events/sdl/sdl-events.h
+++ b/backends/events/sdl/sdl-events.h
@@ -80,6 +80,11 @@ protected:
/** Joystick */
SDL_Joystick *_joystick;
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+ /** Game controller */
+ SDL_GameController *_controller;
+#endif
+
/** Last screen id for checking if it was modified */
int _lastScreenID;
@@ -89,6 +94,21 @@ protected:
SdlGraphicsManager *_graphicsManager;
/**
+ * Open the SDL joystick with the specified index
+ *
+ * After this function completes successfully, SDL sends events for the device.
+ *
+ * If the joystick is also a SDL game controller, open it as a controller
+ * so an extended button mapping can be used.
+ */
+ void openJoystick(int joystickIndex);
+
+ /**
+ * Close the currently open joystick if any
+ */
+ void closeJoystick();
+
+ /**
* Pre process an event before it is dispatched.
*/
virtual void preprocessEvents(SDL_Event *event) {}
@@ -117,9 +137,21 @@ protected:
virtual bool handleJoyAxisMotion(SDL_Event &ev, Common::Event &event);
virtual bool handleKbdMouse(Common::Event &event);
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+ virtual bool handleJoystickAdded(const SDL_JoyDeviceEvent &event);
+ virtual bool handleJoystickRemoved(const SDL_JoyDeviceEvent &device);
+ virtual bool handleControllerButton(const SDL_Event &ev, Common::Event &event, bool buttonUp);
+ virtual bool handleControllerAxisMotion(const SDL_Event &ev, Common::Event &event);
+#endif
+
//@}
/**
+ * Update the virtual mouse according to a joystick or game controller axis position change
+ */
+ virtual bool handleAxisToMouseMotion(int16 xAxis, int16 yAxis);
+
+ /**
* Assigns the mouse coords to the mouse event. Furthermore notify the
* graphics manager about the position change.
*/
diff --git a/backends/events/symbiansdl/symbiansdl-events.cpp b/backends/events/symbiansdl/symbiansdl-events.cpp
index 4649f9f90a..0ae5824681 100644
--- a/backends/events/symbiansdl/symbiansdl-events.cpp
+++ b/backends/events/symbiansdl/symbiansdl-events.cpp
@@ -31,6 +31,8 @@
#include <bautils.h>
+#define JOY_DEADZONE 3200
+
SymbianSdlEventSource::zoneDesc SymbianSdlEventSource::_zones[TOTAL_ZONES] = {
{ 0, 0, 320, 145 },
{ 0, 145, 150, 55 },
@@ -200,4 +202,38 @@ bool SymbianSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
return false;
}
+bool SymbianSdlEventSource::handleAxisToMouseMotion(int16 xAxis, int16 yAxis) {
+ // Symbian wants dialog joystick i.e cursor for movement/selection
+
+ if (xAxis > JOY_DEADZONE) {
+ xAxis -= JOY_DEADZONE;
+ } else if (xAxis < -JOY_DEADZONE) {
+ xAxis += JOY_DEADZONE;
+ } else
+ xAxis = 0;
+ if (yAxis > JOY_DEADZONE) {
+ yAxis -= JOY_DEADZONE;
+ } else if (yAxis < -JOY_DEADZONE) {
+ yAxis += JOY_DEADZONE;
+ } else
+ yAxis = 0;
+
+ if (xAxis != 0) {
+ _km.x_vel = (xAxis > 0) ? 1 * MULTIPLIER:-1 * MULTIPLIER;
+ _km.x_down_count = 1;
+ } else {
+ _km.x_vel = 0;
+ _km.x_down_count = 0;
+ }
+ if (yAxis != 0) {
+ _km.y_vel = (yAxis > 0) ? 1 * MULTIPLIER: -1 * MULTIPLIER;
+ _km.y_down_count = 1;
+ } else {
+ _km.y_vel = 0;
+ _km.y_down_count = 0;
+ }
+
+ return false;
+}
+
#endif
diff --git a/backends/events/symbiansdl/symbiansdl-events.h b/backends/events/symbiansdl/symbiansdl-events.h
index 2664bc267d..0393e398f0 100644
--- a/backends/events/symbiansdl/symbiansdl-events.h
+++ b/backends/events/symbiansdl/symbiansdl-events.h
@@ -50,6 +50,8 @@ protected:
static zoneDesc _zones[TOTAL_ZONES];
virtual bool remapKey(SDL_Event &ev, Common::Event &event);
+
+ virtual bool handleAxisToMouseMotion(int16 xAxis, int16 yAxis);
};
#endif
diff --git a/backends/platform/psp/display_manager.cpp b/backends/platform/psp/display_manager.cpp
index 2e995c809e..f8be51e4e9 100644
--- a/backends/platform/psp/display_manager.cpp
+++ b/backends/platform/psp/display_manager.cpp
@@ -55,7 +55,8 @@ uint32 __attribute__((aligned(16))) MasterGuRenderer::_displayList[2048];
const OSystem::GraphicsMode DisplayManager::_supportedModes[] = {
{ "Original Resolution", "Original Resolution", ORIGINAL_RESOLUTION },
{ "Keep Aspect Ratio", "Keep Aspect Ratio", KEEP_ASPECT_RATIO },
- { "Full Screen", "Full Screen", STRETCHED_FULL_SCREEN },
+ { "4:3 Aspect Ratio", "4:3 Aspect Ratio", ASPECT_RATIO_CORRECTION },
+ { "Stretched Full Screen", "Stretched Full Screen", STRETCHED_FULL_SCREEN },
{0, 0, 0}
};
@@ -358,23 +359,35 @@ void DisplayManager::calculateScaleParams() {
switch (_graphicsMode) {
case ORIGINAL_RESOLUTION:
// check if we can fit the original resolution inside the screen
- if ((_displayParams.screenSource.width < PSP_SCREEN_WIDTH) &&
- (_displayParams.screenSource.height < PSP_SCREEN_HEIGHT)) {
+ if ((_displayParams.screenSource.width <= PSP_SCREEN_WIDTH) &&
+ (_displayParams.screenSource.height <= PSP_SCREEN_HEIGHT)) {
_displayParams.screenOutput.width = _displayParams.screenSource.width;
_displayParams.screenOutput.height = _displayParams.screenSource.height;
- } else { // revert to stretch to fit
- _displayParams.screenOutput.width = PSP_SCREEN_WIDTH;
- _displayParams.screenOutput.height = PSP_SCREEN_HEIGHT;
+ break;
}
- break;
+ // else revert to keep aspect ratio
case KEEP_ASPECT_RATIO: { // maximize the height while keeping aspect ratio
float aspectRatio = (float)_displayParams.screenSource.width / (float)_displayParams.screenSource.height;
_displayParams.screenOutput.height = PSP_SCREEN_HEIGHT; // always full height
_displayParams.screenOutput.width = (uint32)(PSP_SCREEN_HEIGHT * aspectRatio);
- if (_displayParams.screenOutput.width > PSP_SCREEN_WIDTH) // we can't have wider than the screen
+ if (_displayParams.screenOutput.width > PSP_SCREEN_WIDTH) { // shrink if wider than screen
+ _displayParams.screenOutput.height = (uint32) (((float) PSP_SCREEN_HEIGHT * (float) PSP_SCREEN_WIDTH) / (float) _displayParams.screenOutput.width);
+ _displayParams.screenOutput.width = PSP_SCREEN_WIDTH;
+ }
+ }
+ break;
+ case ASPECT_RATIO_CORRECTION: { // maximize the height while forcing 4:3 aspect ratio
+ float aspectRatio = 4.0f / 3.0f;
+
+ _displayParams.screenOutput.height = PSP_SCREEN_HEIGHT; // always full height
+ _displayParams.screenOutput.width = (uint32)(PSP_SCREEN_HEIGHT * aspectRatio);
+
+ if (_displayParams.screenOutput.width > PSP_SCREEN_WIDTH) { // // shrink if wider than screen
+ _displayParams.screenOutput.height = (uint32) (((float) PSP_SCREEN_HEIGHT * (float) PSP_SCREEN_WIDTH) / (float) _displayParams.screenOutput.width);
_displayParams.screenOutput.width = PSP_SCREEN_WIDTH;
+ }
}
break;
case STRETCHED_FULL_SCREEN: // we simply stretch to the whole screen
diff --git a/backends/platform/psp/display_manager.h b/backends/platform/psp/display_manager.h
index b1b748a68c..ba11963f8c 100644
--- a/backends/platform/psp/display_manager.h
+++ b/backends/platform/psp/display_manager.h
@@ -106,6 +106,7 @@ public:
enum GraphicsModeID { ///> Possible output formats onscreen
ORIGINAL_RESOLUTION,
KEEP_ASPECT_RATIO,
+ ASPECT_RATIO_CORRECTION,
STRETCHED_FULL_SCREEN
};
DisplayManager() : _screen(0), _cursor(0), _overlay(0), _keyboard(0),
@@ -118,7 +119,7 @@ public:
bool setGraphicsMode(int mode);
bool setGraphicsMode(const char *name);
int getGraphicsMode() const { return _graphicsMode; }
- uint32 getDefaultGraphicsMode() const { return STRETCHED_FULL_SCREEN; }
+ uint32 getDefaultGraphicsMode() const { return KEEP_ASPECT_RATIO; }
const OSystem::GraphicsMode* getSupportedGraphicsModes() const { return _supportedModes; }
// Setters for pointers
diff --git a/backends/platform/sdl/psp2/psp2.cpp b/backends/platform/sdl/psp2/psp2.cpp
index 94b06e6d23..12154ba7d0 100644
--- a/backends/platform/sdl/psp2/psp2.cpp
+++ b/backends/platform/sdl/psp2/psp2.cpp
@@ -94,12 +94,6 @@ void OSystem_PSP2::initBackend() {
if (!ConfMan.hasKey("filtering")) {
ConfMan.setBool("filtering", true);
}
- if (!ConfMan.hasKey("kbdmouse_speed")) {
- ConfMan.setInt("kbdmouse_speed", 3);
- }
- if (!ConfMan.hasKey("joystick_deadzone")) {
- ConfMan.setInt("joystick_deadzone", 2);
- }
if (!ConfMan.hasKey("shader")) {
ConfMan.setInt("shader", 2);
}
@@ -108,6 +102,14 @@ void OSystem_PSP2::initBackend() {
if (_savefileManager == 0)
_savefileManager = new DefaultSaveFileManager("ux0:data/scummvm/saves");
+ // Controller mappings for Vita, various names have been used in various SDL versions
+ SDL_GameControllerAddMapping("50535669746120436f6e74726f6c6c65,PSVita Controller,y:b0,b:b1,a:b2,x:b3,leftshoulder:b4,rightshoulder:b5,dpdown:b6,dpleft:b7,dpup:b8,dpright:b9,back:b10,start:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,");
+ SDL_GameControllerAddMapping("50535669746120636f6e74726f6c6c65,PSVita controller,y:b0,b:b1,a:b2,x:b3,leftshoulder:b4,rightshoulder:b5,dpdown:b6,dpleft:b7,dpup:b8,dpright:b9,back:b10,start:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,");
+ SDL_GameControllerAddMapping("50535669746120636f6e74726f6c6c65,PSVita controller 2,y:b0,b:b1,a:b2,x:b3,leftshoulder:b4,rightshoulder:b5,dpdown:b6,dpleft:b7,dpup:b8,dpright:b9,back:b10,start:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,");
+ SDL_GameControllerAddMapping("50535669746120636f6e74726f6c6c65,PSVita controller 3,y:b0,b:b1,a:b2,x:b3,leftshoulder:b4,rightshoulder:b5,dpdown:b6,dpleft:b7,dpup:b8,dpright:b9,back:b10,start:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,");
+ SDL_GameControllerAddMapping("50535669746120636f6e74726f6c6c65,PSVita controller 4,y:b0,b:b1,a:b2,x:b3,leftshoulder:b4,rightshoulder:b5,dpdown:b6,dpleft:b7,dpup:b8,dpright:b9,back:b10,start:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,");
+ SDL_GameControllerAddMapping("505356697461206275696c74696e206a,PSVita builtin joypad,y:b0,b:b1,a:b2,x:b3,leftshoulder:b4,rightshoulder:b5,dpdown:b6,dpleft:b7,dpup:b8,dpright:b9,back:b10,start:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,");
+
// Event source
if (_eventSource == 0)
_eventSource = new PSP2EventSource();
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index f6ab180897..3082a69ebf 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -90,6 +90,8 @@ OSystem_SDL::OSystem_SDL()
_eventSource(0),
_window(0) {
+ ConfMan.registerDefault("kbdmouse_speed", 3);
+ ConfMan.registerDefault("joystick_deadzone", 3);
}
OSystem_SDL::~OSystem_SDL() {
@@ -180,10 +182,10 @@ bool OSystem_SDL::hasFeature(Feature f) {
#if SDL_VERSION_ATLEAST(2, 0, 0)
if (f == kFeatureClipboardSupport) return true;
#endif
-#ifdef JOY_ANALOG
- if (f == kFeatureJoystickDeadzone) return true;
-#endif
- if (f == kFeatureKbdMouseSpeed) return true;
+ if (f == kFeatureJoystickDeadzone || f == kFeatureKbdMouseSpeed) {
+ bool joystickSupportEnabled = ConfMan.getInt("joystick_num") >= 0;
+ return joystickSupportEnabled;
+ }
return ModularBackend::hasFeature(f);
}
@@ -289,16 +291,6 @@ void OSystem_SDL::initBackend() {
_inited = true;
- if (!ConfMan.hasKey("kbdmouse_speed")) {
- ConfMan.registerDefault("kbdmouse_speed", 3);
- ConfMan.setInt("kbdmouse_speed", 3);
- }
-#ifdef JOY_ANALOG
- if (!ConfMan.hasKey("joystick_deadzone")) {
- ConfMan.registerDefault("joystick_deadzone", 3);
- ConfMan.setInt("joystick_deadzone", 3);
- }
-#endif
ModularBackend::initBackend();
// We have to initialize the graphics manager before the event manager
diff --git a/backends/platform/symbian/README b/backends/platform/symbian/README
index cdff5f9787..867a683f41 100644
--- a/backends/platform/symbian/README
+++ b/backends/platform/symbian/README
@@ -1,7 +1,7 @@
ScummVM - ScummVM ported to EPOC/SymbianOS
- Copyright (C) 2008-2017 ScummVM Team
+ Copyright (C) 2008-2018 ScummVM Team
Copyright (C) 2013-2013 Fedor Strizhniou aka zanac
Copyright (C) 2003-2013 Lars 'AnotherGuest' Persson
Copyright (C) 2002-2008 Jurgen 'SumthinWicked' Braam
diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp
index 4d417b5a66..87e1c09a63 100644
--- a/backends/platform/symbian/src/SymbianOS.cpp
+++ b/backends/platform/symbian/src/SymbianOS.cpp
@@ -173,6 +173,13 @@ Common::String OSystem_SDL_Symbian::getDefaultConfigFileName() {
return configFile;
}
+bool OSystem_SDL_Symbian::hasFeature(Feature f) {
+ if (f == kFeatureJoystickDeadzone) return false;
+
+ return OSystem_SDL::hasFeature(f);
+}
+
+
RFs& OSystem_SDL_Symbian::FsSession() {
return *_RFs;
}
diff --git a/backends/platform/symbian/src/SymbianOS.h b/backends/platform/symbian/src/SymbianOS.h
index 617540941d..fea1ebc0b2 100644
--- a/backends/platform/symbian/src/SymbianOS.h
+++ b/backends/platform/symbian/src/SymbianOS.h
@@ -39,6 +39,7 @@ public:
virtual void engineDone();
virtual bool setGraphicsMode(const char *name);
virtual Common::String getDefaultConfigFileName();
+ virtual bool hasFeature(Feature f);
/**
* Returns reference to File session
diff --git a/configure b/configure
index 6a42bbb6f2..2b244e93be 100755
--- a/configure
+++ b/configure
@@ -3407,7 +3407,7 @@ case $_backend in
append_var LIBS "-lSceSysmodule_stub -lSceDisplay_stub -lSceGxm_stub"
append_var LIBS "-lSceAudio_stub -lSceCtrl_stub -lScePower_stub"
append_var LIBS "-lSceNet_stub -lSceNetCtl_stub -lSceAppMgr_stub -lScePgf_stub"
- append_var LIBS "-lSceTouch_stub"
+ append_var LIBS "-lSceTouch_stub -lSceHid_stub"
append_var DEFINES "-DSDL_BACKEND"
add_line_to_config_mk "SDL_BACKEND = 1"
add_line_to_config_mk "USE_SDL2 = 1"
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index e59924c033..c0cc8af87c 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -1061,12 +1061,14 @@ const Feature s_features[] = {
};
const Tool s_tools[] = {
+ { "create_cryo", true},
{ "create_drascula", true},
{ "create_hugo", true},
{ "create_kyradat", true},
{ "create_lure", true},
{ "create_neverhood", true},
{ "create_teenagent", true},
+ { "create_titanic", true},
{ "create_tony", true},
{ "create_toon", true},
{ "create_translations", true},
diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt
index f28a51661a..ab32653da4 100644
--- a/devtools/scumm-md5.txt
+++ b/devtools/scumm-md5.txt
@@ -638,15 +638,16 @@ airport Let's Explore the Airport with Buzzy
3c90d2a39cafa60b8ebce70a34a59a41 51152 nl Windows - Demo - Ben Castricum
farm Let's Explore the Farm with Buzzy
- a5c5388da9bf0e6662fdca8813a79d13 86962 en Windows - - - George Kormendi
+ f4357cf21ba59889d6d5bcc431140238 -1 en Windows - - - MrEightThreeOne
+ a5c5388da9bf0e6662fdca8813a79d13 86962 en Windows HE 72 - - George Kormendi
fbbbb38a81fc9d6a61d509278390a290 -1 en Mac HE 73 - - khalek
a85856675429fe88051744f755b72f93 -1 en Windows HE 73 - - Kirben
a2386da005672cbd5136f4f27a626c5f 87061 nl Windows HE 73 - - George Kormendi
eeb606c2d2ec877a712a9f20c10bcdda 87034 nl Mac HE 73 - - Ben Castricum
5dda73606533d66a4c3f4f9ea6e842af 87061 ru Windows HE 73 - - sev
- 39fd6db10d0222d817025c4d3346e3b4 -1 en Mac - Demo - Joachim Eberhard
- 6c375c2236d99f56e6c2cf540e74e474 34333 nl Windows - Demo - Kirben
+ 39fd6db10d0222d817025c4d3346e3b4 -1 en Mac HE 72 Demo - Joachim Eberhard
+ 6c375c2236d99f56e6c2cf540e74e474 34333 nl Windows HE 72 Demo - Kirben
03173f0df12062d84721062666155efa 34312 en Windows HE 71 Demo - Ben Castricum
bf8b52fdd9a69c67f34e8e9fec72661c -1 en Windows HE 71 Demo - khalek, sev
0557df19f046a84c2fdc63507c6616cb -1 nl Windows HE 72 Demo - adutchguy
diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist
index f61bb3b462..db46156d68 100644
--- a/dists/macosx/Info.plist
+++ b/dists/macosx/Info.plist
@@ -9,7 +9,7 @@
<key>CFBundleExecutable</key>
<string>scummvm</string>
<key>CFBundleGetInfoString</key>
- <string>2.1.0git, Copyright 2001-2017 The ScummVM Team</string>
+ <string>2.1.0git, Copyright 2001-2018 The ScummVM Team</string>
<key>CFBundleIconFile</key>
<string>scummvm.icns</string>
<key>CFBundleIdentifier</key>
@@ -49,7 +49,7 @@
<key>CFBundleVersion</key>
<string>2.1.0git</string>
<key>NSHumanReadableCopyright</key>
- <string>Copyright 2001-2017 The ScummVM Team</string>
+ <string>Copyright 2001-2018 The ScummVM Team</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>SUFeedURL</key>
diff --git a/dists/macosx/Info.plist.in b/dists/macosx/Info.plist.in
index db740769ef..93ab74b1e8 100644
--- a/dists/macosx/Info.plist.in
+++ b/dists/macosx/Info.plist.in
@@ -9,7 +9,7 @@
<key>CFBundleExecutable</key>
<string>scummvm</string>
<key>CFBundleGetInfoString</key>
- <string>@VERSION@, Copyright 2001-2017 The ScummVM Team</string>
+ <string>@VERSION@, Copyright 2001-2018 The ScummVM Team</string>
<key>CFBundleIconFile</key>
<string>scummvm.icns</string>
<key>CFBundleIdentifier</key>
@@ -49,7 +49,7 @@
<key>CFBundleVersion</key>
<string>@VERSION@</string>
<key>NSHumanReadableCopyright</key>
- <string>Copyright 2001-2017 The ScummVM Team</string>
+ <string>Copyright 2001-2018 The ScummVM Team</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>SUFeedURL</key>
diff --git a/dists/macosx/dockplugin/Info.plist b/dists/macosx/dockplugin/Info.plist
index f030b60b9b..6e68bc4edb 100644
--- a/dists/macosx/dockplugin/Info.plist
+++ b/dists/macosx/dockplugin/Info.plist
@@ -19,7 +19,7 @@
<key>CFBundleVersion</key>
<string>2.1.0git</string>
<key>NSHumanReadableCopyright</key>
- <string>Copyright 2001-2017 The ScummVM Team</string>
+ <string>Copyright 2001-2018 The ScummVM Team</string>
<key>NSPrincipalClass</key>
<string>ScummVMDockTilePlugIn</string>
</dict>
diff --git a/dists/macosx/dockplugin/Info.plist.in b/dists/macosx/dockplugin/Info.plist.in
index 57699e6151..60a03aecac 100644
--- a/dists/macosx/dockplugin/Info.plist.in
+++ b/dists/macosx/dockplugin/Info.plist.in
@@ -19,7 +19,7 @@
<key>CFBundleVersion</key>
<string>@VERSION@</string>
<key>NSHumanReadableCopyright</key>
- <string>Copyright 2001-2017 The ScummVM Team</string>
+ <string>Copyright 2001-2018 The ScummVM Team</string>
<key>NSPrincipalClass</key>
<string>ScummVMDockTilePlugIn</string>
</dict>
diff --git a/dists/ps3/readme-ps3.md b/dists/ps3/readme-ps3.md
index 8290f87066..d0a1382525 100644
--- a/dists/ps3/readme-ps3.md
+++ b/dists/ps3/readme-ps3.md
@@ -21,14 +21,21 @@ Savegames are wrote in the /hdd0/game/SCUM12000/saves folder.
Joypad button mapping
=====================
-- Left stick => Mouse
-- Cross => Left mouse button
-- Circle => Right mouse button
-- Triangle => Game menu (F5)
-- Square => Escape
-- Start => ScummVM's in global game menu
-- Select => Toggle virtual keyboard
-- L1 => AGI predictive input dialog
+- Left stick => Mouse
+- R1 + Left stick => Slow Mouse
+- Cross => Left mouse button
+- Circle => Right mouse button
+- DPad => Cursor Keys (useful for character motion)
+- R1 + DPad => Diagonal Cursor Keys
+- L1 => Game menu (F5)
+- R1 => Shift (used to enable Mass Add in menu)
+- Square => Period '.' (used to skip dialog lines)
+- R1 + Square => Space ' '
+- Triangle => Escape (used to skip cutscenes)
+- R1 + Triangle => Return
+- Start => ScummVM's global in-game menu
+- Select => Toggle virtual keyboard
+- R1 + Select => AGI predictive input dialog
Disclaimer
==========
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index 2cdeeb8227..a5b6eb222b 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -94,7 +94,7 @@ BEGIN
VALUE "FileDescription", "http://www.scummvm.org/\0"
VALUE "FileVersion", "2.1.0git\0"
VALUE "InternalName", "scummvm\0"
- VALUE "LegalCopyright", "Copyright Љ 2001-2017 The ScummVM Team\0"
+ VALUE "LegalCopyright", "Copyright Љ 2001-2018 The ScummVM Team\0"
VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0"
VALUE "OriginalFilename", "scummvm.exe\0"
VALUE "ProductName", "ScummVM\0"
diff --git a/dists/scummvm.rc.in b/dists/scummvm.rc.in
index 3aa95b3671..d960cc2a75 100644
--- a/dists/scummvm.rc.in
+++ b/dists/scummvm.rc.in
@@ -94,7 +94,7 @@ BEGIN
VALUE "FileDescription", "http://www.scummvm.org/\0"
VALUE "FileVersion", "@VERSION@\0"
VALUE "InternalName", "scummvm\0"
- VALUE "LegalCopyright", "Copyright Љ 2001-2017 The ScummVM Team\0"
+ VALUE "LegalCopyright", "Copyright Љ 2001-2018 The ScummVM Team\0"
VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0"
VALUE "OriginalFilename", "scummvm.exe\0"
VALUE "ProductName", "ScummVM\0"
diff --git a/dists/win32/ScummVM.iss b/dists/win32/ScummVM.iss
index 8a495e0b45..4fcc4f7ee4 100644
--- a/dists/win32/ScummVM.iss
+++ b/dists/win32/ScummVM.iss
@@ -1,5 +1,5 @@
[Setup]
-AppCopyright=2017
+AppCopyright=2018
AppName=ScummVM
AppVerName=ScummVM Git
AppPublisher=The ScummVM Team
diff --git a/dists/win32/migration.bat b/dists/win32/migration.bat
index 6ec7806b5f..95f554af2b 100644
--- a/dists/win32/migration.bat
+++ b/dists/win32/migration.bat
@@ -4,7 +4,7 @@
:: This script will copy any saved games located in the
:: old default location, to the new default location.
::
-:: (c) 2012-2017 ScummVM Team
+:: (c) 2012-2018 ScummVM Team
::
@echo off
diff --git a/doc/de/LIESMICH b/doc/de/LIESMICH
index e8c1df3779..1a910329bd 100644
--- a/doc/de/LIESMICH
+++ b/doc/de/LIESMICH
@@ -988,6 +988,8 @@ Bild unten: Nach unten sehen
Leertaste: Spiel pausieren
ESC: Zwischensequenz УМberspringen
F5: MenУМ
+Strg-o: Spiel laden
+Strg-s: Spiel speichern
3.18) Hinweise zu Simon the Sorcerer 1 und 2:
diff --git a/engines/bladerunner/detection_tables.h b/engines/bladerunner/detection_tables.h
index b2589786dc..5b6c3d5fa4 100644
--- a/engines/bladerunner/detection_tables.h
+++ b/engines/bladerunner/detection_tables.h
@@ -53,6 +53,21 @@ static const ADGameDescription gameDescriptions[] = {
ADGF_NO_FLAGS,
GUIO0()
},
+
+ // BladeRunner (French) - Bug #9722
+ {
+ "bladerunner",
+ 0,
+ {
+ {"STARTUP.MIX", 0, "39d1901df50935d58aee252707134952", 2314526},
+ AD_LISTEND
+ },
+ Common::FR_FRA,
+ Common::kPlatformWindows,
+ ADGF_NO_FLAGS,
+ GUIO0()
+ },
+
AD_TABLE_END_MARKER
};
diff --git a/engines/kyra/detection_tables.h b/engines/kyra/detection_tables.h
index 773d491423..43dc0cc881 100644
--- a/engines/kyra/detection_tables.h
+++ b/engines/kyra/detection_tables.h
@@ -1449,6 +1449,74 @@ const KYRAGameDescription adGameDescs[] = {
LOL_FLOPPY_FLAGS
},
+ { // Spanish floppy version 1.23, bug #9699 "Lands of Lore - Spanish version 1.23 MD5"
+ {
+ "lol",
+ "Extracted",
+ {
+ {"GENERAL.PAK", 0, "ca1208aa60c5f3e3a7e06a0420a11526", -1 },
+ {"CHAPTER7.PAK", 0, "1f11dc4ba0473eec9d6d93bbf2ee9c8a", -1 },
+ { 0, 0, 0, 0 }
+ },
+ Common::ES_ESP,
+ Common::kPlatformDOS,
+ ADGF_NO_FLAGS,
+ GUIO8(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA, GAMEOPTION_LOL_SCROLLING, GAMEOPTION_LOL_CURSORS)
+ },
+ LOL_FLOPPY_FLAGS
+ },
+
+ { // Chinese floppy version bug #7893
+ {
+ "lol",
+ "Extracted",
+ {
+ {"GENERAL.PAK", 0, "f2c305bfb10c08371e947ab4d0a2f5f5", -1 },
+ {"CHAPTER7.PAK", 0, "f3cbab6d945ceda35149a5c9a324a8fe", -1 },
+ { 0, 0, 0, 0 }
+ },
+ Common::ZH_CNA,
+ Common::kPlatformDOS,
+ ADGF_NO_FLAGS,
+ GUIO8(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA, GAMEOPTION_LOL_SCROLLING, GAMEOPTION_LOL_CURSORS)
+ },
+ LOL_FLOPPY_FLAGS
+ },
+
+ { // German version - Bug 9557
+ {
+ "lol",
+ "Extracted",
+ {
+ { "GENERAL.PAK", 0, "8e144826df680397876e0fd7ce30c701", -1 },
+ { "CHAPTER7.PAK", 0, "1240fb870aba719f5887ca7270227699", -1 },
+ { 0, 0, 0, 0 }
+ },
+ Common::DE_DEU,
+ Common::kPlatformDOS,
+ ADGF_NO_FLAGS,
+ GUIO8(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA, GAMEOPTION_LOL_SCROLLING, GAMEOPTION_LOL_CURSORS)
+ },
+ LOL_FLOPPY_FLAGS
+ },
+
+ { // Japanese PC9821 version - Bug 9828
+ {
+ "lol",
+ "Extracted",
+ {
+ { "GENERAL.PAK", 0, "8902b233405461025e25093b9c4c8d2c", -1 },
+ { "CHAPTER7.PAK", 0, "32a46c338a3d6249c273cc3b3881bb8a", -1 },
+ { 0, 0, 0, 0 }
+ },
+ Common::JA_JPN,
+ Common::kPlatformPC98,
+ ADGF_NO_FLAGS,
+ GUIO5(GUIO_NOSPEECH, GUIO_MIDIPC98, GUIO_RENDERPC9801, GAMEOPTION_LOL_SCROLLING, GAMEOPTION_LOL_CURSORS)
+ },
+ LOL_PC9801_FLAGS
+ },
+
// Russian fan translation
{
{
diff --git a/engines/mohawk/dialogs.cpp b/engines/mohawk/dialogs.cpp
index df832c9a2c..029867f6a6 100644
--- a/engines/mohawk/dialogs.cpp
+++ b/engines/mohawk/dialogs.cpp
@@ -94,13 +94,13 @@ enum {
MohawkOptionsDialog::MohawkOptionsDialog(MohawkEngine *vm) :
GUI::Dialog(0, 0, 360, 200),
- _vm(vm), _loadSlot(-1) {
- _loadButton = new GUI::ButtonWidget(this, 245, 25, 100, 25, _("~L~oad"), 0, kLoadCmd);
- _saveButton = new GUI::ButtonWidget(this, 245, 60, 100, 25, _("~S~ave"), 0, kSaveCmd);
- new GUI::ButtonWidget(this, 245, 95, 100, 25, _("~Q~uit"), 0, kQuitCmd);
+ _vm(vm), _loadSlot(-1), _saveSlot(-1) {
+ _loadButton = new GUI::ButtonWidget(this, 245, 25, 100, 25, _("~L~oad"), nullptr, kLoadCmd);
+ _saveButton = new GUI::ButtonWidget(this, 245, 60, 100, 25, _("~S~ave"), nullptr, kSaveCmd);
+ new GUI::ButtonWidget(this, 245, 95, 100, 25, _("~Q~uit"), nullptr, kQuitCmd);
- new GUI::ButtonWidget(this, 95, 160, 120, 25, _("~O~K"), 0, GUI::kOKCmd);
- new GUI::ButtonWidget(this, 225, 160, 120, 25, _("~C~ancel"), 0, GUI::kCloseCmd);
+ new GUI::ButtonWidget(this, 95, 160, 120, 25, _("~O~K"), nullptr, GUI::kOKCmd);
+ new GUI::ButtonWidget(this, 225, 160, 120, 25, _("~C~ancel"), nullptr, GUI::kCloseCmd);
_loadDialog = new GUI::SaveLoadChooser(_("Load game:"), _("Load"), false);
_saveDialog = new GUI::SaveLoadChooser(_("Save game:"), _("Save"), true);
@@ -115,22 +115,22 @@ void MohawkOptionsDialog::open() {
GUI::Dialog::open();
_loadSlot = -1;
+ _saveSlot = -1;
_loadButton->setEnabled(_vm->canLoadGameStateCurrently());
_saveButton->setEnabled(_vm->canSaveGameStateCurrently());
}
void MohawkOptionsDialog::save() {
- int slot = _saveDialog->runModalWithCurrentTarget();
+ _saveSlot = _saveDialog->runModalWithCurrentTarget();
- if (slot >= 0) {
- Common::String result(_saveDialog->getResultString());
- if (result.empty()) {
+ if (_saveSlot >= 0) {
+ _saveDescription = _saveDialog->getResultString();
+ if (_saveDescription.empty()) {
// If the user was lazy and entered no save name, come up with a default name.
- result = _saveDialog->createDefaultSaveDescription(slot);
+ _saveDescription = _saveDialog->createDefaultSaveDescription(_saveSlot);
}
- _vm->saveGameState(slot, result);
close();
}
}
diff --git a/engines/mohawk/dialogs.h b/engines/mohawk/dialogs.h
index 9cbf5ff74c..efc1005737 100644
--- a/engines/mohawk/dialogs.h
+++ b/engines/mohawk/dialogs.h
@@ -83,7 +83,9 @@ public:
virtual void reflowLayout() override;
virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) override;
- int getLoadSlot() const {return _loadSlot;}
+ int getLoadSlot() const { return _loadSlot; }
+ int getSaveSlot() const { return _saveSlot; }
+ Common::String getSaveDescription() const { return _saveDescription; }
private:
MohawkEngine *_vm;
@@ -95,6 +97,8 @@ private:
GUI::SaveLoadChooser *_saveDialog;
int _loadSlot;
+ int _saveSlot;
+ Common::String _saveDescription;
void save();
void load();
diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp
index e229faf078..5baa89cea8 100644
--- a/engines/mohawk/myst.cpp
+++ b/engines/mohawk/myst.cpp
@@ -391,6 +391,8 @@ void MohawkEngine_Myst::doFrame() {
runDialog(*_optionsDialog);
if (_optionsDialog->getLoadSlot() >= 0)
loadGameState(_optionsDialog->getLoadSlot());
+ if (_optionsDialog->getSaveSlot() >= 0)
+ saveGameState(_optionsDialog->getSaveSlot(), _optionsDialog->getSaveDescription());
if (_needsPageDrop) {
dropPage();
diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp
index 266706ae11..0bf4024057 100644
--- a/engines/mohawk/riven.cpp
+++ b/engines/mohawk/riven.cpp
@@ -238,6 +238,8 @@ void MohawkEngine_Riven::doFrame() {
runDialog(*_optionsDialog);
if (_optionsDialog->getLoadSlot() >= 0)
loadGameStateAndDisplayError(_optionsDialog->getLoadSlot());
+ if (_optionsDialog->getSaveSlot() >= 0)
+ saveGameStateAndDisplayError(_optionsDialog->getSaveSlot(), _optionsDialog->getSaveDescription());
_gfx->setTransitionMode((RivenTransitionMode) _vars["transitionmode"]);
_card->initializeZipMode();
break;
@@ -257,6 +259,20 @@ void MohawkEngine_Riven::doFrame() {
changeToCard(6);
}
break;
+ case Common::KEYCODE_o:
+ if (event.kbd.flags & Common::KBD_CTRL) {
+ if (canLoadGameStateCurrently()) {
+ runLoadDialog();
+ }
+ }
+ break;
+ case Common::KEYCODE_s:
+ if (event.kbd.flags & Common::KBD_CTRL) {
+ if (canSaveGameStateCurrently()) {
+ runSaveDialog();
+ }
+ }
+ break;
default:
if (event.kbdRepeat) {
continue;
@@ -525,6 +541,24 @@ void MohawkEngine_Riven::runLoadDialog() {
}
}
+void MohawkEngine_Riven::runSaveDialog() {
+ GUI::SaveLoadChooser slc(_("Save game:"), _("Save"), true);
+
+ pauseEngine(true);
+ int slot = slc.runModalWithCurrentTarget();
+ pauseEngine(false);
+
+ if (slot >= 0) {
+ Common::String result(slc.getResultString());
+ if (result.empty()) {
+ // If the user was lazy and entered no save name, come up with a default name.
+ result = slc.createDefaultSaveDescription(slot);
+ }
+
+ saveGameStateAndDisplayError(slot, result);
+ }
+}
+
Common::Error MohawkEngine_Riven::loadGameState(int slot) {
return _saveLoad->loadGame(slot);
}
@@ -544,6 +578,17 @@ Common::Error MohawkEngine_Riven::saveGameState(int slot, const Common::String &
return _saveLoad->saveGame(slot, desc);
}
+void MohawkEngine_Riven::saveGameStateAndDisplayError(int slot, const Common::String &desc) {
+ assert(slot >= 0 && !desc.empty());
+
+ Common::Error saveError = saveGameState(slot, desc);
+
+ if (saveError.getCode() != Common::kNoError) {
+ GUI::MessageDialog dialog(saveError.getDesc());
+ dialog.runModal();
+ }
+}
+
void MohawkEngine_Riven::addZipVisitedCard(uint16 cardId, uint16 cardNameId) {
Common::String cardName = getStack()->getName(kCardNames, cardNameId);
if (cardName.empty())
diff --git a/engines/mohawk/riven.h b/engines/mohawk/riven.h
index 58d0855074..86a431170f 100644
--- a/engines/mohawk/riven.h
+++ b/engines/mohawk/riven.h
@@ -100,7 +100,6 @@ public:
bool canLoadGameStateCurrently();
bool canSaveGameStateCurrently();
Common::Error loadGameState(int slot);
- void loadGameStateAndDisplayError(int slot);
Common::Error saveGameState(int slot, const Common::String &desc);
bool hasFeature(EngineFeature f) const;
@@ -148,9 +147,14 @@ public:
Common::SeekableReadStream *getExtrasResource(uint32 tag, uint16 id);
bool _activatedPLST;
bool _activatedSLST;
- void runLoadDialog();
void delay(uint32 ms);
+ // Save / Load
+ void runLoadDialog();
+ void runSaveDialog();
+ void loadGameStateAndDisplayError(int slot);
+ void saveGameStateAndDisplayError(int slot, const Common::String &desc);
+
/**
* Has the game ended, or has the user requested to quit?
*/
diff --git a/engines/mohawk/riven_video.cpp b/engines/mohawk/riven_video.cpp
index 14af3e566b..9bd185ed5d 100644
--- a/engines/mohawk/riven_video.cpp
+++ b/engines/mohawk/riven_video.cpp
@@ -255,6 +255,7 @@ void RivenVideo::playBlocking(int32 endTime) {
if (playTillEnd) {
disable();
stop();
+ seek(0);
}
// Execute the stored opcode
diff --git a/engines/neverhood/neverhood.cpp b/engines/neverhood/neverhood.cpp
index 7fe3e77ccb..0f7a1d198d 100644
--- a/engines/neverhood/neverhood.cpp
+++ b/engines/neverhood/neverhood.cpp
@@ -182,9 +182,6 @@ void NeverhoodEngine::mainLoop() {
case Common::EVENT_WHEELDOWN:
_gameModule->handleWheelDown();
break;
- case Common::EVENT_QUIT:
- _system->quit();
- break;
default:
break;
}
diff --git a/engines/saga/detection_tables.h b/engines/saga/detection_tables.h
index 20fdfb09ee..308fb27fba 100644
--- a/engines/saga/detection_tables.h
+++ b/engines/saga/detection_tables.h
@@ -795,6 +795,36 @@ static const SAGAGameDescription gameDescriptions[] = {
NULL,
},
+ // I Have No Mouth And I Must Scream - Hungarian fan CD translation
+ // English CD version with Hungarian text patch
+ // (English speech - Hungarian text)
+ {
+ {
+ "ihnm",
+ "fan-made",
+ {
+ {"musicfm.res", GAME_MUSICFILE_FM, "0439083e3dfdc51b486071d45872ae52", 302676},
+ {"musicgm.res", GAME_MUSICFILE_GM, "80f875a1fb384160d1f4b27166eef583", 314020},
+ {"scream.res", GAME_RESOURCEFILE, "46bbdc65d164ba7e89836a0935eec8e6", 83411541},
+ {"scripts.res", GAME_SCRIPTFILE, "be38bbc5a26be809dbf39f13befebd01", 505001},
+ {"patch.re_", GAME_PATCHFILE | GAME_RESOURCEFILE, "58b79e61594779513c7f2d35509fa89e", 5038599},
+ {"sfx.res", GAME_SOUNDFILE, "1c610d543f32ec8b525e3f652536f269", 22561056},
+ { NULL, 0, NULL, 0}
+ },
+ Common::HU_HUN,
+ Common::kPlatformDOS,
+ ADGF_NO_FLAGS,
+ GUIO1(GUIO_NOASPECT)
+ },
+ GID_IHNM,
+ 0,
+ IHNM_DEFAULT_SCENE,
+ &IHNM_Resources,
+ ARRAYSIZE(IHNMCD_GameFonts),
+ IHNMCD_GameFonts,
+ NULL,
+ },
+
// I Have No Mouth And I Must Scream - Sp CD version
{
{
diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index 4b91ec158c..f82554b414 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -2860,6 +2860,15 @@ static const struct ADGameDescription SciGameDescriptions[] = {
AD_LISTEND},
Common::FR_FRA, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO_LIGHTHOUSE },
+ // Lighthouse - German DOS (from bug #10359)
+ {"lighthouse", "", {
+ {"resmap.001", 0, "d2dc13bb936d6528a19feac92fc7df1c", 7852},
+ {"ressci.001", 0, "dbb615146ec943e4ff7764a485c90511", 122330257},
+ {"resmap.002", 0, "8fdb8544d801057d3123539d8e6d039a", 7618},
+ {"ressci.002", 0, "6635764dc258b2041ca9a387e5aaab25", 115026179},
+ AD_LISTEND},
+ Common::DE_DEU, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO_LIGHTHOUSE },
+
#undef GUIO_LIGHTHOUSE_DEMO
#undef GUIO_LIGHTHOUSE
@@ -3422,6 +3431,15 @@ static const struct ADGameDescription SciGameDescriptions[] = {
AD_LISTEND},
Common::EN_ANY, Common::kPlatformDOS, 0, GUIO5(GUIO_NOSPEECH, GAMEOPTION_EGA_UNDITHER, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI) },
+ // Police Quest 2 English DOS 1.002.011 (supplied by misterhands in bug report #9716)
+ {"pq2", "", {
+ {"resource.map", 0, "f42a265e26168d0463d12e0913e8dd1c", 5808},
+ {"resource.001", 0, "77f02def3094af804fd2371db25b7100", 161673},
+ {"resource.002", 0, "77f02def3094af804fd2371db25b7100", 334283},
+ {"resource.003", 0, "77f02def3094af804fd2371db25b7100", 308044},
+ AD_LISTEND},
+ Common::EN_ANY, Common::kPlatformDOS, 0, GUIO5(GUIO_NOSPEECH, GAMEOPTION_EGA_UNDITHER, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI) },
+
// Police Quest 2 - English Atari ST
// Game version 1.001.006 1989-01-16 13:30
// Executable reports "1.001.009"
@@ -4272,6 +4290,20 @@ static const struct ADGameDescription SciGameDescriptions[] = {
AD_LISTEND},
Common::EN_ANY, Common::kPlatformDOS, 0, GUIO4(GUIO_NOSPEECH, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI) },
+ // Space Quest 1 VGA Remake - Russian DOS (from ncuxonaT in bug report #10156)
+ // VERSION file reports "2.000"
+ // SCI interpreter version 1.000.510 (just a guess)
+ {"sq1sci", "SCI", {
+ {"resource.map", 0, "764bcf12ef3d19c2edb12fef95311b18", 5913},
+ {"resource.000", 0, "8796727a998f62f5126a88342a6b919c", 1027050},
+ {"resource.001", 0, "03b15058b01dfad36a78eeb3237a468a", 1042620},
+ {"resource.002", 0, "c10edb6ee3c57da2af7f7f3b92e2d173", 1173464},
+ {"resource.003", 0, "da52b87ce225d12a3aa35e6b157e785c", 1214406},
+ {"resource.004", 0, "424f08b7593e54aa0ae22478b73e628a", 1208608},
+ AD_LISTEND},
+ Common::RU_RUS, Common::kPlatformDOS, 0, GUIO4(GUIO_NOSPEECH, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI) },
+
+
// Space Quest 1 VGA Remake - English Mac (from Fingolfin)
{"sq1sci", "SCI", {
{"resource.map", 0, "5c6ad20407261b544238e8dce87afead", 5895},
diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index ecdf0cb695..b60aaa5c23 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -369,6 +369,7 @@ const SciWorkaroundEntry uninitializedReadWorkarounds[] = {
{ GID_LSL6, -1, 928, -1, "Narrator", "startText", NULL, 0, 0, { WORKAROUND_FAKE, 0 } }, // used by various objects that are even translated in foreign versions, that's why we use the base-class
{ GID_LSL6HIRES, -1, 85, 0, "LL6Inv", "init", NULL, 0, 0, { WORKAROUND_FAKE, 0 } }, // when creating a new game
{ GID_LSL6HIRES, -1, 85, 0, "washcloth", "doVerb", NULL, 0, 0, { WORKAROUND_FAKE, 0 } }, // when interacting with the wet washcloth in the inventory - Trac#9811
+ { GID_LSL6HIRES, 820, 82, 0, "", "export 0", NULL, 3, 3, { WORKAROUND_FAKE, 0 } }, // when touching the electric fence - bug #10361
{ GID_LSL6HIRES, -1, 64950, 1, "Feature", "handleEvent", NULL, 0, 0, { WORKAROUND_FAKE, 0 } }, // at least when entering swimming pool area
{ GID_LSL6HIRES, -1, 64964, 0, "DPath", "init", NULL, 1, 1, { WORKAROUND_FAKE, 0 } }, // during the game
{ GID_LSL7, -1, 64029, 0, "oMessager", "nextMsg", NULL, 4, 4, { WORKAROUND_FAKE, 0 } }, // when running the game with subtitles only
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index eb786bce03..78b641c9de 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -2918,6 +2918,9 @@ Common::String ResourceManager::findSierraGameId(const bool isBE) {
heap = findResource(ResourceId(kResourceTypeScript, 0), false);
Resource *vocab = findResource(ResourceId(kResourceTypeVocab, VOCAB_RESOURCE_SELECTORS), false);
+ if (!vocab)
+ return "";
+
const uint16 numSelectors = isBE ? vocab->getUint16BEAt(0) : vocab->getUint16LEAt(0);
for (uint16 i = 0; i < numSelectors; ++i) {
uint16 selectorOffset;
diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index 8ec1575af0..65891e0b0d 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -304,11 +304,11 @@ static const GameSettings gameVariantsTable[] = {
// The first version to use 640x480 resolution and wizImages
// There are also 7.1 versions of freddemo, airdemo and farmdemo
{"catalog", "", 0, GID_HEGAME, 6, 71, MDT_NONE, GF_USE_KEY, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT)},
+ {"farm", "", 0, GID_HEGAME, 6, 71, MDT_NONE, GF_USE_KEY, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT)},
{"freddi", "", 0, GID_HEGAME, 6, 71, MDT_NONE, GF_USE_KEY, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT)},
// Humongous Entertainment Scumm Version 7.2
{"airport", "", 0, GID_HEGAME, 6, 72, MDT_NONE, GF_USE_KEY, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT)},
- {"farm", "", 0, GID_HEGAME, 6, 72, MDT_NONE, GF_USE_KEY, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT)},
// Changed o_getResourceSize to cover all resource types
{"puttzoo", "", 0, GID_PUTTZOO, 6, 73, MDT_NONE, GF_USE_KEY, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT)},
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index 6cc2fbdc04..50ed673a05 100644
--- a/engines/scumm/scumm-md5.h
+++ b/engines/scumm/scumm-md5.h
@@ -1,5 +1,5 @@
/*
- This file was generated by the md5table tool on Mon Aug 21 13:35:07 2017
+ This file was generated by the md5table tool on Fri Dec 22 04:43:47 2017
DO NOT EDIT MANUALLY!
*/
@@ -179,7 +179,7 @@ static const MD5Table md5table[] = {
{ "3938ee1aa4433fca9d9308c9891172b1", "indyzak", "FM-TOWNS", "Demo", 7520, Common::EN_ANY, Common::kPlatformFMTowns },
{ "399b217b0c8d65d0398076da486363a9", "indy3", "VGA", "VGA", 6295, Common::DE_DEU, Common::kPlatformDOS },
{ "39cb9dec16fa16f38d79acd80effb059", "loom", "EGA", "EGA", -1, Common::UNK_LANG, Common::kPlatformAmiga },
- { "39fd6db10d0222d817025c4d3346e3b4", "farm", "", "Demo", -1, Common::EN_ANY, Common::kPlatformMacintosh },
+ { "39fd6db10d0222d817025c4d3346e3b4", "farm", "HE 72", "Demo", -1, Common::EN_ANY, Common::kPlatformMacintosh },
{ "3a03dab514e4038df192d8a8de469788", "atlantis", "Floppy", "Floppy", -1, Common::EN_ANY, Common::kPlatformAmiga },
{ "3a0c35f3c147b98a2bdf8d400cfc4ab5", "indy3", "FM-TOWNS", "", -1, Common::JA_JPN, Common::kPlatformFMTowns },
{ "3a3e592b074f595489f7f11e150c398d", "puttzoo", "HE 99", "Updated", -1, Common::EN_ANY, Common::kPlatformWindows },
@@ -329,7 +329,7 @@ static const MD5Table md5table[] = {
{ "6bca7a1a96d16e52b8f3c42b50dbdca3", "fbear", "HE 62", "", -1, Common::JA_JPN, Common::kPlatform3DO },
{ "6bf70eee5de3d24d2403e0dd3d267e8a", "spyfox", "", "", 49221, Common::UNK_LANG, Common::kPlatformWindows },
{ "6c2bff0e327f2962e809c2e1a82d7309", "monkey", "VGA", "", -1, Common::EN_ANY, Common::kPlatformAmiga },
- { "6c375c2236d99f56e6c2cf540e74e474", "farm", "", "Demo", 34333, Common::NL_NLD, Common::kPlatformWindows },
+ { "6c375c2236d99f56e6c2cf540e74e474", "farm", "HE 72", "Demo", 34333, Common::NL_NLD, Common::kPlatformWindows },
{ "6d1baa1065ac5f7b210be8ebe4235e49", "freddi", "HE 73", "", 26384, Common::NL_NLD, Common::kPlatformMacintosh },
{ "6dead580b0ff14d5f7b33b4219f04159", "samnmax", "", "Demo", 16556335, Common::EN_ANY, Common::kPlatformMacintosh },
{ "6df20c50c1ab19799de9be7ae7716881", "fbear", "HE 62", "Demo", -1, Common::EN_ANY, Common::kPlatformMacintosh },
@@ -485,7 +485,7 @@ static const MD5Table md5table[] = {
{ "a56e8d9d4281c53c3f63c9bd22a59e21", "catalog", "HE CUP", "Preview", 10978342, Common::EN_ANY, Common::kPlatformUnknown },
{ "a570381b028972d891052ee1e51dc011", "maniac", "V2", "V2", 1988, Common::EN_ANY, Common::kPlatformAtariST },
{ "a59a438cb182124c30c4447d8ed469e9", "freddi", "HE 100", "", 34837, Common::NB_NOR, Common::kPlatformWii },
- { "a5c5388da9bf0e6662fdca8813a79d13", "farm", "", "", 86962, Common::EN_ANY, Common::kPlatformWindows },
+ { "a5c5388da9bf0e6662fdca8813a79d13", "farm", "HE 72", "", 86962, Common::EN_ANY, Common::kPlatformWindows },
{ "a654fb60c3b67d6317a7894ffd9f25c5", "pajama3", "", "Demo", -1, Common::EN_USA, Common::kPlatformUnknown },
{ "a71014c53a6d18c66ef2ea0ee42328e9", "PuttTime", "HE 99", "Mini Game", 18458, Common::NL_NLD, Common::kPlatformWindows },
{ "a77d0efbe786ea7f490c2021dbfa3f2f", "zak", "V2", "V2", -1, Common::RU_RUS, Common::kPlatformDOS },
@@ -683,6 +683,7 @@ static const MD5Table md5table[] = {
{ "f3c5d9bf3f091bd1f18dc1013fba5396", "atlantis", "Steam", "Steam", 638976, Common::EN_ANY, Common::kPlatformWindows },
{ "f3d55aea441e260e9e9c7d2a187097e0", "puttzoo", "", "Demo", 14337, Common::EN_ANY, Common::kPlatformWindows },
{ "f40a7f495f59188ca57a9d1d50301bb6", "puttputt", "HE 60", "Demo", -1, Common::EN_ANY, Common::kPlatformMacintosh },
+ { "f4357cf21ba59889d6d5bcc431140238", "farm", "", "", -1, Common::EN_ANY, Common::kPlatformWindows },
{ "f4d20ab4ce19743a646cb48bd93aee72", "monkey2", "SE Talkie", "Unofficial SE Talkie v0.2", 10835, Common::EN_ANY, Common::kPlatformDOS },
{ "f5228b0cc1c19e6ea8268ba2eeb61f60", "freddi", "HE 73", "Demo", -1, Common::FR_FRA, Common::kPlatformWindows },
{ "f73883f13b5a302749a5bad31d909780", "tentacle", "", "CD", -1, Common::DE_DEU, Common::kPlatformMacintosh },
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index ec7d60a1a2..9ed6951fbe 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -57,24 +57,23 @@ void Cache::load(const Common::String &name, Common::SeekableReadStream &stream)
int32 signature = stream.readUint32BE();
stream.seek(0);
-
- // Allocate a new cache entry
- _resources[name] = CacheEntry();
- CacheEntry &cacheEntry = _resources[name];
-
+
// Check whether the file is compressed
if (signature == MKTAG('L', 'Z', 'V', 26)) {
+
+ // Allocate a new cache entry
+ _resources[name] = CacheEntry();
+ CacheEntry &cacheEntry = _resources[name];
+
// It's compressed, so decompress the file and store its data in the cache entry
Common::SeekableReadStream *decompressed = _vm->_res->decompress(stream);
cacheEntry.resize(decompressed->size());
decompressed->read(&cacheEntry[0], decompressed->size());
delete decompressed;
- } else {
- // It's not, so read the raw data of the file into the cache entry
- cacheEntry.resize(stream.size());
- stream.read(&cacheEntry[0], stream.size());
+
}
+
}
Common::SeekableReadStream *Cache::get(const Common::String &filename) const {
diff --git a/engines/sludge/backdrop.cpp b/engines/sludge/backdrop.cpp
index dab10be8b3..c1042c7f05 100644
--- a/engines/sludge/backdrop.cpp
+++ b/engines/sludge/backdrop.cpp
@@ -35,11 +35,11 @@
#include "sludge/imgloader.h"
#include "sludge/moreio.h"
#include "sludge/newfatal.h"
+#include "sludge/speech.h"
#include "sludge/statusba.h"
#include "sludge/zbuffer.h"
#include "sludge/sludge.h"
#include "sludge/sludger.h"
-#include "sludge/talk.h"
#include "sludge/variable.h"
#include "sludge/version.h"
@@ -185,7 +185,7 @@ bool GraphicsManager::snapshot() {
// draw snapshot to rendersurface
displayBase();
- viewSpeech(); // ...and anything being said
+ _vm->_speechMan->display();
drawStatusBar();
// copy backdrop to snapshot
diff --git a/engines/sludge/builtin.cpp b/engines/sludge/builtin.cpp
index 9b4c1b7622..7385d4d861 100644
--- a/engines/sludge/builtin.cpp
+++ b/engines/sludge/builtin.cpp
@@ -24,34 +24,33 @@
#include "common/savefile.h"
#include "sludge/allfiles.h"
-#include "sludge/sludger.h"
-#include "sludge/builtin.h"
-#include "sludge/newfatal.h"
-#include "sludge/cursors.h"
-#include "sludge/statusba.h"
-#include "sludge/loadsave.h"
#include "sludge/backdrop.h"
#include "sludge/bg_effects.h"
-#include "sludge/sprites.h"
-#include "sludge/fonttext.h"
-#include "sludge/sprbanks.h"
-#include "sludge/people.h"
-#include "sludge/sound.h"
-#include "sludge/objtypes.h"
+#include "sludge/builtin.h"
+#include "sludge/cursors.h"
+#include "sludge/event.h"
#include "sludge/floor.h"
-#include "sludge/zbuffer.h"
-#include "sludge/talk.h"
-#include "sludge/region.h"
+#include "sludge/fonttext.h"
+#include "sludge/freeze.h"
+#include "sludge/graphics.h"
#include "sludge/language.h"
+#include "sludge/loadsave.h"
#include "sludge/moreio.h"
#include "sludge/movie.h"
+#include "sludge/newfatal.h"
+#include "sludge/objtypes.h"
+#include "sludge/people.h"
+#include "sludge/region.h"
#include "sludge/savedata.h"
-#include "sludge/freeze.h"
-#include "sludge/language.h"
+#include "sludge/sludger.h"
+#include "sludge/sound.h"
+#include "sludge/speech.h"
+#include "sludge/sprbanks.h"
+#include "sludge/sprites.h"
+#include "sludge/statusba.h"
#include "sludge/sludge.h"
#include "sludge/utf8.h"
-#include "sludge/graphics.h"
-#include "sludge/event.h"
+#include "sludge/zbuffer.h"
namespace Sludge {
@@ -71,7 +70,6 @@ extern int numBIFNames, numUserFunc;
extern Common::String *allUserFunc;
extern Common::String *allBIFNames;
-extern float speechSpeed;
extern byte brightnessLevel;
extern byte fadeMode;
extern uint16 saveEncoding;
@@ -153,7 +151,7 @@ static BuiltReturn sayCore(int numParams, LoadedFunction *fun, bool sayIt) {
if (!getValueType(objT, SVT_OBJTYPE, fun->stack->thisVar))
return BR_ERROR;
trimStack(fun->stack);
- p = wrapSpeech(newText, objT, fileNum, sayIt);
+ p = g_sludge->_speechMan->wrapSpeech(newText, objT, fileNum, sayIt);
fun->timeLeft = p;
//debugOut ("BUILTIN: sayCore: %s (%i)\n", newText, p);
fun->isSpeech = true;
@@ -1298,7 +1296,7 @@ builtIn(setSpeechMode) {
builtIn(somethingSpeaking) {
UNUSEDALL
- int i = isThereAnySpeechGoingOn();
+ int i = g_sludge->_speechMan->isThereAnySpeechGoingOn();
if (i == -1) {
setVariable(fun->reg, SVT_INT, 0);
} else {
@@ -1958,7 +1956,7 @@ builtIn(setSpeechSpeed) {
if (!getValueType(number, SVT_INT, fun->stack->thisVar))
return BR_ERROR;
trimStack(fun->stack);
- speechSpeed = number * 0.01;
+ g_sludge->_speechMan->setSpeechSpeed(number * 0.01);
setVariable(fun->reg, SVT_INT, 1);
return BR_CONTINUE;
}
diff --git a/engines/sludge/floor.cpp b/engines/sludge/floor.cpp
index 45a7501470..71aa75cbe7 100644
--- a/engines/sludge/floor.cpp
+++ b/engines/sludge/floor.cpp
@@ -23,12 +23,12 @@
#include "graphics/surface.h"
#include "sludge/allfiles.h"
-#include "sludge/newfatal.h"
#include "sludge/fileset.h"
+#include "sludge/floor.h"
#include "sludge/graphics.h"
#include "sludge/moreio.h"
+#include "sludge/newfatal.h"
#include "sludge/sludge.h"
-#include "sludge/floor.h"
namespace Sludge {
diff --git a/engines/sludge/fonttext.cpp b/engines/sludge/fonttext.cpp
index 787e95e6f3..0f63c6e24f 100644
--- a/engines/sludge/fonttext.cpp
+++ b/engines/sludge/fonttext.cpp
@@ -21,11 +21,11 @@
*/
#include "sludge/allfiles.h"
-#include "sludge/sprites.h"
#include "sludge/fonttext.h"
#include "sludge/graphics.h"
-#include "sludge/newfatal.h"
#include "sludge/moreio.h"
+#include "sludge/newfatal.h"
+#include "sludge/sprites.h"
#include "sludge/sludge.h"
#include "sludge/version.h"
diff --git a/engines/sludge/freeze.cpp b/engines/sludge/freeze.cpp
index 3e8cdef0d0..e90f2700d8 100644
--- a/engines/sludge/freeze.cpp
+++ b/engines/sludge/freeze.cpp
@@ -19,9 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
+
#include "sludge/allfiles.h"
-#include "sludge/cursors.h"
#include "sludge/backdrop.h"
+#include "sludge/cursors.h"
#include "sludge/event.h"
#include "sludge/fonttext.h"
#include "sludge/freeze.h"
@@ -30,12 +31,12 @@
#include "sludge/objtypes.h"
#include "sludge/people.h"
#include "sludge/region.h"
-#include "sludge/sprites.h"
-#include "sludge/sprbanks.h"
#include "sludge/sludge.h"
#include "sludge/sludger.h"
+#include "sludge/speech.h"
+#include "sludge/sprites.h"
+#include "sludge/sprbanks.h"
#include "sludge/statusba.h"
-#include "sludge/talk.h"
#include "sludge/zbuffer.h"
namespace Sludge {
@@ -43,7 +44,6 @@ namespace Sludge {
extern OnScreenPerson *allPeople;
extern ScreenRegion *allScreenRegions;
extern ScreenRegion *overRegion;
-extern SpeechStruct *speech;
void GraphicsManager::freezeGraphics() {
@@ -100,10 +100,7 @@ bool GraphicsManager::freeze() {
overRegion = NULL;
_vm->_cursorMan->freeze(newFreezer);
-
- newFreezer->speech = speech;
- initSpeech();
-
+ _vm->_speechMan->freeze(newFreezer);
_vm->_evtMan->freeze(newFreezer);
newFreezer->next = _frozenStuff;
@@ -168,19 +165,12 @@ void GraphicsManager::unfreeze(bool killImage) {
killParallax();
_parallaxStuff = _frozenStuff->parallaxStuff;
-
_vm->_cursorMan->resotre(_frozenStuff);
-
restoreBarStuff(_frozenStuff->frozenStatus);
-
_vm->_evtMan->restore(_frozenStuff);
+ _vm->_speechMan->restore(_frozenStuff);
- killAllSpeech();
- delete speech;
-
- speech = _frozenStuff->speech;
_frozenStuff = _frozenStuff->next;
-
overRegion = NULL;
// free current frozen screen struct
diff --git a/engines/sludge/language.cpp b/engines/sludge/language.cpp
index 8bd9d51493..f2cde99a9c 100644
--- a/engines/sludge/language.cpp
+++ b/engines/sludge/language.cpp
@@ -24,9 +24,9 @@
#include "sludge/allfiles.h"
#include "sludge/fileset.h"
-#include "sludge/newfatal.h"
-#include "sludge/moreio.h"
#include "sludge/language.h"
+#include "sludge/moreio.h"
+#include "sludge/newfatal.h"
#include "sludge/sludge.h"
#include "sludge/version.h"
diff --git a/engines/sludge/loadsave.cpp b/engines/sludge/loadsave.cpp
index 21c80f7e25..4cabbc79da 100644
--- a/engines/sludge/loadsave.cpp
+++ b/engines/sludge/loadsave.cpp
@@ -23,30 +23,30 @@
#include "common/savefile.h"
#include "sludge/allfiles.h"
-#include "sludge/sprites.h"
+#include "sludge/backdrop.h"
+#include "sludge/bg_effects.h"
+#include "sludge/cursors.h"
#include "sludge/event.h"
+#include "sludge/floor.h"
#include "sludge/fonttext.h"
-#include "sludge/newfatal.h"
-#include "sludge/variable.h"
+#include "sludge/graphics.h"
#include "sludge/language.h"
+#include "sludge/loadsave.h"
#include "sludge/moreio.h"
-#include "sludge/sludge.h"
-#include "sludge/sludger.h"
-#include "sludge/people.h"
-#include "sludge/talk.h"
+#include "sludge/newfatal.h"
#include "sludge/objtypes.h"
-#include "sludge/backdrop.h"
+#include "sludge/people.h"
#include "sludge/region.h"
-#include "sludge/floor.h"
-#include "sludge/zbuffer.h"
-#include "sludge/cursors.h"
-#include "sludge/statusba.h"
+#include "sludge/sludge.h"
+#include "sludge/sludger.h"
#include "sludge/sound.h"
-#include "sludge/loadsave.h"
-#include "sludge/bg_effects.h"
+#include "sludge/sprites.h"
+#include "sludge/statusba.h"
+#include "sludge/speech.h"
#include "sludge/utf8.h"
+#include "sludge/variable.h"
#include "sludge/version.h"
-#include "sludge/graphics.h"
+#include "sludge/zbuffer.h"
namespace Sludge {
@@ -59,9 +59,7 @@ extern const char *typeName[]; // In variable.cpp
extern int numGlobals; // In sludger.cpp
extern Variable *globalVars; // In sludger.cpp
extern Floor *currentFloor; // In floor.cpp
-extern SpeechStruct *speech; // In talk.cpp
extern FILETIME fileTime; // In sludger.cpp
-extern int speechMode; // " " "
extern byte brightnessLevel; // " " "
extern byte fadeMode; // In transition.cpp
extern bool captureAllKeys;
@@ -410,12 +408,11 @@ bool saveGame(const Common::String &fname) {
}
g_sludge->_gfxMan->saveZBuffer(fp);
-
g_sludge->_gfxMan->saveLightMap(fp);
- fp->writeByte(speechMode);
fp->writeByte(fadeMode);
- saveSpeech(speech, fp);
+
+ g_sludge->_speechMan->save(fp);
saveStatusBars(fp);
g_sludge->_soundMan->saveSounds(fp);
@@ -559,9 +556,8 @@ bool loadGame(const Common::String &fname) {
return false;
}
- speechMode = fp->readByte();
fadeMode = fp->readByte();
- loadSpeech(speech, fp);
+ g_sludge->_speechMan->load(fp);
loadStatusBars(fp);
g_sludge->_soundMan->loadSounds(fp);
diff --git a/engines/sludge/loadsave.h b/engines/sludge/loadsave.h
index 120e638369..269fadb507 100644
--- a/engines/sludge/loadsave.h
+++ b/engines/sludge/loadsave.h
@@ -24,6 +24,10 @@
namespace Sludge {
+struct LoadedFunction;
+struct Variable;
+struct VariableStack;
+
bool saveGame(const Common::String &fname);
bool loadGame(const Common::String &fname);
diff --git a/engines/sludge/main_loop.cpp b/engines/sludge/main_loop.cpp
index fc164dfd57..905d91d9c2 100644
--- a/engines/sludge/main_loop.cpp
+++ b/engines/sludge/main_loop.cpp
@@ -38,7 +38,7 @@
#include "sludge/sound.h"
#include "sludge/sludge.h"
#include "sludge/sludger.h"
-#include "sludge/talk.h"
+#include "sludge/speech.h"
#include "sludge/transition.h"
#include "sludge/timing.h"
diff --git a/engines/sludge/module.mk b/engines/sludge/module.mk
index 07f1af36c0..a083ec4a95 100644
--- a/engines/sludge/module.mk
+++ b/engines/sludge/module.mk
@@ -28,10 +28,10 @@ MODULE_OBJS := \
sludge.o \
sludger.o \
sound.o \
+ speech.o \
sprbanks.o \
sprites.o \
statusba.o \
- talk.o \
thumbnail.o \
timing.o \
transition.o \
diff --git a/engines/sludge/movie.cpp b/engines/sludge/movie.cpp
index 0162a7086b..271728da75 100644
--- a/engines/sludge/movie.cpp
+++ b/engines/sludge/movie.cpp
@@ -20,10 +20,10 @@
*
*/
-#include "sludge/newfatal.h"
-#include "sludge/timing.h"
#include "sludge/movie.h"
+#include "sludge/newfatal.h"
#include "sludge/sound.h"
+#include "sludge/timing.h"
namespace Sludge {
diff --git a/engines/sludge/newfatal.cpp b/engines/sludge/newfatal.cpp
index 70f6bd9209..edd4a88073 100644
--- a/engines/sludge/newfatal.cpp
+++ b/engines/sludge/newfatal.cpp
@@ -23,9 +23,9 @@
#include "common/debug.h"
#include "sludge/allfiles.h"
-#include "sludge/sound.h"
#include "sludge/errors.h"
#include "sludge/sludge.h"
+#include "sludge/sound.h"
#include "sludge/version.h"
namespace Sludge {
diff --git a/engines/sludge/objtypes.cpp b/engines/sludge/objtypes.cpp
index dc41249ab7..12d4318884 100644
--- a/engines/sludge/objtypes.cpp
+++ b/engines/sludge/objtypes.cpp
@@ -21,12 +21,12 @@
*/
#include "sludge/allfiles.h"
-#include "sludge/objtypes.h"
-#include "sludge/variable.h"
-#include "sludge/newfatal.h"
+#include "sludge/fileset.h"
#include "sludge/moreio.h"
+#include "sludge/newfatal.h"
+#include "sludge/objtypes.h"
#include "sludge/sludge.h"
-#include "sludge/fileset.h"
+#include "sludge/variable.h"
#include "sludge/version.h"
namespace Sludge {
diff --git a/engines/sludge/people.cpp b/engines/sludge/people.cpp
index a6adc4ebfb..4aec5fa8b7 100644
--- a/engines/sludge/people.cpp
+++ b/engines/sludge/people.cpp
@@ -21,23 +21,23 @@
*/
#include "sludge/allfiles.h"
+#include "sludge/floor.h"
#include "sludge/graphics.h"
-#include "sludge/sprites.h"
-#include "sludge/sprbanks.h"
-#include "sludge/sludger.h"
+#include "sludge/loadsave.h"
+#include "sludge/moreio.h"
+#include "sludge/newfatal.h"
#include "sludge/objtypes.h"
-#include "sludge/region.h"
#include "sludge/people.h"
-#include "sludge/talk.h"
-#include "sludge/newfatal.h"
-#include "sludge/variable.h"
-#include "sludge/moreio.h"
-#include "sludge/loadsave.h"
-#include "sludge/floor.h"
-#include "sludge/zbuffer.h"
+#include "sludge/region.h"
#include "sludge/sludge.h"
+#include "sludge/sludger.h"
#include "sludge/sound.h"
+#include "sludge/speech.h"
+#include "sludge/sprbanks.h"
+#include "sludge/sprites.h"
+#include "sludge/variable.h"
#include "sludge/version.h"
+#include "sludge/zbuffer.h"
#define ANGLEFIX (180.0 / 3.14157)
#define ANI_STAND 0
@@ -46,8 +46,6 @@
namespace Sludge {
-extern SpeechStruct *speech;
-
extern VariableStack *noStack;
extern int ssgVersion;
@@ -202,7 +200,7 @@ bool turnPersonToFace(int thisNum, int direc) {
thisPerson->walking = false;
thisPerson->spinning = false;
turnMeAngle(thisPerson, direc);
- setFrames(*thisPerson, (thisPerson == speech->currentTalker) ? ANI_TALK : ANI_STAND);
+ setFrames(*thisPerson, g_sludge->_speechMan->isCurrentTalker(thisPerson) ? ANI_TALK : ANI_STAND);
return true;
}
return false;
diff --git a/engines/sludge/savedata.cpp b/engines/sludge/savedata.cpp
index 9b75e137f3..9e2c92395d 100644
--- a/engines/sludge/savedata.cpp
+++ b/engines/sludge/savedata.cpp
@@ -23,9 +23,9 @@
#include "common/file.h"
#include "sludge/allfiles.h"
-#include "sludge/variable.h"
-#include "sludge/newfatal.h"
#include "sludge/moreio.h"
+#include "sludge/newfatal.h"
+#include "sludge/variable.h"
#define LOAD_ERROR "Can't load custom data...\n\n"
diff --git a/engines/sludge/sludge.cpp b/engines/sludge/sludge.cpp
index 97904e191f..d14f92202f 100644
--- a/engines/sludge/sludge.cpp
+++ b/engines/sludge/sludge.cpp
@@ -27,10 +27,11 @@
#include "sludge/cursors.h"
#include "sludge/event.h"
+#include "sludge/fonttext.h"
#include "sludge/graphics.h"
#include "sludge/sludge.h"
#include "sludge/sound.h"
-#include "sludge/fonttext.h"
+#include "sludge/speech.h"
#include "sludge/main_loop.h"
namespace Sludge {
@@ -80,6 +81,7 @@ SludgeEngine::SludgeEngine(OSystem *syst, const SludgeGameDescription *gameDesc)
_soundMan = new SoundManager();
_txtMan = new TextManager();
_cursorMan = new CursorManager(this);
+ _speechMan = new SpeechManager(this);
}
SludgeEngine::~SludgeEngine() {
@@ -118,6 +120,8 @@ SludgeEngine::~SludgeEngine() {
_languageMan = nullptr;
delete _resMan;
_resMan = nullptr;
+ delete _speechMan;
+ _speechMan = nullptr;
}
Common::Error SludgeEngine::run() {
diff --git a/engines/sludge/sludge.h b/engines/sludge/sludge.h
index 240045db57..83c6359f52 100644
--- a/engines/sludge/sludge.h
+++ b/engines/sludge/sludge.h
@@ -42,6 +42,7 @@ class CursorManager;
class EventManager;
class GraphicsManager;
class SoundManager;
+class SpeechManager;
class TextManager;
class SludgeConsole;
@@ -86,6 +87,7 @@ public:
SoundManager *_soundMan;
TextManager *_txtMan;
CursorManager *_cursorMan;
+ SpeechManager *_speechMan;
SludgeEngine(OSystem *syst, const SludgeGameDescription *gameDesc);
virtual ~SludgeEngine();
diff --git a/engines/sludge/sludger.cpp b/engines/sludge/sludger.cpp
index 69e6966e74..812f42fb5d 100644
--- a/engines/sludge/sludger.cpp
+++ b/engines/sludge/sludger.cpp
@@ -47,7 +47,7 @@
#include "sludge/sound.h"
#include "sludge/sludge.h"
#include "sludge/sludger.h"
-#include "sludge/talk.h"
+#include "sludge/speech.h"
#include "sludge/transition.h"
#include "sludge/variable.h"
#include "sludge/version.h"
@@ -71,7 +71,6 @@ bool captureAllKeys = false;
byte brightnessLevel = 255;
-extern SpeechStruct *speech;
extern LoadedFunction *saverFunc;
LoadedFunction *allRunningFunctions = NULL;
@@ -81,8 +80,6 @@ Variable *globalVars;
int numGlobals = 0;
extern SpritePalette pastePalette;
-extern int speechMode;
-extern float speechSpeed;
extern Variable *launchResult;
extern int lastFramesPerSecond, thumbWidth, thumbHeight;
@@ -155,7 +152,7 @@ void initSludge() {
initPeople();
initFloor();
g_sludge->_objMan->init();
- initSpeech();
+ g_sludge->_speechMan->init();
initStatusBar();
resetRandW();
g_sludge->_evtMan->init();
@@ -169,7 +166,6 @@ void initSludge() {
// global variables
numGlobals = 0;
- speechMode = 0;
launchResult = nullptr;
lastFramesPerSecond = -1;
@@ -179,7 +175,6 @@ void initSludge() {
noStack = nullptr;
numBIFNames = numUserFunc = 0;
allUserFunc = allBIFNames = nullptr;
- speechSpeed = 1;
brightnessLevel = 255;
fadeMode = 2;
saveEncoding = false;
@@ -190,7 +185,7 @@ void killSludge() {
killAllPeople();
killAllRegions();
setFloorNull();
- killAllSpeech();
+ g_sludge->_speechMan->kill();
g_sludge->_languageMan->kill();
g_sludge->_gfxMan->kill();
g_sludge->_resMan->kill();
@@ -345,7 +340,7 @@ void displayBase() {
void sludgeDisplay() {
displayBase();
- viewSpeech();// ...and anything being said
+ g_sludge->_speechMan->display();
drawStatusBar();
g_sludge->_cursorMan->displayCursor();
g_sludge->_gfxMan->display();
@@ -381,7 +376,7 @@ void killSpeechTimers() {
thisFunction = thisFunction->next;
}
- killAllSpeech();
+ g_sludge->_speechMan->kill();
}
void completeTimers() {
@@ -940,7 +935,7 @@ bool runSludge() {
if (thisFunction->timeLeft) {
if (thisFunction->timeLeft < 0) {
if (!g_sludge->_soundMan->stillPlayingSound(
- g_sludge->_soundMan->findInSoundCache(speech->lastFile))) {
+ g_sludge->_speechMan->getLastSpeechSound())) {
thisFunction->timeLeft = 0;
}
} else if (!--(thisFunction->timeLeft)) {
@@ -948,7 +943,7 @@ bool runSludge() {
} else {
if (thisFunction->isSpeech) {
thisFunction->isSpeech = false;
- killAllSpeech();
+ g_sludge->_speechMan->kill();
}
if (!continueFunction(thisFunction))
return false;
diff --git a/engines/sludge/sound.cpp b/engines/sludge/sound.cpp
index 8f8284f1da..306fd49b4e 100644
--- a/engines/sludge/sound.cpp
+++ b/engines/sludge/sound.cpp
@@ -31,11 +31,11 @@
#include "audio/mods/mod_xm_s3m.h"
#include "sludge/allfiles.h"
-#include "sludge/newfatal.h"
-#include "sludge/sound.h"
-#include "sludge/moreio.h"
#include "sludge/fileset.h"
+#include "sludge/moreio.h"
+#include "sludge/newfatal.h"
#include "sludge/sludge.h"
+#include "sludge/sound.h"
namespace Sludge {
diff --git a/engines/sludge/talk.cpp b/engines/sludge/speech.cpp
index 4bb1d222b6..1d342a1b65 100644
--- a/engines/sludge/talk.cpp
+++ b/engines/sludge/speech.cpp
@@ -22,64 +22,62 @@
#include "sludge/allfiles.h"
#include "sludge/backdrop.h"
+#include "sludge/fonttext.h"
+#include "sludge/freeze.h"
#include "sludge/graphics.h"
-#include "sludge/sprites.h"
-#include "sludge/sludger.h"
+#include "sludge/moreio.h"
+#include "sludge/newfatal.h"
#include "sludge/objtypes.h"
-#include "sludge/region.h"
-#include "sludge/sprbanks.h"
#include "sludge/people.h"
-#include "sludge/talk.h"
+#include "sludge/region.h"
#include "sludge/sludge.h"
+#include "sludge/sludger.h"
#include "sludge/sound.h"
-#include "sludge/fonttext.h"
-#include "sludge/newfatal.h"
-#include "sludge/moreio.h"
+#include "sludge/speech.h"
+#include "sludge/sprbanks.h"
+#include "sludge/sprites.h"
namespace Sludge {
-extern int speechMode;
-SpeechStruct *speech;
-float speechSpeed = 1;
-
-void initSpeech() {
- speech = new SpeechStruct;
- if (checkNew(speech)) {
- speech->currentTalker = NULL;
- speech->allSpeech = NULL;
- speech->speechY = 0;
- speech->lastFile = -1;
+void SpeechManager::init() {
+ _speechMode = 0;
+ _speechSpeed = 1;
+ _speech = new SpeechStruct;
+ if (checkNew(_speech)) {
+ _speech->currentTalker = NULL;
+ _speech->allSpeech = NULL;
+ _speech->speechY = 0;
+ _speech->lastFile = -1;
}
}
-void killAllSpeech() {
- if (!speech)
+void SpeechManager::kill() {
+ if (!_speech)
return;
- if (speech->lastFile != -1) {
- g_sludge->_soundMan->huntKillSound(speech->lastFile);
- speech->lastFile = -1;
+ if (_speech->lastFile != -1) {
+ _vm->_soundMan->huntKillSound(_speech->lastFile);
+ _speech->lastFile = -1;
}
- if (speech->currentTalker) {
- makeSilent(*(speech->currentTalker));
- speech->currentTalker = NULL;
+ if (_speech->currentTalker) {
+ makeSilent(*(_speech->currentTalker));
+ _speech->currentTalker = NULL;
}
SpeechLine *killMe;
-
- while (speech->allSpeech) {
- killMe = speech->allSpeech;
- speech->allSpeech = speech->allSpeech->next;
+ while (_speech->allSpeech) {
+ killMe = _speech->allSpeech;
+ _speech->allSpeech = _speech->allSpeech->next;
delete killMe;
}
}
-inline void setObjFontColour(ObjectType *t) {
- setFontColour(speech->talkCol, t->r, t->g, t->b);
+void SpeechManager::setObjFontColour(ObjectType *t) {
+ setFontColour(_speech->talkCol, t->r, t->g, t->b);
}
-void addSpeechLine(const Common::String &theLine, int x, int &offset) {
+void SpeechManager::addSpeechLine(const Common::String &theLine, int x, int &offset) {
float cameraZoom = g_sludge->_gfxMan->getCamZoom();
int halfWidth = (g_sludge->_txtMan->stringWidth(theLine) >> 1) / cameraZoom;
int xx1 = x - (halfWidth);
@@ -87,11 +85,11 @@ void addSpeechLine(const Common::String &theLine, int x, int &offset) {
SpeechLine *newLine = new SpeechLine;
checkNew(newLine);
- newLine->next = speech->allSpeech;
+ newLine->next = _speech->allSpeech;
newLine->textLine.clear();
newLine->textLine = theLine;
newLine->x = xx1;
- speech->allSpeech = newLine;
+ _speech->allSpeech = newLine;
if ((xx1 < 5) && (offset < (5 - xx1))) {
offset = 5 - xx1;
} else if ((xx2 >= ((float) g_system->getWidth() / cameraZoom) - 5)
@@ -100,33 +98,37 @@ void addSpeechLine(const Common::String &theLine, int x, int &offset) {
}
}
-int isThereAnySpeechGoingOn() {
- return speech->allSpeech ? speech->lookWhosTalking : -1;
+int SpeechManager::isThereAnySpeechGoingOn() {
+ return _speech->allSpeech ? _speech->lookWhosTalking : -1;
}
-int wrapSpeechXY(const Common::String &theText, int x, int y, int wrap, int sampleFile) {
+int SpeechManager::getLastSpeechSound() {
+ return _vm->_soundMan->findInSoundCache(_speech->lastFile);
+}
+
+int SpeechManager::wrapSpeechXY(const Common::String &theText, int x, int y, int wrap, int sampleFile) {
float cameraZoom = g_sludge->_gfxMan->getCamZoom();
int fontHeight = g_sludge->_txtMan->getFontHeight();
int cameraY = g_sludge->_gfxMan->getCamY();
int a, offset = 0;
- killAllSpeech();
+ kill();
- int speechTime = (theText.size() + 20) * speechSpeed;
+ int speechTime = (theText.size() + 20) * _speechSpeed;
if (speechTime < 1)
speechTime = 1;
if (sampleFile != -1) {
- if (speechMode >= 1) {
+ if (_speechMode >= 1) {
if (g_sludge->_soundMan->startSound(sampleFile, false)) {
speechTime = -10;
- speech->lastFile = sampleFile;
- if (speechMode == 2) return -10;
+ _speech->lastFile = sampleFile;
+ if (_speechMode == 2) return -10;
}
}
}
- speech->speechY = y;
+ _speech->speechY = y;
char *tmp, *txt;
tmp = txt = createCString(theText);
@@ -150,13 +152,13 @@ int wrapSpeechXY(const Common::String &theText, int x, int y, int wrap, int samp
delete []tmp;
if (y < 0)
- speech->speechY -= y;
- else if (speech->speechY > cameraY + (float) (g_system->getHeight() - fontHeight / 3) / cameraZoom)
- speech->speechY = cameraY
+ _speech->speechY -= y;
+ else if (_speech->speechY > cameraY + (float) (g_system->getHeight() - fontHeight / 3) / cameraZoom)
+ _speech->speechY = cameraY
+ (float) (g_system->getHeight() - fontHeight / 3) / cameraZoom;
if (offset) {
- SpeechLine *viewLine = speech->allSpeech;
+ SpeechLine *viewLine = _speech->allSpeech;
while (viewLine) {
viewLine->x += offset;
viewLine = viewLine->next;
@@ -165,7 +167,7 @@ int wrapSpeechXY(const Common::String &theText, int x, int y, int wrap, int samp
return speechTime;
}
-int wrapSpeechPerson(const Common::String &theText, OnScreenPerson &thePerson, int sampleFile, bool animPerson) {
+int SpeechManager::wrapSpeechPerson(const Common::String &theText, OnScreenPerson &thePerson, int sampleFile, bool animPerson) {
int cameraX = g_sludge->_gfxMan->getCamX();
int cameraY = g_sludge->_gfxMan->getCamY();
int i = wrapSpeechXY(theText, thePerson.x - cameraX,
@@ -175,17 +177,17 @@ int wrapSpeechPerson(const Common::String &theText, OnScreenPerson &thePerson, i
thePerson.thisType->wrapSpeech, sampleFile);
if (animPerson) {
makeTalker(thePerson);
- speech->currentTalker = &thePerson;
+ _speech->currentTalker = &thePerson;
}
return i;
}
-int wrapSpeech(const Common::String &theText, int objT, int sampleFile, bool animPerson) {
+int SpeechManager::wrapSpeech(const Common::String &theText, int objT, int sampleFile, bool animPerson) {
int i;
int cameraX = g_sludge->_gfxMan->getCamX();
int cameraY = g_sludge->_gfxMan->getCamY();
- speech->lookWhosTalking = objT;
+ _speech->lookWhosTalking = objT;
OnScreenPerson *thisPerson = findPerson(objT);
if (thisPerson) {
setObjFontColour(thisPerson->thisType);
@@ -208,35 +210,37 @@ int wrapSpeech(const Common::String &theText, int objT, int sampleFile, bool ani
return i;
}
-void viewSpeech() {
+void SpeechManager::display() {
float cameraZoom = g_sludge->_gfxMan->getCamZoom();
int fontHeight = g_sludge->_txtMan->getFontHeight();
- int viewY = speech->speechY;
- SpeechLine *viewLine = speech->allSpeech;
+ int viewY = _speech->speechY;
+ SpeechLine *viewLine = _speech->allSpeech;
while (viewLine) {
- g_sludge->_txtMan->pasteString(viewLine->textLine, viewLine->x, viewY, speech->talkCol);
+ g_sludge->_txtMan->pasteString(viewLine->textLine, viewLine->x, viewY, _speech->talkCol);
viewY -= fontHeight / cameraZoom;
viewLine = viewLine->next;
}
}
-void saveSpeech(SpeechStruct *sS, Common::WriteStream *stream) {
- SpeechLine *viewLine = sS->allSpeech;
+void SpeechManager::save(Common::WriteStream *stream) {
+ stream->writeByte(_speechMode);
+
+ SpeechLine *viewLine = _speech->allSpeech;
- stream->writeByte(sS->talkCol.originalRed);
- stream->writeByte(sS->talkCol.originalGreen);
- stream->writeByte(sS->talkCol.originalBlue);
+ stream->writeByte(_speech->talkCol.originalRed);
+ stream->writeByte(_speech->talkCol.originalGreen);
+ stream->writeByte(_speech->talkCol.originalBlue);
- stream->writeFloatLE(speechSpeed);
+ stream->writeFloatLE(_speechSpeed);
// Write y co-ordinate
- stream->writeUint16BE(sS->speechY);
+ stream->writeUint16BE(_speech->speechY);
// Write which character's talking
- stream->writeUint16BE(sS->lookWhosTalking);
- if (sS->currentTalker) {
+ stream->writeUint16BE(_speech->lookWhosTalking);
+ if (_speech->currentTalker) {
stream->writeByte(1);
- stream->writeUint16BE(sS->currentTalker->thisType->objectNum);
+ stream->writeUint16BE(_speech->currentTalker->thisType->objectNum);
} else {
stream->writeByte(0);
}
@@ -251,42 +255,57 @@ void saveSpeech(SpeechStruct *sS, Common::WriteStream *stream) {
stream->writeByte(0);
}
-bool loadSpeech(SpeechStruct *sS, Common::SeekableReadStream *stream) {
- speech->currentTalker = NULL;
- killAllSpeech();
+bool SpeechManager::load(Common::SeekableReadStream *stream) {
+ // read speech mode
+ _speechMode = stream->readByte();
+
+ _speech->currentTalker = nullptr;
+ kill();
byte r = stream->readByte();
byte g = stream->readByte();
byte b = stream->readByte();
- setFontColour(sS->talkCol, r, g, b);
+ setFontColour(_speech->talkCol, r, g, b);
- speechSpeed = stream->readFloatLE();
+ _speechSpeed = stream->readFloatLE();
// Read y co-ordinate
- sS->speechY = stream->readUint16BE();
+ _speech->speechY = stream->readUint16BE();
// Read which character's talking
- sS->lookWhosTalking = stream->readUint16BE();
+ _speech->lookWhosTalking = stream->readUint16BE();
if (stream->readByte()) {
- sS->currentTalker = findPerson(stream->readUint16BE());
+ _speech->currentTalker = findPerson(stream->readUint16BE());
} else {
- sS->currentTalker = NULL;
+ _speech->currentTalker = NULL;
}
// Read what's being said
- SpeechLine **viewLine = &sS->allSpeech;
+ SpeechLine **viewLine = &_speech->allSpeech;
SpeechLine *newOne;
- speech->lastFile = -1;
+ _speech->lastFile = -1;
while (stream->readByte()) {
newOne = new SpeechLine;
- if (! checkNew(newOne)) return false;
+ if (!checkNew(newOne))
+ return false;
newOne->textLine = readString(stream);
newOne->x = stream->readUint16BE();
newOne->next = NULL;
- (* viewLine) = newOne;
+ (*viewLine) = newOne;
viewLine = &(newOne->next);
}
return true;
}
+void SpeechManager::freeze(FrozenStuffStruct *frozenStuff) {
+ frozenStuff->speech = _speech;
+ init();
+}
+
+void SpeechManager::restore(FrozenStuffStruct *frozenStuff) {
+ kill();
+ delete _speech;
+ _speech = frozenStuff->speech;
+}
+
} // End of namespace Sludge
diff --git a/engines/sludge/talk.h b/engines/sludge/speech.h
index 0d7fa80f0f..98b6035cb0 100644
--- a/engines/sludge/talk.h
+++ b/engines/sludge/speech.h
@@ -26,6 +26,8 @@
namespace Sludge {
+struct ObjectType;
+
struct SpeechLine {
Common::String textLine;
SpeechLine *next;
@@ -39,13 +41,44 @@ struct SpeechStruct {
SpritePalette talkCol;
};
-int wrapSpeech(const Common::String &theText, int objT, int sampleFile, bool);
-void viewSpeech();
-void killAllSpeech();
-int isThereAnySpeechGoingOn();
-void initSpeech();
-void saveSpeech(SpeechStruct *sS, Common::WriteStream *stream);
-bool loadSpeech(SpeechStruct *sS, Common::SeekableReadStream *stream);
+class SpeechManager {
+public:
+ SpeechManager(SludgeEngine *vm) : _vm(vm) { init(); }
+ ~SpeechManager() { kill(); }
+
+ void init();
+ void kill();
+
+ int wrapSpeech(const Common::String &theText, int objT, int sampleFile, bool);
+ void display();
+
+ int isThereAnySpeechGoingOn();
+ bool isCurrentTalker(OnScreenPerson *person) { return person == _speech->currentTalker; }
+ int getLastSpeechSound();
+
+ // setters & getters
+ void setObjFontColour(ObjectType *t);
+ void setSpeechSpeed(float speed) { _speechSpeed = speed; }
+ float getSpeechSpeed() { return _speechSpeed; }
+
+ // load & save
+ void save(Common::WriteStream *stream);
+ bool load(Common::SeekableReadStream *stream);
+
+ // freeze & restore
+ void freeze(FrozenStuffStruct *frozenStuff);
+ void restore(FrozenStuffStruct *frozenStuff);
+
+private:
+ SludgeEngine *_vm;
+ int _speechMode;
+ SpeechStruct *_speech;
+ float _speechSpeed;
+
+ void addSpeechLine(const Common::String &theLine, int x, int &offset);
+ int wrapSpeechXY(const Common::String &theText, int x, int y, int wrap, int sampleFile);
+ int wrapSpeechPerson(const Common::String &theText, OnScreenPerson &thePerson, int sampleFile, bool animPerson);
+};
} // End of namespace Sludge
diff --git a/engines/sludge/sprbanks.cpp b/engines/sludge/sprbanks.cpp
index 5bc5de2fdf..c566f650c0 100644
--- a/engines/sludge/sprbanks.cpp
+++ b/engines/sludge/sprbanks.cpp
@@ -24,10 +24,10 @@
#include "sludge/allfiles.h"
#include "sludge/graphics.h"
+#include "sludge/newfatal.h"
#include "sludge/sludge.h"
#include "sludge/sprites.h"
#include "sludge/sprbanks.h"
-#include "sludge/newfatal.h"
namespace Sludge {
diff --git a/engines/sludge/sprites.cpp b/engines/sludge/sprites.cpp
index 81769ccb97..49c27dbed8 100644
--- a/engines/sludge/sprites.cpp
+++ b/engines/sludge/sprites.cpp
@@ -25,18 +25,18 @@
#include "graphics/transparent_surface.h"
#include "sludge/allfiles.h"
+#include "sludge/backdrop.h"
#include "sludge/event.h"
#include "sludge/fileset.h"
#include "sludge/graphics.h"
-#include "sludge/people.h"
-#include "sludge/sprites.h"
+#include "sludge/imgloader.h"
#include "sludge/moreio.h"
#include "sludge/newfatal.h"
-#include "sludge/backdrop.h"
+#include "sludge/people.h"
+#include "sludge/sludge.h"
#include "sludge/sludger.h"
+#include "sludge/sprites.h"
#include "sludge/zbuffer.h"
-#include "sludge/imgloader.h"
-#include "sludge/sludge.h"
namespace Sludge {
diff --git a/engines/sludge/statusba.cpp b/engines/sludge/statusba.cpp
index 9e8546a3ff..1aa24971f1 100644
--- a/engines/sludge/statusba.cpp
+++ b/engines/sludge/statusba.cpp
@@ -24,12 +24,12 @@
#include "sludge/allfiles.h"
#include "sludge/backdrop.h"
-#include "sludge/sprites.h"
#include "sludge/fonttext.h"
#include "sludge/graphics.h"
#include "sludge/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/sludge.h"
+#include "sludge/sprites.h"
#include "sludge/statusba.h"
namespace Sludge {
diff --git a/engines/sludge/thumbnail.cpp b/engines/sludge/thumbnail.cpp
index 285b43ad86..2c7e007f71 100644
--- a/engines/sludge/thumbnail.cpp
+++ b/engines/sludge/thumbnail.cpp
@@ -24,13 +24,13 @@
#include "image/png.h"
#include "sludge/allfiles.h"
+#include "sludge/backdrop.h"
#include "sludge/errors.h"
#include "sludge/graphics.h"
#include "sludge/imgloader.h"
#include "sludge/moreio.h"
-#include "sludge/sludger.h"
-#include "sludge/backdrop.h"
#include "sludge/newfatal.h"
+#include "sludge/sludger.h"
#include "sludge/version.h"
namespace Sludge {
diff --git a/engines/sludge/variable.cpp b/engines/sludge/variable.cpp
index 510c6f4607..9cbb9f49f8 100644
--- a/engines/sludge/variable.cpp
+++ b/engines/sludge/variable.cpp
@@ -24,13 +24,13 @@
#include "common/savefile.h"
#include "sludge/allfiles.h"
-#include "sludge/variable.h"
+#include "sludge/fileset.h"
#include "sludge/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/objtypes.h"
#include "sludge/people.h"
-#include "sludge/fileset.h"
#include "sludge/sludge.h"
+#include "sludge/variable.h"
namespace Sludge {
diff --git a/engines/sludge/zbuffer.cpp b/engines/sludge/zbuffer.cpp
index bc9a1cf608..02dddd068e 100644
--- a/engines/sludge/zbuffer.cpp
+++ b/engines/sludge/zbuffer.cpp
@@ -25,13 +25,13 @@
#include "graphics/transparent_surface.h"
#include "sludge/allfiles.h"
-#include "sludge/zbuffer.h"
#include "sludge/fileset.h"
#include "sludge/graphics.h"
#include "sludge/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/sludge.h"
#include "sludge/sprites.h"
+#include "sludge/zbuffer.h"
namespace Sludge {
diff --git a/engines/xeen/character.cpp b/engines/xeen/character.cpp
index 8a6dd14c42..7e36e54190 100644
--- a/engines/xeen/character.cpp
+++ b/engines/xeen/character.cpp
@@ -61,6 +61,25 @@ AttributeCategory XeenItem::getAttributeCategory() const {
return (AttributeCategory)idx;
}
+const char *XeenItem::getItemName(ItemCategory category, uint id) {
+ if (id < 82)
+ return Res.ITEM_NAMES[category][id];
+
+ switch (category) {
+ case CATEGORY_WEAPON:
+ return Res.QUEST_ITEM_NAMES[id - 82];
+
+ case CATEGORY_ARMOR:
+ return Res.QUEST_ITEM_NAMES[id - 82 + 35];
+
+ case CATEGORY_ACCESSORY:
+ return Res.QUEST_ITEM_NAMES[id - 82 + 35 + 14];
+
+ default:
+ return Res.QUEST_ITEM_NAMES[id - 82 + 35 + 14 + 11];
+ }
+}
+
/*------------------------------------------------------------------------*/
InventoryItems::InventoryItems(Character *character, ItemCategory category):
@@ -1106,87 +1125,80 @@ uint Character::getCurrentLevel() const {
int Character::itemScan(int itemId) const {
int result = 0;
- for (int accessIdx = 0; accessIdx < 3; ++accessIdx) {
- switch (accessIdx) {
- case 0:
- for (int idx = 0; idx < INV_ITEMS_TOTAL; ++idx) {
- const XeenItem &item = _weapons[idx];
+ // Weapons
+ for (int idx = 0; idx < INV_ITEMS_TOTAL; ++idx) {
+ const XeenItem &item = _weapons[idx];
- if (item._frame && !(item._bonusFlags & 0xC0) && itemId < 11
- && itemId != 3 && item._material >= 59 && item._material <= 130) {
- int mIndex = (int)item.getAttributeCategory();
- if (mIndex > PERSONALITY)
- ++mIndex;
+ if (item._frame && !(item._bonusFlags & 0xC0) && itemId < 11
+ && itemId != 3 && item._material >= 59 && item._material <= 130) {
+ int mIndex = (int)item.getAttributeCategory();
+ if (mIndex > PERSONALITY)
+ ++mIndex;
- if (mIndex == itemId)
- result += Res.ATTRIBUTE_BONUSES[item._material - 59];
- }
+ if (mIndex == itemId)
+ result += Res.ATTRIBUTE_BONUSES[item._material - 59];
+ }
+ }
+
+ // Armor
+ for (int idx = 0; idx < INV_ITEMS_TOTAL; ++idx) {
+ const XeenItem &item = _armor[idx];
+
+ if (item._frame && !(item._bonusFlags & 0xC0)) {
+ if (itemId < 11 && itemId != 3 && item._material >= 59 && item._material <= 130) {
+ int mIndex = (int)item.getAttributeCategory();
+ if (mIndex > PERSONALITY)
+ ++mIndex;
+
+ if (mIndex == itemId)
+ result += Res.ATTRIBUTE_BONUSES[item._material - 59];
}
- break;
- case 1:
- for (int idx = 0; idx < INV_ITEMS_TOTAL; ++idx) {
- const XeenItem &item = _armor[idx];
+ if (itemId > 10 && item._material < 37) {
+ int mIndex = item.getElementalCategory() + 11;
- if (item._frame && !(item._bonusFlags & 0xC0)) {
- if (itemId < 11 && itemId != 3 && item._material >= 59 && item._material <= 130) {
- int mIndex = (int)item.getAttributeCategory();
- if (mIndex > PERSONALITY)
- ++mIndex;
+ if (mIndex == itemId) {
+ result += Res.ELEMENTAL_RESISTENCES[item._material];
+ }
+ }
- if (mIndex == itemId)
- result += Res.ATTRIBUTE_BONUSES[item._material - 59];
- }
+ if (itemId == 9) {
+ result += Res.ARMOR_STRENGTHS[item._id];
- if (itemId > 10 && item._material < 37) {
- int mIndex = item.getElementalCategory() + 11;
+ if (item._material >= 37 && item._material <= 58)
+ result += Res.METAL_LAC[item._material - 37];
+ }
+ }
+ }
- if (mIndex == itemId) {
- result += Res.ELEMENTAL_RESISTENCES[item._material];
- }
- }
+ // Accessories
+ for (int idx = 0; idx < INV_ITEMS_TOTAL; ++idx) {
+ const XeenItem &item = _accessories[idx];
- if (itemId == 9) {
- result += Res.ARMOR_STRENGTHS[item._id];
+ if (item._frame && !(item._bonusFlags & 0xC0)) {
+ if (itemId < 11 && itemId != 3 && item._material >= 59 && item._material <= 130) {
+ int mIndex = (int)item.getAttributeCategory();
+ if (mIndex > PERSONALITY)
+ ++mIndex;
- if (item._material >= 37 && item._material <= 58)
- result += Res.METAL_LAC[item._material - 37];
- }
+ if (mIndex == itemId) {
+ result += Res.ATTRIBUTE_BONUSES[item._material - 59];
}
}
- break;
- case 2:
- for (int idx = 0; idx < INV_ITEMS_TOTAL; ++idx) {
- const XeenItem &item = _accessories[idx];
-
- if (item._frame && !(item._bonusFlags & 0xC0)) {
- if (itemId < 11 && itemId != 3 && item._material >= 59 && item._material <= 130) {
- int mIndex = (int)item.getAttributeCategory();
- if (mIndex > PERSONALITY)
- ++mIndex;
-
- if (mIndex == itemId) {
- result += Res.ATTRIBUTE_BONUSES[item._material - 59];
- }
- }
-
- if (itemId > 10 && item._material < 37) {
- int mIndex = item.getElementalCategory() + 11;
-
- if (mIndex == itemId)
- result += Res.ELEMENTAL_RESISTENCES[item._material];
- }
-
- if (itemId == 9) {
- result += Res.ARMOR_STRENGTHS[item._id];
- if (item._material >= 37 && item._material <= 58) {
- result += Res.METAL_LAC[item._material - 37];
- }
- }
+ if (itemId > 10 && item._material < 37) {
+ int mIndex = item.getElementalCategory() + 11;
+
+ if (mIndex == itemId)
+ result += Res.ELEMENTAL_RESISTENCES[item._material];
+ }
+
+ if (itemId == 9) {
+ result += Res.ARMOR_STRENGTHS[item._id];
+ if (item._material >= 37 && item._material <= 58) {
+ result += Res.METAL_LAC[item._material - 37];
}
}
- break;
}
}
@@ -1439,23 +1451,24 @@ void Character::setValue(int id, uint value) {
}
bool Character::guildMember() const {
- Party &party = *Party::_vm->_party;
+ FileManager &files = *g_vm->_files;
+ Party &party = *g_vm->_party;
- if (party._mazeId == 49 && !Party::_vm->_files->_isDarkCc) {
- return hasAward(5);
+ if (party._mazeId == 49 && !files._isDarkCc) {
+ return hasAward(SHANGRILA_GUILD_MEMBER);
}
switch (party._mazeId) {
case 29:
- return hasAward(83);
+ return hasAward(CASTLEVIEW_GUILD_MEMBER);
case 31:
- return hasAward(84);
+ return hasAward(SANDCASTER_GUILD_MEMBER);
case 33:
- return hasAward(85);
+ return hasAward(LAKESIDE_GUILD_MEMBER);
case 35:
- return hasAward(86);
+ return hasAward(NECROPOLIS_GUILD_MEMBER);
default:
- return hasAward(87);
+ return hasAward(OLYMPUS_GUILD_MEMBER);
}
}
@@ -1806,7 +1819,7 @@ void Character::subtractHitPoints(int amount) {
}
}
-bool Character::hasSpecialItem() const {
+bool Character::hasSlayerSword() const {
for (uint idx = 0; idx < INV_ITEMS_TOTAL; ++idx) {
if (_weapons[idx]._id == 34)
// Character has Xeen Slayer sword
diff --git a/engines/xeen/character.h b/engines/xeen/character.h
index c19cfef4fc..54e8d1a37c 100644
--- a/engines/xeen/character.h
+++ b/engines/xeen/character.h
@@ -37,6 +37,12 @@ namespace Xeen {
#define AWARDS_TOTAL 88
#define WARZONE_AWARD 9
+enum Award {
+ SHANGRILA_GUILD_MEMBER = 5, GOOBER = 76, SUPER_GOOBER = 77,
+ CASTLEVIEW_GUILD_MEMBER = 83, SANDCASTER_GUILD_MEMBER = 84,
+ LAKESIDE_GUILD_MEMBER = 85, NECROPOLIS_GUILD_MEMBER = 86, OLYMPUS_GUILD_MEMBER = 87
+};
+
enum BonusFlags {
ITEMFLAG_BONUS_MASK = 0xBF, ITEMFLAG_CURSED = 0x40, ITEMFLAG_BROKEN = 0x80
};
@@ -97,16 +103,36 @@ public:
int _bonusFlags;
int _frame;
public:
+ /**
+ * Return the name of the item
+ */
+ static const char *getItemName(ItemCategory category, uint id);
+public:
XeenItem();
+ /**
+ * Clear the data for the item
+ */
void clear();
+ /**
+ * Returns true if no item is set
+ */
bool empty() const { return _id != 0; }
+ /**
+ * Synchronizes the data for the item
+ */
void synchronize(Common::Serializer &s);
+ /**
+ * Gets the elemental category for the item
+ */
ElementalCategory getElementalCategory() const;
+ /**
+ * Gets the attribute category for the item
+ */
AttributeCategory getAttributeCategory() const;
};
@@ -125,6 +151,9 @@ public:
InventoryItems(Character *character, ItemCategory category);
virtual ~InventoryItems() {}
+ /**
+ * Clears the set of items
+ */
void clear();
/**
@@ -139,6 +168,9 @@ public:
virtual Common::String getFullDescription(int itemIndex, int displayNum = 15) = 0;
+ /**
+ * Returns the identified details for an item
+ */
Common::String getIdentifiedDetails(int itemIndex);
/**
@@ -146,6 +178,9 @@ public:
*/
bool discardItem(int itemIndex);
+ /**
+ * Equips an item
+ */
virtual void equipItem(int itemIndex) {}
/**
@@ -158,6 +193,9 @@ public:
*/
void sort();
+ /**
+ * Enchants an item
+ */
virtual void enchantItem(int itemIndex, int amount);
/**
@@ -184,6 +222,9 @@ public:
*/
virtual Common::String getFullDescription(int itemIndex, int displayNum);
+ /**
+ * Enchants a weapon
+ */
virtual void enchantItem(int itemIndex, int amount);
};
@@ -205,6 +246,9 @@ public:
*/
virtual Common::String getFullDescription(int itemIndex, int displayNum);
+ /**
+ * Enchants an armor
+ */
virtual void enchantItem(int itemIndex, int amount);
};
@@ -323,8 +367,14 @@ public:
public:
Character();
+ /**
+ * Clears the data for a character
+ */
void clear();
+ /**
+ * Synchronizes data for the character
+ */
void synchronize(Common::Serializer &s);
/**
@@ -352,8 +402,14 @@ public:
*/
int getAge(bool ignoreTemp = false) const;
+ /**
+ * Gets the maximum hit points for a character
+ */
int getMaxHP() const;
+ /**
+ * Gets the maximum spell points for a character
+ */
int getMaxSP() const;
/**
@@ -367,10 +423,19 @@ public:
*/
static int statColor(int amount, int threshold);
+ /**
+ * Returns the bonus the character gets for stats
+ */
int statBonus(uint statValue) const;
+ /**
+ * Returns true if the character passes a saving throw for a given attack type
+ */
bool charSavingThrow(DamageType attackType) const;
+ /**
+ * Returns true if the character is unable to perform any action
+ */
bool noActions();
/**
@@ -383,6 +448,9 @@ public:
*/
bool hasAward(int awardId) const;
+ /**
+ * Returns the character's armor class
+ */
int getArmorClass(bool baseOnly = false) const;
/**
@@ -392,16 +460,34 @@ public:
uint getCurrentLevel() const;
+ /**
+ * Scans the character's inventory for the given item
+ */
int itemScan(int itemId) const;
+ /**
+ * Sets various attributes of a character
+ */
void setValue(int id, uint value);
+ /**
+ * Returns true if the character is a member of the current town's guild
+ */
bool guildMember() const;
+ /**
+ * Returns the experience required to reach the next level
+ */
uint experienceToNextLevel() const;
+ /**
+ * Returns the next level the character will reach
+ */
uint nextExperienceLevel() const;
+ /**
+ * Returns the character's current experience
+ */
uint getCurrentExperience() const;
/**
@@ -414,6 +500,9 @@ public:
*/
int getNumAwards() const;
+ /**
+ * Creates an item and adds it to the inventory
+ */
int makeItem(int p1, int itemIndex, int p3);
/**
@@ -422,14 +511,23 @@ public:
void addHitPoints(int amount);
/**
- * Remove hit points fromo the character
+ * Remove hit points from the character
*/
void subtractHitPoints(int amount);
- bool hasSpecialItem() const;
+ /**
+ * Returns true if the character has the Xeen Slayer Sword
+ */
+ bool hasSlayerSword() const;
+ /**
+ * Returns true if the character has a missile weapon, such as a bow
+ */
bool hasMissileWeapon() const;
+ /**
+ * Returns a category index for a character, used such for indexing into spell data
+ */
int getClassCategory() const;
};
diff --git a/engines/xeen/debugger.cpp b/engines/xeen/debugger.cpp
index 25eab2b7b3..68d2c0cbd4 100644
--- a/engines/xeen/debugger.cpp
+++ b/engines/xeen/debugger.cpp
@@ -50,6 +50,8 @@ Debugger::Debugger(XeenEngine *vm) : GUI::Debugger(), _vm(vm) {
registerCmd("dump", WRAP_METHOD(Debugger, cmdDump));
registerCmd("gold", WRAP_METHOD(Debugger, cmdGold));
registerCmd("gems", WRAP_METHOD(Debugger, cmdGems));
+ registerCmd("map", WRAP_METHOD(Debugger, cmdMap));
+ registerCmd("pos", WRAP_METHOD(Debugger, cmdPos));
_spellId = -1;
}
@@ -93,8 +95,6 @@ bool Debugger::cmdDump(int argc, const char **argv) {
} else {
if (argc == 2)
f.open(argv[1]);
- else
- f.open(argv[1], (ArchiveType)strToInt(argv[2]));
if (f.isOpen()) {
Common::DumpFile df;
@@ -141,4 +141,41 @@ bool Debugger::cmdGems(int argc, const char **argv) {
return true;
}
+bool Debugger::cmdMap(int argc, const char **argv) {
+ FileManager &files = *g_vm->_files;
+ Map &map = *g_vm->_map;
+ Party &party = *g_vm->_party;
+
+ if (argc < 2) {
+ debugPrintf("map mapId [ sideNum [ xp, yp ]]\n");
+ return true;
+ } else {
+ int mapId = strToInt(argv[1]);
+ bool side = argc < 3 ? files._isDarkCc : strToInt(argv[2]) != 0;
+ int x = argc < 4 ? 8 : strToInt(argv[3]);
+ int y = argc < 5 ? 8 : strToInt(argv[4]);
+
+ map._loadDarkSide = side;
+ map.load(mapId);
+ party._mazePosition.x = x;
+ party._mazePosition.y = y;
+ party._mazeDirection = DIR_NORTH;
+ return false;
+ }
+}
+
+bool Debugger::cmdPos(int argc, const char **argv) {
+ Party &party = *g_vm->_party;
+
+ if (argc < 3) {
+ debugPrintf("pos xp, yp\n");
+ return true;
+ } else {
+ party._mazePosition.x = strToInt(argv[1]);
+ party._mazePosition.y = strToInt(argv[2]);
+ party._stepped = true;
+ return false;
+ }
+}
+
} // End of namespace Xeen
diff --git a/engines/xeen/debugger.h b/engines/xeen/debugger.h
index bbcc4ca4c2..5916419ce8 100644
--- a/engines/xeen/debugger.h
+++ b/engines/xeen/debugger.h
@@ -39,6 +39,8 @@ private:
bool cmdDump(int argc, const char **argv);
bool cmdGold(int argc, const char **argv);
bool cmdGems(int argc, const char **argv);
+ bool cmdMap(int argc, const char **argv);
+ bool cmdPos(int argc, const char **argv);
public:
Debugger(XeenEngine *vm);
diff --git a/engines/xeen/detection.cpp b/engines/xeen/detection.cpp
index 0866d5f107..df3df4ffa7 100644
--- a/engines/xeen/detection.cpp
+++ b/engines/xeen/detection.cpp
@@ -144,7 +144,7 @@ SaveStateList XeenMetaEngine::listSaves(const char *target) const {
Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(*file);
if (in) {
- Xeen::XeenEngine::readSavegameHeader(in, header);
+ Xeen::SavesManager::readSavegameHeader(in, header);
saveList.push_back(SaveStateDescriptor(slot, header._saveName));
header._thumbnail->free();
@@ -172,7 +172,7 @@ SaveStateDescriptor XeenMetaEngine::querySaveMetaInfos(const char *target, int s
if (f) {
Xeen::XeenSavegameHeader header;
- Xeen::XeenEngine::readSavegameHeader(f, header);
+ Xeen::SavesManager::readSavegameHeader(f, header);
delete f;
// Create the return descriptor
diff --git a/engines/xeen/dialogs.cpp b/engines/xeen/dialogs.cpp
index d44a361c3c..04d56d72bf 100644
--- a/engines/xeen/dialogs.cpp
+++ b/engines/xeen/dialogs.cpp
@@ -160,6 +160,14 @@ void ButtonContainer::loadStrings(const Common::String &name) {
f.close();
}
+void ButtonContainer::loadStrings(const Common::String &name, int ccMode) {
+ File f(name, ccMode);
+ _textStrings.clear();
+ while (f.pos() < f.size())
+ _textStrings.push_back(f.readString());
+ f.close();
+}
+
/*------------------------------------------------------------------------*/
void SettingsBaseDialog::showContents(SpriteResource &title1, bool waitFlag) {
@@ -201,13 +209,22 @@ void CreditsScreen::execute() {
/*------------------------------------------------------------------------*/
-void PleaseWait::show(XeenEngine *vm) {
- Windows &windows = *vm->_windows;
+PleaseWait::PleaseWait(bool isOops) {
+ _msg = isOops ? Res.OOPS : Res.PLEASE_WAIT;
+}
+
+PleaseWait::~PleaseWait() {
+ Windows &windows = *g_vm->_windows;
+ windows[9].close();
+}
+
+void PleaseWait::show() {
+ Windows &windows = *g_vm->_windows;
Window &w = windows[9];
- if (vm->_mode != MODE_0) {
+ if (g_vm->_mode != MODE_0) {
w.open();
- w.writeString(Res.PLEASE_WAIT);
+ w.writeString(_msg);
w.update();
}
}
diff --git a/engines/xeen/dialogs.h b/engines/xeen/dialogs.h
index 680963f907..d0bf20108b 100644
--- a/engines/xeen/dialogs.h
+++ b/engines/xeen/dialogs.h
@@ -70,6 +70,13 @@ protected:
* @param name Name of resource containing strings
*/
void loadStrings(const Common::String &name);
+
+ /**
+ * Load a set of text strings from the given resource
+ * @param name Name of resource containing strings
+ * @param ccMode Optional cc file number to explicitly use
+ */
+ void loadStrings(const Common::String &name, int ccMode);
public:
ButtonContainer(XeenEngine *vm) : Cutscenes(vm), _buttonValue(0) {}
@@ -113,8 +120,13 @@ public:
};
class PleaseWait {
+private:
+ Common::String _msg;
public:
- static void show(XeenEngine *vm);
+ PleaseWait(bool isOops = false);
+ ~PleaseWait();
+
+ void show();
};
} // End of namespace Xeen
diff --git a/engines/xeen/dialogs_awards.cpp b/engines/xeen/dialogs_awards.cpp
index 91421cab16..ab1b79193b 100644
--- a/engines/xeen/dialogs_awards.cpp
+++ b/engines/xeen/dialogs_awards.cpp
@@ -41,7 +41,7 @@ void Awards::execute(const Character *ch) {
Mode oldMode = g_vm->_mode;
int topIndex = 0;
- loadStrings("award.bin");
+ loadStrings("award.bin", 1);
addButtons();
// Open the window and draw contents
diff --git a/engines/xeen/dialogs_input.cpp b/engines/xeen/dialogs_input.cpp
index a0573d20ef..6437778f7c 100644
--- a/engines/xeen/dialogs_input.cpp
+++ b/engines/xeen/dialogs_input.cpp
@@ -120,14 +120,11 @@ Common::KeyCode Input::waitForKey(const Common::String &msg) {
void Input::animateCursor() {
// Iterate through each frame
_cursorAnimIndex = _cursorAnimIndex ? _cursorAnimIndex - 1 : 5;
- static const int CURSOR_ANIMATION_IDS[] = { 32, 124, 126, 127, 126, 124 };
+ static const char CURSOR_ANIMATION_IDS[] = { 32, 124, 126, 127, 126, 124 };
// Form a string for the cursor and write it out
- Common::String cursorStr = Common::String::format("%c",
- CURSOR_ANIMATION_IDS[_cursorAnimIndex]);
-
Common::Point writePos = _window->_writePos;
- _window->writeString(cursorStr);
+ _window->writeCharacter(CURSOR_ANIMATION_IDS[_cursorAnimIndex]);
_window->_writePos = writePos;
}
@@ -147,6 +144,7 @@ int StringInput::show(XeenEngine *vm, bool type, const Common::String &msg1,
int StringInput::execute(bool type, const Common::String &expected,
const Common::String &title, int opcode) {
+ FileManager &files = *_vm->_files;
Interface &intf = *_vm->_interface;
Scripts &scripts = *_vm->_scripts;
Windows &windows = *_vm->_windows;
@@ -168,8 +166,7 @@ int StringInput::execute(bool type, const Common::String &expected,
}
} else {
// Load in the mirror list
- File f(Common::String::format("%smirr.txt",
- _vm->_files->_isDarkCc ? "dark" : "xeen"));
+ File f(Common::String::format("%smirr.txt", files._isDarkCc ? "dark" : "xeen"), 1);
MirrorEntry me;
scripts._mirror.clear();
while (me.synchronize(f))
diff --git a/engines/xeen/dialogs_party.cpp b/engines/xeen/dialogs_party.cpp
index 39b4615ad5..f4d95ca612 100644
--- a/engines/xeen/dialogs_party.cpp
+++ b/engines/xeen/dialogs_party.cpp
@@ -222,7 +222,7 @@ void PartyDialog::execute() {
if (charButtonValue != 0) {
int charIndex = charButtonValue - Common::KEYCODE_1 + startingChar;
Character &c = party._roster[_charList[charIndex]];
- if (c.hasSpecialItem()) {
+ if (c.hasSlayerSword()) {
ErrorScroll::show(_vm, Res.HAS_SLAYER_SWORD);
} else {
Common::String msg = Common::String::format(Res.SURE_TO_DELETE_CHAR,
diff --git a/engines/xeen/dialogs_quests.cpp b/engines/xeen/dialogs_quests.cpp
index 6667bf5262..5cfd9efc96 100644
--- a/engines/xeen/dialogs_quests.cpp
+++ b/engines/xeen/dialogs_quests.cpp
@@ -204,13 +204,13 @@ void Quests::execute() {
topRow = 0;
break;
case Common::KEYCODE_END:
- topRow = count - 1;
+ topRow = MAX(count - 1, 0);
break;
case Common::KEYCODE_PAGEUP:
topRow = MAX(topRow - 3, 0);
break;
case Common::KEYCODE_PAGEDOWN:
- topRow = CLIP(topRow + 3, 0, count - 1);
+ topRow = CLIP(topRow + 3, 0, MAX(count - 1, 0));
break;
case Common::KEYCODE_UP:
case Common::KEYCODE_KP8:
@@ -218,7 +218,7 @@ void Quests::execute() {
break;
case Common::KEYCODE_DOWN:
case Common::KEYCODE_KP2:
- topRow = CLIP(topRow + 1, 0, count - 1);
+ topRow = CLIP(topRow + 1, 0, MAX(count - 1, 0));
break;
default:
break;
@@ -245,7 +245,7 @@ void Quests::addButtons() {
}
void Quests::loadQuestNotes() {
- File f("qnotes.bin", _vm->getGameID() == GType_Clouds ? GAME_ARCHIVE : ALTSIDE_ARCHIVE);
+ File f("qnotes.bin");
while (f.pos() < f.size())
_questNotes.push_back(f.readString());
f.close();
diff --git a/engines/xeen/files.cpp b/engines/xeen/files.cpp
index 06dd3d12a7..375b9df65a 100644
--- a/engines/xeen/files.cpp
+++ b/engines/xeen/files.cpp
@@ -26,6 +26,7 @@
#include "common/textconsole.h"
#include "xeen/xeen.h"
#include "xeen/files.h"
+#include "xeen/saves.h"
namespace Xeen {
@@ -120,7 +121,7 @@ int BaseCCArchive::listMembers(Common::ArchiveMemberList &list) const {
CCArchive::CCArchive(const Common::String &filename, bool encoded):
BaseCCArchive(), _filename(filename), _encoded(encoded) {
- File f(filename);
+ File f(filename, SearchMan);
loadIndex(&f);
}
@@ -128,7 +129,7 @@ CCArchive::CCArchive(const Common::String &filename, const Common::String &prefi
bool encoded): BaseCCArchive(), _filename(filename),
_prefix(prefix), _encoded(encoded) {
_prefix.toLowercase();
- File f(filename);
+ File f(filename, SearchMan);
loadIndex(&f);
}
@@ -183,71 +184,68 @@ Common::SeekableReadStream *CCArchive::createReadStreamForMember(const Common::S
/*------------------------------------------------------------------------*/
-CCArchive *FileManager::_archives[3];
-
FileManager::FileManager(XeenEngine *vm) {
Common::File f;
- int sideNum = 0;
-
- File::_currentArchive = ANY_ARCHIVE;
_isDarkCc = vm->getGameID() == GType_DarkSide;
- _archives[0] = _archives[1] = _archives[2] = nullptr;
-
- if (vm->getGameID() != GType_DarkSide) {
- _archives[0] = new CCArchive("xeen.cc", "xeen", true);
- SearchMan.add("xeen", _archives[0]);
- sideNum = 1;
+
+ File::_xeenCc = (vm->getGameID() == GType_DarkSide) ? nullptr :
+ new CCArchive("xeen.cc", "xeen", true);
+ File::_darkCc = (vm->getGameID() == GType_Clouds) ? nullptr :
+ new CCArchive("dark.cc", "dark", true);
+ if (Common::File::exists("intro.cc")) {
+ CCArchive *introCc = new CCArchive("intro.cc", "intro", true);
+ SearchMan.add("intro", introCc);
}
- if (vm->getGameID() == GType_DarkSide || vm->getGameID() == GType_WorldOfXeen) {
- _archives[sideNum] = new CCArchive("dark.cc", "dark", true);
- SearchMan.add("dark", _archives[sideNum]);
- }
+ File::_currentArchive = vm->getGameID() == GType_DarkSide ?
+ File::_darkCc : File::_xeenCc;
+ assert(File::_currentArchive);
+}
- if (f.exists("intro.cc")) {
- _archives[2] = new CCArchive("intro.cc", "intro", true);
- SearchMan.add("intro", _archives[2]);
- }
+FileManager::~FileManager() {
+ SearchMan.remove("intro");
+ delete File::_xeenCc;
+ delete File::_darkCc;
}
-void FileManager::setGameCc(bool isDarkCc) {
- _isDarkCc = isDarkCc;
- File::_currentArchive = isDarkCc ? ALTSIDE_ARCHIVE : GAME_ARCHIVE;
+void FileManager::setGameCc(int ccMode) {
+ if (g_vm->getGameID() != GType_WorldOfXeen)
+ ccMode = 1;
+
+ File::setCurrentArchive(ccMode);
+ _isDarkCc = ccMode != 0;
}
/*------------------------------------------------------------------------*/
-ArchiveType File::_currentArchive;
+CCArchive *File::_xeenCc;
+CCArchive *File::_darkCc;
+SaveArchive *File::_xeenSave;
+SaveArchive *File::_darkSave;
+BaseCCArchive *File::_currentArchive;
+SaveArchive *File::_currentSave;
File::File(const Common::String &filename) {
File::open(filename);
}
-File::File(const Common::String &filename, ArchiveType archiveType) {
- File::open(filename, archiveType);
-}
-
File::File(const Common::String &filename, Common::Archive &archive) {
File::open(filename, archive);
}
+File::File(const Common::String &filename, int ccMode) {
+ File::open(filename, ccMode);
+}
+
bool File::open(const Common::String &filename) {
- return File::open(filename, _currentArchive);
-}
-
-bool File::open(const Common::String &filename, ArchiveType archiveType) {
- if (archiveType == ANY_ARCHIVE) {
- Common::File::open(filename);
- } else {
- CCArchive &archive = *FileManager::_archives[archiveType];
- if (!Common::File::open(filename, archive))
- // If not in the designated archive, try opening from any archive,
- // or as a standalone file in the filesystem
- Common::File::open(filename);
+ if (!_currentSave || !Common::File::open(filename, *_currentSave)) {
+ if (!Common::File::open(filename, *_currentArchive)) {
+ // Could not find in current archive, so try intro.cc or in folder
+ if (!Common::File::open(filename))
+ error("Could not open file - %s", filename.c_str());
+ }
}
- if (!isOpen())
- error("Could not open file - %s", filename.c_str());
return true;
}
@@ -257,6 +255,36 @@ bool File::open(const Common::String &filename, Common::Archive &archive) {
return true;
}
+bool File::open(const Common::String &filename, int ccMode) {
+ FileManager &files = *g_vm->_files;
+ int oldMode = files._isDarkCc ? 1 : 0;
+
+ files.setGameCc(ccMode);
+ File::open(filename);
+ files.setGameCc(oldMode);
+
+ return true;
+}
+
+void File::setCurrentArchive(int ccMode) {
+ switch (ccMode) {
+ case 0:
+ _currentArchive = _xeenCc;
+ _currentSave = _xeenSave;
+ break;
+
+ case 1:
+ _currentArchive = _darkCc;
+ _currentSave = _darkSave;
+ break;
+
+ default:
+ break;
+ }
+
+ assert(_currentArchive);
+}
+
Common::String File::readString() {
Common::String result;
char c;
@@ -267,18 +295,179 @@ Common::String File::readString() {
return result;
}
+bool File::exists(const Common::String &filename) {
+ if (!_currentSave || !_currentSave->hasFile(filename)) {
+ if (!_currentArchive->hasFile(filename)) {
+ // Could not find in current archive, so try intro.cc or in folder
+ return Common::File::exists(filename);
+ }
+ }
+
+ return true;
+}
+
+bool File::exists(const Common::String &filename, int ccMode) {
+ FileManager &files = *g_vm->_files;
+ int oldMode = files._isDarkCc ? 1 : 0;
+
+ files.setGameCc(ccMode);
+ bool result = exists(filename);
+ files.setGameCc(oldMode);
+
+ return result;
+}
+
+void File::syncBitFlags(Common::Serializer &s, bool *startP, bool *endP) {
+ byte data = 0;
+
+ int bitCounter = 0;
+ for (bool *p = startP; p < endP; ++p, bitCounter = (bitCounter + 1) % 8) {
+ if (bitCounter == 0) {
+ if (s.isLoading() || p != startP)
+ s.syncAsByte(data);
+
+ if (s.isSaving())
+ data = 0;
+ }
+
+ if (s.isLoading())
+ *p = ((data >> bitCounter) & 1) != 0;
+ else if (*p)
+ data |= 1 << bitCounter;
+ }
+
+ if (s.isSaving())
+ s.syncAsByte(data);
+}
+
/*------------------------------------------------------------------------*/
void StringArray::load(const Common::String &name) {
- load(name, ANY_ARCHIVE);
+ File f(name);
+ clear();
+ while (f.pos() < f.size())
+ push_back(f.readString());
}
-void StringArray::load(const Common::String &name, ArchiveType archiveType) {
- File f(name, archiveType);
+void StringArray::load(const Common::String &name, int ccMode) {
+ File f(name, ccMode);
clear();
while (f.pos() < f.size())
push_back(f.readString());
}
+/*------------------------------------------------------------------------*/
+
+SaveArchive::SaveArchive(Party *party) : BaseCCArchive(), _party(party) {
+ _data = nullptr;
+}
+
+SaveArchive::~SaveArchive() {
+ for (Common::HashMap<uint16, Common::MemoryWriteStreamDynamic *>::iterator it = _newData.begin(); it != _newData.end(); it++) {
+ delete (*it)._value;
+ }
+ delete[] _data;
+}
+
+Common::SeekableReadStream *SaveArchive::createReadStreamForMember(const Common::String &name) const {
+ CCEntry ccEntry;
+
+ // If the given resource has already been perviously "written" to the
+ // save manager, then return that new resource
+ uint16 id = BaseCCArchive::convertNameToId(name);
+ if (_newData.contains(id)) {
+ Common::MemoryWriteStreamDynamic *stream = _newData[id];
+ return new Common::MemoryReadStream(stream->getData(), stream->size());
+ }
+
+ // Retrieve the resource from the loaded savefile
+ if (getHeaderEntry(name, ccEntry)) {
+ // Open the correct CC entry
+ return new Common::MemoryReadStream(_data + ccEntry._offset, ccEntry._size);
+ }
+
+ return nullptr;
+}
+
+void SaveArchive::load(Common::SeekableReadStream *stream) {
+ loadIndex(stream);
+
+ delete[] _data;
+ _data = new byte[stream->size()];
+ stream->seek(0);
+ stream->read(_data, stream->size());
+
+ // Load in the character stats and active party
+ Common::SeekableReadStream *chr = createReadStreamForMember("maze.chr");
+ Common::Serializer sChr(chr, nullptr);
+ _party->_roster.synchronize(sChr);
+ delete chr;
+
+ Common::SeekableReadStream *pty = createReadStreamForMember("maze.pty");
+ Common::Serializer sPty(pty, nullptr);
+ _party->synchronize(sPty);
+ delete pty;
+}
+
+void SaveArchive::reset(CCArchive *src) {
+ Common::MemoryWriteStreamDynamic saveFile(DisposeAfterUse::YES);
+ File fIn;
+
+ g_vm->_files->setGameCc(g_vm->getGameID() == GType_DarkSide ? 1 : 0);
+ const int RESOURCES[6] = { 0x2A0C, 0x2A1C, 0x2A2C, 0x2A3C, 0x284C, 0x2A5C };
+ for (int i = 0; i < 6; ++i) {
+ Common::String filename = Common::String::format("%.4x", RESOURCES[i]);
+ if (src->hasFile(filename)) {
+ // Read in the next resource
+ fIn.open(filename, *src);
+ byte *data = new byte[fIn.size()];
+ fIn.read(data, fIn.size());
+
+ // Copy it to the combined savefile resource
+ saveFile.write(data, fIn.size());
+ delete[] data;
+ fIn.close();
+ }
+ }
+
+ assert(saveFile.size() > 0);
+ Common::MemoryReadStream f(saveFile.getData(), saveFile.size());
+ load(&f);
+}
+
+/*------------------------------------------------------------------------*/
+
+OutFile::OutFile(const Common::String &filename) :
+ _filename(filename), _backingStream(DisposeAfterUse::YES) {
+ _archive = File::_currentSave;
+}
+
+OutFile::OutFile(const Common::String &filename, SaveArchive *archive) :
+ _filename(filename), _archive(archive), _backingStream(DisposeAfterUse::YES) {
+}
+
+OutFile::OutFile(const Common::String &filename, int ccMode) :
+ _filename(filename), _backingStream(DisposeAfterUse::YES) {
+ g_vm->_files->setGameCc(ccMode);
+ _archive = File::_currentSave;
+}
+
+uint32 OutFile::write(const void *dataPtr, uint32 dataSize) {
+ return _backingStream.write(dataPtr, dataSize);
+}
+
+int32 OutFile::pos() const {
+ return _backingStream.pos();
+}
+
+void OutFile::finalize() {
+ uint16 id = BaseCCArchive::convertNameToId(_filename);
+
+ if (!_archive->_newData.contains(id))
+ _archive->_newData[id] = new Common::MemoryWriteStreamDynamic(DisposeAfterUse::YES);
+
+ Common::MemoryWriteStreamDynamic *out = _archive->_newData[id];
+ out->write(_backingStream.getData(), _backingStream.size());
+}
} // End of namespace Xeen
diff --git a/engines/xeen/files.h b/engines/xeen/files.h
index ffb703374b..34a96906cf 100644
--- a/engines/xeen/files.h
+++ b/engines/xeen/files.h
@@ -26,20 +26,22 @@
#include "common/scummsys.h"
#include "common/array.h"
#include "common/file.h"
+#include "common/memstream.h"
+#include "common/savefile.h"
#include "common/serializer.h"
#include "common/str-array.h"
#include "graphics/surface.h"
namespace Xeen {
-enum ArchiveType {
- ANY_ARCHIVE = -1, GAME_ARCHIVE = 0, ALTSIDE_ARCHIVE = 1,
- INTRO_ARCHIVE = 2
-};
-
class XeenEngine;
class CCArchive;
+class BaseCCArchive;
class File;
+class SaveArchive;
+class Party;
+class OutFile;
+class SavesManager;
#define SYNC_AS(SUFFIX,STREAM,TYPE,SIZE) \
template<typename T> \
@@ -55,42 +57,70 @@ class File;
_bytesSynced += SIZE; \
}
+/**
+ * Details of a single entry in a CC file index
+ */
+struct CCEntry {
+ uint16 _id;
+ uint32 _offset;
+ uint16 _size;
+
+ CCEntry() : _id(0), _offset(0), _size(0) {}
+ CCEntry(uint16 id, uint32 offset, uint32 size)
+ : _id(id), _offset(offset), _size(size) {
+ }
+};
+
/*
* Main resource manager
*/
class FileManager {
- friend class File;
-private:
- static CCArchive *_archives[3];
public:
bool _isDarkCc;
public:
/**
- * Instantiates the resource manager
+ * Constructor
*/
FileManager(XeenEngine *vm);
+
+ /**
+ * Destructor
+ */
+ ~FileManager();
/**
* Set which game side files to use
+ * @param ccMode 0=Clouds, 1=Dark Side
*/
- void setGameCc(bool isDarkCc);
+ void setGameCc(int ccMode);
};
/**
* Derived file class
*/
class File : public Common::File {
+ friend class FileManager;
+ friend class OutFile;
+ friend class SavesManager;
+private:
+ static CCArchive *_xeenCc, *_darkCc;
+ static SaveArchive *_xeenSave, *_darkSave;
+ static BaseCCArchive *_currentArchive;
+ static SaveArchive *_currentSave;
public:
- static ArchiveType _currentArchive;
-
/**
* Sets which archive is used by default
*/
- static void setCurrentArchive(ArchiveType arcType) { _currentArchive = arcType; }
+ static void setCurrentArchive(int ccMode);
+
+ /**
+ * Synchronizes a boolean array as a bitfield set
+ */
+ static void syncBitFlags(Common::Serializer &s, bool *startP, bool *endP);
public:
File() : Common::File() {}
File(const Common::String &filename);
- File(const Common::String &filename, ArchiveType archiveType);
+ File(const Common::String &filename, int ccMode);
File(const Common::String &filename, Common::Archive &archive);
virtual ~File() {}
@@ -102,12 +132,12 @@ public:
/**
* Opens the given file, throwing an error if it can't be opened
*/
- virtual bool open(const Common::String &filename, ArchiveType archiveType);
+ virtual bool open(const Common::String &filename, Common::Archive &archive);
/**
* Opens the given file, throwing an error if it can't be opened
*/
- virtual bool open(const Common::String &filename, Common::Archive &archive);
+ virtual bool open(const Common::String &filename, int ccMode);
/**
* Opens the given file
@@ -123,7 +153,26 @@ public:
return Common::File::open(stream, name);
}
+ /**
+ * Reads in a null terminated string
+ */
Common::String readString();
+
+ /**
+ * Checks if a given file exists
+ *
+ * @param filename the file to check for
+ * @return true if the file exists, false otherwise
+ */
+ static bool exists(const Common::String &filename);
+
+ /**
+ * Checks if a given file exists
+ *
+ * @param filename the file to check for
+ * @return true if the file exists, false otherwise
+ */
+ static bool exists(const Common::String &filename, int ccMode);
};
class StringArray : public Common::StringArray {
@@ -139,7 +188,7 @@ public:
/**
* Loads a string array from the specified file
*/
- void load(const Common::String &name, ArchiveType archiveType);
+ void load(const Common::String &name, int ccMode);
};
class XeenSerializer : public Common::Serializer {
@@ -155,22 +204,8 @@ public:
};
/**
-* Details of a single entry in a CC file index
-*/
-struct CCEntry {
- uint16 _id;
- uint32 _offset;
- uint16 _size;
-
- CCEntry() : _id(0), _offset(0), _size(0) {}
- CCEntry(uint16 id, uint32 offset, uint32 size)
- : _id(id), _offset(offset), _size(size) {
- }
-};
-
-/**
-* Base Xeen CC file implementation
-*/
+ * Base Xeen CC file implementation
+ */
class BaseCCArchive : public Common::Archive {
protected:
Common::Array<CCEntry> _index;
@@ -200,8 +235,8 @@ public:
};
/**
-* Xeen CC file implementation
-*/
+ * Xeen CC file implementation
+ */
class CCArchive : public BaseCCArchive {
private:
Common::String _filename;
@@ -218,6 +253,56 @@ public:
virtual Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const;
};
+class SaveArchive : public BaseCCArchive {
+ friend class OutFile;
+private:
+ Party *_party;
+ byte *_data;
+ Common::HashMap<uint16, Common::MemoryWriteStreamDynamic *> _newData;
+
+ void load(Common::SeekableReadStream *stream);
+public:
+ SaveArchive(Party *party);
+ ~SaveArchive();
+
+ /**
+ * Sets up the dynamic data for the game for a new game
+ */
+ void reset(CCArchive *src);
+
+ // Archive implementation
+ virtual Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const;
+};
+
+/**
+ * Provides an interface to updating files within the in-memory save state
+ */
+class OutFile : public Common::WriteStream {
+private:
+ SaveArchive *_archive;
+ Common::String _filename;
+ Common::MemoryWriteStreamDynamic _backingStream;
+public:
+ OutFile(const Common::String &filename);
+ OutFile(const Common::String &filename, SaveArchive *archive);
+ OutFile(const Common::String &filename, int ccMode);
+
+ /**
+ * Finishes any pending writes, pushing out the written data
+ */
+ void finalize();
+
+ /**
+ * Writes data
+ */
+ uint32 write(const void *dataPtr, uint32 dataSize) override;
+
+ /**
+ * Returns the current position
+ */
+ int32 pos() const override;
+};
+
} // End of namespace Xeen
#endif /* XEEN_FILES_H */
diff --git a/engines/xeen/font.cpp b/engines/xeen/font.cpp
index 1d7dab7e21..3a70c4c8be 100644
--- a/engines/xeen/font.cpp
+++ b/engines/xeen/font.cpp
@@ -247,6 +247,13 @@ const char *FontSurface::writeString(const Common::String &s, const Common::Rect
return _displayString;
}
+void FontSurface::writeCharacter(char c, const Common::Rect &clipRect) {
+ Justify justify = _fontJustify;
+ _fontJustify = JUSTIFY_NONE;
+ writeString(Common::String::format("%c", c), clipRect);
+ _fontJustify = justify;
+}
+
char FontSurface::getNextChar() {
return *_displayString++ & 0x7f;
}
diff --git a/engines/xeen/font.h b/engines/xeen/font.h
index d4f10d64b9..ca2cf87ad4 100644
--- a/engines/xeen/font.h
+++ b/engines/xeen/font.h
@@ -96,6 +96,13 @@ public:
* justification is set, the message will be written at _writePos
*/
const char *writeString(const Common::String &s, const Common::Rect &clipRect);
+
+ /**
+ * Write a charcter to the window
+ * @param c Character
+ * @param clipRect Window bounds to display string within
+ */
+ void writeCharacter(char c, const Common::Rect &clipRect);
};
} // End of namespace Xeen
diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index 968ddbbb59..0cc509a66a 100644
--- a/engines/xeen/interface.cpp
+++ b/engines/xeen/interface.cpp
@@ -1898,6 +1898,7 @@ void Interface::spellFX(Character *c) {
drawParty(true);
_tillMove = tillMove;
+ ++_charFX[charIndex];
}
void Interface::obscureScene(Obscurity obscurity) {
diff --git a/engines/xeen/items.h b/engines/xeen/items.h
deleted file mode 100644
index bfbd9e4481..0000000000
--- a/engines/xeen/items.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef XEEN_ITEMS_H
-#define XEEN_ITEMS_H
-
-#include "xeen/character.h"
-
-namespace Xeen {
-
-
-
-} // End of namespace Xeen
-
-#endif /* XEEN_ITEMS_H */
diff --git a/engines/xeen/locations.cpp b/engines/xeen/locations.cpp
index 392b7007cd..11391736d5 100644
--- a/engines/xeen/locations.cpp
+++ b/engines/xeen/locations.cpp
@@ -2409,8 +2409,7 @@ bool LocationMessage::execute(int portrait, const Common::String &name, const Co
if (!msgEnd && !confirm) {
res._globalSprites.draw(0, 7, Common::Point(232, 74));
- res._globalSprites.draw(0, 0, Common::Point(235, 75));
- res._globalSprites.draw(0, 2, Common::Point(260, 75));
+ drawButtons(&windows[0]);
windows[34].update();
intf._face1State = map._headData[party._mazePosition.y][party._mazePosition.x]._left;
diff --git a/engines/xeen/map.cpp b/engines/xeen/map.cpp
index f0c9b57802..2b954f5afa 100644
--- a/engines/xeen/map.cpp
+++ b/engines/xeen/map.cpp
@@ -518,11 +518,11 @@ void SurroundingMazes::clear() {
_west = 0;
}
-void SurroundingMazes::synchronize(Common::SeekableReadStream &s) {
- _north = s.readUint16LE();
- _east = s.readUint16LE();
- _south = s.readUint16LE();
- _west = s.readUint16LE();
+void SurroundingMazes::synchronize(XeenSerializer &s) {
+ s.syncAsUint16LE(_north);
+ s.syncAsUint16LE(_east);
+ s.syncAsUint16LE(_south);
+ s.syncAsUint16LE(_west);
}
int &SurroundingMazes::operator[](int idx) {
@@ -551,15 +551,15 @@ MazeDifficulties::MazeDifficulties() {
_chance2Run = -1;
}
-void MazeDifficulties::synchronize(Common::SeekableReadStream &s) {
- _wallNoPass = s.readByte();
- _surfaceNoPass = s.readByte();
- _unlockDoor = s.readByte();
- _unlockBox = s.readByte();
- _bashDoor = s.readByte();
- _bashGrate = s.readByte();
- _bashWall = s.readByte();
- _chance2Run = s.readByte();
+void MazeDifficulties::synchronize(XeenSerializer &s) {
+ s.syncAsByte(_wallNoPass);
+ s.syncAsByte(_surfaceNoPass);
+ s.syncAsByte(_unlockDoor);
+ s.syncAsByte(_unlockBox);
+ s.syncAsByte(_bashDoor);
+ s.syncAsSint8(_bashGrate);
+ s.syncAsSint8(_bashWall);
+ s.syncAsSint8(_chance2Run);
}
/*------------------------------------------------------------------------*/
@@ -587,42 +587,48 @@ void MazeData::clear() {
_mazeId = 0;
}
-void MazeData::synchronize(Common::SeekableReadStream &s) {
+void MazeData::synchronize(XeenSerializer &s) {
+ byte b;
+
for (int y = 0; y < MAP_HEIGHT; ++y) {
for (int x = 0; x < MAP_WIDTH; ++x)
- _wallData[y][x]._data = s.readUint16LE();
+ s.syncAsUint16LE(_wallData[y][x]._data);
}
for (int y = 0; y < MAP_HEIGHT; ++y) {
for (int x = 0; x < MAP_WIDTH; ++x) {
- byte b = s.readByte();
- _cells[y][x]._surfaceId = b & 7;
- _cells[y][x]._flags = b & 0xF8;
+ if (s.isLoading()) {
+ s.syncAsByte(b);
+ _cells[y][x]._surfaceId = b & 7;
+ _cells[y][x]._flags = b & 0xF8;
+ } else {
+ b = (_cells[y][x]._surfaceId & 7) | (_cells[y][x]._flags & 0xf8);
+ s.syncAsByte(b);
+ }
}
}
- _mazeNumber = s.readUint16LE();
+ s.syncAsUint16LE(_mazeNumber);
_surroundingMazes.synchronize(s);
- _mazeFlags = s.readUint16LE();
- _mazeFlags2 = s.readUint16LE();
+ s.syncAsUint16LE(_mazeFlags);
+ s.syncAsUint16LE(_mazeFlags2);
for (int i = 0; i < 16; ++i)
- _wallTypes[i] = s.readByte();
+ s.syncAsByte(_wallTypes[i]);
for (int i = 0; i < 16; ++i)
- _surfaceTypes[i] = s.readByte();
+ s.syncAsByte(_surfaceTypes[i]);
- _floorType = s.readByte();
- _runPosition.x = s.readByte();
+ s.syncAsByte(_floorType);
+ s.syncAsByte(_runPosition.x);
_difficulties.synchronize(s);
- _runPosition.y = s.readByte();
- _trapDamage = s.readByte();
- _wallKind = s.readByte();
- _tavernTips = s.readByte();
+ s.syncAsByte(_runPosition.y);
+ s.syncAsByte(_trapDamage);
+ s.syncAsByte(_wallKind);
+ s.syncAsByte(_tavernTips);
- Common::Serializer ser(&s, nullptr);
for (int y = 0; y < MAP_HEIGHT; ++y)
- SavesManager::syncBitFlags(ser, &_seenTiles[y][0], &_seenTiles[y][MAP_WIDTH]);
+ File::syncBitFlags(s, &_seenTiles[y][0], &_seenTiles[y][MAP_WIDTH]);
for (int y = 0; y < MAP_HEIGHT; ++y)
- SavesManager::syncBitFlags(ser, &_steppedOnTiles[y][0], &_steppedOnTiles[y][MAP_WIDTH]);
+ File::syncBitFlags(s, &_steppedOnTiles[y][0], &_steppedOnTiles[y][MAP_WIDTH]);
}
void MazeData::setAllTilesStepped() {
@@ -653,6 +659,12 @@ bool MobStruct::synchronize(XeenSerializer &s) {
return _id != 0xff || _pos.x != -1 || _pos.y != -1;
}
+void MobStruct::endOfList() {
+ _pos.x = _pos.y = -1;
+ _id = 0xff;
+ _direction = (Direction)-1;
+}
+
/*------------------------------------------------------------------------*/
MazeObject::MazeObject() {
@@ -724,19 +736,19 @@ void MonsterObjectData::synchronize(XeenSerializer &s, MonsterData &monsterData)
for (uint i = 0; i < 16; ++i) {
b = (i >= _objectSprites.size()) ? 0xff : _objectSprites[i]._spriteId;
s.syncAsByte(b);
- if (b != 0xff)
+ if (s.isLoading() && b != 0xff)
_objectSprites.push_back(SpriteResourceEntry(b));
}
for (uint i = 0; i < 16; ++i) {
b = (i >= _monsterSprites.size()) ? 0xff : _monsterSprites[i]._spriteId;
s.syncAsByte(b);
- if (b != 0xff)
+ if (s.isLoading() && b != 0xff)
_monsterSprites.push_back(SpriteResourceEntry(b));
}
for (uint i = 0; i < 16; ++i) {
b = (i >= _wallItemSprites.size()) ? 0xff : _wallItemSprites[i]._spriteId;
s.syncAsByte(b);
- if (b != 0xff)
+ if (s.isLoading() && b != 0xff)
_wallItemSprites.push_back(SpriteResourceEntry(b));
}
@@ -748,8 +760,7 @@ void MonsterObjectData::synchronize(XeenSerializer &s, MonsterData &monsterData)
mobStruct._direction = _objects[i]._direction;
mobStruct.synchronize(s);
}
- mobStruct._pos.x = mobStruct._pos.y = -1;
- mobStruct._id = 0xff;
+ mobStruct.endOfList();
mobStruct.synchronize(s);
// Save monsters
@@ -759,13 +770,13 @@ void MonsterObjectData::synchronize(XeenSerializer &s, MonsterData &monsterData)
mobStruct._direction = DIR_NORTH;
mobStruct.synchronize(s);
}
- mobStruct._pos.x = mobStruct._pos.y = -1;
- mobStruct._id = 0xff;
+ mobStruct.endOfList();
mobStruct.synchronize(s);
// Save wall items
if (_wallItems.size() == 0) {
MobStruct nullStruct;
+ nullStruct._pos.x = nullStruct._pos.y = 0x80;
nullStruct.synchronize(s);
} else {
for (uint i = 0; i < _wallItems.size(); ++i) {
@@ -775,8 +786,7 @@ void MonsterObjectData::synchronize(XeenSerializer &s, MonsterData &monsterData)
mobStruct.synchronize(s);
}
}
- mobStruct._pos.x = mobStruct._pos.y = -1;
- mobStruct._id = 0xff;
+ mobStruct.endOfList();
mobStruct.synchronize(s);
} else {
@@ -928,6 +938,7 @@ Map::Map(XeenEngine *vm) : _vm(vm), _mobData(vm) {
_sideObjects = 0;
_sideMonsters = 0;
_sidePictures = 0;
+ _sideMusic = 0;
_isOutdoors = false;
_mazeDataIndex = 0;
_currentSteppedOn = false;
@@ -944,24 +955,20 @@ Map::Map(XeenEngine *vm) : _vm(vm), _mobData(vm) {
void Map::load(int mapId) {
EventsManager &events = *g_vm->_events;
+ FileManager &files = *g_vm->_files;
Interface &intf = *g_vm->_interface;
Party &party = *g_vm->_party;
Sound &sound = *g_vm->_sound;
- Windows &windows = *g_vm->_windows;
IndoorDrawList &indoorList = intf._indoorList;
OutdoorDrawList &outdoorList = intf._outdoorList;
- if (intf._falling) {
- Window &w = windows[9];
- w.open();
- w.writeString(Res.OOPS);
- } else {
- PleaseWait::show(_vm);
- }
+ PleaseWait waitMsg(intf._falling);
+ waitMsg.show();
intf._objNumber = 0;
party._stepped = true;
party._mazeId = mapId;
+ saveMaze();
events.clearEvents();
_sideObjects = 1;
@@ -974,6 +981,8 @@ void Map::load(int mapId) {
}
if (_vm->getGameID() == GType_WorldOfXeen) {
+ files.setGameCc(1);
+
if (!_loadDarkSide) {
_animationInfo.load("clouds.dat");
_monsterData.load("xeen.mon");
@@ -1020,6 +1029,8 @@ void Map::load(int mapId) {
break;
}
}
+
+ files.setGameCc(_loadDarkSide);
}
// Load any events for the new map
@@ -1027,7 +1038,7 @@ void Map::load(int mapId) {
// Iterate through loading the given maze as well as the two successive
// mazes in each of the four cardinal directions
- bool isDarkCc = _vm->getGameID() == GType_DarkSide;
+ bool isDarkCc = files._isDarkCc;
MazeData *mazeDataP = &_mazeData[0];
bool textLoaded = false;
@@ -1041,7 +1052,8 @@ void Map::load(int mapId) {
Common::String datName = Common::String::format("maze%c%03d.dat",
(mapId >= 100) ? 'x' : '0', mapId);
File datFile(datName);
- mazeDataP->synchronize(datFile);
+ XeenSerializer datSer(&datFile, nullptr);
+ mazeDataP->synchronize(datSer);
datFile.close();
if (isDarkCc && mapId == 50)
@@ -1056,9 +1068,10 @@ void Map::load(int mapId) {
// Handle loading text data
if (!textLoaded) {
textLoaded = true;
+
Common::String txtName = Common::String::format("%s%c%03d.txt",
isDarkCc ? "dark" : "xeen", mapId >= 100 ? 'x' : '0', mapId);
- File fText(txtName);
+ File fText(txtName, 1);
char mazeName[33];
fText.read(mazeName, 33);
mazeName[32] = '\0';
@@ -1108,13 +1121,15 @@ void Map::load(int mapId) {
mapId = party._mazeId;
Common::String filename = Common::String::format("maze%c%03d.mob",
(mapId >= 100) ? 'x' : '0', mapId);
- File mobFile(filename, *_vm->_saves);
+ File mobFile(filename);
XeenSerializer sMob(&mobFile, nullptr);
_mobData.synchronize(sMob, _monsterData);
mobFile.close();
// Load sprites for the objects
for (uint i = 0; i < _mobData._objectSprites.size(); ++i) {
+ files.setGameCc(_sideObjects);
+
if (party._cloudsEnd && _mobData._objectSprites[i]._spriteId == 85 &&
mapId == 27 && isDarkCc) {
_mobData._objects[29]._spriteId = 0;
@@ -1131,34 +1146,35 @@ void Map::load(int mapId) {
}
// Read in the object sprites
- _mobData._objectSprites[i]._sprites.load(filename,
- _sideObjects ? ALTSIDE_ARCHIVE : GAME_ARCHIVE);
+ _mobData._objectSprites[i]._sprites.load(filename);
}
// Load sprites for the monsters
for (uint i = 0; i < _mobData._monsterSprites.size(); ++i) {
MonsterObjectData::SpriteResourceEntry &spr = _mobData._monsterSprites[i];
- ArchiveType archiveType = spr._spriteId == 91 && _vm->getGameID() == GType_WorldOfXeen ?
- ALTSIDE_ARCHIVE : GAME_ARCHIVE;
uint imgNumber = _monsterData[spr._spriteId]._imageNumber;
+ files.setGameCc((spr._spriteId == 91 && _vm->getGameID() == GType_WorldOfXeen) ?
+ 0 : _sideMonsters);
filename = Common::String::format("%03u.mon", imgNumber);
- _mobData._monsterSprites[i]._sprites.load(filename, archiveType);
+ _mobData._monsterSprites[i]._sprites.load(filename);
filename = Common::String::format("%03u.att", imgNumber);
- _mobData._monsterSprites[i]._attackSprites.load(filename, archiveType);
+ _mobData._monsterSprites[i]._attackSprites.load(filename);
}
// Load wall picture sprite resources
for (uint i = 0; i < _mobData._wallItemSprites.size(); ++i) {
filename = Common::String::format("%03d.pic", _mobData._wallItemSprites[i]._spriteId);
- _mobData._wallItemSprites[i]._sprites.load(filename,
- _sidePictures ? ALTSIDE_ARCHIVE : GAME_ARCHIVE);
+ _mobData._wallItemSprites[i]._sprites.load(filename, _sidePictures);
}
+ files.setGameCc(isDarkCc);
+
// Handle loading miscellaneous sprites for the map
if (_isOutdoors) {
// Start playing relevant music
+ sound._musicSide = isDarkCc;
Common::String musName;
if (_vm->_files->_isDarkCc) {
@@ -1190,11 +1206,16 @@ void Map::load(int mapId) {
_surfaceSprites[i].load(Res.SURFACE_NAMES[_mazeData[0]._surfaceTypes[i]]);
}
} else {
+ if (files._isDarkCc && (mapId == 125 || mapId == 126 || mapId == 127))
+ files.setGameCc(0);
+ sound._musicSide = files._isDarkCc;
+
// Start playing relevant music
const int MUS_INDEXES[] = { 1, 2, 3, 4, 3, 5 };
Common::String musName;
- if (_vm->_files->_isDarkCc) {
+ _sideMusic = isDarkCc;
+ if (isDarkCc) {
int randIndex = _vm->getRandomNumber(6);
musName = MUSIC_FILES2[MUS_INDEXES[_mazeData->_wallKind]][randIndex];
} else {
@@ -1298,6 +1319,8 @@ void Map::load(int mapId) {
}
loadSky();
+
+ files.setGameCc(isDarkCc);
}
int Map::mazeLookup(const Common::Point &pt, int layerShift, int wallMask) {
@@ -1378,7 +1401,7 @@ void Map::loadEvents(int mapId) {
// Load events
Common::String filename = Common::String::format("maze%c%03d.evt",
(mapId >= 100) ? 'x' : '0', mapId);
- File fEvents(filename, *_vm->_saves);
+ File fEvents(filename);
XeenSerializer sEvents(&fEvents, nullptr);
_events.synchronize(sEvents);
fEvents.close();
@@ -1393,26 +1416,75 @@ void Map::loadEvents(int mapId) {
fText.close();
}
-void Map::saveMaze() {
- int mazeNum = _mazeData[0]._mazeNumber;
- if (!mazeNum || (mazeNum == 85 && !_vm->_files->_isDarkCc))
- return;
-
- // Save the event data
+void Map::saveEvents() {
+ // Save eents
+ int mapId = _mazeData[0]._mazeId;
Common::String filename = Common::String::format("maze%c%03d.evt",
- (mazeNum >= 100) ? 'x' : '0', mazeNum);
- OutFile fEvents(_vm, filename);
+ (mapId >= 100) ? 'x' : '0', mapId);
+ OutFile fEvents(filename);
XeenSerializer sEvents(nullptr, &fEvents);
_events.synchronize(sEvents);
fEvents.finalize();
+}
- // Save the maze MOB file
- filename = Common::String::format("maze%c%03d.mob",
- (mazeNum >= 100) ? 'x' : '0', mazeNum);
- OutFile fMob(_vm, filename);
- XeenSerializer sMob(nullptr, &fEvents);
+void Map::saveMap() {
+ FileManager &files = *g_vm->_files;
+ Party &party = *g_vm->_party;
+ int mapId = _mazeData[0]._mazeId;
+ if (!files._isDarkCc && mapId == 85)
+ return;
+
+ // Save the primary maze
+ Common::String datName = Common::String::format("maze%c%03d.dat", (mapId >= 100) ? 'x' : '0', mapId);
+ OutFile datFile(datName);
+ XeenSerializer datSer(nullptr, &datFile);
+ _mazeData[0].synchronize(datSer);
+ datFile.finalize();
+
+ if (!files._isDarkCc && mapId == 15) {
+ for (uint idx = 0; idx < MIN(_mobData._monsters.size(), (uint)3); ++idx) {
+ MazeMonster &mon = _mobData._monsters[idx];
+ if (mon._position.x > 31 || mon._position.y > 31) {
+ party._gameFlags[0][56] = true;
+ break;
+ }
+ }
+ }
+
+ if (!_isOutdoors) {
+ // Iterate through the surrounding mazes
+ for (int mazeIndex = 1; mazeIndex < 9; ++mazeIndex) {
+ mapId = _mazeData[mazeIndex]._mazeId;
+ if (mapId == 0)
+ continue;
+
+ datName = Common::String::format("maze%c%03d.dat", (mapId >= 100) ? 'x' : '0', mapId);
+ OutFile datFile2(datName);
+ XeenSerializer datSer2(nullptr, &datFile2);
+ _mazeData[mazeIndex].synchronize(datSer2);
+ datFile2.finalize();
+ }
+ }
+}
+
+void Map::saveMonsters() {
+ int mapId = _mazeData[0]._mazeId;
+ Common::String filename = Common::String::format("maze%c%03d.mob",
+ (mapId >= 100) ? 'x' : '0', mapId);
+ OutFile fMob(filename);
+ XeenSerializer sMob(nullptr, &fMob);
_mobData.synchronize(sMob, _monsterData);
- fEvents.finalize();
+ fMob.finalize();
+}
+
+void Map::saveMaze() {
+ int mazeNum = _mazeData[0]._mazeNumber;
+ if (!mazeNum || (mazeNum == 85 && !_vm->_files->_isDarkCc))
+ return;
+
+ saveEvents();
+ saveMap();
+ saveMonsters();
}
void Map::cellFlagLookup(const Common::Point &pt) {
@@ -1619,7 +1691,7 @@ void Map::getNewMaze() {
// Get the correct map to use from the cached list
_mazeDataIndex = 0;
- while (_mazeData[_mazeDataIndex]._mazeId == mapId)
+ while (_mazeData[_mazeDataIndex]._mazeId != mapId)
++_mazeDataIndex;
// Adjust Y and X to be in the 0-15 range, and on the correct surrounding
diff --git a/engines/xeen/map.h b/engines/xeen/map.h
index 3defc589bf..fe626858c8 100644
--- a/engines/xeen/map.h
+++ b/engines/xeen/map.h
@@ -27,6 +27,7 @@
#include "common/array.h"
#include "common/rect.h"
#include "xeen/combat.h"
+#include "xeen/files.h"
#include "xeen/party.h"
#include "xeen/scripts.h"
#include "xeen/sprites.h"
@@ -114,7 +115,7 @@ public:
void clear();
- void synchronize(Common::SeekableReadStream &s);
+ void synchronize(XeenSerializer &s);
int &operator[](int idx);
};
@@ -132,7 +133,10 @@ public:
public:
MazeDifficulties();
- void synchronize(Common::SeekableReadStream &s);
+ /**
+ * Synchronizes data for the item
+ */
+ void synchronize(XeenSerializer &s);
};
enum MazeFlags {
@@ -208,7 +212,10 @@ public:
void clear();
- void synchronize(Common::SeekableReadStream &s);
+ /**
+ * Synchronize data for the maze data
+ */
+ void synchronize(XeenSerializer &s);
/**
* Flags all tiles for the map as having been stepped on
@@ -226,7 +233,15 @@ public:
public:
MobStruct();
+ /**
+ * Synchronizes the data for the item
+ */
bool synchronize(XeenSerializer &s);
+
+ /**
+ * Sets up the entry as an end of list marker
+ */
+ void endOfList();
};
struct MazeObject {
@@ -388,12 +403,28 @@ private:
int _sidePictures;
int _sideObjects;
int _sideMonsters;
+ int _sideMusic;
int _mazeDataIndex;
/**
* Load the events for a new map
*/
void loadEvents(int mapId);
+
+ /**
+ * Save the events for a map
+ */
+ void saveEvents();
+
+ /**
+ * Save the monster data for a map
+ */
+ void saveMonsters();
+
+ /**
+ * Save the map data
+ */
+ void saveMap();
public:
Common::String _mazeName;
bool _isOutdoors;
@@ -432,6 +463,9 @@ public:
void setWall(const Common::Point &pt, Direction dir, int v);
+ /**
+ * Saves all changeable maze data to the in-memory save state
+ */
void saveMaze();
int getCell(int idx);
diff --git a/engines/xeen/music.cpp b/engines/xeen/music.cpp
index fbbaadb374..1e9f6e2fbc 100644
--- a/engines/xeen/music.cpp
+++ b/engines/xeen/music.cpp
@@ -655,7 +655,7 @@ const uint AdlibMusicDriver::WAVEFORMS[24] = {
/*------------------------------------------------------------------------*/
Music::Music() : _musicDriver(nullptr), _songData(nullptr),
- _archiveType(ANY_ARCHIVE), _effectsData(nullptr), _musicOn(true) {
+ _effectsData(nullptr), _musicOn(true), _musicSide(0) {
_musicDriver = new AdlibMusicDriver();
}
@@ -668,13 +668,13 @@ Music::~Music() {
void Music::loadEffectsData() {
// Check whether it's the first load, or switching from intro to game data
- if (_effectsData && !(_archiveType == INTRO_ARCHIVE && File::_currentArchive != INTRO_ARCHIVE))
- return;
+// if (_effectsData && !(_archiveType == INTRO_ARCHIVE && File::_currentArchive != INTRO_ARCHIVE))
+// return;
// Stop any prior FX
stopFX();
delete[] _effectsData;
- _archiveType = File::_currentArchive;
+// _archiveType = File::_currentArchive;
// Load in an entire driver so we have quick access to the effects data
// that's hardcoded within it
@@ -738,7 +738,7 @@ void Music::playSong(const Common::String &name, int param) {
_priorMusic = _currentMusic;
_currentMusic = name;
- File f(name);
+ File f(name, _musicSide);
playSong(f);
}
diff --git a/engines/xeen/music.h b/engines/xeen/music.h
index a3d0121665..126b079677 100644
--- a/engines/xeen/music.h
+++ b/engines/xeen/music.h
@@ -305,7 +305,6 @@ private:
const byte *_effectsData;
Common::Array<uint16> _effectsOffsets;
const byte *_songData;
- ArchiveType _archiveType;
private:
/**
* Loads effects data that was embedded in the music driver
@@ -319,6 +318,7 @@ private:
public:
bool _musicOn;
Common::String _currentMusic, _priorMusic;
+ int _musicSide;
public:
Music();
~Music();
diff --git a/engines/xeen/party.cpp b/engines/xeen/party.cpp
index abedaa46ed..49d86bee62 100644
--- a/engines/xeen/party.cpp
+++ b/engines/xeen/party.cpp
@@ -206,11 +206,11 @@ void Party::synchronize(Common::Serializer &s) {
s.syncAsUint32LE(_bankGems);
s.syncAsUint32LE(_totalTime);
s.syncAsByte(_rested);
- SavesManager::syncBitFlags(s, &_gameFlags[0][0], &_gameFlags[0][256]);
- SavesManager::syncBitFlags(s, &_gameFlags[1][0], &_gameFlags[1][256]);
- SavesManager::syncBitFlags(s, &_worldFlags[0], &_worldFlags[128]);
- SavesManager::syncBitFlags(s, &_questFlags[0][0], &_questFlags[0][30]);
- SavesManager::syncBitFlags(s, &_questFlags[1][0], &_questFlags[1][30]);
+ File::syncBitFlags(s, &_gameFlags[0][0], &_gameFlags[0][256]);
+ File::syncBitFlags(s, &_gameFlags[1][0], &_gameFlags[1][256]);
+ File::syncBitFlags(s, &_worldFlags[0], &_worldFlags[128]);
+ File::syncBitFlags(s, &_questFlags[0][0], &_questFlags[0][30]);
+ File::syncBitFlags(s, &_questFlags[1][0], &_questFlags[1][30]);
for (int i = 0; i < 85; ++i)
s.syncAsByte(_questItems[i]);
@@ -225,7 +225,7 @@ void Party::synchronize(Common::Serializer &s) {
_blacksmithMisc[1][i].synchronize(s);
for (int i = 0; i < TOTAL_CHARACTERS; ++i)
- SavesManager::syncBitFlags(s, &_characterFlags[i][0], &_characterFlags[i][24]);
+ File::syncBitFlags(s, &_characterFlags[i][0], &_characterFlags[i][24]);
s.syncBytes(&dummy[0], 30);
}
@@ -574,7 +574,7 @@ void Party::giveTreasure() {
Windows &windows = *_vm->_windows;
Window &w = windows[10];
- if (!_treasure._gold && !_treasure._gems)
+ if (!_treasure._hasItems && !_treasure._gold && !_treasure._gems)
return;
bool monstersPresent = false;
@@ -652,7 +652,7 @@ void Party::giveTreasure() {
Character &c = _activeParty[charIndex];
if (!c._items[(ItemCategory)categoryNum].isFull() && !c.isDisabledOrDead()) {
giveTreasureToCharacter(c, (ItemCategory)categoryNum, itemNum);
- continue;
+ break;
}
}
}
@@ -713,17 +713,15 @@ void Party::giveTreasureToCharacter(Character &c, ItemCategory category, int ite
if (treasureItem._id < 82) {
// Copy item into the character's inventory
c._items[category][INV_ITEMS_TOTAL - 1] = treasureItem;
- c._items[category].sort();
}
w.writeString(Res.GIVE_TREASURE_FORMATTING);
w.update();
events.ipause(5);
- w.writeString(Common::String::format(Res.X_FOUND_Y, c._name.c_str(),
- Res.ITEM_NAMES[category][treasureItem._id]));
+ const char *itemName = XeenItem::getItemName(category, treasureItem._id);
+ w.writeString(Common::String::format(Res.X_FOUND_Y, c._name.c_str(), itemName));
w.update();
-
events.ipause(5);
}
@@ -860,7 +858,7 @@ bool Party::giveTake(int takeMode, uint takeVal, int giveMode, uint giveVal, int
break;
}
} else {
- error("Invalid id");
+ _questItems[takeVal - 82]--;
}
}
if (!found)
@@ -1100,7 +1098,10 @@ bool Party::giveTake(int takeMode, uint takeVal, int giveMode, uint giveVal, int
break;
case 21: {
int idx;
- if (giveVal < 35) {
+ if (giveVal >= 82) {
+ _questItems[giveVal - 82]++;
+ }
+ if (giveVal < 35 || giveVal >= 82) {
for (idx = 0; idx < 10 && _treasure._weapons[idx]._id; ++idx);
if (idx < 10) {
_treasure._weapons[idx]._id = giveVal;
@@ -1121,15 +1122,13 @@ bool Party::giveTake(int takeMode, uint takeVal, int giveMode, uint giveVal, int
_treasure._hasItems = true;
return false;
}
- } else if (giveVal < 82) {
+ } else {
for (idx = 0; idx < 10 && _treasure._misc[idx]._material; ++idx);
if (idx < 10) {
_treasure._accessories[idx]._material = giveVal - 60;
_treasure._hasItems = true;
return false;
}
- } else {
- error("Invalid id");
}
return true;
}
@@ -1391,6 +1390,106 @@ bool Party::giveTake(int takeMode, uint takeVal, int giveMode, uint giveVal, int
return false;
}
+bool Party::giveExt(int mode1, uint val1, int mode2, uint val2, int mode3, uint val3, int charId) {
+ Combat &combat = *g_vm->_combat;
+ FileManager &files = *g_vm->_files;
+ Interface &intf = *g_vm->_interface;
+ Map &map = *g_vm->_map;
+ Party &party = *g_vm->_party;
+ Scripts &scripts = *g_vm->_scripts;
+ Sound &sound = *g_vm->_sound;
+ Character &c = party._activeParty[charId];
+
+ if (intf._objNumber && !scripts._animCounter) {
+ MazeObject &obj = map._mobData._objects[intf._objNumber - 1];
+ switch (obj._spriteId) {
+ case 15:
+ if (!files._isDarkCc)
+ break;
+ // Intentional fall-through
+
+ case 16:
+ case 58:
+ case 73:
+ obj._frame = 1;
+
+ if (obj._position.x != 20) {
+ if (g_vm->getRandomNumber(1, 4) == 1) {
+ combat.giveCharDamage(map.mazeData()._trapDamage,
+ (DamageType)_vm->getRandomNumber(0, 6), charId);
+ }
+
+ int unlockBox = map.mazeData()._difficulties._unlockBox;
+ if ((c.getThievery() + _vm->getRandomNumber(1, 20)) >= unlockBox) {
+ scripts._animCounter++;
+ g_vm->_mode = MODE_7;
+ c._experience += c.getCurrentLevel() * unlockBox * 10;
+
+ sound.playFX(10);
+ intf.draw3d(true, false);
+ Common::String msg = Common::String::format(Res.PICKS_THE_LOCK, c._name.c_str());
+ ErrorScroll::show(g_vm, msg);
+ } else {
+ sound.playFX(21);
+
+ obj._frame = 0;
+ scripts._animCounter = 0;
+ Common::String msg = Common::String::format(Res.UNABLE_TO_PICK_LOCK, c._name.c_str());
+ ErrorScroll::show(g_vm, msg);
+
+ scripts._animCounter = 255;
+ return true;
+ }
+ }
+ }
+ }
+
+ for (int paramCtr = 0; paramCtr < 3; ++paramCtr) {
+ int mode = (paramCtr == 0) ? mode1 : (paramCtr == 1 ? mode2 : mode3);
+ int val = (paramCtr == 0) ? val1 : (paramCtr == 1 ? val2 : val3);
+
+ switch (mode) {
+ case 34:
+ party._treasure._gold += val;
+ break;
+
+ case 35:
+ party._treasure._gems += val;
+ break;
+
+ case 66:
+ c = _itemsCharacter;
+ c.clear();
+
+ if (giveTake(0, 0, mode, val, charId))
+ return true;
+ break;
+
+ case 100:
+ _treasure._gold += g_vm->getRandomNumber(1, val);
+ break;
+
+ case 101:
+ _treasure._gems += g_vm->getRandomNumber(1, val);
+ break;
+
+ case 106:
+ party._food += g_vm->getRandomNumber(1, val);
+ break;
+
+ case 67:
+ default:
+ if (giveTake(0, 0, mode, val, charId))
+ return true;
+ else if (mode == 67)
+ return false;
+ break;
+ }
+ }
+
+ return false;
+}
+
int Party::howMuch() {
return HowMuch::show(_vm);
}
diff --git a/engines/xeen/party.h b/engines/xeen/party.h
index f6df5ff83e..9262417a26 100644
--- a/engines/xeen/party.h
+++ b/engines/xeen/party.h
@@ -30,7 +30,6 @@
#include "xeen/character.h"
#include "xeen/combat.h"
#include "xeen/dialogs_error.h"
-#include "xeen/items.h"
namespace Xeen {
@@ -228,6 +227,11 @@ public:
bool giveTake(int takeMode, uint takeVal, int giveMode, uint giveVal, int charIdx);
/**
+ * Gives up to three different item/amounts to various character and/or party properties
+ */
+ bool giveExt(int mode1, uint val1, int mode2, uint val2, int mode3, uint val3, int charId);
+
+ /**
* Resets the inventory that Blacksmiths sell
*/
void resetBlacksmithWares();
diff --git a/engines/xeen/resources.cpp b/engines/xeen/resources.cpp
index c60897cb81..f9b6548404 100644
--- a/engines/xeen/resources.cpp
+++ b/engines/xeen/resources.cpp
@@ -42,6 +42,8 @@ Resources *Resources::init(XeenEngine *vm) {
Resources::Resources() {
g_resources = this;
+ g_vm->_files->setGameCc(1);
+
_globalSprites.load("global.icn");
File f("mae.xen");
@@ -1579,7 +1581,7 @@ const char *const Resources::BACKPACKS_FULL_PRESS_KEY =
"\v007\f12Warning! BackPacks Full!\fd\n"
"Press a Key";
-const char *const Resources::HIT_A_KEY = "\x3l\v120\t000\x4""077\x3""c\f37Hit a key\f'd";
+const char *const Resources::HIT_A_KEY = "\x3l\v120\t000\x4""077\x3""c\f37Hit a key\xC""d";
const char *const Resources::GIVE_TREASURE_FORMATTING =
"\x3l\v060\t000\x4""077\n"
@@ -1666,4 +1668,8 @@ const char *const Resources::WARZONE_LEVEL = "What level of monsters? (1-10)\n";
const char *const Resources::WARZONE_HOW_MANY = "How many monsters? (1-20)\n";
+const char *const Resources::PICKS_THE_LOCK = "\x3""c\xB""010%s picks the lock!\nPress any key.";
+
+const char *const Resources::UNABLE_TO_PICK_LOCK = "\x3""c\v010%s was unable to pick the lock!\nPress any key.";
+
} // End of namespace Xeen
diff --git a/engines/xeen/resources.h b/engines/xeen/resources.h
index dab3dffd8d..61581594e8 100644
--- a/engines/xeen/resources.h
+++ b/engines/xeen/resources.h
@@ -351,6 +351,8 @@ public:
static const char *const WARZONE_MAXED;
static const char *const WARZONE_LEVEL;
static const char *const WARZONE_HOW_MANY;
+ static const char *const PICKS_THE_LOCK;
+ static const char *const UNABLE_TO_PICK_LOCK;
public:
/**
* Initializes an instnace of the resources
diff --git a/engines/xeen/saves.cpp b/engines/xeen/saves.cpp
index 1c0604249d..504bb18dd7 100644
--- a/engines/xeen/saves.cpp
+++ b/engines/xeen/saves.cpp
@@ -23,167 +23,176 @@
#include "common/scummsys.h"
#include "common/algorithm.h"
#include "common/memstream.h"
+#include "graphics/scaler.h"
+#include "graphics/thumbnail.h"
#include "xeen/saves.h"
#include "xeen/files.h"
#include "xeen/xeen.h"
namespace Xeen {
-OutFile::OutFile(XeenEngine *vm, const Common::String filename) :
- _vm(vm),
- _filename(filename),
- _backingStream(DisposeAfterUse::YES) {
-}
+SavesManager::SavesManager(const Common::String &targetName): _targetName(targetName),
+ _wonWorld(false), _wonDarkSide(false) {
+ File::_xeenSave = nullptr;
+ File::_darkSave = nullptr;
-uint32 OutFile::write(const void *dataPtr, uint32 dataSize) {
- return _backingStream.write(dataPtr, dataSize);
-}
+ if (g_vm->getGameID() != GType_Clouds) {
+ File::_darkSave = new SaveArchive(g_vm->_party);
+ File::_darkSave->reset(File::_darkCc);
+ }
+ if (g_vm->getGameID() != GType_DarkSide) {
+ File::_xeenSave = new SaveArchive(g_vm->_party);
+ File::_xeenSave->reset(File::_xeenCc);
+ }
-int32 OutFile::pos() const {
- return _backingStream.pos();
-}
+ File::_currentSave = g_vm->getGameID() == GType_DarkSide ?
+ File::_darkSave : File::_xeenSave;
+ assert(File::_currentSave);
-void OutFile::finalize() {
- uint16 id = BaseCCArchive::convertNameToId(_filename);
+ // Set any final initial values
+ Party &party = *g_vm->_party;
+ party.resetBlacksmithWares();
+ party._year = g_vm->getGameID() == GType_WorldOfXeen ? 610 : 850;
+ party._totalTime = 0;
+}
- if (!_vm->_saves->_newData.contains(id))
- _vm->_saves->_newData[id] = new Common::MemoryWriteStreamDynamic(DisposeAfterUse::YES);
+SavesManager::~SavesManager() {
+ delete File::_xeenSave;
+ delete File::_darkSave;
+}
- Common::MemoryWriteStreamDynamic *out = _vm->_saves->_newData[id];
- out->write(_backingStream.getData(), _backingStream.size());
+void SavesManager::readCharFile() {
+ warning("TODO: readCharFile");
}
-/*------------------------------------------------------------------------*/
+void SavesManager::writeCharFile() {
+ warning("TODO: writeCharFile");
+}
-SavesManager::SavesManager(XeenEngine *vm, Party &party) :
- BaseCCArchive(), _vm(vm), _party(party) {
- SearchMan.add("saves", this, 0, false);
- _data = nullptr;
- _wonWorld = false;
- _wonDarkSide = false;
+void SavesManager::saveChars() {
+ warning("TODO: saveChars");
}
-SavesManager::~SavesManager() {
- for (Common::HashMap<uint16, Common::MemoryWriteStreamDynamic *>::iterator it = _newData.begin(); it != _newData.end(); it++) {
- delete (*it)._value;
- }
- delete[] _data;
+const char *const SAVEGAME_STR = "XEEN";
+#define SAVEGAME_STR_SIZE 6
+
+bool SavesManager::readSavegameHeader(Common::InSaveFile *in, XeenSavegameHeader &header) {
+ char saveIdentBuffer[SAVEGAME_STR_SIZE + 1];
+ header._thumbnail = nullptr;
+
+ // Validate the header Id
+ in->read(saveIdentBuffer, SAVEGAME_STR_SIZE + 1);
+ if (strncmp(saveIdentBuffer, SAVEGAME_STR, SAVEGAME_STR_SIZE))
+ return false;
+
+ header._version = in->readByte();
+ if (header._version > XEEN_SAVEGAME_VERSION)
+ return false;
+
+ // Read in the string
+ header._saveName.clear();
+ char ch;
+ while ((ch = (char)in->readByte()) != '\0')
+ header._saveName += ch;
+
+ // Get the thumbnail
+ header._thumbnail = Graphics::loadThumbnail(*in);
+ if (!header._thumbnail)
+ return false;
+
+ // Read in save date/time
+ header._year = in->readSint16LE();
+ header._month = in->readSint16LE();
+ header._day = in->readSint16LE();
+ header._hour = in->readSint16LE();
+ header._minute = in->readSint16LE();
+ header._totalFrames = in->readUint32LE();
+
+ return true;
}
-void SavesManager::syncBitFlags(Common::Serializer &s, bool *startP, bool *endP) {
- byte data = 0;
-
- int bitCounter = 0;
- for (bool *p = startP; p <= endP; ++p, bitCounter = (bitCounter + 1) % 8) {
- if (p == endP || bitCounter == 0) {
- if (p != endP || s.isSaving())
- s.syncAsByte(data);
- if (p == endP)
- break;
-
- if (s.isSaving())
- data = 0;
- }
-
- if (s.isLoading())
- *p = (data >> bitCounter) != 0;
- else if (*p)
- data |= 1 << bitCounter;
- }
+void SavesManager::writeSavegameHeader(Common::OutSaveFile *out, XeenSavegameHeader &header) {
+ // Write out a savegame header
+ out->write(SAVEGAME_STR, SAVEGAME_STR_SIZE + 1);
+
+ out->writeByte(XEEN_SAVEGAME_VERSION);
+
+ // Write savegame name
+ out->writeString(header._saveName);
+ out->writeByte('\0');
+
+ // Write a thumbnail of the screen
+ /*
+ uint8 thumbPalette[768];
+ _screen->getPalette(thumbPalette);
+ Graphics::Surface saveThumb;
+ ::createThumbnail(&saveThumb, (const byte *)_screen->getPixels(),
+ _screen->w, _screen->h, thumbPalette);
+ Graphics::saveThumbnail(*out, saveThumb);
+ saveThumb.free();
+ */
+ // Write out the save date/time
+ TimeDate td;
+ g_system->getTimeAndDate(td);
+ out->writeSint16LE(td.tm_year + 1900);
+ out->writeSint16LE(td.tm_mon + 1);
+ out->writeSint16LE(td.tm_mday);
+ out->writeSint16LE(td.tm_hour);
+ out->writeSint16LE(td.tm_min);
+ // out->writeUint32LE(_events->getFrameCounter());
}
-Common::SeekableReadStream *SavesManager::createReadStreamForMember(const Common::String &name) const {
- CCEntry ccEntry;
+Common::Error SavesManager::saveGameState(int slot, const Common::String &desc) {
+ Common::OutSaveFile *out = g_system->getSavefileManager()->openForSaving(
+ generateSaveName(slot));
+ if (!out)
+ return Common::kCreatingFileFailed;
- // If the given resource has already been perviously "written" to the
- // save manager, then return that new resource
- uint16 id = BaseCCArchive::convertNameToId(name);
- if (_newData.contains(id)) {
- Common::MemoryWriteStreamDynamic *stream = _newData[id];
- return new Common::MemoryReadStream(stream->getData(), stream->size());
- }
+ XeenSavegameHeader header;
+ header._saveName = desc;
+ writeSavegameHeader(out, header);
- // Retrieve the resource from the loaded savefile
- if (getHeaderEntry(name, ccEntry)) {
- // Open the correct CC entry
- return new Common::MemoryReadStream(_data + ccEntry._offset, ccEntry._size);
- }
+ Common::Serializer s(nullptr, out);
+ synchronize(s);
- return nullptr;
-}
+ out->finalize();
+ delete out;
-void SavesManager::load(Common::SeekableReadStream *stream) {
- loadIndex(stream);
+ return Common::kNoError;
+}
- delete[] _data;
- _data = new byte[stream->size()];
- stream->seek(0);
- stream->read(_data, stream->size());
+Common::Error SavesManager::loadGameState(int slot) {
+ Common::InSaveFile *saveFile = g_system->getSavefileManager()->openForLoading(
+ generateSaveName(slot));
+ if (!saveFile)
+ return Common::kReadingFailed;
- // Load in the character stats and active party
- Common::SeekableReadStream *chr = createReadStreamForMember("maze.chr");
- Common::Serializer sChr(chr, nullptr);
- _party._roster.synchronize(sChr);
- delete chr;
+ Common::Serializer s(saveFile, nullptr);
- Common::SeekableReadStream *pty = createReadStreamForMember("maze.pty");
- Common::Serializer sPty(pty, nullptr);
- _party.synchronize(sPty);
- delete pty;
-}
+ // Load the savaegame header
+ XeenSavegameHeader header;
+ if (!readSavegameHeader(saveFile, header))
+ error("Invalid savegame");
-void SavesManager::reset() {
- Common::String prefix = _vm->getGameID() != GType_DarkSide ? "xeen|" : "dark|";
- Common::MemoryWriteStreamDynamic saveFile(DisposeAfterUse::YES);
- Common::File fIn;
-
- const int RESOURCES[6] = { 0x2A0C, 0x2A1C, 0x2A2C, 0x2A3C, 0x284C, 0x2A5C };
- for (int i = 0; i < 6; ++i) {
- Common::String filename = prefix + Common::String::format("%.4x", RESOURCES[i]);
- if (fIn.exists(filename)) {
- // Read in the next resource
- fIn.open(filename);
- byte *data = new byte[fIn.size()];
- fIn.read(data, fIn.size());
-
- // Copy it to the combined savefile resource
- saveFile.write(data, fIn.size());
- delete[] data;
- fIn.close();
- }
+ if (header._thumbnail) {
+ header._thumbnail->free();
+ delete header._thumbnail;
}
- Common::MemoryReadStream f(saveFile.getData(), saveFile.size());
- load(&f);
-
- // Set up the party and characters from dark.cur
- CCArchive gameCur("xeen.cur", false);
- File fParty("maze.pty", gameCur);
- Common::Serializer sParty(&fParty, nullptr);
- _party.synchronize(sParty);
- fParty.close();
-
- File fChar("maze.chr", gameCur);
- Common::Serializer sChar(&fChar, nullptr);
- _party._roster.synchronize(sChar);
- fChar.close();
+ // Load most of the savegame data
+ synchronize(s);
+ delete saveFile;
- // Set any final initial values
- _party.resetBlacksmithWares();
- _party._year = _vm->getGameID() == GType_WorldOfXeen ? 610 : 850;
- _party._totalTime = 0;
+ return Common::kNoError;
}
-void SavesManager::readCharFile() {
- warning("TODO: readCharFile");
+Common::String SavesManager::generateSaveName(int slot) {
+ return Common::String::format("%s.%03d", _targetName.c_str(), slot);
}
-void SavesManager::writeCharFile() {
- warning("TODO: writeCharFile");
+void SavesManager::synchronize(Common::Serializer &s) {
+ // TODO
}
-void SavesManager::saveChars() {
- warning("TODO: saveChars");
-}
} // End of namespace Xeen
diff --git a/engines/xeen/saves.h b/engines/xeen/saves.h
index 9c161c838c..2711cc7f2c 100644
--- a/engines/xeen/saves.h
+++ b/engines/xeen/saves.h
@@ -24,11 +24,11 @@
#define XEEN_SAVES_H
#include "common/scummsys.h"
-#include "common/memstream.h"
#include "common/savefile.h"
+#include "common/serializer.h"
+#include "common/str.h"
#include "graphics/surface.h"
#include "xeen/party.h"
-#include "xeen/files.h"
namespace Xeen {
@@ -41,59 +41,57 @@ struct XeenSavegameHeader {
int _totalFrames;
};
-class XeenEngine;
-class SavesManager;
-
-class OutFile : public Common::WriteStream {
+class SavesManager {
private:
- XeenEngine *_vm;
- Common::String _filename;
- Common::MemoryWriteStreamDynamic _backingStream;
-public:
- OutFile(XeenEngine *vm, const Common::String filename);
-
- void finalize();
-
- uint32 write(const void *dataPtr, uint32 dataSize) override;
-
- int32 pos() const override;
-};
-
-class SavesManager: public BaseCCArchive {
- friend class OutFile;
+ Common::String _targetName;
private:
- XeenEngine *_vm;
- Party &_party;
- byte *_data;
- Common::HashMap<uint16, Common::MemoryWriteStreamDynamic *> _newData;
+ /**
+ * Synchronize savegame data
+ */
+ void synchronize(Common::Serializer &s);
- void load(Common::SeekableReadStream *stream);
-public:
/**
- * Synchronizes a boolean array as a bitfield set
+ * Support method that generates a savegame name
+ * @param slot Slot number
*/
- static void syncBitFlags(Common::Serializer &s, bool *startP, bool *endP);
+ Common::String generateSaveName(int slot);
+
+ /**
+ * Initializes a new savegame
+ */
+ void reset();
public:
bool _wonWorld;
bool _wonDarkSide;
public:
- SavesManager(XeenEngine *vm, Party &party);
-
+ SavesManager(const Common::String &targetName);
~SavesManager();
- /**
- * Sets up the dynamic data for the game for a new game
- */
- void reset();
-
void readCharFile();
void writeCharFile();
void saveChars();
- // Archive implementation
- virtual Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const;
+ /**
+ * Read in a savegame header
+ */
+ static bool readSavegameHeader(Common::InSaveFile *in, XeenSavegameHeader &header);
+
+ /**
+ * Write out a savegame header
+ */
+ void writeSavegameHeader(Common::OutSaveFile *out, XeenSavegameHeader &header);
+
+ /**
+ * Load a savegame
+ */
+ Common::Error loadGameState(int slot);
+
+ /**
+ * Save the game
+ */
+ Common::Error saveGameState(int slot, const Common::String &desc);
};
} // End of namespace Xeen
diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp
index d33c534b6b..99603224c8 100644
--- a/engines/xeen/scripts.cpp
+++ b/engines/xeen/scripts.cpp
@@ -348,7 +348,7 @@ bool Scripts::doOpcode(MazeEvent &event) {
&Scripts::cmdMoveObj, &Scripts::cmdTakeOrGive, &Scripts::cmdDoNothing,
&Scripts::cmdRemove, &Scripts::cmdSetChar, &Scripts::cmdSpawn,
&Scripts::cmdDoTownEvent, &Scripts::cmdExit, &Scripts::cmdAlterMap,
- &Scripts::cmdGiveExtended, &Scripts::cmdConfirmWord, &Scripts::cmdDamage,
+ &Scripts::cmdGiveMulti, &Scripts::cmdConfirmWord, &Scripts::cmdDamage,
&Scripts::cmdJumpRnd, &Scripts::cmdAlterEvent, &Scripts::cmdCallEvent,
&Scripts::cmdReturn, &Scripts::cmdSetVar, &Scripts::cmdTakeOrGive,
&Scripts::cmdTakeOrGive, &Scripts::cmdCutsceneEndClouds,
@@ -468,7 +468,8 @@ bool Scripts::cmdTeleport(ParamsIterator &params) {
Sound &sound = *_vm->_sound;
windows.closeAll();
-
+
+ bool restartFlag = _event->_opcode == OP_TeleportAndContinue;
int mapId = params.readByte();
Common::Point pt;
@@ -519,11 +520,13 @@ bool Scripts::cmdTeleport(ParamsIterator &params) {
events.clearEvents();
- if (_event->_opcode == OP_TeleportAndContinue) {
+ if (restartFlag) {
+ // Draw the new location and start any script at that location
intf.draw3d(true);
_lineNum = 0;
return true;
} else {
+ // Stop executing the script
return cmdExit(params);
}
}
@@ -593,6 +596,7 @@ bool Scripts::cmdTakeOrGive(ParamsIterator &params) {
int mode1, mode2, mode3, param2;
uint32 val1, val2, val3;
+ _refreshIcons = true;
mode1 = params.readByte();
switch (mode1) {
case 16:
@@ -870,45 +874,48 @@ bool Scripts::cmdAlterMap(ParamsIterator &params) {
return true;
}
-bool Scripts::cmdGiveExtended(ParamsIterator &params) {
+bool Scripts::cmdGiveMulti(ParamsIterator &params) {
Party &party = *_vm->_party;
- uint32 val;
- int newLineNum;
- bool result;
-
- int mode = params.readByte();
- switch (mode) {
- case 16:
- case 34:
- case 100:
- val = params.readUint32LE();
- break;
- case 25:
- case 35:
- case 101:
- case 106:
- val = params.readUint16LE();
- break;
- default:
- val = params.readByte();
- break;
- }
- newLineNum = params.readByte();
+ int modes[3];
+ uint32 vals[3];
- if ((_charIndex != 0 && _charIndex != 8) || mode == 44) {
- result = ifProc(mode, val, _event->_opcode - OP_If1, _charIndex - 1);
- } else {
- result = false;
- for (int idx = 0; idx < (int)party._activeParty.size() && !result; ++idx) {
- if (_charIndex == 0 || (_charIndex == 8 && _v2 != idx)) {
- result = ifProc(mode, val, _event->_opcode - OP_If1, idx);
- }
+ _refreshIcons = true;
+ for (int idx = 0; idx < 3; ++idx) {
+ modes[idx] = params.readByte();
+ switch (modes[idx]) {
+ case 16:
+ case 34:
+ case 100:
+ vals[idx] = params.readUint32LE();
+ break;
+ case 25:
+ case 35:
+ case 101:
+ case 106:
+ vals[idx] = params.readUint16LE();
+ break;
+ default:
+ vals[idx] = params.readByte();
+ break;
}
}
+ _scriptExecuted = true;
+ bool result = party.giveExt(modes[0], vals[0], modes[1], vals[1], modes[2], vals[2],
+ (_charIndex > 0) ? _charIndex - 1 : 0);
+
if (result) {
- _lineNum = newLineNum;
- return false;
+ if (_animCounter == 255) {
+ _animCounter = 0;
+ return cmdExit(params);
+ } else if (modes[0] == 67 || modes[1] == 67 || modes[2] == 67) {
+ _animCounter = 1;
+ } else {
+ return cmdExit(params);
+ }
+ } else {
+ if (modes[0] == 67 || modes[1] == 67 || modes[2] == 67)
+ return cmdExit(params);
}
return true;
@@ -1246,7 +1253,7 @@ bool Scripts::cmdGiveEnchanted(ParamsIterator &params) {
return true;
} else {
- error("Invalid id");
+ party._questItems[id - 82]++;
}
}
@@ -1425,16 +1432,16 @@ void Scripts::doEnding(const Common::String &endStr) {
int state = 0;
for (uint idx = 0; idx < party._activeParty.size(); ++idx) {
Character &player = party._activeParty[idx];
- if (player.hasAward(77)) {
+ if (player.hasAward(SUPER_GOOBER)) {
state = 2;
break;
- } else if (player.hasAward(76)) {
+ } else if (player.hasAward(GOOBER)) {
state = 1;
break;
}
}
- error("TODO: doEnding");
+ error("TODO: doEnding state:%d", state);
}
bool Scripts::ifProc(int action, uint32 val, int mode, int charIndex) {
@@ -1568,8 +1575,8 @@ bool Scripts::ifProc(int action, uint32 val, int mode, int charIndex) {
}
}
}
- } else {
- error("Invalid id");
+ } else if (party._questItems[val - 82]) {
+ v = val;
}
break;
case 25:
diff --git a/engines/xeen/scripts.h b/engines/xeen/scripts.h
index 4c81185c54..9332018092 100644
--- a/engines/xeen/scripts.h
+++ b/engines/xeen/scripts.h
@@ -54,7 +54,7 @@ enum Opcode {
OP_DoTownEvent = 0x11,
OP_Exit = 0x12,
OP_AfterMap = 0x13,
- OP_GiveExtended = 0x14,
+ OP_GiveMulti = 0x14,
OP_ConfirmWord = 0x15,
OP_Damage = 0x16,
OP_JumpRnd = 0x17,
@@ -312,9 +312,9 @@ private:
bool cmdAlterMap(ParamsIterator &params);
/**
- *
+ * Gives up to three different item/amounts to various character and/or party properties
*/
- bool cmdGiveExtended(ParamsIterator &params);
+ bool cmdGiveMulti(ParamsIterator &params);
/**
* Prompts the user to enter a word for passwords or mirror
diff --git a/engines/xeen/spells.cpp b/engines/xeen/spells.cpp
index 255e5ceb55..53303c384b 100644
--- a/engines/xeen/spells.cpp
+++ b/engines/xeen/spells.cpp
@@ -36,7 +36,7 @@ Spells::Spells(XeenEngine *vm) : _vm(vm) {
}
void Spells::load() {
- File f1("spells.xen");
+ File f1("spells.xen", 1);
while (f1.pos() < f1.size())
_spellNames.push_back(f1.readString());
f1.close();
diff --git a/engines/xeen/sprites.cpp b/engines/xeen/sprites.cpp
index dac7949164..8ea18f0e10 100644
--- a/engines/xeen/sprites.cpp
+++ b/engines/xeen/sprites.cpp
@@ -69,8 +69,8 @@ void SpriteResource::load(const Common::String &filename) {
load(f);
}
-void SpriteResource::load(const Common::String &filename, ArchiveType archiveType) {
- File f(filename, archiveType);
+void SpriteResource::load(const Common::String &filename, int ccMode) {
+ File f(filename, ccMode);
load(f);
}
diff --git a/engines/xeen/sprites.h b/engines/xeen/sprites.h
index a370ceea83..342fa3f39a 100644
--- a/engines/xeen/sprites.h
+++ b/engines/xeen/sprites.h
@@ -101,7 +101,7 @@ public:
/**
* Load a sprite resource from a given file and archive
*/
- void load(const Common::String &filename, ArchiveType archiveType);
+ void load(const Common::String &filename, int ccMode);
/**
* Clears the sprite resource
diff --git a/engines/xeen/window.h b/engines/xeen/window.h
index 2389065300..b63943f919 100644
--- a/engines/xeen/window.h
+++ b/engines/xeen/window.h
@@ -148,6 +148,14 @@ public:
const char *writeString(const Common::String &s) {
return FontSurface::writeString(s, _innerBounds);
}
+
+ /**
+ * Write a charcter to the window
+ * @param c Character
+ */
+ void writeCharacter(char c) {
+ FontSurface::writeCharacter(c, _innerBounds);
+ }
};
} // End of namespace Xeen
diff --git a/engines/xeen/worldofxeen/clouds_cutscenes.cpp b/engines/xeen/worldofxeen/clouds_cutscenes.cpp
index 3d85a6ce22..26ce12eb69 100644
--- a/engines/xeen/worldofxeen/clouds_cutscenes.cpp
+++ b/engines/xeen/worldofxeen/clouds_cutscenes.cpp
@@ -94,7 +94,7 @@ bool CloudsCutscenes::showCloudsIntro() {
lake("lake.vga"), xeen("xeen.vga"), wizTower("wiztower.vga"),
wizTower2("wiztwer2.vga"), lake2("lake2.vga"), lake3("lake3.vga"),
xeen1("xeen1.vga");
- _subtitles.load("special.bin", GAME_ARCHIVE);
+ _subtitles.load("special.bin", 0);
_vm->_files->_isDarkCc = false;
// Show the production splash screen
@@ -343,7 +343,7 @@ bool CloudsCutscenes::showCloudsEnding() {
Sound &sound = *_vm->_sound;
files._isDarkCc = false;
- File::setCurrentArchive(GAME_ARCHIVE);
+ files.setGameCc(0);
// Show the castle with swirling clouds and lightning
SpriteResource prec;
diff --git a/engines/xeen/xeen.cpp b/engines/xeen/xeen.cpp
index 67fb977572..9a0e42e44c 100644
--- a/engines/xeen/xeen.cpp
+++ b/engines/xeen/xeen.cpp
@@ -25,8 +25,6 @@
#include "common/debug-channels.h"
#include "common/events.h"
#include "engines/util.h"
-#include "graphics/scaler.h"
-#include "graphics/thumbnail.h"
#include "xeen/xeen.h"
#include "xeen/files.h"
#include "xeen/resources.h"
@@ -99,14 +97,14 @@ void XeenEngine::initialize() {
_locations = new LocationManager();
_map = new Map(this);
_party = new Party(this);
- _saves = new SavesManager(this, *_party);
+ _saves = new SavesManager(_targetName);
_screen = new Screen(this);
_scripts = new Scripts(this);
_sound = new Sound(this, _mixer);
_spells = new Spells(this);
_windows = new Windows();
- File f("029.obj");
+ File f("029.obj", 1);
_eventData = f.readStream(f.size());
// Set graphics mode
@@ -137,51 +135,11 @@ int XeenEngine::getRandomNumber(int minNumber, int maxNumber) {
}
Common::Error XeenEngine::saveGameState(int slot, const Common::String &desc) {
- Common::OutSaveFile *out = g_system->getSavefileManager()->openForSaving(
- generateSaveName(slot));
- if (!out)
- return Common::kCreatingFileFailed;
-
- XeenSavegameHeader header;
- header._saveName = desc;
- writeSavegameHeader(out, header);
-
- Common::Serializer s(nullptr, out);
- synchronize(s);
-
- out->finalize();
- delete out;
-
- return Common::kNoError;
+ return _saves->saveGameState(slot, desc);
}
Common::Error XeenEngine::loadGameState(int slot) {
- Common::InSaveFile *saveFile = g_system->getSavefileManager()->openForLoading(
- generateSaveName(slot));
- if (!saveFile)
- return Common::kReadingFailed;
-
- Common::Serializer s(saveFile, nullptr);
-
- // Load the savaegame header
- XeenSavegameHeader header;
- if (!readSavegameHeader(saveFile, header))
- error("Invalid savegame");
-
- if (header._thumbnail) {
- header._thumbnail->free();
- delete header._thumbnail;
- }
-
- // Load most of the savegame data
- synchronize(s);
- delete saveFile;
-
- return Common::kNoError;
-}
-
-Common::String XeenEngine::generateSaveName(int slot) {
- return Common::String::format("%s.%03d", _targetName.c_str(), slot);
+ return _saves->loadGameState(slot);
}
bool XeenEngine::canLoadGameStateCurrently() {
@@ -192,82 +150,8 @@ bool XeenEngine::canSaveGameStateCurrently() {
return true;
}
-void XeenEngine::synchronize(Common::Serializer &s) {
- // TODO
-}
-
-const char *const SAVEGAME_STR = "XEEN";
-#define SAVEGAME_STR_SIZE 6
-
-bool XeenEngine::readSavegameHeader(Common::InSaveFile *in, XeenSavegameHeader &header) {
- char saveIdentBuffer[SAVEGAME_STR_SIZE + 1];
- header._thumbnail = nullptr;
-
- // Validate the header Id
- in->read(saveIdentBuffer, SAVEGAME_STR_SIZE + 1);
- if (strncmp(saveIdentBuffer, SAVEGAME_STR, SAVEGAME_STR_SIZE))
- return false;
-
- header._version = in->readByte();
- if (header._version > XEEN_SAVEGAME_VERSION)
- return false;
-
- // Read in the string
- header._saveName.clear();
- char ch;
- while ((ch = (char)in->readByte()) != '\0')
- header._saveName += ch;
-
- // Get the thumbnail
- header._thumbnail = Graphics::loadThumbnail(*in);
- if (!header._thumbnail)
- return false;
-
- // Read in save date/time
- header._year = in->readSint16LE();
- header._month = in->readSint16LE();
- header._day = in->readSint16LE();
- header._hour = in->readSint16LE();
- header._minute = in->readSint16LE();
- header._totalFrames = in->readUint32LE();
-
- return true;
-}
-
-void XeenEngine::writeSavegameHeader(Common::OutSaveFile *out, XeenSavegameHeader &header) {
- // Write out a savegame header
- out->write(SAVEGAME_STR, SAVEGAME_STR_SIZE + 1);
-
- out->writeByte(XEEN_SAVEGAME_VERSION);
-
- // Write savegame name
- out->writeString(header._saveName);
- out->writeByte('\0');
-
- // Write a thumbnail of the screen
-/*
- uint8 thumbPalette[768];
- _screen->getPalette(thumbPalette);
- Graphics::Surface saveThumb;
- ::createThumbnail(&saveThumb, (const byte *)_screen->getPixels(),
- _screen->w, _screen->h, thumbPalette);
- Graphics::saveThumbnail(*out, saveThumb);
- saveThumb.free();
-*/
- // Write out the save date/time
- TimeDate td;
- g_system->getTimeAndDate(td);
- out->writeSint16LE(td.tm_year + 1900);
- out->writeSint16LE(td.tm_mon + 1);
- out->writeSint16LE(td.tm_mday);
- out->writeSint16LE(td.tm_hour);
- out->writeSint16LE(td.tm_min);
-// out->writeUint32LE(_events->getFrameCounter());
-}
-
void XeenEngine::playGame() {
- _saves->reset();
- File::setCurrentArchive(GAME_ARCHIVE);
+ _files->setGameCc(0);
_sound->stopAllAudio();
play();
diff --git a/engines/xeen/xeen.h b/engines/xeen/xeen.h
index 022ad6673a..afbec4a7f9 100644
--- a/engines/xeen/xeen.h
+++ b/engines/xeen/xeen.h
@@ -27,7 +27,6 @@
#include "common/system.h"
#include "common/error.h"
#include "common/random.h"
-#include "common/savefile.h"
#include "common/serializer.h"
#include "common/util.h"
#include "engines/engine.h"
@@ -124,17 +123,6 @@ protected:
private:
void initialize();
- /**
- * Synchronize savegame data
- */
- void synchronize(Common::Serializer &s);
-
- /**
- * Support method that generates a savegame name
- * @param slot Slot number
- */
- Common::String generateSaveName(int slot);
-
// Engine APIs
virtual Common::Error run();
virtual bool hasFeature(EngineFeature f) const;
@@ -196,16 +184,6 @@ public:
*/
bool canSaveGameStateCurrently();
- /**
- * Read in a savegame header
- */
- static bool readSavegameHeader(Common::InSaveFile *in, XeenSavegameHeader &header);
-
- /**
- * Write out a savegame header
- */
- void writeSavegameHeader(Common::OutSaveFile *out, XeenSavegameHeader &header);
-
static Common::String printMil(uint value);
static Common::String printK(uint value);
diff --git a/graphics/VectorRendererSpec.cpp b/graphics/VectorRendererSpec.cpp
index 028f62101a..68e7a0ce14 100644
--- a/graphics/VectorRendererSpec.cpp
+++ b/graphics/VectorRendererSpec.cpp
@@ -3587,42 +3587,44 @@ drawRoundedSquareShadow(int x1, int y1, int r, int w, int h, int offset) {
uint16 alpha = (_activeSurface->format.bytesPerPixel > 2) ? 4 : 8;
// These constants ensure a border of 2px on the left and of each rounded square
- int xstart = (x1 > 2) ? x1 - 2 : x1;
- int ystart = y1;
- int width = w + offset + 2;
- int height = h + offset + 1;
-
+ Common::Rect shadowRect(w + offset + 2, h + offset + 1);
+ shadowRect.translate((x1 > 2) ? x1 - 2 : x1, y1);
+
+ // The rounded rectangle drawn on top of this shadow is guaranteed
+ // to occlude entirely the following rect with a non-transparent color.
+ // As an optimization, we don't draw the shadow inside of it.
+ Common::Rect occludingRect(x1, y1, x1 + w, y1 + h);
+ occludingRect.top += r;
+ occludingRect.bottom -= r;
+
+ // Soft shadows are constructed by drawing increasingly
+ // darker and smaller rectangles on top of each other.
for (int i = offset; i >= 0; i--) {
int f, ddF_x, ddF_y;
int x, y, px, py;
- PixelType *ptr_tl = (PixelType *)Base::_activeSurface->getBasePtr(xstart + r, ystart + r);
- PixelType *ptr_tr = (PixelType *)Base::_activeSurface->getBasePtr(xstart + width - r, ystart + r);
- PixelType *ptr_bl = (PixelType *)Base::_activeSurface->getBasePtr(xstart + r, ystart + height - r);
- PixelType *ptr_br = (PixelType *)Base::_activeSurface->getBasePtr(xstart + width - r, ystart + height - r);
- PixelType *ptr_fill = (PixelType *)Base::_activeSurface->getBasePtr(xstart, ystart);
+ PixelType *ptr_tl = (PixelType *)Base::_activeSurface->getBasePtr(shadowRect.left + r, shadowRect.top + r);
+ PixelType *ptr_tr = (PixelType *)Base::_activeSurface->getBasePtr(shadowRect.right - r, shadowRect.top + r);
+ PixelType *ptr_bl = (PixelType *)Base::_activeSurface->getBasePtr(shadowRect.left + r, shadowRect.bottom - r);
+ PixelType *ptr_br = (PixelType *)Base::_activeSurface->getBasePtr(shadowRect.right - r, shadowRect.bottom - r);
- int short_h = height - (2 * r) + 2;
PixelType color = _format.RGBToColor(0, 0, 0);
BE_RESET();
- // HACK: As we are drawing circles exploting 8-axis symmetry,
+ // HACK: As we are drawing circles exploiting 8-axis symmetry,
// there are 4 pixels on each circle which are drawn twice.
// this is ok on filled circles, but when blending on surfaces,
// we cannot let it blend twice. awful.
uint32 hb = 0;
+ // Draw the top and bottom parts of the shadow. Those parts have rounded corners.
while (x++ < y) {
BE_ALGORITHM();
if (((1 << x) & hb) == 0) {
blendFill(ptr_tl - y - px, ptr_tr + y - px, color, (uint8)alpha);
-
- // Will create a dark line of pixles if left out
- if (hb > 0) {
- blendFill(ptr_bl - y + px, ptr_br + y + px, color, (uint8)alpha);
- }
+ blendFill(ptr_bl - y + px, ptr_br + y + px, color, (uint8)alpha);
hb |= (1 << x);
}
@@ -3633,17 +3635,26 @@ drawRoundedSquareShadow(int x1, int y1, int r, int w, int h, int offset) {
}
}
- ptr_fill += pitch * r;
- while (short_h--) {
- blendFill(ptr_fill, ptr_fill + width + 1, color, (uint8)alpha);
+ // Draw the middle part of the shadow. This part is a rectangle with regular corners.
+ PixelType *ptr_fill = (PixelType *)Base::_activeSurface->getBasePtr(0, shadowRect.top + r);
+ for (int y2 = shadowRect.top + r; y2 < shadowRect.bottom - r + 1; y2++) {
+
+ if (occludingRect.top <= y2 && y2 < occludingRect.bottom) {
+ if (shadowRect.left < occludingRect.left) {
+ blendFill(ptr_fill + shadowRect.left, ptr_fill + occludingRect.left, color, (uint8)alpha);
+ }
+ if (occludingRect.right < shadowRect.right + 1) {
+ blendFill(ptr_fill + occludingRect.right, ptr_fill + shadowRect.right + 1, color, (uint8)alpha);
+ }
+ } else {
+ blendFill(ptr_fill + shadowRect.left, ptr_fill + shadowRect.right + 1, color, (uint8)alpha);
+ }
+
ptr_fill += pitch;
}
- // Make shadow smaller each iteration, and move it one pixel inward
- xstart += 1;
- ystart += 1;
- width -= 2;
- height -= 2;
+ // Make shadow smaller each iteration
+ shadowRect.grow(-1);
if (_shadowFillMode == kShadowExponential)
// Multiply with expfactor
@@ -3661,27 +3672,32 @@ drawRoundedSquareShadowClip(int x1, int y1, int r, int w, int h, int offset) {
uint16 alpha = (_activeSurface->format.bytesPerPixel > 2) ? 4 : 8;
// These constants ensure a border of 2px on the left and of each rounded square
- int xstart = (x1 > 2) ? x1 - 2 : x1;
- int ystart = y1;
- int width = w + offset + 2;
- int height = h + offset + 1;
-
+ Common::Rect shadowRect(w + offset + 2, h + offset + 1);
+ shadowRect.translate((x1 > 2) ? x1 - 2 : x1, y1);
+
+ // The rounded rectangle drawn on top of this shadow is guaranteed
+ // to occlude entirely the following rect with a non-transparent color.
+ // As an optimization, we don't draw the shadow inside of it.
+ Common::Rect occludingRect(x1, y1, x1 + w, y1 + h);
+ occludingRect.top += r;
+ occludingRect.bottom -= r;
+
+ // Soft shadows are constructed by drawing increasingly
+ // darker and smaller rectangles on top of each other.
for (int i = offset; i >= 0; i--) {
int f, ddF_x, ddF_y;
int x, y, px, py;
- PixelType *ptr_tl = (PixelType *)Base::_activeSurface->getBasePtr(xstart + r, ystart + r);
- PixelType *ptr_tr = (PixelType *)Base::_activeSurface->getBasePtr(xstart + width - r, ystart + r);
- PixelType *ptr_bl = (PixelType *)Base::_activeSurface->getBasePtr(xstart + r, ystart + height - r);
- PixelType *ptr_br = (PixelType *)Base::_activeSurface->getBasePtr(xstart + width - r, ystart + height - r);
- PixelType *ptr_fill = (PixelType *)Base::_activeSurface->getBasePtr(xstart, ystart);
+ PixelType *ptr_tl = (PixelType *)Base::_activeSurface->getBasePtr(shadowRect.left + r, shadowRect.top + r);
+ PixelType *ptr_tr = (PixelType *)Base::_activeSurface->getBasePtr(shadowRect.right - r, shadowRect.top + r);
+ PixelType *ptr_bl = (PixelType *)Base::_activeSurface->getBasePtr(shadowRect.left + r, shadowRect.bottom - r);
+ PixelType *ptr_br = (PixelType *)Base::_activeSurface->getBasePtr(shadowRect.right - r, shadowRect.bottom - r);
- int short_h = height - (2 * r) + 2;
PixelType color = _format.RGBToColor(0, 0, 0);
BE_RESET();
- // HACK: As we are drawing circles exploting 8-axis symmetry,
+ // HACK: As we are drawing circles exploiting 8-axis symmetry,
// there are 4 pixels on each circle which are drawn twice.
// this is ok on filled circles, but when blending on surfaces,
// we cannot let it blend twice. awful.
@@ -3692,36 +3708,46 @@ drawRoundedSquareShadowClip(int x1, int y1, int r, int w, int h, int offset) {
if (((1 << x) & hb) == 0) {
blendFillClip(ptr_tl - y - px, ptr_tr + y - px, color, (uint8)alpha,
- xstart + r - y, ystart + r - x);
+ shadowRect.left + r - y, shadowRect.top + r - x);
+ blendFillClip(ptr_bl - y + px, ptr_br + y + px, color, (uint8)alpha,
+ shadowRect.left + r - y, shadowRect.bottom - r + x);
- // Will create a dark line of pixles if left out
- if (hb > 0) {
- blendFillClip(ptr_bl - y + px, ptr_br + y + px, color, (uint8)alpha,
- xstart + r - y, ystart + height - r + x);
- }
hb |= (1 << x);
}
if (((1 << y) & hb) == 0) {
- blendFillClip(ptr_tl - x - py, ptr_tr + x - py, color, (uint8)alpha, xstart + r - x, ystart + r - y);
- blendFillClip(ptr_bl - x + py, ptr_br + x + py, color, (uint8)alpha, xstart + r - x, ystart + height - r + y);
+ blendFillClip(ptr_tl - x - py, ptr_tr + x - py, color, (uint8)alpha,
+ shadowRect.left + r - x, shadowRect.top + r - y);
+ blendFillClip(ptr_bl - x + py, ptr_br + x + py, color, (uint8)alpha,
+ shadowRect.left + r - x, shadowRect.bottom - r + y);
+
hb |= (1 << y);
}
}
- ptr_fill += pitch * r;
- int orig_short_h = short_h;
- while (short_h--) {
- blendFillClip(ptr_fill, ptr_fill + width + 1, color, (uint8)alpha,
- xstart, ystart + r + orig_short_h - short_h - 1);
+ // Draw the middle part of the shadow. This part is a rectangle with regular corners.
+ PixelType *ptr_fill = (PixelType *)Base::_activeSurface->getBasePtr(0, shadowRect.top + r);
+ for (int y2 = shadowRect.top + r; y2 < shadowRect.bottom - r + 1; y2++) {
+
+ if (occludingRect.top <= y2 && y2 < occludingRect.bottom) {
+ if (shadowRect.left < occludingRect.left) {
+ blendFillClip(ptr_fill + shadowRect.left, ptr_fill + occludingRect.left, color, (uint8)alpha,
+ shadowRect.left, y2);
+ }
+ if (occludingRect.right < shadowRect.right + 1) {
+ blendFillClip(ptr_fill + occludingRect.right, ptr_fill + shadowRect.right + 1, color, (uint8)alpha,
+ occludingRect.right, y2);
+ }
+ } else {
+ blendFillClip(ptr_fill + shadowRect.left, ptr_fill + shadowRect.right + 1, color, (uint8)alpha,
+ shadowRect.left, y2);
+ }
+
ptr_fill += pitch;
}
- // Make shadow smaller each iteration, and move it one pixel inward
- xstart += 1;
- ystart += 1;
- width -= 2;
- height -= 2;
+ // Make shadow smaller each iteration
+ shadowRect.grow(-1);
if (_shadowFillMode == kShadowExponential)
// Multiply with expfactor
diff --git a/gui/about.cpp b/gui/about.cpp
index 25912557f9..a72a4ed09b 100644
--- a/gui/about.cpp
+++ b/gui/about.cpp
@@ -57,7 +57,7 @@ enum {
static const char *copyright_text[] = {
"",
-"C0""Copyright (C) 2001-2017 The ScummVM Team",
+"C0""Copyright (C) 2001-2018 The ScummVM Team",
"C0""http://www.scummvm.org",
"",
"C0""ScummVM is the legal property of its developers, whose names are too numerous to list here. Please refer to the COPYRIGHT file distributed with this binary.",
diff --git a/gui/options.cpp b/gui/options.cpp
index f1ca21a90d..0ffcee4f87 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -240,21 +240,17 @@ void OptionsDialog::build() {
}
}
if (g_system->hasFeature(OSystem::kFeatureKbdMouseSpeed)) {
- if (ConfMan.hasKey("kbdmouse_speed", _domain)) {
- int value = ConfMan.getInt("kbdmouse_speed", _domain);
- if (_kbdMouseSpeedSlider && value < ARRAYSIZE(kbdMouseSpeedLabels) - 1 && value >= 0) {
- _kbdMouseSpeedSlider->setValue(value);
- _kbdMouseSpeedLabel->setLabel(_(kbdMouseSpeedLabels[value]));
- }
+ int value = ConfMan.getInt("kbdmouse_speed", _domain);
+ if (_kbdMouseSpeedSlider && value < ARRAYSIZE(kbdMouseSpeedLabels) - 1 && value >= 0) {
+ _kbdMouseSpeedSlider->setValue(value);
+ _kbdMouseSpeedLabel->setLabel(_(kbdMouseSpeedLabels[value]));
}
}
if (g_system->hasFeature(OSystem::kFeatureJoystickDeadzone)) {
- if (ConfMan.hasKey("joystick_deadzone", _domain)) {
- int value = ConfMan.getInt("joystick_deadzone", _domain);
- if (_joystickDeadzoneSlider != 0) {
- _joystickDeadzoneSlider->setValue(value);
- _joystickDeadzoneLabel->setValue(value);
- }
+ int value = ConfMan.getInt("joystick_deadzone", _domain);
+ if (_joystickDeadzoneSlider != 0) {
+ _joystickDeadzoneSlider->setValue(value);
+ _joystickDeadzoneLabel->setValue(value);
}
}
diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index 526d072822..ca96180604 100644
--- a/gui/themes/translations.dat
+++ b/gui/themes/translations.dat
Binary files differ
diff --git a/po/be_BY.po b/po/be_BY.po
index 28c5f3c35b..eb8eaee803 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: 2017-12-10 15:25+0100\n"
+"POT-Creation-Date: 2017-12-26 21:11+0100\n"
"PO-Revision-Date: 2017-11-28 19:36+0300\n"
"Last-Translator: Ivan Lukyanov <greencis@mail.ru>\n"
"Language-Team: Belarusian <https://translations.scummvm.org/projects/scummvm/"
@@ -58,7 +58,7 @@ msgstr "Уверх"
#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editgamedialog.cpp:292
#: gui/editrecorddialog.cpp:67 gui/filebrowser-dialog.cpp:64
#: gui/fluidsynth-dialog.cpp:152 gui/KeysDialog.cpp:43 gui/massadd.cpp:95
-#: gui/options.cpp:1680 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
+#: gui/options.cpp:1676 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
#: gui/recorderdialog.cpp:155 gui/remotebrowser.cpp:59
#: gui/saveload-dialog.cpp:383 gui/saveload-dialog.cpp:445
#: gui/saveload-dialog.cpp:727 gui/saveload-dialog.cpp:1121
@@ -117,7 +117,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -130,7 +130,7 @@ msgstr "Так"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -153,7 +153,7 @@ msgstr ""
#: gui/downloaddialog.cpp:146 gui/editgamedialog.cpp:293
#: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:526
-#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1682
+#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1678
#: gui/saveload-dialog.cpp:1122 engines/engine.cpp:443 engines/engine.cpp:454
#: backends/platform/wii/options.cpp:47
#: backends/platform/wince/CELauncherDialog.cpp:54
@@ -239,8 +239,8 @@ msgstr ""
"Мова гульні. Змена гэтай налады не ператворыць рускую версію гульні ў "
"беларускую"
-#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:997
-#: gui/options.cpp:1010 gui/options.cpp:1575 audio/null.cpp:41
+#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:993
+#: gui/options.cpp:1006 gui/options.cpp:1571 audio/null.cpp:41
msgid "<default>"
msgstr "<агадана>"
@@ -262,11 +262,11 @@ msgstr "Платформа:"
msgid "Engine"
msgstr "Рухавічок"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "Graphics"
msgstr "Графіка"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "GFX"
msgstr "Грф"
@@ -279,7 +279,7 @@ msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Перакрыць глабальныя налады графікі"
-#: gui/editgamedialog.cpp:196 gui/options.cpp:1457
+#: gui/editgamedialog.cpp:196 gui/options.cpp:1453
msgid "Audio"
msgstr "Аўдыё"
@@ -292,11 +292,11 @@ msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Перакрыць глабальныя налады аўдыё"
-#: gui/editgamedialog.cpp:210 gui/options.cpp:1462
+#: gui/editgamedialog.cpp:210 gui/options.cpp:1458
msgid "Volume"
msgstr "Гучнасць"
-#: gui/editgamedialog.cpp:212 gui/options.cpp:1464
+#: gui/editgamedialog.cpp:212 gui/options.cpp:1460
msgctxt "lowres"
msgid "Volume"
msgstr "Гучнасць"
@@ -310,7 +310,7 @@ msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Перакрыць глабальныя налады гучнасці"
-#: gui/editgamedialog.cpp:226 gui/options.cpp:1472
+#: gui/editgamedialog.cpp:226 gui/options.cpp:1468
msgid "MIDI"
msgstr "MIDI"
@@ -323,7 +323,7 @@ msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Перакрыць глабальныя налады MIDI"
-#: gui/editgamedialog.cpp:241 gui/options.cpp:1482
+#: gui/editgamedialog.cpp:241 gui/options.cpp:1478
msgid "MT-32"
msgstr "MT-32"
@@ -336,11 +336,11 @@ msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Перакрыць глабальныя налады MT-32"
-#: gui/editgamedialog.cpp:255 gui/options.cpp:1489
+#: gui/editgamedialog.cpp:255 gui/options.cpp:1485
msgid "Paths"
msgstr "Шляхі"
-#: gui/editgamedialog.cpp:257 gui/options.cpp:1491
+#: gui/editgamedialog.cpp:257 gui/options.cpp:1487
msgctxt "lowres"
msgid "Paths"
msgstr "Шляхі"
@@ -354,7 +354,7 @@ msgctxt "lowres"
msgid "Game Path:"
msgstr "Шлях да гульні:"
-#: gui/editgamedialog.cpp:271 gui/options.cpp:1515
+#: gui/editgamedialog.cpp:271 gui/options.cpp:1511
msgid "Extra Path:"
msgstr "Дад. шлях:"
@@ -363,44 +363,44 @@ msgstr "Дад. шлях:"
msgid "Specifies path to additional data used by the game"
msgstr "Паказвае шлях да дадатковых файлаў, дадзеных для гульні"
-#: gui/editgamedialog.cpp:273 gui/options.cpp:1517
+#: gui/editgamedialog.cpp:273 gui/options.cpp:1513
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Дад. шлях:"
-#: gui/editgamedialog.cpp:280 gui/options.cpp:1499
+#: gui/editgamedialog.cpp:280 gui/options.cpp:1495
msgid "Save Path:"
msgstr "Захаванні гульняў:"
#: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282
-#: gui/editgamedialog.cpp:283 gui/options.cpp:1499 gui/options.cpp:1501
-#: gui/options.cpp:1502
+#: gui/editgamedialog.cpp:283 gui/options.cpp:1495 gui/options.cpp:1497
+#: gui/options.cpp:1498
msgid "Specifies where your saved games are put"
msgstr "Паказвае шлях да захаванняў гульні"
-#: gui/editgamedialog.cpp:282 gui/options.cpp:1501
+#: gui/editgamedialog.cpp:282 gui/options.cpp:1497
msgctxt "lowres"
msgid "Save Path:"
msgstr "Захаванні гульняў:"
#: gui/editgamedialog.cpp:301 gui/editgamedialog.cpp:398
-#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1510
-#: gui/options.cpp:1518 gui/options.cpp:1527 gui/options.cpp:1707
-#: gui/options.cpp:1713 gui/options.cpp:1721 gui/options.cpp:1744
-#: gui/options.cpp:1777 gui/options.cpp:1783 gui/options.cpp:1790
-#: gui/options.cpp:1798 gui/options.cpp:1993 gui/options.cpp:1996
-#: gui/options.cpp:2003 gui/options.cpp:2013
+#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1506
+#: gui/options.cpp:1514 gui/options.cpp:1523 gui/options.cpp:1703
+#: gui/options.cpp:1709 gui/options.cpp:1717 gui/options.cpp:1740
+#: gui/options.cpp:1773 gui/options.cpp:1779 gui/options.cpp:1786
+#: gui/options.cpp:1794 gui/options.cpp:1989 gui/options.cpp:1992
+#: gui/options.cpp:1999 gui/options.cpp:2009
msgctxt "path"
msgid "None"
msgstr "Не зададзены"
#: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404
-#: gui/editgamedialog.cpp:522 gui/options.cpp:1701 gui/options.cpp:1771
-#: gui/options.cpp:1999 backends/platform/wii/options.cpp:56
+#: gui/editgamedialog.cpp:522 gui/options.cpp:1697 gui/options.cpp:1767
+#: gui/options.cpp:1995 backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Агадана"
-#: gui/editgamedialog.cpp:450 gui/options.cpp:2007
+#: gui/editgamedialog.cpp:450 gui/options.cpp:2003
msgid "Select SoundFont"
msgstr "Абярыце SoundFont"
@@ -408,7 +408,7 @@ msgstr "Абярыце SoundFont"
msgid "Select additional game directory"
msgstr "Абярыце дадатковую дырэкторыю гульні"
-#: gui/editgamedialog.cpp:502 gui/options.cpp:1930
+#: gui/editgamedialog.cpp:502 gui/options.cpp:1926
msgid "Select directory for saved games"
msgstr "Абярыце дырэкторыю для захаванняў"
@@ -501,7 +501,7 @@ msgstr "Сінусоіда"
msgid "Triangle"
msgstr "Трохкутная"
-#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1535
+#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1531
msgid "Misc"
msgstr "Рознае"
@@ -678,7 +678,7 @@ msgid "Search:"
msgstr "Пошук:"
#: gui/launcher.cpp:200 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:517
+#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:533
#: engines/pegasus/pegasus.cpp:355 engines/tsage/scenes.cpp:601
#: engines/wage/saveload.cpp:748
msgid "Load game:"
@@ -688,7 +688,7 @@ msgstr "Загрузіць гульню:"
#: backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:105
-#: engines/mohawk/riven.cpp:517 engines/parallaction/saveload.cpp:194
+#: engines/mohawk/riven.cpp:533 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
msgid "Load"
@@ -799,210 +799,210 @@ msgstr "кожныя 15 хв"
msgid "every 30 mins"
msgstr "кожныя 30 хв"
-#: gui/options.cpp:343 gui/options.cpp:640 gui/options.cpp:778
-#: gui/options.cpp:853 gui/options.cpp:1114
+#: gui/options.cpp:339 gui/options.cpp:636 gui/options.cpp:774
+#: gui/options.cpp:849 gui/options.cpp:1110
msgctxt "soundfont"
msgid "None"
msgstr "Не зададзены"
-#: gui/options.cpp:514
+#: gui/options.cpp:510
msgid "Failed to apply some of the graphic options changes:"
msgstr "Не атрымалася ўжыць змены некаторых графічных налад:"
-#: gui/options.cpp:526
+#: gui/options.cpp:522
msgid "the video mode could not be changed."
msgstr "відэарэжым не можа быць зменены."
-#: gui/options.cpp:532
+#: gui/options.cpp:528
msgid "the aspect ratio setting could not be changed"
msgstr "рэжым карэктыроўкі суадносін бакоў не можа быць зменены"
-#: gui/options.cpp:538
+#: gui/options.cpp:534
msgid "the fullscreen setting could not be changed"
msgstr "поўнаэкранны рэжым не можа быць зменены"
-#: gui/options.cpp:544
+#: gui/options.cpp:540
msgid "the filtering setting could not be changed"
msgstr "рэжым фільтравання не можа быць зменены"
-#: gui/options.cpp:932
+#: gui/options.cpp:928
msgid "Show On-screen control"
msgstr "Паказаць кіраванне экранам"
-#: gui/options.cpp:936
+#: gui/options.cpp:932
msgid "Touchpad mouse mode"
msgstr "Рэжым тачпада"
-#: gui/options.cpp:940
+#: gui/options.cpp:936
msgid "Swap Menu and Back buttons"
msgstr "Памяняць месцамі кнопкі \"Меню\" і \"Назад\""
-#: gui/options.cpp:945
+#: gui/options.cpp:941
msgid "Pointer Speed:"
msgstr "Хуткасць паказальніка:"
-#: gui/options.cpp:945 gui/options.cpp:947 gui/options.cpp:948
+#: gui/options.cpp:941 gui/options.cpp:943 gui/options.cpp:944
msgid "Speed for keyboard/joystick mouse pointer control"
msgstr "Кіраванне хуткасцю паказальніка мышы/джойсціка"
-#: gui/options.cpp:947
+#: gui/options.cpp:943
msgctxt "lowres"
msgid "Pointer Speed:"
msgstr "Хуткасць паказальніка:"
-#: gui/options.cpp:958
+#: gui/options.cpp:954
msgid "Joy Deadzone:"
msgstr "Мёртвая зона джойсціка:"
-#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
+#: gui/options.cpp:954 gui/options.cpp:956 gui/options.cpp:957
msgid "Analog joystick Deadzone"
msgstr "Мёртвая зона аналагавага джойсціка"
-#: gui/options.cpp:960
+#: gui/options.cpp:956
msgctxt "lowres"
msgid "Joy Deadzone:"
msgstr "Мёртвая зона джойсціка:"
-#: gui/options.cpp:974
+#: gui/options.cpp:970
msgid "HW Shader:"
msgstr "Апаратны шэйдар:"
-#: gui/options.cpp:974 gui/options.cpp:976
+#: gui/options.cpp:970 gui/options.cpp:972
msgid "Different hardware shaders give different visual effects"
msgstr "Розныя апаратныя шэйдары даюць розныя глядзельныя эфекты"
-#: gui/options.cpp:976
+#: gui/options.cpp:972
msgctxt "lowres"
msgid "HW Shader:"
msgstr "Апаратны шэйдар:"
-#: gui/options.cpp:977
+#: gui/options.cpp:973
msgid "Different shaders give different visual effects"
msgstr "Розныя шэйдары даюць розныя эфекты"
-#: gui/options.cpp:994
+#: gui/options.cpp:990
msgid "Graphics mode:"
msgstr "Граф. рэжым:"
-#: gui/options.cpp:1008
+#: gui/options.cpp:1004
msgid "Render mode:"
msgstr "Рэжым растру:"
-#: gui/options.cpp:1008 gui/options.cpp:1009
+#: gui/options.cpp:1004 gui/options.cpp:1005
msgid "Special dithering modes supported by some games"
msgstr "Спецыяльныя рэжымы рэндэрынгу, падтрымоўваныя некаторымі гульнямі"
-#: gui/options.cpp:1020 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
+#: gui/options.cpp:1016 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2590
msgid "Fullscreen mode"
msgstr "Поўнаэкранны рэжым"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Filter graphics"
msgstr "Фільтраванне графікі"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Use linear filtering when scaling graphics"
msgstr "Выкарыстоўваць лінейную фільтрацыю для павелічэння адрознення"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Aspect ratio correction"
msgstr "Карэкцыя суадносін бакоў"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Correct aspect ratio for 320x200 games"
msgstr "Карэктаваць суадносіны бакоў для гульняў з адрозненнем 320x200"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Preferred Device:"
msgstr "Упадабаная прылада:"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Music Device:"
msgstr "Гукавая прылада:"
-#: gui/options.cpp:1034 gui/options.cpp:1036
+#: gui/options.cpp:1030 gui/options.cpp:1032
msgid "Specifies preferred sound device or sound card emulator"
msgstr "Зазначае ўпадабаную гукавую прыладу ці эмулятар гукавой карты"
-#: gui/options.cpp:1034 gui/options.cpp:1036 gui/options.cpp:1037
+#: gui/options.cpp:1030 gui/options.cpp:1032 gui/options.cpp:1033
msgid "Specifies output sound device or sound card emulator"
msgstr "Зазначае выходную гукавую прыладу ці эмулятар гукавой карты"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Упадабаная:"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Music Device:"
msgstr "Гукавая прылада:"
-#: gui/options.cpp:1063
+#: gui/options.cpp:1059
msgid "AdLib emulator:"
msgstr "Эмулятар AdLib:"
-#: gui/options.cpp:1063 gui/options.cpp:1064
+#: gui/options.cpp:1059 gui/options.cpp:1060
msgid "AdLib is used for music in many games"
msgstr "Гукавая карта AdLib выкарыстоўваецца многімі гульнямі"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "GM Device:"
msgstr "Прылада GM:"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "Specifies default sound device for General MIDI output"
msgstr "Зазначае выходную гукавую прыладу для MIDI"
-#: gui/options.cpp:1088
+#: gui/options.cpp:1084
msgid "Don't use General MIDI music"
msgstr "Не выкарыстоўваць музыку для General MIDI"
-#: gui/options.cpp:1099 gui/options.cpp:1161
+#: gui/options.cpp:1095 gui/options.cpp:1157
msgid "Use first available device"
msgstr "Выкарыстоўваць першую даступную прыладу"
-#: gui/options.cpp:1111
+#: gui/options.cpp:1107
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1111 gui/options.cpp:1113 gui/options.cpp:1114
+#: gui/options.cpp:1107 gui/options.cpp:1109 gui/options.cpp:1110
msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity"
msgstr ""
"SoundFont падтрымваецца некаторымі гукавымі картамі, FluidSynth і Timidity"
-#: gui/options.cpp:1113
+#: gui/options.cpp:1109
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Mixed AdLib/MIDI mode"
msgstr "Змешаны рэжым AdLib/MIDI"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Use both MIDI and AdLib sound generation"
msgstr "Выкарыстоўваць і MIDI, і AdLib для генерацыі гуку"
-#: gui/options.cpp:1122
+#: gui/options.cpp:1118
msgid "MIDI gain:"
msgstr "Узмацненне MIDI:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "MT-32 Device:"
msgstr "Нал. MT-32:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
"Паказвае агаданую гукавую прыладу для вываду на Roland MT-32/LAPC1/CM32l/CM64"
-#: gui/options.cpp:1137
+#: gui/options.cpp:1133
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Сапраўдны Roland MT-32 (забараніць эмуляцыю GM)"
-#: gui/options.cpp:1137 gui/options.cpp:1139
+#: gui/options.cpp:1133 gui/options.cpp:1135
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -1010,16 +1010,16 @@ msgstr ""
"Адзначце, калі ў вас падключана Roland-сумяшчальная гукавая прылада і вы "
"жадаеце яе выкарыстоўваць"
-#: gui/options.cpp:1139
+#: gui/options.cpp:1135
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Сапраўдны Roland MT-32 (без эмуляцыі GM)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid "Roland GS Device (enable MT-32 mappings)"
msgstr "Рэжым Roland GS (дазволіць мапінг MT-32)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid ""
"Check if you want to enable patch mappings to emulate an MT-32 on a Roland "
"GS device"
@@ -1027,273 +1027,273 @@ msgstr ""
"Адзначце, калі жадаеце дазволіць мапінг для эмуляцыі MT-32 на прыладзе "
"Roland GS"
-#: gui/options.cpp:1151
+#: gui/options.cpp:1147
msgid "Don't use Roland MT-32 music"
msgstr "Не выкарыстоўваць музыку для MT-32"
-#: gui/options.cpp:1178
+#: gui/options.cpp:1174
msgid "Text and Speech:"
msgstr "Тэкст і агучка:"
-#: gui/options.cpp:1182 gui/options.cpp:1192
+#: gui/options.cpp:1178 gui/options.cpp:1188
msgid "Speech"
msgstr "Агучка"
-#: gui/options.cpp:1183 gui/options.cpp:1193
+#: gui/options.cpp:1179 gui/options.cpp:1189
msgid "Subtitles"
msgstr "Субтытры"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1180
msgid "Both"
msgstr "Абое"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1182
msgid "Subtitle speed:"
msgstr "Хуткасць тытраў:"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1184
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Тэкст і агучка:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1188
msgid "Spch"
msgstr "Агуч"
-#: gui/options.cpp:1193
+#: gui/options.cpp:1189
msgid "Subs"
msgstr "Суб"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgctxt "lowres"
msgid "Both"
msgstr "Абое"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgid "Show subtitles and play speech"
msgstr "Паказваць субтытры і прайграваць гаворку"
-#: gui/options.cpp:1196
+#: gui/options.cpp:1192
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Хуткасць тытраў:"
-#: gui/options.cpp:1212
+#: gui/options.cpp:1208
msgid "Music volume:"
msgstr "Гучн. музыкі:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1210
msgctxt "lowres"
msgid "Music volume:"
msgstr "Гучн. музыкі:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1217
msgid "Mute All"
msgstr "Выкл. усё"
-#: gui/options.cpp:1224
+#: gui/options.cpp:1220
msgid "SFX volume:"
msgstr "Гучнасць SFX:"
-#: gui/options.cpp:1224 gui/options.cpp:1226 gui/options.cpp:1227
+#: gui/options.cpp:1220 gui/options.cpp:1222 gui/options.cpp:1223
msgid "Special sound effects volume"
msgstr "Гучнасць спецыяльных гукавых эфектаў"
-#: gui/options.cpp:1226
+#: gui/options.cpp:1222
msgctxt "lowres"
msgid "SFX volume:"
msgstr "Гучнасць SFX:"
-#: gui/options.cpp:1234
+#: gui/options.cpp:1230
msgid "Speech volume:"
msgstr "Гучн. агучкі:"
-#: gui/options.cpp:1236
+#: gui/options.cpp:1232
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Гучн. агучкі:"
-#: gui/options.cpp:1438
+#: gui/options.cpp:1434
msgid "Shader"
msgstr "Шэйдар"
-#: gui/options.cpp:1450
+#: gui/options.cpp:1446
msgid "Control"
msgstr "Кіраванне"
-#: gui/options.cpp:1476
+#: gui/options.cpp:1472
msgid "FluidSynth Settings"
msgstr "Налады FluidSynth"
-#: gui/options.cpp:1507
+#: gui/options.cpp:1503
msgid "Theme Path:"
msgstr "Шлях да тэм:"
-#: gui/options.cpp:1509
+#: gui/options.cpp:1505
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Шлях да тэм:"
-#: gui/options.cpp:1515 gui/options.cpp:1517 gui/options.cpp:1518
+#: gui/options.cpp:1511 gui/options.cpp:1513 gui/options.cpp:1514
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr ""
"Паказвае шлях да дадатковых файлаў дадзеных, выкарыстоўваных усімі гульнямі "
"або ScummVM"
-#: gui/options.cpp:1524
+#: gui/options.cpp:1520
msgid "Plugins Path:"
msgstr "Шлях да плагінаў:"
-#: gui/options.cpp:1526
+#: gui/options.cpp:1522
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Шлях да плагінаў:"
-#: gui/options.cpp:1537
+#: gui/options.cpp:1533
msgctxt "lowres"
msgid "Misc"
msgstr "Рознае"
-#: gui/options.cpp:1539
+#: gui/options.cpp:1535
msgid "Theme:"
msgstr "Тэма:"
-#: gui/options.cpp:1543
+#: gui/options.cpp:1539
msgid "GUI Renderer:"
msgstr "Малявалка GUI:"
-#: gui/options.cpp:1555
+#: gui/options.cpp:1551
msgid "Autosave:"
msgstr "Аўтазахаванне:"
-#: gui/options.cpp:1557
+#: gui/options.cpp:1553
msgctxt "lowres"
msgid "Autosave:"
msgstr "Аўтазахаванне:"
-#: gui/options.cpp:1565
+#: gui/options.cpp:1561
msgid "Keys"
msgstr "Клавішы"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "GUI Language:"
msgstr "Мова GUI:"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "Language of ScummVM GUI"
msgstr "Мова графічнага інтэрфейсу ScummVM"
-#: gui/options.cpp:1600 gui/updates-dialog.cpp:86
+#: gui/options.cpp:1596 gui/updates-dialog.cpp:86
msgid "Update check:"
msgstr "Правяраць абнаўленні:"
-#: gui/options.cpp:1600
+#: gui/options.cpp:1596
msgid "How often to check ScummVM updates"
msgstr "Як часта правяраць абнаўленні ScummVM"
-#: gui/options.cpp:1612
+#: gui/options.cpp:1608
msgid "Check now"
msgstr "Праверыць цяпер"
-#: gui/options.cpp:1620
+#: gui/options.cpp:1616
msgid "Cloud"
msgstr "Воблака"
-#: gui/options.cpp:1622
+#: gui/options.cpp:1618
msgctxt "lowres"
msgid "Cloud"
msgstr "Воблака"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Storage:"
msgstr "Воблака:"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Active cloud storage"
msgstr "Актыўнае воблачнае сховішча"
-#: gui/options.cpp:1634 gui/options.cpp:2210
+#: gui/options.cpp:1630 gui/options.cpp:2206
msgid "<none>"
msgstr "<няма>"
-#: gui/options.cpp:1638 backends/platform/wii/options.cpp:114
+#: gui/options.cpp:1634 backends/platform/wii/options.cpp:114
msgid "Username:"
msgstr "Карыстач:"
-#: gui/options.cpp:1638
+#: gui/options.cpp:1634
msgid "Username used by this storage"
msgstr "Імя карыстача ў гэтым воблаку"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Used space:"
msgstr "Карыстаны аб'ём:"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Space used by ScummVM's saved games on this storage"
msgstr "Аб'ём, заняты захаваннямі гульняў ScummVM на гэтым воблаку"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "Last sync time:"
msgstr "Апошняя сінхранізацыя:"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "When the last saved games sync for this storage occured"
msgstr "Калі рабілася апошняя сінхранізацыя з гэтым воблакам"
-#: gui/options.cpp:1647 gui/storagewizarddialog.cpp:71
+#: gui/options.cpp:1643 gui/storagewizarddialog.cpp:71
msgid "Connect"
msgstr "Далучыць"
-#: gui/options.cpp:1647
+#: gui/options.cpp:1643
msgid "Open wizard dialog to connect your cloud storage account"
msgstr "Адкрывае дыялог для налады далучэння да воблака"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh"
msgstr "Абнавіць"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh current cloud storage information (username and usage)"
msgstr "Абнаўляе бягучую інфармацыю пра воблака (імя карыстача і аб'ём)"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Download"
msgstr "Загрузіць"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Open downloads manager dialog"
msgstr "Адкрывае менеджар загрузак"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run server"
msgstr "Запусціць сервер"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run local webserver"
msgstr "Запускае лакальны вэб-сервер"
-#: gui/options.cpp:1652 gui/options.cpp:2320
+#: gui/options.cpp:1648 gui/options.cpp:2316
msgid "Not running"
msgstr "Не запушчаны"
-#: gui/options.cpp:1656
+#: gui/options.cpp:1652
msgid "/root/ Path:"
msgstr "Каранёвая дырэкторыя:"
-#: gui/options.cpp:1656 gui/options.cpp:1658 gui/options.cpp:1659
+#: gui/options.cpp:1652 gui/options.cpp:1654 gui/options.cpp:1655
msgid "Specifies which directory the Files Manager can access"
msgstr "Паказвае шлях да дырэкторыі, куды будзе мець доступ менеджар файлаў"
-#: gui/options.cpp:1658
+#: gui/options.cpp:1654
msgctxt "lowres"
msgid "/root/ Path:"
msgstr "Корань:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid "Server's port:"
msgstr "Порт сервера:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid ""
"Which port is used by the server\n"
"Auth with server is not available with non-default port"
@@ -1301,27 +1301,27 @@ msgstr ""
"Нумар порта, карыстаны серверам\n"
"Усталяванне доступу працуе толькі з агаданым портам"
-#: gui/options.cpp:1681
+#: gui/options.cpp:1677
msgid "Apply"
msgstr "Ужыць"
-#: gui/options.cpp:1824
+#: gui/options.cpp:1820
msgid "Failed to change cloud storage!"
msgstr "Не атрымалася змяніць воблака!"
-#: gui/options.cpp:1827
+#: gui/options.cpp:1823
msgid "Another cloud storage is already active."
msgstr "Ужо актыўна іншае воблачнае сховішча."
-#: gui/options.cpp:1895
+#: gui/options.cpp:1891
msgid "Theme does not support selected language!"
msgstr "Тэма не падтрымвае абраную мову!"
-#: gui/options.cpp:1898
+#: gui/options.cpp:1894
msgid "Theme cannot be loaded!"
msgstr "Немагчыма загрузіць тэму!"
-#: gui/options.cpp:1901
+#: gui/options.cpp:1897
msgid ""
"\n"
"Misc settings will be restored."
@@ -1329,48 +1329,48 @@ msgstr ""
"\n"
"Налады на вокладцы \"Рознае\" будуць адноўлены."
-#: gui/options.cpp:1937
+#: gui/options.cpp:1933
msgid "The chosen directory cannot be written to. Please select another one."
msgstr "Не магу пісаць у абраную дырэкторыю. Калі ласка, азначце іншую."
-#: gui/options.cpp:1946
+#: gui/options.cpp:1942
msgid "Select directory for GUI themes"
msgstr "Абярыце дырэкторыю для тэм GUI"
-#: gui/options.cpp:1956
+#: gui/options.cpp:1952
msgid "Select directory for extra files"
msgstr "Абярыце дырэкторыю з дадатковымі файламі"
-#: gui/options.cpp:1967
+#: gui/options.cpp:1963
msgid "Select directory for plugins"
msgstr "Абярыце дырэкторыю з плагінамі"
-#: gui/options.cpp:1979
+#: gui/options.cpp:1975
msgid "Select directory for Files Manager /root/"
msgstr "Абярыце дырэкторыю для кораня ў менеджары файлаў"
-#: gui/options.cpp:2217
+#: gui/options.cpp:2213
#, c-format
msgid "%llu bytes"
msgstr "%llu байтаў"
-#: gui/options.cpp:2225
+#: gui/options.cpp:2221
msgid "<right now>"
msgstr "<зараз>"
-#: gui/options.cpp:2227
+#: gui/options.cpp:2223
msgid "<never>"
msgstr "<ніколі>"
-#: gui/options.cpp:2311
+#: gui/options.cpp:2307
msgid "Stop server"
msgstr "Спыніць сервер"
-#: gui/options.cpp:2312
+#: gui/options.cpp:2308
msgid "Stop local webserver"
msgstr "Спыняе лакальны вэб-сервер"
-#: gui/options.cpp:2403
+#: gui/options.cpp:2399
msgid ""
"Request failed.\n"
"Check your Internet connection."
@@ -1840,8 +1840,8 @@ msgstr "Г~а~лоўнае меню"
#: 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:106
-#: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:658
+#: engines/mohawk/riven.cpp:545 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
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
#: engines/toon/toon.cpp:3340 engines/tsage/scenes.cpp:599
@@ -1860,9 +1860,9 @@ msgstr "Захаваць гульню:"
#: engines/dm/loadsave.cpp:196 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:106 engines/neverhood/menumodule.cpp:880
-#: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:659
+#: engines/mohawk/dialogs.cpp:106 engines/mohawk/riven.cpp:545
+#: 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
#: engines/sherlock/scalpel/scalpel.cpp:1250
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
@@ -2177,7 +2177,7 @@ msgstr "Пстрычкі выключаны"
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Рэжым 'дотыкаў' тачскрына - Пралёт (клікі па DPad)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
msgid "Do you want to quit ?"
msgstr "Вы сапраўды жадаеце выйсці?"
@@ -3333,7 +3333,7 @@ msgid ""
msgstr ""
"Бракуе файла 'extras.mhk'. Замест яго можна скарыстаць файл 'arcriven.z'."
-#: engines/mohawk/riven.cpp:416
+#: engines/mohawk/riven.cpp:432
msgid "You are missing the following required Riven data files:\n"
msgstr "Бракуе наступных файлаў гульні Riven:\n"
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 373b436602..fd63677f82 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: 2017-12-10 15:25+0100\n"
+"POT-Creation-Date: 2017-12-26 21:11+0100\n"
"PO-Revision-Date: 2017-02-20 14:15+0000\n"
"Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n"
"Language-Team: Catalan <https://translations.scummvm.org/projects/scummvm/"
@@ -58,7 +58,7 @@ msgstr "Amunt"
#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editgamedialog.cpp:292
#: gui/editrecorddialog.cpp:67 gui/filebrowser-dialog.cpp:64
#: gui/fluidsynth-dialog.cpp:152 gui/KeysDialog.cpp:43 gui/massadd.cpp:95
-#: gui/options.cpp:1680 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
+#: gui/options.cpp:1676 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
#: gui/recorderdialog.cpp:155 gui/remotebrowser.cpp:59
#: gui/saveload-dialog.cpp:383 gui/saveload-dialog.cpp:445
#: gui/saveload-dialog.cpp:727 gui/saveload-dialog.cpp:1121
@@ -118,7 +118,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -131,7 +131,7 @@ msgstr "Sэ"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -154,7 +154,7 @@ msgstr ""
#: gui/downloaddialog.cpp:146 gui/editgamedialog.cpp:293
#: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:526
-#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1682
+#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1678
#: gui/saveload-dialog.cpp:1122 engines/engine.cpp:443 engines/engine.cpp:454
#: backends/platform/wii/options.cpp:47
#: backends/platform/wince/CELauncherDialog.cpp:54
@@ -240,8 +240,8 @@ msgstr ""
"Idioma del joc. Aixђ no convertirр la vostra versiѓ Espanyola del joc a "
"Anglшs"
-#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:997
-#: gui/options.cpp:1010 gui/options.cpp:1575 audio/null.cpp:41
+#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:993
+#: gui/options.cpp:1006 gui/options.cpp:1571 audio/null.cpp:41
msgid "<default>"
msgstr "<per defecte>"
@@ -263,11 +263,11 @@ msgstr "Platafor.:"
msgid "Engine"
msgstr "Motor"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "Graphics"
msgstr "Grрfics"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "GFX"
msgstr "GFX"
@@ -280,7 +280,7 @@ msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Canviar les opcions de grрfics"
-#: gui/editgamedialog.cpp:196 gui/options.cpp:1457
+#: gui/editgamedialog.cpp:196 gui/options.cpp:1453
msgid "Audio"
msgstr "Рudio"
@@ -293,11 +293,11 @@ msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Canviar les opcions d'рudio"
-#: gui/editgamedialog.cpp:210 gui/options.cpp:1462
+#: gui/editgamedialog.cpp:210 gui/options.cpp:1458
msgid "Volume"
msgstr "Volum"
-#: gui/editgamedialog.cpp:212 gui/options.cpp:1464
+#: gui/editgamedialog.cpp:212 gui/options.cpp:1460
msgctxt "lowres"
msgid "Volume"
msgstr "Volum"
@@ -311,7 +311,7 @@ msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Canviar les opcions de volum"
-#: gui/editgamedialog.cpp:226 gui/options.cpp:1472
+#: gui/editgamedialog.cpp:226 gui/options.cpp:1468
msgid "MIDI"
msgstr "MIDI"
@@ -324,7 +324,7 @@ msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Canviar les opcions de MIDI"
-#: gui/editgamedialog.cpp:241 gui/options.cpp:1482
+#: gui/editgamedialog.cpp:241 gui/options.cpp:1478
msgid "MT-32"
msgstr "MT-32"
@@ -337,11 +337,11 @@ msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Canviar les opcions de MT-32"
-#: gui/editgamedialog.cpp:255 gui/options.cpp:1489
+#: gui/editgamedialog.cpp:255 gui/options.cpp:1485
msgid "Paths"
msgstr "Camins"
-#: gui/editgamedialog.cpp:257 gui/options.cpp:1491
+#: gui/editgamedialog.cpp:257 gui/options.cpp:1487
msgctxt "lowres"
msgid "Paths"
msgstr "Camins"
@@ -355,7 +355,7 @@ msgctxt "lowres"
msgid "Game Path:"
msgstr "Camэ joc:"
-#: gui/editgamedialog.cpp:271 gui/options.cpp:1515
+#: gui/editgamedialog.cpp:271 gui/options.cpp:1511
msgid "Extra Path:"
msgstr "Camэ extra:"
@@ -364,44 +364,44 @@ msgstr "Camэ extra:"
msgid "Specifies path to additional data used by the game"
msgstr "Especifica el camэ de dades addicionals utilitzades pel joc"
-#: gui/editgamedialog.cpp:273 gui/options.cpp:1517
+#: gui/editgamedialog.cpp:273 gui/options.cpp:1513
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Camэ extra:"
-#: gui/editgamedialog.cpp:280 gui/options.cpp:1499
+#: gui/editgamedialog.cpp:280 gui/options.cpp:1495
msgid "Save Path:"
msgstr "Camэ de partides:"
#: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282
-#: gui/editgamedialog.cpp:283 gui/options.cpp:1499 gui/options.cpp:1501
-#: gui/options.cpp:1502
+#: gui/editgamedialog.cpp:283 gui/options.cpp:1495 gui/options.cpp:1497
+#: gui/options.cpp:1498
msgid "Specifies where your saved games are put"
msgstr "Especifica on es desaran les partides"
-#: gui/editgamedialog.cpp:282 gui/options.cpp:1501
+#: gui/editgamedialog.cpp:282 gui/options.cpp:1497
msgctxt "lowres"
msgid "Save Path:"
msgstr "Partides:"
#: gui/editgamedialog.cpp:301 gui/editgamedialog.cpp:398
-#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1510
-#: gui/options.cpp:1518 gui/options.cpp:1527 gui/options.cpp:1707
-#: gui/options.cpp:1713 gui/options.cpp:1721 gui/options.cpp:1744
-#: gui/options.cpp:1777 gui/options.cpp:1783 gui/options.cpp:1790
-#: gui/options.cpp:1798 gui/options.cpp:1993 gui/options.cpp:1996
-#: gui/options.cpp:2003 gui/options.cpp:2013
+#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1506
+#: gui/options.cpp:1514 gui/options.cpp:1523 gui/options.cpp:1703
+#: gui/options.cpp:1709 gui/options.cpp:1717 gui/options.cpp:1740
+#: gui/options.cpp:1773 gui/options.cpp:1779 gui/options.cpp:1786
+#: gui/options.cpp:1794 gui/options.cpp:1989 gui/options.cpp:1992
+#: gui/options.cpp:1999 gui/options.cpp:2009
msgctxt "path"
msgid "None"
msgstr "Cap"
#: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404
-#: gui/editgamedialog.cpp:522 gui/options.cpp:1701 gui/options.cpp:1771
-#: gui/options.cpp:1999 backends/platform/wii/options.cpp:56
+#: gui/editgamedialog.cpp:522 gui/options.cpp:1697 gui/options.cpp:1767
+#: gui/options.cpp:1995 backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Per defecte"
-#: gui/editgamedialog.cpp:450 gui/options.cpp:2007
+#: gui/editgamedialog.cpp:450 gui/options.cpp:2003
msgid "Select SoundFont"
msgstr "Seleccioneu el fitxer SoundFont"
@@ -409,7 +409,7 @@ msgstr "Seleccioneu el fitxer SoundFont"
msgid "Select additional game directory"
msgstr "Seleccioneu el directori addicional del joc"
-#: gui/editgamedialog.cpp:502 gui/options.cpp:1930
+#: gui/editgamedialog.cpp:502 gui/options.cpp:1926
msgid "Select directory for saved games"
msgstr "Seleccioneu el directori de les partides desades"
@@ -500,7 +500,7 @@ msgstr "Sinus"
msgid "Triangle"
msgstr "Triangle"
-#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1535
+#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1531
msgid "Misc"
msgstr "Misc"
@@ -681,7 +681,7 @@ msgid "Search:"
msgstr "Cerca:"
#: gui/launcher.cpp:200 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:517
+#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:533
#: engines/pegasus/pegasus.cpp:355 engines/tsage/scenes.cpp:601
#: engines/wage/saveload.cpp:748
msgid "Load game:"
@@ -691,7 +691,7 @@ msgstr "Carrega partida:"
#: backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:105
-#: engines/mohawk/riven.cpp:517 engines/parallaction/saveload.cpp:194
+#: engines/mohawk/riven.cpp:533 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
msgid "Load"
@@ -802,214 +802,214 @@ msgstr "cada 15 minuts"
msgid "every 30 mins"
msgstr "cada 30 minuts"
-#: gui/options.cpp:343 gui/options.cpp:640 gui/options.cpp:778
-#: gui/options.cpp:853 gui/options.cpp:1114
+#: gui/options.cpp:339 gui/options.cpp:636 gui/options.cpp:774
+#: gui/options.cpp:849 gui/options.cpp:1110
msgctxt "soundfont"
msgid "None"
msgstr "Cap"
-#: gui/options.cpp:514
+#: gui/options.cpp:510
msgid "Failed to apply some of the graphic options changes:"
msgstr "No s'han pogut aplicar alguns canvis de les opcions grрfiques:"
-#: gui/options.cpp:526
+#: gui/options.cpp:522
msgid "the video mode could not be changed."
msgstr "no s'ha pogut canviar el mode de vэdeo."
-#: gui/options.cpp:532
+#: gui/options.cpp:528
msgid "the aspect ratio setting could not be changed"
msgstr "no s'ha pogut canviar l'ajust de la correcciѓ d'aspecte"
-#: gui/options.cpp:538
+#: gui/options.cpp:534
msgid "the fullscreen setting could not be changed"
msgstr "no s'ha pogut canviar l'ajust de pantalla completa"
-#: gui/options.cpp:544
+#: gui/options.cpp:540
msgid "the filtering setting could not be changed"
msgstr "no s'han pogut canviar els ajustes de filtratge"
-#: gui/options.cpp:932
+#: gui/options.cpp:928
msgid "Show On-screen control"
msgstr ""
-#: gui/options.cpp:936
+#: gui/options.cpp:932
#, fuzzy
msgid "Touchpad mouse mode"
msgstr "Mode Touchpad desactivat."
-#: gui/options.cpp:940
+#: gui/options.cpp:936
msgid "Swap Menu and Back buttons"
msgstr ""
-#: gui/options.cpp:945
+#: gui/options.cpp:941
#, fuzzy
msgid "Pointer Speed:"
msgstr "Velocitat:"
-#: gui/options.cpp:945 gui/options.cpp:947 gui/options.cpp:948
+#: gui/options.cpp:941 gui/options.cpp:943 gui/options.cpp:944
msgid "Speed for keyboard/joystick mouse pointer control"
msgstr ""
-#: gui/options.cpp:947
+#: gui/options.cpp:943
#, fuzzy
msgctxt "lowres"
msgid "Pointer Speed:"
msgstr "Velocitat:"
-#: gui/options.cpp:958
+#: gui/options.cpp:954
msgid "Joy Deadzone:"
msgstr ""
-#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
+#: gui/options.cpp:954 gui/options.cpp:956 gui/options.cpp:957
msgid "Analog joystick Deadzone"
msgstr ""
-#: gui/options.cpp:960
+#: gui/options.cpp:956
msgctxt "lowres"
msgid "Joy Deadzone:"
msgstr ""
-#: gui/options.cpp:974
+#: gui/options.cpp:970
msgid "HW Shader:"
msgstr ""
-#: gui/options.cpp:974 gui/options.cpp:976
+#: gui/options.cpp:970 gui/options.cpp:972
msgid "Different hardware shaders give different visual effects"
msgstr ""
-#: gui/options.cpp:976
+#: gui/options.cpp:972
msgctxt "lowres"
msgid "HW Shader:"
msgstr ""
-#: gui/options.cpp:977
+#: gui/options.cpp:973
msgid "Different shaders give different visual effects"
msgstr ""
-#: gui/options.cpp:994
+#: gui/options.cpp:990
msgid "Graphics mode:"
msgstr "Mode grрfic:"
-#: gui/options.cpp:1008
+#: gui/options.cpp:1004
msgid "Render mode:"
msgstr "Mode de pintat:"
-#: gui/options.cpp:1008 gui/options.cpp:1009
+#: gui/options.cpp:1004 gui/options.cpp:1005
msgid "Special dithering modes supported by some games"
msgstr "Modes de tramat especials suportats per alguns jocs"
-#: gui/options.cpp:1020 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
+#: gui/options.cpp:1016 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2590
msgid "Fullscreen mode"
msgstr "Mode pantalla completa"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Filter graphics"
msgstr "Filtres de grрfics"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Use linear filtering when scaling graphics"
msgstr ""
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Aspect ratio correction"
msgstr "Correcciѓ de la relaciѓ d'aspecte"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Correct aspect ratio for 320x200 games"
msgstr "Corregeix la relaciѓ d'aspecte per jocs de 320x200"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Preferred Device:"
msgstr "Disp. preferit:"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Music Device:"
msgstr "Disp. de mњsica:"
-#: gui/options.cpp:1034 gui/options.cpp:1036
+#: gui/options.cpp:1030 gui/options.cpp:1032
msgid "Specifies preferred sound device or sound card emulator"
msgstr "Especifica el dispositiu de so o l'emulador de tarja de so preferit"
-#: gui/options.cpp:1034 gui/options.cpp:1036 gui/options.cpp:1037
+#: gui/options.cpp:1030 gui/options.cpp:1032 gui/options.cpp:1033
msgid "Specifies output sound device or sound card emulator"
msgstr "Especifica el dispositiu de so o l'emulador de tarja de so de sortida"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Disp. preferit:"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Music Device:"
msgstr "Disp. de mњsica:"
-#: gui/options.cpp:1063
+#: gui/options.cpp:1059
msgid "AdLib emulator:"
msgstr "Emulador AdLib:"
-#: gui/options.cpp:1063 gui/options.cpp:1064
+#: gui/options.cpp:1059 gui/options.cpp:1060
msgid "AdLib is used for music in many games"
msgstr "AdLib s'utilitza per la mњsica de molts jocs"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "GM Device:"
msgstr "Dispositiu GM:"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "Specifies default sound device for General MIDI output"
msgstr ""
"Especifica el dispositiu de so per defecte per a la sortida General MIDI"
-#: gui/options.cpp:1088
+#: gui/options.cpp:1084
msgid "Don't use General MIDI music"
msgstr "No utilitzis mњsica General MIDI"
-#: gui/options.cpp:1099 gui/options.cpp:1161
+#: gui/options.cpp:1095 gui/options.cpp:1157
msgid "Use first available device"
msgstr "Utilitza el primer dispositiu disponible"
-#: gui/options.cpp:1111
+#: gui/options.cpp:1107
msgid "SoundFont:"
msgstr "Fitxer SoundFont:"
-#: gui/options.cpp:1111 gui/options.cpp:1113 gui/options.cpp:1114
+#: gui/options.cpp:1107 gui/options.cpp:1109 gui/options.cpp:1110
msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity"
msgstr "Algunes targes de so, FluidSynth i Timidity suporten SoundFont"
-#: gui/options.cpp:1113
+#: gui/options.cpp:1109
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Mixed AdLib/MIDI mode"
msgstr "Mode combinat AdLib/MIDI"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Use both MIDI and AdLib sound generation"
msgstr "Utilitza MIDI i la generaciѓ de so AdLib alhora"
-#: gui/options.cpp:1122
+#: gui/options.cpp:1118
msgid "MIDI gain:"
msgstr "Guany MIDI:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "MT-32 Device:"
msgstr "Disposit. MT-32:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
"Especifica el dispositiu de so per defecte per a la sortida de Roland MT-32/"
"LAPC1/CM32l/CM64"
-#: gui/options.cpp:1137
+#: gui/options.cpp:1133
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Roland MT-32 real (desactiva l'emulaciѓ GM)"
-#: gui/options.cpp:1137 gui/options.cpp:1139
+#: gui/options.cpp:1133 gui/options.cpp:1135
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -1017,366 +1017,366 @@ msgstr ""
"Marqueu si voleu utilitzar el vostre dispositiu hardware real de so "
"compatible amb Roland connectat al vostre ordinador"
-#: gui/options.cpp:1139
+#: gui/options.cpp:1135
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Roland MT-32 real (sense emulaciѓ GM)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid "Roland GS Device (enable MT-32 mappings)"
msgstr "Dispositiu Roland GS (activar conversiѓ MT-32)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid ""
"Check if you want to enable patch mappings to emulate an MT-32 on a Roland "
"GS device"
msgstr ""
-#: gui/options.cpp:1151
+#: gui/options.cpp:1147
msgid "Don't use Roland MT-32 music"
msgstr "No utilitzis mњsica de Roland MT-32"
-#: gui/options.cpp:1178
+#: gui/options.cpp:1174
msgid "Text and Speech:"
msgstr "Text i Veus:"
-#: gui/options.cpp:1182 gui/options.cpp:1192
+#: gui/options.cpp:1178 gui/options.cpp:1188
msgid "Speech"
msgstr "Veus"
-#: gui/options.cpp:1183 gui/options.cpp:1193
+#: gui/options.cpp:1179 gui/options.cpp:1189
msgid "Subtitles"
msgstr "Subtэtols"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1180
msgid "Both"
msgstr "Ambdѓs"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1182
msgid "Subtitle speed:"
msgstr "Velocitat de subt.:"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1184
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Text i Veus:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1188
msgid "Spch"
msgstr "Veus"
-#: gui/options.cpp:1193
+#: gui/options.cpp:1189
msgid "Subs"
msgstr "Subt"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgctxt "lowres"
msgid "Both"
msgstr "Ambdѓs"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgid "Show subtitles and play speech"
msgstr "Mostra els subtэtols i reprodueix la veu"
-#: gui/options.cpp:1196
+#: gui/options.cpp:1192
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Veloc. de subt.:"
-#: gui/options.cpp:1212
+#: gui/options.cpp:1208
msgid "Music volume:"
msgstr "Volum de mњsica:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1210
msgctxt "lowres"
msgid "Music volume:"
msgstr "Volum de mњsica:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1217
msgid "Mute All"
msgstr "Silenciar tot"
-#: gui/options.cpp:1224
+#: gui/options.cpp:1220
msgid "SFX volume:"
msgstr "Volum d'efectes:"
-#: gui/options.cpp:1224 gui/options.cpp:1226 gui/options.cpp:1227
+#: gui/options.cpp:1220 gui/options.cpp:1222 gui/options.cpp:1223
msgid "Special sound effects volume"
msgstr "Volum dels sons d'efectes especials"
-#: gui/options.cpp:1226
+#: gui/options.cpp:1222
msgctxt "lowres"
msgid "SFX volume:"
msgstr "Volum d'efectes:"
-#: gui/options.cpp:1234
+#: gui/options.cpp:1230
msgid "Speech volume:"
msgstr "Volum de veus:"
-#: gui/options.cpp:1236
+#: gui/options.cpp:1232
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Volum de veus:"
-#: gui/options.cpp:1438
+#: gui/options.cpp:1434
msgid "Shader"
msgstr ""
-#: gui/options.cpp:1450
+#: gui/options.cpp:1446
#, fuzzy
msgid "Control"
msgstr "Controla el ratolэ"
-#: gui/options.cpp:1476
+#: gui/options.cpp:1472
msgid "FluidSynth Settings"
msgstr "Configuraciѓ de FluidSynth"
-#: gui/options.cpp:1507
+#: gui/options.cpp:1503
msgid "Theme Path:"
msgstr "Camэ dels temes:"
-#: gui/options.cpp:1509
+#: gui/options.cpp:1505
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Camэ temes:"
-#: gui/options.cpp:1515 gui/options.cpp:1517 gui/options.cpp:1518
+#: gui/options.cpp:1511 gui/options.cpp:1513 gui/options.cpp:1514
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr ""
"Especifica el camэ de les dades addicionals utilitzades per tots els jocs o "
"pel ScummVM"
-#: gui/options.cpp:1524
+#: gui/options.cpp:1520
msgid "Plugins Path:"
msgstr "Camэ dels connectors:"
-#: gui/options.cpp:1526
+#: gui/options.cpp:1522
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Camэ de connectors:"
-#: gui/options.cpp:1537
+#: gui/options.cpp:1533
msgctxt "lowres"
msgid "Misc"
msgstr "Misc"
-#: gui/options.cpp:1539
+#: gui/options.cpp:1535
msgid "Theme:"
msgstr "Tema:"
-#: gui/options.cpp:1543
+#: gui/options.cpp:1539
msgid "GUI Renderer:"
msgstr "Pintat GUI:"
-#: gui/options.cpp:1555
+#: gui/options.cpp:1551
msgid "Autosave:"
msgstr "Desat automрtic:"
-#: gui/options.cpp:1557
+#: gui/options.cpp:1553
msgctxt "lowres"
msgid "Autosave:"
msgstr "Auto-desat:"
-#: gui/options.cpp:1565
+#: gui/options.cpp:1561
msgid "Keys"
msgstr "Tecles"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "GUI Language:"
msgstr "Idioma GUI:"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "Language of ScummVM GUI"
msgstr "Idioma de la interfэcie d'usuari de ScummVM"
-#: gui/options.cpp:1600 gui/updates-dialog.cpp:86
+#: gui/options.cpp:1596 gui/updates-dialog.cpp:86
msgid "Update check:"
msgstr ""
-#: gui/options.cpp:1600
+#: gui/options.cpp:1596
msgid "How often to check ScummVM updates"
msgstr ""
-#: gui/options.cpp:1612
+#: gui/options.cpp:1608
msgid "Check now"
msgstr ""
-#: gui/options.cpp:1620
+#: gui/options.cpp:1616
msgid "Cloud"
msgstr ""
-#: gui/options.cpp:1622
+#: gui/options.cpp:1618
msgctxt "lowres"
msgid "Cloud"
msgstr ""
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Storage:"
msgstr ""
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Active cloud storage"
msgstr ""
-#: gui/options.cpp:1634 gui/options.cpp:2210
+#: gui/options.cpp:1630 gui/options.cpp:2206
msgid "<none>"
msgstr ""
-#: gui/options.cpp:1638 backends/platform/wii/options.cpp:114
+#: gui/options.cpp:1634 backends/platform/wii/options.cpp:114
msgid "Username:"
msgstr "Nom d'usuari:"
-#: gui/options.cpp:1638
+#: gui/options.cpp:1634
msgid "Username used by this storage"
msgstr ""
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Used space:"
msgstr ""
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Space used by ScummVM's saved games on this storage"
msgstr ""
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "Last sync time:"
msgstr ""
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "When the last saved games sync for this storage occured"
msgstr ""
-#: gui/options.cpp:1647 gui/storagewizarddialog.cpp:71
+#: gui/options.cpp:1643 gui/storagewizarddialog.cpp:71
msgid "Connect"
msgstr ""
-#: gui/options.cpp:1647
+#: gui/options.cpp:1643
msgid "Open wizard dialog to connect your cloud storage account"
msgstr ""
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh"
msgstr ""
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh current cloud storage information (username and usage)"
msgstr ""
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Download"
msgstr "Descarregar"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Open downloads manager dialog"
msgstr ""
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run server"
msgstr ""
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run local webserver"
msgstr ""
-#: gui/options.cpp:1652 gui/options.cpp:2320
+#: gui/options.cpp:1648 gui/options.cpp:2316
msgid "Not running"
msgstr "Aturat"
-#: gui/options.cpp:1656
+#: gui/options.cpp:1652
msgid "/root/ Path:"
msgstr "Directori /arrel/:"
-#: gui/options.cpp:1656 gui/options.cpp:1658 gui/options.cpp:1659
+#: gui/options.cpp:1652 gui/options.cpp:1654 gui/options.cpp:1655
msgid "Specifies which directory the Files Manager can access"
msgstr "Especifica els directoris accessibles per al gestor d'arxius"
-#: gui/options.cpp:1658
+#: gui/options.cpp:1654
msgctxt "lowres"
msgid "/root/ Path:"
msgstr "Directori /arrel/:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid "Server's port:"
msgstr "Port del servidor:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid ""
"Which port is used by the server\n"
"Auth with server is not available with non-default port"
msgstr ""
-#: gui/options.cpp:1681
+#: gui/options.cpp:1677
msgid "Apply"
msgstr ""
-#: gui/options.cpp:1824
+#: gui/options.cpp:1820
msgid "Failed to change cloud storage!"
msgstr "Fallada al canviar l'emmagatzematge en lэnia!"
-#: gui/options.cpp:1827
+#: gui/options.cpp:1823
msgid "Another cloud storage is already active."
msgstr ""
-#: gui/options.cpp:1895
+#: gui/options.cpp:1891
#, fuzzy
msgid "Theme does not support selected language!"
msgstr "El connector de motor no suporta partides desades"
-#: gui/options.cpp:1898
+#: gui/options.cpp:1894
#, fuzzy
msgid "Theme cannot be loaded!"
msgstr "La partida NO s'ha desat"
-#: gui/options.cpp:1901
+#: gui/options.cpp:1897
msgid ""
"\n"
"Misc settings will be restored."
msgstr ""
-#: gui/options.cpp:1937
+#: gui/options.cpp:1933
msgid "The chosen directory cannot be written to. Please select another one."
msgstr ""
"No es pot escriure al directori seleccionat. Si us plau, escolliu-ne un "
"altre."
-#: gui/options.cpp:1946
+#: gui/options.cpp:1942
msgid "Select directory for GUI themes"
msgstr "Seleccioneu el directori dels temes"
-#: gui/options.cpp:1956
+#: gui/options.cpp:1952
msgid "Select directory for extra files"
msgstr "Seleccioneu el directori dels fitxers extra"
-#: gui/options.cpp:1967
+#: gui/options.cpp:1963
msgid "Select directory for plugins"
msgstr "Seleccioneu el directori dels connectors"
-#: gui/options.cpp:1979
+#: gui/options.cpp:1975
msgid "Select directory for Files Manager /root/"
msgstr "Selecciona el directori /arrel/ per al gestor d'arxius"
-#: gui/options.cpp:2217
+#: gui/options.cpp:2213
#, c-format
msgid "%llu bytes"
msgstr ""
-#: gui/options.cpp:2225
+#: gui/options.cpp:2221
msgid "<right now>"
msgstr ""
-#: gui/options.cpp:2227
+#: gui/options.cpp:2223
msgid "<never>"
msgstr "<mai>"
-#: gui/options.cpp:2311
+#: gui/options.cpp:2307
msgid "Stop server"
msgstr "Aturar servidor"
-#: gui/options.cpp:2312
+#: gui/options.cpp:2308
msgid "Stop local webserver"
msgstr ""
-#: gui/options.cpp:2403
+#: gui/options.cpp:2399
msgid ""
"Request failed.\n"
"Check your Internet connection."
@@ -1836,8 +1836,8 @@ msgstr "~R~etorna al Llanчador"
#: 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:106
-#: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:658
+#: engines/mohawk/riven.cpp:545 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
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
#: engines/toon/toon.cpp:3340 engines/tsage/scenes.cpp:599
@@ -1856,9 +1856,9 @@ msgstr "Desa la partida:"
#: engines/dm/loadsave.cpp:196 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:106 engines/neverhood/menumodule.cpp:880
-#: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:659
+#: engines/mohawk/dialogs.cpp:106 engines/mohawk/riven.cpp:545
+#: 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
#: engines/sherlock/scalpel/scalpel.cpp:1250
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
@@ -2167,7 +2167,7 @@ msgstr "Clicat desactivat"
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "'Mode Toc' de pantalla tрctil - Flotant (Clics de DPad)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
msgid "Do you want to quit ?"
msgstr "Vols sortir?"
@@ -3315,7 +3315,7 @@ msgid ""
"works."
msgstr ""
-#: engines/mohawk/riven.cpp:416
+#: engines/mohawk/riven.cpp:432
msgid "You are missing the following required Riven data files:\n"
msgstr ""
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index ad62c743c7..79b6fa5b4f 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: 2017-12-10 15:25+0100\n"
+"POT-Creation-Date: 2017-12-26 21:11+0100\n"
"PO-Revision-Date: 2017-11-29 07:42+0000\n"
"Last-Translator: Zbynьk Schwarz <zbynek.schwarz@gmail.com>\n"
"Language-Team: Czech <https://translations.scummvm.org/projects/scummvm/"
@@ -60,7 +60,7 @@ msgstr "Jэt nahoru"
#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editgamedialog.cpp:292
#: gui/editrecorddialog.cpp:67 gui/filebrowser-dialog.cpp:64
#: gui/fluidsynth-dialog.cpp:152 gui/KeysDialog.cpp:43 gui/massadd.cpp:95
-#: gui/options.cpp:1680 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
+#: gui/options.cpp:1676 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
#: gui/recorderdialog.cpp:155 gui/remotebrowser.cpp:59
#: gui/saveload-dialog.cpp:383 gui/saveload-dialog.cpp:445
#: gui/saveload-dialog.cpp:727 gui/saveload-dialog.cpp:1121
@@ -120,7 +120,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -133,7 +133,7 @@ msgstr "Ano"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -156,7 +156,7 @@ msgstr ""
#: gui/downloaddialog.cpp:146 gui/editgamedialog.cpp:293
#: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:526
-#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1682
+#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1678
#: gui/saveload-dialog.cpp:1122 engines/engine.cpp:443 engines/engine.cpp:454
#: backends/platform/wii/options.cpp:47
#: backends/platform/wince/CELauncherDialog.cpp:54
@@ -240,8 +240,8 @@ msgid ""
"English"
msgstr "Jazyk hry. Toto z vaЙэ Љpanьlskщ verze neudьlс Anglickou"
-#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:997
-#: gui/options.cpp:1010 gui/options.cpp:1575 audio/null.cpp:41
+#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:993
+#: gui/options.cpp:1006 gui/options.cpp:1571 audio/null.cpp:41
msgid "<default>"
msgstr "<v§chozэ>"
@@ -263,11 +263,11 @@ msgstr "Platforma:"
msgid "Engine"
msgstr "Jсdro"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "Graphics"
msgstr "Obraz"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "GFX"
msgstr "GFX"
@@ -280,7 +280,7 @@ msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Potlaшit globсlnэ nastavenэ obrazu"
-#: gui/editgamedialog.cpp:196 gui/options.cpp:1457
+#: gui/editgamedialog.cpp:196 gui/options.cpp:1453
msgid "Audio"
msgstr "Zvuk"
@@ -293,11 +293,11 @@ msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Potlaшit globсlnэ nastavenэ zvuku"
-#: gui/editgamedialog.cpp:210 gui/options.cpp:1462
+#: gui/editgamedialog.cpp:210 gui/options.cpp:1458
msgid "Volume"
msgstr "Hlasitost"
-#: gui/editgamedialog.cpp:212 gui/options.cpp:1464
+#: gui/editgamedialog.cpp:212 gui/options.cpp:1460
msgctxt "lowres"
msgid "Volume"
msgstr "Hlasitost"
@@ -311,7 +311,7 @@ msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Potlaшit globсlnэ nastavenэ hlasitosti"
-#: gui/editgamedialog.cpp:226 gui/options.cpp:1472
+#: gui/editgamedialog.cpp:226 gui/options.cpp:1468
msgid "MIDI"
msgstr "MIDI"
@@ -324,7 +324,7 @@ msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Potlaшit globсlnэ nastavenэ MIDI"
-#: gui/editgamedialog.cpp:241 gui/options.cpp:1482
+#: gui/editgamedialog.cpp:241 gui/options.cpp:1478
msgid "MT-32"
msgstr "MT-32"
@@ -337,11 +337,11 @@ msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Potlaшit globсlnэ nastavenэ MT-32"
-#: gui/editgamedialog.cpp:255 gui/options.cpp:1489
+#: gui/editgamedialog.cpp:255 gui/options.cpp:1485
msgid "Paths"
msgstr "Cesty"
-#: gui/editgamedialog.cpp:257 gui/options.cpp:1491
+#: gui/editgamedialog.cpp:257 gui/options.cpp:1487
msgctxt "lowres"
msgid "Paths"
msgstr "Cesty"
@@ -355,7 +355,7 @@ msgctxt "lowres"
msgid "Game Path:"
msgstr "Cesta Hry:"
-#: gui/editgamedialog.cpp:271 gui/options.cpp:1515
+#: gui/editgamedialog.cpp:271 gui/options.cpp:1511
msgid "Extra Path:"
msgstr "Dodateшnс Cesta:"
@@ -364,44 +364,44 @@ msgstr "Dodateшnс Cesta:"
msgid "Specifies path to additional data used by the game"
msgstr "Stanovэ cestu pro dodateшnс data pouОitс ve hјe"
-#: gui/editgamedialog.cpp:273 gui/options.cpp:1517
+#: gui/editgamedialog.cpp:273 gui/options.cpp:1513
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Dodateшnс Cesta:"
-#: gui/editgamedialog.cpp:280 gui/options.cpp:1499
+#: gui/editgamedialog.cpp:280 gui/options.cpp:1495
msgid "Save Path:"
msgstr "Cesta pro uloОenэ:"
#: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282
-#: gui/editgamedialog.cpp:283 gui/options.cpp:1499 gui/options.cpp:1501
-#: gui/options.cpp:1502
+#: gui/editgamedialog.cpp:283 gui/options.cpp:1495 gui/options.cpp:1497
+#: gui/options.cpp:1498
msgid "Specifies where your saved games are put"
msgstr "Stanovuje, kam jsou umэstьny vaЙe uloОenщ hry"
-#: gui/editgamedialog.cpp:282 gui/options.cpp:1501
+#: gui/editgamedialog.cpp:282 gui/options.cpp:1497
msgctxt "lowres"
msgid "Save Path:"
msgstr "Cesta pro uloОenэ:"
#: gui/editgamedialog.cpp:301 gui/editgamedialog.cpp:398
-#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1510
-#: gui/options.cpp:1518 gui/options.cpp:1527 gui/options.cpp:1707
-#: gui/options.cpp:1713 gui/options.cpp:1721 gui/options.cpp:1744
-#: gui/options.cpp:1777 gui/options.cpp:1783 gui/options.cpp:1790
-#: gui/options.cpp:1798 gui/options.cpp:1993 gui/options.cpp:1996
-#: gui/options.cpp:2003 gui/options.cpp:2013
+#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1506
+#: gui/options.cpp:1514 gui/options.cpp:1523 gui/options.cpp:1703
+#: gui/options.cpp:1709 gui/options.cpp:1717 gui/options.cpp:1740
+#: gui/options.cpp:1773 gui/options.cpp:1779 gui/options.cpp:1786
+#: gui/options.cpp:1794 gui/options.cpp:1989 gui/options.cpp:1992
+#: gui/options.cpp:1999 gui/options.cpp:2009
msgctxt "path"
msgid "None"
msgstr "Ўсdnщ"
#: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404
-#: gui/editgamedialog.cpp:522 gui/options.cpp:1701 gui/options.cpp:1771
-#: gui/options.cpp:1999 backends/platform/wii/options.cpp:56
+#: gui/editgamedialog.cpp:522 gui/options.cpp:1697 gui/options.cpp:1767
+#: gui/options.cpp:1995 backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "V§chozэ"
-#: gui/editgamedialog.cpp:450 gui/options.cpp:2007
+#: gui/editgamedialog.cpp:450 gui/options.cpp:2003
msgid "Select SoundFont"
msgstr "Vybrat SoundFont"
@@ -409,7 +409,7 @@ msgstr "Vybrat SoundFont"
msgid "Select additional game directory"
msgstr "Vyberte dodateшn§ adresсј hry"
-#: gui/editgamedialog.cpp:502 gui/options.cpp:1930
+#: gui/editgamedialog.cpp:502 gui/options.cpp:1926
msgid "Select directory for saved games"
msgstr "Vyberte adresсј pro uloОenщ hry"
@@ -501,7 +501,7 @@ msgstr "Sinus"
msgid "Triangle"
msgstr "Trojњhelnэk"
-#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1535
+#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1531
msgid "Misc"
msgstr "Rљznщ"
@@ -680,7 +680,7 @@ msgid "Search:"
msgstr "Hledat:"
#: gui/launcher.cpp:200 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:517
+#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:533
#: engines/pegasus/pegasus.cpp:355 engines/tsage/scenes.cpp:601
#: engines/wage/saveload.cpp:748
msgid "Load game:"
@@ -690,7 +690,7 @@ msgstr "Nahrсt hru:"
#: backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:105
-#: engines/mohawk/riven.cpp:517 engines/parallaction/saveload.cpp:194
+#: engines/mohawk/riven.cpp:533 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
msgid "Load"
@@ -799,210 +799,210 @@ msgstr "KaОd§ch 15 min"
msgid "every 30 mins"
msgstr "KaОd§ch 30 min"
-#: gui/options.cpp:343 gui/options.cpp:640 gui/options.cpp:778
-#: gui/options.cpp:853 gui/options.cpp:1114
+#: gui/options.cpp:339 gui/options.cpp:636 gui/options.cpp:774
+#: gui/options.cpp:849 gui/options.cpp:1110
msgctxt "soundfont"
msgid "None"
msgstr "Ўсdnщ"
-#: gui/options.cpp:514
+#: gui/options.cpp:510
msgid "Failed to apply some of the graphic options changes:"
msgstr "Nelze pouОэt nьkterщ zmьny moОnostэ grafiky:"
-#: gui/options.cpp:526
+#: gui/options.cpp:522
msgid "the video mode could not be changed."
msgstr "reОim obrazu nemohl b§t zmьnьn."
-#: gui/options.cpp:532
+#: gui/options.cpp:528
msgid "the aspect ratio setting could not be changed"
msgstr "nastavenэ pomьru stran nemohlo b§t zmьnьno"
-#: gui/options.cpp:538
+#: gui/options.cpp:534
msgid "the fullscreen setting could not be changed"
msgstr "nastavenэ celщ obrazovky nemohlo b§t zmьnьno"
-#: gui/options.cpp:544
+#: gui/options.cpp:540
msgid "the filtering setting could not be changed"
msgstr "nastavenэ filtrovсnэ nemohlo b§t zmьnьno"
-#: gui/options.cpp:932
+#: gui/options.cpp:928
msgid "Show On-screen control"
msgstr "Zobrazit ovlсdсnэ na obrazovce"
-#: gui/options.cpp:936
+#: gui/options.cpp:932
msgid "Touchpad mouse mode"
msgstr "ReОim Touchpad myЙi"
-#: gui/options.cpp:940
+#: gui/options.cpp:936
msgid "Swap Menu and Back buttons"
msgstr "Zamьnit tlaшэtka Menu a Zpьt"
-#: gui/options.cpp:945
+#: gui/options.cpp:941
msgid "Pointer Speed:"
msgstr "Rychlost ukazatele:"
-#: gui/options.cpp:945 gui/options.cpp:947 gui/options.cpp:948
+#: gui/options.cpp:941 gui/options.cpp:943 gui/options.cpp:944
msgid "Speed for keyboard/joystick mouse pointer control"
msgstr "Rychlost ovlсdсnэ ukazatele myЙi pomocэ klсvesnice/joysticku"
-#: gui/options.cpp:947
+#: gui/options.cpp:943
msgctxt "lowres"
msgid "Pointer Speed:"
msgstr "Rychlost ukazatele:"
-#: gui/options.cpp:958
+#: gui/options.cpp:954
msgid "Joy Deadzone:"
msgstr "Mrtvс zѓna Joysticku:"
-#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
+#: gui/options.cpp:954 gui/options.cpp:956 gui/options.cpp:957
msgid "Analog joystick Deadzone"
msgstr "Mrtvс zѓna analogovщho joysticku"
-#: gui/options.cpp:960
+#: gui/options.cpp:956
msgctxt "lowres"
msgid "Joy Deadzone:"
msgstr "Mrtvс zѓna Joysticku:"
-#: gui/options.cpp:974
+#: gui/options.cpp:970
msgid "HW Shader:"
msgstr "Hardwarov§ shader:"
-#: gui/options.cpp:974 gui/options.cpp:976
+#: gui/options.cpp:970 gui/options.cpp:972
msgid "Different hardware shaders give different visual effects"
msgstr "KaОd§ hardwarov§ shader vytvсјэ rљznщ vizuсlnэ efekty"
-#: gui/options.cpp:976
+#: gui/options.cpp:972
msgctxt "lowres"
msgid "HW Shader:"
msgstr "Hardwarov§ shader:"
-#: gui/options.cpp:977
+#: gui/options.cpp:973
msgid "Different shaders give different visual effects"
msgstr "KaОd§ shader vytvсјэ rљznщ vizuсlnэ efekty"
-#: gui/options.cpp:994
+#: gui/options.cpp:990
msgid "Graphics mode:"
msgstr "ReОim obrazu:"
-#: gui/options.cpp:1008
+#: gui/options.cpp:1004
msgid "Render mode:"
msgstr "ReОim vykreslenэ:"
-#: gui/options.cpp:1008 gui/options.cpp:1009
+#: gui/options.cpp:1004 gui/options.cpp:1005
msgid "Special dithering modes supported by some games"
msgstr "Speciсlnэ reОimy chvьnэ podporovanщ nьkter§mi hrami"
-#: gui/options.cpp:1020 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
+#: gui/options.cpp:1016 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2590
msgid "Fullscreen mode"
msgstr "ReОim celщ obrazovky"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Filter graphics"
msgstr "Filtrovсnэ grafiky"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Use linear filtering when scaling graphics"
msgstr "Pro Йkсlovсnэ grafiky pouОэt lineсrnэ filtrovсnэ"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Aspect ratio correction"
msgstr "Korekce pomьru stran"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Correct aspect ratio for 320x200 games"
msgstr "Korigovat pomьr stran pro hry 320x200"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Preferred Device:"
msgstr "Prioritnэ Zaјэzenэ:"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Music Device:"
msgstr "Hudebnэ zaјэzenэ:"
-#: gui/options.cpp:1034 gui/options.cpp:1036
+#: gui/options.cpp:1030 gui/options.cpp:1032
msgid "Specifies preferred sound device or sound card emulator"
msgstr "Stanovэ prioritnэ zvukovщ zaјэzenэ nebo emulсtor zvukovщ karty"
-#: gui/options.cpp:1034 gui/options.cpp:1036 gui/options.cpp:1037
+#: gui/options.cpp:1030 gui/options.cpp:1032 gui/options.cpp:1033
msgid "Specifies output sound device or sound card emulator"
msgstr "Stanovэ v§stupnэ zvukovщ zaјэzenэ nebo emulсtor zvukovщ karty"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Prioritnэ Zaј.:"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Music Device:"
msgstr "Hudebnэ zaјэzenэ:"
-#: gui/options.cpp:1063
+#: gui/options.cpp:1059
msgid "AdLib emulator:"
msgstr "AdLib emulсtor:"
-#: gui/options.cpp:1063 gui/options.cpp:1064
+#: gui/options.cpp:1059 gui/options.cpp:1060
msgid "AdLib is used for music in many games"
msgstr "AdLib se pouОэvс pro hudbu v mnoha hrсch"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "GM Device:"
msgstr "GM Zaјэzenэ:"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "Specifies default sound device for General MIDI output"
msgstr "Stanovэ v§chozэ zvukovщ zaјэzenэ pro v§stup General MIDI"
-#: gui/options.cpp:1088
+#: gui/options.cpp:1084
msgid "Don't use General MIDI music"
msgstr "NepouОэvat hudbu General MIDI"
-#: gui/options.cpp:1099 gui/options.cpp:1161
+#: gui/options.cpp:1095 gui/options.cpp:1157
msgid "Use first available device"
msgstr "PouОэt prvnэ dostupnщ zaјэzenэ"
-#: gui/options.cpp:1111
+#: gui/options.cpp:1107
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1111 gui/options.cpp:1113 gui/options.cpp:1114
+#: gui/options.cpp:1107 gui/options.cpp:1109 gui/options.cpp:1110
msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity"
msgstr ""
"SoundFont je podporovсn nьkter§mi zvukov§mi kartami, FluidSynth a Timidity"
-#: gui/options.cpp:1113
+#: gui/options.cpp:1109
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Mixed AdLib/MIDI mode"
msgstr "SmэЙen§ reОim AdLib/MIDI"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Use both MIDI and AdLib sound generation"
msgstr "PouОэt obь zvukovщ generace MIDI a AdLib"
-#: gui/options.cpp:1122
+#: gui/options.cpp:1118
msgid "MIDI gain:"
msgstr "Zesэlenэ MIDI:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "MT-32 Device:"
msgstr "Zaјэzenэ MT-32:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
"Stanovэ v§chozэ zvukovщ v§stupnэ zaјэzenэ pro Roland MT-32/LAPC1/CM32l/CM64"
-#: gui/options.cpp:1137
+#: gui/options.cpp:1133
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Opravdov§ Roland MT-32 (vypne GM emulaci)"
-#: gui/options.cpp:1137 gui/options.cpp:1139
+#: gui/options.cpp:1133 gui/options.cpp:1135
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -1010,16 +1010,16 @@ msgstr ""
"ZaЙkrtnьte, pokud chcete pouОэt pravщ hardwarovщ zaјэzenэ kompatibilnэ s "
"Roland, pјipojenщ k vaЙemu poшэtaшi"
-#: gui/options.cpp:1139
+#: gui/options.cpp:1135
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Opravdov§ Roland MT-32 (Осdnс GM emulace)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid "Roland GS Device (enable MT-32 mappings)"
msgstr "Zaјэzenэ Roland GS (zapne mapovсnэ MT-32)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid ""
"Check if you want to enable patch mappings to emulate an MT-32 on a Roland "
"GS device"
@@ -1027,274 +1027,274 @@ msgstr ""
"ZaЙkrtnьte, pokud chcete povolit zсplaty mapovсnэ umoОђujэcэ emulovat MT-32 "
"na zaјэzenэ Roland GS"
-#: gui/options.cpp:1151
+#: gui/options.cpp:1147
msgid "Don't use Roland MT-32 music"
msgstr "NepouОэvat hudbu Roland MT-32"
-#: gui/options.cpp:1178
+#: gui/options.cpp:1174
msgid "Text and Speech:"
msgstr "Text a иeш:"
-#: gui/options.cpp:1182 gui/options.cpp:1192
+#: gui/options.cpp:1178 gui/options.cpp:1188
msgid "Speech"
msgstr "иeш"
-#: gui/options.cpp:1183 gui/options.cpp:1193
+#: gui/options.cpp:1179 gui/options.cpp:1189
msgid "Subtitles"
msgstr "Titulky"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1180
msgid "Both"
msgstr "Oba"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1182
msgid "Subtitle speed:"
msgstr "Rychlost titulkљ:"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1184
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Text a иeш:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1188
msgid "Spch"
msgstr "иeш"
-#: gui/options.cpp:1193
+#: gui/options.cpp:1189
msgid "Subs"
msgstr "Titl"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgctxt "lowres"
msgid "Both"
msgstr "Oba"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgid "Show subtitles and play speech"
msgstr "Zobrazit titulky a pјehrсvat јeш"
-#: gui/options.cpp:1196
+#: gui/options.cpp:1192
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Rychlost titulkљ:"
-#: gui/options.cpp:1212
+#: gui/options.cpp:1208
msgid "Music volume:"
msgstr "Hlasitost hudby:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1210
msgctxt "lowres"
msgid "Music volume:"
msgstr "Hlasitost hudby:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1217
msgid "Mute All"
msgstr "Ztlumit VЙe"
-#: gui/options.cpp:1224
+#: gui/options.cpp:1220
msgid "SFX volume:"
msgstr "Hlasitost zvukљ:"
-#: gui/options.cpp:1224 gui/options.cpp:1226 gui/options.cpp:1227
+#: gui/options.cpp:1220 gui/options.cpp:1222 gui/options.cpp:1223
msgid "Special sound effects volume"
msgstr "Hlasitost speciсlnэch zvukov§ch efektљ"
-#: gui/options.cpp:1226
+#: gui/options.cpp:1222
msgctxt "lowres"
msgid "SFX volume:"
msgstr "Hlasitost zvukљ:"
-#: gui/options.cpp:1234
+#: gui/options.cpp:1230
msgid "Speech volume:"
msgstr "Hlasitost јeшi:"
-#: gui/options.cpp:1236
+#: gui/options.cpp:1232
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Hlasitost јeшi:"
-#: gui/options.cpp:1438
+#: gui/options.cpp:1434
msgid "Shader"
msgstr "Shader"
-#: gui/options.cpp:1450
+#: gui/options.cpp:1446
msgid "Control"
msgstr "Ovlсdсnэ"
-#: gui/options.cpp:1476
+#: gui/options.cpp:1472
msgid "FluidSynth Settings"
msgstr "Nastavenэ FluidSynth"
-#: gui/options.cpp:1507
+#: gui/options.cpp:1503
msgid "Theme Path:"
msgstr "Cesta ke Vzhledu:"
-#: gui/options.cpp:1509
+#: gui/options.cpp:1505
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Cesta ke Vzhledu:"
-#: gui/options.cpp:1515 gui/options.cpp:1517 gui/options.cpp:1518
+#: gui/options.cpp:1511 gui/options.cpp:1513 gui/options.cpp:1514
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr "Stanovэ cestu k dodateшn§m datљm pouОэvanс vЙemi hrami nebo ScummVM"
-#: gui/options.cpp:1524
+#: gui/options.cpp:1520
msgid "Plugins Path:"
msgstr "Cesta k Pluginљm:"
-#: gui/options.cpp:1526
+#: gui/options.cpp:1522
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Cesta k Pluginљm:"
-#: gui/options.cpp:1537
+#: gui/options.cpp:1533
msgctxt "lowres"
msgid "Misc"
msgstr "Rљznщ"
-#: gui/options.cpp:1539
+#: gui/options.cpp:1535
msgid "Theme:"
msgstr "Vzhled:"
-#: gui/options.cpp:1543
+#: gui/options.cpp:1539
msgid "GUI Renderer:"
msgstr "GUI Vykreslovaш:"
-#: gui/options.cpp:1555
+#: gui/options.cpp:1551
msgid "Autosave:"
msgstr "Autouklсdсnэ:"
-#: gui/options.cpp:1557
+#: gui/options.cpp:1553
msgctxt "lowres"
msgid "Autosave:"
msgstr "Autouklсdсnэ:"
-#: gui/options.cpp:1565
+#: gui/options.cpp:1561
msgid "Keys"
msgstr "Klсvesy"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "GUI Language:"
msgstr "Jazyk GUI:"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "Language of ScummVM GUI"
msgstr "Jazyk GUI ScummVM"
-#: gui/options.cpp:1600 gui/updates-dialog.cpp:86
+#: gui/options.cpp:1596 gui/updates-dialog.cpp:86
msgid "Update check:"
msgstr "Ovьјenэ aktualizacэ:"
-#: gui/options.cpp:1600
+#: gui/options.cpp:1596
msgid "How often to check ScummVM updates"
msgstr "Jak шasto ScummVM kontroluje aktualizace"
-#: gui/options.cpp:1612
+#: gui/options.cpp:1608
msgid "Check now"
msgstr "Zkontrolovat nynэ"
-#: gui/options.cpp:1620
+#: gui/options.cpp:1616
msgid "Cloud"
msgstr "Cloud"
-#: gui/options.cpp:1622
+#: gui/options.cpp:1618
msgctxt "lowres"
msgid "Cloud"
msgstr "Cloud"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Storage:"
msgstr "кloОiЙtь:"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Active cloud storage"
msgstr "Aktivnэ cloudovщ њloОiЙtь"
-#: gui/options.cpp:1634 gui/options.cpp:2210
+#: gui/options.cpp:1630 gui/options.cpp:2206
msgid "<none>"
msgstr "<Осdnщ>"
-#: gui/options.cpp:1638 backends/platform/wii/options.cpp:114
+#: gui/options.cpp:1634 backends/platform/wii/options.cpp:114
msgid "Username:"
msgstr "UОivatelskщ jmщno:"
-#: gui/options.cpp:1638
+#: gui/options.cpp:1634
msgid "Username used by this storage"
msgstr "UОivatelskс jmщna kterс toto њloОiЙtь vyuОэvajэ"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Used space:"
msgstr "VyuОit§ prostor:"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Space used by ScummVM's saved games on this storage"
msgstr "Prostor vyuОit§ uloОen§mi hrami ScummVM v tomto њloОiЙti"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "Last sync time:"
msgstr "Datum poslednэ synchronizace:"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "When the last saved games sync for this storage occured"
msgstr "Kdy byla provedena poslednэ synchronizace uloОen§ch her"
-#: gui/options.cpp:1647 gui/storagewizarddialog.cpp:71
+#: gui/options.cpp:1643 gui/storagewizarddialog.cpp:71
msgid "Connect"
msgstr "Pјipojit"
-#: gui/options.cpp:1647
+#: gui/options.cpp:1643
msgid "Open wizard dialog to connect your cloud storage account"
msgstr ""
"Otevјэt dialogovщ okno prљvodce pro pјipojenэ k vaЙemu њшtu cloudovщho "
"њloОiЙtь"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh"
msgstr "Obnovit"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh current cloud storage information (username and usage)"
msgstr ""
"Obnovit souшasnщ њdaje cloudovщho њloОiЙtь (uОivatelskщ jmщno a vyuОitэ)"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Download"
msgstr "Stсhnout"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Open downloads manager dialog"
msgstr "Otevјэt dialogovщ okno sprсvce stahovanэ"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run server"
msgstr "Spustit server"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run local webserver"
msgstr "Spustit mэstnэ internetov§ server"
-#: gui/options.cpp:1652 gui/options.cpp:2320
+#: gui/options.cpp:1648 gui/options.cpp:2316
msgid "Not running"
msgstr "NespuЙtьno"
-#: gui/options.cpp:1656
+#: gui/options.cpp:1652
msgid "/root/ Path:"
msgstr "Cesta /root/:"
-#: gui/options.cpp:1656 gui/options.cpp:1658 gui/options.cpp:1659
+#: gui/options.cpp:1652 gui/options.cpp:1654 gui/options.cpp:1655
msgid "Specifies which directory the Files Manager can access"
msgstr "Urшuje do kterщho adresсјe mс Sprсvce souborљ pјэstup"
-#: gui/options.cpp:1658
+#: gui/options.cpp:1654
msgctxt "lowres"
msgid "/root/ Path:"
msgstr "Cesta /root/:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid "Server's port:"
msgstr "Port serveru:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid ""
"Which port is used by the server\n"
"Auth with server is not available with non-default port"
@@ -1302,27 +1302,27 @@ msgstr ""
"Kter§ port server pouОэvс\n"
"PјihlсЙenэ pomocэ serveru nenэ dostupnщ pјi pouОitэ nestandardnэho portu"
-#: gui/options.cpp:1681
+#: gui/options.cpp:1677
msgid "Apply"
msgstr "PouОэt"
-#: gui/options.cpp:1824
+#: gui/options.cpp:1820
msgid "Failed to change cloud storage!"
msgstr "Nelze zmьnit cloudovщ њloОiЙtь!"
-#: gui/options.cpp:1827
+#: gui/options.cpp:1823
msgid "Another cloud storage is already active."
msgstr "Jinщ cloudovщ њloОiЙtь jiО je aktivnэ."
-#: gui/options.cpp:1895
+#: gui/options.cpp:1891
msgid "Theme does not support selected language!"
msgstr "Vzhled nepodporuje zvolen§ jazyk!"
-#: gui/options.cpp:1898
+#: gui/options.cpp:1894
msgid "Theme cannot be loaded!"
msgstr "Vzhled nelze naшэst!"
-#: gui/options.cpp:1901
+#: gui/options.cpp:1897
msgid ""
"\n"
"Misc settings will be restored."
@@ -1330,48 +1330,48 @@ msgstr ""
"\n"
"Nastavenэ v Rљznщ budou obnovena."
-#: gui/options.cpp:1937
+#: gui/options.cpp:1933
msgid "The chosen directory cannot be written to. Please select another one."
msgstr "Do zvolenщho adresсјe nelze zapisovat. Vyberte, prosэm, jin§."
-#: gui/options.cpp:1946
+#: gui/options.cpp:1942
msgid "Select directory for GUI themes"
msgstr "Vyberte adresсј pro vhledy GUI"
-#: gui/options.cpp:1956
+#: gui/options.cpp:1952
msgid "Select directory for extra files"
msgstr "Vyberte adresсј pro dodateшnщ soubory"
-#: gui/options.cpp:1967
+#: gui/options.cpp:1963
msgid "Select directory for plugins"
msgstr "Vyberte adresсј pro zсsuvnщ moduly"
-#: gui/options.cpp:1979
+#: gui/options.cpp:1975
msgid "Select directory for Files Manager /root/"
msgstr "Vyberte adresсј pro koјen Sprсvce souborљ"
-#: gui/options.cpp:2217
+#: gui/options.cpp:2213
#, c-format
msgid "%llu bytes"
msgstr "%llu bajtљ"
-#: gui/options.cpp:2225
+#: gui/options.cpp:2221
msgid "<right now>"
msgstr "<prсvь nynэ>"
-#: gui/options.cpp:2227
+#: gui/options.cpp:2223
msgid "<never>"
msgstr "<nikdy>"
-#: gui/options.cpp:2311
+#: gui/options.cpp:2307
msgid "Stop server"
msgstr "Zastavit server"
-#: gui/options.cpp:2312
+#: gui/options.cpp:2308
msgid "Stop local webserver"
msgstr "Zastavit mэstnэ internetov§ server"
-#: gui/options.cpp:2403
+#: gui/options.cpp:2399
msgid ""
"Request failed.\n"
"Check your Internet connection."
@@ -1844,8 +1844,8 @@ msgstr "~N~сvrat do SpouЙtьшe"
#: 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:106
-#: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:658
+#: engines/mohawk/riven.cpp:545 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
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
#: engines/toon/toon.cpp:3340 engines/tsage/scenes.cpp:599
@@ -1864,9 +1864,9 @@ msgstr "UloОit hru:"
#: engines/dm/loadsave.cpp:196 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:106 engines/neverhood/menumodule.cpp:880
-#: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:659
+#: engines/mohawk/dialogs.cpp:106 engines/mohawk/riven.cpp:545
+#: 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
#: engines/sherlock/scalpel/scalpel.cpp:1250
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
@@ -2180,7 +2180,7 @@ msgstr "Kliknutэ Zakсzсno"
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "'ReОim Ћuknutэ' Dotykovщ Obrazovky - Najetэ (Dpad klikс)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
msgid "Do you want to quit ?"
msgstr "Chcete ukonшit ?"
@@ -3334,7 +3334,7 @@ msgstr ""
"Schсzэ vсm soubor 'extras.mhk'. Mэsto toho lze pouОэt soubor instalace "
"'arcriven.z'."
-#: engines/mohawk/riven.cpp:416
+#: engines/mohawk/riven.cpp:432
msgid "You are missing the following required Riven data files:\n"
msgstr "Chybэ vсm nсsledujэcэ potјebnщ datovщ soubory Riven:\n"
diff --git a/po/da_DK.po b/po/da_DK.po
index 17b5456a90..2602c8cbc7 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: 2017-12-10 15:25+0100\n"
+"POT-Creation-Date: 2017-12-26 21:11+0100\n"
"PO-Revision-Date: 2017-12-07 19:59+0000\n"
"Last-Translator: stevenew <steffen@nyeland.dk>\n"
"Language-Team: Danish <https://translations.scummvm.org/projects/scummvm/"
@@ -58,7 +58,7 @@ msgstr "Gх op"
#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editgamedialog.cpp:292
#: gui/editrecorddialog.cpp:67 gui/filebrowser-dialog.cpp:64
#: gui/fluidsynth-dialog.cpp:152 gui/KeysDialog.cpp:43 gui/massadd.cpp:95
-#: gui/options.cpp:1680 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
+#: gui/options.cpp:1676 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
#: gui/recorderdialog.cpp:155 gui/remotebrowser.cpp:59
#: gui/saveload-dialog.cpp:383 gui/saveload-dialog.cpp:445
#: gui/saveload-dialog.cpp:727 gui/saveload-dialog.cpp:1121
@@ -118,7 +118,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -131,7 +131,7 @@ msgstr "Ja"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -154,7 +154,7 @@ msgstr ""
#: gui/downloaddialog.cpp:146 gui/editgamedialog.cpp:293
#: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:526
-#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1682
+#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1678
#: gui/saveload-dialog.cpp:1122 engines/engine.cpp:443 engines/engine.cpp:454
#: backends/platform/wii/options.cpp:47
#: backends/platform/wince/CELauncherDialog.cpp:54
@@ -240,8 +240,8 @@ msgstr ""
"Spillets sprog. Dette vil ikke цndre din spanske version af spillet til "
"engelsk"
-#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:997
-#: gui/options.cpp:1010 gui/options.cpp:1575 audio/null.cpp:41
+#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:993
+#: gui/options.cpp:1006 gui/options.cpp:1571 audio/null.cpp:41
msgid "<default>"
msgstr "<standard>"
@@ -263,11 +263,11 @@ msgstr "Platform:"
msgid "Engine"
msgstr "Motor"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "Graphics"
msgstr "Grafik"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "GFX"
msgstr "GFX"
@@ -280,7 +280,7 @@ msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Overstyr globale grafik indstillinger"
-#: gui/editgamedialog.cpp:196 gui/options.cpp:1457
+#: gui/editgamedialog.cpp:196 gui/options.cpp:1453
msgid "Audio"
msgstr "Lyd"
@@ -293,11 +293,11 @@ msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Overstyr globale lyd indstillinger"
-#: gui/editgamedialog.cpp:210 gui/options.cpp:1462
+#: gui/editgamedialog.cpp:210 gui/options.cpp:1458
msgid "Volume"
msgstr "Lydstyrke"
-#: gui/editgamedialog.cpp:212 gui/options.cpp:1464
+#: gui/editgamedialog.cpp:212 gui/options.cpp:1460
msgctxt "lowres"
msgid "Volume"
msgstr "Lydstyrke"
@@ -311,7 +311,7 @@ msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Overstyr globale lydstyrke indstillinger"
-#: gui/editgamedialog.cpp:226 gui/options.cpp:1472
+#: gui/editgamedialog.cpp:226 gui/options.cpp:1468
msgid "MIDI"
msgstr "MIDI"
@@ -324,7 +324,7 @@ msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Overstyr globale MIDI indstillinger"
-#: gui/editgamedialog.cpp:241 gui/options.cpp:1482
+#: gui/editgamedialog.cpp:241 gui/options.cpp:1478
msgid "MT-32"
msgstr "MT-32"
@@ -337,11 +337,11 @@ msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Overstyr globale MT-32 indstillinger"
-#: gui/editgamedialog.cpp:255 gui/options.cpp:1489
+#: gui/editgamedialog.cpp:255 gui/options.cpp:1485
msgid "Paths"
msgstr "Stier"
-#: gui/editgamedialog.cpp:257 gui/options.cpp:1491
+#: gui/editgamedialog.cpp:257 gui/options.cpp:1487
msgctxt "lowres"
msgid "Paths"
msgstr "Stier"
@@ -355,7 +355,7 @@ msgctxt "lowres"
msgid "Game Path:"
msgstr "Spil sti:"
-#: gui/editgamedialog.cpp:271 gui/options.cpp:1515
+#: gui/editgamedialog.cpp:271 gui/options.cpp:1511
msgid "Extra Path:"
msgstr "Ekstra sti:"
@@ -364,44 +364,44 @@ msgstr "Ekstra sti:"
msgid "Specifies path to additional data used by the game"
msgstr "Angiver sti til ekstra data der bruges i spillet"
-#: gui/editgamedialog.cpp:273 gui/options.cpp:1517
+#: gui/editgamedialog.cpp:273 gui/options.cpp:1513
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Ekstra sti:"
-#: gui/editgamedialog.cpp:280 gui/options.cpp:1499
+#: gui/editgamedialog.cpp:280 gui/options.cpp:1495
msgid "Save Path:"
msgstr "Gemme sti:"
#: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282
-#: gui/editgamedialog.cpp:283 gui/options.cpp:1499 gui/options.cpp:1501
-#: gui/options.cpp:1502
+#: gui/editgamedialog.cpp:283 gui/options.cpp:1495 gui/options.cpp:1497
+#: gui/options.cpp:1498
msgid "Specifies where your saved games are put"
msgstr "Angiver hvor dine gemmer bliver lagt"
-#: gui/editgamedialog.cpp:282 gui/options.cpp:1501
+#: gui/editgamedialog.cpp:282 gui/options.cpp:1497
msgctxt "lowres"
msgid "Save Path:"
msgstr "Gemme sti:"
#: gui/editgamedialog.cpp:301 gui/editgamedialog.cpp:398
-#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1510
-#: gui/options.cpp:1518 gui/options.cpp:1527 gui/options.cpp:1707
-#: gui/options.cpp:1713 gui/options.cpp:1721 gui/options.cpp:1744
-#: gui/options.cpp:1777 gui/options.cpp:1783 gui/options.cpp:1790
-#: gui/options.cpp:1798 gui/options.cpp:1993 gui/options.cpp:1996
-#: gui/options.cpp:2003 gui/options.cpp:2013
+#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1506
+#: gui/options.cpp:1514 gui/options.cpp:1523 gui/options.cpp:1703
+#: gui/options.cpp:1709 gui/options.cpp:1717 gui/options.cpp:1740
+#: gui/options.cpp:1773 gui/options.cpp:1779 gui/options.cpp:1786
+#: gui/options.cpp:1794 gui/options.cpp:1989 gui/options.cpp:1992
+#: gui/options.cpp:1999 gui/options.cpp:2009
msgctxt "path"
msgid "None"
msgstr "Ingen"
#: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404
-#: gui/editgamedialog.cpp:522 gui/options.cpp:1701 gui/options.cpp:1771
-#: gui/options.cpp:1999 backends/platform/wii/options.cpp:56
+#: gui/editgamedialog.cpp:522 gui/options.cpp:1697 gui/options.cpp:1767
+#: gui/options.cpp:1995 backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Standard"
-#: gui/editgamedialog.cpp:450 gui/options.cpp:2007
+#: gui/editgamedialog.cpp:450 gui/options.cpp:2003
msgid "Select SoundFont"
msgstr "Vцlg SoundFont"
@@ -409,7 +409,7 @@ msgstr "Vцlg SoundFont"
msgid "Select additional game directory"
msgstr "Vцlg ekstra spil bibliotek"
-#: gui/editgamedialog.cpp:502 gui/options.cpp:1930
+#: gui/editgamedialog.cpp:502 gui/options.cpp:1926
msgid "Select directory for saved games"
msgstr "Vцlg bibliotek til spil gemmer"
@@ -501,7 +501,7 @@ msgstr "Sinus"
msgid "Triangle"
msgstr "Triangulцr"
-#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1535
+#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1531
msgid "Misc"
msgstr "Andet"
@@ -680,7 +680,7 @@ msgid "Search:"
msgstr "Sјg:"
#: gui/launcher.cpp:200 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:517
+#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:533
#: engines/pegasus/pegasus.cpp:355 engines/tsage/scenes.cpp:601
#: engines/wage/saveload.cpp:748
msgid "Load game:"
@@ -690,7 +690,7 @@ msgstr "Indlцs spil:"
#: backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:105
-#: engines/mohawk/riven.cpp:517 engines/parallaction/saveload.cpp:194
+#: engines/mohawk/riven.cpp:533 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
msgid "Load"
@@ -800,208 +800,208 @@ msgstr "hvert 15. minut"
msgid "every 30 mins"
msgstr "hvert 30. minut"
-#: gui/options.cpp:343 gui/options.cpp:640 gui/options.cpp:778
-#: gui/options.cpp:853 gui/options.cpp:1114
+#: gui/options.cpp:339 gui/options.cpp:636 gui/options.cpp:774
+#: gui/options.cpp:849 gui/options.cpp:1110
msgctxt "soundfont"
msgid "None"
msgstr "Ingen"
-#: gui/options.cpp:514
+#: gui/options.cpp:510
msgid "Failed to apply some of the graphic options changes:"
msgstr "Anvendelse af цndringer for grafiske indstillinger fejlede:"
-#: gui/options.cpp:526
+#: gui/options.cpp:522
msgid "the video mode could not be changed."
msgstr "videotilstanden kunne ikke цndres."
-#: gui/options.cpp:532
+#: gui/options.cpp:528
msgid "the aspect ratio setting could not be changed"
msgstr "billedformat indstillingen ikke kunne цndres"
-#: gui/options.cpp:538
+#: gui/options.cpp:534
msgid "the fullscreen setting could not be changed"
msgstr "fuld skцrm indstillingen kunne ikke цndres"
-#: gui/options.cpp:544
+#: gui/options.cpp:540
msgid "the filtering setting could not be changed"
msgstr "filtrerings-indstillingen kunne ikke цndres"
-#: gui/options.cpp:932
+#: gui/options.cpp:928
msgid "Show On-screen control"
msgstr "Vis Skцrm kontrol"
-#: gui/options.cpp:936
+#: gui/options.cpp:932
msgid "Touchpad mouse mode"
msgstr "Pegeplade muse tilstand"
-#: gui/options.cpp:940
+#: gui/options.cpp:936
msgid "Swap Menu and Back buttons"
msgstr "Byt Menu og Tilbage knapper"
-#: gui/options.cpp:945
+#: gui/options.cpp:941
msgid "Pointer Speed:"
msgstr "Markјr Hastighed:"
-#: gui/options.cpp:945 gui/options.cpp:947 gui/options.cpp:948
+#: gui/options.cpp:941 gui/options.cpp:943 gui/options.cpp:944
msgid "Speed for keyboard/joystick mouse pointer control"
msgstr "Hastighed for tastatur/joystick muse markјr kontrol"
-#: gui/options.cpp:947
+#: gui/options.cpp:943
msgctxt "lowres"
msgid "Pointer Speed:"
msgstr "Markјr Hastighed:"
-#: gui/options.cpp:958
+#: gui/options.cpp:954
msgid "Joy Deadzone:"
msgstr "Joy Dјdszone:"
-#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
+#: gui/options.cpp:954 gui/options.cpp:956 gui/options.cpp:957
msgid "Analog joystick Deadzone"
msgstr "Analog joystick Dјdszone"
-#: gui/options.cpp:960
+#: gui/options.cpp:956
msgctxt "lowres"
msgid "Joy Deadzone:"
msgstr "Joy dјdszone:"
-#: gui/options.cpp:974
+#: gui/options.cpp:970
msgid "HW Shader:"
msgstr "HW Shader:"
-#: gui/options.cpp:974 gui/options.cpp:976
+#: gui/options.cpp:970 gui/options.cpp:972
msgid "Different hardware shaders give different visual effects"
msgstr "Forskellige hardware shaders giver forskellige visuelle effekter"
-#: gui/options.cpp:976
+#: gui/options.cpp:972
msgctxt "lowres"
msgid "HW Shader:"
msgstr "HW Shader:"
-#: gui/options.cpp:977
+#: gui/options.cpp:973
msgid "Different shaders give different visual effects"
msgstr "Forskellige shaders giver forskellige effekter"
-#: gui/options.cpp:994
+#: gui/options.cpp:990
msgid "Graphics mode:"
msgstr "Grafik tilstand:"
-#: gui/options.cpp:1008
+#: gui/options.cpp:1004
msgid "Render mode:"
msgstr "Rendere tilstand:"
-#: gui/options.cpp:1008 gui/options.cpp:1009
+#: gui/options.cpp:1004 gui/options.cpp:1005
msgid "Special dithering modes supported by some games"
msgstr "Speciel farvereduceringstilstand understјttet a nogle spil"
-#: gui/options.cpp:1020 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
+#: gui/options.cpp:1016 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2590
msgid "Fullscreen mode"
msgstr "Fuldskцrms tilstand"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Filter graphics"
msgstr "Filtrer grafik"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Use linear filtering when scaling graphics"
msgstr "Brug liniцr filtrering nхr grafik skaleres"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Aspect ratio correction"
msgstr "Billedformat korrektion"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Correct aspect ratio for 320x200 games"
msgstr "Korrekt billedformat til 320x200 spil"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Preferred Device:"
msgstr "Foretruk. enhed:"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Music Device:"
msgstr "Musik enhed:"
-#: gui/options.cpp:1034 gui/options.cpp:1036
+#: gui/options.cpp:1030 gui/options.cpp:1032
msgid "Specifies preferred sound device or sound card emulator"
msgstr "Angiver foretukket lyd enhed eller lydkort emulator"
-#: gui/options.cpp:1034 gui/options.cpp:1036 gui/options.cpp:1037
+#: gui/options.cpp:1030 gui/options.cpp:1032 gui/options.cpp:1033
msgid "Specifies output sound device or sound card emulator"
msgstr "Angiver lyd udgangsenhed eller lydkorts emulator"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Foretruk. enh.:"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Music Device:"
msgstr "Musik enhed:"
-#: gui/options.cpp:1063
+#: gui/options.cpp:1059
msgid "AdLib emulator:"
msgstr "AdLib emulator:"
-#: gui/options.cpp:1063 gui/options.cpp:1064
+#: gui/options.cpp:1059 gui/options.cpp:1060
msgid "AdLib is used for music in many games"
msgstr "AdLib bliver brugt til musik i mange spil"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "GM Device:"
msgstr "GM enhed:"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "Specifies default sound device for General MIDI output"
msgstr "Angiver standard lyd enhed for Generel MIDI-udgang"
-#: gui/options.cpp:1088
+#: gui/options.cpp:1084
msgid "Don't use General MIDI music"
msgstr "Brug ikke Generel MIDI musik"
-#: gui/options.cpp:1099 gui/options.cpp:1161
+#: gui/options.cpp:1095 gui/options.cpp:1157
msgid "Use first available device"
msgstr "Brug fјrste tilgцngelig enhed"
-#: gui/options.cpp:1111
+#: gui/options.cpp:1107
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1111 gui/options.cpp:1113 gui/options.cpp:1114
+#: gui/options.cpp:1107 gui/options.cpp:1109 gui/options.cpp:1110
msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity"
msgstr "SoundFont er understјttet af nogle lydkort, FluidSynth og Timidity"
-#: gui/options.cpp:1113
+#: gui/options.cpp:1109
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Mixed AdLib/MIDI mode"
msgstr "Blandet AdLib/MIDI tilstand"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Use both MIDI and AdLib sound generation"
msgstr "Brug bхde MIDI og AdLib lyd generering"
-#: gui/options.cpp:1122
+#: gui/options.cpp:1118
msgid "MIDI gain:"
msgstr "MIDI lydstyrke:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "MT-32 Device:"
msgstr "MT-32 enhed:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr "Angiver standard lyd enhed for Roland MT-32/LAPC1/CM32I/CM64 udgang"
-#: gui/options.cpp:1137
+#: gui/options.cpp:1133
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Цgte Roland MT-32 (undlad GM emulering)"
-#: gui/options.cpp:1137 gui/options.cpp:1139
+#: gui/options.cpp:1133 gui/options.cpp:1135
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -1009,16 +1009,16 @@ msgstr ""
"Kryds af hvis du vil bruge din rigtige hardware Roland-kompatible lyd enhed "
"tilsluttet til din computer"
-#: gui/options.cpp:1139
+#: gui/options.cpp:1135
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Цgte Roland MT-32 (ingen GM emulering)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid "Roland GS Device (enable MT-32 mappings)"
msgstr "Roland GS enhed (aktivщr MT-32 tilknytninger)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid ""
"Check if you want to enable patch mappings to emulate an MT-32 on a Roland "
"GS device"
@@ -1026,272 +1026,272 @@ msgstr ""
"Kryds af hvis du vil aktivere patch tilknytninger, for at emulere en MT-32 "
"pх en Roland GS enhed"
-#: gui/options.cpp:1151
+#: gui/options.cpp:1147
msgid "Don't use Roland MT-32 music"
msgstr "Brug ikke Roland MT-32 musik"
-#: gui/options.cpp:1178
+#: gui/options.cpp:1174
msgid "Text and Speech:"
msgstr "Tekst og tale:"
-#: gui/options.cpp:1182 gui/options.cpp:1192
+#: gui/options.cpp:1178 gui/options.cpp:1188
msgid "Speech"
msgstr "Tale"
-#: gui/options.cpp:1183 gui/options.cpp:1193
+#: gui/options.cpp:1179 gui/options.cpp:1189
msgid "Subtitles"
msgstr "Undertekster"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1180
msgid "Both"
msgstr "Begge"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1182
msgid "Subtitle speed:"
msgstr "Tekst hastighed:"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1184
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Tekst og tale:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1188
msgid "Spch"
msgstr "Tale"
-#: gui/options.cpp:1193
+#: gui/options.cpp:1189
msgid "Subs"
msgstr "Tekst"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgctxt "lowres"
msgid "Both"
msgstr "Begge"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgid "Show subtitles and play speech"
msgstr "Vis undertekster og afspil tale"
-#: gui/options.cpp:1196
+#: gui/options.cpp:1192
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Tekst hastighed:"
-#: gui/options.cpp:1212
+#: gui/options.cpp:1208
msgid "Music volume:"
msgstr "Musik lydstyrke:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1210
msgctxt "lowres"
msgid "Music volume:"
msgstr "Musik lydstyrke:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1217
msgid "Mute All"
msgstr "Mute alle"
-#: gui/options.cpp:1224
+#: gui/options.cpp:1220
msgid "SFX volume:"
msgstr "SFX lydstyrke:"
-#: gui/options.cpp:1224 gui/options.cpp:1226 gui/options.cpp:1227
+#: gui/options.cpp:1220 gui/options.cpp:1222 gui/options.cpp:1223
msgid "Special sound effects volume"
msgstr "Lydstyrke for specielle lydeffekter"
-#: gui/options.cpp:1226
+#: gui/options.cpp:1222
msgctxt "lowres"
msgid "SFX volume:"
msgstr "SFX lydstyrke:"
-#: gui/options.cpp:1234
+#: gui/options.cpp:1230
msgid "Speech volume:"
msgstr "Tale lydstyrke:"
-#: gui/options.cpp:1236
+#: gui/options.cpp:1232
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Tale lydstyrke:"
-#: gui/options.cpp:1438
+#: gui/options.cpp:1434
msgid "Shader"
msgstr "Shader"
-#: gui/options.cpp:1450
+#: gui/options.cpp:1446
msgid "Control"
msgstr "Kontrol"
-#: gui/options.cpp:1476
+#: gui/options.cpp:1472
msgid "FluidSynth Settings"
msgstr "FluidSynth indstillinger"
-#: gui/options.cpp:1507
+#: gui/options.cpp:1503
msgid "Theme Path:"
msgstr "Tema sti:"
-#: gui/options.cpp:1509
+#: gui/options.cpp:1505
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Tema sti:"
-#: gui/options.cpp:1515 gui/options.cpp:1517 gui/options.cpp:1518
+#: gui/options.cpp:1511 gui/options.cpp:1513 gui/options.cpp:1514
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr "Angiver sti til ekstra data brugt af alle spil eller ScummVM"
-#: gui/options.cpp:1524
+#: gui/options.cpp:1520
msgid "Plugins Path:"
msgstr "Plugin sti:"
-#: gui/options.cpp:1526
+#: gui/options.cpp:1522
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Plugin sti:"
-#: gui/options.cpp:1537
+#: gui/options.cpp:1533
msgctxt "lowres"
msgid "Misc"
msgstr "Andet"
-#: gui/options.cpp:1539
+#: gui/options.cpp:1535
msgid "Theme:"
msgstr "Tema:"
-#: gui/options.cpp:1543
+#: gui/options.cpp:1539
msgid "GUI Renderer:"
msgstr "GUI renderer:"
-#: gui/options.cpp:1555
+#: gui/options.cpp:1551
msgid "Autosave:"
msgstr "Auto gemme:"
-#: gui/options.cpp:1557
+#: gui/options.cpp:1553
msgctxt "lowres"
msgid "Autosave:"
msgstr "Auto gemme:"
-#: gui/options.cpp:1565
+#: gui/options.cpp:1561
msgid "Keys"
msgstr "Taster"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "GUI Language:"
msgstr "Sprog:"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "Language of ScummVM GUI"
msgstr "Sprog for brugerfladen i ScummVM"
-#: gui/options.cpp:1600 gui/updates-dialog.cpp:86
+#: gui/options.cpp:1596 gui/updates-dialog.cpp:86
msgid "Update check:"
msgstr "Opdaterings tjek:"
-#: gui/options.cpp:1600
+#: gui/options.cpp:1596
msgid "How often to check ScummVM updates"
msgstr "Hvor ofte skal der tjekkes for ScummVM opdateringer"
-#: gui/options.cpp:1612
+#: gui/options.cpp:1608
msgid "Check now"
msgstr "Tjek nu"
-#: gui/options.cpp:1620
+#: gui/options.cpp:1616
msgid "Cloud"
msgstr "Skyen"
-#: gui/options.cpp:1622
+#: gui/options.cpp:1618
msgctxt "lowres"
msgid "Cloud"
msgstr "Skyen"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Storage:"
msgstr "Lager:"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Active cloud storage"
msgstr "Aktivщr lagring i skyen"
-#: gui/options.cpp:1634 gui/options.cpp:2210
+#: gui/options.cpp:1630 gui/options.cpp:2206
msgid "<none>"
msgstr "<ingen>"
-#: gui/options.cpp:1638 backends/platform/wii/options.cpp:114
+#: gui/options.cpp:1634 backends/platform/wii/options.cpp:114
msgid "Username:"
msgstr "Bruger:"
-#: gui/options.cpp:1638
+#: gui/options.cpp:1634
msgid "Username used by this storage"
msgstr "Brugernavn for denne lagring"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Used space:"
msgstr "Udnyttet plads:"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Space used by ScummVM's saved games on this storage"
msgstr "Plads brugt af ScummVM's gemte spil pх denne lagring"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "Last sync time:"
msgstr "Sidst synkroniseret:"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "When the last saved games sync for this storage occured"
msgstr ""
"Hvornхr den sidste synkronisering af gemte spil pх denne lagring foregik"
-#: gui/options.cpp:1647 gui/storagewizarddialog.cpp:71
+#: gui/options.cpp:1643 gui/storagewizarddialog.cpp:71
msgid "Connect"
msgstr "Tilslut"
-#: gui/options.cpp:1647
+#: gui/options.cpp:1643
msgid "Open wizard dialog to connect your cloud storage account"
msgstr "Хben hjцlpe dialog for at forbinde din lagringskonto i skyen"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh"
msgstr "Genopfrisk"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh current cloud storage information (username and usage)"
msgstr "Genopfrisk aktuel lagrings information i skyen (brugernavn og brug)"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Download"
msgstr "Download"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Open downloads manager dialog"
msgstr "Хben download manager dialog"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run server"
msgstr "Kјr server"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run local webserver"
msgstr "Kјr lokal webserver"
-#: gui/options.cpp:1652 gui/options.cpp:2320
+#: gui/options.cpp:1648 gui/options.cpp:2316
msgid "Not running"
msgstr "Kјrer ikke"
-#: gui/options.cpp:1656
+#: gui/options.cpp:1652
msgid "/root/ Path:"
msgstr "/root/ sti:"
-#: gui/options.cpp:1656 gui/options.cpp:1658 gui/options.cpp:1659
+#: gui/options.cpp:1652 gui/options.cpp:1654 gui/options.cpp:1655
msgid "Specifies which directory the Files Manager can access"
msgstr "Angiver hvilke biblioteker Fil Manager kan tilgх"
-#: gui/options.cpp:1658
+#: gui/options.cpp:1654
msgctxt "lowres"
msgid "/root/ Path:"
msgstr "/root/ sti:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid "Server's port:"
msgstr "Server's port:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid ""
"Which port is used by the server\n"
"Auth with server is not available with non-default port"
@@ -1299,27 +1299,27 @@ msgstr ""
"Hvilken port bruges af serveren\n"
"Godkendelse med server er ikke mulig med ikke-standard port"
-#: gui/options.cpp:1681
+#: gui/options.cpp:1677
msgid "Apply"
msgstr "Anvend"
-#: gui/options.cpp:1824
+#: gui/options.cpp:1820
msgid "Failed to change cloud storage!"
msgstr "Mislykkedes at цndre lagring i sky!"
-#: gui/options.cpp:1827
+#: gui/options.cpp:1823
msgid "Another cloud storage is already active."
msgstr "En anden lagring i skyen er allerede aktiv."
-#: gui/options.cpp:1895
+#: gui/options.cpp:1891
msgid "Theme does not support selected language!"
msgstr "Tema understјtter ikke valgte sprog!"
-#: gui/options.cpp:1898
+#: gui/options.cpp:1894
msgid "Theme cannot be loaded!"
msgstr "Tema kunne ikke indlцses!"
-#: gui/options.cpp:1901
+#: gui/options.cpp:1897
msgid ""
"\n"
"Misc settings will be restored."
@@ -1327,48 +1327,48 @@ msgstr ""
"\n"
"Misc opsцtning vil blive genskabt."
-#: gui/options.cpp:1937
+#: gui/options.cpp:1933
msgid "The chosen directory cannot be written to. Please select another one."
msgstr "Der kan ikke skrives til det valgte bibliotek. Vцlg venligst et andet."
-#: gui/options.cpp:1946
+#: gui/options.cpp:1942
msgid "Select directory for GUI themes"
msgstr "Vцlg bibliotek for GUI temaer"
-#: gui/options.cpp:1956
+#: gui/options.cpp:1952
msgid "Select directory for extra files"
msgstr "Vцlg bibliotek for ekstra filer"
-#: gui/options.cpp:1967
+#: gui/options.cpp:1963
msgid "Select directory for plugins"
msgstr "Vцlg bibliotek for plugins"
-#: gui/options.cpp:1979
+#: gui/options.cpp:1975
msgid "Select directory for Files Manager /root/"
msgstr "Vцlg bibliotek for Fil Manager /root/"
-#: gui/options.cpp:2217
+#: gui/options.cpp:2213
#, c-format
msgid "%llu bytes"
msgstr "%llu bytes"
-#: gui/options.cpp:2225
+#: gui/options.cpp:2221
msgid "<right now>"
msgstr "<lige nu>"
-#: gui/options.cpp:2227
+#: gui/options.cpp:2223
msgid "<never>"
msgstr "<aldrig>"
-#: gui/options.cpp:2311
+#: gui/options.cpp:2307
msgid "Stop server"
msgstr "Stop server"
-#: gui/options.cpp:2312
+#: gui/options.cpp:2308
msgid "Stop local webserver"
msgstr "Stop lokal webserver"
-#: gui/options.cpp:2403
+#: gui/options.cpp:2399
msgid ""
"Request failed.\n"
"Check your Internet connection."
@@ -1838,8 +1838,8 @@ msgstr "~R~etur til oversigt"
#: 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:106
-#: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:658
+#: engines/mohawk/riven.cpp:545 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
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
#: engines/toon/toon.cpp:3340 engines/tsage/scenes.cpp:599
@@ -1858,9 +1858,9 @@ msgstr "Gemmer:"
#: engines/dm/loadsave.cpp:196 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:106 engines/neverhood/menumodule.cpp:880
-#: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:659
+#: engines/mohawk/dialogs.cpp:106 engines/mohawk/riven.cpp:545
+#: 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
#: engines/sherlock/scalpel/scalpel.cpp:1250
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
@@ -2173,7 +2173,7 @@ msgstr "Klik deaktiveret"
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Touchscreen 'Tap Mode' - Henover (DPad Klik)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
msgid "Do you want to quit ?"
msgstr "Vil du afslutte?"
@@ -3329,7 +3329,7 @@ msgstr ""
"Du mangler 'extras.mhk'. Brug af 'arcriven.z' installationsfilen fungerer "
"ogsх."
-#: engines/mohawk/riven.cpp:416
+#: engines/mohawk/riven.cpp:432
msgid "You are missing the following required Riven data files:\n"
msgstr "Du mangler fјlgende krцvede Riven data filer:\n"
diff --git a/po/de_DE.po b/po/de_DE.po
index eb6310d8eb..82f2fbbf55 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.10.0git\n"
"Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2017-12-10 15:25+0100\n"
+"POT-Creation-Date: 2017-12-26 21:11+0100\n"
"PO-Revision-Date: 2017-11-15 09:26+0000\n"
"Last-Translator: Lothar Serra Mari <rootfather@scummvm.org>\n"
"Language-Team: German <https://translations.scummvm.org/projects/scummvm/"
@@ -59,7 +59,7 @@ msgstr "Pfad hoch"
#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editgamedialog.cpp:292
#: gui/editrecorddialog.cpp:67 gui/filebrowser-dialog.cpp:64
#: gui/fluidsynth-dialog.cpp:152 gui/KeysDialog.cpp:43 gui/massadd.cpp:95
-#: gui/options.cpp:1680 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
+#: gui/options.cpp:1676 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
#: gui/recorderdialog.cpp:155 gui/remotebrowser.cpp:59
#: gui/saveload-dialog.cpp:383 gui/saveload-dialog.cpp:445
#: gui/saveload-dialog.cpp:727 gui/saveload-dialog.cpp:1121
@@ -121,7 +121,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -134,7 +134,7 @@ msgstr "Ja"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -157,7 +157,7 @@ msgstr ""
#: gui/downloaddialog.cpp:146 gui/editgamedialog.cpp:293
#: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:526
-#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1682
+#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1678
#: gui/saveload-dialog.cpp:1122 engines/engine.cpp:443 engines/engine.cpp:454
#: backends/platform/wii/options.cpp:47
#: backends/platform/wince/CELauncherDialog.cpp:54
@@ -243,8 +243,8 @@ msgstr ""
"Sprache des Spiels. Diese Funktion wird eine spanische Version des Spiels "
"nicht in eine deutsche verwandeln"
-#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:997
-#: gui/options.cpp:1010 gui/options.cpp:1575 audio/null.cpp:41
+#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:993
+#: gui/options.cpp:1006 gui/options.cpp:1571 audio/null.cpp:41
msgid "<default>"
msgstr "<Standard>"
@@ -266,11 +266,11 @@ msgstr "Plattform:"
msgid "Engine"
msgstr "Engine"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "Graphics"
msgstr "Grafik"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "GFX"
msgstr "GFX"
@@ -283,7 +283,7 @@ msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Globale Grafik-Einstellungen ќbergehen"
-#: gui/editgamedialog.cpp:196 gui/options.cpp:1457
+#: gui/editgamedialog.cpp:196 gui/options.cpp:1453
msgid "Audio"
msgstr "Audio"
@@ -296,11 +296,11 @@ msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Globale Audio-Einstellungen ќbergehen"
-#: gui/editgamedialog.cpp:210 gui/options.cpp:1462
+#: gui/editgamedialog.cpp:210 gui/options.cpp:1458
msgid "Volume"
msgstr "Lautstфrke"
-#: gui/editgamedialog.cpp:212 gui/options.cpp:1464
+#: gui/editgamedialog.cpp:212 gui/options.cpp:1460
msgctxt "lowres"
msgid "Volume"
msgstr "Lautst."
@@ -314,7 +314,7 @@ msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Globale Lautstфrke-Einstellungen ќbergehen"
-#: gui/editgamedialog.cpp:226 gui/options.cpp:1472
+#: gui/editgamedialog.cpp:226 gui/options.cpp:1468
msgid "MIDI"
msgstr "MIDI"
@@ -327,7 +327,7 @@ msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Globale MIDI-Einstellungen ќbergehen"
-#: gui/editgamedialog.cpp:241 gui/options.cpp:1482
+#: gui/editgamedialog.cpp:241 gui/options.cpp:1478
msgid "MT-32"
msgstr "MT-32"
@@ -340,11 +340,11 @@ msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Globale MT-32-Einstellungen ќbergehen"
-#: gui/editgamedialog.cpp:255 gui/options.cpp:1489
+#: gui/editgamedialog.cpp:255 gui/options.cpp:1485
msgid "Paths"
msgstr "Pfade"
-#: gui/editgamedialog.cpp:257 gui/options.cpp:1491
+#: gui/editgamedialog.cpp:257 gui/options.cpp:1487
msgctxt "lowres"
msgid "Paths"
msgstr "Pfade"
@@ -358,7 +358,7 @@ msgctxt "lowres"
msgid "Game Path:"
msgstr "Spielpfad:"
-#: gui/editgamedialog.cpp:271 gui/options.cpp:1515
+#: gui/editgamedialog.cpp:271 gui/options.cpp:1511
msgid "Extra Path:"
msgstr "Extras:"
@@ -367,44 +367,44 @@ msgstr "Extras:"
msgid "Specifies path to additional data used by the game"
msgstr "Legt den Verzeichnispfad fќr zusфtzliche Spieldateien fest"
-#: gui/editgamedialog.cpp:273 gui/options.cpp:1517
+#: gui/editgamedialog.cpp:273 gui/options.cpp:1513
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Extras:"
-#: gui/editgamedialog.cpp:280 gui/options.cpp:1499
+#: gui/editgamedialog.cpp:280 gui/options.cpp:1495
msgid "Save Path:"
msgstr "Spielstфnde:"
#: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282
-#: gui/editgamedialog.cpp:283 gui/options.cpp:1499 gui/options.cpp:1501
-#: gui/options.cpp:1502
+#: gui/editgamedialog.cpp:283 gui/options.cpp:1495 gui/options.cpp:1497
+#: gui/options.cpp:1498
msgid "Specifies where your saved games are put"
msgstr "Legt fest, wo die Spielstфnde gespeichert werden"
-#: gui/editgamedialog.cpp:282 gui/options.cpp:1501
+#: gui/editgamedialog.cpp:282 gui/options.cpp:1497
msgctxt "lowres"
msgid "Save Path:"
msgstr "Spielstфnde:"
#: gui/editgamedialog.cpp:301 gui/editgamedialog.cpp:398
-#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1510
-#: gui/options.cpp:1518 gui/options.cpp:1527 gui/options.cpp:1707
-#: gui/options.cpp:1713 gui/options.cpp:1721 gui/options.cpp:1744
-#: gui/options.cpp:1777 gui/options.cpp:1783 gui/options.cpp:1790
-#: gui/options.cpp:1798 gui/options.cpp:1993 gui/options.cpp:1996
-#: gui/options.cpp:2003 gui/options.cpp:2013
+#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1506
+#: gui/options.cpp:1514 gui/options.cpp:1523 gui/options.cpp:1703
+#: gui/options.cpp:1709 gui/options.cpp:1717 gui/options.cpp:1740
+#: gui/options.cpp:1773 gui/options.cpp:1779 gui/options.cpp:1786
+#: gui/options.cpp:1794 gui/options.cpp:1989 gui/options.cpp:1992
+#: gui/options.cpp:1999 gui/options.cpp:2009
msgctxt "path"
msgid "None"
msgstr "Keiner"
#: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404
-#: gui/editgamedialog.cpp:522 gui/options.cpp:1701 gui/options.cpp:1771
-#: gui/options.cpp:1999 backends/platform/wii/options.cpp:56
+#: gui/editgamedialog.cpp:522 gui/options.cpp:1697 gui/options.cpp:1767
+#: gui/options.cpp:1995 backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Standard"
-#: gui/editgamedialog.cpp:450 gui/options.cpp:2007
+#: gui/editgamedialog.cpp:450 gui/options.cpp:2003
msgid "Select SoundFont"
msgstr "SoundFont auswфhlen"
@@ -412,7 +412,7 @@ msgstr "SoundFont auswфhlen"
msgid "Select additional game directory"
msgstr "Verzeichnis mit zusфtzlichen Dateien auswфhlen"
-#: gui/editgamedialog.cpp:502 gui/options.cpp:1930
+#: gui/editgamedialog.cpp:502 gui/options.cpp:1926
msgid "Select directory for saved games"
msgstr "Verzeichnis fќr Spielstфnde auswфhlen"
@@ -505,7 +505,7 @@ msgstr "Sinus"
msgid "Triangle"
msgstr "Dreieck"
-#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1535
+#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1531
msgid "Misc"
msgstr "Sonstiges"
@@ -686,7 +686,7 @@ msgid "Search:"
msgstr "Suchen:"
#: gui/launcher.cpp:200 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:517
+#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:533
#: engines/pegasus/pegasus.cpp:355 engines/tsage/scenes.cpp:601
#: engines/wage/saveload.cpp:748
msgid "Load game:"
@@ -696,7 +696,7 @@ msgstr "Spiel laden:"
#: backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:105
-#: engines/mohawk/riven.cpp:517 engines/parallaction/saveload.cpp:194
+#: engines/mohawk/riven.cpp:533 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
msgid "Load"
@@ -808,214 +808,214 @@ msgstr "alle 15 Minuten"
msgid "every 30 mins"
msgstr "alle 30 Minuten"
-#: gui/options.cpp:343 gui/options.cpp:640 gui/options.cpp:778
-#: gui/options.cpp:853 gui/options.cpp:1114
+#: gui/options.cpp:339 gui/options.cpp:636 gui/options.cpp:774
+#: gui/options.cpp:849 gui/options.cpp:1110
msgctxt "soundfont"
msgid "None"
msgstr "Kein SoundFont"
-#: gui/options.cpp:514
+#: gui/options.cpp:510
msgid "Failed to apply some of the graphic options changes:"
msgstr "Folgende Grafikoptionen konnten nicht geфndert werden:"
-#: gui/options.cpp:526
+#: gui/options.cpp:522
msgid "the video mode could not be changed."
msgstr "Grafikmodus konnte nicht geфndert werden."
-#: gui/options.cpp:532
+#: gui/options.cpp:528
msgid "the aspect ratio setting could not be changed"
msgstr "Die Einstellung fќr das Seitenverhфltnis konnte nicht geфndert werden"
-#: gui/options.cpp:538
+#: gui/options.cpp:534
msgid "the fullscreen setting could not be changed"
msgstr "Vollbildeinstellung konnte nicht geфndert werden"
-#: gui/options.cpp:544
+#: gui/options.cpp:540
msgid "the filtering setting could not be changed"
msgstr "Die Filtereinstellung konnte nicht geфndert werden"
-#: gui/options.cpp:932
+#: gui/options.cpp:928
msgid "Show On-screen control"
msgstr "Virtuelle Bedienelemente anzeigen"
-#: gui/options.cpp:936
+#: gui/options.cpp:932
msgid "Touchpad mouse mode"
msgstr "Touchpad-Mausmodus"
-#: gui/options.cpp:940
+#: gui/options.cpp:936
msgid "Swap Menu and Back buttons"
msgstr "Menќ- und Zurќck-Tasten vertauschen"
-#: gui/options.cpp:945
+#: gui/options.cpp:941
msgid "Pointer Speed:"
msgstr "Zeiger-Geschw.:"
-#: gui/options.cpp:945 gui/options.cpp:947 gui/options.cpp:948
+#: gui/options.cpp:941 gui/options.cpp:943 gui/options.cpp:944
msgid "Speed for keyboard/joystick mouse pointer control"
msgstr "Zeiger-Geschwindigkeit der Tastatur-/Joystick-Maus"
-#: gui/options.cpp:947
+#: gui/options.cpp:943
msgctxt "lowres"
msgid "Pointer Speed:"
msgstr "Zeiger-Geschw.:"
-#: gui/options.cpp:958
+#: gui/options.cpp:954
msgid "Joy Deadzone:"
msgstr "Joystick-Totzone:"
-#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
+#: gui/options.cpp:954 gui/options.cpp:956 gui/options.cpp:957
msgid "Analog joystick Deadzone"
msgstr "Totzone des analogen Joysticks"
-#: gui/options.cpp:960
+#: gui/options.cpp:956
msgctxt "lowres"
msgid "Joy Deadzone:"
msgstr "Joystick-Totzone:"
-#: gui/options.cpp:974
+#: gui/options.cpp:970
msgid "HW Shader:"
msgstr "HW-Shader:"
-#: gui/options.cpp:974 gui/options.cpp:976
+#: gui/options.cpp:970 gui/options.cpp:972
msgid "Different hardware shaders give different visual effects"
msgstr ""
"Verschiedene Hardware-Shader erzeugen unterschiedliche visuelle Effekte"
-#: gui/options.cpp:976
+#: gui/options.cpp:972
msgctxt "lowres"
msgid "HW Shader:"
msgstr "HW-Shader:"
-#: gui/options.cpp:977
+#: gui/options.cpp:973
msgid "Different shaders give different visual effects"
msgstr "Verschiedene Shader erzeugen verschiedene Grafikeffekte"
-#: gui/options.cpp:994
+#: gui/options.cpp:990
msgid "Graphics mode:"
msgstr "Grafikmodus:"
-#: gui/options.cpp:1008
+#: gui/options.cpp:1004
msgid "Render mode:"
msgstr "Render-Modus:"
-#: gui/options.cpp:1008 gui/options.cpp:1009
+#: gui/options.cpp:1004 gui/options.cpp:1005
msgid "Special dithering modes supported by some games"
msgstr "Spezielle Farbmischungsmethoden werden von manchen Spielen unterstќtzt"
-#: gui/options.cpp:1020 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
+#: gui/options.cpp:1016 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2590
msgid "Fullscreen mode"
msgstr "Vollbildmodus"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Filter graphics"
msgstr "Bilineare Filterung"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Use linear filtering when scaling graphics"
msgstr "Verwende bilineare Filterung zur Grafik-Skalierung"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Aspect ratio correction"
msgstr "Seitenverhфltnis korrigieren"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Correct aspect ratio for 320x200 games"
msgstr "Seitenverhфltnis fќr Spiele mit der Auflіsung 320x200 korrigieren"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Preferred Device:"
msgstr "Bevorzugtes Gerфt:"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Music Device:"
msgstr "Musikgerфt:"
-#: gui/options.cpp:1034 gui/options.cpp:1036
+#: gui/options.cpp:1030 gui/options.cpp:1032
msgid "Specifies preferred sound device or sound card emulator"
msgstr ""
"Legt das bevorzugte Tonwiedergabe-Gerфt oder den Soundkarten-Emulator fest"
-#: gui/options.cpp:1034 gui/options.cpp:1036 gui/options.cpp:1037
+#: gui/options.cpp:1030 gui/options.cpp:1032 gui/options.cpp:1033
msgid "Specifies output sound device or sound card emulator"
msgstr "Legt das Musikwiedergabe-Gerфt oder den Soundkarten-Emulator fest"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Standard-Gerфt:"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Music Device:"
msgstr "Musikgerфt:"
-#: gui/options.cpp:1063
+#: gui/options.cpp:1059
msgid "AdLib emulator:"
msgstr "AdLib-Emulator:"
-#: gui/options.cpp:1063 gui/options.cpp:1064
+#: gui/options.cpp:1059 gui/options.cpp:1060
msgid "AdLib is used for music in many games"
msgstr "AdLib wird fќr die Musik in vielen Spielen verwendet"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "GM Device:"
msgstr "GM-Gerфt:"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "Specifies default sound device for General MIDI output"
msgstr ""
"Legt das standardmфпige Musikwiedergabe-Gerфt fќr General-MIDI-Ausgabe fest"
-#: gui/options.cpp:1088
+#: gui/options.cpp:1084
msgid "Don't use General MIDI music"
msgstr "Keine General-MIDI-Musik"
-#: gui/options.cpp:1099 gui/options.cpp:1161
+#: gui/options.cpp:1095 gui/options.cpp:1157
msgid "Use first available device"
msgstr "Erstes verfќgbares Gerфt"
-#: gui/options.cpp:1111
+#: gui/options.cpp:1107
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1111 gui/options.cpp:1113 gui/options.cpp:1114
+#: gui/options.cpp:1107 gui/options.cpp:1109 gui/options.cpp:1110
msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity"
msgstr ""
"SoundFont wird von einigen Soundkarten, FluidSynth und Timidity unterstќtzt"
-#: gui/options.cpp:1113
+#: gui/options.cpp:1109
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Mixed AdLib/MIDI mode"
msgstr "Gemischter AdLib/MIDI-Modus"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Use both MIDI and AdLib sound generation"
msgstr "Kombiniert MIDI-Musik mit AdLib-Soundeffekten"
-#: gui/options.cpp:1122
+#: gui/options.cpp:1118
msgid "MIDI gain:"
msgstr "MIDI-Lautstфrke:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "MT-32 Device:"
msgstr "MT-32-Gerфt:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
"Legt das standardmфпige Tonwiedergabe-Gerфt fќr die Ausgabe von Roland MT-32/"
"LAPC1/CM32l/CM64 fest"
-#: gui/options.cpp:1137
+#: gui/options.cpp:1133
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Echte Roland MT-32 (GM-Emulation deaktiviert)"
-#: gui/options.cpp:1137 gui/options.cpp:1139
+#: gui/options.cpp:1133 gui/options.cpp:1135
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -1023,16 +1023,16 @@ msgstr ""
"Wфhlen Sie dies aus, wenn Sie ein echtes Roland-kompatibles Soundgerфt "
"verwenden"
-#: gui/options.cpp:1139
+#: gui/options.cpp:1135
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Echte Roland MT-32 (keine GM-Emulation)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid "Roland GS Device (enable MT-32 mappings)"
msgstr "Roland-GS-Gerфt (MT-32-Zuweisungen aktivieren)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid ""
"Check if you want to enable patch mappings to emulate an MT-32 on a Roland "
"GS device"
@@ -1040,278 +1040,278 @@ msgstr ""
"Auswфhlen, wenn Sie ausbessernde Instrumentzuweisungen aktivieren mіchten, "
"um MT-32 auf einem Roland-GS-Gerфt zu emulieren"
-#: gui/options.cpp:1151
+#: gui/options.cpp:1147
msgid "Don't use Roland MT-32 music"
msgstr "Keine Roland-MT-32-Musik"
-#: gui/options.cpp:1178
+#: gui/options.cpp:1174
msgid "Text and Speech:"
msgstr "Sprache und Text:"
-#: gui/options.cpp:1182 gui/options.cpp:1192
+#: gui/options.cpp:1178 gui/options.cpp:1188
msgid "Speech"
msgstr "Sprache"
-#: gui/options.cpp:1183 gui/options.cpp:1193
+#: gui/options.cpp:1179 gui/options.cpp:1189
msgid "Subtitles"
msgstr "Untertitel"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1180
msgid "Both"
msgstr "Beides"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1182
msgid "Subtitle speed:"
msgstr "Untertitel-Tempo:"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1184
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Text u. Sprache:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1188
msgid "Spch"
msgstr "Spr."
-#: gui/options.cpp:1193
+#: gui/options.cpp:1189
msgid "Subs"
msgstr "Text"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgctxt "lowres"
msgid "Both"
msgstr "S+T"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgid "Show subtitles and play speech"
msgstr "Untertitel anzeigen und Sprachausgabe aktivieren"
-#: gui/options.cpp:1196
+#: gui/options.cpp:1192
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Text-Tempo:"
-#: gui/options.cpp:1212
+#: gui/options.cpp:1208
msgid "Music volume:"
msgstr "Musiklautstфrke:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1210
msgctxt "lowres"
msgid "Music volume:"
msgstr "Musiklautstфrke:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1217
msgid "Mute All"
msgstr "Stumm"
-#: gui/options.cpp:1224
+#: gui/options.cpp:1220
msgid "SFX volume:"
msgstr "Effektlautstфrke:"
-#: gui/options.cpp:1224 gui/options.cpp:1226 gui/options.cpp:1227
+#: gui/options.cpp:1220 gui/options.cpp:1222 gui/options.cpp:1223
msgid "Special sound effects volume"
msgstr "Lautstфrke spezieller Gerфusch-Effekte"
-#: gui/options.cpp:1226
+#: gui/options.cpp:1222
msgctxt "lowres"
msgid "SFX volume:"
msgstr "Effektlautst.:"
-#: gui/options.cpp:1234
+#: gui/options.cpp:1230
msgid "Speech volume:"
msgstr "Sprachlautstфrke:"
-#: gui/options.cpp:1236
+#: gui/options.cpp:1232
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Sprachlautst.:"
-#: gui/options.cpp:1438
+#: gui/options.cpp:1434
msgid "Shader"
msgstr "Shader"
-#: gui/options.cpp:1450
+#: gui/options.cpp:1446
msgid "Control"
msgstr "Steuerung"
-#: gui/options.cpp:1476
+#: gui/options.cpp:1472
msgid "FluidSynth Settings"
msgstr "FluidSynth-Einstellungen"
-#: gui/options.cpp:1507
+#: gui/options.cpp:1503
msgid "Theme Path:"
msgstr "Themen:"
-#: gui/options.cpp:1509
+#: gui/options.cpp:1505
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Themen:"
-#: gui/options.cpp:1515 gui/options.cpp:1517 gui/options.cpp:1518
+#: gui/options.cpp:1511 gui/options.cpp:1513 gui/options.cpp:1514
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr ""
"Legt das Verzeichnis fќr zusфtzliche Spieldateien fќr alle Spiele in ScummVM "
"fest"
-#: gui/options.cpp:1524
+#: gui/options.cpp:1520
msgid "Plugins Path:"
msgstr "Plugins:"
-#: gui/options.cpp:1526
+#: gui/options.cpp:1522
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Plugins:"
-#: gui/options.cpp:1537
+#: gui/options.cpp:1533
msgctxt "lowres"
msgid "Misc"
msgstr "Andere"
-#: gui/options.cpp:1539
+#: gui/options.cpp:1535
msgid "Theme:"
msgstr "Thema:"
-#: gui/options.cpp:1543
+#: gui/options.cpp:1539
msgid "GUI Renderer:"
msgstr "GUI-Renderer:"
-#: gui/options.cpp:1555
+#: gui/options.cpp:1551
msgid "Autosave:"
msgstr "Autom. Speichern:"
-#: gui/options.cpp:1557
+#: gui/options.cpp:1553
msgctxt "lowres"
msgid "Autosave:"
msgstr "Autospeichern:"
-#: gui/options.cpp:1565
+#: gui/options.cpp:1561
msgid "Keys"
msgstr "Tasten"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "GUI Language:"
msgstr "Sprache:"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "Language of ScummVM GUI"
msgstr "Sprache der ScummVM-Oberflфche"
-#: gui/options.cpp:1600 gui/updates-dialog.cpp:86
+#: gui/options.cpp:1596 gui/updates-dialog.cpp:86
msgid "Update check:"
msgstr "Updates suchen:"
-#: gui/options.cpp:1600
+#: gui/options.cpp:1596
msgid "How often to check ScummVM updates"
msgstr "Wie oft nach Aktualisierungen von ScummVM suchen?"
-#: gui/options.cpp:1612
+#: gui/options.cpp:1608
msgid "Check now"
msgstr "Jetzt prќfen"
-#: gui/options.cpp:1620
+#: gui/options.cpp:1616
msgid "Cloud"
msgstr "Cloud"
-#: gui/options.cpp:1622
+#: gui/options.cpp:1618
msgctxt "lowres"
msgid "Cloud"
msgstr "Cloud"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Storage:"
msgstr "Cloud-Speicher:"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Active cloud storage"
msgstr "Aktiver Cloud-Speicher"
-#: gui/options.cpp:1634 gui/options.cpp:2210
+#: gui/options.cpp:1630 gui/options.cpp:2206
msgid "<none>"
msgstr "<keiner>"
-#: gui/options.cpp:1638 backends/platform/wii/options.cpp:114
+#: gui/options.cpp:1634 backends/platform/wii/options.cpp:114
msgid "Username:"
msgstr "Benutzername:"
-#: gui/options.cpp:1638
+#: gui/options.cpp:1634
msgid "Username used by this storage"
msgstr "Benutzername, der von diesem Cloud-Speicher verwendet wird"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Used space:"
msgstr "Belegter Speicher:"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Space used by ScummVM's saved games on this storage"
msgstr ""
"Von ScummVM-Spielstфnden beleger Speicherplatz auf diesem Cloud-Speicher"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "Last sync time:"
msgstr "Letzte Sync.:"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "When the last saved games sync for this storage occured"
msgstr "Zeitpunkt der letzten Spielstand-Synchronisierung"
-#: gui/options.cpp:1647 gui/storagewizarddialog.cpp:71
+#: gui/options.cpp:1643 gui/storagewizarddialog.cpp:71
msgid "Connect"
msgstr "Verbinden"
-#: gui/options.cpp:1647
+#: gui/options.cpp:1643
msgid "Open wizard dialog to connect your cloud storage account"
msgstr ""
"жffnet den Assistenten, der Sie durch die Einrichtung Ihres Cloud-Speichers "
"fќhrt"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh"
msgstr "Aktualisieren"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh current cloud storage information (username and usage)"
msgstr ""
"Aktualisiert die Informationen ќber diesen Cloud-Speicher (Benutzername und "
"Belegung)"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Download"
msgstr "Herunterladen"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Open downloads manager dialog"
msgstr "жffnet den Download-Manager"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run server"
msgstr "Server starten"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run local webserver"
msgstr "Startet den lokalen Webserver"
-#: gui/options.cpp:1652 gui/options.cpp:2320
+#: gui/options.cpp:1648 gui/options.cpp:2316
msgid "Not running"
msgstr "Nicht gestartet"
-#: gui/options.cpp:1656
+#: gui/options.cpp:1652
msgid "/root/ Path:"
msgstr "/root/-Pfad:"
-#: gui/options.cpp:1656 gui/options.cpp:1658 gui/options.cpp:1659
+#: gui/options.cpp:1652 gui/options.cpp:1654 gui/options.cpp:1655
msgid "Specifies which directory the Files Manager can access"
msgstr "Legt fest, auf welches Verzeichnis der Dateimanager zugreifen darf"
-#: gui/options.cpp:1658
+#: gui/options.cpp:1654
msgctxt "lowres"
msgid "/root/ Path:"
msgstr "/root/-Pfad:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid "Server's port:"
msgstr "Server-Port:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid ""
"Which port is used by the server\n"
"Auth with server is not available with non-default port"
@@ -1320,27 +1320,27 @@ msgstr ""
"Authentifizierung mit dem Server ist nicht verfќgbar, wenn ein anderer Port "
"verwendet wird"
-#: gui/options.cpp:1681
+#: gui/options.cpp:1677
msgid "Apply"
msgstr "мbernehmen"
-#: gui/options.cpp:1824
+#: gui/options.cpp:1820
msgid "Failed to change cloud storage!"
msgstr "Konnte den Cloud-Speicher nicht фndern!"
-#: gui/options.cpp:1827
+#: gui/options.cpp:1823
msgid "Another cloud storage is already active."
msgstr "Ein anderer Cloud-Speicher arbeitet gerade."
-#: gui/options.cpp:1895
+#: gui/options.cpp:1891
msgid "Theme does not support selected language!"
msgstr "Das Theme unterstќtzt die gewфhlte Sprache nicht!"
-#: gui/options.cpp:1898
+#: gui/options.cpp:1894
msgid "Theme cannot be loaded!"
msgstr "Theme konnte nicht geladen werden!"
-#: gui/options.cpp:1901
+#: gui/options.cpp:1897
msgid ""
"\n"
"Misc settings will be restored."
@@ -1348,51 +1348,51 @@ msgstr ""
"\n"
"Verschiedene Einstellungen werden wiederhergestellt."
-#: gui/options.cpp:1937
+#: gui/options.cpp:1933
msgid "The chosen directory cannot be written to. Please select another one."
msgstr ""
"In das gewфhlte Verzeichnis kann nicht geschrieben werden. Bitte ein anderes "
"auswфhlen."
-#: gui/options.cpp:1946
+#: gui/options.cpp:1942
msgid "Select directory for GUI themes"
msgstr "Verzeichnis fќr Oberflфchen-Themen"
-#: gui/options.cpp:1956
+#: gui/options.cpp:1952
msgid "Select directory for extra files"
msgstr "Verzeichnis fќr zusфtzliche Dateien auswфhlen"
-#: gui/options.cpp:1967
+#: gui/options.cpp:1963
msgid "Select directory for plugins"
msgstr "Verzeichnis fќr Erweiterungen auswфhlen"
-#: gui/options.cpp:1979
+#: gui/options.cpp:1975
msgid "Select directory for Files Manager /root/"
msgstr ""
"Wфhlen Sie das Verzeichnis aus, welches als Stammverzeichnis ('root') dient"
-#: gui/options.cpp:2217
+#: gui/options.cpp:2213
#, c-format
msgid "%llu bytes"
msgstr "%llu Bytes"
-#: gui/options.cpp:2225
+#: gui/options.cpp:2221
msgid "<right now>"
msgstr "<gerade eben>"
-#: gui/options.cpp:2227
+#: gui/options.cpp:2223
msgid "<never>"
msgstr "<nie>"
-#: gui/options.cpp:2311
+#: gui/options.cpp:2307
msgid "Stop server"
msgstr "Server anhalten"
-#: gui/options.cpp:2312
+#: gui/options.cpp:2308
msgid "Stop local webserver"
msgstr "Lokalen Webserver anhalten"
-#: gui/options.cpp:2403
+#: gui/options.cpp:2399
msgid ""
"Request failed.\n"
"Check your Internet connection."
@@ -1867,8 +1867,8 @@ msgstr "Zur Spiele~l~iste"
#: 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:106
-#: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:658
+#: engines/mohawk/riven.cpp:545 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
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
#: engines/toon/toon.cpp:3340 engines/tsage/scenes.cpp:599
@@ -1887,9 +1887,9 @@ msgstr "Speichern:"
#: engines/dm/loadsave.cpp:196 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:106 engines/neverhood/menumodule.cpp:880
-#: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:659
+#: engines/mohawk/dialogs.cpp:106 engines/mohawk/riven.cpp:545
+#: 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
#: engines/sherlock/scalpel/scalpel.cpp:1250
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
@@ -2206,7 +2206,7 @@ msgstr "Klicken deaktiviert"
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Berќhrungsbildschirm-Tipp-Modus - schweben (DPad-Klicks)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
msgid "Do you want to quit ?"
msgstr "Mіchten Sie beenden?"
@@ -3372,7 +3372,7 @@ msgstr ""
"Die Datei 'extras.mhk' fehlt. Sie kіnnen auch die Installationsdatei "
"'arcriven.z verwenden."
-#: engines/mohawk/riven.cpp:416
+#: engines/mohawk/riven.cpp:432
msgid "You are missing the following required Riven data files:\n"
msgstr "Ihnen fehlen die folgenden Spieldateien fќr Riven:\n"
diff --git a/po/el.po b/po/el.po
index 827beec194..eaa92772be 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: 2017-12-10 15:25+0100\n"
+"POT-Creation-Date: 2017-12-26 21:11+0100\n"
"PO-Revision-Date: 2017-04-28 11:12+0000\n"
"Last-Translator: Arius <alidop@pathfinder.gr>\n"
"Language-Team: Greek <https://translations.scummvm.org/projects/scummvm/"
@@ -57,7 +57,7 @@ msgstr "Ьхємтсѓч №мэљ"
#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editgamedialog.cpp:292
#: gui/editrecorddialog.cpp:67 gui/filebrowser-dialog.cpp:64
#: gui/fluidsynth-dialog.cpp:152 gui/KeysDialog.cpp:43 gui/massadd.cpp:95
-#: gui/options.cpp:1680 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
+#: gui/options.cpp:1676 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
#: gui/recorderdialog.cpp:155 gui/remotebrowser.cpp:59
#: gui/saveload-dialog.cpp:383 gui/saveload-dialog.cpp:445
#: gui/saveload-dialog.cpp:727 gui/saveload-dialog.cpp:1121
@@ -117,7 +117,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -130,7 +130,7 @@ msgstr "Эсщ"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -153,7 +153,7 @@ msgstr ""
#: gui/downloaddialog.cpp:146 gui/editgamedialog.cpp:293
#: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:526
-#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1682
+#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1678
#: gui/saveload-dialog.cpp:1122 engines/engine.cpp:443 engines/engine.cpp:454
#: backends/platform/wii/options.cpp:47
#: backends/platform/wince/CELauncherDialog.cpp:54
@@ -240,8 +240,8 @@ msgstr ""
"Уыўѓѓс єяѕ №сщїэщфщя§. Сѕєќ фх шс ьхєсєёнјхщ єчэ Щѓ№сэщъо нъфяѓч єяѕ "
"№сщїэщфщя§ ѓсђ ѓх Сууыщъо"
-#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:997
-#: gui/options.cpp:1010 gui/options.cpp:1575 audio/null.cpp:41
+#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:993
+#: gui/options.cpp:1006 gui/options.cpp:1571 audio/null.cpp:41
msgid "<default>"
msgstr "<№ёяъсшяёщѓьнэч>"
@@ -263,11 +263,11 @@ msgstr "аысєіќёьс:"
msgid "Engine"
msgstr "Ьчїсэо"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "Graphics"
msgstr "Уёсіщъм"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "GFX"
msgstr "Уёсі."
@@ -280,7 +280,7 @@ msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "асёмъсьјч ёѕшь, уёсіщъўэ"
-#: gui/editgamedialog.cpp:196 gui/options.cpp:1457
+#: gui/editgamedialog.cpp:196 gui/options.cpp:1453
msgid "Audio"
msgstr "Йїяђ"
@@ -293,11 +293,11 @@ msgctxt "lowres"
msgid "Override global audio settings"
msgstr "асёмъсьјч ёѕшь. оїяѕ"
-#: gui/editgamedialog.cpp:210 gui/options.cpp:1462
+#: gui/editgamedialog.cpp:210 gui/options.cpp:1458
msgid "Volume"
msgstr "Иэєсѓч"
-#: gui/editgamedialog.cpp:212 gui/options.cpp:1464
+#: gui/editgamedialog.cpp:212 gui/options.cpp:1460
msgctxt "lowres"
msgid "Volume"
msgstr "Иэєсѓч"
@@ -311,7 +311,7 @@ msgctxt "lowres"
msgid "Override global volume settings"
msgstr "асёмъсьјч ёѕшь. нэєсѓчђ"
-#: gui/editgamedialog.cpp:226 gui/options.cpp:1472
+#: gui/editgamedialog.cpp:226 gui/options.cpp:1468
msgid "MIDI"
msgstr "MIDI"
@@ -324,7 +324,7 @@ msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "асёмъсьјч ёѕшь. MIDI"
-#: gui/editgamedialog.cpp:241 gui/options.cpp:1482
+#: gui/editgamedialog.cpp:241 gui/options.cpp:1478
msgid "MT-32"
msgstr "MT-32"
@@ -337,11 +337,11 @@ msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "асёмъсьјч ёѕшь. MT-32"
-#: gui/editgamedialog.cpp:255 gui/options.cpp:1489
+#: gui/editgamedialog.cpp:255 gui/options.cpp:1485
msgid "Paths"
msgstr "жмъхыящ"
-#: gui/editgamedialog.cpp:257 gui/options.cpp:1491
+#: gui/editgamedialog.cpp:257 gui/options.cpp:1487
msgctxt "lowres"
msgid "Paths"
msgstr "жмъхыящ"
@@ -355,7 +355,7 @@ msgctxt "lowres"
msgid "Game Path:"
msgstr "жмъхыяђ асщїэщфщя§:"
-#: gui/editgamedialog.cpp:271 gui/options.cpp:1515
+#: gui/editgamedialog.cpp:271 gui/options.cpp:1511
msgid "Extra Path:"
msgstr "жмъхыяђ Июєёс:"
@@ -365,44 +365,44 @@ msgid "Specifies path to additional data used by the game"
msgstr ""
"Ъсшяёпцхщ фщсфёяьо ущс №ёќѓшхєс фхфяьнэс №яѕ їёчѓщья№ящя§эєсщ с№ќ єя №сщїэпфщ"
-#: gui/editgamedialog.cpp:273 gui/options.cpp:1517
+#: gui/editgamedialog.cpp:273 gui/options.cpp:1513
msgctxt "lowres"
msgid "Extra Path:"
msgstr "жмъхыяђ Июєёс:"
-#: gui/editgamedialog.cpp:280 gui/options.cpp:1499
+#: gui/editgamedialog.cpp:280 gui/options.cpp:1495
msgid "Save Path:"
msgstr "жмъхыяђ С№яшоъхѕѓчђ:"
#: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282
-#: gui/editgamedialog.cpp:283 gui/options.cpp:1499 gui/options.cpp:1501
-#: gui/options.cpp:1502
+#: gui/editgamedialog.cpp:283 gui/options.cpp:1495 gui/options.cpp:1497
+#: gui/options.cpp:1498
msgid "Specifies where your saved games are put"
msgstr "Ъсшяёпцхщ єчэ єя№яшхѓпс єљэ с№яшчъхѕьнэљэ №сщїэщфщўэ ѓсђ"
-#: gui/editgamedialog.cpp:282 gui/options.cpp:1501
+#: gui/editgamedialog.cpp:282 gui/options.cpp:1497
msgctxt "lowres"
msgid "Save Path:"
msgstr "жмъхыяђ С№яш.:"
#: gui/editgamedialog.cpp:301 gui/editgamedialog.cpp:398
-#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1510
-#: gui/options.cpp:1518 gui/options.cpp:1527 gui/options.cpp:1707
-#: gui/options.cpp:1713 gui/options.cpp:1721 gui/options.cpp:1744
-#: gui/options.cpp:1777 gui/options.cpp:1783 gui/options.cpp:1790
-#: gui/options.cpp:1798 gui/options.cpp:1993 gui/options.cpp:1996
-#: gui/options.cpp:2003 gui/options.cpp:2013
+#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1506
+#: gui/options.cpp:1514 gui/options.cpp:1523 gui/options.cpp:1703
+#: gui/options.cpp:1709 gui/options.cpp:1717 gui/options.cpp:1740
+#: gui/options.cpp:1773 gui/options.cpp:1779 gui/options.cpp:1786
+#: gui/options.cpp:1794 gui/options.cpp:1989 gui/options.cpp:1992
+#: gui/options.cpp:1999 gui/options.cpp:2009
msgctxt "path"
msgid "None"
msgstr "Ъсэнэс"
#: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404
-#: gui/editgamedialog.cpp:522 gui/options.cpp:1701 gui/options.cpp:1771
-#: gui/options.cpp:1999 backends/platform/wii/options.cpp:56
+#: gui/editgamedialog.cpp:522 gui/options.cpp:1697 gui/options.cpp:1767
+#: gui/options.cpp:1995 backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "аёяъсшяёщѓьнэя"
-#: gui/editgamedialog.cpp:450 gui/options.cpp:2007
+#: gui/editgamedialog.cpp:450 gui/options.cpp:2003
msgid "Select SoundFont"
msgstr "Х№щынюєх SoundFont"
@@ -410,7 +410,7 @@ msgstr "Х№щынюєх SoundFont"
msgid "Select additional game directory"
msgstr "Х№щынюєх №ёќѓшхєя імъхыя №сщїэщфщя§"
-#: gui/editgamedialog.cpp:502 gui/options.cpp:1930
+#: gui/editgamedialog.cpp:502 gui/options.cpp:1926
msgid "Select directory for saved games"
msgstr "Х№щынюєх імъхыя ущс с№яшчъхѕьнэс №сщїэпфщс"
@@ -505,7 +505,7 @@ msgstr "Чьпєяэя"
msgid "Triangle"
msgstr "дёпуљэя"
-#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1535
+#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1531
msgid "Misc"
msgstr "Фщміяёс"
@@ -687,7 +687,7 @@ msgid "Search:"
msgstr "Сэсцоєчѓч:"
#: gui/launcher.cpp:200 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:517
+#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:533
#: engines/pegasus/pegasus.cpp:355 engines/tsage/scenes.cpp:601
#: engines/wage/saveload.cpp:748
msgid "Load game:"
@@ -697,7 +697,7 @@ msgstr "жќёєљѓч №сщїэщфщя§:"
#: backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:105
-#: engines/mohawk/riven.cpp:517 engines/parallaction/saveload.cpp:194
+#: engines/mohawk/riven.cpp:533 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
msgid "Load"
@@ -815,213 +815,213 @@ msgstr "ъмшх 15 ых№єм"
msgid "every 30 mins"
msgstr "ъмшх 30 ых№єм"
-#: gui/options.cpp:343 gui/options.cpp:640 gui/options.cpp:778
-#: gui/options.cpp:853 gui/options.cpp:1114
+#: gui/options.cpp:339 gui/options.cpp:636 gui/options.cpp:774
+#: gui/options.cpp:849 gui/options.cpp:1110
msgctxt "soundfont"
msgid "None"
msgstr "Ъсэнэс"
-#: gui/options.cpp:514
+#: gui/options.cpp:510
msgid "Failed to apply some of the graphic options changes:"
msgstr "Фхэ оєсэ фѕэсєо ч хісёьяуо яёщѓьнэљэ сыысуўэ ѓєщђ х№щыяунђ уёсіщъўэ:"
-#: gui/options.cpp:526
+#: gui/options.cpp:522
msgid "the video mode could not be changed."
msgstr "фхэ оєсэ фѕэсєо ч сыысуо єчђ ыхщєяѕёупсђ тпэєхя."
-#: gui/options.cpp:532
+#: gui/options.cpp:528
msgid "the aspect ratio setting could not be changed"
msgstr "фхэ оєсэ фѕэсєо ч сыысуо єчђ фщќёшљѓчђ сэсыяупсђ фщсѓємѓхљэ"
-#: gui/options.cpp:538
+#: gui/options.cpp:534
msgid "the fullscreen setting could not be changed"
msgstr "фхэ оєсэ фѕэсєо ч сыысуо єчђ ё§шьщѓчђ №ыоёяѕђ яшќэчђ"
-#: gui/options.cpp:544
+#: gui/options.cpp:540
msgid "the filtering setting could not be changed"
msgstr "фхэ оєсэ фѕэсєо ч сыысуо єчђ ё§шьщѓчђ іщыєёсёпѓьсєяђ"
-#: gui/options.cpp:932
+#: gui/options.cpp:928
msgid "Show On-screen control"
msgstr "Хьімэщѓч єљэ ѓєящїхпљэ їхщёщѓья§ ѓєчэ яшќэч"
-#: gui/options.cpp:936
+#: gui/options.cpp:932
msgid "Touchpad mouse mode"
msgstr "Touchpad ѓх ыхщєяѕёупс №яэєщъщя§"
-#: gui/options.cpp:940
+#: gui/options.cpp:936
msgid "Swap Menu and Back buttons"
msgstr "Хэсыысуо єљэ ъяѕь№щўэ Ьхэя§ ъсщ апѓљ"
-#: gui/options.cpp:945
+#: gui/options.cpp:941
msgid "Pointer Speed:"
msgstr "дсї§єчєс фхпъєч:"
-#: gui/options.cpp:945 gui/options.cpp:947 gui/options.cpp:948
+#: gui/options.cpp:941 gui/options.cpp:943 gui/options.cpp:944
msgid "Speed for keyboard/joystick mouse pointer control"
msgstr "дсї§єчєс їхщёщѓья§ єяѕ фхпъєч №яэєщъщя§ ьх №ычъєёяыќущя/їхщёщѓєоёщя"
-#: gui/options.cpp:947
+#: gui/options.cpp:943
msgctxt "lowres"
msgid "Pointer Speed:"
msgstr "дсї§єчєс фхпъєч:"
-#: gui/options.cpp:958
+#: gui/options.cpp:954
msgid "Joy Deadzone:"
msgstr "ахёщяїо сфёмэхщсђ їхщёщѓєоёщяѕ:"
-#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
+#: gui/options.cpp:954 gui/options.cpp:956 gui/options.cpp:957
msgid "Analog joystick Deadzone"
msgstr "ахёщяїо сфёмэхщсђ сэсыяущъя§ їхщёщѓєоёщяѕ"
-#: gui/options.cpp:960
+#: gui/options.cpp:956
msgctxt "lowres"
msgid "Joy Deadzone:"
msgstr "ахёщяїо сфёмэхщсђ їхщёщѓєоёщяѕ:"
-#: gui/options.cpp:974
+#: gui/options.cpp:970
msgid "HW Shader:"
msgstr ""
-#: gui/options.cpp:974 gui/options.cpp:976
+#: gui/options.cpp:970 gui/options.cpp:972
msgid "Different hardware shaders give different visual effects"
msgstr ""
-#: gui/options.cpp:976
+#: gui/options.cpp:972
msgctxt "lowres"
msgid "HW Shader:"
msgstr ""
-#: gui/options.cpp:977
+#: gui/options.cpp:973
msgid "Different shaders give different visual effects"
msgstr ""
-#: gui/options.cpp:994
+#: gui/options.cpp:990
msgid "Graphics mode:"
msgstr "Ыхщєяѕёупс уёсіщъўэ:"
-#: gui/options.cpp:1008
+#: gui/options.cpp:1004
msgid "Render mode:"
msgstr "Ыхщєяѕёупс с№ќфяѓчђ:"
-#: gui/options.cpp:1008 gui/options.cpp:1009
+#: gui/options.cpp:1004 gui/options.cpp:1005
msgid "Special dithering modes supported by some games"
msgstr ""
"Хщфщънђ ыхщєяѕёупхђ їёљьсєщъођ сэєщ№сёмшхѓчђ ящ я№япхђ ѕ№яѓєчёпцяэєсщ с№ќ "
"яёщѓьнэс №сщїэпфщс"
-#: gui/options.cpp:1020 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
+#: gui/options.cpp:1016 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2590
msgid "Fullscreen mode"
msgstr "Ыхщєяѕёупс №ыоёяѕђ яшќэчђ"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Filter graphics"
msgstr "жпыєёя уёсіщъўэ"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Use linear filtering when scaling graphics"
msgstr "зёоѓч уёсььщъя§ іщыєёсёпѓьсєяђ ущс єчэ ъыщьмъљѓч уёсіщъўэ"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Aspect ratio correction"
msgstr "Фщќёшљѓч сэсыяупсђ фщсѓємѓхљэ"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Correct aspect ratio for 320x200 games"
msgstr "Фщќёшљѓч сэсыяупсђ фщсѓємѓхљэ ущс №сщїэпфщс 320x200"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Preferred Device:"
msgstr "аёяєщьўьхэч ѓѕѓъхѕо:"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Music Device:"
msgstr "гѕѓъхѕо Ьяѕѓщъођ:"
-#: gui/options.cpp:1034 gui/options.cpp:1036
+#: gui/options.cpp:1030 gui/options.cpp:1032
msgid "Specifies preferred sound device or sound card emulator"
msgstr "Ъсшяёпцхщ єчэ №ёяєщьўьхэч ѓѕѓъхѕо хюќфяѕ оїяѕ о хюяьящљєо ъмёєсђ оїяѕ"
-#: gui/options.cpp:1034 gui/options.cpp:1036 gui/options.cpp:1037
+#: gui/options.cpp:1030 gui/options.cpp:1032 gui/options.cpp:1033
msgid "Specifies output sound device or sound card emulator"
msgstr "Ъсшяёпцхщ єч ѓѕѓъхѕо хюќфяѕ оїяѕ о хюяьящљєо ъмёєсђ оїяѕ"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "аёяєщь. гѕѓъ.:"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Music Device:"
msgstr "гѕѓъ. Ьяѕѓ.:"
-#: gui/options.cpp:1063
+#: gui/options.cpp:1059
msgid "AdLib emulator:"
msgstr "Хюяьящљєођ Adlib:"
-#: gui/options.cpp:1063 gui/options.cpp:1064
+#: gui/options.cpp:1059 gui/options.cpp:1060
msgid "AdLib is used for music in many games"
msgstr "Ч Adlib їёчѓщья№ящхпєсщ ущс ьяѕѓщъо ѓх №яыым №сщїэпфщс"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "GM Device:"
msgstr "гѕѓъхѕо GM:"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "Specifies default sound device for General MIDI output"
msgstr "Ъсшяёпцхщ №ёях№щыхуьнэч ѓѕѓъхѕо оїяѕ ущс єчэ нюяфя General MIDI"
-#: gui/options.cpp:1088
+#: gui/options.cpp:1084
msgid "Don't use General MIDI music"
msgstr "Ьч їёоѓч ьяѕѓщъођ General MIDI"
-#: gui/options.cpp:1099 gui/options.cpp:1161
+#: gui/options.cpp:1095 gui/options.cpp:1157
msgid "Use first available device"
msgstr "зёоѓч №ёўєчђ фщсшнѓщьчђ ѓѕѓъхѕођ"
-#: gui/options.cpp:1111
+#: gui/options.cpp:1107
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1111 gui/options.cpp:1113 gui/options.cpp:1114
+#: gui/options.cpp:1107 gui/options.cpp:1109 gui/options.cpp:1110
msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity"
msgstr ""
"дя SoundFont ѕ№яѓєчёпцхєсщ с№ќ ьхёщънђ ъмёєхђ оїяѕ, єя FluidSynth ъсщ єя "
"Timidity"
-#: gui/options.cpp:1113
+#: gui/options.cpp:1109
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Mixed AdLib/MIDI mode"
msgstr "Ьщъєо ыхщєяѕёупс Adlib/MIDI"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Use both MIDI and AdLib sound generation"
msgstr "зёоѓч MIDI ъсщ Adlib ущс фчьщяѕёупс оїяѕ"
-#: gui/options.cpp:1122
+#: gui/options.cpp:1118
msgid "MIDI gain:"
msgstr "С§ючѓч MIDI:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "MT-32 Device:"
msgstr "гѕѓъхѕо MT-32:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
"Ъсшяёпцхщ №ёях№щыхуьнэч ѓѕѓъхѕо оїяѕ ущс нюяфя Roland MT-32/LAPC1/CM32l/CM64"
-#: gui/options.cpp:1137
+#: gui/options.cpp:1133
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "аёсуьсєщъо Roland MT-32 (с№хэхёуя№япчѓч хюяьящљєо GM)"
-#: gui/options.cpp:1137 gui/options.cpp:1139
+#: gui/options.cpp:1133 gui/options.cpp:1135
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -1029,16 +1029,16 @@ msgstr ""
"Х№щынюєх сэ шныхєх эс їёчѓщья№ящоѓхєх ѓѕѓъхѕо оїяѕ ѓѕьтсєо ьх Roland, ч "
"я№япс хпэсщ ѓѕэфхфхьнэч ѓєяэ ѕ№яыяущѓєо ѓсђ"
-#: gui/options.cpp:1139
+#: gui/options.cpp:1135
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "аёсуьсєщъо Roland MT-32 (їљёпђ хюяьяпљѓч GM)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid "Roland GS Device (enable MT-32 mappings)"
msgstr "гѕѓъхѕо Roland GS (хэхёуя№япчѓч сэєщѓєящїпѓхљэ MT-32)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid ""
"Check if you want to enable patch mappings to emulate an MT-32 on a Roland "
"GS device"
@@ -1046,280 +1046,280 @@ msgstr ""
"Х№щынюєх сэ шныхєх эс хэхёуя№ящоѓхєх фщяёшљьнэхђ сэєщѓєящїпѓхщђ ущс эс "
"хюяьящўѓхєх ьщс MT-32 ѓх ѓѕѓъхѕо Roland GS"
-#: gui/options.cpp:1151
+#: gui/options.cpp:1147
msgid "Don't use Roland MT-32 music"
msgstr "Ьч їёоѓч ьяѕѓщъођ Roland MT-32"
-#: gui/options.cpp:1178
+#: gui/options.cpp:1174
msgid "Text and Speech:"
msgstr "Ъхпьхэя ъсщ Яьщыпс:"
-#: gui/options.cpp:1182 gui/options.cpp:1192
+#: gui/options.cpp:1178 gui/options.cpp:1188
msgid "Speech"
msgstr "Яьщыпс"
-#: gui/options.cpp:1183 gui/options.cpp:1193
+#: gui/options.cpp:1179 gui/options.cpp:1189
msgid "Subtitles"
msgstr "е№ќєщєыящ"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1180
msgid "Both"
msgstr "Ъсщ єс фѕя"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1182
msgid "Subtitle speed:"
msgstr "дсї§єчєс ѕ№яєпєыљэ:"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1184
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Ъхпьхэя ъсщ Яьщыпс:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1188
msgid "Spch"
msgstr "Яьщыпс"
-#: gui/options.cpp:1193
+#: gui/options.cpp:1189
msgid "Subs"
msgstr "е№ќє."
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgctxt "lowres"
msgid "Both"
msgstr "Ъсщ єс фѕя"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgid "Show subtitles and play speech"
msgstr "аёятяыо ѕ№яєпєыљэ ъсщ сэс№сёсуљуо іљэођ"
-#: gui/options.cpp:1196
+#: gui/options.cpp:1192
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "дсї§єчєс ѕ№ќє.:"
-#: gui/options.cpp:1212
+#: gui/options.cpp:1208
msgid "Music volume:"
msgstr "Иэєсѓч ьяѕѓщъођ:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1210
msgctxt "lowres"
msgid "Music volume:"
msgstr "Иэєсѓч ьяѕѓщъођ:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1217
msgid "Mute All"
msgstr "гпусѓч Мыљэ"
-#: gui/options.cpp:1224
+#: gui/options.cpp:1220
msgid "SFX volume:"
msgstr "Иэєсѓч хін:"
-#: gui/options.cpp:1224 gui/options.cpp:1226 gui/options.cpp:1227
+#: gui/options.cpp:1220 gui/options.cpp:1222 gui/options.cpp:1223
msgid "Special sound effects volume"
msgstr "Иэєсѓч хщфщъўэ съяѕѓєщъўэ хін"
-#: gui/options.cpp:1226
+#: gui/options.cpp:1222
msgctxt "lowres"
msgid "SFX volume:"
msgstr "Иэєсѓч хін:"
-#: gui/options.cpp:1234
+#: gui/options.cpp:1230
msgid "Speech volume:"
msgstr "Иэєсѓч яьщыпсђ:"
-#: gui/options.cpp:1236
+#: gui/options.cpp:1232
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Иэєсѓч яьщыпсђ:"
-#: gui/options.cpp:1438
+#: gui/options.cpp:1434
msgid "Shader"
msgstr ""
-#: gui/options.cpp:1450
+#: gui/options.cpp:1446
msgid "Control"
msgstr "зхщёщѓьќђ"
-#: gui/options.cpp:1476
+#: gui/options.cpp:1472
msgid "FluidSynth Settings"
msgstr "бѕшьпѓхщђ FluidSynth"
-#: gui/options.cpp:1507
+#: gui/options.cpp:1503
msgid "Theme Path:"
msgstr "жмъхыяђ Шньсєяђ:"
-#: gui/options.cpp:1509
+#: gui/options.cpp:1505
msgctxt "lowres"
msgid "Theme Path:"
msgstr "жмъхыяђ Шньсєяђ:"
-#: gui/options.cpp:1515 gui/options.cpp:1517 gui/options.cpp:1518
+#: gui/options.cpp:1511 gui/options.cpp:1513 gui/options.cpp:1514
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr ""
"Ъсшяёпцхщ єч фщсфёяьо ущс №ёќѓшхєс фхфяьнэс №яѕ їёчѓщья№ящя§эєсщ с№ќ ќыс єс "
"№сщїэпфщс о єя ScummVM"
-#: gui/options.cpp:1524
+#: gui/options.cpp:1520
msgid "Plugins Path:"
msgstr "Фщсфёяьо аёќѓшхєљэ:"
-#: gui/options.cpp:1526
+#: gui/options.cpp:1522
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Фщсфё. аёќѓш.:"
-#: gui/options.cpp:1537
+#: gui/options.cpp:1533
msgctxt "lowres"
msgid "Misc"
msgstr "Ыящ№м"
-#: gui/options.cpp:1539
+#: gui/options.cpp:1535
msgid "Theme:"
msgstr "Шньс:"
-#: gui/options.cpp:1543
+#: gui/options.cpp:1539
msgid "GUI Renderer:"
msgstr "С№хщъќэщѓч GUI:"
-#: gui/options.cpp:1555
+#: gui/options.cpp:1551
msgid "Autosave:"
msgstr "Сѕєќьсєч с№яшоъхѕѓч:"
-#: gui/options.cpp:1557
+#: gui/options.cpp:1553
msgctxt "lowres"
msgid "Autosave:"
msgstr "Сѕєќь. с№яш.:"
-#: gui/options.cpp:1565
+#: gui/options.cpp:1561
msgid "Keys"
msgstr "аыоъєёс"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "GUI Language:"
msgstr "Уыўѓѓс GUI:"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "Language of ScummVM GUI"
msgstr "Уыўѓѓс єяѕ ScummVM GUI"
-#: gui/options.cpp:1600 gui/updates-dialog.cpp:86
+#: gui/options.cpp:1596 gui/updates-dialog.cpp:86
msgid "Update check:"
msgstr "Иыхуїяђ сэстсшьпѓхљэ:"
-#: gui/options.cpp:1600
+#: gui/options.cpp:1596
msgid "How often to check ScummVM updates"
msgstr "гѕїэќєчєс хынуїяѕ хэчьхёўѓхљэ єяѕ ScummVM"
-#: gui/options.cpp:1612
+#: gui/options.cpp:1608
msgid "Check now"
msgstr "Хынуюєх єўёс"
-#: gui/options.cpp:1620
+#: gui/options.cpp:1616
msgid "Cloud"
msgstr "г§ээхія"
-#: gui/options.cpp:1622
+#: gui/options.cpp:1618
msgctxt "lowres"
msgid "Cloud"
msgstr "г§ээхія"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Storage:"
msgstr "С№яшоъхѕѓч:"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Active cloud storage"
msgstr "Хэхёуо с№яшоъхѕѓч ѓ§ээхіяѕ"
-#: gui/options.cpp:1634 gui/options.cpp:2210
+#: gui/options.cpp:1630 gui/options.cpp:2206
msgid "<none>"
msgstr "<ъсьпс>"
-#: gui/options.cpp:1638 backends/platform/wii/options.cpp:114
+#: gui/options.cpp:1634 backends/platform/wii/options.cpp:114
msgid "Username:"
msgstr "Мэяьс їёоѓєч:"
-#: gui/options.cpp:1638
+#: gui/options.cpp:1634
msgid "Username used by this storage"
msgstr "дя ќэяьс їёоѓєч №яѕ їёчѓщья№ящхпєсщ с№ќ сѕєо єчэ с№яшоъч"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Used space:"
msgstr "зёчѓщья№ящчьнэяђ їўёяђ:"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Space used by ScummVM's saved games on this storage"
msgstr ""
"зўёяђ №яѕ їёчѓщья№ящхпєсщ с№ќ єс с№яшчъхѕьнэс №сщїэпфщс єяѕ ScummVM ѓх сѕєо "
"єчэ с№яшоъч"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "Last sync time:"
msgstr "дхыхѕєспс ўёс ѓѕуїёяэщѓья§:"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "When the last saved games sync for this storage occured"
msgstr ""
"аќєх №ёсуьсєя№ящошчъх я єхыхѕєспяђ ѓѕуїёяэщѓьќђ с№яшчъхѕьнэљэ №сщїэщфщўэ"
-#: gui/options.cpp:1647 gui/storagewizarddialog.cpp:71
+#: gui/options.cpp:1643 gui/storagewizarddialog.cpp:71
msgid "Connect"
msgstr "г§эфхѓч"
-#: gui/options.cpp:1647
+#: gui/options.cpp:1643
msgid "Open wizard dialog to connect your cloud storage account"
msgstr ""
"Сэяпюєх єя фщмыяуя яфчуя§ ущс эс ѓѕэфнѓхєх єя ыяусёщсѓьќ єя§ ѓ§ээхіяѕ "
"с№яшоъхѕѓођ ѓсђ"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh"
msgstr "Сэсэнљѓч"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh current cloud storage information (username and usage)"
msgstr ""
"Сэсэнљѓч №ычёяіяёщўэ єёнїяэєяђ їўёяѕ с№яшоъхѕѓчђ ѓєя ѓ§ээхія (ќэяьс їёоѓєч "
"ъсщ їёоѓч)"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Download"
msgstr "Ьхєсіќёєљѓч"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Open downloads manager dialog"
msgstr "Жэящуьс фщсыќуяѕ фщсїхпёщѓчђ ьхєсіяёєўѓхљэ"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run server"
msgstr "Хъєныхѓч фщсъяьщѓєо"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run local webserver"
msgstr "Хъєныхѓч єя№щъя§ фщсъяьщѓєо web"
-#: gui/options.cpp:1652 gui/options.cpp:2320
+#: gui/options.cpp:1648 gui/options.cpp:2316
msgid "Not running"
msgstr "Фхэ хъєхыхпєсщ"
-#: gui/options.cpp:1656
+#: gui/options.cpp:1652
msgid "/root/ Path:"
msgstr "/root/ Фщсфёяьо:"
-#: gui/options.cpp:1656 gui/options.cpp:1658 gui/options.cpp:1659
+#: gui/options.cpp:1652 gui/options.cpp:1654 gui/options.cpp:1655
msgid "Specifies which directory the Files Manager can access"
msgstr "Ъсшяёпцхщ єя імъхыя ѓєяэ я№япя нїхщ №ёќѓтсѓч я File Manager"
-#: gui/options.cpp:1658
+#: gui/options.cpp:1654
msgctxt "lowres"
msgid "/root/ Path:"
msgstr "/root/ Фщсфёяьо:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid "Server's port:"
msgstr "Ш§ёс хюѕ№чёхєчєо:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid ""
"Which port is used by the server\n"
"Auth with server is not available with non-default port"
@@ -1327,27 +1327,27 @@ msgstr ""
"аящм ш§ёс їёчѓщья№ящхпєсщ с№ќ єя фщсъяьщѓєо\n"
"Фхэ хпэсщ фщсшнѓщьч ч №щѓєя№япчѓч ьх єя фщсъяьщѓєо ѓх ьч-№ёях№щыхуьнэч ш§ёс"
-#: gui/options.cpp:1681
+#: gui/options.cpp:1677
msgid "Apply"
msgstr "Хісёьяуо"
-#: gui/options.cpp:1824
+#: gui/options.cpp:1820
msgid "Failed to change cloud storage!"
msgstr "Сфѕэсьпс сыысуођ с№яшоъхѕѓчђ ѓ§ээхіяѕ!"
-#: gui/options.cpp:1827
+#: gui/options.cpp:1823
msgid "Another cloud storage is already active."
msgstr "Ьщс мыыч с№яшоъхѕѓч ѓ§ээхіяѕ хпэсщ офч хэхёуо."
-#: gui/options.cpp:1895
+#: gui/options.cpp:1891
msgid "Theme does not support selected language!"
msgstr "дя шньс фхэ ѕ№яѓєчёпцхщ єчэ х№щыхуьнэч уыўѓѓс!"
-#: gui/options.cpp:1898
+#: gui/options.cpp:1894
msgid "Theme cannot be loaded!"
msgstr "дя шньс фхэ іяёєўшчъх!"
-#: gui/options.cpp:1901
+#: gui/options.cpp:1897
msgid ""
"\n"
"Misc settings will be restored."
@@ -1355,50 +1355,50 @@ msgstr ""
"\n"
"Ящ ыящ№нђ ёѕшьпѓхщђ шс х№сэсіхёшя§э ѓєщђ сёїщънђ єяѕђ єщьнђ."
-#: gui/options.cpp:1937
+#: gui/options.cpp:1933
msgid "The chosen directory cannot be written to. Please select another one."
msgstr ""
"Фхэ оєсэ фѕэсєо ч хууёсіо ѓєяэ х№щыхуьнэя імъхыя. асёсъсыў х№щынюєх ъм№ящяэ "
"мыыя."
-#: gui/options.cpp:1946
+#: gui/options.cpp:1942
msgid "Select directory for GUI themes"
msgstr "Х№щынюєх імъхыя ущс шньсєс GUI"
-#: gui/options.cpp:1956
+#: gui/options.cpp:1952
msgid "Select directory for extra files"
msgstr "Х№щынюєх імъхыя ущс нюєёс сёїхпс"
-#: gui/options.cpp:1967
+#: gui/options.cpp:1963
msgid "Select directory for plugins"
msgstr "Х№щынюєх імъхыя ущс №ёќѓшхєс"
-#: gui/options.cpp:1979
+#: gui/options.cpp:1975
msgid "Select directory for Files Manager /root/"
msgstr "Х№щынюєх імъхыя ущс єя /root/ єяѕ Фщсїхщёщѓєо Сёїхпљэ"
-#: gui/options.cpp:2217
+#: gui/options.cpp:2213
#, c-format
msgid "%llu bytes"
msgstr "%llu bytes"
-#: gui/options.cpp:2225
+#: gui/options.cpp:2221
msgid "<right now>"
msgstr "<мьхѓс>"
-#: gui/options.cpp:2227
+#: gui/options.cpp:2223
msgid "<never>"
msgstr "<№яєн>"
-#: gui/options.cpp:2311
+#: gui/options.cpp:2307
msgid "Stop server"
msgstr "Фщсъя№о хюѕ№чёхєчєо"
-#: gui/options.cpp:2312
+#: gui/options.cpp:2308
msgid "Stop local webserver"
msgstr "Фщсъя№о єя№щъя§ хюѕ№чёхєчєо web"
-#: gui/options.cpp:2403
+#: gui/options.cpp:2399
msgid ""
"Request failed.\n"
"Check your Internet connection."
@@ -1871,8 +1871,8 @@ msgstr "Х№щѓ~є~ё. ѓєяэ Яфчучєо"
#: 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:106
-#: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:658
+#: engines/mohawk/riven.cpp:545 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
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
#: engines/toon/toon.cpp:3340 engines/tsage/scenes.cpp:599
@@ -1891,9 +1891,9 @@ msgstr "С№яшоъхѕѓч №сщїэщфщя§:"
#: engines/dm/loadsave.cpp:196 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:106 engines/neverhood/menumodule.cpp:880
-#: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:659
+#: engines/mohawk/dialogs.cpp:106 engines/mohawk/riven.cpp:545
+#: 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
#: engines/sherlock/scalpel/scalpel.cpp:1250
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
@@ -2211,7 +2211,7 @@ msgstr "С№хэхёуя№ящчьнэя Clicking"
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "'Ыхщєяѕёупс Tap' яшќэчђ сіођ - Сщўёчѓч (DPad Clicks)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
msgid "Do you want to quit ?"
msgstr "Шныхєх эс тухпєх с№ќ єя №ёќуёсььс;"
@@ -3380,7 +3380,7 @@ msgstr ""
"гсђ ыхп№хщ єя 'extras.mhk'. Ч їёоѓч єяѕ сёїхпяѕ хуъсємѓєсѓчђ 'arcriven.z' "
"ыхщєяѕёухп х№пѓчђ."
-#: engines/mohawk/riven.cpp:416
+#: engines/mohawk/riven.cpp:432
msgid "You are missing the following required Riven data files:\n"
msgstr ""
diff --git a/po/es_ES.po b/po/es_ES.po
index b56e147107..f0c34f32be 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: 2017-12-10 15:25+0100\n"
+"POT-Creation-Date: 2017-12-26 21:11+0100\n"
"PO-Revision-Date: 2017-12-01 22:51+0000\n"
"Last-Translator: TomasM <truido@gmail.com>\n"
"Language-Team: Spanish <https://translations.scummvm.org/projects/scummvm/"
@@ -58,7 +58,7 @@ msgstr "Arriba"
#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editgamedialog.cpp:292
#: gui/editrecorddialog.cpp:67 gui/filebrowser-dialog.cpp:64
#: gui/fluidsynth-dialog.cpp:152 gui/KeysDialog.cpp:43 gui/massadd.cpp:95
-#: gui/options.cpp:1680 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
+#: gui/options.cpp:1676 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
#: gui/recorderdialog.cpp:155 gui/remotebrowser.cpp:59
#: gui/saveload-dialog.cpp:383 gui/saveload-dialog.cpp:445
#: gui/saveload-dialog.cpp:727 gui/saveload-dialog.cpp:1121
@@ -118,7 +118,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -131,7 +131,7 @@ msgstr "Sэ"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -154,7 +154,7 @@ msgstr ""
#: gui/downloaddialog.cpp:146 gui/editgamedialog.cpp:293
#: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:526
-#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1682
+#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1678
#: gui/saveload-dialog.cpp:1122 engines/engine.cpp:443 engines/engine.cpp:454
#: backends/platform/wii/options.cpp:47
#: backends/platform/wince/CELauncherDialog.cpp:54
@@ -240,8 +240,8 @@ msgstr ""
"Idioma del juego. No sirve para pasar al inglщs la versiѓn espaёola de un "
"juego"
-#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:997
-#: gui/options.cpp:1010 gui/options.cpp:1575 audio/null.cpp:41
+#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:993
+#: gui/options.cpp:1006 gui/options.cpp:1571 audio/null.cpp:41
msgid "<default>"
msgstr "<por defecto>"
@@ -263,11 +263,11 @@ msgstr "Plat.:"
msgid "Engine"
msgstr "Motor"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "Graphics"
msgstr "Grсficos"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "GFX"
msgstr "Grсf."
@@ -280,7 +280,7 @@ msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Opciones grсficas especэficas"
-#: gui/editgamedialog.cpp:196 gui/options.cpp:1457
+#: gui/editgamedialog.cpp:196 gui/options.cpp:1453
msgid "Audio"
msgstr "Sonido"
@@ -293,11 +293,11 @@ msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Opciones de sonido especэficas"
-#: gui/editgamedialog.cpp:210 gui/options.cpp:1462
+#: gui/editgamedialog.cpp:210 gui/options.cpp:1458
msgid "Volume"
msgstr "Volumen"
-#: gui/editgamedialog.cpp:212 gui/options.cpp:1464
+#: gui/editgamedialog.cpp:212 gui/options.cpp:1460
msgctxt "lowres"
msgid "Volume"
msgstr "Volumen"
@@ -311,7 +311,7 @@ msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Opciones de volumen especэficas"
-#: gui/editgamedialog.cpp:226 gui/options.cpp:1472
+#: gui/editgamedialog.cpp:226 gui/options.cpp:1468
msgid "MIDI"
msgstr "MIDI"
@@ -324,7 +324,7 @@ msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Opciones de MIDI especэficas"
-#: gui/editgamedialog.cpp:241 gui/options.cpp:1482
+#: gui/editgamedialog.cpp:241 gui/options.cpp:1478
msgid "MT-32"
msgstr "MT-32"
@@ -337,11 +337,11 @@ msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Opciones de MT-32 especэficas"
-#: gui/editgamedialog.cpp:255 gui/options.cpp:1489
+#: gui/editgamedialog.cpp:255 gui/options.cpp:1485
msgid "Paths"
msgstr "Rutas"
-#: gui/editgamedialog.cpp:257 gui/options.cpp:1491
+#: gui/editgamedialog.cpp:257 gui/options.cpp:1487
msgctxt "lowres"
msgid "Paths"
msgstr "Rutas"
@@ -355,7 +355,7 @@ msgctxt "lowres"
msgid "Game Path:"
msgstr "Juego:"
-#: gui/editgamedialog.cpp:271 gui/options.cpp:1515
+#: gui/editgamedialog.cpp:271 gui/options.cpp:1511
msgid "Extra Path:"
msgstr "Adicional:"
@@ -364,44 +364,44 @@ msgstr "Adicional:"
msgid "Specifies path to additional data used by the game"
msgstr "Especifica un directorio para datos adicionales del juego"
-#: gui/editgamedialog.cpp:273 gui/options.cpp:1517
+#: gui/editgamedialog.cpp:273 gui/options.cpp:1513
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Adicional:"
-#: gui/editgamedialog.cpp:280 gui/options.cpp:1499
+#: gui/editgamedialog.cpp:280 gui/options.cpp:1495
msgid "Save Path:"
msgstr "Partidas:"
#: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282
-#: gui/editgamedialog.cpp:283 gui/options.cpp:1499 gui/options.cpp:1501
-#: gui/options.cpp:1502
+#: gui/editgamedialog.cpp:283 gui/options.cpp:1495 gui/options.cpp:1497
+#: gui/options.cpp:1498
msgid "Specifies where your saved games are put"
msgstr "Especifica dѓnde guardar tus partidas"
-#: gui/editgamedialog.cpp:282 gui/options.cpp:1501
+#: gui/editgamedialog.cpp:282 gui/options.cpp:1497
msgctxt "lowres"
msgid "Save Path:"
msgstr "Partidas:"
#: gui/editgamedialog.cpp:301 gui/editgamedialog.cpp:398
-#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1510
-#: gui/options.cpp:1518 gui/options.cpp:1527 gui/options.cpp:1707
-#: gui/options.cpp:1713 gui/options.cpp:1721 gui/options.cpp:1744
-#: gui/options.cpp:1777 gui/options.cpp:1783 gui/options.cpp:1790
-#: gui/options.cpp:1798 gui/options.cpp:1993 gui/options.cpp:1996
-#: gui/options.cpp:2003 gui/options.cpp:2013
+#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1506
+#: gui/options.cpp:1514 gui/options.cpp:1523 gui/options.cpp:1703
+#: gui/options.cpp:1709 gui/options.cpp:1717 gui/options.cpp:1740
+#: gui/options.cpp:1773 gui/options.cpp:1779 gui/options.cpp:1786
+#: gui/options.cpp:1794 gui/options.cpp:1989 gui/options.cpp:1992
+#: gui/options.cpp:1999 gui/options.cpp:2009
msgctxt "path"
msgid "None"
msgstr "Ninguna"
#: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404
-#: gui/editgamedialog.cpp:522 gui/options.cpp:1701 gui/options.cpp:1771
-#: gui/options.cpp:1999 backends/platform/wii/options.cpp:56
+#: gui/editgamedialog.cpp:522 gui/options.cpp:1697 gui/options.cpp:1767
+#: gui/options.cpp:1995 backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Por defecto"
-#: gui/editgamedialog.cpp:450 gui/options.cpp:2007
+#: gui/editgamedialog.cpp:450 gui/options.cpp:2003
msgid "Select SoundFont"
msgstr "Selecciona un SoundFont"
@@ -409,7 +409,7 @@ msgstr "Selecciona un SoundFont"
msgid "Select additional game directory"
msgstr "Selecciona el directorio adicional"
-#: gui/editgamedialog.cpp:502 gui/options.cpp:1930
+#: gui/editgamedialog.cpp:502 gui/options.cpp:1926
msgid "Select directory for saved games"
msgstr "Selecciona el directorio para partidas guardadas"
@@ -501,7 +501,7 @@ msgstr "Seno"
msgid "Triangle"
msgstr "Triсngulo"
-#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1535
+#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1531
msgid "Misc"
msgstr "Otras"
@@ -680,7 +680,7 @@ msgid "Search:"
msgstr "Buscar:"
#: gui/launcher.cpp:200 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:517
+#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:533
#: engines/pegasus/pegasus.cpp:355 engines/tsage/scenes.cpp:601
#: engines/wage/saveload.cpp:748
msgid "Load game:"
@@ -690,7 +690,7 @@ msgstr "Cargar juego:"
#: backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:105
-#: engines/mohawk/riven.cpp:517 engines/parallaction/saveload.cpp:194
+#: engines/mohawk/riven.cpp:533 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
msgid "Load"
@@ -804,217 +804,217 @@ msgstr "cada 15 minutos"
msgid "every 30 mins"
msgstr "cada 30 minutos"
-#: gui/options.cpp:343 gui/options.cpp:640 gui/options.cpp:778
-#: gui/options.cpp:853 gui/options.cpp:1114
+#: gui/options.cpp:339 gui/options.cpp:636 gui/options.cpp:774
+#: gui/options.cpp:849 gui/options.cpp:1110
msgctxt "soundfont"
msgid "None"
msgstr "Ninguno"
-#: gui/options.cpp:514
+#: gui/options.cpp:510
msgid "Failed to apply some of the graphic options changes:"
msgstr "Fallo al aplicar algunos cambios en las opciones grсficas:"
-#: gui/options.cpp:526
+#: gui/options.cpp:522
msgid "the video mode could not be changed."
msgstr "no se ha podido cambiar el modo de vэdeo."
-#: gui/options.cpp:532
+#: gui/options.cpp:528
msgid "the aspect ratio setting could not be changed"
msgstr "no se ha podido cambiar el ajuste de correcciѓn de aspecto"
-#: gui/options.cpp:538
+#: gui/options.cpp:534
msgid "the fullscreen setting could not be changed"
msgstr "no se ha podido cambiar el ajuste a pantalla completa"
-#: gui/options.cpp:544
+#: gui/options.cpp:540
msgid "the filtering setting could not be changed"
msgstr "no se han podido cambiar los ajustes de filtrado"
-#: gui/options.cpp:932
+#: gui/options.cpp:928
msgid "Show On-screen control"
msgstr "Mostrar controles en pantalla"
-#: gui/options.cpp:936
+#: gui/options.cpp:932
msgid "Touchpad mouse mode"
msgstr "Modo Touchpad"
-#: gui/options.cpp:940
+#: gui/options.cpp:936
msgid "Swap Menu and Back buttons"
msgstr "Intercambiar botones Menu y Volver"
-#: gui/options.cpp:945
+#: gui/options.cpp:941
msgid "Pointer Speed:"
msgstr "Velocidad del puntero:"
-#: gui/options.cpp:945 gui/options.cpp:947 gui/options.cpp:948
+#: gui/options.cpp:941 gui/options.cpp:943 gui/options.cpp:944
msgid "Speed for keyboard/joystick mouse pointer control"
msgstr "Velocidad del puntero para el control por teclado o joystick"
-#: gui/options.cpp:947
+#: gui/options.cpp:943
msgctxt "lowres"
msgid "Pointer Speed:"
msgstr "Velocidad del puntero:"
-#: gui/options.cpp:958
+#: gui/options.cpp:954
msgid "Joy Deadzone:"
msgstr "Zona inactiva del joystick:"
-#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
+#: gui/options.cpp:954 gui/options.cpp:956 gui/options.cpp:957
msgid "Analog joystick Deadzone"
msgstr "Zona inactiva del joystick analѓgico"
-#: gui/options.cpp:960
+#: gui/options.cpp:956
msgctxt "lowres"
msgid "Joy Deadzone:"
msgstr "Zona inactiva del joystick:"
-#: gui/options.cpp:974
+#: gui/options.cpp:970
msgid "HW Shader:"
msgstr "Shader:"
-#: gui/options.cpp:974 gui/options.cpp:976
+#: gui/options.cpp:970 gui/options.cpp:972
msgid "Different hardware shaders give different visual effects"
msgstr "Hardware Shaders diferentes, otorgan efectos visuales diferentes"
-#: gui/options.cpp:976
+#: gui/options.cpp:972
msgctxt "lowres"
msgid "HW Shader:"
msgstr "HW Shader:"
-#: gui/options.cpp:977
+#: gui/options.cpp:973
msgid "Different shaders give different visual effects"
msgstr "Cada shader produce un efecto visual distinto"
-#: gui/options.cpp:994
+#: gui/options.cpp:990
msgid "Graphics mode:"
msgstr "Modo grсfico:"
-#: gui/options.cpp:1008
+#: gui/options.cpp:1004
msgid "Render mode:"
msgstr "Renderizado:"
-#: gui/options.cpp:1008 gui/options.cpp:1009
+#: gui/options.cpp:1004 gui/options.cpp:1005
msgid "Special dithering modes supported by some games"
msgstr "Modos especiales de difuminado compatibles con algunos juegos"
-#: gui/options.cpp:1020 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
+#: gui/options.cpp:1016 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2590
msgid "Fullscreen mode"
msgstr "Pantalla completa"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Filter graphics"
msgstr "Filtros de grсficos"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Use linear filtering when scaling graphics"
msgstr "Usar filtrado lineal para reescalar grсficos"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Aspect ratio correction"
msgstr "Correcciѓn de la relaciѓn de aspecto"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Correct aspect ratio for 320x200 games"
msgstr "Corregir relaciѓn de aspecto en juegos de 320x200"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Preferred Device:"
msgstr "Disp. preferido:"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Music Device:"
msgstr "Disp. de mњsica:"
-#: gui/options.cpp:1034 gui/options.cpp:1036
+#: gui/options.cpp:1030 gui/options.cpp:1032
msgid "Specifies preferred sound device or sound card emulator"
msgstr ""
"Especifica el dispositivo de sonido o emulador de tarjeta de sonido "
"prefierido"
-#: gui/options.cpp:1034 gui/options.cpp:1036 gui/options.cpp:1037
+#: gui/options.cpp:1030 gui/options.cpp:1032 gui/options.cpp:1033
msgid "Specifies output sound device or sound card emulator"
msgstr ""
"Especifica el dispositivo de sonido o emulador de tarjeta de sonido de salida"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Disp. preferido:"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Music Device:"
msgstr "Disp. de mњsica:"
-#: gui/options.cpp:1063
+#: gui/options.cpp:1059
msgid "AdLib emulator:"
msgstr "Emul. AdLib:"
-#: gui/options.cpp:1063 gui/options.cpp:1064
+#: gui/options.cpp:1059 gui/options.cpp:1060
msgid "AdLib is used for music in many games"
msgstr "AdLib se utiliza para reproducir la mњsica en muchos juegos"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "GM Device:"
msgstr "Dispositivo GM:"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "Specifies default sound device for General MIDI output"
msgstr ""
"Especifique el dispositivo de salidapor defecto para la salida de General "
"MIDI"
-#: gui/options.cpp:1088
+#: gui/options.cpp:1084
msgid "Don't use General MIDI music"
msgstr "No usar mњsica General MIDI"
-#: gui/options.cpp:1099 gui/options.cpp:1161
+#: gui/options.cpp:1095 gui/options.cpp:1157
msgid "Use first available device"
msgstr "Usar el primer dispositivo disponible"
-#: gui/options.cpp:1111
+#: gui/options.cpp:1107
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1111 gui/options.cpp:1113 gui/options.cpp:1114
+#: gui/options.cpp:1107 gui/options.cpp:1109 gui/options.cpp:1110
msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity"
msgstr ""
"SoundFont es compatible con algunas tarjetas de sonido, con FluidSynth y con "
"Timidity"
-#: gui/options.cpp:1113
+#: gui/options.cpp:1109
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Mixed AdLib/MIDI mode"
msgstr "Modo AdLib/MIDI"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Use both MIDI and AdLib sound generation"
msgstr "Usar tanto MIDI como AdLib en la generaciѓn de sonido"
-#: gui/options.cpp:1122
+#: gui/options.cpp:1118
msgid "MIDI gain:"
msgstr "Ganancia MIDI:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "MT-32 Device:"
msgstr "Disp. MT-32:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
"Especifica el dispositivo de sonido para la salida Roland MT-32/LAPC1/CM32l/"
"CM64 por defecto"
-#: gui/options.cpp:1137
+#: gui/options.cpp:1133
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Roland MT-32 autщntica (desactivar emulaciѓn GM)"
-#: gui/options.cpp:1137 gui/options.cpp:1139
+#: gui/options.cpp:1133 gui/options.cpp:1135
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -1022,16 +1022,16 @@ msgstr ""
"Marcar si se quiere usar un dispositivo de sonido real conectado al "
"ordenador y compatible con Roland"
-#: gui/options.cpp:1139
+#: gui/options.cpp:1135
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Roland MT-32 real (sin emulaciѓn GM)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid "Roland GS Device (enable MT-32 mappings)"
msgstr "Dispositivo Roland GS (activar conversiѓn MT-32)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid ""
"Check if you want to enable patch mappings to emulate an MT-32 on a Roland "
"GS device"
@@ -1039,274 +1039,274 @@ msgstr ""
"Marca esta opciѓn si quieres activar la conversiѓn para emular una MT-32 en "
"un dispositivo Roland GS"
-#: gui/options.cpp:1151
+#: gui/options.cpp:1147
msgid "Don't use Roland MT-32 music"
msgstr "No usar mњsica Roland MT-32"
-#: gui/options.cpp:1178
+#: gui/options.cpp:1174
msgid "Text and Speech:"
msgstr "Texto y voces:"
-#: gui/options.cpp:1182 gui/options.cpp:1192
+#: gui/options.cpp:1178 gui/options.cpp:1188
msgid "Speech"
msgstr "Voces"
-#: gui/options.cpp:1183 gui/options.cpp:1193
+#: gui/options.cpp:1179 gui/options.cpp:1189
msgid "Subtitles"
msgstr "Subtэtulos"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1180
msgid "Both"
msgstr "Ambos"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1182
msgid "Subtitle speed:"
msgstr "Vel. de subtэtulos:"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1184
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Texto y voces:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1188
msgid "Spch"
msgstr "Voz"
-#: gui/options.cpp:1193
+#: gui/options.cpp:1189
msgid "Subs"
msgstr "Subt"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgctxt "lowres"
msgid "Both"
msgstr "V&S"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgid "Show subtitles and play speech"
msgstr "Reproducir voces y subtэtulos"
-#: gui/options.cpp:1196
+#: gui/options.cpp:1192
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Vel. de subt.:"
-#: gui/options.cpp:1212
+#: gui/options.cpp:1208
msgid "Music volume:"
msgstr "Mњsica:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1210
msgctxt "lowres"
msgid "Music volume:"
msgstr "Mњsica:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1217
msgid "Mute All"
msgstr "Silenciar"
-#: gui/options.cpp:1224
+#: gui/options.cpp:1220
msgid "SFX volume:"
msgstr "Efectos:"
-#: gui/options.cpp:1224 gui/options.cpp:1226 gui/options.cpp:1227
+#: gui/options.cpp:1220 gui/options.cpp:1222 gui/options.cpp:1223
msgid "Special sound effects volume"
msgstr "Volumen de los efectos de sonido"
-#: gui/options.cpp:1226
+#: gui/options.cpp:1222
msgctxt "lowres"
msgid "SFX volume:"
msgstr "Efectos:"
-#: gui/options.cpp:1234
+#: gui/options.cpp:1230
msgid "Speech volume:"
msgstr "Voces:"
-#: gui/options.cpp:1236
+#: gui/options.cpp:1232
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Voces:"
-#: gui/options.cpp:1438
+#: gui/options.cpp:1434
msgid "Shader"
msgstr "Shader"
-#: gui/options.cpp:1450
+#: gui/options.cpp:1446
msgid "Control"
msgstr "Controles"
-#: gui/options.cpp:1476
+#: gui/options.cpp:1472
msgid "FluidSynth Settings"
msgstr "Opciones de FluidSynth"
-#: gui/options.cpp:1507
+#: gui/options.cpp:1503
msgid "Theme Path:"
msgstr "Temas:"
-#: gui/options.cpp:1509
+#: gui/options.cpp:1505
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Temas:"
-#: gui/options.cpp:1515 gui/options.cpp:1517 gui/options.cpp:1518
+#: gui/options.cpp:1511 gui/options.cpp:1513 gui/options.cpp:1514
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr "Especifica el directorio adicional usado por los juegos y ScummVM"
-#: gui/options.cpp:1524
+#: gui/options.cpp:1520
msgid "Plugins Path:"
msgstr "Plugins:"
-#: gui/options.cpp:1526
+#: gui/options.cpp:1522
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Plugins:"
-#: gui/options.cpp:1537
+#: gui/options.cpp:1533
msgctxt "lowres"
msgid "Misc"
msgstr "Otras"
-#: gui/options.cpp:1539
+#: gui/options.cpp:1535
msgid "Theme:"
msgstr "Tema:"
-#: gui/options.cpp:1543
+#: gui/options.cpp:1539
msgid "GUI Renderer:"
msgstr "Interfaz:"
-#: gui/options.cpp:1555
+#: gui/options.cpp:1551
msgid "Autosave:"
msgstr "Autoguardado:"
-#: gui/options.cpp:1557
+#: gui/options.cpp:1553
msgctxt "lowres"
msgid "Autosave:"
msgstr "Autoguardado:"
-#: gui/options.cpp:1565
+#: gui/options.cpp:1561
msgid "Keys"
msgstr "Teclas"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "GUI Language:"
msgstr "Idioma:"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "Language of ScummVM GUI"
msgstr "Idioma de la interfaz de ScummVM"
-#: gui/options.cpp:1600 gui/updates-dialog.cpp:86
+#: gui/options.cpp:1596 gui/updates-dialog.cpp:86
msgid "Update check:"
msgstr "Buscar actualizaciones:"
-#: gui/options.cpp:1600
+#: gui/options.cpp:1596
msgid "How often to check ScummVM updates"
msgstr "Frecuencia con la que se buscan actualizaciones"
-#: gui/options.cpp:1612
+#: gui/options.cpp:1608
msgid "Check now"
msgstr "Buscar ahora"
-#: gui/options.cpp:1620
+#: gui/options.cpp:1616
msgid "Cloud"
msgstr "Nube"
-#: gui/options.cpp:1622
+#: gui/options.cpp:1618
msgctxt "lowres"
msgid "Cloud"
msgstr "Nube"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Storage:"
msgstr "Almacenamiento:"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Active cloud storage"
msgstr "Almacenamiento activo"
-#: gui/options.cpp:1634 gui/options.cpp:2210
+#: gui/options.cpp:1630 gui/options.cpp:2206
msgid "<none>"
msgstr "<ninguno>"
-#: gui/options.cpp:1638 backends/platform/wii/options.cpp:114
+#: gui/options.cpp:1634 backends/platform/wii/options.cpp:114
msgid "Username:"
msgstr "Usuario:"
-#: gui/options.cpp:1638
+#: gui/options.cpp:1634
msgid "Username used by this storage"
msgstr "Nombre de usuario utilizado para este almacenamiento"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Used space:"
msgstr "Espacio utilizado:"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Space used by ScummVM's saved games on this storage"
msgstr "Espacio utilizado para las partidas guardadas en este almacenamiento"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "Last sync time:"
msgstr "кltima sincronizaciѓn:"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "When the last saved games sync for this storage occured"
msgstr "Cuсndo se ha producido la њltima sincronizaciѓn de partidas guardadas"
-#: gui/options.cpp:1647 gui/storagewizarddialog.cpp:71
+#: gui/options.cpp:1643 gui/storagewizarddialog.cpp:71
msgid "Connect"
msgstr "Conectar"
-#: gui/options.cpp:1647
+#: gui/options.cpp:1643
msgid "Open wizard dialog to connect your cloud storage account"
msgstr ""
"Abrir el asistente de configuraciѓn para habilitar el almacenamiento en lэnea"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh"
msgstr "Refrescar"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh current cloud storage information (username and usage)"
msgstr ""
"Refrescar la informaciѓn del almacenamiento en lэnea (nombre de usuario y "
"espacio)"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Download"
msgstr "Descargar"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Open downloads manager dialog"
msgstr "Abrir el gestor de descargas"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run server"
msgstr "Habilitar servidor"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run local webserver"
msgstr "Habilitar el servidor local"
-#: gui/options.cpp:1652 gui/options.cpp:2320
+#: gui/options.cpp:1648 gui/options.cpp:2316
msgid "Not running"
msgstr "Detenido"
-#: gui/options.cpp:1656
+#: gui/options.cpp:1652
msgid "/root/ Path:"
msgstr "Directorio /raэz/:"
-#: gui/options.cpp:1656 gui/options.cpp:1658 gui/options.cpp:1659
+#: gui/options.cpp:1652 gui/options.cpp:1654 gui/options.cpp:1655
msgid "Specifies which directory the Files Manager can access"
msgstr "Especifica los directorios accesibles para el gestor de archivos"
-#: gui/options.cpp:1658
+#: gui/options.cpp:1654
msgctxt "lowres"
msgid "/root/ Path:"
msgstr "/raэz/:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid "Server's port:"
msgstr "Puerto del servidor:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid ""
"Which port is used by the server\n"
"Auth with server is not available with non-default port"
@@ -1314,27 +1314,27 @@ msgstr ""
"Puerto utilizado por el servidor\n"
"La autentificaciѓn solo es posible con el puerto predeterminado"
-#: gui/options.cpp:1681
+#: gui/options.cpp:1677
msgid "Apply"
msgstr "Aplicar"
-#: gui/options.cpp:1824
+#: gui/options.cpp:1820
msgid "Failed to change cloud storage!"
msgstr "ЁFallo al cambiar el almacenamiento en lэnea!"
-#: gui/options.cpp:1827
+#: gui/options.cpp:1823
msgid "Another cloud storage is already active."
msgstr "Ya se ha habilitado otro almacenamiento en lэnea."
-#: gui/options.cpp:1895
+#: gui/options.cpp:1891
msgid "Theme does not support selected language!"
msgstr "ЁEl Tema no soporta el lenguaje seleccionado!"
-#: gui/options.cpp:1898
+#: gui/options.cpp:1894
msgid "Theme cannot be loaded!"
msgstr "No se ha podido cargar el tema."
-#: gui/options.cpp:1901
+#: gui/options.cpp:1897
msgid ""
"\n"
"Misc settings will be restored."
@@ -1342,48 +1342,48 @@ msgstr ""
"\n"
"Se restaurarс la configuraciѓn por defecto."
-#: gui/options.cpp:1937
+#: gui/options.cpp:1933
msgid "The chosen directory cannot be written to. Please select another one."
msgstr "No se puede escribir en el directorio elegido. Selecciona otro."
-#: gui/options.cpp:1946
+#: gui/options.cpp:1942
msgid "Select directory for GUI themes"
msgstr "Selecciona el directorio de temas"
-#: gui/options.cpp:1956
+#: gui/options.cpp:1952
msgid "Select directory for extra files"
msgstr "Selecciona el directorio adicional"
-#: gui/options.cpp:1967
+#: gui/options.cpp:1963
msgid "Select directory for plugins"
msgstr "Selecciona el directorio de plugins"
-#: gui/options.cpp:1979
+#: gui/options.cpp:1975
msgid "Select directory for Files Manager /root/"
msgstr "Selecciona el directorio /raэz/ para el gestor de archivos"
-#: gui/options.cpp:2217
+#: gui/options.cpp:2213
#, c-format
msgid "%llu bytes"
msgstr "%llu bytes"
-#: gui/options.cpp:2225
+#: gui/options.cpp:2221
msgid "<right now>"
msgstr "<ahora>"
-#: gui/options.cpp:2227
+#: gui/options.cpp:2223
msgid "<never>"
msgstr "<nunca>"
-#: gui/options.cpp:2311
+#: gui/options.cpp:2307
msgid "Stop server"
msgstr "Detener servidor"
-#: gui/options.cpp:2312
+#: gui/options.cpp:2308
msgid "Stop local webserver"
msgstr "Detener el servidor local"
-#: gui/options.cpp:2403
+#: gui/options.cpp:2399
msgid ""
"Request failed.\n"
"Check your Internet connection."
@@ -1854,8 +1854,8 @@ msgstr "~V~olver al lanzador"
#: 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:106
-#: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:658
+#: engines/mohawk/riven.cpp:545 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
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
#: engines/toon/toon.cpp:3340 engines/tsage/scenes.cpp:599
@@ -1874,9 +1874,9 @@ msgstr "Guardar partida:"
#: engines/dm/loadsave.cpp:196 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:106 engines/neverhood/menumodule.cpp:880
-#: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:659
+#: engines/mohawk/dialogs.cpp:106 engines/mohawk/riven.cpp:545
+#: 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
#: engines/sherlock/scalpel/scalpel.cpp:1250
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
@@ -2190,7 +2190,7 @@ msgstr "Clic desactivado"
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "'Modo toque' de pantalla tсctil - Flotante (clic de cruceta)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
msgid "Do you want to quit ?"
msgstr "ПQuieres salir?"
@@ -3344,7 +3344,7 @@ msgstr ""
"Falta el fichero 'extras.mhk'. Tambiщn es posible usar el fichero instalador "
"'arcriven.z'."
-#: engines/mohawk/riven.cpp:416
+#: engines/mohawk/riven.cpp:432
msgid "You are missing the following required Riven data files:\n"
msgstr "Te faltan estos archivos de Riven:\n"
diff --git a/po/eu.po b/po/eu.po
index 3e36bffe2d..13582508f9 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: 2017-12-10 15:25+0100\n"
+"POT-Creation-Date: 2017-12-26 21:11+0100\n"
"PO-Revision-Date: 2016-12-04 13:27+0000\n"
"Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n"
"Language-Team: Basque <https://translations.scummvm.org/projects/scummvm/"
@@ -58,7 +58,7 @@ msgstr "Joan gora"
#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editgamedialog.cpp:292
#: gui/editrecorddialog.cpp:67 gui/filebrowser-dialog.cpp:64
#: gui/fluidsynth-dialog.cpp:152 gui/KeysDialog.cpp:43 gui/massadd.cpp:95
-#: gui/options.cpp:1680 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
+#: gui/options.cpp:1676 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
#: gui/recorderdialog.cpp:155 gui/remotebrowser.cpp:59
#: gui/saveload-dialog.cpp:383 gui/saveload-dialog.cpp:445
#: gui/saveload-dialog.cpp:727 gui/saveload-dialog.cpp:1121
@@ -117,7 +117,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -130,7 +130,7 @@ msgstr "Bai"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -151,7 +151,7 @@ msgstr ""
#: gui/downloaddialog.cpp:146 gui/editgamedialog.cpp:293
#: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:526
-#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1682
+#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1678
#: gui/saveload-dialog.cpp:1122 engines/engine.cpp:443 engines/engine.cpp:454
#: backends/platform/wii/options.cpp:47
#: backends/platform/wince/CELauncherDialog.cpp:54
@@ -234,8 +234,8 @@ msgid ""
msgstr ""
"Jokoaren hizkuntza. Honek ez du zure ingelesezko bertsioa frantsesera pasako"
-#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:997
-#: gui/options.cpp:1010 gui/options.cpp:1575 audio/null.cpp:41
+#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:993
+#: gui/options.cpp:1006 gui/options.cpp:1571 audio/null.cpp:41
msgid "<default>"
msgstr "<lehenetsia>"
@@ -257,11 +257,11 @@ msgstr "Plataforma:"
msgid "Engine"
msgstr "Motorea"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "Graphics"
msgstr "Grafikoak"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "GFX"
msgstr "GFX"
@@ -274,7 +274,7 @@ msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Ezarpen grafiko globalak baliogabetu"
-#: gui/editgamedialog.cpp:196 gui/options.cpp:1457
+#: gui/editgamedialog.cpp:196 gui/options.cpp:1453
msgid "Audio"
msgstr "Soinua"
@@ -287,11 +287,11 @@ msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Soinu ezarpen globalak baliogabetu"
-#: gui/editgamedialog.cpp:210 gui/options.cpp:1462
+#: gui/editgamedialog.cpp:210 gui/options.cpp:1458
msgid "Volume"
msgstr "Bolumena"
-#: gui/editgamedialog.cpp:212 gui/options.cpp:1464
+#: gui/editgamedialog.cpp:212 gui/options.cpp:1460
msgctxt "lowres"
msgid "Volume"
msgstr "Bolumena"
@@ -305,7 +305,7 @@ msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Bolumen ezarpen globalak baliogabetu"
-#: gui/editgamedialog.cpp:226 gui/options.cpp:1472
+#: gui/editgamedialog.cpp:226 gui/options.cpp:1468
msgid "MIDI"
msgstr "MIDI"
@@ -318,7 +318,7 @@ msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "MIDI ezarpen globalak baliogabetu"
-#: gui/editgamedialog.cpp:241 gui/options.cpp:1482
+#: gui/editgamedialog.cpp:241 gui/options.cpp:1478
msgid "MT-32"
msgstr "MT-32"
@@ -331,11 +331,11 @@ msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "MT-32 ezarpen globalak baliogabetu"
-#: gui/editgamedialog.cpp:255 gui/options.cpp:1489
+#: gui/editgamedialog.cpp:255 gui/options.cpp:1485
msgid "Paths"
msgstr "Bide-izenak"
-#: gui/editgamedialog.cpp:257 gui/options.cpp:1491
+#: gui/editgamedialog.cpp:257 gui/options.cpp:1487
msgctxt "lowres"
msgid "Paths"
msgstr "Bideak"
@@ -349,7 +349,7 @@ msgctxt "lowres"
msgid "Game Path:"
msgstr "Jokoa:"
-#: gui/editgamedialog.cpp:271 gui/options.cpp:1515
+#: gui/editgamedialog.cpp:271 gui/options.cpp:1511
msgid "Extra Path:"
msgstr "Gehigarriak:"
@@ -358,44 +358,44 @@ msgstr "Gehigarriak:"
msgid "Specifies path to additional data used by the game"
msgstr "Jokoak erabiltzen duen datu gehigarrien bide-izena"
-#: gui/editgamedialog.cpp:273 gui/options.cpp:1517
+#: gui/editgamedialog.cpp:273 gui/options.cpp:1513
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Gehigarria:"
-#: gui/editgamedialog.cpp:280 gui/options.cpp:1499
+#: gui/editgamedialog.cpp:280 gui/options.cpp:1495
msgid "Save Path:"
msgstr "Partida gordeak:"
#: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282
-#: gui/editgamedialog.cpp:283 gui/options.cpp:1499 gui/options.cpp:1501
-#: gui/options.cpp:1502
+#: gui/editgamedialog.cpp:283 gui/options.cpp:1495 gui/options.cpp:1497
+#: gui/options.cpp:1498
msgid "Specifies where your saved games are put"
msgstr "Zure gordetako partidak non gordeko diren zehazten du"
-#: gui/editgamedialog.cpp:282 gui/options.cpp:1501
+#: gui/editgamedialog.cpp:282 gui/options.cpp:1497
msgctxt "lowres"
msgid "Save Path:"
msgstr "Partida gordeak:"
#: gui/editgamedialog.cpp:301 gui/editgamedialog.cpp:398
-#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1510
-#: gui/options.cpp:1518 gui/options.cpp:1527 gui/options.cpp:1707
-#: gui/options.cpp:1713 gui/options.cpp:1721 gui/options.cpp:1744
-#: gui/options.cpp:1777 gui/options.cpp:1783 gui/options.cpp:1790
-#: gui/options.cpp:1798 gui/options.cpp:1993 gui/options.cpp:1996
-#: gui/options.cpp:2003 gui/options.cpp:2013
+#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1506
+#: gui/options.cpp:1514 gui/options.cpp:1523 gui/options.cpp:1703
+#: gui/options.cpp:1709 gui/options.cpp:1717 gui/options.cpp:1740
+#: gui/options.cpp:1773 gui/options.cpp:1779 gui/options.cpp:1786
+#: gui/options.cpp:1794 gui/options.cpp:1989 gui/options.cpp:1992
+#: gui/options.cpp:1999 gui/options.cpp:2009
msgctxt "path"
msgid "None"
msgstr "Bat ere ez"
#: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404
-#: gui/editgamedialog.cpp:522 gui/options.cpp:1701 gui/options.cpp:1771
-#: gui/options.cpp:1999 backends/platform/wii/options.cpp:56
+#: gui/editgamedialog.cpp:522 gui/options.cpp:1697 gui/options.cpp:1767
+#: gui/options.cpp:1995 backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Lehenetsia"
-#: gui/editgamedialog.cpp:450 gui/options.cpp:2007
+#: gui/editgamedialog.cpp:450 gui/options.cpp:2003
msgid "Select SoundFont"
msgstr "SoundFont-a aukeratu"
@@ -403,7 +403,7 @@ msgstr "SoundFont-a aukeratu"
msgid "Select additional game directory"
msgstr "Direktorio gehigarria aukeratu"
-#: gui/editgamedialog.cpp:502 gui/options.cpp:1930
+#: gui/editgamedialog.cpp:502 gui/options.cpp:1926
msgid "Select directory for saved games"
msgstr "Partida gordeen direktorioa aukeratu"
@@ -493,7 +493,7 @@ msgstr "Sinua"
msgid "Triangle"
msgstr "Triangelua"
-#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1535
+#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1531
msgid "Misc"
msgstr "Beste"
@@ -670,7 +670,7 @@ msgid "Search:"
msgstr "Bilatu:"
#: gui/launcher.cpp:200 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:517
+#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:533
#: engines/pegasus/pegasus.cpp:355 engines/tsage/scenes.cpp:601
#: engines/wage/saveload.cpp:748
msgid "Load game:"
@@ -680,7 +680,7 @@ msgstr "Jokoa kargatu:"
#: backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:105
-#: engines/mohawk/riven.cpp:517 engines/parallaction/saveload.cpp:194
+#: engines/mohawk/riven.cpp:533 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
msgid "Load"
@@ -793,217 +793,217 @@ msgstr "15 minuturo"
msgid "every 30 mins"
msgstr "30 minuturo"
-#: gui/options.cpp:343 gui/options.cpp:640 gui/options.cpp:778
-#: gui/options.cpp:853 gui/options.cpp:1114
+#: gui/options.cpp:339 gui/options.cpp:636 gui/options.cpp:774
+#: gui/options.cpp:849 gui/options.cpp:1110
msgctxt "soundfont"
msgid "None"
msgstr "Bat ere ez"
-#: gui/options.cpp:514
+#: gui/options.cpp:510
msgid "Failed to apply some of the graphic options changes:"
msgstr "Ezin izan da grafikoen aukeretako batzuk aplikatu:"
-#: gui/options.cpp:526
+#: gui/options.cpp:522
msgid "the video mode could not be changed."
msgstr "ezin izan da bideo-modua aldatu."
-#: gui/options.cpp:532
+#: gui/options.cpp:528
msgid "the aspect ratio setting could not be changed"
msgstr "formatu-ratioaren ezarpena ezin izan da aldatu"
-#: gui/options.cpp:538
+#: gui/options.cpp:534
msgid "the fullscreen setting could not be changed"
msgstr "ezin izan da pantaila-osoaren ezarpena aldatu"
-#: gui/options.cpp:544
+#: gui/options.cpp:540
#, fuzzy
msgid "the filtering setting could not be changed"
msgstr "ezin izan da pantaila-osoaren ezarpena aldatu"
-#: gui/options.cpp:932
+#: gui/options.cpp:928
msgid "Show On-screen control"
msgstr ""
-#: gui/options.cpp:936
+#: gui/options.cpp:932
#, fuzzy
msgid "Touchpad mouse mode"
msgstr "Touchpad modua desgaituta."
-#: gui/options.cpp:940
+#: gui/options.cpp:936
msgid "Swap Menu and Back buttons"
msgstr ""
-#: gui/options.cpp:945
+#: gui/options.cpp:941
#, fuzzy
msgid "Pointer Speed:"
msgstr "Abiadura:"
-#: gui/options.cpp:945 gui/options.cpp:947 gui/options.cpp:948
+#: gui/options.cpp:941 gui/options.cpp:943 gui/options.cpp:944
msgid "Speed for keyboard/joystick mouse pointer control"
msgstr ""
-#: gui/options.cpp:947
+#: gui/options.cpp:943
#, fuzzy
msgctxt "lowres"
msgid "Pointer Speed:"
msgstr "Abiadura:"
-#: gui/options.cpp:958
+#: gui/options.cpp:954
msgid "Joy Deadzone:"
msgstr ""
-#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
+#: gui/options.cpp:954 gui/options.cpp:956 gui/options.cpp:957
msgid "Analog joystick Deadzone"
msgstr ""
-#: gui/options.cpp:960
+#: gui/options.cpp:956
msgctxt "lowres"
msgid "Joy Deadzone:"
msgstr ""
-#: gui/options.cpp:974
+#: gui/options.cpp:970
msgid "HW Shader:"
msgstr ""
-#: gui/options.cpp:974 gui/options.cpp:976
+#: gui/options.cpp:970 gui/options.cpp:972
msgid "Different hardware shaders give different visual effects"
msgstr ""
-#: gui/options.cpp:976
+#: gui/options.cpp:972
msgctxt "lowres"
msgid "HW Shader:"
msgstr ""
-#: gui/options.cpp:977
+#: gui/options.cpp:973
msgid "Different shaders give different visual effects"
msgstr ""
-#: gui/options.cpp:994
+#: gui/options.cpp:990
msgid "Graphics mode:"
msgstr "Modu grafikoa:"
-#: gui/options.cpp:1008
+#: gui/options.cpp:1004
msgid "Render mode:"
msgstr "Renderizazioa:"
-#: gui/options.cpp:1008 gui/options.cpp:1009
+#: gui/options.cpp:1004 gui/options.cpp:1005
msgid "Special dithering modes supported by some games"
msgstr "Joko batzuk onarturiko lausotze-modu bereziak"
-#: gui/options.cpp:1020 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
+#: gui/options.cpp:1016 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2590
msgid "Fullscreen mode"
msgstr "Pantaila osoa"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
#, fuzzy
msgid "Filter graphics"
msgstr "Grafikoak"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Use linear filtering when scaling graphics"
msgstr ""
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Aspect ratio correction"
msgstr "Formatu-ratioaren zuzenketa"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Correct aspect ratio for 320x200 games"
msgstr "320x200 jokoentzako formatu-ratioa zuzendu"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Preferred Device:"
msgstr "Gogoko gailua:"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Music Device:"
msgstr "Musika gailua:"
-#: gui/options.cpp:1034 gui/options.cpp:1036
+#: gui/options.cpp:1030 gui/options.cpp:1032
msgid "Specifies preferred sound device or sound card emulator"
msgstr "Gogoko soinu txartel edo emuladorea zein den ezartzen du"
-#: gui/options.cpp:1034 gui/options.cpp:1036 gui/options.cpp:1037
+#: gui/options.cpp:1030 gui/options.cpp:1032 gui/options.cpp:1033
msgid "Specifies output sound device or sound card emulator"
msgstr "Irteerako soinu txartel edo emuladorea ezartzen du"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Gail. gogokoa:"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Music Device:"
msgstr "Musika gailua:"
-#: gui/options.cpp:1063
+#: gui/options.cpp:1059
msgid "AdLib emulator:"
msgstr "AdLib emuladorea:"
-#: gui/options.cpp:1063 gui/options.cpp:1064
+#: gui/options.cpp:1059 gui/options.cpp:1060
msgid "AdLib is used for music in many games"
msgstr "AdLib musikarako hainbat jokotan erabiltzen da"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "GM Device:"
msgstr "GM gailua:"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "Specifies default sound device for General MIDI output"
msgstr "Defektuzko soinu txartela ezartzen du General MIDI irteerarako"
-#: gui/options.cpp:1088
+#: gui/options.cpp:1084
msgid "Don't use General MIDI music"
msgstr "Ez erabili General MIDI musika"
-#: gui/options.cpp:1099 gui/options.cpp:1161
+#: gui/options.cpp:1095 gui/options.cpp:1157
msgid "Use first available device"
msgstr "Erabilgarri dagoen lehen gailua erabili"
-#: gui/options.cpp:1111
+#: gui/options.cpp:1107
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1111 gui/options.cpp:1113 gui/options.cpp:1114
+#: gui/options.cpp:1107 gui/options.cpp:1109 gui/options.cpp:1110
msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity"
msgstr ""
"Zenbait soinu txartel bateragarriak dira SoundFont-ekin, FluidSynth eta "
"Timidity besteak beste"
-#: gui/options.cpp:1113
+#: gui/options.cpp:1109
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Mixed AdLib/MIDI mode"
msgstr "AdLib/MIDI modua"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Use both MIDI and AdLib sound generation"
msgstr "Soinua sortzerakoan MIDI eta AdLib erabili"
-#: gui/options.cpp:1122
+#: gui/options.cpp:1118
msgid "MIDI gain:"
msgstr "MIDI irabazia:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "MT-32 Device:"
msgstr "MT-32 gailua:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
"Roland MT-32/LAPC1/CM32l/CM64 irteerarako defektuzko soinu txartela ezartzen "
"du"
-#: gui/options.cpp:1137
+#: gui/options.cpp:1133
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Benetako Roland MT-32 (GM emulazio gabe)"
-#: gui/options.cpp:1137 gui/options.cpp:1139
+#: gui/options.cpp:1133 gui/options.cpp:1135
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -1011,16 +1011,16 @@ msgstr ""
"Markatu ordenagailura konektaturiko Roland-ekin bateragarria den soinu-"
"gailua erabiltzeko"
-#: gui/options.cpp:1139
+#: gui/options.cpp:1135
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Benetako Roland MT-32 (GM emulazio gabe)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid "Roland GS Device (enable MT-32 mappings)"
msgstr "Roland GS Gailua (gaitu MT-32 bihurketak)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid ""
"Check if you want to enable patch mappings to emulate an MT-32 on a Roland "
"GS device"
@@ -1028,358 +1028,358 @@ msgstr ""
"Markatu Roland GS gailu batean MT-32 bat emulatzea ahalbidetzen "
"dutenbihurketak gaitzeko"
-#: gui/options.cpp:1151
+#: gui/options.cpp:1147
msgid "Don't use Roland MT-32 music"
msgstr "Ez erabili Roland MT-32 musika"
-#: gui/options.cpp:1178
+#: gui/options.cpp:1174
msgid "Text and Speech:"
msgstr "Testu eta ahotsa:"
-#: gui/options.cpp:1182 gui/options.cpp:1192
+#: gui/options.cpp:1178 gui/options.cpp:1188
msgid "Speech"
msgstr "Ahotsa"
-#: gui/options.cpp:1183 gui/options.cpp:1193
+#: gui/options.cpp:1179 gui/options.cpp:1189
msgid "Subtitles"
msgstr "Azpitituluak"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1180
msgid "Both"
msgstr "Biak"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1182
msgid "Subtitle speed:"
msgstr "Azpitit. abiadura:"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1184
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Testu eta ahotsa:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1188
msgid "Spch"
msgstr "Ahots."
-#: gui/options.cpp:1193
+#: gui/options.cpp:1189
msgid "Subs"
msgstr "Azp."
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgctxt "lowres"
msgid "Both"
msgstr "Biak"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgid "Show subtitles and play speech"
msgstr "Ahotsak erreproduzitu eta azpitituluak erakutsi"
-#: gui/options.cpp:1196
+#: gui/options.cpp:1192
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Azpit. abiadura:"
-#: gui/options.cpp:1212
+#: gui/options.cpp:1208
msgid "Music volume:"
msgstr "Musika:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1210
msgctxt "lowres"
msgid "Music volume:"
msgstr "Musika:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1217
msgid "Mute All"
msgstr "Mututu dena"
-#: gui/options.cpp:1224
+#: gui/options.cpp:1220
msgid "SFX volume:"
msgstr "Efektuak:"
-#: gui/options.cpp:1224 gui/options.cpp:1226 gui/options.cpp:1227
+#: gui/options.cpp:1220 gui/options.cpp:1222 gui/options.cpp:1223
msgid "Special sound effects volume"
msgstr "Soinu efektu berezien bolumena"
-#: gui/options.cpp:1226
+#: gui/options.cpp:1222
msgctxt "lowres"
msgid "SFX volume:"
msgstr "Efektuak:"
-#: gui/options.cpp:1234
+#: gui/options.cpp:1230
msgid "Speech volume:"
msgstr "Ahotsak:"
-#: gui/options.cpp:1236
+#: gui/options.cpp:1232
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Ahotsak:"
-#: gui/options.cpp:1438
+#: gui/options.cpp:1434
msgid "Shader"
msgstr ""
-#: gui/options.cpp:1450
+#: gui/options.cpp:1446
#, fuzzy
msgid "Control"
msgstr "Saguaren kontrola"
-#: gui/options.cpp:1476
+#: gui/options.cpp:1472
msgid "FluidSynth Settings"
msgstr "FluidSynth Ezarpenak"
-#: gui/options.cpp:1507
+#: gui/options.cpp:1503
msgid "Theme Path:"
msgstr "Gaiak:"
-#: gui/options.cpp:1509
+#: gui/options.cpp:1505
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Gaiak:"
-#: gui/options.cpp:1515 gui/options.cpp:1517 gui/options.cpp:1518
+#: gui/options.cpp:1511 gui/options.cpp:1513 gui/options.cpp:1514
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr ""
"Joko guztiek edo ScummVM-k darabilten datu gehigarrien bide-izena ezartzen du"
-#: gui/options.cpp:1524
+#: gui/options.cpp:1520
msgid "Plugins Path:"
msgstr "Pluginak:"
-#: gui/options.cpp:1526
+#: gui/options.cpp:1522
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Pluginak:"
-#: gui/options.cpp:1537
+#: gui/options.cpp:1533
msgctxt "lowres"
msgid "Misc"
msgstr "Beste"
-#: gui/options.cpp:1539
+#: gui/options.cpp:1535
msgid "Theme:"
msgstr "Gaia:"
-#: gui/options.cpp:1543
+#: gui/options.cpp:1539
msgid "GUI Renderer:"
msgstr "Interfazea:"
-#: gui/options.cpp:1555
+#: gui/options.cpp:1551
msgid "Autosave:"
msgstr "Autogordetzea:"
-#: gui/options.cpp:1557
+#: gui/options.cpp:1553
msgctxt "lowres"
msgid "Autosave:"
msgstr "Autogordetzea:"
-#: gui/options.cpp:1565
+#: gui/options.cpp:1561
msgid "Keys"
msgstr "Teklak"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "GUI Language:"
msgstr "Hizkuntza:"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "Language of ScummVM GUI"
msgstr "ScummVM interfazearen hizkuntza"
-#: gui/options.cpp:1600 gui/updates-dialog.cpp:86
+#: gui/options.cpp:1596 gui/updates-dialog.cpp:86
msgid "Update check:"
msgstr ""
-#: gui/options.cpp:1600
+#: gui/options.cpp:1596
msgid "How often to check ScummVM updates"
msgstr ""
-#: gui/options.cpp:1612
+#: gui/options.cpp:1608
msgid "Check now"
msgstr ""
-#: gui/options.cpp:1620
+#: gui/options.cpp:1616
msgid "Cloud"
msgstr ""
-#: gui/options.cpp:1622
+#: gui/options.cpp:1618
msgctxt "lowres"
msgid "Cloud"
msgstr ""
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Storage:"
msgstr ""
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Active cloud storage"
msgstr ""
-#: gui/options.cpp:1634 gui/options.cpp:2210
+#: gui/options.cpp:1630 gui/options.cpp:2206
msgid "<none>"
msgstr ""
-#: gui/options.cpp:1638 backends/platform/wii/options.cpp:114
+#: gui/options.cpp:1634 backends/platform/wii/options.cpp:114
msgid "Username:"
msgstr "Erabiltzaile-izena:"
-#: gui/options.cpp:1638
+#: gui/options.cpp:1634
msgid "Username used by this storage"
msgstr ""
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Used space:"
msgstr ""
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Space used by ScummVM's saved games on this storage"
msgstr ""
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "Last sync time:"
msgstr ""
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "When the last saved games sync for this storage occured"
msgstr ""
-#: gui/options.cpp:1647 gui/storagewizarddialog.cpp:71
+#: gui/options.cpp:1643 gui/storagewizarddialog.cpp:71
msgid "Connect"
msgstr ""
-#: gui/options.cpp:1647
+#: gui/options.cpp:1643
msgid "Open wizard dialog to connect your cloud storage account"
msgstr ""
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh"
msgstr ""
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh current cloud storage information (username and usage)"
msgstr ""
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
#, fuzzy
msgid "Download"
msgstr "Behera"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Open downloads manager dialog"
msgstr ""
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run server"
msgstr ""
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run local webserver"
msgstr ""
-#: gui/options.cpp:1652 gui/options.cpp:2320
+#: gui/options.cpp:1648 gui/options.cpp:2316
#, fuzzy
msgid "Not running"
msgstr "Jokoa exekutatzean errorea:"
-#: gui/options.cpp:1656
+#: gui/options.cpp:1652
#, fuzzy
msgid "/root/ Path:"
msgstr "Gehigarriak:"
-#: gui/options.cpp:1656 gui/options.cpp:1658 gui/options.cpp:1659
+#: gui/options.cpp:1652 gui/options.cpp:1654 gui/options.cpp:1655
#, fuzzy
msgid "Specifies which directory the Files Manager can access"
msgstr "Zure gordetako partidak non gordeko diren zehazten du"
-#: gui/options.cpp:1658
+#: gui/options.cpp:1654
#, fuzzy
msgctxt "lowres"
msgid "/root/ Path:"
msgstr "Gehigarriak:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
#, fuzzy
msgid "Server's port:"
msgstr "Zerbitzaria:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid ""
"Which port is used by the server\n"
"Auth with server is not available with non-default port"
msgstr ""
-#: gui/options.cpp:1681
+#: gui/options.cpp:1677
msgid "Apply"
msgstr ""
-#: gui/options.cpp:1824
+#: gui/options.cpp:1820
#, fuzzy
msgid "Failed to change cloud storage!"
msgstr "Ezin izan da jokoa gorde"
-#: gui/options.cpp:1827
+#: gui/options.cpp:1823
msgid "Another cloud storage is already active."
msgstr ""
-#: gui/options.cpp:1895
+#: gui/options.cpp:1891
#, fuzzy
msgid "Theme does not support selected language!"
msgstr "Motore-pluginak ez ditu gordetako partidak onartzen"
-#: gui/options.cpp:1898
+#: gui/options.cpp:1894
#, fuzzy
msgid "Theme cannot be loaded!"
msgstr "Jokoa EZ da kargatu"
-#: gui/options.cpp:1901
+#: gui/options.cpp:1897
msgid ""
"\n"
"Misc settings will be restored."
msgstr ""
-#: gui/options.cpp:1937
+#: gui/options.cpp:1933
msgid "The chosen directory cannot be written to. Please select another one."
msgstr "Aukeraturiko direktorioan ezin da idatzi. Mesedez, aukeratu beste bat."
-#: gui/options.cpp:1946
+#: gui/options.cpp:1942
msgid "Select directory for GUI themes"
msgstr "Gaien direktorioa aukeratu"
-#: gui/options.cpp:1956
+#: gui/options.cpp:1952
msgid "Select directory for extra files"
msgstr "Fitxategi gehigarrien direktorioa aukeratu"
-#: gui/options.cpp:1967
+#: gui/options.cpp:1963
msgid "Select directory for plugins"
msgstr "Pluginen direktorioa aukeratu"
-#: gui/options.cpp:1979
+#: gui/options.cpp:1975
#, fuzzy
msgid "Select directory for Files Manager /root/"
msgstr "Fitxategi gehigarrien direktorioa aukeratu"
-#: gui/options.cpp:2217
+#: gui/options.cpp:2213
#, c-format
msgid "%llu bytes"
msgstr ""
-#: gui/options.cpp:2225
+#: gui/options.cpp:2221
msgid "<right now>"
msgstr ""
-#: gui/options.cpp:2227
+#: gui/options.cpp:2223
#, fuzzy
msgid "<never>"
msgstr "Inoiz ez"
-#: gui/options.cpp:2311
+#: gui/options.cpp:2307
#, fuzzy
msgid "Stop server"
msgstr "Zerbitzaria:"
-#: gui/options.cpp:2312
+#: gui/options.cpp:2308
msgid "Stop local webserver"
msgstr ""
-#: gui/options.cpp:2403
+#: gui/options.cpp:2399
msgid ""
"Request failed.\n"
"Check your Internet connection."
@@ -1841,8 +1841,8 @@ msgstr "It~z~uli abiarazlera"
#: 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:106
-#: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:658
+#: engines/mohawk/riven.cpp:545 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
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
#: engines/toon/toon.cpp:3340 engines/tsage/scenes.cpp:599
@@ -1861,9 +1861,9 @@ msgstr "Gorde jokoa:"
#: engines/dm/loadsave.cpp:196 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:106 engines/neverhood/menumodule.cpp:880
-#: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:659
+#: engines/mohawk/dialogs.cpp:106 engines/mohawk/riven.cpp:545
+#: 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
#: engines/sherlock/scalpel/scalpel.cpp:1250
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
@@ -2176,7 +2176,7 @@ msgstr "Klikatzea desgaituta"
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Ukimen-pantailako 'kolpetxo modua' - Flotatu (DPad klikak)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
msgid "Do you want to quit ?"
msgstr "Benetan irten?"
@@ -3343,7 +3343,7 @@ msgid ""
"works."
msgstr ""
-#: engines/mohawk/riven.cpp:416
+#: engines/mohawk/riven.cpp:432
msgid "You are missing the following required Riven data files:\n"
msgstr ""
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 4b93909034..06f29269b8 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: 2017-12-10 15:25+0100\n"
+"POT-Creation-Date: 2017-12-26 21:11+0100\n"
"PO-Revision-Date: 2017-11-10 17:07+0000\n"
"Last-Translator: Timo Mikkolainen <tmikkola@gmail.com>\n"
"Language-Team: Finnish <https://translations.scummvm.org/projects/scummvm/"
@@ -58,7 +58,7 @@ msgstr "Siirry ylіs"
#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editgamedialog.cpp:292
#: gui/editrecorddialog.cpp:67 gui/filebrowser-dialog.cpp:64
#: gui/fluidsynth-dialog.cpp:152 gui/KeysDialog.cpp:43 gui/massadd.cpp:95
-#: gui/options.cpp:1680 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
+#: gui/options.cpp:1676 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
#: gui/recorderdialog.cpp:155 gui/remotebrowser.cpp:59
#: gui/saveload-dialog.cpp:383 gui/saveload-dialog.cpp:445
#: gui/saveload-dialog.cpp:727 gui/saveload-dialog.cpp:1121
@@ -117,7 +117,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -130,7 +130,7 @@ msgstr "Kyllф"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -153,7 +153,7 @@ msgstr ""
#: gui/downloaddialog.cpp:146 gui/editgamedialog.cpp:293
#: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:526
-#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1682
+#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1678
#: gui/saveload-dialog.cpp:1122 engines/engine.cpp:443 engines/engine.cpp:454
#: backends/platform/wii/options.cpp:47
#: backends/platform/wince/CELauncherDialog.cpp:54
@@ -239,8 +239,8 @@ msgstr ""
"Pelin kieli. Tфmф ei muuta esimerkiksi espanjankielistф versiota pelistф "
"englanninkieliseksi"
-#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:997
-#: gui/options.cpp:1010 gui/options.cpp:1575 audio/null.cpp:41
+#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:993
+#: gui/options.cpp:1006 gui/options.cpp:1571 audio/null.cpp:41
msgid "<default>"
msgstr "<oletus>"
@@ -262,11 +262,11 @@ msgstr "Alusta:"
msgid "Engine"
msgstr "Pelimoottori"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "Graphics"
msgstr "Grafiikka"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "GFX"
msgstr "GFX"
@@ -279,7 +279,7 @@ msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Ohita globaalit grafiikka-asetukset"
-#: gui/editgamedialog.cpp:196 gui/options.cpp:1457
+#: gui/editgamedialog.cpp:196 gui/options.cpp:1453
msgid "Audio"
msgstr "Ффni"
@@ -292,11 +292,11 @@ msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Ohita globaalit ффniasetukset"
-#: gui/editgamedialog.cpp:210 gui/options.cpp:1462
+#: gui/editgamedialog.cpp:210 gui/options.cpp:1458
msgid "Volume"
msgstr "Voimakkuus"
-#: gui/editgamedialog.cpp:212 gui/options.cpp:1464
+#: gui/editgamedialog.cpp:212 gui/options.cpp:1460
msgctxt "lowres"
msgid "Volume"
msgstr "Voimakkuus"
@@ -310,7 +310,7 @@ msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Ohita globaalit ффnenvoimakkuusasetukset"
-#: gui/editgamedialog.cpp:226 gui/options.cpp:1472
+#: gui/editgamedialog.cpp:226 gui/options.cpp:1468
msgid "MIDI"
msgstr "MIDI"
@@ -323,7 +323,7 @@ msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Ohita globaalit MIDI-asetukset"
-#: gui/editgamedialog.cpp:241 gui/options.cpp:1482
+#: gui/editgamedialog.cpp:241 gui/options.cpp:1478
msgid "MT-32"
msgstr "MT-32"
@@ -336,11 +336,11 @@ msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Ohita globaalit MT-32 asetukset"
-#: gui/editgamedialog.cpp:255 gui/options.cpp:1489
+#: gui/editgamedialog.cpp:255 gui/options.cpp:1485
msgid "Paths"
msgstr "Polut"
-#: gui/editgamedialog.cpp:257 gui/options.cpp:1491
+#: gui/editgamedialog.cpp:257 gui/options.cpp:1487
msgctxt "lowres"
msgid "Paths"
msgstr "Polut"
@@ -354,7 +354,7 @@ msgctxt "lowres"
msgid "Game Path:"
msgstr "Pelin polku:"
-#: gui/editgamedialog.cpp:271 gui/options.cpp:1515
+#: gui/editgamedialog.cpp:271 gui/options.cpp:1511
msgid "Extra Path:"
msgstr "Lisфkansio:"
@@ -363,44 +363,44 @@ msgstr "Lisфkansio:"
msgid "Specifies path to additional data used by the game"
msgstr "Mффrittфф polun lisфtiedostoihin joita peli mahdollisesti kфyttфф"
-#: gui/editgamedialog.cpp:273 gui/options.cpp:1517
+#: gui/editgamedialog.cpp:273 gui/options.cpp:1513
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Lisфkansio:"
-#: gui/editgamedialog.cpp:280 gui/options.cpp:1499
+#: gui/editgamedialog.cpp:280 gui/options.cpp:1495
msgid "Save Path:"
msgstr "Tallennuskansio:"
#: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282
-#: gui/editgamedialog.cpp:283 gui/options.cpp:1499 gui/options.cpp:1501
-#: gui/options.cpp:1502
+#: gui/editgamedialog.cpp:283 gui/options.cpp:1495 gui/options.cpp:1497
+#: gui/options.cpp:1498
msgid "Specifies where your saved games are put"
msgstr "Mффrittфф polun pelitallennuksille"
-#: gui/editgamedialog.cpp:282 gui/options.cpp:1501
+#: gui/editgamedialog.cpp:282 gui/options.cpp:1497
msgctxt "lowres"
msgid "Save Path:"
msgstr "Tallennuskansio:"
#: gui/editgamedialog.cpp:301 gui/editgamedialog.cpp:398
-#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1510
-#: gui/options.cpp:1518 gui/options.cpp:1527 gui/options.cpp:1707
-#: gui/options.cpp:1713 gui/options.cpp:1721 gui/options.cpp:1744
-#: gui/options.cpp:1777 gui/options.cpp:1783 gui/options.cpp:1790
-#: gui/options.cpp:1798 gui/options.cpp:1993 gui/options.cpp:1996
-#: gui/options.cpp:2003 gui/options.cpp:2013
+#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1506
+#: gui/options.cpp:1514 gui/options.cpp:1523 gui/options.cpp:1703
+#: gui/options.cpp:1709 gui/options.cpp:1717 gui/options.cpp:1740
+#: gui/options.cpp:1773 gui/options.cpp:1779 gui/options.cpp:1786
+#: gui/options.cpp:1794 gui/options.cpp:1989 gui/options.cpp:1992
+#: gui/options.cpp:1999 gui/options.cpp:2009
msgctxt "path"
msgid "None"
msgstr "Ei mффritelty"
#: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404
-#: gui/editgamedialog.cpp:522 gui/options.cpp:1701 gui/options.cpp:1771
-#: gui/options.cpp:1999 backends/platform/wii/options.cpp:56
+#: gui/editgamedialog.cpp:522 gui/options.cpp:1697 gui/options.cpp:1767
+#: gui/options.cpp:1995 backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Oletus"
-#: gui/editgamedialog.cpp:450 gui/options.cpp:2007
+#: gui/editgamedialog.cpp:450 gui/options.cpp:2003
msgid "Select SoundFont"
msgstr "Valitse SoundFont"
@@ -408,7 +408,7 @@ msgstr "Valitse SoundFont"
msgid "Select additional game directory"
msgstr "Valitse lisфhakemisto pelille"
-#: gui/editgamedialog.cpp:502 gui/options.cpp:1930
+#: gui/editgamedialog.cpp:502 gui/options.cpp:1926
msgid "Select directory for saved games"
msgstr "Valitse hakemisto pelitallennuksille"
@@ -500,7 +500,7 @@ msgstr "Sini"
msgid "Triangle"
msgstr "Kolmio"
-#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1535
+#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1531
msgid "Misc"
msgstr "Muut"
@@ -677,7 +677,7 @@ msgid "Search:"
msgstr "Etsi:"
#: gui/launcher.cpp:200 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:517
+#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:533
#: engines/pegasus/pegasus.cpp:355 engines/tsage/scenes.cpp:601
#: engines/wage/saveload.cpp:748
msgid "Load game:"
@@ -687,7 +687,7 @@ msgstr "Lataa peli:"
#: backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:105
-#: engines/mohawk/riven.cpp:517 engines/parallaction/saveload.cpp:194
+#: engines/mohawk/riven.cpp:533 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
msgid "Load"
@@ -800,211 +800,211 @@ msgstr "15 minuutin vфlein"
msgid "every 30 mins"
msgstr "30 minuutin vфlein"
-#: gui/options.cpp:343 gui/options.cpp:640 gui/options.cpp:778
-#: gui/options.cpp:853 gui/options.cpp:1114
+#: gui/options.cpp:339 gui/options.cpp:636 gui/options.cpp:774
+#: gui/options.cpp:849 gui/options.cpp:1110
msgctxt "soundfont"
msgid "None"
msgstr "Ei kфytіssф"
-#: gui/options.cpp:514
+#: gui/options.cpp:510
msgid "Failed to apply some of the graphic options changes:"
msgstr "Joitain grafiikka-asetuksia ei saatu asetettua:"
-#: gui/options.cpp:526
+#: gui/options.cpp:522
msgid "the video mode could not be changed."
msgstr "videotilaa ei voitu vaihtaa."
-#: gui/options.cpp:532
+#: gui/options.cpp:528
msgid "the aspect ratio setting could not be changed"
msgstr "kuvasuhdekorjausasetusta ei voitu muuttaa"
-#: gui/options.cpp:538
+#: gui/options.cpp:534
msgid "the fullscreen setting could not be changed"
msgstr "kokoruututilaa ei voitu muuttaa"
-#: gui/options.cpp:544
+#: gui/options.cpp:540
msgid "the filtering setting could not be changed"
msgstr "Suodatusasetusta ei voitu muuttaa"
-#: gui/options.cpp:932
+#: gui/options.cpp:928
msgid "Show On-screen control"
msgstr "Virtuaalikontrollit"
-#: gui/options.cpp:936
+#: gui/options.cpp:932
msgid "Touchpad mouse mode"
msgstr "Touchpad hiiritila"
-#: gui/options.cpp:940
+#: gui/options.cpp:936
msgid "Swap Menu and Back buttons"
msgstr "Vaihda Menu ja Takaisin nappien paikkaa"
-#: gui/options.cpp:945
+#: gui/options.cpp:941
msgid "Pointer Speed:"
msgstr "Osoittimen Nopeus:"
-#: gui/options.cpp:945 gui/options.cpp:947 gui/options.cpp:948
+#: gui/options.cpp:941 gui/options.cpp:943 gui/options.cpp:944
msgid "Speed for keyboard/joystick mouse pointer control"
msgstr "Nфppфimistі/joystick hiiriosoittimen nopeus"
-#: gui/options.cpp:947
+#: gui/options.cpp:943
msgctxt "lowres"
msgid "Pointer Speed:"
msgstr "Osoittimen Nopeus:"
-#: gui/options.cpp:958
+#: gui/options.cpp:954
msgid "Joy Deadzone:"
msgstr "Joystickin Kuollut Alue:"
-#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
+#: gui/options.cpp:954 gui/options.cpp:956 gui/options.cpp:957
msgid "Analog joystick Deadzone"
msgstr "Analogisen joystickin kuollut alue"
-#: gui/options.cpp:960
+#: gui/options.cpp:956
msgctxt "lowres"
msgid "Joy Deadzone:"
msgstr "Joystickin Kuollut Alue:"
-#: gui/options.cpp:974
+#: gui/options.cpp:970
msgid "HW Shader:"
msgstr "Laitteistosфvytin:"
-#: gui/options.cpp:974 gui/options.cpp:976
+#: gui/options.cpp:970 gui/options.cpp:972
msgid "Different hardware shaders give different visual effects"
msgstr "Laitteistosфvyttimet tuottavat erilaisia visuaalisia efektejф"
-#: gui/options.cpp:976
+#: gui/options.cpp:972
msgctxt "lowres"
msgid "HW Shader:"
msgstr "Laitteistosфvytin:"
-#: gui/options.cpp:977
+#: gui/options.cpp:973
msgid "Different shaders give different visual effects"
msgstr "Laitteistosфvyttimet tuottavat erilaisia visuaalisia efektejф"
-#: gui/options.cpp:994
+#: gui/options.cpp:990
msgid "Graphics mode:"
msgstr "Grafiikkatila:"
-#: gui/options.cpp:1008
+#: gui/options.cpp:1004
msgid "Render mode:"
msgstr "Renderіintitila:"
-#: gui/options.cpp:1008 gui/options.cpp:1009
+#: gui/options.cpp:1004 gui/options.cpp:1005
msgid "Special dithering modes supported by some games"
msgstr "Erityiset dithering asetukset joita jotkut pelit tukevat"
-#: gui/options.cpp:1020 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
+#: gui/options.cpp:1016 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2590
msgid "Fullscreen mode"
msgstr "Kokoruututila"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Filter graphics"
msgstr "Suodata grafiikka"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Use linear filtering when scaling graphics"
msgstr "Kфytф bilineaarista suodatinta grafiikan skaalauksessa"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Aspect ratio correction"
msgstr "Kuvasuhteen korjaus"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Correct aspect ratio for 320x200 games"
msgstr "Korjaa kuvasuhde 320x200 peleille"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Preferred Device:"
msgstr "Ensisijainen laite:"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Music Device:"
msgstr "Musiikkilaite:"
-#: gui/options.cpp:1034 gui/options.cpp:1036
+#: gui/options.cpp:1030 gui/options.cpp:1032
msgid "Specifies preferred sound device or sound card emulator"
msgstr ""
"Mффrittфф ффnilaitteen tai ффnikorttiemulaattorin jota ensisijaisesti tulisi "
"kфyttфф"
-#: gui/options.cpp:1034 gui/options.cpp:1036 gui/options.cpp:1037
+#: gui/options.cpp:1030 gui/options.cpp:1032 gui/options.cpp:1033
msgid "Specifies output sound device or sound card emulator"
msgstr "Mффrittфф ффnikortin tai ффnikorttia emuloivan ohjelmiston"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Ensisijainen:"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Music Device:"
msgstr "Musiikkilaite:"
-#: gui/options.cpp:1063
+#: gui/options.cpp:1059
msgid "AdLib emulator:"
msgstr "AdLib emulaattori:"
-#: gui/options.cpp:1063 gui/options.cpp:1064
+#: gui/options.cpp:1059 gui/options.cpp:1060
msgid "AdLib is used for music in many games"
msgstr "AdLibiф kфytetффn monien pelien musiikeissa"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "GM Device:"
msgstr "GM laite:"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "Specifies default sound device for General MIDI output"
msgstr "Mффrittфф oletuksena kфytettфvфn ффnilaitteen General MIDIlle"
-#: gui/options.cpp:1088
+#: gui/options.cpp:1084
msgid "Don't use General MIDI music"
msgstr "Фlф kфytф General MIDIф musiikissa"
-#: gui/options.cpp:1099 gui/options.cpp:1161
+#: gui/options.cpp:1095 gui/options.cpp:1157
msgid "Use first available device"
msgstr "Kфytф ensimmфistф laitetta"
-#: gui/options.cpp:1111
+#: gui/options.cpp:1107
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1111 gui/options.cpp:1113 gui/options.cpp:1114
+#: gui/options.cpp:1107 gui/options.cpp:1109 gui/options.cpp:1110
msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity"
msgstr ""
"Jotkut ффnikortit tukevat ффnifonttia (SoundFont), FluidSynth ja Timidity"
-#: gui/options.cpp:1113
+#: gui/options.cpp:1109
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Mixed AdLib/MIDI mode"
msgstr "Yhdistetty AdLib/MIDI tila"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Use both MIDI and AdLib sound generation"
msgstr "Kфytф sekф MIDIф ettф Adlibiф ффnentuotantoon"
-#: gui/options.cpp:1122
+#: gui/options.cpp:1118
msgid "MIDI gain:"
msgstr "MIDIn ффnilisфys:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "MT-32 Device:"
msgstr "MT-32 laite:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr "Mффrittфф oletusффnilaitteen Roland MT-32/LAPC1/CM32l/CM64:n kфyttііn"
-#: gui/options.cpp:1137
+#: gui/options.cpp:1133
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Aito Roland MT-32 (ei GM emulointia)"
-#: gui/options.cpp:1137 gui/options.cpp:1139
+#: gui/options.cpp:1133 gui/options.cpp:1135
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -1012,16 +1012,16 @@ msgstr ""
"Valitse jos haluat kфyttфф aitoa Roland-yhteensopivaa laittetta joka on "
"kytketty tietokoneeseesi"
-#: gui/options.cpp:1139
+#: gui/options.cpp:1135
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Aito Roland MT-32 (ei GM emulointia)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid "Roland GS Device (enable MT-32 mappings)"
msgstr "Roland GS Laite (aktivoi MT-32 mappaukset)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid ""
"Check if you want to enable patch mappings to emulate an MT-32 on a Roland "
"GS device"
@@ -1029,273 +1029,273 @@ msgstr ""
"Valitse jos haluat kфyttфф patch mappingia MT-32:n emulointiin Roland GS "
"laitteella"
-#: gui/options.cpp:1151
+#: gui/options.cpp:1147
msgid "Don't use Roland MT-32 music"
msgstr "Фlф kфytф Roland MT-32 musiikkia"
-#: gui/options.cpp:1178
+#: gui/options.cpp:1174
msgid "Text and Speech:"
msgstr "Tekstitys ja puhe:"
-#: gui/options.cpp:1182 gui/options.cpp:1192
+#: gui/options.cpp:1178 gui/options.cpp:1188
msgid "Speech"
msgstr "Puhe"
-#: gui/options.cpp:1183 gui/options.cpp:1193
+#: gui/options.cpp:1179 gui/options.cpp:1189
msgid "Subtitles"
msgstr "Tekstitys"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1180
msgid "Both"
msgstr "Molemmat"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1182
msgid "Subtitle speed:"
msgstr "Tekstityksen nopeus:"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1184
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Tekstitys ja puhe:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1188
msgid "Spch"
msgstr "Puhe"
-#: gui/options.cpp:1193
+#: gui/options.cpp:1189
msgid "Subs"
msgstr "Tekstit"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgctxt "lowres"
msgid "Both"
msgstr "Molemmat"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgid "Show subtitles and play speech"
msgstr "Nфytф tekstitys ja kфytф puhetta"
-#: gui/options.cpp:1196
+#: gui/options.cpp:1192
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Tekstityksen nopeus:"
-#: gui/options.cpp:1212
+#: gui/options.cpp:1208
msgid "Music volume:"
msgstr "Musiikki:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1210
msgctxt "lowres"
msgid "Music volume:"
msgstr "Musiikki:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1217
msgid "Mute All"
msgstr "Vaimenna"
-#: gui/options.cpp:1224
+#: gui/options.cpp:1220
msgid "SFX volume:"
msgstr "Ффniefektit:"
-#: gui/options.cpp:1224 gui/options.cpp:1226 gui/options.cpp:1227
+#: gui/options.cpp:1220 gui/options.cpp:1222 gui/options.cpp:1223
msgid "Special sound effects volume"
msgstr "Erikoisefektit"
-#: gui/options.cpp:1226
+#: gui/options.cpp:1222
msgctxt "lowres"
msgid "SFX volume:"
msgstr "Ффniefektit:"
-#: gui/options.cpp:1234
+#: gui/options.cpp:1230
msgid "Speech volume:"
msgstr "Puhe:"
-#: gui/options.cpp:1236
+#: gui/options.cpp:1232
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Puhe:"
-#: gui/options.cpp:1438
+#: gui/options.cpp:1434
msgid "Shader"
msgstr "Sфvytin"
-#: gui/options.cpp:1450
+#: gui/options.cpp:1446
msgid "Control"
msgstr "Kontrollit"
-#: gui/options.cpp:1476
+#: gui/options.cpp:1472
msgid "FluidSynth Settings"
msgstr "FluidSynth asetukset"
-#: gui/options.cpp:1507
+#: gui/options.cpp:1503
msgid "Theme Path:"
msgstr "Teemojen polku:"
-#: gui/options.cpp:1509
+#: gui/options.cpp:1505
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Teemojen polku:"
-#: gui/options.cpp:1515 gui/options.cpp:1517 gui/options.cpp:1518
+#: gui/options.cpp:1511 gui/options.cpp:1513 gui/options.cpp:1514
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr ""
"Mффrittфф polun, jossa on lisфtiedostoja joita ScummVM tai kaikki pelit "
"kфyttфvфt"
-#: gui/options.cpp:1524
+#: gui/options.cpp:1520
msgid "Plugins Path:"
msgstr "Pluginien sijainti:"
-#: gui/options.cpp:1526
+#: gui/options.cpp:1522
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Pluginien sijainti:"
-#: gui/options.cpp:1537
+#: gui/options.cpp:1533
msgctxt "lowres"
msgid "Misc"
msgstr "Muut"
-#: gui/options.cpp:1539
+#: gui/options.cpp:1535
msgid "Theme:"
msgstr "Teema:"
-#: gui/options.cpp:1543
+#: gui/options.cpp:1539
msgid "GUI Renderer:"
msgstr "GUI renderіijф:"
-#: gui/options.cpp:1555
+#: gui/options.cpp:1551
msgid "Autosave:"
msgstr "Autom. tallennus:"
-#: gui/options.cpp:1557
+#: gui/options.cpp:1553
msgctxt "lowres"
msgid "Autosave:"
msgstr "Autom. tallennus:"
-#: gui/options.cpp:1565
+#: gui/options.cpp:1561
msgid "Keys"
msgstr "Nфppфimet"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "GUI Language:"
msgstr "ScummVM:n kieli:"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "Language of ScummVM GUI"
msgstr "ScummVM kфyttіliittymфn kieli"
-#: gui/options.cpp:1600 gui/updates-dialog.cpp:86
+#: gui/options.cpp:1596 gui/updates-dialog.cpp:86
msgid "Update check:"
msgstr "Pфivitystarkistus:"
-#: gui/options.cpp:1600
+#: gui/options.cpp:1596
msgid "How often to check ScummVM updates"
msgstr "Kuinka usein tarkistetaan onko ScummVM:ффn pфivityksiф"
-#: gui/options.cpp:1612
+#: gui/options.cpp:1608
msgid "Check now"
msgstr "Tarkista nyt"
-#: gui/options.cpp:1620
+#: gui/options.cpp:1616
msgid "Cloud"
msgstr "Pilvi"
-#: gui/options.cpp:1622
+#: gui/options.cpp:1618
msgctxt "lowres"
msgid "Cloud"
msgstr "Pilvi"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Storage:"
msgstr "Tallennustila:"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Active cloud storage"
msgstr "Aktiivinen pilvitallennus"
-#: gui/options.cpp:1634 gui/options.cpp:2210
+#: gui/options.cpp:1630 gui/options.cpp:2206
msgid "<none>"
msgstr "<tyhjф>"
-#: gui/options.cpp:1638 backends/platform/wii/options.cpp:114
+#: gui/options.cpp:1634 backends/platform/wii/options.cpp:114
msgid "Username:"
msgstr "Kфyttфjфnimi:"
-#: gui/options.cpp:1638
+#: gui/options.cpp:1634
msgid "Username used by this storage"
msgstr "Tallennustilan kфyttфjфnimi"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Used space:"
msgstr "Kфytetty tila:"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Space used by ScummVM's saved games on this storage"
msgstr "ScummVM:n pelitallennusten kфyttфmф tila tallennustilassa"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "Last sync time:"
msgstr "Viimeisin synkronointi:"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "When the last saved games sync for this storage occured"
msgstr "Milloin pelitallennukset viimeksi synkronoitiin tфhфn tallennustilaan"
-#: gui/options.cpp:1647 gui/storagewizarddialog.cpp:71
+#: gui/options.cpp:1643 gui/storagewizarddialog.cpp:71
msgid "Connect"
msgstr "Yhdistф"
-#: gui/options.cpp:1647
+#: gui/options.cpp:1643
msgid "Open wizard dialog to connect your cloud storage account"
msgstr "Avaa velhodialogi pilvitilan tiliin kirjautumiseen"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh"
msgstr "Pфivitф"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh current cloud storage information (username and usage)"
msgstr "Pфivitф tфmфnhetkiset pilvitilan tiedot (kфyttфjфnimi ja kфyttіaste)"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Download"
msgstr "Lataa"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Open downloads manager dialog"
msgstr "Avaa lataustenhallintadialogi"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run server"
msgstr "Kфynnistф palvelin"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run local webserver"
msgstr "Kфynnistф paikallinen webpalvelin"
-#: gui/options.cpp:1652 gui/options.cpp:2320
+#: gui/options.cpp:1648 gui/options.cpp:2316
msgid "Not running"
msgstr "Ei kфynnissф"
-#: gui/options.cpp:1656
+#: gui/options.cpp:1652
msgid "/root/ Path:"
msgstr "/root/-polku:"
-#: gui/options.cpp:1656 gui/options.cpp:1658 gui/options.cpp:1659
+#: gui/options.cpp:1652 gui/options.cpp:1654 gui/options.cpp:1655
msgid "Specifies which directory the Files Manager can access"
msgstr "Mффrittфф hakemiston johon tiedostonhallinnalla on pффsy"
-#: gui/options.cpp:1658
+#: gui/options.cpp:1654
msgctxt "lowres"
msgid "/root/ Path:"
msgstr "/root/-polku:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid "Server's port:"
msgstr "Palvelimen portti:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid ""
"Which port is used by the server\n"
"Auth with server is not available with non-default port"
@@ -1303,27 +1303,27 @@ msgstr ""
"Palvelimen kфyttфmф portti\n"
"Autentikaatio palvelimella on mahdollista vain vakioportilla"
-#: gui/options.cpp:1681
+#: gui/options.cpp:1677
msgid "Apply"
msgstr "Kфytф"
-#: gui/options.cpp:1824
+#: gui/options.cpp:1820
msgid "Failed to change cloud storage!"
msgstr "Pilvitallennustilan vaihtaminen epфonnistui!"
-#: gui/options.cpp:1827
+#: gui/options.cpp:1823
msgid "Another cloud storage is already active."
msgstr "Toinen pilvitila on jo aktiivinen."
-#: gui/options.cpp:1895
+#: gui/options.cpp:1891
msgid "Theme does not support selected language!"
msgstr "Teema ei tue valittua kieltф!"
-#: gui/options.cpp:1898
+#: gui/options.cpp:1894
msgid "Theme cannot be loaded!"
msgstr "Teemaa ei pystytф lataamaan!"
-#: gui/options.cpp:1901
+#: gui/options.cpp:1897
msgid ""
"\n"
"Misc settings will be restored."
@@ -1331,48 +1331,48 @@ msgstr ""
"\n"
"Muut asetukset palautetaan."
-#: gui/options.cpp:1937
+#: gui/options.cpp:1933
msgid "The chosen directory cannot be written to. Please select another one."
msgstr "Valittuun hakemistoon ei voi kirjoittaa. Valitse toinen hakemisto."
-#: gui/options.cpp:1946
+#: gui/options.cpp:1942
msgid "Select directory for GUI themes"
msgstr "Valitse hakemisto kфyttіliittymфn teemoille"
-#: gui/options.cpp:1956
+#: gui/options.cpp:1952
msgid "Select directory for extra files"
msgstr "Valitse hakemisto lisфtiedostoille"
-#: gui/options.cpp:1967
+#: gui/options.cpp:1963
msgid "Select directory for plugins"
msgstr "Valitse hakemisto plugineille"
-#: gui/options.cpp:1979
+#: gui/options.cpp:1975
msgid "Select directory for Files Manager /root/"
msgstr "Valitse /root/ hakemisto tiedostonhallinnalle"
-#: gui/options.cpp:2217
+#: gui/options.cpp:2213
#, c-format
msgid "%llu bytes"
msgstr "%llu tavua"
-#: gui/options.cpp:2225
+#: gui/options.cpp:2221
msgid "<right now>"
msgstr "<nyt>"
-#: gui/options.cpp:2227
+#: gui/options.cpp:2223
msgid "<never>"
msgstr "<ei koskaan>"
-#: gui/options.cpp:2311
+#: gui/options.cpp:2307
msgid "Stop server"
msgstr "Pysфytф palvelin"
-#: gui/options.cpp:2312
+#: gui/options.cpp:2308
msgid "Stop local webserver"
msgstr "Pysфytф paikallinen webpalvelin"
-#: gui/options.cpp:2403
+#: gui/options.cpp:2399
msgid ""
"Request failed.\n"
"Check your Internet connection."
@@ -1843,8 +1843,8 @@ msgstr "Palaa p~e~livalitsimeen"
#: 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:106
-#: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:658
+#: engines/mohawk/riven.cpp:545 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
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
#: engines/toon/toon.cpp:3340 engines/tsage/scenes.cpp:599
@@ -1863,9 +1863,9 @@ msgstr "Tallenna peli:"
#: engines/dm/loadsave.cpp:196 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:106 engines/neverhood/menumodule.cpp:880
-#: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:659
+#: engines/mohawk/dialogs.cpp:106 engines/mohawk/riven.cpp:545
+#: 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
#: engines/sherlock/scalpel/scalpel.cpp:1250
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
@@ -2176,7 +2176,7 @@ msgstr "Klikkaus pois pффltф"
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Kosketusnфytіn 'Tap moodi' - Hover (DPad klikkaus)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
msgid "Do you want to quit ?"
msgstr "Haluatko lopettaa?"
@@ -3330,7 +3330,7 @@ msgstr ""
"Sinulta puuttuu \"extras.mhk\". \"archriven.z\" asennustiedoston kфyttі "
"toimii myіs."
-#: engines/mohawk/riven.cpp:416
+#: engines/mohawk/riven.cpp:432
msgid "You are missing the following required Riven data files:\n"
msgstr "Sinulta puuttuu seuraavat vaaditut Rivenin datatiedostot:\n"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 461b00a27c..6cda422451 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: 2017-12-10 15:25+0100\n"
+"POT-Creation-Date: 2017-12-26 21:11+0100\n"
"PO-Revision-Date: 2017-11-12 22:44+0000\n"
"Last-Translator: Thierry Crozat <criezy@scummvm.org>\n"
"Language-Team: French <https://translations.scummvm.org/projects/scummvm/"
@@ -58,7 +58,7 @@ msgstr "Remonter"
#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editgamedialog.cpp:292
#: gui/editrecorddialog.cpp:67 gui/filebrowser-dialog.cpp:64
#: gui/fluidsynth-dialog.cpp:152 gui/KeysDialog.cpp:43 gui/massadd.cpp:95
-#: gui/options.cpp:1680 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
+#: gui/options.cpp:1676 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
#: gui/recorderdialog.cpp:155 gui/remotebrowser.cpp:59
#: gui/saveload-dialog.cpp:383 gui/saveload-dialog.cpp:445
#: gui/saveload-dialog.cpp:727 gui/saveload-dialog.cpp:1121
@@ -118,7 +118,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -131,7 +131,7 @@ msgstr "Oui"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -154,7 +154,7 @@ msgstr ""
#: gui/downloaddialog.cpp:146 gui/editgamedialog.cpp:293
#: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:526
-#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1682
+#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1678
#: gui/saveload-dialog.cpp:1122 engines/engine.cpp:443 engines/engine.cpp:454
#: backends/platform/wii/options.cpp:47
#: backends/platform/wince/CELauncherDialog.cpp:54
@@ -240,8 +240,8 @@ msgstr ""
"Langue du jeu. Cela ne traduira pas en anglais par magie votre version "
"espagnole du jeu."
-#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:997
-#: gui/options.cpp:1010 gui/options.cpp:1575 audio/null.cpp:41
+#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:993
+#: gui/options.cpp:1006 gui/options.cpp:1571 audio/null.cpp:41
msgid "<default>"
msgstr "<dщfaut>"
@@ -263,11 +263,11 @@ msgstr "Systшme :"
msgid "Engine"
msgstr "Moteur"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "Graphics"
msgstr "Graphique"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "GFX"
msgstr "GFX"
@@ -280,7 +280,7 @@ msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Rщglages spщcifiques р ce jeu"
-#: gui/editgamedialog.cpp:196 gui/options.cpp:1457
+#: gui/editgamedialog.cpp:196 gui/options.cpp:1453
msgid "Audio"
msgstr "Audio"
@@ -293,11 +293,11 @@ msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Rщglages spщcifiques р ce jeu"
-#: gui/editgamedialog.cpp:210 gui/options.cpp:1462
+#: gui/editgamedialog.cpp:210 gui/options.cpp:1458
msgid "Volume"
msgstr "Volume"
-#: gui/editgamedialog.cpp:212 gui/options.cpp:1464
+#: gui/editgamedialog.cpp:212 gui/options.cpp:1460
msgctxt "lowres"
msgid "Volume"
msgstr "Volume"
@@ -311,7 +311,7 @@ msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Rщglages spщcifiques р ce jeu"
-#: gui/editgamedialog.cpp:226 gui/options.cpp:1472
+#: gui/editgamedialog.cpp:226 gui/options.cpp:1468
msgid "MIDI"
msgstr "MIDI"
@@ -324,7 +324,7 @@ msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Rщglages spщcifiques р ce jeu"
-#: gui/editgamedialog.cpp:241 gui/options.cpp:1482
+#: gui/editgamedialog.cpp:241 gui/options.cpp:1478
msgid "MT-32"
msgstr "MT-32"
@@ -337,11 +337,11 @@ msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Rщglages spщcifiques р ce jeu"
-#: gui/editgamedialog.cpp:255 gui/options.cpp:1489
+#: gui/editgamedialog.cpp:255 gui/options.cpp:1485
msgid "Paths"
msgstr "Chemins"
-#: gui/editgamedialog.cpp:257 gui/options.cpp:1491
+#: gui/editgamedialog.cpp:257 gui/options.cpp:1487
msgctxt "lowres"
msgid "Paths"
msgstr "Chemins"
@@ -355,7 +355,7 @@ msgctxt "lowres"
msgid "Game Path:"
msgstr "Chemin du Jeu :"
-#: gui/editgamedialog.cpp:271 gui/options.cpp:1515
+#: gui/editgamedialog.cpp:271 gui/options.cpp:1511
msgid "Extra Path:"
msgstr "Extra :"
@@ -365,44 +365,44 @@ msgid "Specifies path to additional data used by the game"
msgstr ""
"Dщfinie un chemin vers des donnщes supplщmentaires utilisщes par le jeu"
-#: gui/editgamedialog.cpp:273 gui/options.cpp:1517
+#: gui/editgamedialog.cpp:273 gui/options.cpp:1513
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Extra :"
-#: gui/editgamedialog.cpp:280 gui/options.cpp:1499
+#: gui/editgamedialog.cpp:280 gui/options.cpp:1495
msgid "Save Path:"
msgstr "Sauvegardes :"
#: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282
-#: gui/editgamedialog.cpp:283 gui/options.cpp:1499 gui/options.cpp:1501
-#: gui/options.cpp:1502
+#: gui/editgamedialog.cpp:283 gui/options.cpp:1495 gui/options.cpp:1497
+#: gui/options.cpp:1498
msgid "Specifies where your saved games are put"
msgstr "Dщfinit l'emplacement oљ les fichiers de sauvegarde sont crщщs"
-#: gui/editgamedialog.cpp:282 gui/options.cpp:1501
+#: gui/editgamedialog.cpp:282 gui/options.cpp:1497
msgctxt "lowres"
msgid "Save Path:"
msgstr "Sauvegardes :"
#: gui/editgamedialog.cpp:301 gui/editgamedialog.cpp:398
-#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1510
-#: gui/options.cpp:1518 gui/options.cpp:1527 gui/options.cpp:1707
-#: gui/options.cpp:1713 gui/options.cpp:1721 gui/options.cpp:1744
-#: gui/options.cpp:1777 gui/options.cpp:1783 gui/options.cpp:1790
-#: gui/options.cpp:1798 gui/options.cpp:1993 gui/options.cpp:1996
-#: gui/options.cpp:2003 gui/options.cpp:2013
+#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1506
+#: gui/options.cpp:1514 gui/options.cpp:1523 gui/options.cpp:1703
+#: gui/options.cpp:1709 gui/options.cpp:1717 gui/options.cpp:1740
+#: gui/options.cpp:1773 gui/options.cpp:1779 gui/options.cpp:1786
+#: gui/options.cpp:1794 gui/options.cpp:1989 gui/options.cpp:1992
+#: gui/options.cpp:1999 gui/options.cpp:2009
msgctxt "path"
msgid "None"
msgstr "Aucun"
#: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404
-#: gui/editgamedialog.cpp:522 gui/options.cpp:1701 gui/options.cpp:1771
-#: gui/options.cpp:1999 backends/platform/wii/options.cpp:56
+#: gui/editgamedialog.cpp:522 gui/options.cpp:1697 gui/options.cpp:1767
+#: gui/options.cpp:1995 backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Dщfaut"
-#: gui/editgamedialog.cpp:450 gui/options.cpp:2007
+#: gui/editgamedialog.cpp:450 gui/options.cpp:2003
msgid "Select SoundFont"
msgstr "Choisir une banque de sons"
@@ -410,7 +410,7 @@ msgstr "Choisir une banque de sons"
msgid "Select additional game directory"
msgstr "Sщlectionner un rщpertoire supplщmentaire"
-#: gui/editgamedialog.cpp:502 gui/options.cpp:1930
+#: gui/editgamedialog.cpp:502 gui/options.cpp:1926
msgid "Select directory for saved games"
msgstr "Sщlectionner le rщpertoire pour les sauvegardes"
@@ -503,7 +503,7 @@ msgstr "Sinus"
msgid "Triangle"
msgstr "Triangle"
-#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1535
+#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1531
msgid "Misc"
msgstr "Divers"
@@ -683,7 +683,7 @@ msgid "Search:"
msgstr "Filtre :"
#: gui/launcher.cpp:200 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:517
+#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:533
#: engines/pegasus/pegasus.cpp:355 engines/tsage/scenes.cpp:601
#: engines/wage/saveload.cpp:748
msgid "Load game:"
@@ -693,7 +693,7 @@ msgstr "Charger le jeu :"
#: backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:105
-#: engines/mohawk/riven.cpp:517 engines/parallaction/saveload.cpp:194
+#: engines/mohawk/riven.cpp:533 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
msgid "Load"
@@ -806,217 +806,217 @@ msgstr "Toutes les 15 mins"
msgid "every 30 mins"
msgstr "Toutes les 30 mins"
-#: gui/options.cpp:343 gui/options.cpp:640 gui/options.cpp:778
-#: gui/options.cpp:853 gui/options.cpp:1114
+#: gui/options.cpp:339 gui/options.cpp:636 gui/options.cpp:774
+#: gui/options.cpp:849 gui/options.cpp:1110
msgctxt "soundfont"
msgid "None"
msgstr "Aucune"
-#: gui/options.cpp:514
+#: gui/options.cpp:510
msgid "Failed to apply some of the graphic options changes:"
msgstr "Certaines options graphiques n'ont pu ъtre changщes :"
-#: gui/options.cpp:526
+#: gui/options.cpp:522
msgid "the video mode could not be changed."
msgstr "le mode vidщo n'a pu ъtre changщ."
-#: gui/options.cpp:532
+#: gui/options.cpp:528
msgid "the aspect ratio setting could not be changed"
msgstr "la correction de rapport d'aspect n'a pu ъtre changщe"
-#: gui/options.cpp:538
+#: gui/options.cpp:534
msgid "the fullscreen setting could not be changed"
msgstr "le mode plein щcran n'a pu ъtre changщ"
-#: gui/options.cpp:544
+#: gui/options.cpp:540
msgid "the filtering setting could not be changed"
msgstr "le mode de filtrage n'a pu ъtre changщ"
-#: gui/options.cpp:932
+#: gui/options.cpp:928
msgid "Show On-screen control"
msgstr "Afficher les contrєles sur l'щcran"
-#: gui/options.cpp:936
+#: gui/options.cpp:932
msgid "Touchpad mouse mode"
msgstr "Souris en mode Touchpad"
-#: gui/options.cpp:940
+#: gui/options.cpp:936
msgid "Swap Menu and Back buttons"
msgstr "Inverser les boutons Menu et Retour"
-#: gui/options.cpp:945
+#: gui/options.cpp:941
msgid "Pointer Speed:"
msgstr "Vitesse du pointeur :"
-#: gui/options.cpp:945 gui/options.cpp:947 gui/options.cpp:948
+#: gui/options.cpp:941 gui/options.cpp:943 gui/options.cpp:944
msgid "Speed for keyboard/joystick mouse pointer control"
msgstr ""
"Vitesse du pointeur de souris pour les contrєles par clavier ou joystick"
-#: gui/options.cpp:947
+#: gui/options.cpp:943
msgctxt "lowres"
msgid "Pointer Speed:"
msgstr "Vitesse du pointeur :"
-#: gui/options.cpp:958
+#: gui/options.cpp:954
msgid "Joy Deadzone:"
msgstr "Zone inactive du joystick :"
-#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
+#: gui/options.cpp:954 gui/options.cpp:956 gui/options.cpp:957
msgid "Analog joystick Deadzone"
msgstr "Zone inactive du joystick analogique"
-#: gui/options.cpp:960
+#: gui/options.cpp:956
msgctxt "lowres"
msgid "Joy Deadzone:"
msgstr "Zone inactive du joystick :"
-#: gui/options.cpp:974
+#: gui/options.cpp:970
msgid "HW Shader:"
msgstr "Shader :"
-#: gui/options.cpp:974 gui/options.cpp:976
+#: gui/options.cpp:970 gui/options.cpp:972
msgid "Different hardware shaders give different visual effects"
msgstr "Les divers shaders matщriels crщent des effets visuels diffщrents"
-#: gui/options.cpp:976
+#: gui/options.cpp:972
msgctxt "lowres"
msgid "HW Shader:"
msgstr "Shader :"
-#: gui/options.cpp:977
+#: gui/options.cpp:973
msgid "Different shaders give different visual effects"
msgstr "Divers shaders crщent des effets visuels diffщrents"
-#: gui/options.cpp:994
+#: gui/options.cpp:990
msgid "Graphics mode:"
msgstr "Mode graphique :"
-#: gui/options.cpp:1008
+#: gui/options.cpp:1004
msgid "Render mode:"
msgstr "Mode de rendu :"
-#: gui/options.cpp:1008 gui/options.cpp:1009
+#: gui/options.cpp:1004 gui/options.cpp:1005
msgid "Special dithering modes supported by some games"
msgstr "Mode spщcial de tramage supportщ par certains jeux"
-#: gui/options.cpp:1020 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
+#: gui/options.cpp:1016 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2590
msgid "Fullscreen mode"
msgstr "Plein щcran"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Filter graphics"
msgstr "Filtrer les graphiques"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Use linear filtering when scaling graphics"
msgstr ""
"Utiliser une interpolation bi-linщaire lors du changement d'щchelle des "
"graphiques"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Aspect ratio correction"
msgstr "Correction du rapport d'aspect"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Correct aspect ratio for 320x200 games"
msgstr "Corrige le rapport d'aspect pour les jeux en 320x200"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Preferred Device:"
msgstr "Sortie Prщfщrщe :"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Music Device:"
msgstr "Sortie Audio :"
-#: gui/options.cpp:1034 gui/options.cpp:1036
+#: gui/options.cpp:1030 gui/options.cpp:1032
msgid "Specifies preferred sound device or sound card emulator"
msgstr ""
"Spщcifie le pщriphщrique de sortie audio ou l'щmulateur de carte audio "
"prщfщrщ"
-#: gui/options.cpp:1034 gui/options.cpp:1036 gui/options.cpp:1037
+#: gui/options.cpp:1030 gui/options.cpp:1032 gui/options.cpp:1033
msgid "Specifies output sound device or sound card emulator"
msgstr "Spщcifie le pщriphщrique de sortie audio ou l'щmulateur de carte audio"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Sortie Prщfщrщe :"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Music Device:"
msgstr "Sortie Audio :"
-#: gui/options.cpp:1063
+#: gui/options.cpp:1059
msgid "AdLib emulator:"
msgstr "Щmulateur AdLib :"
-#: gui/options.cpp:1063 gui/options.cpp:1064
+#: gui/options.cpp:1059 gui/options.cpp:1060
msgid "AdLib is used for music in many games"
msgstr "AdLib est utilisщ pour la musique dans de nombreux jeux"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "GM Device:"
msgstr "Sortie GM :"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "Specifies default sound device for General MIDI output"
msgstr "Spщcifie le pщriphщrique audio par dщfaut pour la sortie General MIDI"
-#: gui/options.cpp:1088
+#: gui/options.cpp:1084
msgid "Don't use General MIDI music"
msgstr "Ne pas utiliser la musique General MIDI"
-#: gui/options.cpp:1099 gui/options.cpp:1161
+#: gui/options.cpp:1095 gui/options.cpp:1157
msgid "Use first available device"
msgstr "Utiliser le premier pщriphщrique disponible"
-#: gui/options.cpp:1111
+#: gui/options.cpp:1107
msgid "SoundFont:"
msgstr "Banque de sons :"
-#: gui/options.cpp:1111 gui/options.cpp:1113 gui/options.cpp:1114
+#: gui/options.cpp:1107 gui/options.cpp:1109 gui/options.cpp:1110
msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity"
msgstr ""
"La banque de sons (SoundFont) est utilisщe par certaines cartes audio, "
"FluidSynth et Timidity"
-#: gui/options.cpp:1113
+#: gui/options.cpp:1109
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont :"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Mixed AdLib/MIDI mode"
msgstr "Mode mixte AdLib/MIDI"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Use both MIDI and AdLib sound generation"
msgstr "Utiliser р la fois MIDI et AdLib"
-#: gui/options.cpp:1122
+#: gui/options.cpp:1118
msgid "MIDI gain:"
msgstr "Gain MIDI :"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "MT-32 Device:"
msgstr "Sortie MT-32 :"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
"Spщcifie le pщriphщrique audio par dщfaut pour la sortie Roland MT-32/LAPC1/"
"CM32l/CM64"
-#: gui/options.cpp:1137
+#: gui/options.cpp:1133
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Roland MT-32 exacte (dщsactive l'щmulation GM)"
-#: gui/options.cpp:1137 gui/options.cpp:1139
+#: gui/options.cpp:1133 gui/options.cpp:1135
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -1024,16 +1024,16 @@ msgstr ""
"Vщrifie si vous voulez utiliser un pщriphщrique audio compatible Roland "
"connectщ р l'ordinateur"
-#: gui/options.cpp:1139
+#: gui/options.cpp:1135
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Roland MT-32 exacte (pas d'щmu GM)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid "Roland GS Device (enable MT-32 mappings)"
msgstr "Roland GS (active le mappage MT-32)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid ""
"Check if you want to enable patch mappings to emulate an MT-32 on a Roland "
"GS device"
@@ -1041,275 +1041,275 @@ msgstr ""
"Utilisez cette option si vous voulez activez le mappage р la volщe pour une "
"щmulation MT-32 sur un appareil Roland GS."
-#: gui/options.cpp:1151
+#: gui/options.cpp:1147
msgid "Don't use Roland MT-32 music"
msgstr "Ne pas utiliser la musique Roland MT-32"
-#: gui/options.cpp:1178
+#: gui/options.cpp:1174
msgid "Text and Speech:"
msgstr "Dialogue :"
-#: gui/options.cpp:1182 gui/options.cpp:1192
+#: gui/options.cpp:1178 gui/options.cpp:1188
msgid "Speech"
msgstr "Voix"
-#: gui/options.cpp:1183 gui/options.cpp:1193
+#: gui/options.cpp:1179 gui/options.cpp:1189
msgid "Subtitles"
msgstr "Sous-titres"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1180
msgid "Both"
msgstr "Les deux"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1182
msgid "Subtitle speed:"
msgstr "Vitesse des ST :"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1184
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Dialogue :"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1188
msgid "Spch"
msgstr "Voix"
-#: gui/options.cpp:1193
+#: gui/options.cpp:1189
msgid "Subs"
msgstr "Subs"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgctxt "lowres"
msgid "Both"
msgstr "V&S"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgid "Show subtitles and play speech"
msgstr "Affiche les sous-titres et joue les dialogues audio"
-#: gui/options.cpp:1196
+#: gui/options.cpp:1192
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Vitesse des ST :"
-#: gui/options.cpp:1212
+#: gui/options.cpp:1208
msgid "Music volume:"
msgstr "Volume Musique :"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1210
msgctxt "lowres"
msgid "Music volume:"
msgstr "Musique :"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1217
msgid "Mute All"
msgstr "Silence"
-#: gui/options.cpp:1224
+#: gui/options.cpp:1220
msgid "SFX volume:"
msgstr "Volume Bruitage :"
-#: gui/options.cpp:1224 gui/options.cpp:1226 gui/options.cpp:1227
+#: gui/options.cpp:1220 gui/options.cpp:1222 gui/options.cpp:1223
msgid "Special sound effects volume"
msgstr "Volume des effets spщciaux sonores"
-#: gui/options.cpp:1226
+#: gui/options.cpp:1222
msgctxt "lowres"
msgid "SFX volume:"
msgstr "Bruitage :"
-#: gui/options.cpp:1234
+#: gui/options.cpp:1230
msgid "Speech volume:"
msgstr "Volume Dialogues :"
-#: gui/options.cpp:1236
+#: gui/options.cpp:1232
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Dialogues :"
-#: gui/options.cpp:1438
+#: gui/options.cpp:1434
msgid "Shader"
msgstr "Shader"
-#: gui/options.cpp:1450
+#: gui/options.cpp:1446
msgid "Control"
msgstr "Contrєles"
-#: gui/options.cpp:1476
+#: gui/options.cpp:1472
msgid "FluidSynth Settings"
msgstr "Paramшtres FluidSynth"
-#: gui/options.cpp:1507
+#: gui/options.cpp:1503
msgid "Theme Path:"
msgstr "Thшmes :"
-#: gui/options.cpp:1509
+#: gui/options.cpp:1505
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Thшmes :"
-#: gui/options.cpp:1515 gui/options.cpp:1517 gui/options.cpp:1518
+#: gui/options.cpp:1511 gui/options.cpp:1513 gui/options.cpp:1514
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr ""
"Spщcifie un chemin vers des donnщes supplщmentaires utilisщes par tous les "
"jeux ou ScummVM"
-#: gui/options.cpp:1524
+#: gui/options.cpp:1520
msgid "Plugins Path:"
msgstr "Plugins :"
-#: gui/options.cpp:1526
+#: gui/options.cpp:1522
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Plugins :"
-#: gui/options.cpp:1537
+#: gui/options.cpp:1533
msgctxt "lowres"
msgid "Misc"
msgstr "Divers"
-#: gui/options.cpp:1539
+#: gui/options.cpp:1535
msgid "Theme:"
msgstr "Thшme :"
-#: gui/options.cpp:1543
+#: gui/options.cpp:1539
msgid "GUI Renderer:"
msgstr "Interface :"
-#: gui/options.cpp:1555
+#: gui/options.cpp:1551
msgid "Autosave:"
msgstr "Sauvegarde auto :"
-#: gui/options.cpp:1557
+#: gui/options.cpp:1553
msgctxt "lowres"
msgid "Autosave:"
msgstr "Sauvegarde :"
-#: gui/options.cpp:1565
+#: gui/options.cpp:1561
msgid "Keys"
msgstr "Touches"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "GUI Language:"
msgstr "Langue :"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "Language of ScummVM GUI"
msgstr "Langue de l'interface graphique de ScummVM"
-#: gui/options.cpp:1600 gui/updates-dialog.cpp:86
+#: gui/options.cpp:1596 gui/updates-dialog.cpp:86
msgid "Update check:"
msgstr "Vщrif. mises р jour :"
-#: gui/options.cpp:1600
+#: gui/options.cpp:1596
msgid "How often to check ScummVM updates"
msgstr "Frщquence des vщrifications"
-#: gui/options.cpp:1612
+#: gui/options.cpp:1608
msgid "Check now"
msgstr "Maintenant"
-#: gui/options.cpp:1620
+#: gui/options.cpp:1616
msgid "Cloud"
msgstr "Nuage"
-#: gui/options.cpp:1622
+#: gui/options.cpp:1618
msgctxt "lowres"
msgid "Cloud"
msgstr "Nuage"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Storage:"
msgstr "Stockage :"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Active cloud storage"
msgstr "Service de stockage actif"
-#: gui/options.cpp:1634 gui/options.cpp:2210
+#: gui/options.cpp:1630 gui/options.cpp:2206
msgid "<none>"
msgstr "<aucun>"
-#: gui/options.cpp:1638 backends/platform/wii/options.cpp:114
+#: gui/options.cpp:1634 backends/platform/wii/options.cpp:114
msgid "Username:"
msgstr "Nom d'utilisateur :"
-#: gui/options.cpp:1638
+#: gui/options.cpp:1634
msgid "Username used by this storage"
msgstr "Nom d'utilisateur pour ce service"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Used space:"
msgstr "Espace utilisщ :"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Space used by ScummVM's saved games on this storage"
msgstr "Espace utilisщ par les sauvegardes de ScummVM sur ce stockage"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "Last sync time:"
msgstr "Synchronisщ :"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "When the last saved games sync for this storage occured"
msgstr "Quand la derniшre synchronisation des sauvegardes a eu lieu"
-#: gui/options.cpp:1647 gui/storagewizarddialog.cpp:71
+#: gui/options.cpp:1643 gui/storagewizarddialog.cpp:71
msgid "Connect"
msgstr "Se connecter"
-#: gui/options.cpp:1647
+#: gui/options.cpp:1643
msgid "Open wizard dialog to connect your cloud storage account"
msgstr "Ouvre l'assistant de connexion au compte de stockage en ligne"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh"
msgstr "Rafraюchir"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh current cloud storage information (username and usage)"
msgstr ""
"Rafraюchir les informations (nom d'utilisateur et espace utilisщ) pour le "
"service de stockage actif"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Download"
msgstr "Tщlщcharger"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Open downloads manager dialog"
msgstr "Ouvrir le gestionnaire de tщlщchargement"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run server"
msgstr "Dщmarrer serveur"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run local webserver"
msgstr "Dщmarre le serveur web local"
-#: gui/options.cpp:1652 gui/options.cpp:2320
+#: gui/options.cpp:1648 gui/options.cpp:2316
msgid "Not running"
msgstr "Arrъtщ"
-#: gui/options.cpp:1656
+#: gui/options.cpp:1652
msgid "/root/ Path:"
msgstr "Chemin /racine/ :"
-#: gui/options.cpp:1656 gui/options.cpp:1658 gui/options.cpp:1659
+#: gui/options.cpp:1652 gui/options.cpp:1654 gui/options.cpp:1655
msgid "Specifies which directory the Files Manager can access"
msgstr "Indique le rщpertoire auquel le gestionnaire de fichier peut accщder"
-#: gui/options.cpp:1658
+#: gui/options.cpp:1654
msgctxt "lowres"
msgid "/root/ Path:"
msgstr "/racine/ :"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid "Server's port:"
msgstr "Port :"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid ""
"Which port is used by the server\n"
"Auth with server is not available with non-default port"
@@ -1317,27 +1317,27 @@ msgstr ""
"Port utilisщ par le serveur\n"
"Authentification avec le serveur n'est disponible qu'avec le port par dщfaut"
-#: gui/options.cpp:1681
+#: gui/options.cpp:1677
msgid "Apply"
msgstr "Appliquer"
-#: gui/options.cpp:1824
+#: gui/options.cpp:1820
msgid "Failed to change cloud storage!"
msgstr "Echec du changement de service de stockage !"
-#: gui/options.cpp:1827
+#: gui/options.cpp:1823
msgid "Another cloud storage is already active."
msgstr "Un autre service de stockage est dщjр actif."
-#: gui/options.cpp:1895
+#: gui/options.cpp:1891
msgid "Theme does not support selected language!"
msgstr "Cette langue ne peut pas ъtre utilisщe avec le thшme actuel !"
-#: gui/options.cpp:1898
+#: gui/options.cpp:1894
msgid "Theme cannot be loaded!"
msgstr "Erreur au chargement du thшme !"
-#: gui/options.cpp:1901
+#: gui/options.cpp:1897
msgid ""
"\n"
"Misc settings will be restored."
@@ -1345,50 +1345,50 @@ msgstr ""
"\n"
"Les rщglages Divers vont ъtre restaurщs р leurs valeurs prщcщdentes."
-#: gui/options.cpp:1937
+#: gui/options.cpp:1933
msgid "The chosen directory cannot be written to. Please select another one."
msgstr ""
"Le rщpertoire sщlectionnщ est verrouillщ en щcriture. Sщlectionnez un autre "
"rщpertoire."
-#: gui/options.cpp:1946
+#: gui/options.cpp:1942
msgid "Select directory for GUI themes"
msgstr "Sщlectionner le rщpertoire des thшmes d'interface"
-#: gui/options.cpp:1956
+#: gui/options.cpp:1952
msgid "Select directory for extra files"
msgstr "Sщlectionner le rщpertoire pour les fichiers supplщmentaires"
-#: gui/options.cpp:1967
+#: gui/options.cpp:1963
msgid "Select directory for plugins"
msgstr "Sщlectionner le rщpertoire des plugins"
-#: gui/options.cpp:1979
+#: gui/options.cpp:1975
msgid "Select directory for Files Manager /root/"
msgstr "Indique le rщpertoire pour la /racine/ du Gestionnaire de Fichiers"
-#: gui/options.cpp:2217
+#: gui/options.cpp:2213
#, c-format
msgid "%llu bytes"
msgstr "%llu octets"
-#: gui/options.cpp:2225
+#: gui/options.cpp:2221
msgid "<right now>"
msgstr "<maintenant>"
-#: gui/options.cpp:2227
+#: gui/options.cpp:2223
msgid "<never>"
msgstr "<jamais>"
-#: gui/options.cpp:2311
+#: gui/options.cpp:2307
msgid "Stop server"
msgstr "Arrъter serveur"
-#: gui/options.cpp:2312
+#: gui/options.cpp:2308
msgid "Stop local webserver"
msgstr "Arrъter le serveur"
-#: gui/options.cpp:2403
+#: gui/options.cpp:2399
msgid ""
"Request failed.\n"
"Check your Internet connection."
@@ -1861,8 +1861,8 @@ msgstr "Retour au ~L~anceur"
#: 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:106
-#: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:658
+#: engines/mohawk/riven.cpp:545 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
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
#: engines/toon/toon.cpp:3340 engines/tsage/scenes.cpp:599
@@ -1881,9 +1881,9 @@ msgstr "Sauvegarde :"
#: engines/dm/loadsave.cpp:196 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:106 engines/neverhood/menumodule.cpp:880
-#: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:659
+#: engines/mohawk/dialogs.cpp:106 engines/mohawk/riven.cpp:545
+#: 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
#: engines/sherlock/scalpel/scalpel.cpp:1250
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
@@ -2197,7 +2197,7 @@ msgstr "Clic Dщsactivщ"
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Touchscreen 'Tap Mode' - Dщplacer sans cliquer"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
msgid "Do you want to quit ?"
msgstr "Voulez-vous quitter ?"
@@ -3356,7 +3356,7 @@ msgstr ""
"Il vous manque le fichier 'extras.mhk'. Utiliser le fichier archive "
"'arcriven.z' marche щgalement."
-#: engines/mohawk/riven.cpp:416
+#: engines/mohawk/riven.cpp:432
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"
diff --git a/po/gl_ES.po b/po/gl_ES.po
index 2a0dee4153..8eb9e70ce3 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: 2017-12-10 15:25+0100\n"
+"POT-Creation-Date: 2017-12-26 21:11+0100\n"
"PO-Revision-Date: 2017-11-23 12:42+0000\n"
"Last-Translator: Santiago G. Sanz <santiagogarciasanz@gmail.com>\n"
"Language-Team: Galician <https://translations.scummvm.org/projects/scummvm/"
@@ -58,7 +58,7 @@ msgstr "Arriba"
#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editgamedialog.cpp:292
#: gui/editrecorddialog.cpp:67 gui/filebrowser-dialog.cpp:64
#: gui/fluidsynth-dialog.cpp:152 gui/KeysDialog.cpp:43 gui/massadd.cpp:95
-#: gui/options.cpp:1680 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
+#: gui/options.cpp:1676 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
#: gui/recorderdialog.cpp:155 gui/remotebrowser.cpp:59
#: gui/saveload-dialog.cpp:383 gui/saveload-dialog.cpp:445
#: gui/saveload-dialog.cpp:727 gui/saveload-dialog.cpp:1121
@@ -118,7 +118,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -131,7 +131,7 @@ msgstr "Si"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -154,7 +154,7 @@ msgstr ""
#: gui/downloaddialog.cpp:146 gui/editgamedialog.cpp:293
#: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:526
-#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1682
+#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1678
#: gui/saveload-dialog.cpp:1122 engines/engine.cpp:443 engines/engine.cpp:454
#: backends/platform/wii/options.cpp:47
#: backends/platform/wince/CELauncherDialog.cpp:54
@@ -238,8 +238,8 @@ msgid ""
"English"
msgstr "Idioma do xogo. Non converterс a versiѓn galega do xogo en inglesa"
-#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:997
-#: gui/options.cpp:1010 gui/options.cpp:1575 audio/null.cpp:41
+#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:993
+#: gui/options.cpp:1006 gui/options.cpp:1571 audio/null.cpp:41
msgid "<default>"
msgstr "<por defecto>"
@@ -261,11 +261,11 @@ msgstr "Plataforma:"
msgid "Engine"
msgstr "Motor"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "Graphics"
msgstr "Grсficos"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "GFX"
msgstr "Efectos grсficos"
@@ -278,7 +278,7 @@ msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Anular a configuraciѓn dos grсficos"
-#: gui/editgamedialog.cpp:196 gui/options.cpp:1457
+#: gui/editgamedialog.cpp:196 gui/options.cpp:1453
msgid "Audio"
msgstr "Son"
@@ -291,11 +291,11 @@ msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Anular a configuraciѓn do son"
-#: gui/editgamedialog.cpp:210 gui/options.cpp:1462
+#: gui/editgamedialog.cpp:210 gui/options.cpp:1458
msgid "Volume"
msgstr "Volume"
-#: gui/editgamedialog.cpp:212 gui/options.cpp:1464
+#: gui/editgamedialog.cpp:212 gui/options.cpp:1460
msgctxt "lowres"
msgid "Volume"
msgstr "Volume"
@@ -309,7 +309,7 @@ msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Anular a configuraciѓn do volume"
-#: gui/editgamedialog.cpp:226 gui/options.cpp:1472
+#: gui/editgamedialog.cpp:226 gui/options.cpp:1468
msgid "MIDI"
msgstr "MIDI"
@@ -322,7 +322,7 @@ msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Anular a configuraciѓn de MIDI"
-#: gui/editgamedialog.cpp:241 gui/options.cpp:1482
+#: gui/editgamedialog.cpp:241 gui/options.cpp:1478
msgid "MT-32"
msgstr "MT-32"
@@ -335,11 +335,11 @@ msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Anular a configuraciѓn de MT-32"
-#: gui/editgamedialog.cpp:255 gui/options.cpp:1489
+#: gui/editgamedialog.cpp:255 gui/options.cpp:1485
msgid "Paths"
msgstr "Camiёos"
-#: gui/editgamedialog.cpp:257 gui/options.cpp:1491
+#: gui/editgamedialog.cpp:257 gui/options.cpp:1487
msgctxt "lowres"
msgid "Paths"
msgstr "Camiёos"
@@ -353,7 +353,7 @@ msgctxt "lowres"
msgid "Game Path:"
msgstr "Camiёo do xogo:"
-#: gui/editgamedialog.cpp:271 gui/options.cpp:1515
+#: gui/editgamedialog.cpp:271 gui/options.cpp:1511
msgid "Extra Path:"
msgstr "Camiёo adicional:"
@@ -362,44 +362,44 @@ msgstr "Camiёo adicional:"
msgid "Specifies path to additional data used by the game"
msgstr "Especifica o camiёo dos datos adicionais usados no xogo"
-#: gui/editgamedialog.cpp:273 gui/options.cpp:1517
+#: gui/editgamedialog.cpp:273 gui/options.cpp:1513
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Camiёo adicional:"
-#: gui/editgamedialog.cpp:280 gui/options.cpp:1499
+#: gui/editgamedialog.cpp:280 gui/options.cpp:1495
msgid "Save Path:"
msgstr "Camiёo de gardado:"
#: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282
-#: gui/editgamedialog.cpp:283 gui/options.cpp:1499 gui/options.cpp:1501
-#: gui/options.cpp:1502
+#: gui/editgamedialog.cpp:283 gui/options.cpp:1495 gui/options.cpp:1497
+#: gui/options.cpp:1498
msgid "Specifies where your saved games are put"
msgstr "Especifica o lugar dos ficheiros de gardado"
-#: gui/editgamedialog.cpp:282 gui/options.cpp:1501
+#: gui/editgamedialog.cpp:282 gui/options.cpp:1497
msgctxt "lowres"
msgid "Save Path:"
msgstr "Camiёo de gardado:"
#: gui/editgamedialog.cpp:301 gui/editgamedialog.cpp:398
-#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1510
-#: gui/options.cpp:1518 gui/options.cpp:1527 gui/options.cpp:1707
-#: gui/options.cpp:1713 gui/options.cpp:1721 gui/options.cpp:1744
-#: gui/options.cpp:1777 gui/options.cpp:1783 gui/options.cpp:1790
-#: gui/options.cpp:1798 gui/options.cpp:1993 gui/options.cpp:1996
-#: gui/options.cpp:2003 gui/options.cpp:2013
+#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1506
+#: gui/options.cpp:1514 gui/options.cpp:1523 gui/options.cpp:1703
+#: gui/options.cpp:1709 gui/options.cpp:1717 gui/options.cpp:1740
+#: gui/options.cpp:1773 gui/options.cpp:1779 gui/options.cpp:1786
+#: gui/options.cpp:1794 gui/options.cpp:1989 gui/options.cpp:1992
+#: gui/options.cpp:1999 gui/options.cpp:2009
msgctxt "path"
msgid "None"
msgstr "Ningњn"
#: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404
-#: gui/editgamedialog.cpp:522 gui/options.cpp:1701 gui/options.cpp:1771
-#: gui/options.cpp:1999 backends/platform/wii/options.cpp:56
+#: gui/editgamedialog.cpp:522 gui/options.cpp:1697 gui/options.cpp:1767
+#: gui/options.cpp:1995 backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Predefinido"
-#: gui/editgamedialog.cpp:450 gui/options.cpp:2007
+#: gui/editgamedialog.cpp:450 gui/options.cpp:2003
msgid "Select SoundFont"
msgstr "Seleccionar SoundFont"
@@ -407,7 +407,7 @@ msgstr "Seleccionar SoundFont"
msgid "Select additional game directory"
msgstr "Selecciona un directorio con datos adicionais"
-#: gui/editgamedialog.cpp:502 gui/options.cpp:1930
+#: gui/editgamedialog.cpp:502 gui/options.cpp:1926
msgid "Select directory for saved games"
msgstr "Selecciona un directorio para ficheiros de gardado"
@@ -500,7 +500,7 @@ msgstr "Seno"
msgid "Triangle"
msgstr "Triсngulo"
-#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1535
+#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1531
msgid "Misc"
msgstr "Misc."
@@ -680,7 +680,7 @@ msgid "Search:"
msgstr "Buscar:"
#: gui/launcher.cpp:200 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:517
+#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:533
#: engines/pegasus/pegasus.cpp:355 engines/tsage/scenes.cpp:601
#: engines/wage/saveload.cpp:748
msgid "Load game:"
@@ -690,7 +690,7 @@ msgstr "Cargar partida:"
#: backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:105
-#: engines/mohawk/riven.cpp:517 engines/parallaction/saveload.cpp:194
+#: engines/mohawk/riven.cpp:533 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
msgid "Load"
@@ -799,229 +799,229 @@ msgstr "cada 15 min"
msgid "every 30 mins"
msgstr "cada 30 min"
-#: gui/options.cpp:343 gui/options.cpp:640 gui/options.cpp:778
-#: gui/options.cpp:853 gui/options.cpp:1114
+#: gui/options.cpp:339 gui/options.cpp:636 gui/options.cpp:774
+#: gui/options.cpp:849 gui/options.cpp:1110
msgctxt "soundfont"
msgid "None"
msgstr "Ningunha"
-#: gui/options.cpp:514
+#: gui/options.cpp:510
msgid "Failed to apply some of the graphic options changes:"
msgstr "Erro ao aplicar os cambios na configuraciѓn dos grсficos:"
-#: gui/options.cpp:526
+#: gui/options.cpp:522
msgid "the video mode could not be changed."
msgstr "non se puido cambiar o modo de vэdeo."
-#: gui/options.cpp:532
+#: gui/options.cpp:528
msgid "the aspect ratio setting could not be changed"
msgstr "non se puido cambiar a proporciѓn."
-#: gui/options.cpp:538
+#: gui/options.cpp:534
msgid "the fullscreen setting could not be changed"
msgstr "non se puido cambiar a configuraciѓn de pantalla completa."
-#: gui/options.cpp:544
+#: gui/options.cpp:540
msgid "the filtering setting could not be changed"
msgstr "non se puido cambiar a configuraciѓn de filtrado."
-#: gui/options.cpp:932
+#: gui/options.cpp:928
msgid "Show On-screen control"
msgstr "Mostrar controis na pantalla"
-#: gui/options.cpp:936
+#: gui/options.cpp:932
msgid "Touchpad mouse mode"
msgstr "Modo Panel tсctil"
-#: gui/options.cpp:940
+#: gui/options.cpp:936
msgid "Swap Menu and Back buttons"
msgstr "Cambiar botѓns Menњ e Atrсs"
-#: gui/options.cpp:945
+#: gui/options.cpp:941
msgid "Pointer Speed:"
msgstr "Velocidade do punteiro:"
-#: gui/options.cpp:945 gui/options.cpp:947 gui/options.cpp:948
+#: gui/options.cpp:941 gui/options.cpp:943 gui/options.cpp:944
msgid "Speed for keyboard/joystick mouse pointer control"
msgstr "Velocidade do control do punteiro."
-#: gui/options.cpp:947
+#: gui/options.cpp:943
msgctxt "lowres"
msgid "Pointer Speed:"
msgstr "Velocidade do punteiro:"
-#: gui/options.cpp:958
+#: gui/options.cpp:954
msgid "Joy Deadzone:"
msgstr "Zona morta da panca:"
-#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
+#: gui/options.cpp:954 gui/options.cpp:956 gui/options.cpp:957
msgid "Analog joystick Deadzone"
msgstr "Zona morta da panca de xogos"
-#: gui/options.cpp:960
+#: gui/options.cpp:956
msgctxt "lowres"
msgid "Joy Deadzone:"
msgstr "Zona morta da panca:"
-#: gui/options.cpp:974
+#: gui/options.cpp:970
msgid "HW Shader:"
msgstr "Sombreador HW:"
-#: gui/options.cpp:974 gui/options.cpp:976
+#: gui/options.cpp:970 gui/options.cpp:972
msgid "Different hardware shaders give different visual effects"
msgstr ""
"Os distintos sombreadores por hardware teёen efectos visuais diferentes."
-#: gui/options.cpp:976
+#: gui/options.cpp:972
msgctxt "lowres"
msgid "HW Shader:"
msgstr "Sombreador HW:"
-#: gui/options.cpp:977
+#: gui/options.cpp:973
msgid "Different shaders give different visual effects"
msgstr "Os distintos sombreadores teёen efectos diferentes."
-#: gui/options.cpp:994
+#: gui/options.cpp:990
msgid "Graphics mode:"
msgstr "Grсficos:"
-#: gui/options.cpp:1008
+#: gui/options.cpp:1004
msgid "Render mode:"
msgstr "Procesamento:"
-#: gui/options.cpp:1008 gui/options.cpp:1009
+#: gui/options.cpp:1004 gui/options.cpp:1005
msgid "Special dithering modes supported by some games"
msgstr "Modos de interpolaciѓn de cores compatibles con algњns xogos"
-#: gui/options.cpp:1020 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
+#: gui/options.cpp:1016 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2590
msgid "Fullscreen mode"
msgstr "Pantalla completa"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Filter graphics"
msgstr "Filtrar grсficos"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Use linear filtering when scaling graphics"
msgstr "Empregar filtrado linear ao escalar grсficos"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Aspect ratio correction"
msgstr "Correcciѓn de proporciѓn"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Correct aspect ratio for 320x200 games"
msgstr "Corrixir a proporciѓn para os xogos en 320x200"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Preferred Device:"
msgstr "Dispositivo preferido:"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Music Device:"
msgstr "Dispositivo de mњsica:"
-#: gui/options.cpp:1034 gui/options.cpp:1036
+#: gui/options.cpp:1030 gui/options.cpp:1032
msgid "Specifies preferred sound device or sound card emulator"
msgstr "Especifica o dispositivo ou emulador de tarxeta de son preferido"
-#: gui/options.cpp:1034 gui/options.cpp:1036 gui/options.cpp:1037
+#: gui/options.cpp:1030 gui/options.cpp:1032 gui/options.cpp:1033
msgid "Specifies output sound device or sound card emulator"
msgstr "Especifica o dispositivo ou emulador de tarxeta de son de saэda"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Disp. preferido:"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Music Device:"
msgstr "Disp. mњsica:"
-#: gui/options.cpp:1063
+#: gui/options.cpp:1059
msgid "AdLib emulator:"
msgstr "Emulador de AdLib:"
-#: gui/options.cpp:1063 gui/options.cpp:1064
+#: gui/options.cpp:1059 gui/options.cpp:1060
msgid "AdLib is used for music in many games"
msgstr "Moitos xogos empregan AdLib para a mњsica"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "GM Device:"
msgstr "Dispositivo de GM:"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "Specifies default sound device for General MIDI output"
msgstr ""
"Especifica o dispositivo de son por defecto para a saэda de General MIDI"
-#: gui/options.cpp:1088
+#: gui/options.cpp:1084
msgid "Don't use General MIDI music"
msgstr "Non empregar mњsica en General MIDI"
-#: gui/options.cpp:1099 gui/options.cpp:1161
+#: gui/options.cpp:1095 gui/options.cpp:1157
msgid "Use first available device"
msgstr "Empregar o primeiro dispositivo dispoёible"
-#: gui/options.cpp:1111
+#: gui/options.cpp:1107
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1111 gui/options.cpp:1113 gui/options.cpp:1114
+#: gui/options.cpp:1107 gui/options.cpp:1109 gui/options.cpp:1110
msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity"
msgstr ""
"SoundFont щ compatible con algunhas tarxetas de son, FluidSynth e Timidity"
-#: gui/options.cpp:1113
+#: gui/options.cpp:1109
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Mixed AdLib/MIDI mode"
msgstr "Modo AdLib/MIDI mixto"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Use both MIDI and AdLib sound generation"
msgstr "Empregar xeraciѓn de son MIDI e mсis AdLib"
-#: gui/options.cpp:1122
+#: gui/options.cpp:1118
msgid "MIDI gain:"
msgstr "Ganancia de MIDI:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "MT-32 Device:"
msgstr "Dispositivo de MT-32:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
"Especifica o dispositivo por defecto para a saэda de Roland MT-32/LAPC1/"
"CM32l/CM64"
-#: gui/options.cpp:1137
+#: gui/options.cpp:1133
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Roland MT-32 verdadeiro (sen emulaciѓn de GM)"
-#: gui/options.cpp:1137 gui/options.cpp:1139
+#: gui/options.cpp:1133 gui/options.cpp:1135
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
msgstr ""
"Marcar para empregar o hardware compatible con Roland conectado ao sistema"
-#: gui/options.cpp:1139
+#: gui/options.cpp:1135
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Roland MT-32 (sen emulaciѓn de GM)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid "Roland GS Device (enable MT-32 mappings)"
msgstr "Dispositivo Roland GS (activar atribuciѓn MT-32)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid ""
"Check if you want to enable patch mappings to emulate an MT-32 on a Roland "
"GS device"
@@ -1029,278 +1029,278 @@ msgstr ""
"Marcar para activar a atribuciѓn de parches e emular MT-32 nun dispositivo "
"Roland GS"
-#: gui/options.cpp:1151
+#: gui/options.cpp:1147
msgid "Don't use Roland MT-32 music"
msgstr "Non empregar mњsica en Roland MT-32"
-#: gui/options.cpp:1178
+#: gui/options.cpp:1174
msgid "Text and Speech:"
msgstr "Texto e voz:"
-#: gui/options.cpp:1182 gui/options.cpp:1192
+#: gui/options.cpp:1178 gui/options.cpp:1188
msgid "Speech"
msgstr "Voz"
-#: gui/options.cpp:1183 gui/options.cpp:1193
+#: gui/options.cpp:1179 gui/options.cpp:1189
msgid "Subtitles"
msgstr "Subtэtulos"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1180
msgid "Both"
msgstr "Ambos"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1182
msgid "Subtitle speed:"
msgstr "Velocidade dos subtэtulos:"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1184
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Texto e voz:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1188
msgid "Spch"
msgstr "Voz"
-#: gui/options.cpp:1193
+#: gui/options.cpp:1189
msgid "Subs"
msgstr "Subs"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgctxt "lowres"
msgid "Both"
msgstr "Ambos"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgid "Show subtitles and play speech"
msgstr "Mostrar os subtэtulos e reproducir as voces"
-#: gui/options.cpp:1196
+#: gui/options.cpp:1192
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Velocidade subs:"
-#: gui/options.cpp:1212
+#: gui/options.cpp:1208
msgid "Music volume:"
msgstr "Volume de mњsica:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1210
msgctxt "lowres"
msgid "Music volume:"
msgstr "Volume mњsica:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1217
msgid "Mute All"
msgstr "Silenciar todo"
-#: gui/options.cpp:1224
+#: gui/options.cpp:1220
msgid "SFX volume:"
msgstr "Volume de efectos:"
-#: gui/options.cpp:1224 gui/options.cpp:1226 gui/options.cpp:1227
+#: gui/options.cpp:1220 gui/options.cpp:1222 gui/options.cpp:1223
msgid "Special sound effects volume"
msgstr "Volume dos efectos de son"
-#: gui/options.cpp:1226
+#: gui/options.cpp:1222
msgctxt "lowres"
msgid "SFX volume:"
msgstr "Volume efectos:"
-#: gui/options.cpp:1234
+#: gui/options.cpp:1230
msgid "Speech volume:"
msgstr "Volume de voz:"
-#: gui/options.cpp:1236
+#: gui/options.cpp:1232
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Volume voz:"
-#: gui/options.cpp:1438
+#: gui/options.cpp:1434
msgid "Shader"
msgstr "Sombreador"
-#: gui/options.cpp:1450
+#: gui/options.cpp:1446
msgid "Control"
msgstr "Control"
-#: gui/options.cpp:1476
+#: gui/options.cpp:1472
msgid "FluidSynth Settings"
msgstr "Configuraciѓn de FluidSynth"
-#: gui/options.cpp:1507
+#: gui/options.cpp:1503
msgid "Theme Path:"
msgstr "Camiёo do tema:"
-#: gui/options.cpp:1509
+#: gui/options.cpp:1505
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Camiёo tema:"
-#: gui/options.cpp:1515 gui/options.cpp:1517 gui/options.cpp:1518
+#: gui/options.cpp:1511 gui/options.cpp:1513 gui/options.cpp:1514
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr ""
"Especificar o camiёo dos datos adicionais de todos os xogos ou de ScummVM"
-#: gui/options.cpp:1524
+#: gui/options.cpp:1520
msgid "Plugins Path:"
msgstr "Camiёo dos complementos:"
-#: gui/options.cpp:1526
+#: gui/options.cpp:1522
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Camiёo complementos:"
-#: gui/options.cpp:1537
+#: gui/options.cpp:1533
msgctxt "lowres"
msgid "Misc"
msgstr "Misc."
-#: gui/options.cpp:1539
+#: gui/options.cpp:1535
msgid "Theme:"
msgstr "Tema:"
-#: gui/options.cpp:1543
+#: gui/options.cpp:1539
msgid "GUI Renderer:"
msgstr "Procesamento da interfaz:"
-#: gui/options.cpp:1555
+#: gui/options.cpp:1551
msgid "Autosave:"
msgstr "Autogardado:"
-#: gui/options.cpp:1557
+#: gui/options.cpp:1553
msgctxt "lowres"
msgid "Autosave:"
msgstr "Autogardado:"
-#: gui/options.cpp:1565
+#: gui/options.cpp:1561
msgid "Keys"
msgstr "Teclas"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "GUI Language:"
msgstr "Idioma de interfaz:"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "Language of ScummVM GUI"
msgstr "Idioma da interfaz de ScummVM"
-#: gui/options.cpp:1600 gui/updates-dialog.cpp:86
+#: gui/options.cpp:1596 gui/updates-dialog.cpp:86
msgid "Update check:"
msgstr "Comprobaciѓn de actualizaciѓns:"
-#: gui/options.cpp:1600
+#: gui/options.cpp:1596
msgid "How often to check ScummVM updates"
msgstr "Frecuencia de comprobaciѓn das actualizaciѓns de ScummVM"
-#: gui/options.cpp:1612
+#: gui/options.cpp:1608
msgid "Check now"
msgstr "Comprobar agora"
-#: gui/options.cpp:1620
+#: gui/options.cpp:1616
msgid "Cloud"
msgstr "Nube"
-#: gui/options.cpp:1622
+#: gui/options.cpp:1618
msgctxt "lowres"
msgid "Cloud"
msgstr "Nube"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Storage:"
msgstr "Almacenamento:"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Active cloud storage"
msgstr "Almacenamento na nube activo"
-#: gui/options.cpp:1634 gui/options.cpp:2210
+#: gui/options.cpp:1630 gui/options.cpp:2206
msgid "<none>"
msgstr "<ningњn>"
-#: gui/options.cpp:1638 backends/platform/wii/options.cpp:114
+#: gui/options.cpp:1634 backends/platform/wii/options.cpp:114
msgid "Username:"
msgstr "Nome de usuario:"
-#: gui/options.cpp:1638
+#: gui/options.cpp:1634
msgid "Username used by this storage"
msgstr "Nome de usuario empregado por este almacenamento"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Used space:"
msgstr "Espazo empregado:"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Space used by ScummVM's saved games on this storage"
msgstr ""
"Espazo empregado polas partidas gardadas de ScummVM neste almacenamento."
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "Last sync time:"
msgstr "кltima sincronizaciѓn:"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "When the last saved games sync for this storage occured"
msgstr ""
"O momento da њltima sincronizaciѓn das partidas gardadas neste almacenamento."
-#: gui/options.cpp:1647 gui/storagewizarddialog.cpp:71
+#: gui/options.cpp:1643 gui/storagewizarddialog.cpp:71
msgid "Connect"
msgstr "Conectar"
-#: gui/options.cpp:1647
+#: gui/options.cpp:1643
msgid "Open wizard dialog to connect your cloud storage account"
msgstr ""
"Abre o diсlogo do asistente para conectar coa tњa conta de almacenamento na "
"nube."
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh"
msgstr "Actualizar"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh current cloud storage information (username and usage)"
msgstr ""
"Actualiza a informaciѓn do almacenamento na nube actual (nome de usuario e "
"espazo empregado)."
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Download"
msgstr "Descargar"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Open downloads manager dialog"
msgstr "Abre o diсlogo do xestor de descargas."
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run server"
msgstr "Executar servidor"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run local webserver"
msgstr "Executar servidor web local"
-#: gui/options.cpp:1652 gui/options.cpp:2320
+#: gui/options.cpp:1648 gui/options.cpp:2316
msgid "Not running"
msgstr "Non se estс a executar"
-#: gui/options.cpp:1656
+#: gui/options.cpp:1652
msgid "/root/ Path:"
msgstr "Camiёo de /root/:"
-#: gui/options.cpp:1656 gui/options.cpp:1658 gui/options.cpp:1659
+#: gui/options.cpp:1652 gui/options.cpp:1654 gui/options.cpp:1655
msgid "Specifies which directory the Files Manager can access"
msgstr "Especifica o directorio de acceso do xestor de ficheiros."
-#: gui/options.cpp:1658
+#: gui/options.cpp:1654
msgctxt "lowres"
msgid "/root/ Path:"
msgstr "Camiёo de /root/:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid "Server's port:"
msgstr "Porto do servidor:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid ""
"Which port is used by the server\n"
"Auth with server is not available with non-default port"
@@ -1308,27 +1308,27 @@ msgstr ""
"O porto empregado polo servidor.\n"
"Autenticaciѓn non dispoёible con portos non predeterminados."
-#: gui/options.cpp:1681
+#: gui/options.cpp:1677
msgid "Apply"
msgstr "Aplicar"
-#: gui/options.cpp:1824
+#: gui/options.cpp:1820
msgid "Failed to change cloud storage!"
msgstr "Erro ao cambiar o almacenamento na nube!"
-#: gui/options.cpp:1827
+#: gui/options.cpp:1823
msgid "Another cloud storage is already active."
msgstr "Xa estс activo outro almacenamento na nube."
-#: gui/options.cpp:1895
+#: gui/options.cpp:1891
msgid "Theme does not support selected language!"
msgstr "O tema non щ compatible co idioma seleccionado!"
-#: gui/options.cpp:1898
+#: gui/options.cpp:1894
msgid "Theme cannot be loaded!"
msgstr "Non se puido cargar o tema!"
-#: gui/options.cpp:1901
+#: gui/options.cpp:1897
msgid ""
"\n"
"Misc settings will be restored."
@@ -1336,48 +1336,48 @@ msgstr ""
"\n"
"A configuraciѓn de Misc. serс restaurada."
-#: gui/options.cpp:1937
+#: gui/options.cpp:1933
msgid "The chosen directory cannot be written to. Please select another one."
msgstr "Non щ posible escribir no directorio elixido. Selecciona outro."
-#: gui/options.cpp:1946
+#: gui/options.cpp:1942
msgid "Select directory for GUI themes"
msgstr "Seleccionar directorio para temas de interfaz"
-#: gui/options.cpp:1956
+#: gui/options.cpp:1952
msgid "Select directory for extra files"
msgstr "Seleccionar directorio para ficheiros adicionais"
-#: gui/options.cpp:1967
+#: gui/options.cpp:1963
msgid "Select directory for plugins"
msgstr "Seleccionar directorio para complementos"
-#: gui/options.cpp:1979
+#: gui/options.cpp:1975
msgid "Select directory for Files Manager /root/"
msgstr "Seleccionar directorio para /root/ de xestor de ficheiros"
-#: gui/options.cpp:2217
+#: gui/options.cpp:2213
#, c-format
msgid "%llu bytes"
msgstr "%llu bytes"
-#: gui/options.cpp:2225
+#: gui/options.cpp:2221
msgid "<right now>"
msgstr "<agora mesmo>"
-#: gui/options.cpp:2227
+#: gui/options.cpp:2223
msgid "<never>"
msgstr "<nunca>"
-#: gui/options.cpp:2311
+#: gui/options.cpp:2307
msgid "Stop server"
msgstr "Deter servidor"
-#: gui/options.cpp:2312
+#: gui/options.cpp:2308
msgid "Stop local webserver"
msgstr "Deter servidor web local"
-#: gui/options.cpp:2403
+#: gui/options.cpp:2399
msgid ""
"Request failed.\n"
"Check your Internet connection."
@@ -1847,8 +1847,8 @@ msgstr "~V~olver ao Iniciador"
#: 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:106
-#: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:658
+#: engines/mohawk/riven.cpp:545 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
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
#: engines/toon/toon.cpp:3340 engines/tsage/scenes.cpp:599
@@ -1867,9 +1867,9 @@ msgstr "Gardar partida:"
#: engines/dm/loadsave.cpp:196 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:106 engines/neverhood/menumodule.cpp:880
-#: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:659
+#: engines/mohawk/dialogs.cpp:106 engines/mohawk/riven.cpp:545
+#: 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
#: engines/sherlock/scalpel/scalpel.cpp:1250
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
@@ -2183,7 +2183,7 @@ msgstr "Premer desactivado"
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Modo Pantalla tсctil: apuntar co rato (premer na cruceta)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
msgid "Do you want to quit ?"
msgstr "Queres saэr?"
@@ -3339,7 +3339,7 @@ msgstr ""
"Falta o ficheiro extras.mhk. Tamщn podes empregar o ficheiro do instalador "
"arcriven.z."
-#: engines/mohawk/riven.cpp:416
+#: engines/mohawk/riven.cpp:432
msgid "You are missing the following required Riven data files:\n"
msgstr "Faltan os seguintes ficheiros de datos requiridos de Riven:\n"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 4b93326ed8..6d8b740065 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: 2017-12-10 15:25+0100\n"
+"POT-Creation-Date: 2017-12-26 21:11+0100\n"
"PO-Revision-Date: 2017-11-10 16:20+0000\n"
"Last-Translator: George Kormendi <grubycza@hotmail.com>\n"
"Language-Team: Hungarian <https://translations.scummvm.org/projects/scummvm/"
@@ -58,7 +58,7 @@ msgstr "Feljebb"
#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editgamedialog.cpp:292
#: gui/editrecorddialog.cpp:67 gui/filebrowser-dialog.cpp:64
#: gui/fluidsynth-dialog.cpp:152 gui/KeysDialog.cpp:43 gui/massadd.cpp:95
-#: gui/options.cpp:1680 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
+#: gui/options.cpp:1676 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
#: gui/recorderdialog.cpp:155 gui/remotebrowser.cpp:59
#: gui/saveload-dialog.cpp:383 gui/saveload-dialog.cpp:445
#: gui/saveload-dialog.cpp:727 gui/saveload-dialog.cpp:1121
@@ -118,7 +118,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -131,7 +131,7 @@ msgstr "Igen"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -154,7 +154,7 @@ msgstr ""
#: gui/downloaddialog.cpp:146 gui/editgamedialog.cpp:293
#: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:526
-#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1682
+#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1678
#: gui/saveload-dialog.cpp:1122 engines/engine.cpp:443 engines/engine.cpp:454
#: backends/platform/wii/options.cpp:47
#: backends/platform/wince/CELauncherDialog.cpp:54
@@ -238,8 +238,8 @@ msgid ""
msgstr ""
"A jсtщk nyelve. Ne сllэtsd сt a pl. Spanyol nyelvћ jсtщkodat Angol nyelvre"
-#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:997
-#: gui/options.cpp:1010 gui/options.cpp:1575 audio/null.cpp:41
+#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:993
+#: gui/options.cpp:1006 gui/options.cpp:1571 audio/null.cpp:41
msgid "<default>"
msgstr "<alapщrtelmezett>"
@@ -261,11 +261,11 @@ msgstr "Platform:"
msgid "Engine"
msgstr "Motor"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "Graphics"
msgstr "Grafika"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "GFX"
msgstr "GFX"
@@ -278,7 +278,7 @@ msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Globсlis grafikai beсllэtсsok felќlbэrсlсsa"
-#: gui/editgamedialog.cpp:196 gui/options.cpp:1457
+#: gui/editgamedialog.cpp:196 gui/options.cpp:1453
msgid "Audio"
msgstr "Audiѓ"
@@ -291,11 +291,11 @@ msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Globсlis audiѓ beсllэtсsok felќlbэrсlсsa"
-#: gui/editgamedialog.cpp:210 gui/options.cpp:1462
+#: gui/editgamedialog.cpp:210 gui/options.cpp:1458
msgid "Volume"
msgstr "Hangerѕ"
-#: gui/editgamedialog.cpp:212 gui/options.cpp:1464
+#: gui/editgamedialog.cpp:212 gui/options.cpp:1460
msgctxt "lowres"
msgid "Volume"
msgstr "Hangerѕ"
@@ -309,7 +309,7 @@ msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Globсlis hangerѕbeсllэtсsok felќlbэrсlсsa"
-#: gui/editgamedialog.cpp:226 gui/options.cpp:1472
+#: gui/editgamedialog.cpp:226 gui/options.cpp:1468
msgid "MIDI"
msgstr "MIDI"
@@ -322,7 +322,7 @@ msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Globсlis MIDI beсllэtсsok felќlbэrсlсsa"
-#: gui/editgamedialog.cpp:241 gui/options.cpp:1482
+#: gui/editgamedialog.cpp:241 gui/options.cpp:1478
msgid "MT-32"
msgstr "MT-32"
@@ -335,11 +335,11 @@ msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Globсlis MT-32 beсllэtсsok felќlbэrсlсsa"
-#: gui/editgamedialog.cpp:255 gui/options.cpp:1489
+#: gui/editgamedialog.cpp:255 gui/options.cpp:1485
msgid "Paths"
msgstr "Mappсk"
-#: gui/editgamedialog.cpp:257 gui/options.cpp:1491
+#: gui/editgamedialog.cpp:257 gui/options.cpp:1487
msgctxt "lowres"
msgid "Paths"
msgstr "Mappсk"
@@ -353,7 +353,7 @@ msgctxt "lowres"
msgid "Game Path:"
msgstr "Jсtщk Mappa:"
-#: gui/editgamedialog.cpp:271 gui/options.cpp:1515
+#: gui/editgamedialog.cpp:271 gui/options.cpp:1511
msgid "Extra Path:"
msgstr "Extra Mappa:"
@@ -362,44 +362,44 @@ msgstr "Extra Mappa:"
msgid "Specifies path to additional data used by the game"
msgstr "Mappa kivсlasztсs a jсtщkok kiegщszэtѕ fсjljaihoz"
-#: gui/editgamedialog.cpp:273 gui/options.cpp:1517
+#: gui/editgamedialog.cpp:273 gui/options.cpp:1513
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Extra Mappa:"
-#: gui/editgamedialog.cpp:280 gui/options.cpp:1499
+#: gui/editgamedialog.cpp:280 gui/options.cpp:1495
msgid "Save Path:"
msgstr "Mentщs Mappa:"
#: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282
-#: gui/editgamedialog.cpp:283 gui/options.cpp:1499 gui/options.cpp:1501
-#: gui/options.cpp:1502
+#: gui/editgamedialog.cpp:283 gui/options.cpp:1495 gui/options.cpp:1497
+#: gui/options.cpp:1498
msgid "Specifies where your saved games are put"
msgstr "Jсtщkmentщsek helyщnek meghatсrozсsa"
-#: gui/editgamedialog.cpp:282 gui/options.cpp:1501
+#: gui/editgamedialog.cpp:282 gui/options.cpp:1497
msgctxt "lowres"
msgid "Save Path:"
msgstr "Mentщs Mappa:"
#: gui/editgamedialog.cpp:301 gui/editgamedialog.cpp:398
-#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1510
-#: gui/options.cpp:1518 gui/options.cpp:1527 gui/options.cpp:1707
-#: gui/options.cpp:1713 gui/options.cpp:1721 gui/options.cpp:1744
-#: gui/options.cpp:1777 gui/options.cpp:1783 gui/options.cpp:1790
-#: gui/options.cpp:1798 gui/options.cpp:1993 gui/options.cpp:1996
-#: gui/options.cpp:2003 gui/options.cpp:2013
+#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1506
+#: gui/options.cpp:1514 gui/options.cpp:1523 gui/options.cpp:1703
+#: gui/options.cpp:1709 gui/options.cpp:1717 gui/options.cpp:1740
+#: gui/options.cpp:1773 gui/options.cpp:1779 gui/options.cpp:1786
+#: gui/options.cpp:1794 gui/options.cpp:1989 gui/options.cpp:1992
+#: gui/options.cpp:1999 gui/options.cpp:2009
msgctxt "path"
msgid "None"
msgstr "Nincs"
#: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404
-#: gui/editgamedialog.cpp:522 gui/options.cpp:1701 gui/options.cpp:1771
-#: gui/options.cpp:1999 backends/platform/wii/options.cpp:56
+#: gui/editgamedialog.cpp:522 gui/options.cpp:1697 gui/options.cpp:1767
+#: gui/options.cpp:1995 backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Alapщrtelmezett"
-#: gui/editgamedialog.cpp:450 gui/options.cpp:2007
+#: gui/editgamedialog.cpp:450 gui/options.cpp:2003
msgid "Select SoundFont"
msgstr "SoundFont kivсlasztсs"
@@ -407,7 +407,7 @@ msgstr "SoundFont kivсlasztсs"
msgid "Select additional game directory"
msgstr "Vсlassz mappсt a jсtщk kiegщszэtѕkhіz"
-#: gui/editgamedialog.cpp:502 gui/options.cpp:1930
+#: gui/editgamedialog.cpp:502 gui/options.cpp:1926
msgid "Select directory for saved games"
msgstr "Vсlaszz jсtщkmentщseknek mappсt"
@@ -499,7 +499,7 @@ msgstr "Szэnusz"
msgid "Triangle"
msgstr "Hсromszіg"
-#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1535
+#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1531
msgid "Misc"
msgstr "Vegyes"
@@ -677,7 +677,7 @@ msgid "Search:"
msgstr "Keresщs:"
#: gui/launcher.cpp:200 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:517
+#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:533
#: engines/pegasus/pegasus.cpp:355 engines/tsage/scenes.cpp:601
#: engines/wage/saveload.cpp:748
msgid "Load game:"
@@ -687,7 +687,7 @@ msgstr "Jсtщk betіltщse:"
#: backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:105
-#: engines/mohawk/riven.cpp:517 engines/parallaction/saveload.cpp:194
+#: engines/mohawk/riven.cpp:533 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
msgid "Load"
@@ -797,209 +797,209 @@ msgstr "15 percenkщnt"
msgid "every 30 mins"
msgstr "30 percenkщnt"
-#: gui/options.cpp:343 gui/options.cpp:640 gui/options.cpp:778
-#: gui/options.cpp:853 gui/options.cpp:1114
+#: gui/options.cpp:339 gui/options.cpp:636 gui/options.cpp:774
+#: gui/options.cpp:849 gui/options.cpp:1110
msgctxt "soundfont"
msgid "None"
msgstr "Nincs"
-#: gui/options.cpp:514
+#: gui/options.cpp:510
msgid "Failed to apply some of the graphic options changes:"
msgstr "Nщhсny grafikus opciѓ vсltoztatсsa sikertelen:"
-#: gui/options.cpp:526
+#: gui/options.cpp:522
msgid "the video mode could not be changed."
msgstr "a videѓmѓd nem vсltozott."
-#: gui/options.cpp:532
+#: gui/options.cpp:528
msgid "the aspect ratio setting could not be changed"
msgstr "a kщpmщretarсny beсllэtсsok nem vсltoztak"
-#: gui/options.cpp:538
+#: gui/options.cpp:534
msgid "the fullscreen setting could not be changed"
msgstr "a teljeskщpernyѕs beсllэtсs nem vсltozott"
-#: gui/options.cpp:544
+#: gui/options.cpp:540
msgid "the filtering setting could not be changed"
msgstr "a szћrщsi beсllэtсst nem lehet megvсltoztatni"
-#: gui/options.cpp:932
+#: gui/options.cpp:928
msgid "Show On-screen control"
msgstr "Irсnyэtсs a kщpernyѕn megjelenэtщse"
-#: gui/options.cpp:936
+#: gui/options.cpp:932
msgid "Touchpad mouse mode"
msgstr "Touchpad egщr mѓd"
-#: gui/options.cpp:940
+#: gui/options.cpp:936
msgid "Swap Menu and Back buttons"
msgstr "Menќ щs Vissza gombok cserщje"
-#: gui/options.cpp:945
+#: gui/options.cpp:941
msgid "Pointer Speed:"
msgstr "Mutatѓ Sebessщg:"
-#: gui/options.cpp:945 gui/options.cpp:947 gui/options.cpp:948
+#: gui/options.cpp:941 gui/options.cpp:943 gui/options.cpp:944
msgid "Speed for keyboard/joystick mouse pointer control"
msgstr "Billentyћzet/joystick egщrmutatѓ vezщrlщs sebessщge"
-#: gui/options.cpp:947
+#: gui/options.cpp:943
msgctxt "lowres"
msgid "Pointer Speed:"
msgstr "Mutatѓ Sebessщg:"
-#: gui/options.cpp:958
+#: gui/options.cpp:954
msgid "Joy Deadzone:"
msgstr "Joy Holtzѓna:"
-#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
+#: gui/options.cpp:954 gui/options.cpp:956 gui/options.cpp:957
msgid "Analog joystick Deadzone"
msgstr "Analѓg joystick Holtzѓna"
-#: gui/options.cpp:960
+#: gui/options.cpp:956
msgctxt "lowres"
msgid "Joy Deadzone:"
msgstr "Joy Holtzѓna:"
-#: gui/options.cpp:974
+#: gui/options.cpp:970
msgid "HW Shader:"
msgstr "HW Сrnyalѓ:"
-#: gui/options.cpp:974 gui/options.cpp:976
+#: gui/options.cpp:970 gui/options.cpp:972
msgid "Different hardware shaders give different visual effects"
msgstr "Kќlіnbіzѕ hardver сrnyalѓk kќlіnbіzѕ vizuсlis effekteket adnak"
-#: gui/options.cpp:976
+#: gui/options.cpp:972
msgctxt "lowres"
msgid "HW Shader:"
msgstr "HW Сrnyalѓ:"
-#: gui/options.cpp:977
+#: gui/options.cpp:973
msgid "Different shaders give different visual effects"
msgstr "Kќlіnbіzѕ hardver сrnyalѓk kќlіnbіzѕ vizuсlis effekteket adnak"
-#: gui/options.cpp:994
+#: gui/options.cpp:990
msgid "Graphics mode:"
msgstr "Grafikus mѓd:"
-#: gui/options.cpp:1008
+#: gui/options.cpp:1004
msgid "Render mode:"
msgstr "Kirajzolсs mѓd:"
-#: gui/options.cpp:1008 gui/options.cpp:1009
+#: gui/options.cpp:1004 gui/options.cpp:1005
msgid "Special dithering modes supported by some games"
msgstr "Nщhсny jсtщk tсmogatja a speciсlis сrnyalсsi mѓdokat"
-#: gui/options.cpp:1020 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
+#: gui/options.cpp:1016 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2590
msgid "Fullscreen mode"
msgstr "Teljeskщpernyѕs mѓd"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Filter graphics"
msgstr "Grafika szћrщse"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Use linear filtering when scaling graphics"
msgstr "Lineсris szћrщs hasznсlata a grafika сtmщretezщsщnщl"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Aspect ratio correction"
msgstr "Kщpmщretarсny korrekciѓ"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Correct aspect ratio for 320x200 games"
msgstr "Helyes oldalarсny a 320x200 jсtщkokhoz"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Preferred Device:"
msgstr "Elsѕdleges eszkіz:"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Music Device:"
msgstr "Zene eszkіz:"
-#: gui/options.cpp:1034 gui/options.cpp:1036
+#: gui/options.cpp:1030 gui/options.cpp:1032
msgid "Specifies preferred sound device or sound card emulator"
msgstr "Elsѕdleges hangeszkіz vagy hang emulсtor beсllэtсsok"
-#: gui/options.cpp:1034 gui/options.cpp:1036 gui/options.cpp:1037
+#: gui/options.cpp:1030 gui/options.cpp:1032 gui/options.cpp:1033
msgid "Specifies output sound device or sound card emulator"
msgstr "Hangeszkіz vagy hangkсrtya emulсtor beсllэtсsok"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Elsѕdleges eszk.:"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Music Device:"
msgstr "Zene eszkіz:"
-#: gui/options.cpp:1063
+#: gui/options.cpp:1059
msgid "AdLib emulator:"
msgstr "AdLib emulсtor:"
-#: gui/options.cpp:1063 gui/options.cpp:1064
+#: gui/options.cpp:1059 gui/options.cpp:1060
msgid "AdLib is used for music in many games"
msgstr "AdLib meghajtѓt sok jсtщk hasznсlja zenщhez"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "GM Device:"
msgstr "GM Eszkіz:"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "Specifies default sound device for General MIDI output"
msgstr "Alapщrtelmezett hangeszkіz General MIDI kimenethez"
-#: gui/options.cpp:1088
+#: gui/options.cpp:1084
msgid "Don't use General MIDI music"
msgstr "Ne hasznсlj General MIDI zenщt"
-#: gui/options.cpp:1099 gui/options.cpp:1161
+#: gui/options.cpp:1095 gui/options.cpp:1157
msgid "Use first available device"
msgstr "Elsѕ elщrhetѕ eszkіz hasznсlata"
-#: gui/options.cpp:1111
+#: gui/options.cpp:1107
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1111 gui/options.cpp:1113 gui/options.cpp:1114
+#: gui/options.cpp:1107 gui/options.cpp:1109 gui/options.cpp:1110
msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity"
msgstr ""
"Nщhсny hangkсrya, FluidSynth щs Timidyti tсmogatja a SoundFont betіltщsщt"
-#: gui/options.cpp:1113
+#: gui/options.cpp:1109
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Mixed AdLib/MIDI mode"
msgstr "Vegyes AdLib/MIDI mѓd"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Use both MIDI and AdLib sound generation"
msgstr "MIDI щs AdLib hanggenerсtorok hasznсlata"
-#: gui/options.cpp:1122
+#: gui/options.cpp:1118
msgid "MIDI gain:"
msgstr "MIDI erѕsэtщs:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "MT-32 Device:"
msgstr "MT-32 Eszkіz:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr "Roland MT-32/LAPC1/CM32l/CM64 alapщrtelmezett hangeszkіzіk beсllэtсsa"
-#: gui/options.cpp:1137
+#: gui/options.cpp:1133
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Roland MT-32 Hardver (GM emulсciѓ tiltva)"
-#: gui/options.cpp:1137 gui/options.cpp:1139
+#: gui/options.cpp:1133 gui/options.cpp:1135
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -1007,16 +1007,16 @@ msgstr ""
"Jelіld be, ha hardveres Roland-Kompatibilis hangeszkіz van csatlakoztatva a "
"gщpedhez щs hasznсlni akarod"
-#: gui/options.cpp:1139
+#: gui/options.cpp:1135
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Roland MT-32 Hardver (GM emulсciѓ nincs)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid "Roland GS Device (enable MT-32 mappings)"
msgstr "Roland GS eszkіz (MT-32 mapping engedщlyezщs)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid ""
"Check if you want to enable patch mappings to emulate an MT-32 on a Roland "
"GS device"
@@ -1024,272 +1024,272 @@ msgstr ""
"Ellenѕrzщs ha engedщlyezni akarod az emulсlt MT-32 Folt lekщpezщst a Roland "
"GS eszkіzіn"
-#: gui/options.cpp:1151
+#: gui/options.cpp:1147
msgid "Don't use Roland MT-32 music"
msgstr "Ne hasznсlj Roland MT-32 zenщt"
-#: gui/options.cpp:1178
+#: gui/options.cpp:1174
msgid "Text and Speech:"
msgstr "Szіveg щs beszщd:"
-#: gui/options.cpp:1182 gui/options.cpp:1192
+#: gui/options.cpp:1178 gui/options.cpp:1188
msgid "Speech"
msgstr "Csak beszщd"
-#: gui/options.cpp:1183 gui/options.cpp:1193
+#: gui/options.cpp:1179 gui/options.cpp:1189
msgid "Subtitles"
msgstr "Csak felirat"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1180
msgid "Both"
msgstr "Mind"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1182
msgid "Subtitle speed:"
msgstr "Felirat sebessщg:"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1184
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Felirat щs beszщd:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1188
msgid "Spch"
msgstr "Besz"
-#: gui/options.cpp:1193
+#: gui/options.cpp:1189
msgid "Subs"
msgstr "Text"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgctxt "lowres"
msgid "Both"
msgstr "Mind"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgid "Show subtitles and play speech"
msgstr "Hang щs feliratok megjelenэtщse"
-#: gui/options.cpp:1196
+#: gui/options.cpp:1192
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Felirat sebessщg:"
-#: gui/options.cpp:1212
+#: gui/options.cpp:1208
msgid "Music volume:"
msgstr "Zene hangerѕ:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1210
msgctxt "lowres"
msgid "Music volume:"
msgstr "Zene hangerѕ:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1217
msgid "Mute All"
msgstr "жsszes nщmэtсsa"
-#: gui/options.cpp:1224
+#: gui/options.cpp:1220
msgid "SFX volume:"
msgstr "SFX hangerѕ:"
-#: gui/options.cpp:1224 gui/options.cpp:1226 gui/options.cpp:1227
+#: gui/options.cpp:1220 gui/options.cpp:1222 gui/options.cpp:1223
msgid "Special sound effects volume"
msgstr "Speciсlis hangeffektusok hangereje"
-#: gui/options.cpp:1226
+#: gui/options.cpp:1222
msgctxt "lowres"
msgid "SFX volume:"
msgstr "SFX hangerѕ:"
-#: gui/options.cpp:1234
+#: gui/options.cpp:1230
msgid "Speech volume:"
msgstr "Beszщd hangerѕ:"
-#: gui/options.cpp:1236
+#: gui/options.cpp:1232
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Beszщd hangerѕ:"
-#: gui/options.cpp:1438
+#: gui/options.cpp:1434
msgid "Shader"
msgstr "Сrnyalѓ"
-#: gui/options.cpp:1450
+#: gui/options.cpp:1446
msgid "Control"
msgstr "Irсnyitсs"
-#: gui/options.cpp:1476
+#: gui/options.cpp:1472
msgid "FluidSynth Settings"
msgstr "FluidSynth Beсllэtсsa"
-#: gui/options.cpp:1507
+#: gui/options.cpp:1503
msgid "Theme Path:"
msgstr "Tщma Mappa:"
-#: gui/options.cpp:1509
+#: gui/options.cpp:1505
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Tщma Mappa:"
-#: gui/options.cpp:1515 gui/options.cpp:1517 gui/options.cpp:1518
+#: gui/options.cpp:1511 gui/options.cpp:1513 gui/options.cpp:1514
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr "Minden jщtщk щs ScummVM kiegщszэtѕ fсjljainak mappсja"
-#: gui/options.cpp:1524
+#: gui/options.cpp:1520
msgid "Plugins Path:"
msgstr "Plugin Mappa:"
-#: gui/options.cpp:1526
+#: gui/options.cpp:1522
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Plugin Mappa:"
-#: gui/options.cpp:1537
+#: gui/options.cpp:1533
msgctxt "lowres"
msgid "Misc"
msgstr "Vegyes"
-#: gui/options.cpp:1539
+#: gui/options.cpp:1535
msgid "Theme:"
msgstr "Tщma:"
-#: gui/options.cpp:1543
+#: gui/options.cpp:1539
msgid "GUI Renderer:"
msgstr "GUI Renderelѕ:"
-#: gui/options.cpp:1555
+#: gui/options.cpp:1551
msgid "Autosave:"
msgstr "Automentщs:"
-#: gui/options.cpp:1557
+#: gui/options.cpp:1553
msgctxt "lowres"
msgid "Autosave:"
msgstr "Automentщs:"
-#: gui/options.cpp:1565
+#: gui/options.cpp:1561
msgid "Keys"
msgstr "Billentyћk"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "GUI Language:"
msgstr "GUI nyelve:"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "Language of ScummVM GUI"
msgstr "A ScummVM GUI nyelve"
-#: gui/options.cpp:1600 gui/updates-dialog.cpp:86
+#: gui/options.cpp:1596 gui/updates-dialog.cpp:86
msgid "Update check:"
msgstr "Frissэtщs ellenѕrzщs:"
-#: gui/options.cpp:1600
+#: gui/options.cpp:1596
msgid "How often to check ScummVM updates"
msgstr "Milyen gyakran ellenѕrizze a ScummVM frissэtщseket"
-#: gui/options.cpp:1612
+#: gui/options.cpp:1608
msgid "Check now"
msgstr "Ellenѕrzщs most"
-#: gui/options.cpp:1620
+#: gui/options.cpp:1616
msgid "Cloud"
msgstr "Felhѕ"
-#: gui/options.cpp:1622
+#: gui/options.cpp:1618
msgctxt "lowres"
msgid "Cloud"
msgstr "Felhѕ"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Storage:"
msgstr "Tсrolѓ:"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Active cloud storage"
msgstr "Aktэv felhѕ tсrolѓ"
-#: gui/options.cpp:1634 gui/options.cpp:2210
+#: gui/options.cpp:1630 gui/options.cpp:2206
msgid "<none>"
msgstr "<nincs>"
-#: gui/options.cpp:1638 backends/platform/wii/options.cpp:114
+#: gui/options.cpp:1634 backends/platform/wii/options.cpp:114
msgid "Username:"
msgstr "Felhasznсlѓ:"
-#: gui/options.cpp:1638
+#: gui/options.cpp:1634
msgid "Username used by this storage"
msgstr "Felhasznсlѓnщv ehhez a tсrolѓhoz"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Used space:"
msgstr "Hasznсlt hely:"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Space used by ScummVM's saved games on this storage"
msgstr "ScummVM mentщsekhez hasznсlt hely ezen a tсrolѓn"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "Last sync time:"
msgstr "Utolsѓ szinkron:"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "When the last saved games sync for this storage occured"
msgstr "Amikor az utolsѓ mentщs szinkronizсlсs tіrtщnt ezen a tсrolѓn"
-#: gui/options.cpp:1647 gui/storagewizarddialog.cpp:71
+#: gui/options.cpp:1643 gui/storagewizarddialog.cpp:71
msgid "Connect"
msgstr "Csatlakozсs"
-#: gui/options.cpp:1647
+#: gui/options.cpp:1643
msgid "Open wizard dialog to connect your cloud storage account"
msgstr "Csatlakozсs varсzslѓ pсrbeszщdablak megnyitсsa a felhѕtсrolѓ fiѓkodhoz"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh"
msgstr "Frissэtщs"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh current cloud storage information (username and usage)"
msgstr ""
"Jelenlegi felhѕtсrolѓ informсciѓk frissэtщse (felhasznсlѓnщv щs hasznсlat)"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Download"
msgstr "Letіltщs"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Open downloads manager dialog"
msgstr "Letіltщskezelѕ pсrbeszщdablak megnyitсsa"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run server"
msgstr "Szerver futtatсs"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run local webserver"
msgstr "Helyi webszerver futtatсsa"
-#: gui/options.cpp:1652 gui/options.cpp:2320
+#: gui/options.cpp:1648 gui/options.cpp:2316
msgid "Not running"
msgstr "Nem fut"
-#: gui/options.cpp:1656
+#: gui/options.cpp:1652
msgid "/root/ Path:"
msgstr "/gyіkщr/ кtvonal:"
-#: gui/options.cpp:1656 gui/options.cpp:1658 gui/options.cpp:1659
+#: gui/options.cpp:1652 gui/options.cpp:1654 gui/options.cpp:1655
msgid "Specifies which directory the Files Manager can access"
msgstr "Meghatсrozza, hogy melyik kіnyvtсrhoz fщrhet hozzс a Fсjlkezelѕ"
-#: gui/options.cpp:1658
+#: gui/options.cpp:1654
msgctxt "lowres"
msgid "/root/ Path:"
msgstr "/gyіkщr/ кtvonal:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid "Server's port:"
msgstr "Szerver portja:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid ""
"Which port is used by the server\n"
"Auth with server is not available with non-default port"
@@ -1297,27 +1297,27 @@ msgstr ""
"Melyik portot hasznсlja a szerver\n"
"Szerver engedщly nem elщrhetѕ nem alapщrtelmezett porttal"
-#: gui/options.cpp:1681
+#: gui/options.cpp:1677
msgid "Apply"
msgstr "Alkalmaz"
-#: gui/options.cpp:1824
+#: gui/options.cpp:1820
msgid "Failed to change cloud storage!"
msgstr "Felhѕtсrolѓ csere nem sikerќlt!"
-#: gui/options.cpp:1827
+#: gui/options.cpp:1823
msgid "Another cloud storage is already active."
msgstr "Egy mсsik felhѕtсrolѓ mсr aktэv."
-#: gui/options.cpp:1895
+#: gui/options.cpp:1891
msgid "Theme does not support selected language!"
msgstr "A tщma nem tсmogatja a vсlasztott nyelvet!"
-#: gui/options.cpp:1898
+#: gui/options.cpp:1894
msgid "Theme cannot be loaded!"
msgstr "A tщmсt nem lehet betіlteni!"
-#: gui/options.cpp:1901
+#: gui/options.cpp:1897
msgid ""
"\n"
"Misc settings will be restored."
@@ -1325,48 +1325,48 @@ msgstr ""
"\n"
"A kќlіnbіzѕ beсllэtсsok visszaсllэtva."
-#: gui/options.cpp:1937
+#: gui/options.cpp:1933
msgid "The chosen directory cannot be written to. Please select another one."
msgstr "A kivсlasztott mappсba nem lehet эrni, vсlassz egy mсsikat."
-#: gui/options.cpp:1946
+#: gui/options.cpp:1942
msgid "Select directory for GUI themes"
msgstr "GUI tщma mappa kivсlasztсsa"
-#: gui/options.cpp:1956
+#: gui/options.cpp:1952
msgid "Select directory for extra files"
msgstr "Mappa vсlasztсs az extra fсjloknak"
-#: gui/options.cpp:1967
+#: gui/options.cpp:1963
msgid "Select directory for plugins"
msgstr "Plugin mappa kivсlasztсsa"
-#: gui/options.cpp:1979
+#: gui/options.cpp:1975
msgid "Select directory for Files Manager /root/"
msgstr "Vсlassz mappсt a Fсjlkezelѕnek /gyіkщr/"
-#: gui/options.cpp:2217
+#: gui/options.cpp:2213
#, c-format
msgid "%llu bytes"
msgstr "%llu byte"
-#: gui/options.cpp:2225
+#: gui/options.cpp:2221
msgid "<right now>"
msgstr "<щpp most>"
-#: gui/options.cpp:2227
+#: gui/options.cpp:2223
msgid "<never>"
msgstr "<soha>"
-#: gui/options.cpp:2311
+#: gui/options.cpp:2307
msgid "Stop server"
msgstr "Szerver leсllэtсs"
-#: gui/options.cpp:2312
+#: gui/options.cpp:2308
msgid "Stop local webserver"
msgstr "Helyi webszerver leсllэtсsa"
-#: gui/options.cpp:2403
+#: gui/options.cpp:2399
msgid ""
"Request failed.\n"
"Check your Internet connection."
@@ -1836,8 +1836,8 @@ msgstr "Visszatщrщs az indэtѓba"
#: 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:106
-#: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:658
+#: engines/mohawk/riven.cpp:545 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
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
#: engines/toon/toon.cpp:3340 engines/tsage/scenes.cpp:599
@@ -1856,9 +1856,9 @@ msgstr "Jсtщk mentщse:"
#: engines/dm/loadsave.cpp:196 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:106 engines/neverhood/menumodule.cpp:880
-#: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:659
+#: engines/mohawk/dialogs.cpp:106 engines/mohawk/riven.cpp:545
+#: 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
#: engines/sherlock/scalpel/scalpel.cpp:1250
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
@@ -2170,7 +2170,7 @@ msgstr "Kattintсs tiltva"
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Щrintѕkщpernyѕ 'Щrintщsmѓd' - Lebegѕ (DPad katt)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
msgid "Do you want to quit ?"
msgstr "Ki akarsz lщpni ?"
@@ -3320,7 +3320,7 @@ msgid ""
msgstr ""
"Hiсnyzik az 'extras.mhk'. A telepэtѕ 'arcriven.z' fсjlja is hasznсlhatѓ mщg."
-#: engines/mohawk/riven.cpp:416
+#: engines/mohawk/riven.cpp:432
msgid "You are missing the following required Riven data files:\n"
msgstr "A kіvetkezѕ szќksщges Riven adatfсjlok hiсnyoznak:\n"
diff --git a/po/it_IT.po b/po/it_IT.po
index de5fad37ec..0b7406305e 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -7,11 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.3.0svn\n"
"Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2017-12-10 15:25+0100\n"
+"POT-Creation-Date: 2017-12-26 21:11+0100\n"
"PO-Revision-Date: 2017-12-18 17:00+0000\n"
"Last-Translator: Paolo Bossi <pbossi86@gmail.com>\n"
-"Language-Team: Italian "
-"<https://translations.scummvm.org/projects/scummvm/scummvm/it/>\n"
+"Language-Team: Italian <https://translations.scummvm.org/projects/scummvm/"
+"scummvm/it/>\n"
"Language: it_IT\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
@@ -58,7 +58,7 @@ msgstr "Su"
#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editgamedialog.cpp:292
#: gui/editrecorddialog.cpp:67 gui/filebrowser-dialog.cpp:64
#: gui/fluidsynth-dialog.cpp:152 gui/KeysDialog.cpp:43 gui/massadd.cpp:95
-#: gui/options.cpp:1680 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
+#: gui/options.cpp:1676 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
#: gui/recorderdialog.cpp:155 gui/remotebrowser.cpp:59
#: gui/saveload-dialog.cpp:383 gui/saveload-dialog.cpp:445
#: gui/saveload-dialog.cpp:727 gui/saveload-dialog.cpp:1121
@@ -118,7 +118,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -131,7 +131,7 @@ msgstr "Sь"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -154,7 +154,7 @@ msgstr ""
#: gui/downloaddialog.cpp:146 gui/editgamedialog.cpp:293
#: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:526
-#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1682
+#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1678
#: gui/saveload-dialog.cpp:1122 engines/engine.cpp:443 engines/engine.cpp:454
#: backends/platform/wii/options.cpp:47
#: backends/platform/wince/CELauncherDialog.cpp:54
@@ -239,8 +239,8 @@ msgid ""
msgstr ""
"Lingua del gioco. Un gioco inglese non potrр risultare tradotto in italiano"
-#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:997
-#: gui/options.cpp:1010 gui/options.cpp:1575 audio/null.cpp:41
+#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:993
+#: gui/options.cpp:1006 gui/options.cpp:1571 audio/null.cpp:41
msgid "<default>"
msgstr "<predefinito>"
@@ -262,11 +262,11 @@ msgstr "Piattaf.:"
msgid "Engine"
msgstr "Motore"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "Graphics"
msgstr "Grafica"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "GFX"
msgstr "Grafica"
@@ -279,7 +279,7 @@ msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Ignora le impostazioni grafiche globali"
-#: gui/editgamedialog.cpp:196 gui/options.cpp:1457
+#: gui/editgamedialog.cpp:196 gui/options.cpp:1453
msgid "Audio"
msgstr "Audio"
@@ -292,11 +292,11 @@ msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Ignora le impostazioni audio globali"
-#: gui/editgamedialog.cpp:210 gui/options.cpp:1462
+#: gui/editgamedialog.cpp:210 gui/options.cpp:1458
msgid "Volume"
msgstr "Volume"
-#: gui/editgamedialog.cpp:212 gui/options.cpp:1464
+#: gui/editgamedialog.cpp:212 gui/options.cpp:1460
msgctxt "lowres"
msgid "Volume"
msgstr "Volume"
@@ -310,7 +310,7 @@ msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Ignora le impostazioni globali di volume"
-#: gui/editgamedialog.cpp:226 gui/options.cpp:1472
+#: gui/editgamedialog.cpp:226 gui/options.cpp:1468
msgid "MIDI"
msgstr "MIDI"
@@ -323,7 +323,7 @@ msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Ignora le impostazioni MIDI globali"
-#: gui/editgamedialog.cpp:241 gui/options.cpp:1482
+#: gui/editgamedialog.cpp:241 gui/options.cpp:1478
msgid "MT-32"
msgstr "MT-32"
@@ -336,11 +336,11 @@ msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Ignora le impostazioni MT-32 globali"
-#: gui/editgamedialog.cpp:255 gui/options.cpp:1489
+#: gui/editgamedialog.cpp:255 gui/options.cpp:1485
msgid "Paths"
msgstr "Percorsi"
-#: gui/editgamedialog.cpp:257 gui/options.cpp:1491
+#: gui/editgamedialog.cpp:257 gui/options.cpp:1487
msgctxt "lowres"
msgid "Paths"
msgstr "Perc"
@@ -354,7 +354,7 @@ msgctxt "lowres"
msgid "Game Path:"
msgstr "Perc. gioco:"
-#: gui/editgamedialog.cpp:271 gui/options.cpp:1515
+#: gui/editgamedialog.cpp:271 gui/options.cpp:1511
msgid "Extra Path:"
msgstr "Percorso extra:"
@@ -363,44 +363,44 @@ msgstr "Percorso extra:"
msgid "Specifies path to additional data used by the game"
msgstr "Specifica il percorso di ulteriori dati usati dal gioco"
-#: gui/editgamedialog.cpp:273 gui/options.cpp:1517
+#: gui/editgamedialog.cpp:273 gui/options.cpp:1513
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Perc. extra:"
-#: gui/editgamedialog.cpp:280 gui/options.cpp:1499
+#: gui/editgamedialog.cpp:280 gui/options.cpp:1495
msgid "Save Path:"
msgstr "Salvataggi:"
#: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282
-#: gui/editgamedialog.cpp:283 gui/options.cpp:1499 gui/options.cpp:1501
-#: gui/options.cpp:1502
+#: gui/editgamedialog.cpp:283 gui/options.cpp:1495 gui/options.cpp:1497
+#: gui/options.cpp:1498
msgid "Specifies where your saved games are put"
msgstr "Specifica dove archiviare i salvataggi"
-#: gui/editgamedialog.cpp:282 gui/options.cpp:1501
+#: gui/editgamedialog.cpp:282 gui/options.cpp:1497
msgctxt "lowres"
msgid "Save Path:"
msgstr "Salvataggi:"
#: gui/editgamedialog.cpp:301 gui/editgamedialog.cpp:398
-#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1510
-#: gui/options.cpp:1518 gui/options.cpp:1527 gui/options.cpp:1707
-#: gui/options.cpp:1713 gui/options.cpp:1721 gui/options.cpp:1744
-#: gui/options.cpp:1777 gui/options.cpp:1783 gui/options.cpp:1790
-#: gui/options.cpp:1798 gui/options.cpp:1993 gui/options.cpp:1996
-#: gui/options.cpp:2003 gui/options.cpp:2013
+#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1506
+#: gui/options.cpp:1514 gui/options.cpp:1523 gui/options.cpp:1703
+#: gui/options.cpp:1709 gui/options.cpp:1717 gui/options.cpp:1740
+#: gui/options.cpp:1773 gui/options.cpp:1779 gui/options.cpp:1786
+#: gui/options.cpp:1794 gui/options.cpp:1989 gui/options.cpp:1992
+#: gui/options.cpp:1999 gui/options.cpp:2009
msgctxt "path"
msgid "None"
msgstr "Nessuno"
#: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404
-#: gui/editgamedialog.cpp:522 gui/options.cpp:1701 gui/options.cpp:1771
-#: gui/options.cpp:1999 backends/platform/wii/options.cpp:56
+#: gui/editgamedialog.cpp:522 gui/options.cpp:1697 gui/options.cpp:1767
+#: gui/options.cpp:1995 backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Predefinito"
-#: gui/editgamedialog.cpp:450 gui/options.cpp:2007
+#: gui/editgamedialog.cpp:450 gui/options.cpp:2003
msgid "Select SoundFont"
msgstr "Seleziona SoundFont"
@@ -408,7 +408,7 @@ msgstr "Seleziona SoundFont"
msgid "Select additional game directory"
msgstr "Seleziona la cartella di gioco aggiuntiva"
-#: gui/editgamedialog.cpp:502 gui/options.cpp:1930
+#: gui/editgamedialog.cpp:502 gui/options.cpp:1926
msgid "Select directory for saved games"
msgstr "Seleziona la cartella dei salvataggi"
@@ -501,7 +501,7 @@ msgstr "Seno"
msgid "Triangle"
msgstr "Triangolo"
-#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1535
+#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1531
msgid "Misc"
msgstr "Varie"
@@ -681,7 +681,7 @@ msgid "Search:"
msgstr "Cerca:"
#: gui/launcher.cpp:200 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:517
+#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:533
#: engines/pegasus/pegasus.cpp:355 engines/tsage/scenes.cpp:601
#: engines/wage/saveload.cpp:748
msgid "Load game:"
@@ -691,7 +691,7 @@ msgstr "Carica gioco:"
#: backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:105
-#: engines/mohawk/riven.cpp:517 engines/parallaction/saveload.cpp:194
+#: engines/mohawk/riven.cpp:533 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
msgid "Load"
@@ -805,212 +805,212 @@ msgstr "ogni 15 minuti"
msgid "every 30 mins"
msgstr "ogni 30 minuti"
-#: gui/options.cpp:343 gui/options.cpp:640 gui/options.cpp:778
-#: gui/options.cpp:853 gui/options.cpp:1114
+#: gui/options.cpp:339 gui/options.cpp:636 gui/options.cpp:774
+#: gui/options.cpp:849 gui/options.cpp:1110
msgctxt "soundfont"
msgid "None"
msgstr "Nessuno"
-#: gui/options.cpp:514
+#: gui/options.cpp:510
msgid "Failed to apply some of the graphic options changes:"
msgstr "Impossibile applicare alcuni dei cambiamenti nelle opzioni grafiche:"
-#: gui/options.cpp:526
+#: gui/options.cpp:522
msgid "the video mode could not be changed."
msgstr "impossibile modificare la modalitр video."
-#: gui/options.cpp:532
+#: gui/options.cpp:528
msgid "the aspect ratio setting could not be changed"
msgstr "impossibile modificare l'impostazione proporzioni"
-#: gui/options.cpp:538
+#: gui/options.cpp:534
msgid "the fullscreen setting could not be changed"
msgstr "Impossibile modificare l'impostazione schermo intero"
-#: gui/options.cpp:544
+#: gui/options.cpp:540
msgid "the filtering setting could not be changed"
msgstr "Impossibile modificare le impostazioni del filtro video"
-#: gui/options.cpp:932
+#: gui/options.cpp:928
msgid "Show On-screen control"
msgstr "Controlli in sovraimpressione"
-#: gui/options.cpp:936
+#: gui/options.cpp:932
msgid "Touchpad mouse mode"
msgstr "Mouse in modalitр Touchpad"
-#: gui/options.cpp:940
+#: gui/options.cpp:936
msgid "Swap Menu and Back buttons"
msgstr "Inverti i tasti Menu e Indietro"
-#: gui/options.cpp:945
+#: gui/options.cpp:941
msgid "Pointer Speed:"
msgstr "Velocitр Puntatore:"
-#: gui/options.cpp:945 gui/options.cpp:947 gui/options.cpp:948
+#: gui/options.cpp:941 gui/options.cpp:943 gui/options.cpp:944
msgid "Speed for keyboard/joystick mouse pointer control"
msgstr "Velocitр puntatore (se controllato con joystick o tastiera)"
-#: gui/options.cpp:947
+#: gui/options.cpp:943
msgctxt "lowres"
msgid "Pointer Speed:"
msgstr "Velocitр del puntatore:"
-#: gui/options.cpp:958
+#: gui/options.cpp:954
msgid "Joy Deadzone:"
msgstr "Deadzone Joystick:"
-#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
+#: gui/options.cpp:954 gui/options.cpp:956 gui/options.cpp:957
msgid "Analog joystick Deadzone"
msgstr "Deadzone (zona inerte) per joystick analogici"
-#: gui/options.cpp:960
+#: gui/options.cpp:956
msgctxt "lowres"
msgid "Joy Deadzone:"
msgstr "Deadzone Joy:"
-#: gui/options.cpp:974
+#: gui/options.cpp:970
msgid "HW Shader:"
msgstr "Shader Hardware:"
-#: gui/options.cpp:974 gui/options.cpp:976
+#: gui/options.cpp:970 gui/options.cpp:972
msgid "Different hardware shaders give different visual effects"
msgstr "Shader differenti danno effetti visivi differenti"
-#: gui/options.cpp:976
+#: gui/options.cpp:972
msgctxt "lowres"
msgid "HW Shader:"
msgstr "HW Shader:"
-#: gui/options.cpp:977
+#: gui/options.cpp:973
msgid "Different shaders give different visual effects"
msgstr "Shader diversi danno diversi effetti grafici"
-#: gui/options.cpp:994
+#: gui/options.cpp:990
msgid "Graphics mode:"
msgstr "Modalitр grafica:"
-#: gui/options.cpp:1008
+#: gui/options.cpp:1004
msgid "Render mode:"
msgstr "Resa grafica:"
-#: gui/options.cpp:1008 gui/options.cpp:1009
+#: gui/options.cpp:1004 gui/options.cpp:1005
msgid "Special dithering modes supported by some games"
msgstr "Modalitр di resa grafica speciali supportate da alcuni giochi"
-#: gui/options.cpp:1020 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
+#: gui/options.cpp:1016 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2590
msgid "Fullscreen mode"
msgstr "Modalitр a schermo intero"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Filter graphics"
msgstr "Applica filtro grafico"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Use linear filtering when scaling graphics"
msgstr "Usa filtro bilineare per lo scaling della grafica"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Aspect ratio correction"
msgstr "Correzione proporzioni"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Correct aspect ratio for 320x200 games"
msgstr "Correggere il rapporto d'aspetto dei giochi con risoluzione a 320x200"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Preferred Device:"
msgstr "Disp. preferito:"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Music Device:"
msgstr "Dispositivo audio:"
-#: gui/options.cpp:1034 gui/options.cpp:1036
+#: gui/options.cpp:1030 gui/options.cpp:1032
msgid "Specifies preferred sound device or sound card emulator"
msgstr ""
"Specifica il dispositivo audio o l'emulatore della scheda audio preferiti"
-#: gui/options.cpp:1034 gui/options.cpp:1036 gui/options.cpp:1037
+#: gui/options.cpp:1030 gui/options.cpp:1032 gui/options.cpp:1033
msgid "Specifies output sound device or sound card emulator"
msgstr ""
"Specifica il dispositivo di output audio o l'emulatore della scheda audio"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Disp. preferito:"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Music Device:"
msgstr "Disposit. audio:"
-#: gui/options.cpp:1063
+#: gui/options.cpp:1059
msgid "AdLib emulator:"
msgstr "Emulatore AdLib:"
-#: gui/options.cpp:1063 gui/options.cpp:1064
+#: gui/options.cpp:1059 gui/options.cpp:1060
msgid "AdLib is used for music in many games"
msgstr "AdLib ш utilizzato per la musica in molti giochi"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "GM Device:"
msgstr "Dispositivo GM:"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "Specifies default sound device for General MIDI output"
msgstr "Specifica il dispositivo audio predefinito per l'output General MIDI"
-#: gui/options.cpp:1088
+#: gui/options.cpp:1084
msgid "Don't use General MIDI music"
msgstr "Non utilizzare la musica General MIDI"
-#: gui/options.cpp:1099 gui/options.cpp:1161
+#: gui/options.cpp:1095 gui/options.cpp:1157
msgid "Use first available device"
msgstr "Utilizza il primo dispositivo disponibile"
-#: gui/options.cpp:1111
+#: gui/options.cpp:1107
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1111 gui/options.cpp:1113 gui/options.cpp:1114
+#: gui/options.cpp:1107 gui/options.cpp:1109 gui/options.cpp:1110
msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity"
msgstr "SoundFont ш supportato da alcune schede audio, FluidSynth e Timidity"
-#: gui/options.cpp:1113
+#: gui/options.cpp:1109
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Mixed AdLib/MIDI mode"
msgstr "Modalitр mista AdLib/MIDI"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Use both MIDI and AdLib sound generation"
msgstr "Utilizza generazione di suono sia MIDI che AdLib"
-#: gui/options.cpp:1122
+#: gui/options.cpp:1118
msgid "MIDI gain:"
msgstr "Guadagno MIDI:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "MT-32 Device:"
msgstr "Disposit. MT-32:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
"Specifica il dispositivo audio predefinito per l'output Roland MT-32/LAPC1/"
"CM32l/CM64"
-#: gui/options.cpp:1137
+#: gui/options.cpp:1133
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Roland MT-32 effettivo (disattiva emulazione GM)"
-#: gui/options.cpp:1137 gui/options.cpp:1139
+#: gui/options.cpp:1133 gui/options.cpp:1135
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -1018,16 +1018,16 @@ msgstr ""
"Seleziona se vuoi usare il dispositivo hardware audio compatibile con Roland "
"che ш connesso al tuo computer"
-#: gui/options.cpp:1139
+#: gui/options.cpp:1135
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Roland MT-32 effettivo (disat.emul.GM)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid "Roland GS Device (enable MT-32 mappings)"
msgstr "Dispositivo Roland GS (attiva mappature MT-32)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid ""
"Check if you want to enable patch mappings to emulate an MT-32 on a Roland "
"GS device"
@@ -1035,274 +1035,274 @@ msgstr ""
"Seleziona se vuoi attivare le mappature per emulare un MT-32 su un "
"dispositivo Roland GS"
-#: gui/options.cpp:1151
+#: gui/options.cpp:1147
msgid "Don't use Roland MT-32 music"
msgstr "Non utilizzare la musica Roland MT-32"
-#: gui/options.cpp:1178
+#: gui/options.cpp:1174
msgid "Text and Speech:"
msgstr "Testo e voci:"
-#: gui/options.cpp:1182 gui/options.cpp:1192
+#: gui/options.cpp:1178 gui/options.cpp:1188
msgid "Speech"
msgstr "Voci"
-#: gui/options.cpp:1183 gui/options.cpp:1193
+#: gui/options.cpp:1179 gui/options.cpp:1189
msgid "Subtitles"
msgstr "Sottotitoli"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1180
msgid "Both"
msgstr "Entrambi"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1182
msgid "Subtitle speed:"
msgstr "Velocitр testo:"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1184
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Testo e voci:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1188
msgid "Spch"
msgstr "Voci"
-#: gui/options.cpp:1193
+#: gui/options.cpp:1189
msgid "Subs"
msgstr "Sub"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgctxt "lowres"
msgid "Both"
msgstr "Entr."
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgid "Show subtitles and play speech"
msgstr "Mostra i sottotitoli e attiva le voci"
-#: gui/options.cpp:1196
+#: gui/options.cpp:1192
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Velocitр testo:"
-#: gui/options.cpp:1212
+#: gui/options.cpp:1208
msgid "Music volume:"
msgstr "Volume musica:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1210
msgctxt "lowres"
msgid "Music volume:"
msgstr "Volume musica:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1217
msgid "Mute All"
msgstr "Disattiva audio"
-#: gui/options.cpp:1224
+#: gui/options.cpp:1220
msgid "SFX volume:"
msgstr "Volume effetti:"
-#: gui/options.cpp:1224 gui/options.cpp:1226 gui/options.cpp:1227
+#: gui/options.cpp:1220 gui/options.cpp:1222 gui/options.cpp:1223
msgid "Special sound effects volume"
msgstr "Volume degli effetti sonori"
-#: gui/options.cpp:1226
+#: gui/options.cpp:1222
msgctxt "lowres"
msgid "SFX volume:"
msgstr "Volume effetti:"
-#: gui/options.cpp:1234
+#: gui/options.cpp:1230
msgid "Speech volume:"
msgstr "Volume voci:"
-#: gui/options.cpp:1236
+#: gui/options.cpp:1232
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Volume voci:"
-#: gui/options.cpp:1438
+#: gui/options.cpp:1434
msgid "Shader"
msgstr "Shader"
-#: gui/options.cpp:1450
+#: gui/options.cpp:1446
msgid "Control"
msgstr "Controllo"
-#: gui/options.cpp:1476
+#: gui/options.cpp:1472
msgid "FluidSynth Settings"
msgstr "Impostazioni FluidSynth"
-#: gui/options.cpp:1507
+#: gui/options.cpp:1503
msgid "Theme Path:"
msgstr "Percorso temi:"
-#: gui/options.cpp:1509
+#: gui/options.cpp:1505
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Perc. temi:"
-#: gui/options.cpp:1515 gui/options.cpp:1517 gui/options.cpp:1518
+#: gui/options.cpp:1511 gui/options.cpp:1513 gui/options.cpp:1514
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr "Specifica il percorso di ulteriori dati usati dai giochi o da ScummVM"
-#: gui/options.cpp:1524
+#: gui/options.cpp:1520
msgid "Plugins Path:"
msgstr "Percorso plugin:"
-#: gui/options.cpp:1526
+#: gui/options.cpp:1522
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Perc. plugin:"
-#: gui/options.cpp:1537
+#: gui/options.cpp:1533
msgctxt "lowres"
msgid "Misc"
msgstr "Varie"
-#: gui/options.cpp:1539
+#: gui/options.cpp:1535
msgid "Theme:"
msgstr "Tema:"
-#: gui/options.cpp:1543
+#: gui/options.cpp:1539
msgid "GUI Renderer:"
msgstr "Renderer GUI:"
-#: gui/options.cpp:1555
+#: gui/options.cpp:1551
msgid "Autosave:"
msgstr "Autosalva:"
-#: gui/options.cpp:1557
+#: gui/options.cpp:1553
msgctxt "lowres"
msgid "Autosave:"
msgstr "Salvataggio automatico:"
-#: gui/options.cpp:1565
+#: gui/options.cpp:1561
msgid "Keys"
msgstr "Tasti"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "GUI Language:"
msgstr "Lingua GUI:"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "Language of ScummVM GUI"
msgstr "Lingua dell'interfaccia grafica di ScummVM"
-#: gui/options.cpp:1600 gui/updates-dialog.cpp:86
+#: gui/options.cpp:1596 gui/updates-dialog.cpp:86
msgid "Update check:"
msgstr "Controllo aggiornamenti:"
-#: gui/options.cpp:1600
+#: gui/options.cpp:1596
msgid "How often to check ScummVM updates"
msgstr "Frequenza delle verifiche disponibilitр aggiornamenti"
-#: gui/options.cpp:1612
+#: gui/options.cpp:1608
msgid "Check now"
msgstr "Controlla ora"
-#: gui/options.cpp:1620
+#: gui/options.cpp:1616
msgid "Cloud"
msgstr "Cloud"
-#: gui/options.cpp:1622
+#: gui/options.cpp:1618
msgctxt "lowres"
msgid "Cloud"
msgstr "Cloud"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Storage:"
msgstr "Servizio cloud:"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Active cloud storage"
msgstr "Servizio di archiviazione cloud attivo"
-#: gui/options.cpp:1634 gui/options.cpp:2210
+#: gui/options.cpp:1630 gui/options.cpp:2206
msgid "<none>"
msgstr "<nessuno>"
-#: gui/options.cpp:1638 backends/platform/wii/options.cpp:114
+#: gui/options.cpp:1634 backends/platform/wii/options.cpp:114
msgid "Username:"
msgstr "Nome utente:"
-#: gui/options.cpp:1638
+#: gui/options.cpp:1634
msgid "Username used by this storage"
msgstr "Nome utilizzato per questo spazio di archiviazione"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Used space:"
msgstr "Spazio su disco utilizzato:"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Space used by ScummVM's saved games on this storage"
msgstr "Spazio utilizzato dai salvataggi di ScummVM su questo archivio Cloud"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "Last sync time:"
msgstr "Ultima sincronizzazione:"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "When the last saved games sync for this storage occured"
msgstr ""
"Ultima sincronizzazione dei salvataggi in questo spazio di archiviazione"
-#: gui/options.cpp:1647 gui/storagewizarddialog.cpp:71
+#: gui/options.cpp:1643 gui/storagewizarddialog.cpp:71
msgid "Connect"
msgstr "Connetti"
-#: gui/options.cpp:1647
+#: gui/options.cpp:1643
msgid "Open wizard dialog to connect your cloud storage account"
msgstr "Apri assistente di connessione all'account di archiviazione su Cloud"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh"
msgstr "Aggiorna"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh current cloud storage information (username and usage)"
msgstr ""
"Aggiorna le informazioni del servizio di archiviazione su Cloud (nome utente "
"e spazio utilizzato)"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Download"
msgstr "Scarica"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Open downloads manager dialog"
msgstr "Apri finestra di gestione dei download"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run server"
msgstr "Avvia server"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run local webserver"
msgstr "Avvia webserver locale"
-#: gui/options.cpp:1652 gui/options.cpp:2320
+#: gui/options.cpp:1648 gui/options.cpp:2316
msgid "Not running"
msgstr "Non avviato"
-#: gui/options.cpp:1656
+#: gui/options.cpp:1652
msgid "/root/ Path:"
msgstr "Percorso base:"
-#: gui/options.cpp:1656 gui/options.cpp:1658 gui/options.cpp:1659
+#: gui/options.cpp:1652 gui/options.cpp:1654 gui/options.cpp:1655
msgid "Specifies which directory the Files Manager can access"
msgstr "Specifica quali cartelle sono accessibili dal File Manager"
-#: gui/options.cpp:1658
+#: gui/options.cpp:1654
msgctxt "lowres"
msgid "/root/ Path:"
msgstr "Percorso base:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid "Server's port:"
msgstr "Porta del Server:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid ""
"Which port is used by the server\n"
"Auth with server is not available with non-default port"
@@ -1310,27 +1310,27 @@ msgstr ""
"Porta utillizzata dal server\n"
"L'autenticazione non ш disponibile tramite una porta personalizzata"
-#: gui/options.cpp:1681
+#: gui/options.cpp:1677
msgid "Apply"
msgstr "Applica"
-#: gui/options.cpp:1824
+#: gui/options.cpp:1820
msgid "Failed to change cloud storage!"
msgstr "Impossibile cambiare dispositivo di archiviazione Cloud!"
-#: gui/options.cpp:1827
+#: gui/options.cpp:1823
msgid "Another cloud storage is already active."
msgstr "Un altro servizio di archiviazione cloud ш giр attivo."
-#: gui/options.cpp:1895
+#: gui/options.cpp:1891
msgid "Theme does not support selected language!"
msgstr "Questo tema non supporta la lingua selezionata!"
-#: gui/options.cpp:1898
+#: gui/options.cpp:1894
msgid "Theme cannot be loaded!"
msgstr "Errore nel caricamento del tema grafico!"
-#: gui/options.cpp:1901
+#: gui/options.cpp:1897
msgid ""
"\n"
"Misc settings will be restored."
@@ -1338,48 +1338,48 @@ msgstr ""
"\n"
"Le impostazioni della categoria Varie saranno riportati ai valori precedenti."
-#: gui/options.cpp:1937
+#: gui/options.cpp:1933
msgid "The chosen directory cannot be written to. Please select another one."
msgstr "La cartella scelta ш in sola lettura. Si prega di sceglierne un'altra."
-#: gui/options.cpp:1946
+#: gui/options.cpp:1942
msgid "Select directory for GUI themes"
msgstr "Seleziona la cartella dei temi dell'interfaccia"
-#: gui/options.cpp:1956
+#: gui/options.cpp:1952
msgid "Select directory for extra files"
msgstr "Seleziona la cartella dei file aggiuntivi"
-#: gui/options.cpp:1967
+#: gui/options.cpp:1963
msgid "Select directory for plugins"
msgstr "Seleziona la cartella dei plugin"
-#: gui/options.cpp:1979
+#: gui/options.cpp:1975
msgid "Select directory for Files Manager /root/"
msgstr "Seleziona la cartella di partenza del File Manager"
-#: gui/options.cpp:2217
+#: gui/options.cpp:2213
#, c-format
msgid "%llu bytes"
msgstr "%lIu bytes"
-#: gui/options.cpp:2225
+#: gui/options.cpp:2221
msgid "<right now>"
msgstr "<adesso>"
-#: gui/options.cpp:2227
+#: gui/options.cpp:2223
msgid "<never>"
msgstr "<mai>"
-#: gui/options.cpp:2311
+#: gui/options.cpp:2307
msgid "Stop server"
msgstr "Arresta server"
-#: gui/options.cpp:2312
+#: gui/options.cpp:2308
msgid "Stop local webserver"
msgstr "Arresta webserver locale"
-#: gui/options.cpp:2403
+#: gui/options.cpp:2399
msgid ""
"Request failed.\n"
"Check your Internet connection."
@@ -1853,8 +1853,8 @@ msgstr "~V~ai a elenco giochi"
#: 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:106
-#: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:658
+#: engines/mohawk/riven.cpp:545 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
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
#: engines/toon/toon.cpp:3340 engines/tsage/scenes.cpp:599
@@ -1873,9 +1873,9 @@ msgstr "Salva gioco:"
#: engines/dm/loadsave.cpp:196 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:106 engines/neverhood/menumodule.cpp:880
-#: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:659
+#: engines/mohawk/dialogs.cpp:106 engines/mohawk/riven.cpp:545
+#: 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
#: engines/sherlock/scalpel/scalpel.cpp:1250
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
@@ -2190,7 +2190,7 @@ msgstr "Clic disattivato"
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Touchscreen 'Tap Mode' - Passaggio del cursore (clic DPad)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
msgid "Do you want to quit ?"
msgstr "Sei sicuro di voler uscire?"
@@ -3347,7 +3347,7 @@ msgstr ""
"File 'extras.mhk' non trovato. Ш anche possibile usare il file di "
"installazione 'arcriven.z'."
-#: engines/mohawk/riven.cpp:416
+#: engines/mohawk/riven.cpp:432
msgid "You are missing the following required Riven data files:\n"
msgstr "I seguenti file di dati di Riven non sono stati trovati:\n"
diff --git a/po/nb_NO.po b/po/nb_NO.po
index b1c8110b87..0250ddca82 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: 2017-12-10 15:25+0100\n"
+"POT-Creation-Date: 2017-12-26 21:11+0100\n"
"PO-Revision-Date: 2016-12-26 17:36+0000\n"
"Last-Translator: Einar Johan Trјan Sјmхen <einarjohants@gmail.com>\n"
"Language-Team: Norwegian Bokmхl <https://translations.scummvm.org/projects/"
@@ -59,7 +59,7 @@ msgstr "Oppover"
#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editgamedialog.cpp:292
#: gui/editrecorddialog.cpp:67 gui/filebrowser-dialog.cpp:64
#: gui/fluidsynth-dialog.cpp:152 gui/KeysDialog.cpp:43 gui/massadd.cpp:95
-#: gui/options.cpp:1680 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
+#: gui/options.cpp:1676 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
#: gui/recorderdialog.cpp:155 gui/remotebrowser.cpp:59
#: gui/saveload-dialog.cpp:383 gui/saveload-dialog.cpp:445
#: gui/saveload-dialog.cpp:727 gui/saveload-dialog.cpp:1121
@@ -119,7 +119,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -132,7 +132,7 @@ msgstr "Ja"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -155,7 +155,7 @@ msgstr ""
#: gui/downloaddialog.cpp:146 gui/editgamedialog.cpp:293
#: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:526
-#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1682
+#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1678
#: gui/saveload-dialog.cpp:1122 engines/engine.cpp:443 engines/engine.cpp:454
#: backends/platform/wii/options.cpp:47
#: backends/platform/wince/CELauncherDialog.cpp:54
@@ -241,8 +241,8 @@ msgstr ""
"Spillets sprхk. Dette vil ikke gjјre din spanske spillversjon om til engelsk "
"versjon"
-#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:997
-#: gui/options.cpp:1010 gui/options.cpp:1575 audio/null.cpp:41
+#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:993
+#: gui/options.cpp:1006 gui/options.cpp:1571 audio/null.cpp:41
msgid "<default>"
msgstr "<standard>"
@@ -264,11 +264,11 @@ msgstr "Plattform:"
msgid "Engine"
msgstr "Motor"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "Graphics"
msgstr "Grafikk"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "GFX"
msgstr "GFX"
@@ -281,7 +281,7 @@ msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Overstyr globale grafikkinstillinger"
-#: gui/editgamedialog.cpp:196 gui/options.cpp:1457
+#: gui/editgamedialog.cpp:196 gui/options.cpp:1453
msgid "Audio"
msgstr "Lyd"
@@ -294,11 +294,11 @@ msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Overstyr globale lydinstillinger"
-#: gui/editgamedialog.cpp:210 gui/options.cpp:1462
+#: gui/editgamedialog.cpp:210 gui/options.cpp:1458
msgid "Volume"
msgstr "Volum"
-#: gui/editgamedialog.cpp:212 gui/options.cpp:1464
+#: gui/editgamedialog.cpp:212 gui/options.cpp:1460
msgctxt "lowres"
msgid "Volume"
msgstr "Volum"
@@ -312,7 +312,7 @@ msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Overstyr globale voluminstillinger"
-#: gui/editgamedialog.cpp:226 gui/options.cpp:1472
+#: gui/editgamedialog.cpp:226 gui/options.cpp:1468
msgid "MIDI"
msgstr "MIDI"
@@ -325,7 +325,7 @@ msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Overstyr globale MIDI-instillinger"
-#: gui/editgamedialog.cpp:241 gui/options.cpp:1482
+#: gui/editgamedialog.cpp:241 gui/options.cpp:1478
msgid "MT-32"
msgstr "MT-32"
@@ -338,11 +338,11 @@ msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Overstyr globale MT-32-instillinger"
-#: gui/editgamedialog.cpp:255 gui/options.cpp:1489
+#: gui/editgamedialog.cpp:255 gui/options.cpp:1485
msgid "Paths"
msgstr "Sti"
-#: gui/editgamedialog.cpp:257 gui/options.cpp:1491
+#: gui/editgamedialog.cpp:257 gui/options.cpp:1487
msgctxt "lowres"
msgid "Paths"
msgstr "Sti"
@@ -356,7 +356,7 @@ msgctxt "lowres"
msgid "Game Path:"
msgstr "Spillsti:"
-#: gui/editgamedialog.cpp:271 gui/options.cpp:1515
+#: gui/editgamedialog.cpp:271 gui/options.cpp:1511
msgid "Extra Path:"
msgstr "Ekstrasti:"
@@ -365,44 +365,44 @@ msgstr "Ekstrasti:"
msgid "Specifies path to additional data used by the game"
msgstr "Bestemmer sti til ytterligere data brukt av spillet"
-#: gui/editgamedialog.cpp:273 gui/options.cpp:1517
+#: gui/editgamedialog.cpp:273 gui/options.cpp:1513
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Ekstrasti:"
-#: gui/editgamedialog.cpp:280 gui/options.cpp:1499
+#: gui/editgamedialog.cpp:280 gui/options.cpp:1495
msgid "Save Path:"
msgstr "Lagringssti:"
#: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282
-#: gui/editgamedialog.cpp:283 gui/options.cpp:1499 gui/options.cpp:1501
-#: gui/options.cpp:1502
+#: gui/editgamedialog.cpp:283 gui/options.cpp:1495 gui/options.cpp:1497
+#: gui/options.cpp:1498
msgid "Specifies where your saved games are put"
msgstr "Bestemmer sti til lagrede spill"
-#: gui/editgamedialog.cpp:282 gui/options.cpp:1501
+#: gui/editgamedialog.cpp:282 gui/options.cpp:1497
msgctxt "lowres"
msgid "Save Path:"
msgstr "Lagringssti:"
#: gui/editgamedialog.cpp:301 gui/editgamedialog.cpp:398
-#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1510
-#: gui/options.cpp:1518 gui/options.cpp:1527 gui/options.cpp:1707
-#: gui/options.cpp:1713 gui/options.cpp:1721 gui/options.cpp:1744
-#: gui/options.cpp:1777 gui/options.cpp:1783 gui/options.cpp:1790
-#: gui/options.cpp:1798 gui/options.cpp:1993 gui/options.cpp:1996
-#: gui/options.cpp:2003 gui/options.cpp:2013
+#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1506
+#: gui/options.cpp:1514 gui/options.cpp:1523 gui/options.cpp:1703
+#: gui/options.cpp:1709 gui/options.cpp:1717 gui/options.cpp:1740
+#: gui/options.cpp:1773 gui/options.cpp:1779 gui/options.cpp:1786
+#: gui/options.cpp:1794 gui/options.cpp:1989 gui/options.cpp:1992
+#: gui/options.cpp:1999 gui/options.cpp:2009
msgctxt "path"
msgid "None"
msgstr "Ingen"
#: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404
-#: gui/editgamedialog.cpp:522 gui/options.cpp:1701 gui/options.cpp:1771
-#: gui/options.cpp:1999 backends/platform/wii/options.cpp:56
+#: gui/editgamedialog.cpp:522 gui/options.cpp:1697 gui/options.cpp:1767
+#: gui/options.cpp:1995 backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Standard"
-#: gui/editgamedialog.cpp:450 gui/options.cpp:2007
+#: gui/editgamedialog.cpp:450 gui/options.cpp:2003
msgid "Select SoundFont"
msgstr "Velg SoundFont"
@@ -410,7 +410,7 @@ msgstr "Velg SoundFont"
msgid "Select additional game directory"
msgstr "Velg mappe med ytterligere data"
-#: gui/editgamedialog.cpp:502 gui/options.cpp:1930
+#: gui/editgamedialog.cpp:502 gui/options.cpp:1926
msgid "Select directory for saved games"
msgstr "Velg mappe for lagrede spill"
@@ -502,7 +502,7 @@ msgstr "Sinus"
msgid "Triangle"
msgstr "Trekant"
-#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1535
+#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1531
msgid "Misc"
msgstr "Diverse"
@@ -680,7 +680,7 @@ msgid "Search:"
msgstr "Sјk:"
#: gui/launcher.cpp:200 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:517
+#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:533
#: engines/pegasus/pegasus.cpp:355 engines/tsage/scenes.cpp:601
#: engines/wage/saveload.cpp:748
msgid "Load game:"
@@ -690,7 +690,7 @@ msgstr "Хpne spill:"
#: backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:105
-#: engines/mohawk/riven.cpp:517 engines/parallaction/saveload.cpp:194
+#: engines/mohawk/riven.cpp:533 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
msgid "Load"
@@ -802,211 +802,211 @@ msgstr "hvert 15. min"
msgid "every 30 mins"
msgstr "hvert 30. min"
-#: gui/options.cpp:343 gui/options.cpp:640 gui/options.cpp:778
-#: gui/options.cpp:853 gui/options.cpp:1114
+#: gui/options.cpp:339 gui/options.cpp:636 gui/options.cpp:774
+#: gui/options.cpp:849 gui/options.cpp:1110
msgctxt "soundfont"
msgid "None"
msgstr "Ingen"
-#: gui/options.cpp:514
+#: gui/options.cpp:510
msgid "Failed to apply some of the graphic options changes:"
msgstr "Klarte ikke х aktivere enkelte av endringene i grafikkinstillinger:"
-#: gui/options.cpp:526
+#: gui/options.cpp:522
msgid "the video mode could not be changed."
msgstr "videomodusen kunne ikke endres."
-#: gui/options.cpp:532
+#: gui/options.cpp:528
msgid "the aspect ratio setting could not be changed"
msgstr "aspektrate-innstillingen kunne ikke endres"
-#: gui/options.cpp:538
+#: gui/options.cpp:534
msgid "the fullscreen setting could not be changed"
msgstr "fullskjermsinnstillingen kunne ikke endres"
-#: gui/options.cpp:544
+#: gui/options.cpp:540
msgid "the filtering setting could not be changed"
msgstr "filterinnstillingen kunne ikke endres"
-#: gui/options.cpp:932
+#: gui/options.cpp:928
msgid "Show On-screen control"
msgstr ""
-#: gui/options.cpp:936
+#: gui/options.cpp:932
#, fuzzy
msgid "Touchpad mouse mode"
msgstr "Touchpad-modus deaktivert."
-#: gui/options.cpp:940
+#: gui/options.cpp:936
msgid "Swap Menu and Back buttons"
msgstr ""
-#: gui/options.cpp:945
+#: gui/options.cpp:941
#, fuzzy
msgid "Pointer Speed:"
msgstr "Hastighet:"
-#: gui/options.cpp:945 gui/options.cpp:947 gui/options.cpp:948
+#: gui/options.cpp:941 gui/options.cpp:943 gui/options.cpp:944
msgid "Speed for keyboard/joystick mouse pointer control"
msgstr ""
-#: gui/options.cpp:947
+#: gui/options.cpp:943
#, fuzzy
msgctxt "lowres"
msgid "Pointer Speed:"
msgstr "Hastighet:"
-#: gui/options.cpp:958
+#: gui/options.cpp:954
msgid "Joy Deadzone:"
msgstr ""
-#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
+#: gui/options.cpp:954 gui/options.cpp:956 gui/options.cpp:957
msgid "Analog joystick Deadzone"
msgstr ""
-#: gui/options.cpp:960
+#: gui/options.cpp:956
msgctxt "lowres"
msgid "Joy Deadzone:"
msgstr ""
-#: gui/options.cpp:974
+#: gui/options.cpp:970
msgid "HW Shader:"
msgstr ""
-#: gui/options.cpp:974 gui/options.cpp:976
+#: gui/options.cpp:970 gui/options.cpp:972
msgid "Different hardware shaders give different visual effects"
msgstr ""
-#: gui/options.cpp:976
+#: gui/options.cpp:972
msgctxt "lowres"
msgid "HW Shader:"
msgstr ""
-#: gui/options.cpp:977
+#: gui/options.cpp:973
msgid "Different shaders give different visual effects"
msgstr ""
-#: gui/options.cpp:994
+#: gui/options.cpp:990
msgid "Graphics mode:"
msgstr "Grafikkmodus:"
-#: gui/options.cpp:1008
+#: gui/options.cpp:1004
msgid "Render mode:"
msgstr "Tegnemodus:"
-#: gui/options.cpp:1008 gui/options.cpp:1009
+#: gui/options.cpp:1004 gui/options.cpp:1005
msgid "Special dithering modes supported by some games"
msgstr "Spesiel dithering-modus stјttet av enkelte spill"
-#: gui/options.cpp:1020 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
+#: gui/options.cpp:1016 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2590
msgid "Fullscreen mode"
msgstr "Fullskjermsmodus"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Filter graphics"
msgstr "Filtrer grafikk"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Use linear filtering when scaling graphics"
msgstr ""
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Aspect ratio correction"
msgstr "Aspekt-rate korrigering"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Correct aspect ratio for 320x200 games"
msgstr "Korriger aspekt-rate for 320x200-spill"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Preferred Device:"
msgstr "Foretrukket enhet:"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Music Device:"
msgstr "Musikkenhet:"
-#: gui/options.cpp:1034 gui/options.cpp:1036
+#: gui/options.cpp:1030 gui/options.cpp:1032
msgid "Specifies preferred sound device or sound card emulator"
msgstr "Velger foretrukket lydenhet eller lydkort-emulator"
-#: gui/options.cpp:1034 gui/options.cpp:1036 gui/options.cpp:1037
+#: gui/options.cpp:1030 gui/options.cpp:1032 gui/options.cpp:1033
msgid "Specifies output sound device or sound card emulator"
msgstr "Velger ut-lydenhet eller lydkortemulator"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Foretrukket enh.:"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Music Device:"
msgstr "Musikkenhet:"
-#: gui/options.cpp:1063
+#: gui/options.cpp:1059
msgid "AdLib emulator:"
msgstr "AdLib-emulator:"
-#: gui/options.cpp:1063 gui/options.cpp:1064
+#: gui/options.cpp:1059 gui/options.cpp:1060
msgid "AdLib is used for music in many games"
msgstr "AdLib brukes til musikk i mange spill"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "GM Device:"
msgstr "GM-enhet:"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "Specifies default sound device for General MIDI output"
msgstr "Velger standard lydenhet for General MIDI-utdata"
-#: gui/options.cpp:1088
+#: gui/options.cpp:1084
msgid "Don't use General MIDI music"
msgstr "Ikke bruk General MIDI-musikk"
-#: gui/options.cpp:1099 gui/options.cpp:1161
+#: gui/options.cpp:1095 gui/options.cpp:1157
msgid "Use first available device"
msgstr "Bruk fјrste tilgjengelige enhet"
-#: gui/options.cpp:1111
+#: gui/options.cpp:1107
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1111 gui/options.cpp:1113 gui/options.cpp:1114
+#: gui/options.cpp:1107 gui/options.cpp:1109 gui/options.cpp:1110
msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity"
msgstr "SoundFont stјttes ikke av enkelte lydkort, FluidSynth og Timidity"
-#: gui/options.cpp:1113
+#: gui/options.cpp:1109
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Mixed AdLib/MIDI mode"
msgstr "Mikset AdLib/MIDI-modus"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Use both MIDI and AdLib sound generation"
msgstr "Bruk bхde MIDI- og AdLib- lydgenerering"
-#: gui/options.cpp:1122
+#: gui/options.cpp:1118
msgid "MIDI gain:"
msgstr "MIDI gain:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "MT-32 Device:"
msgstr "MT-32 Enhet:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr "Velger standard lydenhet for Roland MT-32/LAPC1/CM32I/CM64-avspilling"
-#: gui/options.cpp:1137
+#: gui/options.cpp:1133
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Ekte Roland MT-32 (deaktiver GM-emulering)"
-#: gui/options.cpp:1137 gui/options.cpp:1139
+#: gui/options.cpp:1133 gui/options.cpp:1135
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -1014,16 +1014,16 @@ msgstr ""
"Velg hvis du har et ekte Roland-kompatible lydkort tilkoblet maskinen, og "
"vil bruke dette"
-#: gui/options.cpp:1139
+#: gui/options.cpp:1135
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Ekte Roland MT-32 (deaktiver GM-emulering)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid "Roland GS Device (enable MT-32 mappings)"
msgstr "Roland GS Modus (aktiver MT32-mapping)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid ""
"Check if you want to enable patch mappings to emulate an MT-32 on a Roland "
"GS device"
@@ -1031,272 +1031,272 @@ msgstr ""
"Aktiver hvis du vil slх pх patch mappinger for х emulere en MT-32 eller "
"Roland GS enhet"
-#: gui/options.cpp:1151
+#: gui/options.cpp:1147
msgid "Don't use Roland MT-32 music"
msgstr "Ikke bruk Roland MT-32-musikk"
-#: gui/options.cpp:1178
+#: gui/options.cpp:1174
msgid "Text and Speech:"
msgstr "Tekst og Tale:"
-#: gui/options.cpp:1182 gui/options.cpp:1192
+#: gui/options.cpp:1178 gui/options.cpp:1188
msgid "Speech"
msgstr "Tale"
-#: gui/options.cpp:1183 gui/options.cpp:1193
+#: gui/options.cpp:1179 gui/options.cpp:1189
msgid "Subtitles"
msgstr "Undertekster"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1180
msgid "Both"
msgstr "Begge"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1182
msgid "Subtitle speed:"
msgstr "Teksthastighet:"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1184
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Tekst og Tale:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1188
msgid "Spch"
msgstr "Tale"
-#: gui/options.cpp:1193
+#: gui/options.cpp:1189
msgid "Subs"
msgstr "Tekst"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgctxt "lowres"
msgid "Both"
msgstr "Begge"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgid "Show subtitles and play speech"
msgstr "Vis undertekster, og spill av tale"
-#: gui/options.cpp:1196
+#: gui/options.cpp:1192
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Underteksthastighet:"
-#: gui/options.cpp:1212
+#: gui/options.cpp:1208
msgid "Music volume:"
msgstr "Musikkvolum:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1210
msgctxt "lowres"
msgid "Music volume:"
msgstr "Musikkvolum:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1217
msgid "Mute All"
msgstr "Demp alle"
-#: gui/options.cpp:1224
+#: gui/options.cpp:1220
msgid "SFX volume:"
msgstr "Lydeffektvolum:"
-#: gui/options.cpp:1224 gui/options.cpp:1226 gui/options.cpp:1227
+#: gui/options.cpp:1220 gui/options.cpp:1222 gui/options.cpp:1223
msgid "Special sound effects volume"
msgstr "Volum for spesielle lydeffekter"
-#: gui/options.cpp:1226
+#: gui/options.cpp:1222
msgctxt "lowres"
msgid "SFX volume:"
msgstr "Lydeffektvolum:"
-#: gui/options.cpp:1234
+#: gui/options.cpp:1230
msgid "Speech volume:"
msgstr "Talevolum:"
-#: gui/options.cpp:1236
+#: gui/options.cpp:1232
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Talevolum:"
-#: gui/options.cpp:1438
+#: gui/options.cpp:1434
msgid "Shader"
msgstr ""
-#: gui/options.cpp:1450
+#: gui/options.cpp:1446
#, fuzzy
msgid "Control"
msgstr "Styr Mus"
-#: gui/options.cpp:1476
+#: gui/options.cpp:1472
msgid "FluidSynth Settings"
msgstr "FluidSynth-instillinger"
-#: gui/options.cpp:1507
+#: gui/options.cpp:1503
msgid "Theme Path:"
msgstr "Temasti:"
-#: gui/options.cpp:1509
+#: gui/options.cpp:1505
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Temasti:"
-#: gui/options.cpp:1515 gui/options.cpp:1517 gui/options.cpp:1518
+#: gui/options.cpp:1511 gui/options.cpp:1513 gui/options.cpp:1514
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr "Velger sti for ytterligere data brukt av alle spill eller ScummVM"
-#: gui/options.cpp:1524
+#: gui/options.cpp:1520
msgid "Plugins Path:"
msgstr "Pluginsti:"
-#: gui/options.cpp:1526
+#: gui/options.cpp:1522
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Pluginsti:"
-#: gui/options.cpp:1537
+#: gui/options.cpp:1533
msgctxt "lowres"
msgid "Misc"
msgstr "Div"
-#: gui/options.cpp:1539
+#: gui/options.cpp:1535
msgid "Theme:"
msgstr "Tema:"
-#: gui/options.cpp:1543
+#: gui/options.cpp:1539
msgid "GUI Renderer:"
msgstr "GUI-tegner:"
-#: gui/options.cpp:1555
+#: gui/options.cpp:1551
msgid "Autosave:"
msgstr "Autolagre:"
-#: gui/options.cpp:1557
+#: gui/options.cpp:1553
msgctxt "lowres"
msgid "Autosave:"
msgstr "Autolagre:"
-#: gui/options.cpp:1565
+#: gui/options.cpp:1561
msgid "Keys"
msgstr "Taster"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "GUI Language:"
msgstr "GUI-sprхk:"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "Language of ScummVM GUI"
msgstr "Sprхk i ScummVM-GUIet"
-#: gui/options.cpp:1600 gui/updates-dialog.cpp:86
+#: gui/options.cpp:1596 gui/updates-dialog.cpp:86
msgid "Update check:"
msgstr "Oppdateringssjekk:"
-#: gui/options.cpp:1600
+#: gui/options.cpp:1596
msgid "How often to check ScummVM updates"
msgstr "Hvor ofte det skal sjekkes for ScummVM-oppdateringer"
-#: gui/options.cpp:1612
+#: gui/options.cpp:1608
msgid "Check now"
msgstr "Sjekk nх"
-#: gui/options.cpp:1620
+#: gui/options.cpp:1616
msgid "Cloud"
msgstr "Sky"
-#: gui/options.cpp:1622
+#: gui/options.cpp:1618
msgctxt "lowres"
msgid "Cloud"
msgstr "Sky"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Storage:"
msgstr "Lagring:"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Active cloud storage"
msgstr "Aktiv skylagring"
-#: gui/options.cpp:1634 gui/options.cpp:2210
+#: gui/options.cpp:1630 gui/options.cpp:2206
msgid "<none>"
msgstr "<ingen>"
-#: gui/options.cpp:1638 backends/platform/wii/options.cpp:114
+#: gui/options.cpp:1634 backends/platform/wii/options.cpp:114
msgid "Username:"
msgstr "Brukernavn:"
-#: gui/options.cpp:1638
+#: gui/options.cpp:1634
msgid "Username used by this storage"
msgstr "Brukernavn for denne lagringsmхten"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Used space:"
msgstr "Brukt plass:"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Space used by ScummVM's saved games on this storage"
msgstr "Plass brukt av ScummVM's lagrede spill pх denne lagringsmхten"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "Last sync time:"
msgstr "Forrige synctidspunkt:"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "When the last saved games sync for this storage occured"
msgstr "Nхr forrige sync av lagrede spill til denne lagringsmхten skjedde"
-#: gui/options.cpp:1647 gui/storagewizarddialog.cpp:71
+#: gui/options.cpp:1643 gui/storagewizarddialog.cpp:71
msgid "Connect"
msgstr "Koble til"
-#: gui/options.cpp:1647
+#: gui/options.cpp:1643
msgid "Open wizard dialog to connect your cloud storage account"
msgstr "Хpne veiviserdialog for х koble til skylagringen din"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh"
msgstr "Oppfrisk"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh current cloud storage information (username and usage)"
msgstr "Oppfrisk gjeldende skylagringsinformasjon (brukernavn og bruk)"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Download"
msgstr "Last ned"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Open downloads manager dialog"
msgstr "Хpne nedlastingsbehandlerdialog"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run server"
msgstr "Kjјr server"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run local webserver"
msgstr "Kjјr lokal webserver"
-#: gui/options.cpp:1652 gui/options.cpp:2320
+#: gui/options.cpp:1648 gui/options.cpp:2316
msgid "Not running"
msgstr "Kjјrer ikke"
-#: gui/options.cpp:1656
+#: gui/options.cpp:1652
msgid "/root/ Path:"
msgstr "/root/ Sti:"
-#: gui/options.cpp:1656 gui/options.cpp:1658 gui/options.cpp:1659
+#: gui/options.cpp:1652 gui/options.cpp:1654 gui/options.cpp:1655
msgid "Specifies which directory the Files Manager can access"
msgstr "Angi mappe som filbehandleren skal ha tilgang til"
-#: gui/options.cpp:1658
+#: gui/options.cpp:1654
msgctxt "lowres"
msgid "/root/ Path:"
msgstr "/root/ Sti:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid "Server's port:"
msgstr "Serverport:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid ""
"Which port is used by the server\n"
"Auth with server is not available with non-default port"
@@ -1304,76 +1304,76 @@ msgstr ""
"Hvilken port som brukes av serveren\n"
"Autentisering med server stјttes ikke med ikke-standard port"
-#: gui/options.cpp:1681
+#: gui/options.cpp:1677
msgid "Apply"
msgstr ""
-#: gui/options.cpp:1824
+#: gui/options.cpp:1820
msgid "Failed to change cloud storage!"
msgstr "Klarte ikke х kontakte skylagring!"
-#: gui/options.cpp:1827
+#: gui/options.cpp:1823
msgid "Another cloud storage is already active."
msgstr "En annen skylagring er allerede aktiv."
-#: gui/options.cpp:1895
+#: gui/options.cpp:1891
#, fuzzy
msgid "Theme does not support selected language!"
msgstr "Spillmotor-plugin stјtter ikke lagrede spill"
-#: gui/options.cpp:1898
+#: gui/options.cpp:1894
#, fuzzy
msgid "Theme cannot be loaded!"
msgstr "Spillet ble IKKE lastet"
-#: gui/options.cpp:1901
+#: gui/options.cpp:1897
msgid ""
"\n"
"Misc settings will be restored."
msgstr ""
-#: gui/options.cpp:1937
+#: gui/options.cpp:1933
msgid "The chosen directory cannot be written to. Please select another one."
msgstr "Den valgte mappen kan ikke skrives til. Vennligst velg en annen."
-#: gui/options.cpp:1946
+#: gui/options.cpp:1942
msgid "Select directory for GUI themes"
msgstr "Velg mappe for GUI-temaer"
-#: gui/options.cpp:1956
+#: gui/options.cpp:1952
msgid "Select directory for extra files"
msgstr "Velg mappe for ytterligere filer"
-#: gui/options.cpp:1967
+#: gui/options.cpp:1963
msgid "Select directory for plugins"
msgstr "Velg mappe for plugins"
-#: gui/options.cpp:1979
+#: gui/options.cpp:1975
msgid "Select directory for Files Manager /root/"
msgstr "Velg mappe for filbehandler /root/"
-#: gui/options.cpp:2217
+#: gui/options.cpp:2213
#, c-format
msgid "%llu bytes"
msgstr "%llu bytes"
-#: gui/options.cpp:2225
+#: gui/options.cpp:2221
msgid "<right now>"
msgstr "<med en gang>"
-#: gui/options.cpp:2227
+#: gui/options.cpp:2223
msgid "<never>"
msgstr "<aldri>"
-#: gui/options.cpp:2311
+#: gui/options.cpp:2307
msgid "Stop server"
msgstr "Stopp server"
-#: gui/options.cpp:2312
+#: gui/options.cpp:2308
msgid "Stop local webserver"
msgstr "Stopp lokal webserver"
-#: gui/options.cpp:2403
+#: gui/options.cpp:2399
msgid ""
"Request failed.\n"
"Check your Internet connection."
@@ -1840,8 +1840,8 @@ msgstr "~T~ilbake til oppstarter"
#: 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:106
-#: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:658
+#: engines/mohawk/riven.cpp:545 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
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
#: engines/toon/toon.cpp:3340 engines/tsage/scenes.cpp:599
@@ -1860,9 +1860,9 @@ msgstr "Lagret spill:"
#: engines/dm/loadsave.cpp:196 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:106 engines/neverhood/menumodule.cpp:880
-#: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:659
+#: engines/mohawk/dialogs.cpp:106 engines/mohawk/riven.cpp:545
+#: 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
#: engines/sherlock/scalpel/scalpel.cpp:1250
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
@@ -2176,7 +2176,7 @@ msgstr "Klikking deaktivert"
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Touchskjerm 'Tapmodus' - Sveve (DPad Klikk)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
msgid "Do you want to quit ?"
msgstr "Vil du avslutte?"
@@ -3333,7 +3333,7 @@ msgid ""
"works."
msgstr ""
-#: engines/mohawk/riven.cpp:416
+#: engines/mohawk/riven.cpp:432
msgid "You are missing the following required Riven data files:\n"
msgstr ""
diff --git a/po/nl_NL.po b/po/nl_NL.po
index f06d5b7639..bcc7d3a58b 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: 2017-12-10 15:25+0100\n"
+"POT-Creation-Date: 2017-12-26 21:11+0100\n"
"PO-Revision-Date: 2017-11-11 15:31+0000\n"
"Last-Translator: Ben Castricum <github@bencastricum.nl>\n"
"Language-Team: Dutch <https://translations.scummvm.org/projects/scummvm/"
@@ -59,7 +59,7 @@ msgstr "Ga omhoog"
#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editgamedialog.cpp:292
#: gui/editrecorddialog.cpp:67 gui/filebrowser-dialog.cpp:64
#: gui/fluidsynth-dialog.cpp:152 gui/KeysDialog.cpp:43 gui/massadd.cpp:95
-#: gui/options.cpp:1680 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
+#: gui/options.cpp:1676 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
#: gui/recorderdialog.cpp:155 gui/remotebrowser.cpp:59
#: gui/saveload-dialog.cpp:383 gui/saveload-dialog.cpp:445
#: gui/saveload-dialog.cpp:727 gui/saveload-dialog.cpp:1121
@@ -117,7 +117,7 @@ msgstr "Uw verbinding lijkt beperkt. Wilt u echt bestanden ermee downloaden?"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -130,7 +130,7 @@ msgstr "Ja"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -153,7 +153,7 @@ msgstr ""
#: gui/downloaddialog.cpp:146 gui/editgamedialog.cpp:293
#: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:526
-#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1682
+#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1678
#: gui/saveload-dialog.cpp:1122 engines/engine.cpp:443 engines/engine.cpp:454
#: backends/platform/wii/options.cpp:47
#: backends/platform/wince/CELauncherDialog.cpp:54
@@ -238,8 +238,8 @@ msgid ""
msgstr ""
"De taal van het spel. Dit verandert een Engels spel niet naar een Nederlandse"
-#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:997
-#: gui/options.cpp:1010 gui/options.cpp:1575 audio/null.cpp:41
+#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:993
+#: gui/options.cpp:1006 gui/options.cpp:1571 audio/null.cpp:41
msgid "<default>"
msgstr "<standaard>"
@@ -261,11 +261,11 @@ msgstr "Platform:"
msgid "Engine"
msgstr "Engine"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "Graphics"
msgstr "Beeld"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "GFX"
msgstr "GFX"
@@ -278,7 +278,7 @@ msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Negeer algemene grafische instellingen"
-#: gui/editgamedialog.cpp:196 gui/options.cpp:1457
+#: gui/editgamedialog.cpp:196 gui/options.cpp:1453
msgid "Audio"
msgstr "Geluid"
@@ -291,11 +291,11 @@ msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Negeer algemene audio instellingen"
-#: gui/editgamedialog.cpp:210 gui/options.cpp:1462
+#: gui/editgamedialog.cpp:210 gui/options.cpp:1458
msgid "Volume"
msgstr "Volume"
-#: gui/editgamedialog.cpp:212 gui/options.cpp:1464
+#: gui/editgamedialog.cpp:212 gui/options.cpp:1460
msgctxt "lowres"
msgid "Volume"
msgstr "Volume"
@@ -309,7 +309,7 @@ msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Negeer algemene volume instellingen"
-#: gui/editgamedialog.cpp:226 gui/options.cpp:1472
+#: gui/editgamedialog.cpp:226 gui/options.cpp:1468
msgid "MIDI"
msgstr "MIDI"
@@ -322,7 +322,7 @@ msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Negeer algemene MIDI instellingen"
-#: gui/editgamedialog.cpp:241 gui/options.cpp:1482
+#: gui/editgamedialog.cpp:241 gui/options.cpp:1478
msgid "MT-32"
msgstr "MT-32"
@@ -335,11 +335,11 @@ msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Negeer algemene MT-32 instellingen"
-#: gui/editgamedialog.cpp:255 gui/options.cpp:1489
+#: gui/editgamedialog.cpp:255 gui/options.cpp:1485
msgid "Paths"
msgstr "Paden"
-#: gui/editgamedialog.cpp:257 gui/options.cpp:1491
+#: gui/editgamedialog.cpp:257 gui/options.cpp:1487
msgctxt "lowres"
msgid "Paths"
msgstr "Paden"
@@ -353,7 +353,7 @@ msgctxt "lowres"
msgid "Game Path:"
msgstr "Spel Pad:"
-#: gui/editgamedialog.cpp:271 gui/options.cpp:1515
+#: gui/editgamedialog.cpp:271 gui/options.cpp:1511
msgid "Extra Path:"
msgstr "Extra Pad:"
@@ -362,44 +362,44 @@ msgstr "Extra Pad:"
msgid "Specifies path to additional data used by the game"
msgstr "Specificeer pad naar additionele data voor het spel"
-#: gui/editgamedialog.cpp:273 gui/options.cpp:1517
+#: gui/editgamedialog.cpp:273 gui/options.cpp:1513
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Extra Pad:"
-#: gui/editgamedialog.cpp:280 gui/options.cpp:1499
+#: gui/editgamedialog.cpp:280 gui/options.cpp:1495
msgid "Save Path:"
msgstr "Bewaar Pad:"
#: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282
-#: gui/editgamedialog.cpp:283 gui/options.cpp:1499 gui/options.cpp:1501
-#: gui/options.cpp:1502
+#: gui/editgamedialog.cpp:283 gui/options.cpp:1495 gui/options.cpp:1497
+#: gui/options.cpp:1498
msgid "Specifies where your saved games are put"
msgstr "Bepaalt waar opgeslagen spellen worden bewaard"
-#: gui/editgamedialog.cpp:282 gui/options.cpp:1501
+#: gui/editgamedialog.cpp:282 gui/options.cpp:1497
msgctxt "lowres"
msgid "Save Path:"
msgstr "Bewaar Pad:"
#: gui/editgamedialog.cpp:301 gui/editgamedialog.cpp:398
-#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1510
-#: gui/options.cpp:1518 gui/options.cpp:1527 gui/options.cpp:1707
-#: gui/options.cpp:1713 gui/options.cpp:1721 gui/options.cpp:1744
-#: gui/options.cpp:1777 gui/options.cpp:1783 gui/options.cpp:1790
-#: gui/options.cpp:1798 gui/options.cpp:1993 gui/options.cpp:1996
-#: gui/options.cpp:2003 gui/options.cpp:2013
+#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1506
+#: gui/options.cpp:1514 gui/options.cpp:1523 gui/options.cpp:1703
+#: gui/options.cpp:1709 gui/options.cpp:1717 gui/options.cpp:1740
+#: gui/options.cpp:1773 gui/options.cpp:1779 gui/options.cpp:1786
+#: gui/options.cpp:1794 gui/options.cpp:1989 gui/options.cpp:1992
+#: gui/options.cpp:1999 gui/options.cpp:2009
msgctxt "path"
msgid "None"
msgstr "Geen"
#: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404
-#: gui/editgamedialog.cpp:522 gui/options.cpp:1701 gui/options.cpp:1771
-#: gui/options.cpp:1999 backends/platform/wii/options.cpp:56
+#: gui/editgamedialog.cpp:522 gui/options.cpp:1697 gui/options.cpp:1767
+#: gui/options.cpp:1995 backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Standaard"
-#: gui/editgamedialog.cpp:450 gui/options.cpp:2007
+#: gui/editgamedialog.cpp:450 gui/options.cpp:2003
msgid "Select SoundFont"
msgstr "Selecteer SoundFont"
@@ -407,7 +407,7 @@ msgstr "Selecteer SoundFont"
msgid "Select additional game directory"
msgstr "Selecteer additionele speldatamap"
-#: gui/editgamedialog.cpp:502 gui/options.cpp:1930
+#: gui/editgamedialog.cpp:502 gui/options.cpp:1926
msgid "Select directory for saved games"
msgstr "Selecteer map voor opgeslagen spellen"
@@ -500,7 +500,7 @@ msgstr "Sinus"
msgid "Triangle"
msgstr "Driehoek"
-#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1535
+#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1531
msgid "Misc"
msgstr "Overig"
@@ -679,7 +679,7 @@ msgid "Search:"
msgstr "Zoeken:"
#: gui/launcher.cpp:200 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:517
+#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:533
#: engines/pegasus/pegasus.cpp:355 engines/tsage/scenes.cpp:601
#: engines/wage/saveload.cpp:748
msgid "Load game:"
@@ -689,7 +689,7 @@ msgstr "Laad spel:"
#: backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:105
-#: engines/mohawk/riven.cpp:517 engines/parallaction/saveload.cpp:194
+#: engines/mohawk/riven.cpp:533 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
msgid "Load"
@@ -804,211 +804,211 @@ msgstr "elke 15 minuten"
msgid "every 30 mins"
msgstr "elke 30 minuten"
-#: gui/options.cpp:343 gui/options.cpp:640 gui/options.cpp:778
-#: gui/options.cpp:853 gui/options.cpp:1114
+#: gui/options.cpp:339 gui/options.cpp:636 gui/options.cpp:774
+#: gui/options.cpp:849 gui/options.cpp:1110
msgctxt "soundfont"
msgid "None"
msgstr "Geen"
-#: gui/options.cpp:514
+#: gui/options.cpp:510
msgid "Failed to apply some of the graphic options changes:"
msgstr "Sommige grafische opties konden niet worden toegepast:"
-#: gui/options.cpp:526
+#: gui/options.cpp:522
msgid "the video mode could not be changed."
msgstr "de videomodus kon niet veranderd worden."
-#: gui/options.cpp:532
+#: gui/options.cpp:528
msgid "the aspect ratio setting could not be changed"
msgstr "de pixelverhoudinginstelling kon niet veranderd worden"
-#: gui/options.cpp:538
+#: gui/options.cpp:534
msgid "the fullscreen setting could not be changed"
msgstr "de volledig-scherminstelling kon niet veranderd worden"
-#: gui/options.cpp:544
+#: gui/options.cpp:540
msgid "the filtering setting could not be changed"
msgstr "de filterinstelling kon niet veranderd worden"
-#: gui/options.cpp:932
+#: gui/options.cpp:928
msgid "Show On-screen control"
msgstr "Toon scherm-besturing"
-#: gui/options.cpp:936
+#: gui/options.cpp:932
msgid "Touchpad mouse mode"
msgstr "Touchpadmodus"
-#: gui/options.cpp:940
+#: gui/options.cpp:936
msgid "Swap Menu and Back buttons"
msgstr "Knoppen Menu en Terug omwisselen"
-#: gui/options.cpp:945
+#: gui/options.cpp:941
msgid "Pointer Speed:"
msgstr "Aanwijzer Snelheid:"
-#: gui/options.cpp:945 gui/options.cpp:947 gui/options.cpp:948
+#: gui/options.cpp:941 gui/options.cpp:943 gui/options.cpp:944
msgid "Speed for keyboard/joystick mouse pointer control"
msgstr "Snelheid voor toetsenbord/joystick muis aanwijzer besturing"
-#: gui/options.cpp:947
+#: gui/options.cpp:943
msgctxt "lowres"
msgid "Pointer Speed:"
msgstr "Aanwijzer Snelheid:"
-#: gui/options.cpp:958
+#: gui/options.cpp:954
msgid "Joy Deadzone:"
msgstr "Joy Deadzone:"
-#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
+#: gui/options.cpp:954 gui/options.cpp:956 gui/options.cpp:957
msgid "Analog joystick Deadzone"
msgstr "Analoge Joystick Deadzone"
-#: gui/options.cpp:960
+#: gui/options.cpp:956
msgctxt "lowres"
msgid "Joy Deadzone:"
msgstr "Joy Deadzone:"
-#: gui/options.cpp:974
+#: gui/options.cpp:970
msgid "HW Shader:"
msgstr "HW Shader:"
-#: gui/options.cpp:974 gui/options.cpp:976
+#: gui/options.cpp:970 gui/options.cpp:972
msgid "Different hardware shaders give different visual effects"
msgstr "Verschillende hardware shaders geven verschillende visuele effecten"
-#: gui/options.cpp:976
+#: gui/options.cpp:972
msgctxt "lowres"
msgid "HW Shader:"
msgstr "HW Shader:"
-#: gui/options.cpp:977
+#: gui/options.cpp:973
msgid "Different shaders give different visual effects"
msgstr "Verschillende shaders geven verschillende visuele effecten"
-#: gui/options.cpp:994
+#: gui/options.cpp:990
msgid "Graphics mode:"
msgstr "Grafische modus:"
-#: gui/options.cpp:1008
+#: gui/options.cpp:1004
msgid "Render mode:"
msgstr "Render modus:"
-#: gui/options.cpp:1008 gui/options.cpp:1009
+#: gui/options.cpp:1004 gui/options.cpp:1005
msgid "Special dithering modes supported by some games"
msgstr "Speciale ditheringmodi die door sommige games ondersteund worden"
-#: gui/options.cpp:1020 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
+#: gui/options.cpp:1016 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2590
msgid "Fullscreen mode"
msgstr "Volledig-scherm modus"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Filter graphics"
msgstr "Filter afbeeldingen"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Use linear filtering when scaling graphics"
msgstr "Gebruik lineair filteren tijdens het schalen van afbeeldingen"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Aspect ratio correction"
msgstr "Pixelverhoudingcorrectie"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Correct aspect ratio for 320x200 games"
msgstr "Corrigeer de pixelverhouding voor 320x200 spellen"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Preferred Device:"
msgstr "Voorkeursapparaat:"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Music Device:"
msgstr "Muziekapparaat:"
-#: gui/options.cpp:1034 gui/options.cpp:1036
+#: gui/options.cpp:1030 gui/options.cpp:1032
msgid "Specifies preferred sound device or sound card emulator"
msgstr "Specificeert het voorkeurs geluidsapparaat of geluidskaartemulator"
-#: gui/options.cpp:1034 gui/options.cpp:1036 gui/options.cpp:1037
+#: gui/options.cpp:1030 gui/options.cpp:1032 gui/options.cpp:1033
msgid "Specifies output sound device or sound card emulator"
msgstr "Specificeert geluidsapparaat of geluidskaartemulator"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Voorkeursapparaat:"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Music Device:"
msgstr "Muziekapparaat:"
-#: gui/options.cpp:1063
+#: gui/options.cpp:1059
msgid "AdLib emulator:"
msgstr "AdLib emulator:"
-#: gui/options.cpp:1063 gui/options.cpp:1064
+#: gui/options.cpp:1059 gui/options.cpp:1060
msgid "AdLib is used for music in many games"
msgstr "AdLib word in vele spelen voor muziek gebruikt"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "GM Device:"
msgstr "GM Apparaat:"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "Specifies default sound device for General MIDI output"
msgstr "Specificeert het standaard geluidsapparaat voor General MIDI"
-#: gui/options.cpp:1088
+#: gui/options.cpp:1084
msgid "Don't use General MIDI music"
msgstr "Geen General MIDI muziek gebruiken"
-#: gui/options.cpp:1099 gui/options.cpp:1161
+#: gui/options.cpp:1095 gui/options.cpp:1157
msgid "Use first available device"
msgstr "Gebruik eerst beschikbare apparaat"
-#: gui/options.cpp:1111
+#: gui/options.cpp:1107
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1111 gui/options.cpp:1113 gui/options.cpp:1114
+#: gui/options.cpp:1107 gui/options.cpp:1109 gui/options.cpp:1110
msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity"
msgstr ""
"SoundFont wordt ondersteund door FluidSynth, Timidity en sommige "
"geluidskaarten"
-#: gui/options.cpp:1113
+#: gui/options.cpp:1109
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Mixed AdLib/MIDI mode"
msgstr "Gemengde AdLib/MIDI modus"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Use both MIDI and AdLib sound generation"
msgstr "Gebruik zowel MIDI als AdLib geluid"
-#: gui/options.cpp:1122
+#: gui/options.cpp:1118
msgid "MIDI gain:"
msgstr "MIDI versterking:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "MT-32 Device:"
msgstr "MT-32 Apparaat:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
"Specificeert het standaard geluidsapparaat voor Roland MT-32/LAPC1/CM32l/CM64"
-#: gui/options.cpp:1137
+#: gui/options.cpp:1133
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Waarheidsgetrouwe Roland MT-32 (GM emulatie uitschakelen)"
-#: gui/options.cpp:1137 gui/options.cpp:1139
+#: gui/options.cpp:1133 gui/options.cpp:1135
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -1016,16 +1016,16 @@ msgstr ""
"Selecteer als u een hardware Roland-compatible geluidsapparaat gekoppeld aan "
"uw computer wilt gebruiken"
-#: gui/options.cpp:1139
+#: gui/options.cpp:1135
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Echte Roland MT-32 (geen GM emulatie)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid "Roland GS Device (enable MT-32 mappings)"
msgstr "Roland GS Device (met MT-32 mappings)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid ""
"Check if you want to enable patch mappings to emulate an MT-32 on a Roland "
"GS device"
@@ -1033,273 +1033,273 @@ msgstr ""
"Selecteer dit als u patchmappings wilt om een MT-32 op een Roland GS "
"apparaat te emuleren"
-#: gui/options.cpp:1151
+#: gui/options.cpp:1147
msgid "Don't use Roland MT-32 music"
msgstr "Geen Roland MT-32 muziek gebruiken"
-#: gui/options.cpp:1178
+#: gui/options.cpp:1174
msgid "Text and Speech:"
msgstr "Spraak en/of tekst:"
-#: gui/options.cpp:1182 gui/options.cpp:1192
+#: gui/options.cpp:1178 gui/options.cpp:1188
msgid "Speech"
msgstr "Spraak"
-#: gui/options.cpp:1183 gui/options.cpp:1193
+#: gui/options.cpp:1179 gui/options.cpp:1189
msgid "Subtitles"
msgstr "Tekst"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1180
msgid "Both"
msgstr "Beide"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1182
msgid "Subtitle speed:"
msgstr "Snelheid tekst:"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1184
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Spraak en/of text:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1188
msgid "Spch"
msgstr "Sprk"
-#: gui/options.cpp:1193
+#: gui/options.cpp:1189
msgid "Subs"
msgstr "Text"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgctxt "lowres"
msgid "Both"
msgstr "Beide"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgid "Show subtitles and play speech"
msgstr "Toon tekst en speel spraak af"
-#: gui/options.cpp:1196
+#: gui/options.cpp:1192
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Snelheid text:"
-#: gui/options.cpp:1212
+#: gui/options.cpp:1208
msgid "Music volume:"
msgstr "Muziek volume:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1210
msgctxt "lowres"
msgid "Music volume:"
msgstr "Muziek volume:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1217
msgid "Mute All"
msgstr "Alles Dempen"
-#: gui/options.cpp:1224
+#: gui/options.cpp:1220
msgid "SFX volume:"
msgstr "SFX volume:"
-#: gui/options.cpp:1224 gui/options.cpp:1226 gui/options.cpp:1227
+#: gui/options.cpp:1220 gui/options.cpp:1222 gui/options.cpp:1223
msgid "Special sound effects volume"
msgstr "Volume voor speciale geluidseffecten"
-#: gui/options.cpp:1226
+#: gui/options.cpp:1222
msgctxt "lowres"
msgid "SFX volume:"
msgstr "SFX volume:"
-#: gui/options.cpp:1234
+#: gui/options.cpp:1230
msgid "Speech volume:"
msgstr "Spraak volume:"
-#: gui/options.cpp:1236
+#: gui/options.cpp:1232
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Spraak volume:"
-#: gui/options.cpp:1438
+#: gui/options.cpp:1434
msgid "Shader"
msgstr "Shader"
-#: gui/options.cpp:1450
+#: gui/options.cpp:1446
msgid "Control"
msgstr "Besturing"
-#: gui/options.cpp:1476
+#: gui/options.cpp:1472
msgid "FluidSynth Settings"
msgstr "FluidSynth Instellingen"
-#: gui/options.cpp:1507
+#: gui/options.cpp:1503
msgid "Theme Path:"
msgstr "Thema Pad:"
-#: gui/options.cpp:1509
+#: gui/options.cpp:1505
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Thema Pad:"
-#: gui/options.cpp:1515 gui/options.cpp:1517 gui/options.cpp:1518
+#: gui/options.cpp:1511 gui/options.cpp:1513 gui/options.cpp:1514
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr ""
"Specificeert het pad for aanvullende data voor ScummVM zelf of de spellen"
-#: gui/options.cpp:1524
+#: gui/options.cpp:1520
msgid "Plugins Path:"
msgstr "Plugins Pad:"
-#: gui/options.cpp:1526
+#: gui/options.cpp:1522
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Plugins Pad:"
-#: gui/options.cpp:1537
+#: gui/options.cpp:1533
msgctxt "lowres"
msgid "Misc"
msgstr "Overig"
-#: gui/options.cpp:1539
+#: gui/options.cpp:1535
msgid "Theme:"
msgstr "Thema:"
-#: gui/options.cpp:1543
+#: gui/options.cpp:1539
msgid "GUI Renderer:"
msgstr "GUI Renderer:"
-#: gui/options.cpp:1555
+#: gui/options.cpp:1551
msgid "Autosave:"
msgstr "Auto opslaan:"
-#: gui/options.cpp:1557
+#: gui/options.cpp:1553
msgctxt "lowres"
msgid "Autosave:"
msgstr "Auto opslaan:"
-#: gui/options.cpp:1565
+#: gui/options.cpp:1561
msgid "Keys"
msgstr "Toetsen"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "GUI Language:"
msgstr "GUI Taal:"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "Language of ScummVM GUI"
msgstr "Taal van de ScummVM GUI"
-#: gui/options.cpp:1600 gui/updates-dialog.cpp:86
+#: gui/options.cpp:1596 gui/updates-dialog.cpp:86
msgid "Update check:"
msgstr "Update controle:"
-#: gui/options.cpp:1600
+#: gui/options.cpp:1596
msgid "How often to check ScummVM updates"
msgstr "Hoe vaak checken op ScummVM updates"
-#: gui/options.cpp:1612
+#: gui/options.cpp:1608
msgid "Check now"
msgstr "Controleer nu"
-#: gui/options.cpp:1620
+#: gui/options.cpp:1616
msgid "Cloud"
msgstr "Cloud"
-#: gui/options.cpp:1622
+#: gui/options.cpp:1618
msgctxt "lowres"
msgid "Cloud"
msgstr "Cloud"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Storage:"
msgstr "Opslag:"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Active cloud storage"
msgstr "Actieve cloud opslag"
-#: gui/options.cpp:1634 gui/options.cpp:2210
+#: gui/options.cpp:1630 gui/options.cpp:2206
msgid "<none>"
msgstr "<geen>"
-#: gui/options.cpp:1638 backends/platform/wii/options.cpp:114
+#: gui/options.cpp:1634 backends/platform/wii/options.cpp:114
msgid "Username:"
msgstr "Gebruikersnaam:"
-#: gui/options.cpp:1638
+#: gui/options.cpp:1634
msgid "Username used by this storage"
msgstr "Gebruikersnaam gebruikt voor deze opslag"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Used space:"
msgstr "Gebruikte ruimte:"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Space used by ScummVM's saved games on this storage"
msgstr "Ruimte in gebruik door ScummVM's opgeslagen spellen op deze opslag"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "Last sync time:"
msgstr "Laatste synchronisatie:"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "When the last saved games sync for this storage occured"
msgstr "Wanneer de laatste synchronisatie voor deze opslag is geweest"
-#: gui/options.cpp:1647 gui/storagewizarddialog.cpp:71
+#: gui/options.cpp:1643 gui/storagewizarddialog.cpp:71
msgid "Connect"
msgstr "Verbinden"
-#: gui/options.cpp:1647
+#: gui/options.cpp:1643
msgid "Open wizard dialog to connect your cloud storage account"
msgstr ""
"Open de Wizard dialoogvenster voor verbinden met uw cloud opslag account"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh"
msgstr "Ververs"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh current cloud storage information (username and usage)"
msgstr "Ververs de huidige opslag informatie (gebruikersnaam en gebruik)"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Download"
msgstr "Download"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Open downloads manager dialog"
msgstr "Open downloads manager dialoogvenster"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run server"
msgstr "Start server"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run local webserver"
msgstr "Draai lokale webserver"
-#: gui/options.cpp:1652 gui/options.cpp:2320
+#: gui/options.cpp:1648 gui/options.cpp:2316
msgid "Not running"
msgstr "Draait niet"
-#: gui/options.cpp:1656
+#: gui/options.cpp:1652
msgid "/root/ Path:"
msgstr "/root/ Pad:"
-#: gui/options.cpp:1656 gui/options.cpp:1658 gui/options.cpp:1659
+#: gui/options.cpp:1652 gui/options.cpp:1654 gui/options.cpp:1655
msgid "Specifies which directory the Files Manager can access"
msgstr "Bepaalt welke map de Bestanden Manager gebruiken mag"
-#: gui/options.cpp:1658
+#: gui/options.cpp:1654
msgctxt "lowres"
msgid "/root/ Path:"
msgstr "/root/ Pad:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid "Server's port:"
msgstr "Serverport:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid ""
"Which port is used by the server\n"
"Auth with server is not available with non-default port"
@@ -1307,27 +1307,27 @@ msgstr ""
"Welke port is gebruikt voor de server\n"
"Auth met server is niet beschikbaar met een niet standaard port"
-#: gui/options.cpp:1681
+#: gui/options.cpp:1677
msgid "Apply"
msgstr "Toepassen"
-#: gui/options.cpp:1824
+#: gui/options.cpp:1820
msgid "Failed to change cloud storage!"
msgstr "Veranderen van cloud opslag mislukt!"
-#: gui/options.cpp:1827
+#: gui/options.cpp:1823
msgid "Another cloud storage is already active."
msgstr "Er is al een andere cloud opslag actief."
-#: gui/options.cpp:1895
+#: gui/options.cpp:1891
msgid "Theme does not support selected language!"
msgstr "Thema biedt geen ondersteuning voor geselecteerde taal!"
-#: gui/options.cpp:1898
+#: gui/options.cpp:1894
msgid "Theme cannot be loaded!"
msgstr "Thema kan niet worden geladen!"
-#: gui/options.cpp:1901
+#: gui/options.cpp:1897
msgid ""
"\n"
"Misc settings will be restored."
@@ -1335,49 +1335,49 @@ msgstr ""
"\n"
"Misc instellingen worden teruggezet."
-#: gui/options.cpp:1937
+#: gui/options.cpp:1933
msgid "The chosen directory cannot be written to. Please select another one."
msgstr ""
"Er kan niet worden geschreven in de gekozen map. Selecteer a.u.b. een andere."
-#: gui/options.cpp:1946
+#: gui/options.cpp:1942
msgid "Select directory for GUI themes"
msgstr "Selecteer map voor GUI themas"
-#: gui/options.cpp:1956
+#: gui/options.cpp:1952
msgid "Select directory for extra files"
msgstr "Selecteer map voor extra bestanden"
-#: gui/options.cpp:1967
+#: gui/options.cpp:1963
msgid "Select directory for plugins"
msgstr "Selecteer map voor plugins"
-#: gui/options.cpp:1979
+#: gui/options.cpp:1975
msgid "Select directory for Files Manager /root/"
msgstr "Selecteer map voor Bestanden Manager /root/"
-#: gui/options.cpp:2217
+#: gui/options.cpp:2213
#, c-format
msgid "%llu bytes"
msgstr "%llu bytes"
-#: gui/options.cpp:2225
+#: gui/options.cpp:2221
msgid "<right now>"
msgstr "<nu>"
-#: gui/options.cpp:2227
+#: gui/options.cpp:2223
msgid "<never>"
msgstr "<nooit>"
-#: gui/options.cpp:2311
+#: gui/options.cpp:2307
msgid "Stop server"
msgstr "Stop server"
-#: gui/options.cpp:2312
+#: gui/options.cpp:2308
msgid "Stop local webserver"
msgstr "Stop lokale webserver"
-#: gui/options.cpp:2403
+#: gui/options.cpp:2399
msgid ""
"Request failed.\n"
"Check your Internet connection."
@@ -1845,8 +1845,8 @@ msgstr "S~t~artmenu"
#: 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:106
-#: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:658
+#: engines/mohawk/riven.cpp:545 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
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
#: engines/toon/toon.cpp:3340 engines/tsage/scenes.cpp:599
@@ -1865,9 +1865,9 @@ msgstr "Spel opslaan:"
#: engines/dm/loadsave.cpp:196 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:106 engines/neverhood/menumodule.cpp:880
-#: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:659
+#: engines/mohawk/dialogs.cpp:106 engines/mohawk/riven.cpp:545
+#: 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
#: engines/sherlock/scalpel/scalpel.cpp:1250
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
@@ -2184,7 +2184,7 @@ msgstr "Klikken Uitgeschakeld"
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Touchscreen 'Tap Modus' - Zweven (DPad Klik)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
msgid "Do you want to quit ?"
msgstr "Wilt u stoppen?"
@@ -3343,7 +3343,7 @@ msgstr ""
"Het bestand 'extras.mhk' ontbreekt. Het installatiebestand 'arcriven.z' kan "
"ook gebruikt worden."
-#: engines/mohawk/riven.cpp:416
+#: engines/mohawk/riven.cpp:432
msgid "You are missing the following required Riven data files:\n"
msgstr "U mist de volgende vereiste Riven gegevensbestanden:\n"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index aefb6beb5b..78491af57e 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: 2017-12-10 15:25+0100\n"
+"POT-Creation-Date: 2017-12-26 21:11+0100\n"
"PO-Revision-Date: 2016-12-18 18:23+0000\n"
"Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n"
"Language-Team: Norwegian Nynorsk <https://translations.scummvm.org/projects/"
@@ -59,7 +59,7 @@ msgstr "Oppover"
#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editgamedialog.cpp:292
#: gui/editrecorddialog.cpp:67 gui/filebrowser-dialog.cpp:64
#: gui/fluidsynth-dialog.cpp:152 gui/KeysDialog.cpp:43 gui/massadd.cpp:95
-#: gui/options.cpp:1680 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
+#: gui/options.cpp:1676 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
#: gui/recorderdialog.cpp:155 gui/remotebrowser.cpp:59
#: gui/saveload-dialog.cpp:383 gui/saveload-dialog.cpp:445
#: gui/saveload-dialog.cpp:727 gui/saveload-dialog.cpp:1121
@@ -118,7 +118,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -131,7 +131,7 @@ msgstr "Ja"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -152,7 +152,7 @@ msgstr ""
#: gui/downloaddialog.cpp:146 gui/editgamedialog.cpp:293
#: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:526
-#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1682
+#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1678
#: gui/saveload-dialog.cpp:1122 engines/engine.cpp:443 engines/engine.cpp:454
#: backends/platform/wii/options.cpp:47
#: backends/platform/wince/CELauncherDialog.cpp:54
@@ -236,8 +236,8 @@ msgstr ""
"Spelets sprхk. Dette vil ikkje gjere den spanske versjonen av spelet til ein "
"engelsk versjon"
-#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:997
-#: gui/options.cpp:1010 gui/options.cpp:1575 audio/null.cpp:41
+#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:993
+#: gui/options.cpp:1006 gui/options.cpp:1571 audio/null.cpp:41
msgid "<default>"
msgstr "<standard>"
@@ -259,11 +259,11 @@ msgstr "Plattform:"
msgid "Engine"
msgstr "Motor"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "Graphics"
msgstr "Grafikk"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "GFX"
msgstr "GFX"
@@ -276,7 +276,7 @@ msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Overstyr globale grafikkinstillingar"
-#: gui/editgamedialog.cpp:196 gui/options.cpp:1457
+#: gui/editgamedialog.cpp:196 gui/options.cpp:1453
msgid "Audio"
msgstr "Lyd"
@@ -289,11 +289,11 @@ msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Overstyr globale lydinstillingar"
-#: gui/editgamedialog.cpp:210 gui/options.cpp:1462
+#: gui/editgamedialog.cpp:210 gui/options.cpp:1458
msgid "Volume"
msgstr "Volum"
-#: gui/editgamedialog.cpp:212 gui/options.cpp:1464
+#: gui/editgamedialog.cpp:212 gui/options.cpp:1460
msgctxt "lowres"
msgid "Volume"
msgstr "Volum"
@@ -307,7 +307,7 @@ msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Overstyr globale voluminstillingar"
-#: gui/editgamedialog.cpp:226 gui/options.cpp:1472
+#: gui/editgamedialog.cpp:226 gui/options.cpp:1468
msgid "MIDI"
msgstr "MIDI"
@@ -320,7 +320,7 @@ msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Overstyr globale MIDI-instillingar"
-#: gui/editgamedialog.cpp:241 gui/options.cpp:1482
+#: gui/editgamedialog.cpp:241 gui/options.cpp:1478
msgid "MT-32"
msgstr "MT-32"
@@ -333,11 +333,11 @@ msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Overstyr globale MT-32-instillingar"
-#: gui/editgamedialog.cpp:255 gui/options.cpp:1489
+#: gui/editgamedialog.cpp:255 gui/options.cpp:1485
msgid "Paths"
msgstr "Stiar"
-#: gui/editgamedialog.cpp:257 gui/options.cpp:1491
+#: gui/editgamedialog.cpp:257 gui/options.cpp:1487
msgctxt "lowres"
msgid "Paths"
msgstr "Stiar"
@@ -351,7 +351,7 @@ msgctxt "lowres"
msgid "Game Path:"
msgstr "Spelsti:"
-#: gui/editgamedialog.cpp:271 gui/options.cpp:1515
+#: gui/editgamedialog.cpp:271 gui/options.cpp:1511
msgid "Extra Path:"
msgstr "Ekstrasti:"
@@ -360,44 +360,44 @@ msgstr "Ekstrasti:"
msgid "Specifies path to additional data used by the game"
msgstr "Veljer sti til tilleggsdata nytta av spelet"
-#: gui/editgamedialog.cpp:273 gui/options.cpp:1517
+#: gui/editgamedialog.cpp:273 gui/options.cpp:1513
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Ekstrasti:"
-#: gui/editgamedialog.cpp:280 gui/options.cpp:1499
+#: gui/editgamedialog.cpp:280 gui/options.cpp:1495
msgid "Save Path:"
msgstr "Lagringssti:"
#: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282
-#: gui/editgamedialog.cpp:283 gui/options.cpp:1499 gui/options.cpp:1501
-#: gui/options.cpp:1502
+#: gui/editgamedialog.cpp:283 gui/options.cpp:1495 gui/options.cpp:1497
+#: gui/options.cpp:1498
msgid "Specifies where your saved games are put"
msgstr "Veljer kor lagra spel vert lagra"
-#: gui/editgamedialog.cpp:282 gui/options.cpp:1501
+#: gui/editgamedialog.cpp:282 gui/options.cpp:1497
msgctxt "lowres"
msgid "Save Path:"
msgstr "Lagringssti:"
#: gui/editgamedialog.cpp:301 gui/editgamedialog.cpp:398
-#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1510
-#: gui/options.cpp:1518 gui/options.cpp:1527 gui/options.cpp:1707
-#: gui/options.cpp:1713 gui/options.cpp:1721 gui/options.cpp:1744
-#: gui/options.cpp:1777 gui/options.cpp:1783 gui/options.cpp:1790
-#: gui/options.cpp:1798 gui/options.cpp:1993 gui/options.cpp:1996
-#: gui/options.cpp:2003 gui/options.cpp:2013
+#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1506
+#: gui/options.cpp:1514 gui/options.cpp:1523 gui/options.cpp:1703
+#: gui/options.cpp:1709 gui/options.cpp:1717 gui/options.cpp:1740
+#: gui/options.cpp:1773 gui/options.cpp:1779 gui/options.cpp:1786
+#: gui/options.cpp:1794 gui/options.cpp:1989 gui/options.cpp:1992
+#: gui/options.cpp:1999 gui/options.cpp:2009
msgctxt "path"
msgid "None"
msgstr "Ingen"
#: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404
-#: gui/editgamedialog.cpp:522 gui/options.cpp:1701 gui/options.cpp:1771
-#: gui/options.cpp:1999 backends/platform/wii/options.cpp:56
+#: gui/editgamedialog.cpp:522 gui/options.cpp:1697 gui/options.cpp:1767
+#: gui/options.cpp:1995 backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Standard"
-#: gui/editgamedialog.cpp:450 gui/options.cpp:2007
+#: gui/editgamedialog.cpp:450 gui/options.cpp:2003
msgid "Select SoundFont"
msgstr "Vel SoundFont"
@@ -405,7 +405,7 @@ msgstr "Vel SoundFont"
msgid "Select additional game directory"
msgstr "Vel mappe med tileggsdata for spelet"
-#: gui/editgamedialog.cpp:502 gui/options.cpp:1930
+#: gui/editgamedialog.cpp:502 gui/options.cpp:1926
msgid "Select directory for saved games"
msgstr "Vel mappe for lagra spel"
@@ -495,7 +495,7 @@ msgstr "Sinus"
msgid "Triangle"
msgstr "Triangel"
-#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1535
+#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1531
msgid "Misc"
msgstr "Diverse"
@@ -673,7 +673,7 @@ msgid "Search:"
msgstr "Sјk:"
#: gui/launcher.cpp:200 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:517
+#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:533
#: engines/pegasus/pegasus.cpp:355 engines/tsage/scenes.cpp:601
#: engines/wage/saveload.cpp:748
msgid "Load game:"
@@ -683,7 +683,7 @@ msgstr "Хpne spel:"
#: backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:105
-#: engines/mohawk/riven.cpp:517 engines/parallaction/saveload.cpp:194
+#: engines/mohawk/riven.cpp:533 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
msgid "Load"
@@ -793,213 +793,213 @@ msgstr "kvart 15. min"
msgid "every 30 mins"
msgstr "kvart 30. min"
-#: gui/options.cpp:343 gui/options.cpp:640 gui/options.cpp:778
-#: gui/options.cpp:853 gui/options.cpp:1114
+#: gui/options.cpp:339 gui/options.cpp:636 gui/options.cpp:774
+#: gui/options.cpp:849 gui/options.cpp:1110
msgctxt "soundfont"
msgid "None"
msgstr "Ingen"
-#: gui/options.cpp:514
+#: gui/options.cpp:510
msgid "Failed to apply some of the graphic options changes:"
msgstr "Klarte ikkje х aktivere nokre av grafikkvalendringane:"
-#: gui/options.cpp:526
+#: gui/options.cpp:522
msgid "the video mode could not be changed."
msgstr "Kunne ikkje endre videomodus."
-#: gui/options.cpp:532
+#: gui/options.cpp:528
msgid "the aspect ratio setting could not be changed"
msgstr "aspektrate-innstillinga kunne ikkje endrast"
-#: gui/options.cpp:538
+#: gui/options.cpp:534
msgid "the fullscreen setting could not be changed"
msgstr "Fullskjerminstillinga kunne ikkje endrast"
-#: gui/options.cpp:544
+#: gui/options.cpp:540
#, fuzzy
msgid "the filtering setting could not be changed"
msgstr "Fullskjerminstillinga kunne ikkje endrast"
-#: gui/options.cpp:932
+#: gui/options.cpp:928
msgid "Show On-screen control"
msgstr ""
-#: gui/options.cpp:936
+#: gui/options.cpp:932
#, fuzzy
msgid "Touchpad mouse mode"
msgstr "Touchpadmodus avslхtt."
-#: gui/options.cpp:940
+#: gui/options.cpp:936
msgid "Swap Menu and Back buttons"
msgstr ""
-#: gui/options.cpp:945
+#: gui/options.cpp:941
#, fuzzy
msgid "Pointer Speed:"
msgstr "Hastighet:"
-#: gui/options.cpp:945 gui/options.cpp:947 gui/options.cpp:948
+#: gui/options.cpp:941 gui/options.cpp:943 gui/options.cpp:944
msgid "Speed for keyboard/joystick mouse pointer control"
msgstr ""
-#: gui/options.cpp:947
+#: gui/options.cpp:943
#, fuzzy
msgctxt "lowres"
msgid "Pointer Speed:"
msgstr "Hastighet:"
-#: gui/options.cpp:958
+#: gui/options.cpp:954
msgid "Joy Deadzone:"
msgstr ""
-#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
+#: gui/options.cpp:954 gui/options.cpp:956 gui/options.cpp:957
msgid "Analog joystick Deadzone"
msgstr ""
-#: gui/options.cpp:960
+#: gui/options.cpp:956
msgctxt "lowres"
msgid "Joy Deadzone:"
msgstr ""
-#: gui/options.cpp:974
+#: gui/options.cpp:970
msgid "HW Shader:"
msgstr ""
-#: gui/options.cpp:974 gui/options.cpp:976
+#: gui/options.cpp:970 gui/options.cpp:972
msgid "Different hardware shaders give different visual effects"
msgstr ""
-#: gui/options.cpp:976
+#: gui/options.cpp:972
msgctxt "lowres"
msgid "HW Shader:"
msgstr ""
-#: gui/options.cpp:977
+#: gui/options.cpp:973
msgid "Different shaders give different visual effects"
msgstr ""
-#: gui/options.cpp:994
+#: gui/options.cpp:990
msgid "Graphics mode:"
msgstr "Grafikkmodus:"
-#: gui/options.cpp:1008
+#: gui/options.cpp:1004
msgid "Render mode:"
msgstr "Teiknemodus:"
-#: gui/options.cpp:1008 gui/options.cpp:1009
+#: gui/options.cpp:1004 gui/options.cpp:1005
msgid "Special dithering modes supported by some games"
msgstr "Spesielle dithering-modus som stјttast av nokre spel"
-#: gui/options.cpp:1020 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
+#: gui/options.cpp:1016 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2590
msgid "Fullscreen mode"
msgstr "Fullskjermsmodus"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
#, fuzzy
msgid "Filter graphics"
msgstr "Grafikk"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Use linear filtering when scaling graphics"
msgstr ""
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Aspect ratio correction"
msgstr "Aspekt-korrigering"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Correct aspect ratio for 320x200 games"
msgstr "Rett opp aspekt for 320x200 spel"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Preferred Device:"
msgstr "Fјretrukken eining:"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Music Device:"
msgstr "Musikkeining:"
-#: gui/options.cpp:1034 gui/options.cpp:1036
+#: gui/options.cpp:1030 gui/options.cpp:1032
msgid "Specifies preferred sound device or sound card emulator"
msgstr ""
-#: gui/options.cpp:1034 gui/options.cpp:1036 gui/options.cpp:1037
+#: gui/options.cpp:1030 gui/options.cpp:1032 gui/options.cpp:1033
msgid "Specifies output sound device or sound card emulator"
msgstr ""
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr ""
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Music Device:"
msgstr "Musikkeining:"
-#: gui/options.cpp:1063
+#: gui/options.cpp:1059
msgid "AdLib emulator:"
msgstr "AdLib emulator:"
-#: gui/options.cpp:1063 gui/options.cpp:1064
+#: gui/options.cpp:1059 gui/options.cpp:1060
msgid "AdLib is used for music in many games"
msgstr "AdLib nyttast til musikk i mange spel"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "GM Device:"
msgstr "GM Eining:"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "Specifies default sound device for General MIDI output"
msgstr "Veljer standard lydeining for General MIDI avspeling"
-#: gui/options.cpp:1088
+#: gui/options.cpp:1084
msgid "Don't use General MIDI music"
msgstr "Ikkje nytt General MIDI musikk"
-#: gui/options.cpp:1099 gui/options.cpp:1161
+#: gui/options.cpp:1095 gui/options.cpp:1157
msgid "Use first available device"
msgstr "Nytt fјrste tilgjengelege eining"
-#: gui/options.cpp:1111
+#: gui/options.cpp:1107
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1111 gui/options.cpp:1113 gui/options.cpp:1114
+#: gui/options.cpp:1107 gui/options.cpp:1109 gui/options.cpp:1110
msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity"
msgstr "SoundFont stјttast av enkelte lydkort, FluidSynth og Timidity"
-#: gui/options.cpp:1113
+#: gui/options.cpp:1109
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Mixed AdLib/MIDI mode"
msgstr "Blanda AdLib/MIDI-modus"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Use both MIDI and AdLib sound generation"
msgstr "Nytt bхe MIDI og AdLib lydskaping"
-#: gui/options.cpp:1122
+#: gui/options.cpp:1118
msgid "MIDI gain:"
msgstr "MIDI gain:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "MT-32 Device:"
msgstr "MT-32 Eining:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr "Veljer standard lydeining for Roland MT-32/LAPC1/CM32l/CM64 avspeling"
-#: gui/options.cpp:1137
+#: gui/options.cpp:1133
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Ekte Roland MT-32 (deaktiver GM-emulering)"
-#: gui/options.cpp:1137 gui/options.cpp:1139
+#: gui/options.cpp:1133 gui/options.cpp:1135
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -1007,371 +1007,371 @@ msgstr ""
"Vel om du vil nytte din Roland-kompatible lydeining som du har tilkopla "
"datamaskina di"
-#: gui/options.cpp:1139
+#: gui/options.cpp:1135
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Ekte Roland MT-32 (ingen GS-emulering)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid "Roland GS Device (enable MT-32 mappings)"
msgstr ""
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid ""
"Check if you want to enable patch mappings to emulate an MT-32 on a Roland "
"GS device"
msgstr ""
-#: gui/options.cpp:1151
+#: gui/options.cpp:1147
msgid "Don't use Roland MT-32 music"
msgstr "Ikkje nytt Roland MT-32 musikk"
-#: gui/options.cpp:1178
+#: gui/options.cpp:1174
msgid "Text and Speech:"
msgstr "Tekst og Tale:"
-#: gui/options.cpp:1182 gui/options.cpp:1192
+#: gui/options.cpp:1178 gui/options.cpp:1188
msgid "Speech"
msgstr "Tale"
-#: gui/options.cpp:1183 gui/options.cpp:1193
+#: gui/options.cpp:1179 gui/options.cpp:1189
msgid "Subtitles"
msgstr "Teksting"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1180
msgid "Both"
msgstr "Begge"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1182
msgid "Subtitle speed:"
msgstr "Undertekstfart:"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1184
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Tekst og Tale:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1188
msgid "Spch"
msgstr "Tale"
-#: gui/options.cpp:1193
+#: gui/options.cpp:1189
msgid "Subs"
msgstr "Tekst"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgctxt "lowres"
msgid "Both"
msgstr "Bхe"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgid "Show subtitles and play speech"
msgstr "Vis teksting og spel av tale"
-#: gui/options.cpp:1196
+#: gui/options.cpp:1192
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Undertekstfart:"
-#: gui/options.cpp:1212
+#: gui/options.cpp:1208
msgid "Music volume:"
msgstr "Musikkvolum:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1210
msgctxt "lowres"
msgid "Music volume:"
msgstr "Musikkvolum:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1217
msgid "Mute All"
msgstr "Demp alle"
-#: gui/options.cpp:1224
+#: gui/options.cpp:1220
msgid "SFX volume:"
msgstr "Lydeffektvolum:"
-#: gui/options.cpp:1224 gui/options.cpp:1226 gui/options.cpp:1227
+#: gui/options.cpp:1220 gui/options.cpp:1222 gui/options.cpp:1223
msgid "Special sound effects volume"
msgstr "Spesiallydeffekt volum"
-#: gui/options.cpp:1226
+#: gui/options.cpp:1222
msgctxt "lowres"
msgid "SFX volume:"
msgstr "Lydeffektvolum:"
-#: gui/options.cpp:1234
+#: gui/options.cpp:1230
msgid "Speech volume:"
msgstr "Talevolum:"
-#: gui/options.cpp:1236
+#: gui/options.cpp:1232
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Talevolum:"
-#: gui/options.cpp:1438
+#: gui/options.cpp:1434
msgid "Shader"
msgstr ""
-#: gui/options.cpp:1450
+#: gui/options.cpp:1446
msgid "Control"
msgstr ""
-#: gui/options.cpp:1476
+#: gui/options.cpp:1472
msgid "FluidSynth Settings"
msgstr "FluidSynth instillingar"
-#: gui/options.cpp:1507
+#: gui/options.cpp:1503
msgid "Theme Path:"
msgstr "Temasti:"
-#: gui/options.cpp:1509
+#: gui/options.cpp:1505
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Temasti:"
-#: gui/options.cpp:1515 gui/options.cpp:1517 gui/options.cpp:1518
+#: gui/options.cpp:1511 gui/options.cpp:1513 gui/options.cpp:1514
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr ""
-#: gui/options.cpp:1524
+#: gui/options.cpp:1520
msgid "Plugins Path:"
msgstr "Pluginsti:"
-#: gui/options.cpp:1526
+#: gui/options.cpp:1522
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Pluginsti:"
-#: gui/options.cpp:1537
+#: gui/options.cpp:1533
msgctxt "lowres"
msgid "Misc"
msgstr "Div"
-#: gui/options.cpp:1539
+#: gui/options.cpp:1535
msgid "Theme:"
msgstr "Tema:"
-#: gui/options.cpp:1543
+#: gui/options.cpp:1539
msgid "GUI Renderer:"
msgstr "GUI-teiknar:"
-#: gui/options.cpp:1555
+#: gui/options.cpp:1551
msgid "Autosave:"
msgstr "Autolagre:"
-#: gui/options.cpp:1557
+#: gui/options.cpp:1553
msgctxt "lowres"
msgid "Autosave:"
msgstr "Autolagre:"
-#: gui/options.cpp:1565
+#: gui/options.cpp:1561
msgid "Keys"
msgstr "Tastar"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "GUI Language:"
msgstr "GUI-sprхk:"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "Language of ScummVM GUI"
msgstr "Sprхk i ScummVM-GUIet"
-#: gui/options.cpp:1600 gui/updates-dialog.cpp:86
+#: gui/options.cpp:1596 gui/updates-dialog.cpp:86
msgid "Update check:"
msgstr ""
-#: gui/options.cpp:1600
+#: gui/options.cpp:1596
msgid "How often to check ScummVM updates"
msgstr ""
-#: gui/options.cpp:1612
+#: gui/options.cpp:1608
msgid "Check now"
msgstr ""
-#: gui/options.cpp:1620
+#: gui/options.cpp:1616
msgid "Cloud"
msgstr ""
-#: gui/options.cpp:1622
+#: gui/options.cpp:1618
msgctxt "lowres"
msgid "Cloud"
msgstr ""
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Storage:"
msgstr ""
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Active cloud storage"
msgstr ""
-#: gui/options.cpp:1634 gui/options.cpp:2210
+#: gui/options.cpp:1630 gui/options.cpp:2206
msgid "<none>"
msgstr ""
-#: gui/options.cpp:1638 backends/platform/wii/options.cpp:114
+#: gui/options.cpp:1634 backends/platform/wii/options.cpp:114
msgid "Username:"
msgstr "Brukarnamn:"
-#: gui/options.cpp:1638
+#: gui/options.cpp:1634
msgid "Username used by this storage"
msgstr ""
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Used space:"
msgstr ""
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Space used by ScummVM's saved games on this storage"
msgstr ""
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "Last sync time:"
msgstr ""
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "When the last saved games sync for this storage occured"
msgstr ""
-#: gui/options.cpp:1647 gui/storagewizarddialog.cpp:71
+#: gui/options.cpp:1643 gui/storagewizarddialog.cpp:71
msgid "Connect"
msgstr ""
-#: gui/options.cpp:1647
+#: gui/options.cpp:1643
msgid "Open wizard dialog to connect your cloud storage account"
msgstr ""
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh"
msgstr ""
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh current cloud storage information (username and usage)"
msgstr ""
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
#, fuzzy
msgid "Download"
msgstr "Ned"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Open downloads manager dialog"
msgstr ""
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run server"
msgstr ""
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run local webserver"
msgstr ""
-#: gui/options.cpp:1652 gui/options.cpp:2320
+#: gui/options.cpp:1648 gui/options.cpp:2316
#, fuzzy
msgid "Not running"
msgstr "Feil under kјyring av spel:"
-#: gui/options.cpp:1656
+#: gui/options.cpp:1652
#, fuzzy
msgid "/root/ Path:"
msgstr "Ekstrasti:"
-#: gui/options.cpp:1656 gui/options.cpp:1658 gui/options.cpp:1659
+#: gui/options.cpp:1652 gui/options.cpp:1654 gui/options.cpp:1655
#, fuzzy
msgid "Specifies which directory the Files Manager can access"
msgstr "Veljer kor lagra spel vert lagra"
-#: gui/options.cpp:1658
+#: gui/options.cpp:1654
#, fuzzy
msgctxt "lowres"
msgid "/root/ Path:"
msgstr "Ekstrasti:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
#, fuzzy
msgid "Server's port:"
msgstr "Teinar:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid ""
"Which port is used by the server\n"
"Auth with server is not available with non-default port"
msgstr ""
-#: gui/options.cpp:1681
+#: gui/options.cpp:1677
msgid "Apply"
msgstr ""
-#: gui/options.cpp:1824
+#: gui/options.cpp:1820
#, fuzzy
msgid "Failed to change cloud storage!"
msgstr "Klarte ikkje lagre spel"
-#: gui/options.cpp:1827
+#: gui/options.cpp:1823
msgid "Another cloud storage is already active."
msgstr ""
-#: gui/options.cpp:1895
+#: gui/options.cpp:1891
#, fuzzy
msgid "Theme does not support selected language!"
msgstr "Spelmotor-plugin stјttar ikkje lagra tilstandar."
-#: gui/options.cpp:1898
+#: gui/options.cpp:1894
#, fuzzy
msgid "Theme cannot be loaded!"
msgstr "Spelet vart IKKJE lasta"
-#: gui/options.cpp:1901
+#: gui/options.cpp:1897
msgid ""
"\n"
"Misc settings will be restored."
msgstr ""
-#: gui/options.cpp:1937
+#: gui/options.cpp:1933
msgid "The chosen directory cannot be written to. Please select another one."
msgstr "Den velde mappa kan ikkje skrivast til. Vennlegst vel ein annan."
-#: gui/options.cpp:1946
+#: gui/options.cpp:1942
msgid "Select directory for GUI themes"
msgstr "Vel ei mappe for GUI-tema"
-#: gui/options.cpp:1956
+#: gui/options.cpp:1952
msgid "Select directory for extra files"
msgstr "Vel ei mappe for ekstra filer"
-#: gui/options.cpp:1967
+#: gui/options.cpp:1963
msgid "Select directory for plugins"
msgstr "Vel ei mappe for plugins"
-#: gui/options.cpp:1979
+#: gui/options.cpp:1975
#, fuzzy
msgid "Select directory for Files Manager /root/"
msgstr "Vel ei mappe for ekstra filer"
-#: gui/options.cpp:2217
+#: gui/options.cpp:2213
#, c-format
msgid "%llu bytes"
msgstr ""
-#: gui/options.cpp:2225
+#: gui/options.cpp:2221
msgid "<right now>"
msgstr ""
-#: gui/options.cpp:2227
+#: gui/options.cpp:2223
#, fuzzy
msgid "<never>"
msgstr "Aldri"
-#: gui/options.cpp:2311
+#: gui/options.cpp:2307
#, fuzzy
msgid "Stop server"
msgstr "Teinar:"
-#: gui/options.cpp:2312
+#: gui/options.cpp:2308
msgid "Stop local webserver"
msgstr ""
-#: gui/options.cpp:2403
+#: gui/options.cpp:2399
msgid ""
"Request failed.\n"
"Check your Internet connection."
@@ -1834,8 +1834,8 @@ msgstr "Tilbake til Oppsta~r~tar"
#: 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:106
-#: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:658
+#: engines/mohawk/riven.cpp:545 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
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
#: engines/toon/toon.cpp:3340 engines/tsage/scenes.cpp:599
@@ -1854,9 +1854,9 @@ msgstr "Lagra spel:"
#: engines/dm/loadsave.cpp:196 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:106 engines/neverhood/menumodule.cpp:880
-#: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:659
+#: engines/mohawk/dialogs.cpp:106 engines/mohawk/riven.cpp:545
+#: 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
#: engines/sherlock/scalpel/scalpel.cpp:1250
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
@@ -2167,7 +2167,7 @@ msgstr "Klikking Deaktivert"
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr ""
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
msgid "Do you want to quit ?"
msgstr "Vil du avslutte?"
@@ -3301,7 +3301,7 @@ msgid ""
"works."
msgstr ""
-#: engines/mohawk/riven.cpp:416
+#: engines/mohawk/riven.cpp:432
msgid "You are missing the following required Riven data files:\n"
msgstr ""
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 0c503b1cf2..29ab3730b0 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: 2017-12-10 15:25+0100\n"
+"POT-Creation-Date: 2017-12-26 21:11+0100\n"
"PO-Revision-Date: 2017-01-25 12:49+0000\n"
"Last-Translator: RafaГ Rzepecki <divided.mind@gmail.com>\n"
"Language-Team: Polish <https://translations.scummvm.org/projects/scummvm/"
@@ -63,7 +63,7 @@ msgstr "W gѓrъ"
#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editgamedialog.cpp:292
#: gui/editrecorddialog.cpp:67 gui/filebrowser-dialog.cpp:64
#: gui/fluidsynth-dialog.cpp:152 gui/KeysDialog.cpp:43 gui/massadd.cpp:95
-#: gui/options.cpp:1680 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
+#: gui/options.cpp:1676 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
#: gui/recorderdialog.cpp:155 gui/remotebrowser.cpp:59
#: gui/saveload-dialog.cpp:383 gui/saveload-dialog.cpp:445
#: gui/saveload-dialog.cpp:727 gui/saveload-dialog.cpp:1121
@@ -123,7 +123,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -136,7 +136,7 @@ msgstr "Tak"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -159,7 +159,7 @@ msgstr ""
#: gui/downloaddialog.cpp:146 gui/editgamedialog.cpp:293
#: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:526
-#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1682
+#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1678
#: gui/saveload-dialog.cpp:1122 engines/engine.cpp:443 engines/engine.cpp:454
#: backends/platform/wii/options.cpp:47
#: backends/platform/wince/CELauncherDialog.cpp:54
@@ -243,8 +243,8 @@ msgid ""
"English"
msgstr "Jъzyk gry. Nie zmieni to hiszpaёskiej wersji gry w angielskБ"
-#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:997
-#: gui/options.cpp:1010 gui/options.cpp:1575 audio/null.cpp:41
+#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:993
+#: gui/options.cpp:1006 gui/options.cpp:1571 audio/null.cpp:41
msgid "<default>"
msgstr "<domyЖlne>"
@@ -266,11 +266,11 @@ msgstr "Platforma:"
msgid "Engine"
msgstr "Silnik"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "Graphics"
msgstr "Grafika"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "GFX"
msgstr "Grafika"
@@ -283,7 +283,7 @@ msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "UПyj wГasnych ustawieё grafiki"
-#: gui/editgamedialog.cpp:196 gui/options.cpp:1457
+#: gui/editgamedialog.cpp:196 gui/options.cpp:1453
msgid "Audio"
msgstr "DМwiъk"
@@ -296,11 +296,11 @@ msgctxt "lowres"
msgid "Override global audio settings"
msgstr "UПyj wГasnych ustawieё dМwiъku"
-#: gui/editgamedialog.cpp:210 gui/options.cpp:1462
+#: gui/editgamedialog.cpp:210 gui/options.cpp:1458
msgid "Volume"
msgstr "GГoЖnoЖц"
-#: gui/editgamedialog.cpp:212 gui/options.cpp:1464
+#: gui/editgamedialog.cpp:212 gui/options.cpp:1460
msgctxt "lowres"
msgid "Volume"
msgstr "GГoЖnoЖц"
@@ -314,7 +314,7 @@ msgctxt "lowres"
msgid "Override global volume settings"
msgstr "UПyj wГasnych ustawieё gГoЖnoЖci"
-#: gui/editgamedialog.cpp:226 gui/options.cpp:1472
+#: gui/editgamedialog.cpp:226 gui/options.cpp:1468
msgid "MIDI"
msgstr "MIDI"
@@ -327,7 +327,7 @@ msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "UПyj wГasnych ustawieё MIDI"
-#: gui/editgamedialog.cpp:241 gui/options.cpp:1482
+#: gui/editgamedialog.cpp:241 gui/options.cpp:1478
msgid "MT-32"
msgstr "MT-32"
@@ -340,11 +340,11 @@ msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "UПyj wГasnych ustawieё MT-32"
-#: gui/editgamedialog.cpp:255 gui/options.cpp:1489
+#: gui/editgamedialog.cpp:255 gui/options.cpp:1485
msgid "Paths"
msgstr "ІcieПki"
-#: gui/editgamedialog.cpp:257 gui/options.cpp:1491
+#: gui/editgamedialog.cpp:257 gui/options.cpp:1487
msgctxt "lowres"
msgid "Paths"
msgstr "ІcieПki"
@@ -358,7 +358,7 @@ msgctxt "lowres"
msgid "Game Path:"
msgstr "ІcieПka gry:"
-#: gui/editgamedialog.cpp:271 gui/options.cpp:1515
+#: gui/editgamedialog.cpp:271 gui/options.cpp:1511
msgid "Extra Path:"
msgstr "Іc. dodatkѓw:"
@@ -367,44 +367,44 @@ msgstr "Іc. dodatkѓw:"
msgid "Specifies path to additional data used by the game"
msgstr "OkreЖla ЖcieПkъ dodatkowych danych gry"
-#: gui/editgamedialog.cpp:273 gui/options.cpp:1517
+#: gui/editgamedialog.cpp:273 gui/options.cpp:1513
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Іc. dodatkѓw:"
-#: gui/editgamedialog.cpp:280 gui/options.cpp:1499
+#: gui/editgamedialog.cpp:280 gui/options.cpp:1495
msgid "Save Path:"
msgstr "ІcieПka zapisѓw:"
#: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282
-#: gui/editgamedialog.cpp:283 gui/options.cpp:1499 gui/options.cpp:1501
-#: gui/options.cpp:1502
+#: gui/editgamedialog.cpp:283 gui/options.cpp:1495 gui/options.cpp:1497
+#: gui/options.cpp:1498
msgid "Specifies where your saved games are put"
msgstr "OkreЖla gdzie zapisywaц stan gry"
-#: gui/editgamedialog.cpp:282 gui/options.cpp:1501
+#: gui/editgamedialog.cpp:282 gui/options.cpp:1497
msgctxt "lowres"
msgid "Save Path:"
msgstr "ІcieПka zapisѓw:"
#: gui/editgamedialog.cpp:301 gui/editgamedialog.cpp:398
-#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1510
-#: gui/options.cpp:1518 gui/options.cpp:1527 gui/options.cpp:1707
-#: gui/options.cpp:1713 gui/options.cpp:1721 gui/options.cpp:1744
-#: gui/options.cpp:1777 gui/options.cpp:1783 gui/options.cpp:1790
-#: gui/options.cpp:1798 gui/options.cpp:1993 gui/options.cpp:1996
-#: gui/options.cpp:2003 gui/options.cpp:2013
+#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1506
+#: gui/options.cpp:1514 gui/options.cpp:1523 gui/options.cpp:1703
+#: gui/options.cpp:1709 gui/options.cpp:1717 gui/options.cpp:1740
+#: gui/options.cpp:1773 gui/options.cpp:1779 gui/options.cpp:1786
+#: gui/options.cpp:1794 gui/options.cpp:1989 gui/options.cpp:1992
+#: gui/options.cpp:1999 gui/options.cpp:2009
msgctxt "path"
msgid "None"
msgstr "Brak"
#: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404
-#: gui/editgamedialog.cpp:522 gui/options.cpp:1701 gui/options.cpp:1771
-#: gui/options.cpp:1999 backends/platform/wii/options.cpp:56
+#: gui/editgamedialog.cpp:522 gui/options.cpp:1697 gui/options.cpp:1767
+#: gui/options.cpp:1995 backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "DomyЖlnie"
-#: gui/editgamedialog.cpp:450 gui/options.cpp:2007
+#: gui/editgamedialog.cpp:450 gui/options.cpp:2003
msgid "Select SoundFont"
msgstr "Wybierz SoundFont"
@@ -412,7 +412,7 @@ msgstr "Wybierz SoundFont"
msgid "Select additional game directory"
msgstr "Wybierz dodatkowy katalog gry"
-#: gui/editgamedialog.cpp:502 gui/options.cpp:1930
+#: gui/editgamedialog.cpp:502 gui/options.cpp:1926
msgid "Select directory for saved games"
msgstr "Wybierz katalog dla zapisѓw"
@@ -504,7 +504,7 @@ msgstr "Sinus"
msgid "Triangle"
msgstr "TrѓjkБt"
-#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1535
+#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1531
msgid "Misc"
msgstr "RѓПne"
@@ -682,7 +682,7 @@ msgid "Search:"
msgstr "Szukaj:"
#: gui/launcher.cpp:200 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:517
+#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:533
#: engines/pegasus/pegasus.cpp:355 engines/tsage/scenes.cpp:601
#: engines/wage/saveload.cpp:748
msgid "Load game:"
@@ -692,7 +692,7 @@ msgstr "Wczytaj grъ:"
#: backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:105
-#: engines/mohawk/riven.cpp:517 engines/parallaction/saveload.cpp:194
+#: engines/mohawk/riven.cpp:533 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
msgid "Load"
@@ -800,214 +800,214 @@ msgstr "co 15 min"
msgid "every 30 mins"
msgstr "co 30 min"
-#: gui/options.cpp:343 gui/options.cpp:640 gui/options.cpp:778
-#: gui/options.cpp:853 gui/options.cpp:1114
+#: gui/options.cpp:339 gui/options.cpp:636 gui/options.cpp:774
+#: gui/options.cpp:849 gui/options.cpp:1110
msgctxt "soundfont"
msgid "None"
msgstr "Brak"
-#: gui/options.cpp:514
+#: gui/options.cpp:510
msgid "Failed to apply some of the graphic options changes:"
msgstr "Nie udaГo siъ zastosowaц czъЖci zmian opcji grafiki:"
-#: gui/options.cpp:526
+#: gui/options.cpp:522
msgid "the video mode could not be changed."
msgstr "nie udaГo siъ zmieniц trybu wideo."
-#: gui/options.cpp:532
+#: gui/options.cpp:528
msgid "the aspect ratio setting could not be changed"
msgstr "nie udaГo siъ zmieniц formatu obrazu"
-#: gui/options.cpp:538
+#: gui/options.cpp:534
msgid "the fullscreen setting could not be changed"
msgstr "nie udaГo siъ zmieniц trybu peГnoekranowego"
-#: gui/options.cpp:544
+#: gui/options.cpp:540
msgid "the filtering setting could not be changed"
msgstr "nie udaГo siъ zmieniц trybu filtrowania"
-#: gui/options.cpp:932
+#: gui/options.cpp:928
msgid "Show On-screen control"
msgstr ""
-#: gui/options.cpp:936
+#: gui/options.cpp:932
#, fuzzy
msgid "Touchpad mouse mode"
msgstr "Tryb touchpada wyГБczony."
-#: gui/options.cpp:940
+#: gui/options.cpp:936
msgid "Swap Menu and Back buttons"
msgstr ""
-#: gui/options.cpp:945
+#: gui/options.cpp:941
#, fuzzy
msgid "Pointer Speed:"
msgstr "SzybkoЖц:"
-#: gui/options.cpp:945 gui/options.cpp:947 gui/options.cpp:948
+#: gui/options.cpp:941 gui/options.cpp:943 gui/options.cpp:944
msgid "Speed for keyboard/joystick mouse pointer control"
msgstr ""
-#: gui/options.cpp:947
+#: gui/options.cpp:943
#, fuzzy
msgctxt "lowres"
msgid "Pointer Speed:"
msgstr "SzybkoЖц:"
-#: gui/options.cpp:958
+#: gui/options.cpp:954
msgid "Joy Deadzone:"
msgstr ""
-#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
+#: gui/options.cpp:954 gui/options.cpp:956 gui/options.cpp:957
msgid "Analog joystick Deadzone"
msgstr ""
-#: gui/options.cpp:960
+#: gui/options.cpp:956
msgctxt "lowres"
msgid "Joy Deadzone:"
msgstr ""
-#: gui/options.cpp:974
+#: gui/options.cpp:970
msgid "HW Shader:"
msgstr ""
-#: gui/options.cpp:974 gui/options.cpp:976
+#: gui/options.cpp:970 gui/options.cpp:972
msgid "Different hardware shaders give different visual effects"
msgstr ""
-#: gui/options.cpp:976
+#: gui/options.cpp:972
msgctxt "lowres"
msgid "HW Shader:"
msgstr ""
-#: gui/options.cpp:977
+#: gui/options.cpp:973
msgid "Different shaders give different visual effects"
msgstr ""
-#: gui/options.cpp:994
+#: gui/options.cpp:990
msgid "Graphics mode:"
msgstr "Tryb grafiki:"
-#: gui/options.cpp:1008
+#: gui/options.cpp:1004
msgid "Render mode:"
msgstr "Renderer:"
-#: gui/options.cpp:1008 gui/options.cpp:1009
+#: gui/options.cpp:1004 gui/options.cpp:1005
msgid "Special dithering modes supported by some games"
msgstr "Specjalne tryby ditheringu wspierane przez niektѓre gry"
-#: gui/options.cpp:1020 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
+#: gui/options.cpp:1016 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2590
msgid "Fullscreen mode"
msgstr "PeГny ekran"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Filter graphics"
msgstr "Filtrowanie obrazu"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Use linear filtering when scaling graphics"
msgstr "UПywa filtrowania dwuliniowego przy skalowaniu obrazu"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Aspect ratio correction"
msgstr "Korekcja formatu obrazu"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Correct aspect ratio for 320x200 games"
msgstr "Korekcja formatu obrazu dla gier 320x200"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Preferred Device:"
msgstr "Pref. urzБdzenie:"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Music Device:"
msgstr "Urz. muzyczne:"
-#: gui/options.cpp:1034 gui/options.cpp:1036
+#: gui/options.cpp:1030 gui/options.cpp:1032
msgid "Specifies preferred sound device or sound card emulator"
msgstr "OkreЖla preferowane urzБdzenie dМwiъkowe lub emulator karty dМwiъkowej"
-#: gui/options.cpp:1034 gui/options.cpp:1036 gui/options.cpp:1037
+#: gui/options.cpp:1030 gui/options.cpp:1032 gui/options.cpp:1033
msgid "Specifies output sound device or sound card emulator"
msgstr "OkreЖla wyjЖciowe urzБdzenie dМwiъkowe lub emulator karty dМwiъkowej"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Pref. urzБdzenie:"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Music Device:"
msgstr "Urz. muzyczne:"
-#: gui/options.cpp:1063
+#: gui/options.cpp:1059
msgid "AdLib emulator:"
msgstr "Emulator AdLib:"
-#: gui/options.cpp:1063 gui/options.cpp:1064
+#: gui/options.cpp:1059 gui/options.cpp:1060
msgid "AdLib is used for music in many games"
msgstr "AdLib jest uПywany do muzyki w wielu grach"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "GM Device:"
msgstr "UrzБdzenie GM:"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "Specifies default sound device for General MIDI output"
msgstr "OkreЖla domyЖlne urzБdzenie dМwiъkowe dla wyjЖcia General MIDI"
-#: gui/options.cpp:1088
+#: gui/options.cpp:1084
msgid "Don't use General MIDI music"
msgstr "Nie uПywaj muzyki General MIDI"
-#: gui/options.cpp:1099 gui/options.cpp:1161
+#: gui/options.cpp:1095 gui/options.cpp:1157
msgid "Use first available device"
msgstr "UПyj pierwszego dostъpnego urzБdzenia"
-#: gui/options.cpp:1111
+#: gui/options.cpp:1107
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1111 gui/options.cpp:1113 gui/options.cpp:1114
+#: gui/options.cpp:1107 gui/options.cpp:1109 gui/options.cpp:1110
msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity"
msgstr ""
"SoundFont jest wspierany przez niektѓre karty dМwiъkowe, FluidSynth i "
"Timidity"
-#: gui/options.cpp:1113
+#: gui/options.cpp:1109
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Mixed AdLib/MIDI mode"
msgstr "Tryb miksowanego AdLib/MIDI"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Use both MIDI and AdLib sound generation"
msgstr "UПywaj obu generatorѓw dМwiъku, MIDI i AdLib, jednoczeЖnie"
-#: gui/options.cpp:1122
+#: gui/options.cpp:1118
msgid "MIDI gain:"
msgstr "Wzm. MIDI:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "MT-32 Device:"
msgstr "UrzБdzenie MT-32:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
"OkreЖla domyЖlne urzБdzenie dМwiъku dla wyjЖcia Roland MT-32/LAPC1/CM32l/CM64"
-#: gui/options.cpp:1137
+#: gui/options.cpp:1133
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Prawdziwy Roland MT-32 (wyГБcz emulacjъ GM)"
-#: gui/options.cpp:1137 gui/options.cpp:1139
+#: gui/options.cpp:1133 gui/options.cpp:1135
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -1015,16 +1015,16 @@ msgstr ""
"Zaznacz, jeЖli chcesz uПywaц swojej prawdziwej karty kompatybilnej z Roland "
"podГБczonej do twojego komputera"
-#: gui/options.cpp:1139
+#: gui/options.cpp:1135
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Prawdziwy Roland MT-32 (brak emulacji GM)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid "Roland GS Device (enable MT-32 mappings)"
msgstr "Roland w trybie GS (wГБcz mapowanie MT-32)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid ""
"Check if you want to enable patch mappings to emulate an MT-32 on a Roland "
"GS device"
@@ -1032,274 +1032,274 @@ msgstr ""
"Zaznacz, jeЖli chcesz wГБczyц Гatki mapowania pozwalajБce na emulacjъ MT-32 "
"na urzБdzeniu Roland GS"
-#: gui/options.cpp:1151
+#: gui/options.cpp:1147
msgid "Don't use Roland MT-32 music"
msgstr "Nie uПywaj muzyki Roland MT-32"
-#: gui/options.cpp:1178
+#: gui/options.cpp:1174
msgid "Text and Speech:"
msgstr "Tekst i mowa:"
-#: gui/options.cpp:1182 gui/options.cpp:1192
+#: gui/options.cpp:1178 gui/options.cpp:1188
msgid "Speech"
msgstr "Mowa"
-#: gui/options.cpp:1183 gui/options.cpp:1193
+#: gui/options.cpp:1179 gui/options.cpp:1189
msgid "Subtitles"
msgstr "Napisy"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1180
msgid "Both"
msgstr "Oba"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1182
msgid "Subtitle speed:"
msgstr "Prъd. napisѓw:"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1184
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Tekst i mowa:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1188
msgid "Spch"
msgstr "Mowa"
-#: gui/options.cpp:1193
+#: gui/options.cpp:1189
msgid "Subs"
msgstr "Napisy"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgctxt "lowres"
msgid "Both"
msgstr "Oba"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgid "Show subtitles and play speech"
msgstr "WyЖwietlaj napisy i odtwarzaj mowъ"
-#: gui/options.cpp:1196
+#: gui/options.cpp:1192
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Prъd. napisѓw:"
-#: gui/options.cpp:1212
+#: gui/options.cpp:1208
msgid "Music volume:"
msgstr "GГoЖnoЖц muzyki:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1210
msgctxt "lowres"
msgid "Music volume:"
msgstr "GГoЖnoЖц muzyki:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1217
msgid "Mute All"
msgstr "Wycisz"
-#: gui/options.cpp:1224
+#: gui/options.cpp:1220
msgid "SFX volume:"
msgstr "GГ. efekt. dМw.:"
-#: gui/options.cpp:1224 gui/options.cpp:1226 gui/options.cpp:1227
+#: gui/options.cpp:1220 gui/options.cpp:1222 gui/options.cpp:1223
msgid "Special sound effects volume"
msgstr "GГoЖnoЖц efektѓw dМw."
-#: gui/options.cpp:1226
+#: gui/options.cpp:1222
msgctxt "lowres"
msgid "SFX volume:"
msgstr "GГ. efekt. dМw.:"
-#: gui/options.cpp:1234
+#: gui/options.cpp:1230
msgid "Speech volume:"
msgstr "GГoЖnoЖц mowy:"
-#: gui/options.cpp:1236
+#: gui/options.cpp:1232
msgctxt "lowres"
msgid "Speech volume:"
msgstr "GГoЖnoЖц mowy:"
-#: gui/options.cpp:1438
+#: gui/options.cpp:1434
msgid "Shader"
msgstr ""
-#: gui/options.cpp:1450
+#: gui/options.cpp:1446
#, fuzzy
msgid "Control"
msgstr "Steruj myszkБ"
-#: gui/options.cpp:1476
+#: gui/options.cpp:1472
msgid "FluidSynth Settings"
msgstr "Ustawienia FluidSynth"
-#: gui/options.cpp:1507
+#: gui/options.cpp:1503
msgid "Theme Path:"
msgstr "ІcieПka stylu:"
-#: gui/options.cpp:1509
+#: gui/options.cpp:1505
msgctxt "lowres"
msgid "Theme Path:"
msgstr "ІcieПka stylu:"
-#: gui/options.cpp:1515 gui/options.cpp:1517 gui/options.cpp:1518
+#: gui/options.cpp:1511 gui/options.cpp:1513 gui/options.cpp:1514
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr "OkreЖla ЖcieПkъ dla dodatkowych danych dla wszystkich gier lub ScummVM"
-#: gui/options.cpp:1524
+#: gui/options.cpp:1520
msgid "Plugins Path:"
msgstr "ІcieПka wtyczek:"
-#: gui/options.cpp:1526
+#: gui/options.cpp:1522
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "ІcieПka wtyczek:"
-#: gui/options.cpp:1537
+#: gui/options.cpp:1533
msgctxt "lowres"
msgid "Misc"
msgstr "RѓПne"
-#: gui/options.cpp:1539
+#: gui/options.cpp:1535
msgid "Theme:"
msgstr "Styl:"
-#: gui/options.cpp:1543
+#: gui/options.cpp:1539
msgid "GUI Renderer:"
msgstr "Renderer interf.:"
-#: gui/options.cpp:1555
+#: gui/options.cpp:1551
msgid "Autosave:"
msgstr "Autozapis:"
-#: gui/options.cpp:1557
+#: gui/options.cpp:1553
msgctxt "lowres"
msgid "Autosave:"
msgstr "Autozapis:"
-#: gui/options.cpp:1565
+#: gui/options.cpp:1561
msgid "Keys"
msgstr "Klawisze"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "GUI Language:"
msgstr "Jъzyk interfejsu:"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "Language of ScummVM GUI"
msgstr "Jъzyk interfejsu ScummVM"
-#: gui/options.cpp:1600 gui/updates-dialog.cpp:86
+#: gui/options.cpp:1596 gui/updates-dialog.cpp:86
msgid "Update check:"
msgstr "SprawdМ aktualizacje:"
-#: gui/options.cpp:1600
+#: gui/options.cpp:1596
msgid "How often to check ScummVM updates"
msgstr "CzъstotliwoЖц automatycznego wyszukiwania aktualizacji ScummVM"
-#: gui/options.cpp:1612
+#: gui/options.cpp:1608
msgid "Check now"
msgstr "SprawdМ teraz"
-#: gui/options.cpp:1620
+#: gui/options.cpp:1616
msgid "Cloud"
msgstr "Chmura"
-#: gui/options.cpp:1622
+#: gui/options.cpp:1618
msgctxt "lowres"
msgid "Cloud"
msgstr "Chmura"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Storage:"
msgstr "Dostawca:"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Active cloud storage"
msgstr "Wybrany dostawca przechowywania w chmurze"
-#: gui/options.cpp:1634 gui/options.cpp:2210
+#: gui/options.cpp:1630 gui/options.cpp:2206
msgid "<none>"
msgstr "<brak>"
-#: gui/options.cpp:1638 backends/platform/wii/options.cpp:114
+#: gui/options.cpp:1634 backends/platform/wii/options.cpp:114
msgid "Username:"
msgstr "Nazwa uПytkownika:"
-#: gui/options.cpp:1638
+#: gui/options.cpp:1634
msgid "Username used by this storage"
msgstr "Nazwa uПytkownika w tej usГudze"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Used space:"
msgstr "UПywane miejsce:"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Space used by ScummVM's saved games on this storage"
msgstr "IloЖц miejsca zajmowana przez gry zapisane przez ScummVM w tej usГudze"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "Last sync time:"
msgstr "Ostatnia synchronizacja:"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "When the last saved games sync for this storage occured"
msgstr "Czas ostatniej synchronizacji zapisanych stanѓw gry z tБ usГugБ"
-#: gui/options.cpp:1647 gui/storagewizarddialog.cpp:71
+#: gui/options.cpp:1643 gui/storagewizarddialog.cpp:71
msgid "Connect"
msgstr "PoГБcz"
-#: gui/options.cpp:1647
+#: gui/options.cpp:1643
msgid "Open wizard dialog to connect your cloud storage account"
msgstr "Otwѓrz asystenta poГБczenia z usГugБ przechowywania danych w chmurze"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh"
msgstr "OdЖwieП"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh current cloud storage information (username and usage)"
msgstr ""
"OdЖwieП informacje o usГudze przechowywania (nazwъ uПytkownika i zajmowane "
"miejsce)"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Download"
msgstr "Pobierz"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Open downloads manager dialog"
msgstr "Otwiera okno dialogowe zarzБdzania pobieraniem"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run server"
msgstr "Uruchom serwer"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run local webserver"
msgstr "Uruchamia lokalny serwer WWW"
-#: gui/options.cpp:1652 gui/options.cpp:2320
+#: gui/options.cpp:1648 gui/options.cpp:2316
msgid "Not running"
msgstr "Nie uruchomiono"
-#: gui/options.cpp:1656
+#: gui/options.cpp:1652
msgid "/root/ Path:"
msgstr "ІcieПka bazowa:"
-#: gui/options.cpp:1656 gui/options.cpp:1658 gui/options.cpp:1659
+#: gui/options.cpp:1652 gui/options.cpp:1654 gui/options.cpp:1655
msgid "Specifies which directory the Files Manager can access"
msgstr "OkreЖla ЖcieПkъ gГѓwnБ dla menedПera plikѓw"
-#: gui/options.cpp:1658
+#: gui/options.cpp:1654
msgctxt "lowres"
msgid "/root/ Path:"
msgstr "GГѓwna /:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid "Server's port:"
msgstr "Port:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid ""
"Which port is used by the server\n"
"Auth with server is not available with non-default port"
@@ -1307,76 +1307,76 @@ msgstr ""
"OkreЖla port uПywany do komunikacji z serwerem.\n"
"(Uwierzytelnianie jest dostъpne jedynie na domyЖlnym porcie.)"
-#: gui/options.cpp:1681
+#: gui/options.cpp:1677
msgid "Apply"
msgstr "Zastosuj"
-#: gui/options.cpp:1824
+#: gui/options.cpp:1820
msgid "Failed to change cloud storage!"
msgstr "Nie udaГo siъ zmieniц dostawcy przechowywania!"
-#: gui/options.cpp:1827
+#: gui/options.cpp:1823
msgid "Another cloud storage is already active."
msgstr "Inna usГuga przechowywania jest juП aktywna."
-#: gui/options.cpp:1895
+#: gui/options.cpp:1891
#, fuzzy
msgid "Theme does not support selected language!"
msgstr "Silnik nie wspiera zapisu stanu gry"
-#: gui/options.cpp:1898
+#: gui/options.cpp:1894
#, fuzzy
msgid "Theme cannot be loaded!"
msgstr "NIE wczytano gry"
-#: gui/options.cpp:1901
+#: gui/options.cpp:1897
msgid ""
"\n"
"Misc settings will be restored."
msgstr ""
-#: gui/options.cpp:1937
+#: gui/options.cpp:1933
msgid "The chosen directory cannot be written to. Please select another one."
msgstr "Ten katalog jest zabezpieczony przed zapisem. Wybierz inny."
-#: gui/options.cpp:1946
+#: gui/options.cpp:1942
msgid "Select directory for GUI themes"
msgstr "Wybierz katalog dla stylѓw GUI"
-#: gui/options.cpp:1956
+#: gui/options.cpp:1952
msgid "Select directory for extra files"
msgstr "Wybierz katalog dla dodatkowych plikѓw"
-#: gui/options.cpp:1967
+#: gui/options.cpp:1963
msgid "Select directory for plugins"
msgstr "Wybierz katalog dla wtyczek"
-#: gui/options.cpp:1979
+#: gui/options.cpp:1975
msgid "Select directory for Files Manager /root/"
msgstr "Wybierz gГѓwny katalog dla menedПera plikѓw"
-#: gui/options.cpp:2217
+#: gui/options.cpp:2213
#, c-format
msgid "%llu bytes"
msgstr "%llu B"
-#: gui/options.cpp:2225
+#: gui/options.cpp:2221
msgid "<right now>"
msgstr "<teraz>"
-#: gui/options.cpp:2227
+#: gui/options.cpp:2223
msgid "<never>"
msgstr "<nigdy>"
-#: gui/options.cpp:2311
+#: gui/options.cpp:2307
msgid "Stop server"
msgstr "Zatrzymaj serwer"
-#: gui/options.cpp:2312
+#: gui/options.cpp:2308
msgid "Stop local webserver"
msgstr "Zatrzymuje lokalny serwer WWW"
-#: gui/options.cpp:2403
+#: gui/options.cpp:2399
msgid ""
"Request failed.\n"
"Check your Internet connection."
@@ -1846,8 +1846,8 @@ msgstr "~P~owrѓt do launchera"
#: 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:106
-#: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:658
+#: engines/mohawk/riven.cpp:545 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
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
#: engines/toon/toon.cpp:3340 engines/tsage/scenes.cpp:599
@@ -1866,9 +1866,9 @@ msgstr "Zapis:"
#: engines/dm/loadsave.cpp:196 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:106 engines/neverhood/menumodule.cpp:880
-#: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:659
+#: engines/mohawk/dialogs.cpp:106 engines/mohawk/riven.cpp:545
+#: 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
#: engines/sherlock/scalpel/scalpel.cpp:1250
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
@@ -2178,7 +2178,7 @@ msgstr "Klikanie wyГБczone"
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Dotkniъcie ekranu - przytrzymanie (krzyПak klika)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
msgid "Do you want to quit ?"
msgstr "Chcesz wyjЖц?"
@@ -3338,7 +3338,7 @@ msgid ""
"works."
msgstr ""
-#: engines/mohawk/riven.cpp:416
+#: engines/mohawk/riven.cpp:432
msgid "You are missing the following required Riven data files:\n"
msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index aee99f18f4..92243f43b3 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: 2017-12-10 15:25+0100\n"
+"POT-Creation-Date: 2017-12-26 21:11+0100\n"
"PO-Revision-Date: 2017-03-03 22:26+0000\n"
"Last-Translator: rafaelmessias <rmmartins@gmail.com>\n"
"Language-Team: Portuguese (Brazil) <https://translations.scummvm.org/"
@@ -61,7 +61,7 @@ msgstr "Acima"
#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editgamedialog.cpp:292
#: gui/editrecorddialog.cpp:67 gui/filebrowser-dialog.cpp:64
#: gui/fluidsynth-dialog.cpp:152 gui/KeysDialog.cpp:43 gui/massadd.cpp:95
-#: gui/options.cpp:1680 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
+#: gui/options.cpp:1676 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
#: gui/recorderdialog.cpp:155 gui/remotebrowser.cpp:59
#: gui/saveload-dialog.cpp:383 gui/saveload-dialog.cpp:445
#: gui/saveload-dialog.cpp:727 gui/saveload-dialog.cpp:1121
@@ -120,7 +120,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -133,7 +133,7 @@ msgstr "Sim"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -156,7 +156,7 @@ msgstr ""
#: gui/downloaddialog.cpp:146 gui/editgamedialog.cpp:293
#: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:526
-#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1682
+#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1678
#: gui/saveload-dialog.cpp:1122 engines/engine.cpp:443 engines/engine.cpp:454
#: backends/platform/wii/options.cpp:47
#: backends/platform/wince/CELauncherDialog.cpp:54
@@ -240,8 +240,8 @@ msgid ""
"English"
msgstr "Idioma do jogo. Isto nуo irс passar seu jogo Inglъs para Portuguъs"
-#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:997
-#: gui/options.cpp:1010 gui/options.cpp:1575 audio/null.cpp:41
+#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:993
+#: gui/options.cpp:1006 gui/options.cpp:1571 audio/null.cpp:41
msgid "<default>"
msgstr "<padrуo>"
@@ -263,11 +263,11 @@ msgstr "Sistema:"
msgid "Engine"
msgstr "Engine"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "Graphics"
msgstr "Grсficos"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "GFX"
msgstr "GFX"
@@ -280,7 +280,7 @@ msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Sobrepor configuraчуo global de grсficos"
-#: gui/editgamedialog.cpp:196 gui/options.cpp:1457
+#: gui/editgamedialog.cpp:196 gui/options.cpp:1453
msgid "Audio"
msgstr "Сudio"
@@ -293,11 +293,11 @@ msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Sobrepor configuraчуo global de сudio"
-#: gui/editgamedialog.cpp:210 gui/options.cpp:1462
+#: gui/editgamedialog.cpp:210 gui/options.cpp:1458
msgid "Volume"
msgstr "Volume"
-#: gui/editgamedialog.cpp:212 gui/options.cpp:1464
+#: gui/editgamedialog.cpp:212 gui/options.cpp:1460
msgctxt "lowres"
msgid "Volume"
msgstr "Volume"
@@ -311,7 +311,7 @@ msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Sobrepor configuraчуo global de volume"
-#: gui/editgamedialog.cpp:226 gui/options.cpp:1472
+#: gui/editgamedialog.cpp:226 gui/options.cpp:1468
msgid "MIDI"
msgstr "MIDI"
@@ -324,7 +324,7 @@ msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Sobrepor configuraчуo global de MIDI"
-#: gui/editgamedialog.cpp:241 gui/options.cpp:1482
+#: gui/editgamedialog.cpp:241 gui/options.cpp:1478
msgid "MT-32"
msgstr "MT-32"
@@ -337,11 +337,11 @@ msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Sobrepor configuraчуo global de MT-32"
-#: gui/editgamedialog.cpp:255 gui/options.cpp:1489
+#: gui/editgamedialog.cpp:255 gui/options.cpp:1485
msgid "Paths"
msgstr "Pastas"
-#: gui/editgamedialog.cpp:257 gui/options.cpp:1491
+#: gui/editgamedialog.cpp:257 gui/options.cpp:1487
msgctxt "lowres"
msgid "Paths"
msgstr "Pastas"
@@ -355,7 +355,7 @@ msgctxt "lowres"
msgid "Game Path:"
msgstr "Pasta do Jogo:"
-#: gui/editgamedialog.cpp:271 gui/options.cpp:1515
+#: gui/editgamedialog.cpp:271 gui/options.cpp:1511
msgid "Extra Path:"
msgstr "Pasta de Extras:"
@@ -364,44 +364,44 @@ msgstr "Pasta de Extras:"
msgid "Specifies path to additional data used by the game"
msgstr "Especifique a pasta para dados utilizados no jogo"
-#: gui/editgamedialog.cpp:273 gui/options.cpp:1517
+#: gui/editgamedialog.cpp:273 gui/options.cpp:1513
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Pasta de Extras:"
-#: gui/editgamedialog.cpp:280 gui/options.cpp:1499
+#: gui/editgamedialog.cpp:280 gui/options.cpp:1495
msgid "Save Path:"
msgstr "Pasta para Salvar:"
#: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282
-#: gui/editgamedialog.cpp:283 gui/options.cpp:1499 gui/options.cpp:1501
-#: gui/options.cpp:1502
+#: gui/editgamedialog.cpp:283 gui/options.cpp:1495 gui/options.cpp:1497
+#: gui/options.cpp:1498
msgid "Specifies where your saved games are put"
msgstr "Especifique onde guardar seus jogos salvos"
-#: gui/editgamedialog.cpp:282 gui/options.cpp:1501
+#: gui/editgamedialog.cpp:282 gui/options.cpp:1497
msgctxt "lowres"
msgid "Save Path:"
msgstr "Pasta para Salvar:"
#: gui/editgamedialog.cpp:301 gui/editgamedialog.cpp:398
-#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1510
-#: gui/options.cpp:1518 gui/options.cpp:1527 gui/options.cpp:1707
-#: gui/options.cpp:1713 gui/options.cpp:1721 gui/options.cpp:1744
-#: gui/options.cpp:1777 gui/options.cpp:1783 gui/options.cpp:1790
-#: gui/options.cpp:1798 gui/options.cpp:1993 gui/options.cpp:1996
-#: gui/options.cpp:2003 gui/options.cpp:2013
+#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1506
+#: gui/options.cpp:1514 gui/options.cpp:1523 gui/options.cpp:1703
+#: gui/options.cpp:1709 gui/options.cpp:1717 gui/options.cpp:1740
+#: gui/options.cpp:1773 gui/options.cpp:1779 gui/options.cpp:1786
+#: gui/options.cpp:1794 gui/options.cpp:1989 gui/options.cpp:1992
+#: gui/options.cpp:1999 gui/options.cpp:2009
msgctxt "path"
msgid "None"
msgstr "Nenhum(a)"
#: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404
-#: gui/editgamedialog.cpp:522 gui/options.cpp:1701 gui/options.cpp:1771
-#: gui/options.cpp:1999 backends/platform/wii/options.cpp:56
+#: gui/editgamedialog.cpp:522 gui/options.cpp:1697 gui/options.cpp:1767
+#: gui/options.cpp:1995 backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Padrуo"
-#: gui/editgamedialog.cpp:450 gui/options.cpp:2007
+#: gui/editgamedialog.cpp:450 gui/options.cpp:2003
msgid "Select SoundFont"
msgstr "Selecione o SoundFont"
@@ -409,7 +409,7 @@ msgstr "Selecione o SoundFont"
msgid "Select additional game directory"
msgstr "Selecione a pasta adicional do jogo"
-#: gui/editgamedialog.cpp:502 gui/options.cpp:1930
+#: gui/editgamedialog.cpp:502 gui/options.cpp:1926
msgid "Select directory for saved games"
msgstr "Selecione a pasta para os jogos salvos"
@@ -503,7 +503,7 @@ msgstr ""
msgid "Triangle"
msgstr ""
-#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1535
+#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1531
msgid "Misc"
msgstr "Outros"
@@ -683,7 +683,7 @@ msgid "Search:"
msgstr "Pesquisar:"
#: gui/launcher.cpp:200 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:517
+#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:533
#: engines/pegasus/pegasus.cpp:355 engines/tsage/scenes.cpp:601
#: engines/wage/saveload.cpp:748
msgid "Load game:"
@@ -693,7 +693,7 @@ msgstr "Carregar jogo:"
#: backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:105
-#: engines/mohawk/riven.cpp:517 engines/parallaction/saveload.cpp:194
+#: engines/mohawk/riven.cpp:533 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
msgid "Load"
@@ -811,215 +811,215 @@ msgstr "a cada 15 mins"
msgid "every 30 mins"
msgstr "a cada 30 mins"
-#: gui/options.cpp:343 gui/options.cpp:640 gui/options.cpp:778
-#: gui/options.cpp:853 gui/options.cpp:1114
+#: gui/options.cpp:339 gui/options.cpp:636 gui/options.cpp:774
+#: gui/options.cpp:849 gui/options.cpp:1110
msgctxt "soundfont"
msgid "None"
msgstr "Nenhum(a)"
-#: gui/options.cpp:514
+#: gui/options.cpp:510
msgid "Failed to apply some of the graphic options changes:"
msgstr "Falha ao aplicar algumas mudanчas nas opчѕes de grсfico:"
-#: gui/options.cpp:526
+#: gui/options.cpp:522
msgid "the video mode could not be changed."
msgstr "o modo de vэdeo nуo pєde ser alterado."
-#: gui/options.cpp:532
+#: gui/options.cpp:528
msgid "the aspect ratio setting could not be changed"
msgstr "a configuraчуo de proporчуo nуo pєde ser mudada"
-#: gui/options.cpp:538
+#: gui/options.cpp:534
msgid "the fullscreen setting could not be changed"
msgstr "a configuraчуo de tela cheia nуo pєde ser mudada"
-#: gui/options.cpp:544
+#: gui/options.cpp:540
#, fuzzy
msgid "the filtering setting could not be changed"
msgstr "a configuraчуo de tela cheia nуo pєde ser mudada"
-#: gui/options.cpp:932
+#: gui/options.cpp:928
msgid "Show On-screen control"
msgstr ""
-#: gui/options.cpp:936
+#: gui/options.cpp:932
#, fuzzy
msgid "Touchpad mouse mode"
msgstr "Modo Touchpad desligado."
-#: gui/options.cpp:940
+#: gui/options.cpp:936
msgid "Swap Menu and Back buttons"
msgstr ""
-#: gui/options.cpp:945
+#: gui/options.cpp:941
#, fuzzy
msgid "Pointer Speed:"
msgstr "Voz"
-#: gui/options.cpp:945 gui/options.cpp:947 gui/options.cpp:948
+#: gui/options.cpp:941 gui/options.cpp:943 gui/options.cpp:944
msgid "Speed for keyboard/joystick mouse pointer control"
msgstr ""
-#: gui/options.cpp:947
+#: gui/options.cpp:943
#, fuzzy
msgctxt "lowres"
msgid "Pointer Speed:"
msgstr "Voz"
-#: gui/options.cpp:958
+#: gui/options.cpp:954
msgid "Joy Deadzone:"
msgstr ""
-#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
+#: gui/options.cpp:954 gui/options.cpp:956 gui/options.cpp:957
msgid "Analog joystick Deadzone"
msgstr ""
-#: gui/options.cpp:960
+#: gui/options.cpp:956
msgctxt "lowres"
msgid "Joy Deadzone:"
msgstr ""
-#: gui/options.cpp:974
+#: gui/options.cpp:970
msgid "HW Shader:"
msgstr ""
-#: gui/options.cpp:974 gui/options.cpp:976
+#: gui/options.cpp:970 gui/options.cpp:972
msgid "Different hardware shaders give different visual effects"
msgstr ""
-#: gui/options.cpp:976
+#: gui/options.cpp:972
msgctxt "lowres"
msgid "HW Shader:"
msgstr ""
-#: gui/options.cpp:977
+#: gui/options.cpp:973
msgid "Different shaders give different visual effects"
msgstr ""
-#: gui/options.cpp:994
+#: gui/options.cpp:990
msgid "Graphics mode:"
msgstr "Modo grсfico:"
-#: gui/options.cpp:1008
+#: gui/options.cpp:1004
msgid "Render mode:"
msgstr "Renderizaчуo:"
-#: gui/options.cpp:1008 gui/options.cpp:1009
+#: gui/options.cpp:1004 gui/options.cpp:1005
msgid "Special dithering modes supported by some games"
msgstr "Modos especiais de dithering suportados por alguns jogos"
-#: gui/options.cpp:1020 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
+#: gui/options.cpp:1016 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2590
msgid "Fullscreen mode"
msgstr "Modo Tela Cheia"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
#, fuzzy
msgid "Filter graphics"
msgstr "Grсficos"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Use linear filtering when scaling graphics"
msgstr ""
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Aspect ratio correction"
msgstr "Correчуo de proporчуo"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Correct aspect ratio for 320x200 games"
msgstr "Correчуo de proporчуo para jogos 320x200"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Preferred Device:"
msgstr "Dispositivo pref.:"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Music Device:"
msgstr "Disp. de mњsica:"
-#: gui/options.cpp:1034 gui/options.cpp:1036
+#: gui/options.cpp:1030 gui/options.cpp:1032
msgid "Specifies preferred sound device or sound card emulator"
msgstr "Especifica o dispositivo de som preferido ou emulador de placa de som"
-#: gui/options.cpp:1034 gui/options.cpp:1036 gui/options.cpp:1037
+#: gui/options.cpp:1030 gui/options.cpp:1032 gui/options.cpp:1033
msgid "Specifies output sound device or sound card emulator"
msgstr "Especifica o dispositivo de saэda de som ou emulador de placa de som"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Dispositivo pref.:"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Music Device:"
msgstr "Dispositivo de mњsica:"
-#: gui/options.cpp:1063
+#: gui/options.cpp:1059
msgid "AdLib emulator:"
msgstr "Emulador AdLib:"
-#: gui/options.cpp:1063 gui/options.cpp:1064
+#: gui/options.cpp:1059 gui/options.cpp:1060
msgid "AdLib is used for music in many games"
msgstr "AdLib щ utilizado para mњsica em vсrios jogos"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "GM Device:"
msgstr "Dispositivo GM:"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "Specifies default sound device for General MIDI output"
msgstr "Especifique o dispositivo de som padrуo para a saэda General MIDI"
-#: gui/options.cpp:1088
+#: gui/options.cpp:1084
msgid "Don't use General MIDI music"
msgstr "Nуo usar mњsica General MIDI"
-#: gui/options.cpp:1099 gui/options.cpp:1161
+#: gui/options.cpp:1095 gui/options.cpp:1157
msgid "Use first available device"
msgstr "Usar o primeiro dispositivo disponэvel"
-#: gui/options.cpp:1111
+#: gui/options.cpp:1107
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1111 gui/options.cpp:1113 gui/options.cpp:1114
+#: gui/options.cpp:1107 gui/options.cpp:1109 gui/options.cpp:1110
msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity"
msgstr "SoundFont щ suportado por algumas placas de som, FluidSynth e Timidity"
-#: gui/options.cpp:1113
+#: gui/options.cpp:1109
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Mixed AdLib/MIDI mode"
msgstr "Mixar AdLib/MIDI"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Use both MIDI and AdLib sound generation"
msgstr "Usar MIDI e AdLib juntos na geraчуo de som"
-#: gui/options.cpp:1122
+#: gui/options.cpp:1118
msgid "MIDI gain:"
msgstr "Ganho MIDI:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "MT-32 Device:"
msgstr "Dispositivo MT-32:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
"Especifique o dispositivo de som padrуo para a saэda Roland MT-32/LAPC1/"
"CM32l/CM64"
-#: gui/options.cpp:1137
+#: gui/options.cpp:1133
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Roland MT-32 real (desligar emulaчуo GM)"
-#: gui/options.cpp:1137 gui/options.cpp:1139
+#: gui/options.cpp:1133 gui/options.cpp:1135
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -1027,375 +1027,375 @@ msgstr ""
"Verifique se vocъ quer usar o seu dispositivo de hardware de som compatэvel "
"com Roland"
-#: gui/options.cpp:1139
+#: gui/options.cpp:1135
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Roland MT-32 real (sem emulaчуo GM)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
#, fuzzy
msgid "Roland GS Device (enable MT-32 mappings)"
msgstr "Roland MT-32 real (desligar emulaчуo GM)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid ""
"Check if you want to enable patch mappings to emulate an MT-32 on a Roland "
"GS device"
msgstr ""
-#: gui/options.cpp:1151
+#: gui/options.cpp:1147
msgid "Don't use Roland MT-32 music"
msgstr "Nуo usar mњsica Roland MT-32"
-#: gui/options.cpp:1178
+#: gui/options.cpp:1174
msgid "Text and Speech:"
msgstr "Texto e Voz:"
-#: gui/options.cpp:1182 gui/options.cpp:1192
+#: gui/options.cpp:1178 gui/options.cpp:1188
msgid "Speech"
msgstr "Voz"
-#: gui/options.cpp:1183 gui/options.cpp:1193
+#: gui/options.cpp:1179 gui/options.cpp:1189
msgid "Subtitles"
msgstr "Legendas"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1180
msgid "Both"
msgstr "Ambos"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1182
msgid "Subtitle speed:"
msgstr "Rapidez legendas:"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1184
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Texto e Voz:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1188
msgid "Spch"
msgstr "Voz"
-#: gui/options.cpp:1193
+#: gui/options.cpp:1189
msgid "Subs"
msgstr "Legs"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgctxt "lowres"
msgid "Both"
msgstr "Ambos"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgid "Show subtitles and play speech"
msgstr "Mostrar legenda e vozes (dublagem)"
-#: gui/options.cpp:1196
+#: gui/options.cpp:1192
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Velocidade das legendas:"
-#: gui/options.cpp:1212
+#: gui/options.cpp:1208
msgid "Music volume:"
msgstr "Volume da Mњsica:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1210
msgctxt "lowres"
msgid "Music volume:"
msgstr "Volume da Mњsica:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1217
msgid "Mute All"
msgstr "Mudo"
-#: gui/options.cpp:1224
+#: gui/options.cpp:1220
msgid "SFX volume:"
msgstr "Volume dos Sons:"
-#: gui/options.cpp:1224 gui/options.cpp:1226 gui/options.cpp:1227
+#: gui/options.cpp:1220 gui/options.cpp:1222 gui/options.cpp:1223
msgid "Special sound effects volume"
msgstr "Volume dos efeitos sonoros especiais"
-#: gui/options.cpp:1226
+#: gui/options.cpp:1222
msgctxt "lowres"
msgid "SFX volume:"
msgstr "Volume dos Sons:"
-#: gui/options.cpp:1234
+#: gui/options.cpp:1230
msgid "Speech volume:"
msgstr "Volume da Voz:"
-#: gui/options.cpp:1236
+#: gui/options.cpp:1232
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Volume da Voz:"
-#: gui/options.cpp:1438
+#: gui/options.cpp:1434
msgid "Shader"
msgstr ""
-#: gui/options.cpp:1450
+#: gui/options.cpp:1446
#, fuzzy
msgid "Control"
msgstr "Controle do Mouse"
-#: gui/options.cpp:1476
+#: gui/options.cpp:1472
msgid "FluidSynth Settings"
msgstr ""
-#: gui/options.cpp:1507
+#: gui/options.cpp:1503
msgid "Theme Path:"
msgstr "Pasta do Tema:"
-#: gui/options.cpp:1509
+#: gui/options.cpp:1505
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Pasta do Tema:"
-#: gui/options.cpp:1515 gui/options.cpp:1517 gui/options.cpp:1518
+#: gui/options.cpp:1511 gui/options.cpp:1513 gui/options.cpp:1514
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr ""
"Especifica a pasta para os dados adicionais usados por todos os jogos ou "
"ScummVM"
-#: gui/options.cpp:1524
+#: gui/options.cpp:1520
msgid "Plugins Path:"
msgstr "Pasta de Plugins:"
-#: gui/options.cpp:1526
+#: gui/options.cpp:1522
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Pasta de Plugins:"
-#: gui/options.cpp:1537
+#: gui/options.cpp:1533
msgctxt "lowres"
msgid "Misc"
msgstr "Outros"
-#: gui/options.cpp:1539
+#: gui/options.cpp:1535
msgid "Theme:"
msgstr "Tema:"
-#: gui/options.cpp:1543
+#: gui/options.cpp:1539
msgid "GUI Renderer:"
msgstr "Renderizador GUI:"
-#: gui/options.cpp:1555
+#: gui/options.cpp:1551
msgid "Autosave:"
msgstr "Auto-Salvar:"
-#: gui/options.cpp:1557
+#: gui/options.cpp:1553
msgctxt "lowres"
msgid "Autosave:"
msgstr "Auto-Salvar:"
-#: gui/options.cpp:1565
+#: gui/options.cpp:1561
msgid "Keys"
msgstr "Teclas"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "GUI Language:"
msgstr "Idioma do GUI:"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "Language of ScummVM GUI"
msgstr "Linguagem do ScummVM GUI"
-#: gui/options.cpp:1600 gui/updates-dialog.cpp:86
+#: gui/options.cpp:1596 gui/updates-dialog.cpp:86
msgid "Update check:"
msgstr ""
-#: gui/options.cpp:1600
+#: gui/options.cpp:1596
msgid "How often to check ScummVM updates"
msgstr ""
-#: gui/options.cpp:1612
+#: gui/options.cpp:1608
msgid "Check now"
msgstr ""
-#: gui/options.cpp:1620
+#: gui/options.cpp:1616
msgid "Cloud"
msgstr ""
-#: gui/options.cpp:1622
+#: gui/options.cpp:1618
msgctxt "lowres"
msgid "Cloud"
msgstr ""
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Storage:"
msgstr ""
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Active cloud storage"
msgstr ""
-#: gui/options.cpp:1634 gui/options.cpp:2210
+#: gui/options.cpp:1630 gui/options.cpp:2206
msgid "<none>"
msgstr ""
-#: gui/options.cpp:1638 backends/platform/wii/options.cpp:114
+#: gui/options.cpp:1634 backends/platform/wii/options.cpp:114
msgid "Username:"
msgstr "Nome de usuсrio:"
-#: gui/options.cpp:1638
+#: gui/options.cpp:1634
msgid "Username used by this storage"
msgstr ""
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Used space:"
msgstr ""
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Space used by ScummVM's saved games on this storage"
msgstr ""
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "Last sync time:"
msgstr ""
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "When the last saved games sync for this storage occured"
msgstr ""
-#: gui/options.cpp:1647 gui/storagewizarddialog.cpp:71
+#: gui/options.cpp:1643 gui/storagewizarddialog.cpp:71
msgid "Connect"
msgstr ""
-#: gui/options.cpp:1647
+#: gui/options.cpp:1643
msgid "Open wizard dialog to connect your cloud storage account"
msgstr ""
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh"
msgstr ""
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh current cloud storage information (username and usage)"
msgstr ""
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
#, fuzzy
msgid "Download"
msgstr "Baixo"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Open downloads manager dialog"
msgstr ""
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run server"
msgstr ""
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run local webserver"
msgstr ""
-#: gui/options.cpp:1652 gui/options.cpp:2320
+#: gui/options.cpp:1648 gui/options.cpp:2316
#, fuzzy
msgid "Not running"
msgstr "Erro ao executar o jogo:"
-#: gui/options.cpp:1656
+#: gui/options.cpp:1652
#, fuzzy
msgid "/root/ Path:"
msgstr "Pasta de Extras"
-#: gui/options.cpp:1656 gui/options.cpp:1658 gui/options.cpp:1659
+#: gui/options.cpp:1652 gui/options.cpp:1654 gui/options.cpp:1655
#, fuzzy
msgid "Specifies which directory the Files Manager can access"
msgstr "Especifique onde guardar seus jogos salvos"
-#: gui/options.cpp:1658
+#: gui/options.cpp:1654
#, fuzzy
msgctxt "lowres"
msgid "/root/ Path:"
msgstr "Pasta de Extras"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
#, fuzzy
msgid "Server's port:"
msgstr "Servidor:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid ""
"Which port is used by the server\n"
"Auth with server is not available with non-default port"
msgstr ""
-#: gui/options.cpp:1681
+#: gui/options.cpp:1677
msgid "Apply"
msgstr ""
-#: gui/options.cpp:1824
+#: gui/options.cpp:1820
#, fuzzy
msgid "Failed to change cloud storage!"
msgstr "Falha ao salvar o jogo"
-#: gui/options.cpp:1827
+#: gui/options.cpp:1823
msgid "Another cloud storage is already active."
msgstr ""
-#: gui/options.cpp:1895
+#: gui/options.cpp:1891
#, fuzzy
msgid "Theme does not support selected language!"
msgstr "O programa atual nуo suporta salvar o progresso do jogo"
-#: gui/options.cpp:1898
+#: gui/options.cpp:1894
#, fuzzy
msgid "Theme cannot be loaded!"
msgstr "O jogo NУO foi carregado"
-#: gui/options.cpp:1901
+#: gui/options.cpp:1897
msgid ""
"\n"
"Misc settings will be restored."
msgstr ""
-#: gui/options.cpp:1937
+#: gui/options.cpp:1933
msgid "The chosen directory cannot be written to. Please select another one."
msgstr "O diretѓrio escolhido nуo pode ser usado. Por favor, selecione outro."
-#: gui/options.cpp:1946
+#: gui/options.cpp:1942
msgid "Select directory for GUI themes"
msgstr "Selecione a pasta para os temas da Interface de Uso Grсfico"
-#: gui/options.cpp:1956
+#: gui/options.cpp:1952
msgid "Select directory for extra files"
msgstr "Selecione a pasta para os arquivos extras"
-#: gui/options.cpp:1967
+#: gui/options.cpp:1963
msgid "Select directory for plugins"
msgstr "Selecione a pasta para os plugins"
-#: gui/options.cpp:1979
+#: gui/options.cpp:1975
#, fuzzy
msgid "Select directory for Files Manager /root/"
msgstr "Selecione a pasta para os arquivos extras"
-#: gui/options.cpp:2217
+#: gui/options.cpp:2213
#, c-format
msgid "%llu bytes"
msgstr ""
-#: gui/options.cpp:2225
+#: gui/options.cpp:2221
msgid "<right now>"
msgstr ""
-#: gui/options.cpp:2227
+#: gui/options.cpp:2223
#, fuzzy
msgid "<never>"
msgstr "Nunca"
-#: gui/options.cpp:2311
+#: gui/options.cpp:2307
#, fuzzy
msgid "Stop server"
msgstr "Servidor:"
-#: gui/options.cpp:2312
+#: gui/options.cpp:2308
msgid "Stop local webserver"
msgstr ""
-#: gui/options.cpp:2403
+#: gui/options.cpp:2399
msgid ""
"Request failed.\n"
"Check your Internet connection."
@@ -1871,8 +1871,8 @@ msgstr "~V~oltar ao menu"
#: 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:106
-#: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:658
+#: engines/mohawk/riven.cpp:545 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
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
#: engines/toon/toon.cpp:3340 engines/tsage/scenes.cpp:599
@@ -1891,9 +1891,9 @@ msgstr "Salvar jogo:"
#: engines/dm/loadsave.cpp:196 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:106 engines/neverhood/menumodule.cpp:880
-#: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:659
+#: engines/mohawk/dialogs.cpp:106 engines/mohawk/riven.cpp:545
+#: 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
#: engines/sherlock/scalpel/scalpel.cpp:1250
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
@@ -2212,7 +2212,7 @@ msgstr "Clicando Desabilitado"
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Touchscreen 'Modo Toque' - Acima (Sem Clicar)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
msgid "Do you want to quit ?"
msgstr "Vocъ deseja sair ?"
@@ -3379,7 +3379,7 @@ msgid ""
"works."
msgstr ""
-#: engines/mohawk/riven.cpp:416
+#: engines/mohawk/riven.cpp:432
msgid "You are missing the following required Riven data files:\n"
msgstr ""
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 9cb459778e..d6683f85d1 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: 2017-12-10 15:25+0100\n"
+"POT-Creation-Date: 2017-12-26 21:11+0100\n"
"PO-Revision-Date: 2017-01-30 14:50+0000\n"
"Last-Translator: Vitor Santos <vitorhgsantos90@gmail.com>\n"
"Language-Team: Portuguese (Portugal) <https://translations.scummvm.org/"
@@ -58,7 +58,7 @@ msgstr "Acima"
#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editgamedialog.cpp:292
#: gui/editrecorddialog.cpp:67 gui/filebrowser-dialog.cpp:64
#: gui/fluidsynth-dialog.cpp:152 gui/KeysDialog.cpp:43 gui/massadd.cpp:95
-#: gui/options.cpp:1680 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
+#: gui/options.cpp:1676 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
#: gui/recorderdialog.cpp:155 gui/remotebrowser.cpp:59
#: gui/saveload-dialog.cpp:383 gui/saveload-dialog.cpp:445
#: gui/saveload-dialog.cpp:727 gui/saveload-dialog.cpp:1121
@@ -118,7 +118,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -131,7 +131,7 @@ msgstr "Sim"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -154,7 +154,7 @@ msgstr ""
#: gui/downloaddialog.cpp:146 gui/editgamedialog.cpp:293
#: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:526
-#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1682
+#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1678
#: gui/saveload-dialog.cpp:1122 engines/engine.cpp:443 engines/engine.cpp:454
#: backends/platform/wii/options.cpp:47
#: backends/platform/wince/CELauncherDialog.cpp:54
@@ -240,8 +240,8 @@ msgstr ""
"Idioma do jogo. Esta opчуo nуo muda a sua versуo do jogo de Portuguъs para "
"Inglъs"
-#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:997
-#: gui/options.cpp:1010 gui/options.cpp:1575 audio/null.cpp:41
+#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:993
+#: gui/options.cpp:1006 gui/options.cpp:1571 audio/null.cpp:41
msgid "<default>"
msgstr "<padrуo>"
@@ -263,11 +263,11 @@ msgstr "Plataforma:"
msgid "Engine"
msgstr "Recursos"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "Graphics"
msgstr "Grсficos"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "GFX"
msgstr "GFX"
@@ -280,7 +280,7 @@ msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Substituir configuraчѕes gerais de grсficos"
-#: gui/editgamedialog.cpp:196 gui/options.cpp:1457
+#: gui/editgamedialog.cpp:196 gui/options.cpp:1453
msgid "Audio"
msgstr "Сudio"
@@ -293,11 +293,11 @@ msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Substituir configuraчѕes gerais de сudio"
-#: gui/editgamedialog.cpp:210 gui/options.cpp:1462
+#: gui/editgamedialog.cpp:210 gui/options.cpp:1458
msgid "Volume"
msgstr "Volume"
-#: gui/editgamedialog.cpp:212 gui/options.cpp:1464
+#: gui/editgamedialog.cpp:212 gui/options.cpp:1460
msgctxt "lowres"
msgid "Volume"
msgstr "Volume"
@@ -311,7 +311,7 @@ msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Substituir configuraчѕes gerais de volume"
-#: gui/editgamedialog.cpp:226 gui/options.cpp:1472
+#: gui/editgamedialog.cpp:226 gui/options.cpp:1468
msgid "MIDI"
msgstr "MIDI"
@@ -324,7 +324,7 @@ msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Substituir configuraчѕes gerais de MIDI"
-#: gui/editgamedialog.cpp:241 gui/options.cpp:1482
+#: gui/editgamedialog.cpp:241 gui/options.cpp:1478
msgid "MT-32"
msgstr "MT-32"
@@ -337,11 +337,11 @@ msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Substituir configuraчѕes gerais de MT-32"
-#: gui/editgamedialog.cpp:255 gui/options.cpp:1489
+#: gui/editgamedialog.cpp:255 gui/options.cpp:1485
msgid "Paths"
msgstr "Caminhos"
-#: gui/editgamedialog.cpp:257 gui/options.cpp:1491
+#: gui/editgamedialog.cpp:257 gui/options.cpp:1487
msgctxt "lowres"
msgid "Paths"
msgstr "Caminhos"
@@ -355,7 +355,7 @@ msgctxt "lowres"
msgid "Game Path:"
msgstr "Caminho do Jogo:"
-#: gui/editgamedialog.cpp:271 gui/options.cpp:1515
+#: gui/editgamedialog.cpp:271 gui/options.cpp:1511
msgid "Extra Path:"
msgstr "Caminho de Extras:"
@@ -364,44 +364,44 @@ msgstr "Caminho de Extras:"
msgid "Specifies path to additional data used by the game"
msgstr "Especifica o caminho para dados adicionais usados pelo jogo"
-#: gui/editgamedialog.cpp:273 gui/options.cpp:1517
+#: gui/editgamedialog.cpp:273 gui/options.cpp:1513
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Caminho de Extras:"
-#: gui/editgamedialog.cpp:280 gui/options.cpp:1499
+#: gui/editgamedialog.cpp:280 gui/options.cpp:1495
msgid "Save Path:"
msgstr "Caminho para Salvar:"
#: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282
-#: gui/editgamedialog.cpp:283 gui/options.cpp:1499 gui/options.cpp:1501
-#: gui/options.cpp:1502
+#: gui/editgamedialog.cpp:283 gui/options.cpp:1495 gui/options.cpp:1497
+#: gui/options.cpp:1498
msgid "Specifies where your saved games are put"
msgstr "Especifica onde os jogos salvos sуo colocados"
-#: gui/editgamedialog.cpp:282 gui/options.cpp:1501
+#: gui/editgamedialog.cpp:282 gui/options.cpp:1497
msgctxt "lowres"
msgid "Save Path:"
msgstr "Caminho para Salvar:"
#: gui/editgamedialog.cpp:301 gui/editgamedialog.cpp:398
-#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1510
-#: gui/options.cpp:1518 gui/options.cpp:1527 gui/options.cpp:1707
-#: gui/options.cpp:1713 gui/options.cpp:1721 gui/options.cpp:1744
-#: gui/options.cpp:1777 gui/options.cpp:1783 gui/options.cpp:1790
-#: gui/options.cpp:1798 gui/options.cpp:1993 gui/options.cpp:1996
-#: gui/options.cpp:2003 gui/options.cpp:2013
+#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1506
+#: gui/options.cpp:1514 gui/options.cpp:1523 gui/options.cpp:1703
+#: gui/options.cpp:1709 gui/options.cpp:1717 gui/options.cpp:1740
+#: gui/options.cpp:1773 gui/options.cpp:1779 gui/options.cpp:1786
+#: gui/options.cpp:1794 gui/options.cpp:1989 gui/options.cpp:1992
+#: gui/options.cpp:1999 gui/options.cpp:2009
msgctxt "path"
msgid "None"
msgstr "Nenhum"
#: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404
-#: gui/editgamedialog.cpp:522 gui/options.cpp:1701 gui/options.cpp:1771
-#: gui/options.cpp:1999 backends/platform/wii/options.cpp:56
+#: gui/editgamedialog.cpp:522 gui/options.cpp:1697 gui/options.cpp:1767
+#: gui/options.cpp:1995 backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Padrуo"
-#: gui/editgamedialog.cpp:450 gui/options.cpp:2007
+#: gui/editgamedialog.cpp:450 gui/options.cpp:2003
msgid "Select SoundFont"
msgstr "Seleccione o SoundFont"
@@ -409,7 +409,7 @@ msgstr "Seleccione o SoundFont"
msgid "Select additional game directory"
msgstr "Seleccione uma directoria adicional para o jogo"
-#: gui/editgamedialog.cpp:502 gui/options.cpp:1930
+#: gui/editgamedialog.cpp:502 gui/options.cpp:1926
msgid "Select directory for saved games"
msgstr "Seleccione uma directoria para salvar o jogo"
@@ -504,7 +504,7 @@ msgstr "Seno"
msgid "Triangle"
msgstr "Triтngulo"
-#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1535
+#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1531
msgid "Misc"
msgstr "Vсrios"
@@ -684,7 +684,7 @@ msgid "Search:"
msgstr "Pesquisar:"
#: gui/launcher.cpp:200 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:517
+#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:533
#: engines/pegasus/pegasus.cpp:355 engines/tsage/scenes.cpp:601
#: engines/wage/saveload.cpp:748
msgid "Load game:"
@@ -694,7 +694,7 @@ msgstr "Carregar jogo:"
#: backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:105
-#: engines/mohawk/riven.cpp:517 engines/parallaction/saveload.cpp:194
+#: engines/mohawk/riven.cpp:533 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
msgid "Load"
@@ -812,569 +812,569 @@ msgstr "a cada 15 mins"
msgid "every 30 mins"
msgstr "a cada 30 mins"
-#: gui/options.cpp:343 gui/options.cpp:640 gui/options.cpp:778
-#: gui/options.cpp:853 gui/options.cpp:1114
+#: gui/options.cpp:339 gui/options.cpp:636 gui/options.cpp:774
+#: gui/options.cpp:849 gui/options.cpp:1110
msgctxt "soundfont"
msgid "None"
msgstr "Nenhuma"
-#: gui/options.cpp:514
+#: gui/options.cpp:510
msgid "Failed to apply some of the graphic options changes:"
msgstr "Falha ao aplicar algumas mudanчas nas opчѕes de grсficos:"
-#: gui/options.cpp:526
+#: gui/options.cpp:522
msgid "the video mode could not be changed."
msgstr "o modo de vэdeo nуo pєde ser alterado."
-#: gui/options.cpp:532
+#: gui/options.cpp:528
msgid "the aspect ratio setting could not be changed"
msgstr "a taxa de proporчуo nуo pєde ser alterada"
-#: gui/options.cpp:538
+#: gui/options.cpp:534
msgid "the fullscreen setting could not be changed"
msgstr "a configuraчуo de ecrу inteiro nуo pєde ser alterada"
-#: gui/options.cpp:544
+#: gui/options.cpp:540
msgid "the filtering setting could not be changed"
msgstr "a configuraчуo de filtragem nуo pєde ser alterada"
-#: gui/options.cpp:932
+#: gui/options.cpp:928
msgid "Show On-screen control"
msgstr ""
-#: gui/options.cpp:936
+#: gui/options.cpp:932
msgid "Touchpad mouse mode"
msgstr ""
-#: gui/options.cpp:940
+#: gui/options.cpp:936
msgid "Swap Menu and Back buttons"
msgstr ""
-#: gui/options.cpp:945
+#: gui/options.cpp:941
#, fuzzy
msgid "Pointer Speed:"
msgstr "Velocidade:"
-#: gui/options.cpp:945 gui/options.cpp:947 gui/options.cpp:948
+#: gui/options.cpp:941 gui/options.cpp:943 gui/options.cpp:944
msgid "Speed for keyboard/joystick mouse pointer control"
msgstr ""
-#: gui/options.cpp:947
+#: gui/options.cpp:943
#, fuzzy
msgctxt "lowres"
msgid "Pointer Speed:"
msgstr "Velocidade:"
-#: gui/options.cpp:958
+#: gui/options.cpp:954
msgid "Joy Deadzone:"
msgstr ""
-#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
+#: gui/options.cpp:954 gui/options.cpp:956 gui/options.cpp:957
msgid "Analog joystick Deadzone"
msgstr ""
-#: gui/options.cpp:960
+#: gui/options.cpp:956
msgctxt "lowres"
msgid "Joy Deadzone:"
msgstr ""
-#: gui/options.cpp:974
+#: gui/options.cpp:970
msgid "HW Shader:"
msgstr ""
-#: gui/options.cpp:974 gui/options.cpp:976
+#: gui/options.cpp:970 gui/options.cpp:972
msgid "Different hardware shaders give different visual effects"
msgstr ""
-#: gui/options.cpp:976
+#: gui/options.cpp:972
msgctxt "lowres"
msgid "HW Shader:"
msgstr ""
-#: gui/options.cpp:977
+#: gui/options.cpp:973
msgid "Different shaders give different visual effects"
msgstr ""
-#: gui/options.cpp:994
+#: gui/options.cpp:990
msgid "Graphics mode:"
msgstr "Modelo de grсficos:"
-#: gui/options.cpp:1008
+#: gui/options.cpp:1004
msgid "Render mode:"
msgstr "Renderizaчуo:"
-#: gui/options.cpp:1008 gui/options.cpp:1009
+#: gui/options.cpp:1004 gui/options.cpp:1005
msgid "Special dithering modes supported by some games"
msgstr "Modos especiais de pontilhado suportados por alguns jogos"
-#: gui/options.cpp:1020 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
+#: gui/options.cpp:1016 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2590
msgid "Fullscreen mode"
msgstr "Modo de ecrу inteiro"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Filter graphics"
msgstr "Filtros grсficos"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Use linear filtering when scaling graphics"
msgstr "Usar filtragem linear quando dimensionar grсficos"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Aspect ratio correction"
msgstr "Correчуo da taxa de proporчуo"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Correct aspect ratio for 320x200 games"
msgstr "Corrigir taxa de proporчуo em jogos de 320x200"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Preferred Device:"
msgstr "Dispositivo Preferido:"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Music Device:"
msgstr "Dispositivo de Mњsica:"
-#: gui/options.cpp:1034 gui/options.cpp:1036
+#: gui/options.cpp:1030 gui/options.cpp:1032
msgid "Specifies preferred sound device or sound card emulator"
msgstr "Especifica dispositivo sonoro ou emulador de placa sonora preferida"
-#: gui/options.cpp:1034 gui/options.cpp:1036 gui/options.cpp:1037
+#: gui/options.cpp:1030 gui/options.cpp:1032 gui/options.cpp:1033
msgid "Specifies output sound device or sound card emulator"
msgstr ""
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr ""
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Music Device:"
msgstr ""
-#: gui/options.cpp:1063
+#: gui/options.cpp:1059
msgid "AdLib emulator:"
msgstr "Emulador AdLib:"
-#: gui/options.cpp:1063 gui/options.cpp:1064
+#: gui/options.cpp:1059 gui/options.cpp:1060
msgid "AdLib is used for music in many games"
msgstr "AdLib щ usado para mњsica em vсrios jogos"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "GM Device:"
msgstr ""
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "Specifies default sound device for General MIDI output"
msgstr ""
-#: gui/options.cpp:1088
+#: gui/options.cpp:1084
msgid "Don't use General MIDI music"
msgstr ""
-#: gui/options.cpp:1099 gui/options.cpp:1161
+#: gui/options.cpp:1095 gui/options.cpp:1157
msgid "Use first available device"
msgstr ""
-#: gui/options.cpp:1111
+#: gui/options.cpp:1107
msgid "SoundFont:"
msgstr ""
-#: gui/options.cpp:1111 gui/options.cpp:1113 gui/options.cpp:1114
+#: gui/options.cpp:1107 gui/options.cpp:1109 gui/options.cpp:1110
msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity"
msgstr ""
-#: gui/options.cpp:1113
+#: gui/options.cpp:1109
msgctxt "lowres"
msgid "SoundFont:"
msgstr ""
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Mixed AdLib/MIDI mode"
msgstr ""
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Use both MIDI and AdLib sound generation"
msgstr ""
-#: gui/options.cpp:1122
+#: gui/options.cpp:1118
msgid "MIDI gain:"
msgstr ""
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "MT-32 Device:"
msgstr ""
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
-#: gui/options.cpp:1137
+#: gui/options.cpp:1133
msgid "True Roland MT-32 (disable GM emulation)"
msgstr ""
-#: gui/options.cpp:1137 gui/options.cpp:1139
+#: gui/options.cpp:1133 gui/options.cpp:1135
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
msgstr ""
-#: gui/options.cpp:1139
+#: gui/options.cpp:1135
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr ""
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid "Roland GS Device (enable MT-32 mappings)"
msgstr ""
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid ""
"Check if you want to enable patch mappings to emulate an MT-32 on a Roland "
"GS device"
msgstr ""
-#: gui/options.cpp:1151
+#: gui/options.cpp:1147
msgid "Don't use Roland MT-32 music"
msgstr ""
-#: gui/options.cpp:1178
+#: gui/options.cpp:1174
msgid "Text and Speech:"
msgstr ""
-#: gui/options.cpp:1182 gui/options.cpp:1192
+#: gui/options.cpp:1178 gui/options.cpp:1188
msgid "Speech"
msgstr ""
-#: gui/options.cpp:1183 gui/options.cpp:1193
+#: gui/options.cpp:1179 gui/options.cpp:1189
msgid "Subtitles"
msgstr ""
-#: gui/options.cpp:1184
+#: gui/options.cpp:1180
msgid "Both"
msgstr ""
-#: gui/options.cpp:1186
+#: gui/options.cpp:1182
msgid "Subtitle speed:"
msgstr ""
-#: gui/options.cpp:1188
+#: gui/options.cpp:1184
msgctxt "lowres"
msgid "Text and Speech:"
msgstr ""
-#: gui/options.cpp:1192
+#: gui/options.cpp:1188
msgid "Spch"
msgstr ""
-#: gui/options.cpp:1193
+#: gui/options.cpp:1189
msgid "Subs"
msgstr ""
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgctxt "lowres"
msgid "Both"
msgstr ""
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgid "Show subtitles and play speech"
msgstr ""
-#: gui/options.cpp:1196
+#: gui/options.cpp:1192
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr ""
-#: gui/options.cpp:1212
+#: gui/options.cpp:1208
msgid "Music volume:"
msgstr ""
-#: gui/options.cpp:1214
+#: gui/options.cpp:1210
msgctxt "lowres"
msgid "Music volume:"
msgstr ""
-#: gui/options.cpp:1221
+#: gui/options.cpp:1217
msgid "Mute All"
msgstr ""
-#: gui/options.cpp:1224
+#: gui/options.cpp:1220
msgid "SFX volume:"
msgstr ""
-#: gui/options.cpp:1224 gui/options.cpp:1226 gui/options.cpp:1227
+#: gui/options.cpp:1220 gui/options.cpp:1222 gui/options.cpp:1223
msgid "Special sound effects volume"
msgstr ""
-#: gui/options.cpp:1226
+#: gui/options.cpp:1222
msgctxt "lowres"
msgid "SFX volume:"
msgstr ""
-#: gui/options.cpp:1234
+#: gui/options.cpp:1230
msgid "Speech volume:"
msgstr ""
-#: gui/options.cpp:1236
+#: gui/options.cpp:1232
msgctxt "lowres"
msgid "Speech volume:"
msgstr ""
-#: gui/options.cpp:1438
+#: gui/options.cpp:1434
msgid "Shader"
msgstr ""
-#: gui/options.cpp:1450
+#: gui/options.cpp:1446
msgid "Control"
msgstr ""
-#: gui/options.cpp:1476
+#: gui/options.cpp:1472
msgid "FluidSynth Settings"
msgstr ""
-#: gui/options.cpp:1507
+#: gui/options.cpp:1503
msgid "Theme Path:"
msgstr ""
-#: gui/options.cpp:1509
+#: gui/options.cpp:1505
msgctxt "lowres"
msgid "Theme Path:"
msgstr ""
-#: gui/options.cpp:1515 gui/options.cpp:1517 gui/options.cpp:1518
+#: gui/options.cpp:1511 gui/options.cpp:1513 gui/options.cpp:1514
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr ""
-#: gui/options.cpp:1524
+#: gui/options.cpp:1520
msgid "Plugins Path:"
msgstr ""
-#: gui/options.cpp:1526
+#: gui/options.cpp:1522
msgctxt "lowres"
msgid "Plugins Path:"
msgstr ""
-#: gui/options.cpp:1537
+#: gui/options.cpp:1533
msgctxt "lowres"
msgid "Misc"
msgstr ""
-#: gui/options.cpp:1539
+#: gui/options.cpp:1535
msgid "Theme:"
msgstr ""
-#: gui/options.cpp:1543
+#: gui/options.cpp:1539
msgid "GUI Renderer:"
msgstr ""
-#: gui/options.cpp:1555
+#: gui/options.cpp:1551
msgid "Autosave:"
msgstr ""
-#: gui/options.cpp:1557
+#: gui/options.cpp:1553
msgctxt "lowres"
msgid "Autosave:"
msgstr ""
-#: gui/options.cpp:1565
+#: gui/options.cpp:1561
msgid "Keys"
msgstr ""
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "GUI Language:"
msgstr ""
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "Language of ScummVM GUI"
msgstr ""
-#: gui/options.cpp:1600 gui/updates-dialog.cpp:86
+#: gui/options.cpp:1596 gui/updates-dialog.cpp:86
msgid "Update check:"
msgstr ""
-#: gui/options.cpp:1600
+#: gui/options.cpp:1596
msgid "How often to check ScummVM updates"
msgstr ""
-#: gui/options.cpp:1612
+#: gui/options.cpp:1608
msgid "Check now"
msgstr ""
-#: gui/options.cpp:1620
+#: gui/options.cpp:1616
msgid "Cloud"
msgstr ""
-#: gui/options.cpp:1622
+#: gui/options.cpp:1618
msgctxt "lowres"
msgid "Cloud"
msgstr ""
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Storage:"
msgstr ""
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Active cloud storage"
msgstr ""
-#: gui/options.cpp:1634 gui/options.cpp:2210
+#: gui/options.cpp:1630 gui/options.cpp:2206
msgid "<none>"
msgstr ""
-#: gui/options.cpp:1638 backends/platform/wii/options.cpp:114
+#: gui/options.cpp:1634 backends/platform/wii/options.cpp:114
msgid "Username:"
msgstr ""
-#: gui/options.cpp:1638
+#: gui/options.cpp:1634
msgid "Username used by this storage"
msgstr ""
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Used space:"
msgstr ""
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Space used by ScummVM's saved games on this storage"
msgstr ""
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "Last sync time:"
msgstr ""
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "When the last saved games sync for this storage occured"
msgstr ""
-#: gui/options.cpp:1647 gui/storagewizarddialog.cpp:71
+#: gui/options.cpp:1643 gui/storagewizarddialog.cpp:71
msgid "Connect"
msgstr ""
-#: gui/options.cpp:1647
+#: gui/options.cpp:1643
msgid "Open wizard dialog to connect your cloud storage account"
msgstr ""
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh"
msgstr ""
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh current cloud storage information (username and usage)"
msgstr ""
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Download"
msgstr ""
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Open downloads manager dialog"
msgstr ""
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run server"
msgstr ""
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run local webserver"
msgstr ""
-#: gui/options.cpp:1652 gui/options.cpp:2320
+#: gui/options.cpp:1648 gui/options.cpp:2316
msgid "Not running"
msgstr ""
-#: gui/options.cpp:1656
+#: gui/options.cpp:1652
msgid "/root/ Path:"
msgstr ""
-#: gui/options.cpp:1656 gui/options.cpp:1658 gui/options.cpp:1659
+#: gui/options.cpp:1652 gui/options.cpp:1654 gui/options.cpp:1655
msgid "Specifies which directory the Files Manager can access"
msgstr ""
-#: gui/options.cpp:1658
+#: gui/options.cpp:1654
msgctxt "lowres"
msgid "/root/ Path:"
msgstr ""
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid "Server's port:"
msgstr ""
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid ""
"Which port is used by the server\n"
"Auth with server is not available with non-default port"
msgstr ""
-#: gui/options.cpp:1681
+#: gui/options.cpp:1677
msgid "Apply"
msgstr ""
-#: gui/options.cpp:1824
+#: gui/options.cpp:1820
msgid "Failed to change cloud storage!"
msgstr ""
-#: gui/options.cpp:1827
+#: gui/options.cpp:1823
msgid "Another cloud storage is already active."
msgstr ""
-#: gui/options.cpp:1895
+#: gui/options.cpp:1891
#, fuzzy
msgid "Theme does not support selected language!"
msgstr "Este jogo nуo permite carregar jogos a partir do menu principal."
-#: gui/options.cpp:1898
+#: gui/options.cpp:1894
msgid "Theme cannot be loaded!"
msgstr ""
-#: gui/options.cpp:1901
+#: gui/options.cpp:1897
msgid ""
"\n"
"Misc settings will be restored."
msgstr ""
-#: gui/options.cpp:1937
+#: gui/options.cpp:1933
msgid "The chosen directory cannot be written to. Please select another one."
msgstr ""
-#: gui/options.cpp:1946
+#: gui/options.cpp:1942
msgid "Select directory for GUI themes"
msgstr ""
-#: gui/options.cpp:1956
+#: gui/options.cpp:1952
msgid "Select directory for extra files"
msgstr ""
-#: gui/options.cpp:1967
+#: gui/options.cpp:1963
msgid "Select directory for plugins"
msgstr ""
-#: gui/options.cpp:1979
+#: gui/options.cpp:1975
msgid "Select directory for Files Manager /root/"
msgstr ""
-#: gui/options.cpp:2217
+#: gui/options.cpp:2213
#, c-format
msgid "%llu bytes"
msgstr ""
-#: gui/options.cpp:2225
+#: gui/options.cpp:2221
msgid "<right now>"
msgstr ""
-#: gui/options.cpp:2227
+#: gui/options.cpp:2223
msgid "<never>"
msgstr ""
-#: gui/options.cpp:2311
+#: gui/options.cpp:2307
msgid "Stop server"
msgstr ""
-#: gui/options.cpp:2312
+#: gui/options.cpp:2308
msgid "Stop local webserver"
msgstr ""
-#: gui/options.cpp:2403
+#: gui/options.cpp:2399
msgid ""
"Request failed.\n"
"Check your Internet connection."
@@ -1831,8 +1831,8 @@ msgstr ""
#: 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:106
-#: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:658
+#: engines/mohawk/riven.cpp:545 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
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
#: engines/toon/toon.cpp:3340 engines/tsage/scenes.cpp:599
@@ -1851,9 +1851,9 @@ msgstr ""
#: engines/dm/loadsave.cpp:196 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:106 engines/neverhood/menumodule.cpp:880
-#: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:659
+#: engines/mohawk/dialogs.cpp:106 engines/mohawk/riven.cpp:545
+#: 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
#: engines/sherlock/scalpel/scalpel.cpp:1250
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
@@ -2135,7 +2135,7 @@ msgstr ""
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr ""
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
msgid "Do you want to quit ?"
msgstr ""
@@ -3237,7 +3237,7 @@ msgid ""
"works."
msgstr ""
-#: engines/mohawk/riven.cpp:416
+#: engines/mohawk/riven.cpp:432
msgid "You are missing the following required Riven data files:\n"
msgstr ""
diff --git a/po/ru_RU.po b/po/ru_RU.po
index dfe33e2a26..36f9deecef 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: 2017-12-10 15:25+0100\n"
+"POT-Creation-Date: 2017-12-26 21:11+0100\n"
"PO-Revision-Date: 2017-11-28 17:59+0300\n"
"Last-Translator: Ivan Lukyanov <greencis@mail.ru>\n"
"Language-Team: Russian <https://translations.scummvm.org/projects/scummvm/"
@@ -58,7 +58,7 @@ msgstr "Вверх"
#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editgamedialog.cpp:292
#: gui/editrecorddialog.cpp:67 gui/filebrowser-dialog.cpp:64
#: gui/fluidsynth-dialog.cpp:152 gui/KeysDialog.cpp:43 gui/massadd.cpp:95
-#: gui/options.cpp:1680 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
+#: gui/options.cpp:1676 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
#: gui/recorderdialog.cpp:155 gui/remotebrowser.cpp:59
#: gui/saveload-dialog.cpp:383 gui/saveload-dialog.cpp:445
#: gui/saveload-dialog.cpp:727 gui/saveload-dialog.cpp:1121
@@ -118,7 +118,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -131,7 +131,7 @@ msgstr "Да"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -154,7 +154,7 @@ msgstr ""
#: gui/downloaddialog.cpp:146 gui/editgamedialog.cpp:293
#: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:526
-#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1682
+#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1678
#: gui/saveload-dialog.cpp:1122 engines/engine.cpp:443 engines/engine.cpp:454
#: backends/platform/wii/options.cpp:47
#: backends/platform/wince/CELauncherDialog.cpp:54
@@ -239,8 +239,8 @@ msgid ""
msgstr ""
"Язык игры. Изменение этой настройки не превратит игру на английском в русскую"
-#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:997
-#: gui/options.cpp:1010 gui/options.cpp:1575 audio/null.cpp:41
+#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:993
+#: gui/options.cpp:1006 gui/options.cpp:1571 audio/null.cpp:41
msgid "<default>"
msgstr "<по умолчанию>"
@@ -262,11 +262,11 @@ msgstr "Платформа:"
msgid "Engine"
msgstr "Движок"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "Graphics"
msgstr "Графика"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "GFX"
msgstr "Грф"
@@ -279,7 +279,7 @@ msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Перекрыть глобальные установки графики"
-#: gui/editgamedialog.cpp:196 gui/options.cpp:1457
+#: gui/editgamedialog.cpp:196 gui/options.cpp:1453
msgid "Audio"
msgstr "Аудио"
@@ -292,11 +292,11 @@ msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Перекрыть глобальные установки аудио"
-#: gui/editgamedialog.cpp:210 gui/options.cpp:1462
+#: gui/editgamedialog.cpp:210 gui/options.cpp:1458
msgid "Volume"
msgstr "Громкость"
-#: gui/editgamedialog.cpp:212 gui/options.cpp:1464
+#: gui/editgamedialog.cpp:212 gui/options.cpp:1460
msgctxt "lowres"
msgid "Volume"
msgstr "Громк"
@@ -310,7 +310,7 @@ msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Перекрыть глобальные установки громкости"
-#: gui/editgamedialog.cpp:226 gui/options.cpp:1472
+#: gui/editgamedialog.cpp:226 gui/options.cpp:1468
msgid "MIDI"
msgstr "MIDI"
@@ -323,7 +323,7 @@ msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Перекрыть глобальные установки MIDI"
-#: gui/editgamedialog.cpp:241 gui/options.cpp:1482
+#: gui/editgamedialog.cpp:241 gui/options.cpp:1478
msgid "MT-32"
msgstr "MT-32"
@@ -336,11 +336,11 @@ msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Перекрыть глобальные установки MT-32"
-#: gui/editgamedialog.cpp:255 gui/options.cpp:1489
+#: gui/editgamedialog.cpp:255 gui/options.cpp:1485
msgid "Paths"
msgstr "Пути"
-#: gui/editgamedialog.cpp:257 gui/options.cpp:1491
+#: gui/editgamedialog.cpp:257 gui/options.cpp:1487
msgctxt "lowres"
msgid "Paths"
msgstr "Пути"
@@ -354,7 +354,7 @@ msgctxt "lowres"
msgid "Game Path:"
msgstr "Где игра:"
-#: gui/editgamedialog.cpp:271 gui/options.cpp:1515
+#: gui/editgamedialog.cpp:271 gui/options.cpp:1511
msgid "Extra Path:"
msgstr "Доп. путь:"
@@ -363,44 +363,44 @@ msgstr "Доп. путь:"
msgid "Specifies path to additional data used by the game"
msgstr "Указывает путь к дополнительным файлам данных для игры"
-#: gui/editgamedialog.cpp:273 gui/options.cpp:1517
+#: gui/editgamedialog.cpp:273 gui/options.cpp:1513
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Доп. путь:"
-#: gui/editgamedialog.cpp:280 gui/options.cpp:1499
+#: gui/editgamedialog.cpp:280 gui/options.cpp:1495
msgid "Save Path:"
msgstr "Сохранения игр:"
#: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282
-#: gui/editgamedialog.cpp:283 gui/options.cpp:1499 gui/options.cpp:1501
-#: gui/options.cpp:1502
+#: gui/editgamedialog.cpp:283 gui/options.cpp:1495 gui/options.cpp:1497
+#: gui/options.cpp:1498
msgid "Specifies where your saved games are put"
msgstr "Указывает путь к сохранениям игры"
-#: gui/editgamedialog.cpp:282 gui/options.cpp:1501
+#: gui/editgamedialog.cpp:282 gui/options.cpp:1497
msgctxt "lowres"
msgid "Save Path:"
msgstr "Путь сохр:"
#: gui/editgamedialog.cpp:301 gui/editgamedialog.cpp:398
-#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1510
-#: gui/options.cpp:1518 gui/options.cpp:1527 gui/options.cpp:1707
-#: gui/options.cpp:1713 gui/options.cpp:1721 gui/options.cpp:1744
-#: gui/options.cpp:1777 gui/options.cpp:1783 gui/options.cpp:1790
-#: gui/options.cpp:1798 gui/options.cpp:1993 gui/options.cpp:1996
-#: gui/options.cpp:2003 gui/options.cpp:2013
+#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1506
+#: gui/options.cpp:1514 gui/options.cpp:1523 gui/options.cpp:1703
+#: gui/options.cpp:1709 gui/options.cpp:1717 gui/options.cpp:1740
+#: gui/options.cpp:1773 gui/options.cpp:1779 gui/options.cpp:1786
+#: gui/options.cpp:1794 gui/options.cpp:1989 gui/options.cpp:1992
+#: gui/options.cpp:1999 gui/options.cpp:2009
msgctxt "path"
msgid "None"
msgstr "Не задан"
#: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404
-#: gui/editgamedialog.cpp:522 gui/options.cpp:1701 gui/options.cpp:1771
-#: gui/options.cpp:1999 backends/platform/wii/options.cpp:56
+#: gui/editgamedialog.cpp:522 gui/options.cpp:1697 gui/options.cpp:1767
+#: gui/options.cpp:1995 backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "По умолчанию"
-#: gui/editgamedialog.cpp:450 gui/options.cpp:2007
+#: gui/editgamedialog.cpp:450 gui/options.cpp:2003
msgid "Select SoundFont"
msgstr "Выберите SoundFont"
@@ -408,7 +408,7 @@ msgstr "Выберите SoundFont"
msgid "Select additional game directory"
msgstr "Выберите дополнительную директорию игры"
-#: gui/editgamedialog.cpp:502 gui/options.cpp:1930
+#: gui/editgamedialog.cpp:502 gui/options.cpp:1926
msgid "Select directory for saved games"
msgstr "Выберите директорию для сохранений"
@@ -501,7 +501,7 @@ msgstr "Синусоида"
msgid "Triangle"
msgstr "Треугольная"
-#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1535
+#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1531
msgid "Misc"
msgstr "Разное"
@@ -680,7 +680,7 @@ msgid "Search:"
msgstr "Поиск:"
#: gui/launcher.cpp:200 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:517
+#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:533
#: engines/pegasus/pegasus.cpp:355 engines/tsage/scenes.cpp:601
#: engines/wage/saveload.cpp:748
msgid "Load game:"
@@ -690,7 +690,7 @@ msgstr "Загрузить игру:"
#: backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:105
-#: engines/mohawk/riven.cpp:517 engines/parallaction/saveload.cpp:194
+#: engines/mohawk/riven.cpp:533 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
msgid "Load"
@@ -801,212 +801,212 @@ msgstr "каждые 15 минут"
msgid "every 30 mins"
msgstr "каждые 30 минут"
-#: gui/options.cpp:343 gui/options.cpp:640 gui/options.cpp:778
-#: gui/options.cpp:853 gui/options.cpp:1114
+#: gui/options.cpp:339 gui/options.cpp:636 gui/options.cpp:774
+#: gui/options.cpp:849 gui/options.cpp:1110
msgctxt "soundfont"
msgid "None"
msgstr "Не задан"
-#: gui/options.cpp:514
+#: gui/options.cpp:510
msgid "Failed to apply some of the graphic options changes:"
msgstr "Не удалось применить изменения некоторых графических настроек:"
-#: gui/options.cpp:526
+#: gui/options.cpp:522
msgid "the video mode could not be changed."
msgstr "видеорежим не может быть изменён."
-#: gui/options.cpp:532
+#: gui/options.cpp:528
msgid "the aspect ratio setting could not be changed"
msgstr "режим корректировки соотношения сторон не может быть изменён"
-#: gui/options.cpp:538
+#: gui/options.cpp:534
msgid "the fullscreen setting could not be changed"
msgstr "полноэкранный режим не может быть изменён"
-#: gui/options.cpp:544
+#: gui/options.cpp:540
msgid "the filtering setting could not be changed"
msgstr "режим фильтрации не может быть изменён"
-#: gui/options.cpp:932
+#: gui/options.cpp:928
msgid "Show On-screen control"
msgstr "Показать управление экраном"
-#: gui/options.cpp:936
+#: gui/options.cpp:932
msgid "Touchpad mouse mode"
msgstr "Режим тачпада"
-#: gui/options.cpp:940
+#: gui/options.cpp:936
msgid "Swap Menu and Back buttons"
msgstr "Поменять местами кнопки Меню и Назад"
-#: gui/options.cpp:945
+#: gui/options.cpp:941
msgid "Pointer Speed:"
msgstr "Скорость указателя:"
-#: gui/options.cpp:945 gui/options.cpp:947 gui/options.cpp:948
+#: gui/options.cpp:941 gui/options.cpp:943 gui/options.cpp:944
msgid "Speed for keyboard/joystick mouse pointer control"
msgstr "Скорость для клавиш эмуляции мыши на клавиатуре/джойстике"
-#: gui/options.cpp:947
+#: gui/options.cpp:943
msgctxt "lowres"
msgid "Pointer Speed:"
msgstr "Скорость указателя:"
-#: gui/options.cpp:958
+#: gui/options.cpp:954
msgid "Joy Deadzone:"
msgstr "Мёртвая зона джойстика:"
-#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
+#: gui/options.cpp:954 gui/options.cpp:956 gui/options.cpp:957
msgid "Analog joystick Deadzone"
msgstr "Мёртвая зона аналогового джойстика"
-#: gui/options.cpp:960
+#: gui/options.cpp:956
msgctxt "lowres"
msgid "Joy Deadzone:"
msgstr "Мёртвая зона джойстика:"
-#: gui/options.cpp:974
+#: gui/options.cpp:970
msgid "HW Shader:"
msgstr "Аппаратный шейдер:"
-#: gui/options.cpp:974 gui/options.cpp:976
+#: gui/options.cpp:970 gui/options.cpp:972
msgid "Different hardware shaders give different visual effects"
msgstr "Различные аппаратные шейдеры дают различные зрительные эффекты"
-#: gui/options.cpp:976
+#: gui/options.cpp:972
msgctxt "lowres"
msgid "HW Shader:"
msgstr "Аппаратный шейдер:"
-#: gui/options.cpp:977
+#: gui/options.cpp:973
msgid "Different shaders give different visual effects"
msgstr "Различные шейдеры дают различные эффекты"
-#: gui/options.cpp:994
+#: gui/options.cpp:990
msgid "Graphics mode:"
msgstr "Граф. режим:"
-#: gui/options.cpp:1008
+#: gui/options.cpp:1004
msgid "Render mode:"
msgstr "Режим растра:"
-#: gui/options.cpp:1008 gui/options.cpp:1009
+#: gui/options.cpp:1004 gui/options.cpp:1005
msgid "Special dithering modes supported by some games"
msgstr "Специальные режимы рендеринга, поддерживаемые некоторыми играми"
-#: gui/options.cpp:1020 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
+#: gui/options.cpp:1016 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2590
msgid "Fullscreen mode"
msgstr "Полноэкранный режим"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Filter graphics"
msgstr "Фильтрование графики"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Use linear filtering when scaling graphics"
msgstr "Использовать линейную фильтрацию для увеличения разрешения"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Aspect ratio correction"
msgstr "Коррекция соотношения сторон"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Correct aspect ratio for 320x200 games"
msgstr "Корректировать соотношение сторон для игр с разрешением 320x200"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Preferred Device:"
msgstr "Предпочитаемое:"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Music Device:"
msgstr "Звуковое уст-во:"
-#: gui/options.cpp:1034 gui/options.cpp:1036
+#: gui/options.cpp:1030 gui/options.cpp:1032
msgid "Specifies preferred sound device or sound card emulator"
msgstr ""
"Указывает предпочитаемое звуковое устройство или эмулятор звуковой карты"
-#: gui/options.cpp:1034 gui/options.cpp:1036 gui/options.cpp:1037
+#: gui/options.cpp:1030 gui/options.cpp:1032 gui/options.cpp:1033
msgid "Specifies output sound device or sound card emulator"
msgstr "Указывает выходное звуковое устройство или эмулятор звуковой карты"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Предпочитаемое:"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Music Device:"
msgstr "Звуковое уст-во:"
-#: gui/options.cpp:1063
+#: gui/options.cpp:1059
msgid "AdLib emulator:"
msgstr "Эмулятор AdLib:"
-#: gui/options.cpp:1063 gui/options.cpp:1064
+#: gui/options.cpp:1059 gui/options.cpp:1060
msgid "AdLib is used for music in many games"
msgstr "Звуковая карта AdLib используется многими играми"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "GM Device:"
msgstr "Устройство GM:"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "Specifies default sound device for General MIDI output"
msgstr "Указывает выходное звуковое устройство для MIDI"
-#: gui/options.cpp:1088
+#: gui/options.cpp:1084
msgid "Don't use General MIDI music"
msgstr "Не использовать музыку для General MIDI"
-#: gui/options.cpp:1099 gui/options.cpp:1161
+#: gui/options.cpp:1095 gui/options.cpp:1157
msgid "Use first available device"
msgstr "Использовать первое доступное устройство"
-#: gui/options.cpp:1111
+#: gui/options.cpp:1107
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1111 gui/options.cpp:1113 gui/options.cpp:1114
+#: gui/options.cpp:1107 gui/options.cpp:1109 gui/options.cpp:1110
msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity"
msgstr ""
"SoundFont поддерживается некоторыми звуковыми картами, FluidSynth и Timidity"
-#: gui/options.cpp:1113
+#: gui/options.cpp:1109
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Mixed AdLib/MIDI mode"
msgstr "Смешанный режим AdLib/MIDI"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Use both MIDI and AdLib sound generation"
msgstr "Использовать и MIDI, и AdLib для генерации звука"
-#: gui/options.cpp:1122
+#: gui/options.cpp:1118
msgid "MIDI gain:"
msgstr "Усиление MIDI:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "MT-32 Device:"
msgstr "Устр. MT-32:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
"Указывает звуковое устройство по умолчанию для вывода на Roland MT-32/LAPC1/"
"CM32l/CM64"
-#: gui/options.cpp:1137
+#: gui/options.cpp:1133
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Настоящий Roland MT-32 (запретить эмуляцию GM)"
-#: gui/options.cpp:1137 gui/options.cpp:1139
+#: gui/options.cpp:1133 gui/options.cpp:1135
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -1014,16 +1014,16 @@ msgstr ""
"Отметьте, если у вас подключено Roland-совместимое звуковое устройство и вы "
"хотите его использовать"
-#: gui/options.cpp:1139
+#: gui/options.cpp:1135
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Настоящий Roland MT-32 (без эмуляции GM)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid "Roland GS Device (enable MT-32 mappings)"
msgstr "Устройство Roland GS (разрешить маппинг MT-32)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid ""
"Check if you want to enable patch mappings to emulate an MT-32 on a Roland "
"GS device"
@@ -1031,273 +1031,273 @@ msgstr ""
"Отметьте, если хотите разрешить маппинг для эмуляции MT-32 на устройстве "
"Roland GS"
-#: gui/options.cpp:1151
+#: gui/options.cpp:1147
msgid "Don't use Roland MT-32 music"
msgstr "Не использовать музыку для MT-32"
-#: gui/options.cpp:1178
+#: gui/options.cpp:1174
msgid "Text and Speech:"
msgstr "Текст и озвучка:"
-#: gui/options.cpp:1182 gui/options.cpp:1192
+#: gui/options.cpp:1178 gui/options.cpp:1188
msgid "Speech"
msgstr "Озвучка"
-#: gui/options.cpp:1183 gui/options.cpp:1193
+#: gui/options.cpp:1179 gui/options.cpp:1189
msgid "Subtitles"
msgstr "Субтитры"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1180
msgid "Both"
msgstr "Оба"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1182
msgid "Subtitle speed:"
msgstr "Скорость титров:"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1184
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Текст и озвучка:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1188
msgid "Spch"
msgstr "Озв"
-#: gui/options.cpp:1193
+#: gui/options.cpp:1189
msgid "Subs"
msgstr "Суб"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgctxt "lowres"
msgid "Both"
msgstr "Оба"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgid "Show subtitles and play speech"
msgstr "Показывать субтитры и воспроизводить речь"
-#: gui/options.cpp:1196
+#: gui/options.cpp:1192
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Скорость титров:"
-#: gui/options.cpp:1212
+#: gui/options.cpp:1208
msgid "Music volume:"
msgstr "Громк. музыки:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1210
msgctxt "lowres"
msgid "Music volume:"
msgstr "Громк. музыки:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1217
msgid "Mute All"
msgstr "Выкл. всё"
-#: gui/options.cpp:1224
+#: gui/options.cpp:1220
msgid "SFX volume:"
msgstr "Громкость SFX:"
-#: gui/options.cpp:1224 gui/options.cpp:1226 gui/options.cpp:1227
+#: gui/options.cpp:1220 gui/options.cpp:1222 gui/options.cpp:1223
msgid "Special sound effects volume"
msgstr "Громкость специальных звуковых эффектов"
-#: gui/options.cpp:1226
+#: gui/options.cpp:1222
msgctxt "lowres"
msgid "SFX volume:"
msgstr "Громк. SFX:"
-#: gui/options.cpp:1234
+#: gui/options.cpp:1230
msgid "Speech volume:"
msgstr "Громк. озвучки:"
-#: gui/options.cpp:1236
+#: gui/options.cpp:1232
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Громк. озвучки:"
-#: gui/options.cpp:1438
+#: gui/options.cpp:1434
msgid "Shader"
msgstr "Шейдер"
-#: gui/options.cpp:1450
+#: gui/options.cpp:1446
msgid "Control"
msgstr "Управление"
-#: gui/options.cpp:1476
+#: gui/options.cpp:1472
msgid "FluidSynth Settings"
msgstr "Настройки FluidSynth"
-#: gui/options.cpp:1507
+#: gui/options.cpp:1503
msgid "Theme Path:"
msgstr "Путь к темам:"
-#: gui/options.cpp:1509
+#: gui/options.cpp:1505
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Где темы:"
-#: gui/options.cpp:1515 gui/options.cpp:1517 gui/options.cpp:1518
+#: gui/options.cpp:1511 gui/options.cpp:1513 gui/options.cpp:1514
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr ""
"Указывает путь к дополнительным файлам данных, используемых всеми играми "
"либо ScummVM"
-#: gui/options.cpp:1524
+#: gui/options.cpp:1520
msgid "Plugins Path:"
msgstr "Путь к плагинам:"
-#: gui/options.cpp:1526
+#: gui/options.cpp:1522
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Путь к плагинам:"
-#: gui/options.cpp:1537
+#: gui/options.cpp:1533
msgctxt "lowres"
msgid "Misc"
msgstr "Разное"
-#: gui/options.cpp:1539
+#: gui/options.cpp:1535
msgid "Theme:"
msgstr "Тема:"
-#: gui/options.cpp:1543
+#: gui/options.cpp:1539
msgid "GUI Renderer:"
msgstr "Рисовалка GUI:"
-#: gui/options.cpp:1555
+#: gui/options.cpp:1551
msgid "Autosave:"
msgstr "Автосохранение:"
-#: gui/options.cpp:1557
+#: gui/options.cpp:1553
msgctxt "lowres"
msgid "Autosave:"
msgstr "Автосохр.:"
-#: gui/options.cpp:1565
+#: gui/options.cpp:1561
msgid "Keys"
msgstr "Клавиши"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "GUI Language:"
msgstr "Язык GUI:"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "Language of ScummVM GUI"
msgstr "Язык графического интерфейса ScummVM"
-#: gui/options.cpp:1600 gui/updates-dialog.cpp:86
+#: gui/options.cpp:1596 gui/updates-dialog.cpp:86
msgid "Update check:"
msgstr "Проверять обновления:"
-#: gui/options.cpp:1600
+#: gui/options.cpp:1596
msgid "How often to check ScummVM updates"
msgstr "Как часто проверять обновления ScummVM"
-#: gui/options.cpp:1612
+#: gui/options.cpp:1608
msgid "Check now"
msgstr "Проверить сейчас"
-#: gui/options.cpp:1620
+#: gui/options.cpp:1616
msgid "Cloud"
msgstr "Облако"
-#: gui/options.cpp:1622
+#: gui/options.cpp:1618
msgctxt "lowres"
msgid "Cloud"
msgstr "Облако"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Storage:"
msgstr "Облако:"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Active cloud storage"
msgstr "Активное облачное хранилище"
-#: gui/options.cpp:1634 gui/options.cpp:2210
+#: gui/options.cpp:1630 gui/options.cpp:2206
msgid "<none>"
msgstr "<нет>"
-#: gui/options.cpp:1638 backends/platform/wii/options.cpp:114
+#: gui/options.cpp:1634 backends/platform/wii/options.cpp:114
msgid "Username:"
msgstr "Пользователь:"
-#: gui/options.cpp:1638
+#: gui/options.cpp:1634
msgid "Username used by this storage"
msgstr "Имя пользователя в этом облаке"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Used space:"
msgstr "Используемый объём:"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Space used by ScummVM's saved games on this storage"
msgstr "Объём, занимаемый сохранениями игр ScummVM на этом облаке"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "Last sync time:"
msgstr "Последняя синхронизация:"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "When the last saved games sync for this storage occured"
msgstr "Когда производилась последняя синхронизация с этим облаком"
-#: gui/options.cpp:1647 gui/storagewizarddialog.cpp:71
+#: gui/options.cpp:1643 gui/storagewizarddialog.cpp:71
msgid "Connect"
msgstr "Подключить"
-#: gui/options.cpp:1647
+#: gui/options.cpp:1643
msgid "Open wizard dialog to connect your cloud storage account"
msgstr "Открывает диалог для установки подключения к облаку"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh"
msgstr "Обновить"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh current cloud storage information (username and usage)"
msgstr "Обновляет текущую информацию об облаке (имя пользователя и объём)"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Download"
msgstr "Загрузить"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Open downloads manager dialog"
msgstr "Открывает менеджер загрузок"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run server"
msgstr "Запустить сервер"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run local webserver"
msgstr "Запускает локальный веб-сервер"
-#: gui/options.cpp:1652 gui/options.cpp:2320
+#: gui/options.cpp:1648 gui/options.cpp:2316
msgid "Not running"
msgstr "Не запущен"
-#: gui/options.cpp:1656
+#: gui/options.cpp:1652
msgid "/root/ Path:"
msgstr "Корневая директория:"
-#: gui/options.cpp:1656 gui/options.cpp:1658 gui/options.cpp:1659
+#: gui/options.cpp:1652 gui/options.cpp:1654 gui/options.cpp:1655
msgid "Specifies which directory the Files Manager can access"
msgstr "Указывает путь к директории, куда будет иметь доступ менеджер файлов"
-#: gui/options.cpp:1658
+#: gui/options.cpp:1654
msgctxt "lowres"
msgid "/root/ Path:"
msgstr "Корень:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid "Server's port:"
msgstr "Порт сервера:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid ""
"Which port is used by the server\n"
"Auth with server is not available with non-default port"
@@ -1305,27 +1305,27 @@ msgstr ""
"Номер порта, используемый сервером\n"
"Установление доступа работает только с портом по умолчанию"
-#: gui/options.cpp:1681
+#: gui/options.cpp:1677
msgid "Apply"
msgstr "Применить"
-#: gui/options.cpp:1824
+#: gui/options.cpp:1820
msgid "Failed to change cloud storage!"
msgstr "Не удалось сменить облако!"
-#: gui/options.cpp:1827
+#: gui/options.cpp:1823
msgid "Another cloud storage is already active."
msgstr "Уже активно другое облачное хранилище."
-#: gui/options.cpp:1895
+#: gui/options.cpp:1891
msgid "Theme does not support selected language!"
msgstr "Тема не поддерживает выбранный язык!"
-#: gui/options.cpp:1898
+#: gui/options.cpp:1894
msgid "Theme cannot be loaded!"
msgstr "Невозможно загрузить тему!"
-#: gui/options.cpp:1901
+#: gui/options.cpp:1897
msgid ""
"\n"
"Misc settings will be restored."
@@ -1333,48 +1333,48 @@ msgstr ""
"\n"
"Настройки на закладке Разное будут восстановлены."
-#: gui/options.cpp:1937
+#: gui/options.cpp:1933
msgid "The chosen directory cannot be written to. Please select another one."
msgstr "Не могу писать в выбранную директорию. Пожалуйста, укажите другую."
-#: gui/options.cpp:1946
+#: gui/options.cpp:1942
msgid "Select directory for GUI themes"
msgstr "Выберите директорию для тем GUI"
-#: gui/options.cpp:1956
+#: gui/options.cpp:1952
msgid "Select directory for extra files"
msgstr "Выберите директорию с дополнительными файлами"
-#: gui/options.cpp:1967
+#: gui/options.cpp:1963
msgid "Select directory for plugins"
msgstr "Выберите директорию с плагинами"
-#: gui/options.cpp:1979
+#: gui/options.cpp:1975
msgid "Select directory for Files Manager /root/"
msgstr "Выберите директорию для корня в менеджере файлов"
-#: gui/options.cpp:2217
+#: gui/options.cpp:2213
#, c-format
msgid "%llu bytes"
msgstr "%llu байт"
-#: gui/options.cpp:2225
+#: gui/options.cpp:2221
msgid "<right now>"
msgstr "<сейчас>"
-#: gui/options.cpp:2227
+#: gui/options.cpp:2223
msgid "<never>"
msgstr "<никогда>"
-#: gui/options.cpp:2311
+#: gui/options.cpp:2307
msgid "Stop server"
msgstr "Остановить сервер"
-#: gui/options.cpp:2312
+#: gui/options.cpp:2308
msgid "Stop local webserver"
msgstr "Останавливает локальный веб-сервер"
-#: gui/options.cpp:2403
+#: gui/options.cpp:2399
msgid ""
"Request failed.\n"
"Check your Internet connection."
@@ -1844,8 +1844,8 @@ msgstr "~В~ главное меню"
#: 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:106
-#: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:658
+#: engines/mohawk/riven.cpp:545 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
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
#: engines/toon/toon.cpp:3340 engines/tsage/scenes.cpp:599
@@ -1864,9 +1864,9 @@ msgstr "Сохранить игру:"
#: engines/dm/loadsave.cpp:196 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:106 engines/neverhood/menumodule.cpp:880
-#: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:659
+#: engines/mohawk/dialogs.cpp:106 engines/mohawk/riven.cpp:545
+#: 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
#: engines/sherlock/scalpel/scalpel.cpp:1250
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
@@ -2181,7 +2181,7 @@ msgstr "Щелчки выключены"
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Режим 'касаний' тачскрина - Пролёт (клики DPad)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
msgid "Do you want to quit ?"
msgstr "Вы действительно хотите выйти?"
@@ -3338,7 +3338,7 @@ msgstr ""
"Не хватает файла 'extras.mhk'. Вместо него можно использовать файл 'arcriven."
"z'."
-#: engines/mohawk/riven.cpp:416
+#: engines/mohawk/riven.cpp:432
msgid "You are missing the following required Riven data files:\n"
msgstr "Не хватает следующих файлов игры Riven:\n"
diff --git a/po/scummvm.pot b/po/scummvm.pot
index 427afb5eb5..3ece34a704 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: 2017-12-10 15:25+0100\n"
+"POT-Creation-Date: 2017-12-26 21:11+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,7 +55,7 @@ msgstr ""
#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editgamedialog.cpp:292
#: gui/editrecorddialog.cpp:67 gui/filebrowser-dialog.cpp:64
#: gui/fluidsynth-dialog.cpp:152 gui/KeysDialog.cpp:43 gui/massadd.cpp:95
-#: gui/options.cpp:1680 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
+#: gui/options.cpp:1676 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
#: gui/recorderdialog.cpp:155 gui/remotebrowser.cpp:59
#: gui/saveload-dialog.cpp:383 gui/saveload-dialog.cpp:445
#: gui/saveload-dialog.cpp:727 gui/saveload-dialog.cpp:1121
@@ -113,7 +113,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -126,7 +126,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -147,7 +147,7 @@ msgstr ""
#: gui/downloaddialog.cpp:146 gui/editgamedialog.cpp:293
#: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:526
-#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1682
+#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1678
#: gui/saveload-dialog.cpp:1122 engines/engine.cpp:443 engines/engine.cpp:454
#: backends/platform/wii/options.cpp:47
#: backends/platform/wince/CELauncherDialog.cpp:54
@@ -227,8 +227,8 @@ msgid ""
"English"
msgstr ""
-#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:997
-#: gui/options.cpp:1010 gui/options.cpp:1575 audio/null.cpp:41
+#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:993
+#: gui/options.cpp:1006 gui/options.cpp:1571 audio/null.cpp:41
msgid "<default>"
msgstr ""
@@ -250,11 +250,11 @@ msgstr ""
msgid "Engine"
msgstr ""
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "Graphics"
msgstr ""
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "GFX"
msgstr ""
@@ -267,7 +267,7 @@ msgctxt "lowres"
msgid "Override global graphic settings"
msgstr ""
-#: gui/editgamedialog.cpp:196 gui/options.cpp:1457
+#: gui/editgamedialog.cpp:196 gui/options.cpp:1453
msgid "Audio"
msgstr ""
@@ -280,11 +280,11 @@ msgctxt "lowres"
msgid "Override global audio settings"
msgstr ""
-#: gui/editgamedialog.cpp:210 gui/options.cpp:1462
+#: gui/editgamedialog.cpp:210 gui/options.cpp:1458
msgid "Volume"
msgstr ""
-#: gui/editgamedialog.cpp:212 gui/options.cpp:1464
+#: gui/editgamedialog.cpp:212 gui/options.cpp:1460
msgctxt "lowres"
msgid "Volume"
msgstr ""
@@ -298,7 +298,7 @@ msgctxt "lowres"
msgid "Override global volume settings"
msgstr ""
-#: gui/editgamedialog.cpp:226 gui/options.cpp:1472
+#: gui/editgamedialog.cpp:226 gui/options.cpp:1468
msgid "MIDI"
msgstr ""
@@ -311,7 +311,7 @@ msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr ""
-#: gui/editgamedialog.cpp:241 gui/options.cpp:1482
+#: gui/editgamedialog.cpp:241 gui/options.cpp:1478
msgid "MT-32"
msgstr ""
@@ -324,11 +324,11 @@ msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr ""
-#: gui/editgamedialog.cpp:255 gui/options.cpp:1489
+#: gui/editgamedialog.cpp:255 gui/options.cpp:1485
msgid "Paths"
msgstr ""
-#: gui/editgamedialog.cpp:257 gui/options.cpp:1491
+#: gui/editgamedialog.cpp:257 gui/options.cpp:1487
msgctxt "lowres"
msgid "Paths"
msgstr ""
@@ -342,7 +342,7 @@ msgctxt "lowres"
msgid "Game Path:"
msgstr ""
-#: gui/editgamedialog.cpp:271 gui/options.cpp:1515
+#: gui/editgamedialog.cpp:271 gui/options.cpp:1511
msgid "Extra Path:"
msgstr ""
@@ -351,44 +351,44 @@ msgstr ""
msgid "Specifies path to additional data used by the game"
msgstr ""
-#: gui/editgamedialog.cpp:273 gui/options.cpp:1517
+#: gui/editgamedialog.cpp:273 gui/options.cpp:1513
msgctxt "lowres"
msgid "Extra Path:"
msgstr ""
-#: gui/editgamedialog.cpp:280 gui/options.cpp:1499
+#: gui/editgamedialog.cpp:280 gui/options.cpp:1495
msgid "Save Path:"
msgstr ""
#: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282
-#: gui/editgamedialog.cpp:283 gui/options.cpp:1499 gui/options.cpp:1501
-#: gui/options.cpp:1502
+#: gui/editgamedialog.cpp:283 gui/options.cpp:1495 gui/options.cpp:1497
+#: gui/options.cpp:1498
msgid "Specifies where your saved games are put"
msgstr ""
-#: gui/editgamedialog.cpp:282 gui/options.cpp:1501
+#: gui/editgamedialog.cpp:282 gui/options.cpp:1497
msgctxt "lowres"
msgid "Save Path:"
msgstr ""
#: gui/editgamedialog.cpp:301 gui/editgamedialog.cpp:398
-#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1510
-#: gui/options.cpp:1518 gui/options.cpp:1527 gui/options.cpp:1707
-#: gui/options.cpp:1713 gui/options.cpp:1721 gui/options.cpp:1744
-#: gui/options.cpp:1777 gui/options.cpp:1783 gui/options.cpp:1790
-#: gui/options.cpp:1798 gui/options.cpp:1993 gui/options.cpp:1996
-#: gui/options.cpp:2003 gui/options.cpp:2013
+#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1506
+#: gui/options.cpp:1514 gui/options.cpp:1523 gui/options.cpp:1703
+#: gui/options.cpp:1709 gui/options.cpp:1717 gui/options.cpp:1740
+#: gui/options.cpp:1773 gui/options.cpp:1779 gui/options.cpp:1786
+#: gui/options.cpp:1794 gui/options.cpp:1989 gui/options.cpp:1992
+#: gui/options.cpp:1999 gui/options.cpp:2009
msgctxt "path"
msgid "None"
msgstr ""
#: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404
-#: gui/editgamedialog.cpp:522 gui/options.cpp:1701 gui/options.cpp:1771
-#: gui/options.cpp:1999 backends/platform/wii/options.cpp:56
+#: gui/editgamedialog.cpp:522 gui/options.cpp:1697 gui/options.cpp:1767
+#: gui/options.cpp:1995 backends/platform/wii/options.cpp:56
msgid "Default"
msgstr ""
-#: gui/editgamedialog.cpp:450 gui/options.cpp:2007
+#: gui/editgamedialog.cpp:450 gui/options.cpp:2003
msgid "Select SoundFont"
msgstr ""
@@ -396,7 +396,7 @@ msgstr ""
msgid "Select additional game directory"
msgstr ""
-#: gui/editgamedialog.cpp:502 gui/options.cpp:1930
+#: gui/editgamedialog.cpp:502 gui/options.cpp:1926
msgid "Select directory for saved games"
msgstr ""
@@ -486,7 +486,7 @@ msgstr ""
msgid "Triangle"
msgstr ""
-#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1535
+#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1531
msgid "Misc"
msgstr ""
@@ -663,7 +663,7 @@ msgid "Search:"
msgstr ""
#: gui/launcher.cpp:200 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:517
+#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:533
#: engines/pegasus/pegasus.cpp:355 engines/tsage/scenes.cpp:601
#: engines/wage/saveload.cpp:748
msgid "Load game:"
@@ -673,7 +673,7 @@ msgstr ""
#: backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:105
-#: engines/mohawk/riven.cpp:517 engines/parallaction/saveload.cpp:194
+#: engines/mohawk/riven.cpp:533 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
msgid "Load"
@@ -780,566 +780,566 @@ msgstr ""
msgid "every 30 mins"
msgstr ""
-#: gui/options.cpp:343 gui/options.cpp:640 gui/options.cpp:778
-#: gui/options.cpp:853 gui/options.cpp:1114
+#: gui/options.cpp:339 gui/options.cpp:636 gui/options.cpp:774
+#: gui/options.cpp:849 gui/options.cpp:1110
msgctxt "soundfont"
msgid "None"
msgstr ""
-#: gui/options.cpp:514
+#: gui/options.cpp:510
msgid "Failed to apply some of the graphic options changes:"
msgstr ""
-#: gui/options.cpp:526
+#: gui/options.cpp:522
msgid "the video mode could not be changed."
msgstr ""
-#: gui/options.cpp:532
+#: gui/options.cpp:528
msgid "the aspect ratio setting could not be changed"
msgstr ""
-#: gui/options.cpp:538
+#: gui/options.cpp:534
msgid "the fullscreen setting could not be changed"
msgstr ""
-#: gui/options.cpp:544
+#: gui/options.cpp:540
msgid "the filtering setting could not be changed"
msgstr ""
-#: gui/options.cpp:932
+#: gui/options.cpp:928
msgid "Show On-screen control"
msgstr ""
-#: gui/options.cpp:936
+#: gui/options.cpp:932
msgid "Touchpad mouse mode"
msgstr ""
-#: gui/options.cpp:940
+#: gui/options.cpp:936
msgid "Swap Menu and Back buttons"
msgstr ""
-#: gui/options.cpp:945
+#: gui/options.cpp:941
msgid "Pointer Speed:"
msgstr ""
-#: gui/options.cpp:945 gui/options.cpp:947 gui/options.cpp:948
+#: gui/options.cpp:941 gui/options.cpp:943 gui/options.cpp:944
msgid "Speed for keyboard/joystick mouse pointer control"
msgstr ""
-#: gui/options.cpp:947
+#: gui/options.cpp:943
msgctxt "lowres"
msgid "Pointer Speed:"
msgstr ""
-#: gui/options.cpp:958
+#: gui/options.cpp:954
msgid "Joy Deadzone:"
msgstr ""
-#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
+#: gui/options.cpp:954 gui/options.cpp:956 gui/options.cpp:957
msgid "Analog joystick Deadzone"
msgstr ""
-#: gui/options.cpp:960
+#: gui/options.cpp:956
msgctxt "lowres"
msgid "Joy Deadzone:"
msgstr ""
-#: gui/options.cpp:974
+#: gui/options.cpp:970
msgid "HW Shader:"
msgstr ""
-#: gui/options.cpp:974 gui/options.cpp:976
+#: gui/options.cpp:970 gui/options.cpp:972
msgid "Different hardware shaders give different visual effects"
msgstr ""
-#: gui/options.cpp:976
+#: gui/options.cpp:972
msgctxt "lowres"
msgid "HW Shader:"
msgstr ""
-#: gui/options.cpp:977
+#: gui/options.cpp:973
msgid "Different shaders give different visual effects"
msgstr ""
-#: gui/options.cpp:994
+#: gui/options.cpp:990
msgid "Graphics mode:"
msgstr ""
-#: gui/options.cpp:1008
+#: gui/options.cpp:1004
msgid "Render mode:"
msgstr ""
-#: gui/options.cpp:1008 gui/options.cpp:1009
+#: gui/options.cpp:1004 gui/options.cpp:1005
msgid "Special dithering modes supported by some games"
msgstr ""
-#: gui/options.cpp:1020 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
+#: gui/options.cpp:1016 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2590
msgid "Fullscreen mode"
msgstr ""
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Filter graphics"
msgstr ""
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Use linear filtering when scaling graphics"
msgstr ""
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Aspect ratio correction"
msgstr ""
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Correct aspect ratio for 320x200 games"
msgstr ""
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Preferred Device:"
msgstr ""
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Music Device:"
msgstr ""
-#: gui/options.cpp:1034 gui/options.cpp:1036
+#: gui/options.cpp:1030 gui/options.cpp:1032
msgid "Specifies preferred sound device or sound card emulator"
msgstr ""
-#: gui/options.cpp:1034 gui/options.cpp:1036 gui/options.cpp:1037
+#: gui/options.cpp:1030 gui/options.cpp:1032 gui/options.cpp:1033
msgid "Specifies output sound device or sound card emulator"
msgstr ""
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr ""
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Music Device:"
msgstr ""
-#: gui/options.cpp:1063
+#: gui/options.cpp:1059
msgid "AdLib emulator:"
msgstr ""
-#: gui/options.cpp:1063 gui/options.cpp:1064
+#: gui/options.cpp:1059 gui/options.cpp:1060
msgid "AdLib is used for music in many games"
msgstr ""
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "GM Device:"
msgstr ""
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "Specifies default sound device for General MIDI output"
msgstr ""
-#: gui/options.cpp:1088
+#: gui/options.cpp:1084
msgid "Don't use General MIDI music"
msgstr ""
-#: gui/options.cpp:1099 gui/options.cpp:1161
+#: gui/options.cpp:1095 gui/options.cpp:1157
msgid "Use first available device"
msgstr ""
-#: gui/options.cpp:1111
+#: gui/options.cpp:1107
msgid "SoundFont:"
msgstr ""
-#: gui/options.cpp:1111 gui/options.cpp:1113 gui/options.cpp:1114
+#: gui/options.cpp:1107 gui/options.cpp:1109 gui/options.cpp:1110
msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity"
msgstr ""
-#: gui/options.cpp:1113
+#: gui/options.cpp:1109
msgctxt "lowres"
msgid "SoundFont:"
msgstr ""
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Mixed AdLib/MIDI mode"
msgstr ""
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Use both MIDI and AdLib sound generation"
msgstr ""
-#: gui/options.cpp:1122
+#: gui/options.cpp:1118
msgid "MIDI gain:"
msgstr ""
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "MT-32 Device:"
msgstr ""
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
-#: gui/options.cpp:1137
+#: gui/options.cpp:1133
msgid "True Roland MT-32 (disable GM emulation)"
msgstr ""
-#: gui/options.cpp:1137 gui/options.cpp:1139
+#: gui/options.cpp:1133 gui/options.cpp:1135
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
msgstr ""
-#: gui/options.cpp:1139
+#: gui/options.cpp:1135
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr ""
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid "Roland GS Device (enable MT-32 mappings)"
msgstr ""
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid ""
"Check if you want to enable patch mappings to emulate an MT-32 on a Roland "
"GS device"
msgstr ""
-#: gui/options.cpp:1151
+#: gui/options.cpp:1147
msgid "Don't use Roland MT-32 music"
msgstr ""
-#: gui/options.cpp:1178
+#: gui/options.cpp:1174
msgid "Text and Speech:"
msgstr ""
-#: gui/options.cpp:1182 gui/options.cpp:1192
+#: gui/options.cpp:1178 gui/options.cpp:1188
msgid "Speech"
msgstr ""
-#: gui/options.cpp:1183 gui/options.cpp:1193
+#: gui/options.cpp:1179 gui/options.cpp:1189
msgid "Subtitles"
msgstr ""
-#: gui/options.cpp:1184
+#: gui/options.cpp:1180
msgid "Both"
msgstr ""
-#: gui/options.cpp:1186
+#: gui/options.cpp:1182
msgid "Subtitle speed:"
msgstr ""
-#: gui/options.cpp:1188
+#: gui/options.cpp:1184
msgctxt "lowres"
msgid "Text and Speech:"
msgstr ""
-#: gui/options.cpp:1192
+#: gui/options.cpp:1188
msgid "Spch"
msgstr ""
-#: gui/options.cpp:1193
+#: gui/options.cpp:1189
msgid "Subs"
msgstr ""
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgctxt "lowres"
msgid "Both"
msgstr ""
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgid "Show subtitles and play speech"
msgstr ""
-#: gui/options.cpp:1196
+#: gui/options.cpp:1192
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr ""
-#: gui/options.cpp:1212
+#: gui/options.cpp:1208
msgid "Music volume:"
msgstr ""
-#: gui/options.cpp:1214
+#: gui/options.cpp:1210
msgctxt "lowres"
msgid "Music volume:"
msgstr ""
-#: gui/options.cpp:1221
+#: gui/options.cpp:1217
msgid "Mute All"
msgstr ""
-#: gui/options.cpp:1224
+#: gui/options.cpp:1220
msgid "SFX volume:"
msgstr ""
-#: gui/options.cpp:1224 gui/options.cpp:1226 gui/options.cpp:1227
+#: gui/options.cpp:1220 gui/options.cpp:1222 gui/options.cpp:1223
msgid "Special sound effects volume"
msgstr ""
-#: gui/options.cpp:1226
+#: gui/options.cpp:1222
msgctxt "lowres"
msgid "SFX volume:"
msgstr ""
-#: gui/options.cpp:1234
+#: gui/options.cpp:1230
msgid "Speech volume:"
msgstr ""
-#: gui/options.cpp:1236
+#: gui/options.cpp:1232
msgctxt "lowres"
msgid "Speech volume:"
msgstr ""
-#: gui/options.cpp:1438
+#: gui/options.cpp:1434
msgid "Shader"
msgstr ""
-#: gui/options.cpp:1450
+#: gui/options.cpp:1446
msgid "Control"
msgstr ""
-#: gui/options.cpp:1476
+#: gui/options.cpp:1472
msgid "FluidSynth Settings"
msgstr ""
-#: gui/options.cpp:1507
+#: gui/options.cpp:1503
msgid "Theme Path:"
msgstr ""
-#: gui/options.cpp:1509
+#: gui/options.cpp:1505
msgctxt "lowres"
msgid "Theme Path:"
msgstr ""
-#: gui/options.cpp:1515 gui/options.cpp:1517 gui/options.cpp:1518
+#: gui/options.cpp:1511 gui/options.cpp:1513 gui/options.cpp:1514
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr ""
-#: gui/options.cpp:1524
+#: gui/options.cpp:1520
msgid "Plugins Path:"
msgstr ""
-#: gui/options.cpp:1526
+#: gui/options.cpp:1522
msgctxt "lowres"
msgid "Plugins Path:"
msgstr ""
-#: gui/options.cpp:1537
+#: gui/options.cpp:1533
msgctxt "lowres"
msgid "Misc"
msgstr ""
-#: gui/options.cpp:1539
+#: gui/options.cpp:1535
msgid "Theme:"
msgstr ""
-#: gui/options.cpp:1543
+#: gui/options.cpp:1539
msgid "GUI Renderer:"
msgstr ""
-#: gui/options.cpp:1555
+#: gui/options.cpp:1551
msgid "Autosave:"
msgstr ""
-#: gui/options.cpp:1557
+#: gui/options.cpp:1553
msgctxt "lowres"
msgid "Autosave:"
msgstr ""
-#: gui/options.cpp:1565
+#: gui/options.cpp:1561
msgid "Keys"
msgstr ""
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "GUI Language:"
msgstr ""
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "Language of ScummVM GUI"
msgstr ""
-#: gui/options.cpp:1600 gui/updates-dialog.cpp:86
+#: gui/options.cpp:1596 gui/updates-dialog.cpp:86
msgid "Update check:"
msgstr ""
-#: gui/options.cpp:1600
+#: gui/options.cpp:1596
msgid "How often to check ScummVM updates"
msgstr ""
-#: gui/options.cpp:1612
+#: gui/options.cpp:1608
msgid "Check now"
msgstr ""
-#: gui/options.cpp:1620
+#: gui/options.cpp:1616
msgid "Cloud"
msgstr ""
-#: gui/options.cpp:1622
+#: gui/options.cpp:1618
msgctxt "lowres"
msgid "Cloud"
msgstr ""
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Storage:"
msgstr ""
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Active cloud storage"
msgstr ""
-#: gui/options.cpp:1634 gui/options.cpp:2210
+#: gui/options.cpp:1630 gui/options.cpp:2206
msgid "<none>"
msgstr ""
-#: gui/options.cpp:1638 backends/platform/wii/options.cpp:114
+#: gui/options.cpp:1634 backends/platform/wii/options.cpp:114
msgid "Username:"
msgstr ""
-#: gui/options.cpp:1638
+#: gui/options.cpp:1634
msgid "Username used by this storage"
msgstr ""
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Used space:"
msgstr ""
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Space used by ScummVM's saved games on this storage"
msgstr ""
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "Last sync time:"
msgstr ""
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "When the last saved games sync for this storage occured"
msgstr ""
-#: gui/options.cpp:1647 gui/storagewizarddialog.cpp:71
+#: gui/options.cpp:1643 gui/storagewizarddialog.cpp:71
msgid "Connect"
msgstr ""
-#: gui/options.cpp:1647
+#: gui/options.cpp:1643
msgid "Open wizard dialog to connect your cloud storage account"
msgstr ""
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh"
msgstr ""
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh current cloud storage information (username and usage)"
msgstr ""
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Download"
msgstr ""
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Open downloads manager dialog"
msgstr ""
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run server"
msgstr ""
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run local webserver"
msgstr ""
-#: gui/options.cpp:1652 gui/options.cpp:2320
+#: gui/options.cpp:1648 gui/options.cpp:2316
msgid "Not running"
msgstr ""
-#: gui/options.cpp:1656
+#: gui/options.cpp:1652
msgid "/root/ Path:"
msgstr ""
-#: gui/options.cpp:1656 gui/options.cpp:1658 gui/options.cpp:1659
+#: gui/options.cpp:1652 gui/options.cpp:1654 gui/options.cpp:1655
msgid "Specifies which directory the Files Manager can access"
msgstr ""
-#: gui/options.cpp:1658
+#: gui/options.cpp:1654
msgctxt "lowres"
msgid "/root/ Path:"
msgstr ""
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid "Server's port:"
msgstr ""
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid ""
"Which port is used by the server\n"
"Auth with server is not available with non-default port"
msgstr ""
-#: gui/options.cpp:1681
+#: gui/options.cpp:1677
msgid "Apply"
msgstr ""
-#: gui/options.cpp:1824
+#: gui/options.cpp:1820
msgid "Failed to change cloud storage!"
msgstr ""
-#: gui/options.cpp:1827
+#: gui/options.cpp:1823
msgid "Another cloud storage is already active."
msgstr ""
-#: gui/options.cpp:1895
+#: gui/options.cpp:1891
msgid "Theme does not support selected language!"
msgstr ""
-#: gui/options.cpp:1898
+#: gui/options.cpp:1894
msgid "Theme cannot be loaded!"
msgstr ""
-#: gui/options.cpp:1901
+#: gui/options.cpp:1897
msgid ""
"\n"
"Misc settings will be restored."
msgstr ""
-#: gui/options.cpp:1937
+#: gui/options.cpp:1933
msgid "The chosen directory cannot be written to. Please select another one."
msgstr ""
-#: gui/options.cpp:1946
+#: gui/options.cpp:1942
msgid "Select directory for GUI themes"
msgstr ""
-#: gui/options.cpp:1956
+#: gui/options.cpp:1952
msgid "Select directory for extra files"
msgstr ""
-#: gui/options.cpp:1967
+#: gui/options.cpp:1963
msgid "Select directory for plugins"
msgstr ""
-#: gui/options.cpp:1979
+#: gui/options.cpp:1975
msgid "Select directory for Files Manager /root/"
msgstr ""
-#: gui/options.cpp:2217
+#: gui/options.cpp:2213
#, c-format
msgid "%llu bytes"
msgstr ""
-#: gui/options.cpp:2225
+#: gui/options.cpp:2221
msgid "<right now>"
msgstr ""
-#: gui/options.cpp:2227
+#: gui/options.cpp:2223
msgid "<never>"
msgstr ""
-#: gui/options.cpp:2311
+#: gui/options.cpp:2307
msgid "Stop server"
msgstr ""
-#: gui/options.cpp:2312
+#: gui/options.cpp:2308
msgid "Stop local webserver"
msgstr ""
-#: gui/options.cpp:2403
+#: gui/options.cpp:2399
msgid ""
"Request failed.\n"
"Check your Internet connection."
@@ -1796,8 +1796,8 @@ msgstr ""
#: 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:106
-#: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:658
+#: engines/mohawk/riven.cpp:545 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
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
#: engines/toon/toon.cpp:3340 engines/tsage/scenes.cpp:599
@@ -1816,9 +1816,9 @@ msgstr ""
#: engines/dm/loadsave.cpp:196 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:106 engines/neverhood/menumodule.cpp:880
-#: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:659
+#: engines/mohawk/dialogs.cpp:106 engines/mohawk/riven.cpp:545
+#: 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
#: engines/sherlock/scalpel/scalpel.cpp:1250
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
@@ -2100,7 +2100,7 @@ msgstr ""
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr ""
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
msgid "Do you want to quit ?"
msgstr ""
@@ -3202,7 +3202,7 @@ msgid ""
"works."
msgstr ""
-#: engines/mohawk/riven.cpp:416
+#: engines/mohawk/riven.cpp:432
msgid "You are missing the following required Riven data files:\n"
msgstr ""
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 31305d92ac..cada4aa88a 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: 2017-12-10 15:25+0100\n"
+"POT-Creation-Date: 2017-12-26 21:11+0100\n"
"PO-Revision-Date: 2017-12-01 10:54+0000\n"
"Last-Translator: hampusf <hampus.flink@gmail.com>\n"
"Language-Team: Swedish <https://translations.scummvm.org/projects/scummvm/"
@@ -59,7 +59,7 @@ msgstr "Uppхt"
#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editgamedialog.cpp:292
#: gui/editrecorddialog.cpp:67 gui/filebrowser-dialog.cpp:64
#: gui/fluidsynth-dialog.cpp:152 gui/KeysDialog.cpp:43 gui/massadd.cpp:95
-#: gui/options.cpp:1680 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
+#: gui/options.cpp:1676 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
#: gui/recorderdialog.cpp:155 gui/remotebrowser.cpp:59
#: gui/saveload-dialog.cpp:383 gui/saveload-dialog.cpp:445
#: gui/saveload-dialog.cpp:727 gui/saveload-dialog.cpp:1121
@@ -119,7 +119,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -132,7 +132,7 @@ msgstr "Ja"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -155,7 +155,7 @@ msgstr ""
#: gui/downloaddialog.cpp:146 gui/editgamedialog.cpp:293
#: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:526
-#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1682
+#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1678
#: gui/saveload-dialog.cpp:1122 engines/engine.cpp:443 engines/engine.cpp:454
#: backends/platform/wii/options.cpp:47
#: backends/platform/wince/CELauncherDialog.cpp:54
@@ -241,8 +241,8 @@ msgstr ""
"Spelets sprхk. Den hфr instфllningen omvandlar inte din spanska spelversion "
"till en engelsk"
-#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:997
-#: gui/options.cpp:1010 gui/options.cpp:1575 audio/null.cpp:41
+#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:993
+#: gui/options.cpp:1006 gui/options.cpp:1571 audio/null.cpp:41
msgid "<default>"
msgstr "<standard>"
@@ -264,11 +264,11 @@ msgstr "Plattform:"
msgid "Engine"
msgstr "Motor"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "Graphics"
msgstr "Grafik"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "GFX"
msgstr "GFX"
@@ -281,7 +281,7 @@ msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "жverskrid globala grafikinstфllningar"
-#: gui/editgamedialog.cpp:196 gui/options.cpp:1457
+#: gui/editgamedialog.cpp:196 gui/options.cpp:1453
msgid "Audio"
msgstr "Ljud"
@@ -294,11 +294,11 @@ msgctxt "lowres"
msgid "Override global audio settings"
msgstr "жverskrid globala ljudinstфllningar"
-#: gui/editgamedialog.cpp:210 gui/options.cpp:1462
+#: gui/editgamedialog.cpp:210 gui/options.cpp:1458
msgid "Volume"
msgstr "Volym"
-#: gui/editgamedialog.cpp:212 gui/options.cpp:1464
+#: gui/editgamedialog.cpp:212 gui/options.cpp:1460
msgctxt "lowres"
msgid "Volume"
msgstr "Volym"
@@ -312,7 +312,7 @@ msgctxt "lowres"
msgid "Override global volume settings"
msgstr "жverskrid globala volyminstфllningar"
-#: gui/editgamedialog.cpp:226 gui/options.cpp:1472
+#: gui/editgamedialog.cpp:226 gui/options.cpp:1468
msgid "MIDI"
msgstr "MIDI"
@@ -325,7 +325,7 @@ msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "жverskrid globala MIDI-instфllningar"
-#: gui/editgamedialog.cpp:241 gui/options.cpp:1482
+#: gui/editgamedialog.cpp:241 gui/options.cpp:1478
msgid "MT-32"
msgstr "MT-32"
@@ -338,11 +338,11 @@ msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "жverskrid globala MT-32 instфllningar"
-#: gui/editgamedialog.cpp:255 gui/options.cpp:1489
+#: gui/editgamedialog.cpp:255 gui/options.cpp:1485
msgid "Paths"
msgstr "Sіkvфgar"
-#: gui/editgamedialog.cpp:257 gui/options.cpp:1491
+#: gui/editgamedialog.cpp:257 gui/options.cpp:1487
msgctxt "lowres"
msgid "Paths"
msgstr "Sіkvфgar"
@@ -356,7 +356,7 @@ msgctxt "lowres"
msgid "Game Path:"
msgstr "Sіkv. spel:"
-#: gui/editgamedialog.cpp:271 gui/options.cpp:1515
+#: gui/editgamedialog.cpp:271 gui/options.cpp:1511
msgid "Extra Path:"
msgstr "Sіkv. extra:"
@@ -365,44 +365,44 @@ msgstr "Sіkv. extra:"
msgid "Specifies path to additional data used by the game"
msgstr "Bestфmmer sіkvфgen till ytterligare data som spelet anvфnder"
-#: gui/editgamedialog.cpp:273 gui/options.cpp:1517
+#: gui/editgamedialog.cpp:273 gui/options.cpp:1513
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Sіkv. extra:"
-#: gui/editgamedialog.cpp:280 gui/options.cpp:1499
+#: gui/editgamedialog.cpp:280 gui/options.cpp:1495
msgid "Save Path:"
msgstr "Sіkv. sparat:"
#: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282
-#: gui/editgamedialog.cpp:283 gui/options.cpp:1499 gui/options.cpp:1501
-#: gui/options.cpp:1502
+#: gui/editgamedialog.cpp:283 gui/options.cpp:1495 gui/options.cpp:1497
+#: gui/options.cpp:1498
msgid "Specifies where your saved games are put"
msgstr "Bestфmmer var dina spardata lagras"
-#: gui/editgamedialog.cpp:282 gui/options.cpp:1501
+#: gui/editgamedialog.cpp:282 gui/options.cpp:1497
msgctxt "lowres"
msgid "Save Path:"
msgstr "Sіkv. sparat:"
#: gui/editgamedialog.cpp:301 gui/editgamedialog.cpp:398
-#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1510
-#: gui/options.cpp:1518 gui/options.cpp:1527 gui/options.cpp:1707
-#: gui/options.cpp:1713 gui/options.cpp:1721 gui/options.cpp:1744
-#: gui/options.cpp:1777 gui/options.cpp:1783 gui/options.cpp:1790
-#: gui/options.cpp:1798 gui/options.cpp:1993 gui/options.cpp:1996
-#: gui/options.cpp:2003 gui/options.cpp:2013
+#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1506
+#: gui/options.cpp:1514 gui/options.cpp:1523 gui/options.cpp:1703
+#: gui/options.cpp:1709 gui/options.cpp:1717 gui/options.cpp:1740
+#: gui/options.cpp:1773 gui/options.cpp:1779 gui/options.cpp:1786
+#: gui/options.cpp:1794 gui/options.cpp:1989 gui/options.cpp:1992
+#: gui/options.cpp:1999 gui/options.cpp:2009
msgctxt "path"
msgid "None"
msgstr "Ingen"
#: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404
-#: gui/editgamedialog.cpp:522 gui/options.cpp:1701 gui/options.cpp:1771
-#: gui/options.cpp:1999 backends/platform/wii/options.cpp:56
+#: gui/editgamedialog.cpp:522 gui/options.cpp:1697 gui/options.cpp:1767
+#: gui/options.cpp:1995 backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Standard"
-#: gui/editgamedialog.cpp:450 gui/options.cpp:2007
+#: gui/editgamedialog.cpp:450 gui/options.cpp:2003
msgid "Select SoundFont"
msgstr "Vфlj SoundFont"
@@ -410,7 +410,7 @@ msgstr "Vфlj SoundFont"
msgid "Select additional game directory"
msgstr "Vфlj en ytterligare spelkatalog"
-#: gui/editgamedialog.cpp:502 gui/options.cpp:1930
+#: gui/editgamedialog.cpp:502 gui/options.cpp:1926
msgid "Select directory for saved games"
msgstr "Vфlj katalog fіr spardata"
@@ -502,7 +502,7 @@ msgstr "Sinus"
msgid "Triangle"
msgstr "Triangel"
-#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1535
+#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1531
msgid "Misc"
msgstr "Diverse"
@@ -682,7 +682,7 @@ msgid "Search:"
msgstr "Sіk:"
#: gui/launcher.cpp:200 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:517
+#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:533
#: engines/pegasus/pegasus.cpp:355 engines/tsage/scenes.cpp:601
#: engines/wage/saveload.cpp:748
msgid "Load game:"
@@ -692,7 +692,7 @@ msgstr "Ladda spel:"
#: backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:105
-#: engines/mohawk/riven.cpp:517 engines/parallaction/saveload.cpp:194
+#: engines/mohawk/riven.cpp:533 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
msgid "Load"
@@ -803,209 +803,209 @@ msgstr "var 15:e minut"
msgid "every 30 mins"
msgstr "var 30:e minut"
-#: gui/options.cpp:343 gui/options.cpp:640 gui/options.cpp:778
-#: gui/options.cpp:853 gui/options.cpp:1114
+#: gui/options.cpp:339 gui/options.cpp:636 gui/options.cpp:774
+#: gui/options.cpp:849 gui/options.cpp:1110
msgctxt "soundfont"
msgid "None"
msgstr "Ingen"
-#: gui/options.cpp:514
+#: gui/options.cpp:510
msgid "Failed to apply some of the graphic options changes:"
msgstr "Kunde inte verkstфlla nхgra av grafikinstфllningarna:"
-#: gui/options.cpp:526
+#: gui/options.cpp:522
msgid "the video mode could not be changed."
msgstr "videolфget kunde inte фndras."
-#: gui/options.cpp:532
+#: gui/options.cpp:528
msgid "the aspect ratio setting could not be changed"
msgstr "instфllningen fіr bildfіrhхllandet kunde inte фndras"
-#: gui/options.cpp:538
+#: gui/options.cpp:534
msgid "the fullscreen setting could not be changed"
msgstr "fullskфrmsinstфllningen kunde inte фndras"
-#: gui/options.cpp:544
+#: gui/options.cpp:540
msgid "the filtering setting could not be changed"
msgstr "filterinstфllningen kunde inte фndras"
-#: gui/options.cpp:932
+#: gui/options.cpp:928
msgid "Show On-screen control"
msgstr "Visa kontroller pх skфrmen"
-#: gui/options.cpp:936
+#: gui/options.cpp:932
msgid "Touchpad mouse mode"
msgstr "Touchpad-muslфge"
-#: gui/options.cpp:940
+#: gui/options.cpp:936
msgid "Swap Menu and Back buttons"
msgstr "Vфxla meny- och tillbakaknappar"
-#: gui/options.cpp:945
+#: gui/options.cpp:941
msgid "Pointer Speed:"
msgstr "Pekarhastighet:"
-#: gui/options.cpp:945 gui/options.cpp:947 gui/options.cpp:948
+#: gui/options.cpp:941 gui/options.cpp:943 gui/options.cpp:944
msgid "Speed for keyboard/joystick mouse pointer control"
msgstr "Hastighet fіr kontroll av muspekare via tangentbord/joystick"
-#: gui/options.cpp:947
+#: gui/options.cpp:943
msgctxt "lowres"
msgid "Pointer Speed:"
msgstr "Pekarhastighet:"
-#: gui/options.cpp:958
+#: gui/options.cpp:954
msgid "Joy Deadzone:"
msgstr "Dіdzon fіr joystick:"
-#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
+#: gui/options.cpp:954 gui/options.cpp:956 gui/options.cpp:957
msgid "Analog joystick Deadzone"
msgstr "Dіdzon fіr analog joystick"
-#: gui/options.cpp:960
+#: gui/options.cpp:956
msgctxt "lowres"
msgid "Joy Deadzone:"
msgstr "Dіdzon fіr joystick:"
-#: gui/options.cpp:974
+#: gui/options.cpp:970
msgid "HW Shader:"
msgstr "Hхrdvarushader:"
-#: gui/options.cpp:974 gui/options.cpp:976
+#: gui/options.cpp:970 gui/options.cpp:972
msgid "Different hardware shaders give different visual effects"
msgstr "Olika hхrdvarubaserade shaders ger olika visuella effekter"
-#: gui/options.cpp:976
+#: gui/options.cpp:972
msgctxt "lowres"
msgid "HW Shader:"
msgstr "Hхrdvarushader:"
-#: gui/options.cpp:977
+#: gui/options.cpp:973
msgid "Different shaders give different visual effects"
msgstr "Olika shaders ger olika visuella effekter"
-#: gui/options.cpp:994
+#: gui/options.cpp:990
msgid "Graphics mode:"
msgstr "Grafiklфge:"
-#: gui/options.cpp:1008
+#: gui/options.cpp:1004
msgid "Render mode:"
msgstr "Renderingslфge:"
-#: gui/options.cpp:1008 gui/options.cpp:1009
+#: gui/options.cpp:1004 gui/options.cpp:1005
msgid "Special dithering modes supported by some games"
msgstr "Speciella gitterlфgen stіdda av vissa spel"
-#: gui/options.cpp:1020 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
+#: gui/options.cpp:1016 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2590
msgid "Fullscreen mode"
msgstr "Fullskфrmslфge"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Filter graphics"
msgstr "Filtrera grafik"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Use linear filtering when scaling graphics"
msgstr "Anvфnd linjфrt filter fіr att fіrstora bilden"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Aspect ratio correction"
msgstr "Korrektion av bildfіrhхllande"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Correct aspect ratio for 320x200 games"
msgstr "Korrigera bildfіrhхllandet fіr 320 x 200-spel"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Preferred Device:"
msgstr "Fіredragen enhet:"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Music Device:"
msgstr "Musikenhet:"
-#: gui/options.cpp:1034 gui/options.cpp:1036
+#: gui/options.cpp:1030 gui/options.cpp:1032
msgid "Specifies preferred sound device or sound card emulator"
msgstr "Bestфmmer din fіredragna emulator fіr ljudenhet eller ljudkort"
-#: gui/options.cpp:1034 gui/options.cpp:1036 gui/options.cpp:1037
+#: gui/options.cpp:1030 gui/options.cpp:1032 gui/options.cpp:1033
msgid "Specifies output sound device or sound card emulator"
msgstr "Bestфmmer emulator fіr ljudenhet eller ljudkort"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Fіredr. enhet:"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Music Device:"
msgstr "Musikenhet:"
-#: gui/options.cpp:1063
+#: gui/options.cpp:1059
msgid "AdLib emulator:"
msgstr "AdLib-emulator:"
-#: gui/options.cpp:1063 gui/options.cpp:1064
+#: gui/options.cpp:1059 gui/options.cpp:1060
msgid "AdLib is used for music in many games"
msgstr "AdLib anvфnds fіr musik i mхnga spel"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "GM Device:"
msgstr "GM-enhet:"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "Specifies default sound device for General MIDI output"
msgstr "Bestфmmer standardenheten fіr General MIDI-uppspelning"
-#: gui/options.cpp:1088
+#: gui/options.cpp:1084
msgid "Don't use General MIDI music"
msgstr "Anvфnd inte General MIDI-musik"
-#: gui/options.cpp:1099 gui/options.cpp:1161
+#: gui/options.cpp:1095 gui/options.cpp:1157
msgid "Use first available device"
msgstr "Anvфnd fіrsta tillgфngliga enhet"
-#: gui/options.cpp:1111
+#: gui/options.cpp:1107
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1111 gui/options.cpp:1113 gui/options.cpp:1114
+#: gui/options.cpp:1107 gui/options.cpp:1109 gui/options.cpp:1110
msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity"
msgstr "SoundFont stіds endast av vissa ljudkort, FluidSynth och Timidity"
-#: gui/options.cpp:1113
+#: gui/options.cpp:1109
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Mixed AdLib/MIDI mode"
msgstr "Blandat AdLib/MIDI-lфge"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Use both MIDI and AdLib sound generation"
msgstr "Anvфnd bхde MIDI och AdLib fіr ljudgeneration"
-#: gui/options.cpp:1122
+#: gui/options.cpp:1118
msgid "MIDI gain:"
msgstr "MIDI gain:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "MT-32 Device:"
msgstr "MT-32 enhet:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
"Bestфmmer standardenheten fіr Roland MT-32/LAPC1/CM32I/CM64-uppspelning"
-#: gui/options.cpp:1137
+#: gui/options.cpp:1133
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Фkta Roland MT-32 (inaktivera GM-emulation)"
-#: gui/options.cpp:1137 gui/options.cpp:1139
+#: gui/options.cpp:1133 gui/options.cpp:1135
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -1013,16 +1013,16 @@ msgstr ""
"Aktivera om du vill anvфnda din verkliga Roland-kompatibla och dator-"
"anslutna ljudenhet"
-#: gui/options.cpp:1139
+#: gui/options.cpp:1135
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Фkta Roland MT-32 (ingen GM-emulation)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid "Roland GS Device (enable MT-32 mappings)"
msgstr "Roland GS-enhet (aktivera MT-32 mappings)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid ""
"Check if you want to enable patch mappings to emulate an MT-32 on a Roland "
"GS device"
@@ -1030,273 +1030,273 @@ msgstr ""
"Aktivera om du vill anvфnda patch mapping fіr att emulera en MT-32 pх en "
"Roland GS-enhet"
-#: gui/options.cpp:1151
+#: gui/options.cpp:1147
msgid "Don't use Roland MT-32 music"
msgstr "Anvфnd inte Roland MT-32 musik"
-#: gui/options.cpp:1178
+#: gui/options.cpp:1174
msgid "Text and Speech:"
msgstr "Undertext och tal:"
-#: gui/options.cpp:1182 gui/options.cpp:1192
+#: gui/options.cpp:1178 gui/options.cpp:1188
msgid "Speech"
msgstr "Tal"
-#: gui/options.cpp:1183 gui/options.cpp:1193
+#: gui/options.cpp:1179 gui/options.cpp:1189
msgid "Subtitles"
msgstr "Undertexter"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1180
msgid "Both"
msgstr "Bхda"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1182
msgid "Subtitle speed:"
msgstr "Texthastighet:"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1184
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Text och tal:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1188
msgid "Spch"
msgstr "Tal"
-#: gui/options.cpp:1193
+#: gui/options.cpp:1189
msgid "Subs"
msgstr "Text"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgctxt "lowres"
msgid "Both"
msgstr "Bхda"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgid "Show subtitles and play speech"
msgstr "Visa undertexter och spela upp tal"
-#: gui/options.cpp:1196
+#: gui/options.cpp:1192
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Texthastighet:"
-#: gui/options.cpp:1212
+#: gui/options.cpp:1208
msgid "Music volume:"
msgstr "Musikvolym:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1210
msgctxt "lowres"
msgid "Music volume:"
msgstr "Musikvolym:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1217
msgid "Mute All"
msgstr "Ljud av"
-#: gui/options.cpp:1224
+#: gui/options.cpp:1220
msgid "SFX volume:"
msgstr "SFX-volym:"
-#: gui/options.cpp:1224 gui/options.cpp:1226 gui/options.cpp:1227
+#: gui/options.cpp:1220 gui/options.cpp:1222 gui/options.cpp:1223
msgid "Special sound effects volume"
msgstr "Volym fіr specialeffekter"
-#: gui/options.cpp:1226
+#: gui/options.cpp:1222
msgctxt "lowres"
msgid "SFX volume:"
msgstr "SFX-volym:"
-#: gui/options.cpp:1234
+#: gui/options.cpp:1230
msgid "Speech volume:"
msgstr "Talvolym:"
-#: gui/options.cpp:1236
+#: gui/options.cpp:1232
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Talvolym:"
-#: gui/options.cpp:1438
+#: gui/options.cpp:1434
msgid "Shader"
msgstr "Shader"
-#: gui/options.cpp:1450
+#: gui/options.cpp:1446
msgid "Control"
msgstr "Kontroll"
-#: gui/options.cpp:1476
+#: gui/options.cpp:1472
msgid "FluidSynth Settings"
msgstr "FluidSynth instфllningar"
-#: gui/options.cpp:1507
+#: gui/options.cpp:1503
msgid "Theme Path:"
msgstr "Sіkv. tema:"
-#: gui/options.cpp:1509
+#: gui/options.cpp:1505
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Sіkv. tema:"
-#: gui/options.cpp:1515 gui/options.cpp:1517 gui/options.cpp:1518
+#: gui/options.cpp:1511 gui/options.cpp:1513 gui/options.cpp:1514
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr ""
"Bestфmmer sіkvфg till andra data som anvфnds av alla spel eller ScummVM"
-#: gui/options.cpp:1524
+#: gui/options.cpp:1520
msgid "Plugins Path:"
msgstr "Sіkv. tillфgg:"
-#: gui/options.cpp:1526
+#: gui/options.cpp:1522
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Sіkv. tillфgg:"
-#: gui/options.cpp:1537
+#: gui/options.cpp:1533
msgctxt "lowres"
msgid "Misc"
msgstr "Diverse"
-#: gui/options.cpp:1539
+#: gui/options.cpp:1535
msgid "Theme:"
msgstr "Tema:"
-#: gui/options.cpp:1543
+#: gui/options.cpp:1539
msgid "GUI Renderer:"
msgstr "GUI-rendering:"
-#: gui/options.cpp:1555
+#: gui/options.cpp:1551
msgid "Autosave:"
msgstr "Autospara:"
-#: gui/options.cpp:1557
+#: gui/options.cpp:1553
msgctxt "lowres"
msgid "Autosave:"
msgstr "Autospara:"
-#: gui/options.cpp:1565
+#: gui/options.cpp:1561
msgid "Keys"
msgstr "Tangenter"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "GUI Language:"
msgstr "GUI-sprхk:"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "Language of ScummVM GUI"
msgstr "Sprхk fіr ScummVM:s anvфndargrфnssnitt"
-#: gui/options.cpp:1600 gui/updates-dialog.cpp:86
+#: gui/options.cpp:1596 gui/updates-dialog.cpp:86
msgid "Update check:"
msgstr "Uppdateringskoll:"
-#: gui/options.cpp:1600
+#: gui/options.cpp:1596
msgid "How often to check ScummVM updates"
msgstr "Hur ofta ScummVM kollar efter uppdateringar"
-#: gui/options.cpp:1612
+#: gui/options.cpp:1608
msgid "Check now"
msgstr "Kolla nu"
-#: gui/options.cpp:1620
+#: gui/options.cpp:1616
msgid "Cloud"
msgstr "Moln"
-#: gui/options.cpp:1622
+#: gui/options.cpp:1618
msgctxt "lowres"
msgid "Cloud"
msgstr "Moln"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Storage:"
msgstr "Lager:"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Active cloud storage"
msgstr "Aktivera molnlagring"
-#: gui/options.cpp:1634 gui/options.cpp:2210
+#: gui/options.cpp:1630 gui/options.cpp:2206
msgid "<none>"
msgstr "<ingen>"
-#: gui/options.cpp:1638 backends/platform/wii/options.cpp:114
+#: gui/options.cpp:1634 backends/platform/wii/options.cpp:114
msgid "Username:"
msgstr "Anv. namn:"
-#: gui/options.cpp:1638
+#: gui/options.cpp:1634
msgid "Username used by this storage"
msgstr "Anvфndarnamn som anvфnds av detta lager"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Used space:"
msgstr "Utnyttjat utrymme:"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Space used by ScummVM's saved games on this storage"
msgstr "Utrymme som anvфnds av ScummVM:s sparade data pх det hфr lagret"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "Last sync time:"
msgstr "Senast synkad:"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "When the last saved games sync for this storage occured"
msgstr "Nфr sparade data synkades senast fіr det hфr lagret"
-#: gui/options.cpp:1647 gui/storagewizarddialog.cpp:71
+#: gui/options.cpp:1643 gui/storagewizarddialog.cpp:71
msgid "Connect"
msgstr "Anslut"
-#: gui/options.cpp:1647
+#: gui/options.cpp:1643
msgid "Open wizard dialog to connect your cloud storage account"
msgstr "жppna anslutningsguiden fіr att ansluta ditt molnlagerkonto"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh"
msgstr "Uppdatera"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh current cloud storage information (username and usage)"
msgstr ""
"Uppdaterar informationen om aktuellt molnlager (anvфndarnamn och anvфndning)"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Download"
msgstr "Nedladdning"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Open downloads manager dialog"
msgstr "жppna fіnstret fіr nedladdningshantering"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run server"
msgstr "Starta server"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run local webserver"
msgstr "Starta lokal webbserver"
-#: gui/options.cpp:1652 gui/options.cpp:2320
+#: gui/options.cpp:1648 gui/options.cpp:2316
msgid "Not running"
msgstr "Ej aktiv"
-#: gui/options.cpp:1656
+#: gui/options.cpp:1652
msgid "/root/ Path:"
msgstr "/root/-sіkvфg:"
-#: gui/options.cpp:1656 gui/options.cpp:1658 gui/options.cpp:1659
+#: gui/options.cpp:1652 gui/options.cpp:1654 gui/options.cpp:1655
msgid "Specifies which directory the Files Manager can access"
msgstr "Bestфmmer vilken katalog filhanteraren har хtkomst till"
-#: gui/options.cpp:1658
+#: gui/options.cpp:1654
msgctxt "lowres"
msgid "/root/ Path:"
msgstr "/root/-sіkvфg:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid "Server's port:"
msgstr "Serverport:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid ""
"Which port is used by the server\n"
"Auth with server is not available with non-default port"
@@ -1304,27 +1304,27 @@ msgstr ""
"Vilken port anvфnds av servern\n"
"Serverautorisering фr endast tillgфnglig med standardporten"
-#: gui/options.cpp:1681
+#: gui/options.cpp:1677
msgid "Apply"
msgstr "Verkstфll"
-#: gui/options.cpp:1824
+#: gui/options.cpp:1820
msgid "Failed to change cloud storage!"
msgstr "Kunde inte фndra molnlager!"
-#: gui/options.cpp:1827
+#: gui/options.cpp:1823
msgid "Another cloud storage is already active."
msgstr "Ett annat molnlager фr redan aktivt."
-#: gui/options.cpp:1895
+#: gui/options.cpp:1891
msgid "Theme does not support selected language!"
msgstr "Temat stіder inte det valda sprхket!"
-#: gui/options.cpp:1898
+#: gui/options.cpp:1894
msgid "Theme cannot be loaded!"
msgstr "Temat kunde inte laddas!"
-#: gui/options.cpp:1901
+#: gui/options.cpp:1897
msgid ""
"\n"
"Misc settings will be restored."
@@ -1332,49 +1332,49 @@ msgstr ""
"\n"
"Diverse instфllningar kommer att хterstфllas."
-#: gui/options.cpp:1937
+#: gui/options.cpp:1933
msgid "The chosen directory cannot be written to. Please select another one."
msgstr ""
"Det gхr inte att skriva till den valda katalogen. Var god vфlj en annan."
-#: gui/options.cpp:1946
+#: gui/options.cpp:1942
msgid "Select directory for GUI themes"
msgstr "Vфlj katalog fіr GUI-teman"
-#: gui/options.cpp:1956
+#: gui/options.cpp:1952
msgid "Select directory for extra files"
msgstr "Vфlj katalog fіr extra filer"
-#: gui/options.cpp:1967
+#: gui/options.cpp:1963
msgid "Select directory for plugins"
msgstr "Vфlj katalog fіr tillфgg"
-#: gui/options.cpp:1979
+#: gui/options.cpp:1975
msgid "Select directory for Files Manager /root/"
msgstr "Vфlj katalog fіr filhanterarens /root/"
-#: gui/options.cpp:2217
+#: gui/options.cpp:2213
#, c-format
msgid "%llu bytes"
msgstr "%llu bytes"
-#: gui/options.cpp:2225
+#: gui/options.cpp:2221
msgid "<right now>"
msgstr "<nu direkt>"
-#: gui/options.cpp:2227
+#: gui/options.cpp:2223
msgid "<never>"
msgstr "<aldrig>"
-#: gui/options.cpp:2311
+#: gui/options.cpp:2307
msgid "Stop server"
msgstr "Stoppa server"
-#: gui/options.cpp:2312
+#: gui/options.cpp:2308
msgid "Stop local webserver"
msgstr "Stoppa lokal webbserver"
-#: gui/options.cpp:2403
+#: gui/options.cpp:2399
msgid ""
"Request failed.\n"
"Check your Internet connection."
@@ -1844,8 +1844,8 @@ msgstr "Хte~r~vфnd till launcher"
#: 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:106
-#: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:658
+#: engines/mohawk/riven.cpp:545 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
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
#: engines/toon/toon.cpp:3340 engines/tsage/scenes.cpp:599
@@ -1864,9 +1864,9 @@ msgstr "Spara spelet:"
#: engines/dm/loadsave.cpp:196 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:106 engines/neverhood/menumodule.cpp:880
-#: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:659
+#: engines/mohawk/dialogs.cpp:106 engines/mohawk/riven.cpp:545
+#: 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
#: engines/sherlock/scalpel/scalpel.cpp:1250
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
@@ -2178,7 +2178,7 @@ msgstr "Klickning deaktiverad"
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Touchscreen 'Tap-lфge' - Hover (DPad klick)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
msgid "Do you want to quit ?"
msgstr "Vill du avsluta?"
@@ -3335,7 +3335,7 @@ msgstr ""
"Filen 'extras.mhk' saknas. Det gхr фven bra att anvфnda installationsfilen "
"'arcriven.z' i stфllet."
-#: engines/mohawk/riven.cpp:416
+#: engines/mohawk/riven.cpp:432
msgid "You are missing the following required Riven data files:\n"
msgstr "Du saknar fіljande obligatoriska datafiler fіr Riven:\n"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index b8e6922aba..c57fe07d51 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: 2017-12-10 15:25+0100\n"
+"POT-Creation-Date: 2017-12-26 21:11+0100\n"
"PO-Revision-Date: 2017-06-14 14:55+0000\n"
"Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n"
"Language-Team: Ukrainian <https://translations.scummvm.org/projects/scummvm/"
@@ -60,7 +60,7 @@ msgstr "Вгору"
#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editgamedialog.cpp:292
#: gui/editrecorddialog.cpp:67 gui/filebrowser-dialog.cpp:64
#: gui/fluidsynth-dialog.cpp:152 gui/KeysDialog.cpp:43 gui/massadd.cpp:95
-#: gui/options.cpp:1680 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
+#: gui/options.cpp:1676 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
#: gui/recorderdialog.cpp:155 gui/remotebrowser.cpp:59
#: gui/saveload-dialog.cpp:383 gui/saveload-dialog.cpp:445
#: gui/saveload-dialog.cpp:727 gui/saveload-dialog.cpp:1121
@@ -120,7 +120,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -133,7 +133,7 @@ msgstr "Так"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -156,7 +156,7 @@ msgstr ""
#: gui/downloaddialog.cpp:146 gui/editgamedialog.cpp:293
#: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:526
-#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1682
+#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1678
#: gui/saveload-dialog.cpp:1122 engines/engine.cpp:443 engines/engine.cpp:454
#: backends/platform/wii/options.cpp:47
#: backends/platform/wince/CELauncherDialog.cpp:54
@@ -242,8 +242,8 @@ msgstr ""
"Мова гри. Зміна цього налаштування не перетворить гру англійською на "
"українську"
-#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:997
-#: gui/options.cpp:1010 gui/options.cpp:1575 audio/null.cpp:41
+#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:993
+#: gui/options.cpp:1006 gui/options.cpp:1571 audio/null.cpp:41
msgid "<default>"
msgstr "<за умовчанням>"
@@ -265,11 +265,11 @@ msgstr "Платформа:"
msgid "Engine"
msgstr "Движок"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "Graphics"
msgstr "Графіка"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "GFX"
msgstr "Грф"
@@ -282,7 +282,7 @@ msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Перекрити глобальні налаштування графіки"
-#: gui/editgamedialog.cpp:196 gui/options.cpp:1457
+#: gui/editgamedialog.cpp:196 gui/options.cpp:1453
msgid "Audio"
msgstr "Аудіо"
@@ -295,11 +295,11 @@ msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Перекрити глобальні налаштування аудіо"
-#: gui/editgamedialog.cpp:210 gui/options.cpp:1462
+#: gui/editgamedialog.cpp:210 gui/options.cpp:1458
msgid "Volume"
msgstr "Гучність"
-#: gui/editgamedialog.cpp:212 gui/options.cpp:1464
+#: gui/editgamedialog.cpp:212 gui/options.cpp:1460
msgctxt "lowres"
msgid "Volume"
msgstr "Гучн"
@@ -313,7 +313,7 @@ msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Перекрити глобальні налаштування гучності"
-#: gui/editgamedialog.cpp:226 gui/options.cpp:1472
+#: gui/editgamedialog.cpp:226 gui/options.cpp:1468
msgid "MIDI"
msgstr "MIDI"
@@ -326,7 +326,7 @@ msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Перекрити глобальні налаштування MIDI"
-#: gui/editgamedialog.cpp:241 gui/options.cpp:1482
+#: gui/editgamedialog.cpp:241 gui/options.cpp:1478
msgid "MT-32"
msgstr "MT-32"
@@ -339,11 +339,11 @@ msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Перекрити глобальні налаштування MT-32"
-#: gui/editgamedialog.cpp:255 gui/options.cpp:1489
+#: gui/editgamedialog.cpp:255 gui/options.cpp:1485
msgid "Paths"
msgstr "Шляхи"
-#: gui/editgamedialog.cpp:257 gui/options.cpp:1491
+#: gui/editgamedialog.cpp:257 gui/options.cpp:1487
msgctxt "lowres"
msgid "Paths"
msgstr "Шляхи"
@@ -357,7 +357,7 @@ msgctxt "lowres"
msgid "Game Path:"
msgstr "Шлях до гри:"
-#: gui/editgamedialog.cpp:271 gui/options.cpp:1515
+#: gui/editgamedialog.cpp:271 gui/options.cpp:1511
msgid "Extra Path:"
msgstr "Додатк. шлях:"
@@ -366,44 +366,44 @@ msgstr "Додатк. шлях:"
msgid "Specifies path to additional data used by the game"
msgstr "Вказує шлях до додаткових файлів даних для гри"
-#: gui/editgamedialog.cpp:273 gui/options.cpp:1517
+#: gui/editgamedialog.cpp:273 gui/options.cpp:1513
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Дод. шлях:"
-#: gui/editgamedialog.cpp:280 gui/options.cpp:1499
+#: gui/editgamedialog.cpp:280 gui/options.cpp:1495
msgid "Save Path:"
msgstr "Шлях збер.:"
#: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282
-#: gui/editgamedialog.cpp:283 gui/options.cpp:1499 gui/options.cpp:1501
-#: gui/options.cpp:1502
+#: gui/editgamedialog.cpp:283 gui/options.cpp:1495 gui/options.cpp:1497
+#: gui/options.cpp:1498
msgid "Specifies where your saved games are put"
msgstr "Вказує шлях до збережених ігор"
-#: gui/editgamedialog.cpp:282 gui/options.cpp:1501
+#: gui/editgamedialog.cpp:282 gui/options.cpp:1497
msgctxt "lowres"
msgid "Save Path:"
msgstr "Шлях збер.:"
#: gui/editgamedialog.cpp:301 gui/editgamedialog.cpp:398
-#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1510
-#: gui/options.cpp:1518 gui/options.cpp:1527 gui/options.cpp:1707
-#: gui/options.cpp:1713 gui/options.cpp:1721 gui/options.cpp:1744
-#: gui/options.cpp:1777 gui/options.cpp:1783 gui/options.cpp:1790
-#: gui/options.cpp:1798 gui/options.cpp:1993 gui/options.cpp:1996
-#: gui/options.cpp:2003 gui/options.cpp:2013
+#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1506
+#: gui/options.cpp:1514 gui/options.cpp:1523 gui/options.cpp:1703
+#: gui/options.cpp:1709 gui/options.cpp:1717 gui/options.cpp:1740
+#: gui/options.cpp:1773 gui/options.cpp:1779 gui/options.cpp:1786
+#: gui/options.cpp:1794 gui/options.cpp:1989 gui/options.cpp:1992
+#: gui/options.cpp:1999 gui/options.cpp:2009
msgctxt "path"
msgid "None"
msgstr "Не завдано"
#: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404
-#: gui/editgamedialog.cpp:522 gui/options.cpp:1701 gui/options.cpp:1771
-#: gui/options.cpp:1999 backends/platform/wii/options.cpp:56
+#: gui/editgamedialog.cpp:522 gui/options.cpp:1697 gui/options.cpp:1767
+#: gui/options.cpp:1995 backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "За умовчанням"
-#: gui/editgamedialog.cpp:450 gui/options.cpp:2007
+#: gui/editgamedialog.cpp:450 gui/options.cpp:2003
msgid "Select SoundFont"
msgstr "Виберіть SoundFont"
@@ -411,7 +411,7 @@ msgstr "Виберіть SoundFont"
msgid "Select additional game directory"
msgstr "Виберіть додаткову папку гри"
-#: gui/editgamedialog.cpp:502 gui/options.cpp:1930
+#: gui/editgamedialog.cpp:502 gui/options.cpp:1926
msgid "Select directory for saved games"
msgstr "Виберіть папку для збережених ігор"
@@ -504,7 +504,7 @@ msgstr "Синусоїда"
msgid "Triangle"
msgstr "Трикутник"
-#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1535
+#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1531
msgid "Misc"
msgstr "Різне"
@@ -683,7 +683,7 @@ msgid "Search:"
msgstr "Пошук:"
#: gui/launcher.cpp:200 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:517
+#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:533
#: engines/pegasus/pegasus.cpp:355 engines/tsage/scenes.cpp:601
#: engines/wage/saveload.cpp:748
msgid "Load game:"
@@ -693,7 +693,7 @@ msgstr "Завантажити гру:"
#: backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:105
-#: engines/mohawk/riven.cpp:517 engines/parallaction/saveload.cpp:194
+#: engines/mohawk/riven.cpp:533 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
msgid "Load"
@@ -802,211 +802,211 @@ msgstr "кожні 15 хв"
msgid "every 30 mins"
msgstr "кожні 30 хв"
-#: gui/options.cpp:343 gui/options.cpp:640 gui/options.cpp:778
-#: gui/options.cpp:853 gui/options.cpp:1114
+#: gui/options.cpp:339 gui/options.cpp:636 gui/options.cpp:774
+#: gui/options.cpp:849 gui/options.cpp:1110
msgctxt "soundfont"
msgid "None"
msgstr "Не заданий"
-#: gui/options.cpp:514
+#: gui/options.cpp:510
msgid "Failed to apply some of the graphic options changes:"
msgstr "Не вдалося застосувати деякі зі змін графічних налаштувань:"
-#: gui/options.cpp:526
+#: gui/options.cpp:522
msgid "the video mode could not be changed."
msgstr "не вдалося змінити графічний режим."
-#: gui/options.cpp:532
+#: gui/options.cpp:528
msgid "the aspect ratio setting could not be changed"
msgstr "не вдалося змінити режим корекції співвідношення сторін"
-#: gui/options.cpp:538
+#: gui/options.cpp:534
msgid "the fullscreen setting could not be changed"
msgstr "не вдалося змінити режим повного екрану"
-#: gui/options.cpp:544
+#: gui/options.cpp:540
msgid "the filtering setting could not be changed"
msgstr "не вдалося змінити режим фільтрування"
-#: gui/options.cpp:932
+#: gui/options.cpp:928
msgid "Show On-screen control"
msgstr "Показувати екранне керування"
-#: gui/options.cpp:936
+#: gui/options.cpp:932
msgid "Touchpad mouse mode"
msgstr "Режим тачпаду"
-#: gui/options.cpp:940
+#: gui/options.cpp:936
msgid "Swap Menu and Back buttons"
msgstr "Поміняти місцями кнопки Меню і Назад"
-#: gui/options.cpp:945
+#: gui/options.cpp:941
msgid "Pointer Speed:"
msgstr "Швидкість вказівника:"
-#: gui/options.cpp:945 gui/options.cpp:947 gui/options.cpp:948
+#: gui/options.cpp:941 gui/options.cpp:943 gui/options.cpp:944
msgid "Speed for keyboard/joystick mouse pointer control"
msgstr "Управління швидкістю вказівника миші/джойстика"
-#: gui/options.cpp:947
+#: gui/options.cpp:943
msgctxt "lowres"
msgid "Pointer Speed:"
msgstr "Швидкість вказівника:"
-#: gui/options.cpp:958
+#: gui/options.cpp:954
msgid "Joy Deadzone:"
msgstr "Мертва зона джойстика:"
-#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
+#: gui/options.cpp:954 gui/options.cpp:956 gui/options.cpp:957
msgid "Analog joystick Deadzone"
msgstr "Мертва зона аналогового джойстика"
-#: gui/options.cpp:960
+#: gui/options.cpp:956
msgctxt "lowres"
msgid "Joy Deadzone:"
msgstr "Мертва зона джойстика:"
-#: gui/options.cpp:974
+#: gui/options.cpp:970
msgid "HW Shader:"
msgstr "Апаратний шейдер:"
-#: gui/options.cpp:974 gui/options.cpp:976
+#: gui/options.cpp:970 gui/options.cpp:972
msgid "Different hardware shaders give different visual effects"
msgstr "Різні апаратні шейдери дають різні візуальні ефекти"
-#: gui/options.cpp:976
+#: gui/options.cpp:972
msgctxt "lowres"
msgid "HW Shader:"
msgstr "Апаратний шейдер:"
-#: gui/options.cpp:977
+#: gui/options.cpp:973
msgid "Different shaders give different visual effects"
msgstr "Різні шейдери дають різні візуальні ефекти"
-#: gui/options.cpp:994
+#: gui/options.cpp:990
msgid "Graphics mode:"
msgstr "Графічн. режим:"
-#: gui/options.cpp:1008
+#: gui/options.cpp:1004
msgid "Render mode:"
msgstr "Режим раструв.:"
-#: gui/options.cpp:1008 gui/options.cpp:1009
+#: gui/options.cpp:1004 gui/options.cpp:1005
msgid "Special dithering modes supported by some games"
msgstr "Спеціальні режими растрування, які підтримують деякі ігри"
-#: gui/options.cpp:1020 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
+#: gui/options.cpp:1016 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2590
msgid "Fullscreen mode"
msgstr "Повноекранний режим"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Filter graphics"
msgstr "Фільтрування графіки"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Use linear filtering when scaling graphics"
msgstr "Використовувати лінійну фільтрацію для збільшення графіки"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Aspect ratio correction"
msgstr "Корекція співвідношення сторін"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Correct aspect ratio for 320x200 games"
msgstr "Коригувати співвідношення сторін для ігор з графікою 320x200"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Preferred Device:"
msgstr "Уподобаний пристрій:"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Music Device:"
msgstr "Музич. пристрій:"
-#: gui/options.cpp:1034 gui/options.cpp:1036
+#: gui/options.cpp:1030 gui/options.cpp:1032
msgid "Specifies preferred sound device or sound card emulator"
msgstr "Вказує уподобаний звуковий пристрій або емулятор звукової карти"
-#: gui/options.cpp:1034 gui/options.cpp:1036 gui/options.cpp:1037
+#: gui/options.cpp:1030 gui/options.cpp:1032 gui/options.cpp:1033
msgid "Specifies output sound device or sound card emulator"
msgstr "Вказує вихідний звуковий пристрій або емулятор звукової карти"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Уподоб. пристрій:"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Music Device:"
msgstr "Музичний пристрій:"
-#: gui/options.cpp:1063
+#: gui/options.cpp:1059
msgid "AdLib emulator:"
msgstr "Емулятор AdLib:"
-#: gui/options.cpp:1063 gui/options.cpp:1064
+#: gui/options.cpp:1059 gui/options.cpp:1060
msgid "AdLib is used for music in many games"
msgstr "Звукова карта AdLib використовується багатьма іграми для музики"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "GM Device:"
msgstr "Пристрій GM:"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "Specifies default sound device for General MIDI output"
msgstr "Вказує вихідний звуковий пристрій для General MIDI"
-#: gui/options.cpp:1088
+#: gui/options.cpp:1084
msgid "Don't use General MIDI music"
msgstr "Не використовувати музику General MIDI"
-#: gui/options.cpp:1099 gui/options.cpp:1161
+#: gui/options.cpp:1095 gui/options.cpp:1157
msgid "Use first available device"
msgstr "Використовувати перший наявний пристрій"
-#: gui/options.cpp:1111
+#: gui/options.cpp:1107
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1111 gui/options.cpp:1113 gui/options.cpp:1114
+#: gui/options.cpp:1107 gui/options.cpp:1109 gui/options.cpp:1110
msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity"
msgstr ""
"SoundFont підтримується деякими звуковими картами, FluidSynth та Timidity"
-#: gui/options.cpp:1113
+#: gui/options.cpp:1109
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Mixed AdLib/MIDI mode"
msgstr "Змішаний режим AdLib/MIDI"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Use both MIDI and AdLib sound generation"
msgstr "Використовувати і MIDI і AdLib для генерації звуку"
-#: gui/options.cpp:1122
+#: gui/options.cpp:1118
msgid "MIDI gain:"
msgstr "Посилення MIDI:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "MT-32 Device:"
msgstr "Пристрій MT-32:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
"Вказує звуковий пристрій за замовченням для виводу на Roland MT-32/LAPC1/"
"CM32l/CM64"
-#: gui/options.cpp:1137
+#: gui/options.cpp:1133
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Справжній Roland MT-32 (вимкнути емуляцию GM)"
-#: gui/options.cpp:1137 gui/options.cpp:1139
+#: gui/options.cpp:1133 gui/options.cpp:1135
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -1014,16 +1014,16 @@ msgstr ""
"Відмітьте, якщо у вас підключено Roland-сумісний звуковий пристрій і ви "
"хочете його використовувати"
-#: gui/options.cpp:1139
+#: gui/options.cpp:1135
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Справжній Roland MT-32 (вимкнути емуляцию GM)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid "Roland GS Device (enable MT-32 mappings)"
msgstr "Режим Roland GS (ввімкнути маплення MT-32)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid ""
"Check if you want to enable patch mappings to emulate an MT-32 on a Roland "
"GS device"
@@ -1031,276 +1031,276 @@ msgstr ""
"Відмітьте, якщо хочете включити латки для інструментів для емуляції MT-32 на "
"Roland"
-#: gui/options.cpp:1151
+#: gui/options.cpp:1147
msgid "Don't use Roland MT-32 music"
msgstr "Не використовувати музику для Roland MT-32"
-#: gui/options.cpp:1178
+#: gui/options.cpp:1174
msgid "Text and Speech:"
msgstr "Текст і озвучка:"
-#: gui/options.cpp:1182 gui/options.cpp:1192
+#: gui/options.cpp:1178 gui/options.cpp:1188
msgid "Speech"
msgstr "Озвучка"
-#: gui/options.cpp:1183 gui/options.cpp:1193
+#: gui/options.cpp:1179 gui/options.cpp:1189
msgid "Subtitles"
msgstr "Субтитри"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1180
msgid "Both"
msgstr "Все"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1182
msgid "Subtitle speed:"
msgstr "Швид. субтитрів:"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1184
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Текст і озвучка:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1188
msgid "Spch"
msgstr "Озв"
-#: gui/options.cpp:1193
+#: gui/options.cpp:1189
msgid "Subs"
msgstr "Суб"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgctxt "lowres"
msgid "Both"
msgstr "Все"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgid "Show subtitles and play speech"
msgstr "Показувати субтитри і відтворювати мову"
-#: gui/options.cpp:1196
+#: gui/options.cpp:1192
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Швид. субтитрів:"
-#: gui/options.cpp:1212
+#: gui/options.cpp:1208
msgid "Music volume:"
msgstr "Гучність музики:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1210
msgctxt "lowres"
msgid "Music volume:"
msgstr "Гучність музики:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1217
msgid "Mute All"
msgstr "Вимкнути все"
-#: gui/options.cpp:1224
+#: gui/options.cpp:1220
msgid "SFX volume:"
msgstr "Гучність ефектів:"
-#: gui/options.cpp:1224 gui/options.cpp:1226 gui/options.cpp:1227
+#: gui/options.cpp:1220 gui/options.cpp:1222 gui/options.cpp:1223
msgid "Special sound effects volume"
msgstr "Гучність спеціальних звукових ефектів"
-#: gui/options.cpp:1226
+#: gui/options.cpp:1222
msgctxt "lowres"
msgid "SFX volume:"
msgstr "Гучн. ефектів:"
-#: gui/options.cpp:1234
+#: gui/options.cpp:1230
msgid "Speech volume:"
msgstr "Гучність озвучки:"
-#: gui/options.cpp:1236
+#: gui/options.cpp:1232
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Гучн. озвучки:"
-#: gui/options.cpp:1438
+#: gui/options.cpp:1434
msgid "Shader"
msgstr "Шейдер"
-#: gui/options.cpp:1450
+#: gui/options.cpp:1446
msgid "Control"
msgstr "Керування"
-#: gui/options.cpp:1476
+#: gui/options.cpp:1472
msgid "FluidSynth Settings"
msgstr "Налаштування FluidSynth"
-#: gui/options.cpp:1507
+#: gui/options.cpp:1503
msgid "Theme Path:"
msgstr "Шлях до тем:"
-#: gui/options.cpp:1509
+#: gui/options.cpp:1505
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Шлях до тем:"
-#: gui/options.cpp:1515 gui/options.cpp:1517 gui/options.cpp:1518
+#: gui/options.cpp:1511 gui/options.cpp:1513 gui/options.cpp:1514
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr ""
"Вказує шлях до додаткових файлів даних, які використовуються усіма іграми "
"або ScummVM"
-#: gui/options.cpp:1524
+#: gui/options.cpp:1520
msgid "Plugins Path:"
msgstr "Шлях до втулків:"
-#: gui/options.cpp:1526
+#: gui/options.cpp:1522
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Шлях до втулків:"
-#: gui/options.cpp:1537
+#: gui/options.cpp:1533
msgctxt "lowres"
msgid "Misc"
msgstr "Різне"
-#: gui/options.cpp:1539
+#: gui/options.cpp:1535
msgid "Theme:"
msgstr "Тема:"
-#: gui/options.cpp:1543
+#: gui/options.cpp:1539
msgid "GUI Renderer:"
msgstr "Растер. GUI:"
-#: gui/options.cpp:1555
+#: gui/options.cpp:1551
msgid "Autosave:"
msgstr "Автозбереження:"
-#: gui/options.cpp:1557
+#: gui/options.cpp:1553
msgctxt "lowres"
msgid "Autosave:"
msgstr "Автозбереж.:"
-#: gui/options.cpp:1565
+#: gui/options.cpp:1561
msgid "Keys"
msgstr "Клавіші"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "GUI Language:"
msgstr "Мова інтерф.:"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "Language of ScummVM GUI"
msgstr "Мова графічного інтерфейсу ScummVM"
-#: gui/options.cpp:1600 gui/updates-dialog.cpp:86
+#: gui/options.cpp:1596 gui/updates-dialog.cpp:86
msgid "Update check:"
msgstr "Перевіряти оновлення:"
-#: gui/options.cpp:1600
+#: gui/options.cpp:1596
msgid "How often to check ScummVM updates"
msgstr "Як часто перевіряти оновлення ScummVM"
-#: gui/options.cpp:1612
+#: gui/options.cpp:1608
msgid "Check now"
msgstr "Перевірити зараз"
-#: gui/options.cpp:1620
+#: gui/options.cpp:1616
msgid "Cloud"
msgstr "Хмара"
-#: gui/options.cpp:1622
+#: gui/options.cpp:1618
msgctxt "lowres"
msgid "Cloud"
msgstr "Хмара"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Storage:"
msgstr "Середовище:"
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Active cloud storage"
msgstr "Активне хмарне середовище"
-#: gui/options.cpp:1634 gui/options.cpp:2210
+#: gui/options.cpp:1630 gui/options.cpp:2206
msgid "<none>"
msgstr "<немає>"
-#: gui/options.cpp:1638 backends/platform/wii/options.cpp:114
+#: gui/options.cpp:1634 backends/platform/wii/options.cpp:114
msgid "Username:"
msgstr "Користувач:"
-#: gui/options.cpp:1638
+#: gui/options.cpp:1634
msgid "Username used by this storage"
msgstr "Користувач для цього середовища"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Used space:"
msgstr "Використаний об'єм:"
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Space used by ScummVM's saved games on this storage"
msgstr ""
"Об'єм, використаний для збережених станів ігор ScummVM на цьому середовищі"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "Last sync time:"
msgstr "Остання синхронизація:"
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "When the last saved games sync for this storage occured"
msgstr "Час, коли було зроблено останню синхронизацію з цим середовищем"
-#: gui/options.cpp:1647 gui/storagewizarddialog.cpp:71
+#: gui/options.cpp:1643 gui/storagewizarddialog.cpp:71
msgid "Connect"
msgstr "Залучитись"
-#: gui/options.cpp:1647
+#: gui/options.cpp:1643
msgid "Open wizard dialog to connect your cloud storage account"
msgstr ""
"Розпочати кроки для залучення до вашого облікового засобу на хмарному "
"середовищі"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh"
msgstr "Поновити"
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh current cloud storage information (username and usage)"
msgstr "Поновити поточні дані хмарного середовища (ім'я користувача та об'єм)"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Download"
msgstr "Завантажити"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Open downloads manager dialog"
msgstr "Відкрити керування завантаженнями"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run server"
msgstr "Запустити сервер"
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run local webserver"
msgstr "Запускає локальний веб-сервер"
-#: gui/options.cpp:1652 gui/options.cpp:2320
+#: gui/options.cpp:1648 gui/options.cpp:2316
msgid "Not running"
msgstr "Вимкнено"
-#: gui/options.cpp:1656
+#: gui/options.cpp:1652
msgid "/root/ Path:"
msgstr "Шлях /root/:"
-#: gui/options.cpp:1656 gui/options.cpp:1658 gui/options.cpp:1659
+#: gui/options.cpp:1652 gui/options.cpp:1654 gui/options.cpp:1655
msgid "Specifies which directory the Files Manager can access"
msgstr "Вказує шлях, до якого можна мати доступ через Керування файлами"
-#: gui/options.cpp:1658
+#: gui/options.cpp:1654
msgctxt "lowres"
msgid "/root/ Path:"
msgstr "Корінний шлях:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid "Server's port:"
msgstr "Порт сервера:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid ""
"Which port is used by the server\n"
"Auth with server is not available with non-default port"
@@ -1308,27 +1308,27 @@ msgstr ""
"Порт, який буде використано сервером\n"
"Аутентифікация з сервером неможлива для портів, інших від замовчуваного"
-#: gui/options.cpp:1681
+#: gui/options.cpp:1677
msgid "Apply"
msgstr "Застосувати"
-#: gui/options.cpp:1824
+#: gui/options.cpp:1820
msgid "Failed to change cloud storage!"
msgstr "Не вдалося змінити хмарне середовище!"
-#: gui/options.cpp:1827
+#: gui/options.cpp:1823
msgid "Another cloud storage is already active."
msgstr "Інше хмарне середовище вже активне."
-#: gui/options.cpp:1895
+#: gui/options.cpp:1891
msgid "Theme does not support selected language!"
msgstr "Тема не підтримує обраної мови!"
-#: gui/options.cpp:1898
+#: gui/options.cpp:1894
msgid "Theme cannot be loaded!"
msgstr "Тему не було завантажено!"
-#: gui/options.cpp:1901
+#: gui/options.cpp:1897
msgid ""
"\n"
"Misc settings will be restored."
@@ -1336,48 +1336,48 @@ msgstr ""
"\n"
"Різні налаштування буде поновлено."
-#: gui/options.cpp:1937
+#: gui/options.cpp:1933
msgid "The chosen directory cannot be written to. Please select another one."
msgstr "Не можу писати у вибрану папку. Будь ласка, вкажіть іншу."
-#: gui/options.cpp:1946
+#: gui/options.cpp:1942
msgid "Select directory for GUI themes"
msgstr "Виберіть папку для тем GUI"
-#: gui/options.cpp:1956
+#: gui/options.cpp:1952
msgid "Select directory for extra files"
msgstr "Виберіть папку з додатковими файлами"
-#: gui/options.cpp:1967
+#: gui/options.cpp:1963
msgid "Select directory for plugins"
msgstr "Виберіть папку зі втулками"
-#: gui/options.cpp:1979
+#: gui/options.cpp:1975
msgid "Select directory for Files Manager /root/"
msgstr "Виберіть папку /root/ для Керування файлами"
-#: gui/options.cpp:2217
+#: gui/options.cpp:2213
#, c-format
msgid "%llu bytes"
msgstr "%llu байт"
-#: gui/options.cpp:2225
+#: gui/options.cpp:2221
msgid "<right now>"
msgstr "<зараз>"
-#: gui/options.cpp:2227
+#: gui/options.cpp:2223
msgid "<never>"
msgstr "<ніколи>"
-#: gui/options.cpp:2311
+#: gui/options.cpp:2307
msgid "Stop server"
msgstr "Вимкнути сервер"
-#: gui/options.cpp:2312
+#: gui/options.cpp:2308
msgid "Stop local webserver"
msgstr "Вимкнути локальний веб-сервер"
-#: gui/options.cpp:2403
+#: gui/options.cpp:2399
msgid ""
"Request failed.\n"
"Check your Internet connection."
@@ -1846,8 +1846,8 @@ msgstr "~П~овер.в головне меню"
#: 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:106
-#: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:658
+#: engines/mohawk/riven.cpp:545 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
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
#: engines/toon/toon.cpp:3340 engines/tsage/scenes.cpp:599
@@ -1866,9 +1866,9 @@ msgstr "Зберегти гру:"
#: engines/dm/loadsave.cpp:196 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:106 engines/neverhood/menumodule.cpp:880
-#: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:659
+#: engines/mohawk/dialogs.cpp:106 engines/mohawk/riven.cpp:545
+#: 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
#: engines/sherlock/scalpel/scalpel.cpp:1250
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
@@ -2182,7 +2182,7 @@ msgstr "Кліки вимкнено"
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Режим дотику у тачскріні - Проліт (клік DPad)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
msgid "Do you want to quit ?"
msgstr "Ви дійсно хочете вийти?"
@@ -3341,7 +3341,7 @@ msgstr ""
"У вас немає файлу 'extras.mhk'. Використання файлу 'arcriven.z' також "
"достатньо."
-#: engines/mohawk/riven.cpp:416
+#: engines/mohawk/riven.cpp:432
msgid "You are missing the following required Riven data files:\n"
msgstr ""
diff --git a/po/zh-Latn_CN.po b/po/zh-Latn_CN.po
index c87c620c36..2e50c39ad7 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: 2017-12-10 15:25+0100\n"
+"POT-Creation-Date: 2017-12-26 21:11+0100\n"
"PO-Revision-Date: 2016-12-26 19:38+0000\n"
"Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n"
"Language-Team: Chinese <https://translations.scummvm.org/projects/scummvm/"
@@ -58,7 +58,7 @@ msgstr "ShangYiJi"
#: gui/browser.cpp:75 gui/chooser.cpp:46 gui/editgamedialog.cpp:292
#: gui/editrecorddialog.cpp:67 gui/filebrowser-dialog.cpp:64
#: gui/fluidsynth-dialog.cpp:152 gui/KeysDialog.cpp:43 gui/massadd.cpp:95
-#: gui/options.cpp:1680 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
+#: gui/options.cpp:1676 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69
#: gui/recorderdialog.cpp:155 gui/remotebrowser.cpp:59
#: gui/saveload-dialog.cpp:383 gui/saveload-dialog.cpp:445
#: gui/saveload-dialog.cpp:727 gui/saveload-dialog.cpp:1121
@@ -117,7 +117,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -130,7 +130,7 @@ msgstr "Shi"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:310 gui/launcher.cpp:418 gui/launcher.cpp:477
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -151,7 +151,7 @@ msgstr ""
#: gui/downloaddialog.cpp:146 gui/editgamedialog.cpp:293
#: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:526
-#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1682
+#: gui/launcher.cpp:530 gui/massadd.cpp:92 gui/options.cpp:1678
#: gui/saveload-dialog.cpp:1122 engines/engine.cpp:443 engines/engine.cpp:454
#: backends/platform/wii/options.cpp:47
#: backends/platform/wince/CELauncherDialog.cpp:54
@@ -234,8 +234,8 @@ msgid ""
msgstr ""
"Youxi de Yuyan. CiXiang buhui jiang Yige XibanyaYu Banben Zhuancheng Yingwen"
-#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:997
-#: gui/options.cpp:1010 gui/options.cpp:1575 audio/null.cpp:41
+#: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:993
+#: gui/options.cpp:1006 gui/options.cpp:1571 audio/null.cpp:41
msgid "<default>"
msgstr "<Moren>"
@@ -257,11 +257,11 @@ msgstr "Pingtai:"
msgid "Engine"
msgstr "Yinqing"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "Graphics"
msgstr "Tuxiang"
-#: gui/editgamedialog.cpp:184 gui/options.cpp:1345 gui/options.cpp:1430
+#: gui/editgamedialog.cpp:184 gui/options.cpp:1341 gui/options.cpp:1426
msgid "GFX"
msgstr "GFX"
@@ -274,7 +274,7 @@ msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Fugai Quanju Tuxiang Shezhi"
-#: gui/editgamedialog.cpp:196 gui/options.cpp:1457
+#: gui/editgamedialog.cpp:196 gui/options.cpp:1453
msgid "Audio"
msgstr "Yinpin"
@@ -287,11 +287,11 @@ msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Fugai QUanju Yinpin Shezhi"
-#: gui/editgamedialog.cpp:210 gui/options.cpp:1462
+#: gui/editgamedialog.cpp:210 gui/options.cpp:1458
msgid "Volume"
msgstr "Yinliang"
-#: gui/editgamedialog.cpp:212 gui/options.cpp:1464
+#: gui/editgamedialog.cpp:212 gui/options.cpp:1460
msgctxt "lowres"
msgid "Volume"
msgstr "YinLiang"
@@ -305,7 +305,7 @@ msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Fugai Quanju YinLiang Shezhi"
-#: gui/editgamedialog.cpp:226 gui/options.cpp:1472
+#: gui/editgamedialog.cpp:226 gui/options.cpp:1468
msgid "MIDI"
msgstr "MIDI"
@@ -318,7 +318,7 @@ msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Fugai Quanju MIDI Shezhi"
-#: gui/editgamedialog.cpp:241 gui/options.cpp:1482
+#: gui/editgamedialog.cpp:241 gui/options.cpp:1478
msgid "MT-32"
msgstr "MT-32"
@@ -331,11 +331,11 @@ msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Fugai Quanju MT-32 Shezhi"
-#: gui/editgamedialog.cpp:255 gui/options.cpp:1489
+#: gui/editgamedialog.cpp:255 gui/options.cpp:1485
msgid "Paths"
msgstr "Lujing"
-#: gui/editgamedialog.cpp:257 gui/options.cpp:1491
+#: gui/editgamedialog.cpp:257 gui/options.cpp:1487
msgctxt "lowres"
msgid "Paths"
msgstr "Lujing"
@@ -349,7 +349,7 @@ msgctxt "lowres"
msgid "Game Path:"
msgstr "Youxi Lujing:"
-#: gui/editgamedialog.cpp:271 gui/options.cpp:1515
+#: gui/editgamedialog.cpp:271 gui/options.cpp:1511
msgid "Extra Path:"
msgstr "Qita Lujing:"
@@ -358,44 +358,44 @@ msgstr "Qita Lujing:"
msgid "Specifies path to additional data used by the game"
msgstr "Zhiding Youxi Suoyong de Shuju de Cunfang Lujing"
-#: gui/editgamedialog.cpp:273 gui/options.cpp:1517
+#: gui/editgamedialog.cpp:273 gui/options.cpp:1513
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Qita Lujing:"
-#: gui/editgamedialog.cpp:280 gui/options.cpp:1499
+#: gui/editgamedialog.cpp:280 gui/options.cpp:1495
msgid "Save Path:"
msgstr "Baocun Lujing:"
#: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282
-#: gui/editgamedialog.cpp:283 gui/options.cpp:1499 gui/options.cpp:1501
-#: gui/options.cpp:1502
+#: gui/editgamedialog.cpp:283 gui/options.cpp:1495 gui/options.cpp:1497
+#: gui/options.cpp:1498
msgid "Specifies where your saved games are put"
msgstr "Zhiding Nin Jiang Youxi Baocun Zai le Nali"
-#: gui/editgamedialog.cpp:282 gui/options.cpp:1501
+#: gui/editgamedialog.cpp:282 gui/options.cpp:1497
msgctxt "lowres"
msgid "Save Path:"
msgstr "Baocun Lujing:"
#: gui/editgamedialog.cpp:301 gui/editgamedialog.cpp:398
-#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1510
-#: gui/options.cpp:1518 gui/options.cpp:1527 gui/options.cpp:1707
-#: gui/options.cpp:1713 gui/options.cpp:1721 gui/options.cpp:1744
-#: gui/options.cpp:1777 gui/options.cpp:1783 gui/options.cpp:1790
-#: gui/options.cpp:1798 gui/options.cpp:1993 gui/options.cpp:1996
-#: gui/options.cpp:2003 gui/options.cpp:2013
+#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1506
+#: gui/options.cpp:1514 gui/options.cpp:1523 gui/options.cpp:1703
+#: gui/options.cpp:1709 gui/options.cpp:1717 gui/options.cpp:1740
+#: gui/options.cpp:1773 gui/options.cpp:1779 gui/options.cpp:1786
+#: gui/options.cpp:1794 gui/options.cpp:1989 gui/options.cpp:1992
+#: gui/options.cpp:1999 gui/options.cpp:2009
msgctxt "path"
msgid "None"
msgstr "Wu"
#: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404
-#: gui/editgamedialog.cpp:522 gui/options.cpp:1701 gui/options.cpp:1771
-#: gui/options.cpp:1999 backends/platform/wii/options.cpp:56
+#: gui/editgamedialog.cpp:522 gui/options.cpp:1697 gui/options.cpp:1767
+#: gui/options.cpp:1995 backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Moren"
-#: gui/editgamedialog.cpp:450 gui/options.cpp:2007
+#: gui/editgamedialog.cpp:450 gui/options.cpp:2003
msgid "Select SoundFont"
msgstr "Xuanze SoundFont"
@@ -403,7 +403,7 @@ msgstr "Xuanze SoundFont"
msgid "Select additional game directory"
msgstr "Xuanze Qita Youxi Mulu"
-#: gui/editgamedialog.cpp:502 gui/options.cpp:1930
+#: gui/editgamedialog.cpp:502 gui/options.cpp:1926
msgid "Select directory for saved games"
msgstr "Xuanze Youxi Baocun Mulu"
@@ -493,7 +493,7 @@ msgstr "Zhengxian"
msgid "Triangle"
msgstr "Sanjiaoxing"
-#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1535
+#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1531
msgid "Misc"
msgstr "Zaxiang"
@@ -670,7 +670,7 @@ msgid "Search:"
msgstr "Sousuo:"
#: gui/launcher.cpp:200 engines/dialogs.cpp:115 engines/cruise/menu.cpp:214
-#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:517
+#: engines/mohawk/dialogs.cpp:105 engines/mohawk/riven.cpp:533
#: engines/pegasus/pegasus.cpp:355 engines/tsage/scenes.cpp:601
#: engines/wage/saveload.cpp:748
msgid "Load game:"
@@ -680,7 +680,7 @@ msgstr "Jiazai Youxi:"
#: backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
#: engines/cruise/menu.cpp:214 engines/mohawk/dialogs.cpp:105
-#: engines/mohawk/riven.cpp:517 engines/parallaction/saveload.cpp:194
+#: engines/mohawk/riven.cpp:533 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
msgid "Load"
@@ -789,215 +789,215 @@ msgstr "Mei 15 Fenzhong"
msgid "every 30 mins"
msgstr "Mei 30 Fenzhong"
-#: gui/options.cpp:343 gui/options.cpp:640 gui/options.cpp:778
-#: gui/options.cpp:853 gui/options.cpp:1114
+#: gui/options.cpp:339 gui/options.cpp:636 gui/options.cpp:774
+#: gui/options.cpp:849 gui/options.cpp:1110
msgctxt "soundfont"
msgid "None"
msgstr "Wu"
-#: gui/options.cpp:514
+#: gui/options.cpp:510
msgid "Failed to apply some of the graphic options changes:"
msgstr "Tuxing Xuanxiang Genggai Shibai:"
-#: gui/options.cpp:526
+#: gui/options.cpp:522
msgid "the video mode could not be changed."
msgstr "Shipin Moshi Wufa Genggai."
-#: gui/options.cpp:532
+#: gui/options.cpp:528
msgid "the aspect ratio setting could not be changed"
msgstr "Bili Xuanxiang Wufa Genggai"
-#: gui/options.cpp:538
+#: gui/options.cpp:534
msgid "the fullscreen setting could not be changed"
msgstr "Quanping Shezhi Wufa Genggai"
-#: gui/options.cpp:544
+#: gui/options.cpp:540
#, fuzzy
msgid "the filtering setting could not be changed"
msgstr "Quanping Shezhi Wufa Genggai"
-#: gui/options.cpp:932
+#: gui/options.cpp:928
msgid "Show On-screen control"
msgstr ""
-#: gui/options.cpp:936
+#: gui/options.cpp:932
#, fuzzy
msgid "Touchpad mouse mode"
msgstr "Jinyong Chumoban Moshi."
-#: gui/options.cpp:940
+#: gui/options.cpp:936
msgid "Swap Menu and Back buttons"
msgstr ""
-#: gui/options.cpp:945
+#: gui/options.cpp:941
#, fuzzy
msgid "Pointer Speed:"
msgstr "Sudu:"
-#: gui/options.cpp:945 gui/options.cpp:947 gui/options.cpp:948
+#: gui/options.cpp:941 gui/options.cpp:943 gui/options.cpp:944
msgid "Speed for keyboard/joystick mouse pointer control"
msgstr ""
-#: gui/options.cpp:947
+#: gui/options.cpp:943
#, fuzzy
msgctxt "lowres"
msgid "Pointer Speed:"
msgstr "Sudu:"
-#: gui/options.cpp:958
+#: gui/options.cpp:954
msgid "Joy Deadzone:"
msgstr ""
-#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
+#: gui/options.cpp:954 gui/options.cpp:956 gui/options.cpp:957
msgid "Analog joystick Deadzone"
msgstr ""
-#: gui/options.cpp:960
+#: gui/options.cpp:956
msgctxt "lowres"
msgid "Joy Deadzone:"
msgstr ""
-#: gui/options.cpp:974
+#: gui/options.cpp:970
msgid "HW Shader:"
msgstr ""
-#: gui/options.cpp:974 gui/options.cpp:976
+#: gui/options.cpp:970 gui/options.cpp:972
msgid "Different hardware shaders give different visual effects"
msgstr ""
-#: gui/options.cpp:976
+#: gui/options.cpp:972
msgctxt "lowres"
msgid "HW Shader:"
msgstr ""
-#: gui/options.cpp:977
+#: gui/options.cpp:973
msgid "Different shaders give different visual effects"
msgstr ""
-#: gui/options.cpp:994
+#: gui/options.cpp:990
msgid "Graphics mode:"
msgstr "Tuxing Moshi:"
-#: gui/options.cpp:1008
+#: gui/options.cpp:1004
msgid "Render mode:"
msgstr "Xuanran Moshi:"
-#: gui/options.cpp:1008 gui/options.cpp:1009
+#: gui/options.cpp:1004 gui/options.cpp:1005
msgid "Special dithering modes supported by some games"
msgstr "Youxi Zhichi Teshu de Doudong Moshi"
-#: gui/options.cpp:1020 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
+#: gui/options.cpp:1016 backends/graphics/openglsdl/openglsdl-graphics.cpp:588
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2590
msgid "Fullscreen mode"
msgstr "Quanping Moshi"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
#, fuzzy
msgid "Filter graphics"
msgstr "Tuxiang"
-#: gui/options.cpp:1023
+#: gui/options.cpp:1019
msgid "Use linear filtering when scaling graphics"
msgstr ""
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Aspect ratio correction"
msgstr "Bili Jiaozheng"
-#: gui/options.cpp:1026
+#: gui/options.cpp:1022
msgid "Correct aspect ratio for 320x200 games"
msgstr "320x200 Youxi Bili Jiaozheng"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Preferred Device:"
msgstr "Youxian Shebei:"
-#: gui/options.cpp:1034
+#: gui/options.cpp:1030
msgid "Music Device:"
msgstr "Yinyue Shebei:"
-#: gui/options.cpp:1034 gui/options.cpp:1036
+#: gui/options.cpp:1030 gui/options.cpp:1032
msgid "Specifies preferred sound device or sound card emulator"
msgstr "Zhiding Youxian Shengyin Shebei huo Shengka Moniqi"
-#: gui/options.cpp:1034 gui/options.cpp:1036 gui/options.cpp:1037
+#: gui/options.cpp:1030 gui/options.cpp:1032 gui/options.cpp:1033
msgid "Specifies output sound device or sound card emulator"
msgstr "Zhiding Shuchu Shengyin Shebei huo Shengka Moniqi"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Youxian Shebei:"
-#: gui/options.cpp:1036
+#: gui/options.cpp:1032
msgctxt "lowres"
msgid "Music Device:"
msgstr "Yinyue Shebei:"
-#: gui/options.cpp:1063
+#: gui/options.cpp:1059
msgid "AdLib emulator:"
msgstr "AdLib Moniqi:"
-#: gui/options.cpp:1063 gui/options.cpp:1064
+#: gui/options.cpp:1059 gui/options.cpp:1060
msgid "AdLib is used for music in many games"
msgstr "AdLib bei Henduo Youxi Yonglai Bofang Yinyue"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "GM Device:"
msgstr "GM Shebei:"
-#: gui/options.cpp:1077
+#: gui/options.cpp:1073
msgid "Specifies default sound device for General MIDI output"
msgstr "Zhiding Tongyong MIDI Shuchu Moren Shengyin Shebei"
-#: gui/options.cpp:1088
+#: gui/options.cpp:1084
msgid "Don't use General MIDI music"
msgstr "Buyao Shiyong Tongyong MIDI Yinyue"
-#: gui/options.cpp:1099 gui/options.cpp:1161
+#: gui/options.cpp:1095 gui/options.cpp:1157
msgid "Use first available device"
msgstr "Shiyong Diyige keyong de Shebei"
-#: gui/options.cpp:1111
+#: gui/options.cpp:1107
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1111 gui/options.cpp:1113 gui/options.cpp:1114
+#: gui/options.cpp:1107 gui/options.cpp:1109 gui/options.cpp:1110
msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity"
msgstr "Yixie Shengka Zhichi SoundFont, Biru FluidSynth He Timidity"
-#: gui/options.cpp:1113
+#: gui/options.cpp:1109
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Mixed AdLib/MIDI mode"
msgstr "Hunhe AdLib/MIDI Moshi"
-#: gui/options.cpp:1119
+#: gui/options.cpp:1115
msgid "Use both MIDI and AdLib sound generation"
msgstr "TongShi Shiyong MIDI He AdLib Shengyin Shengcheng"
-#: gui/options.cpp:1122
+#: gui/options.cpp:1118
msgid "MIDI gain:"
msgstr "MIDI gain:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "MT-32 Device:"
msgstr "MT-32 Shebei:"
-#: gui/options.cpp:1132
+#: gui/options.cpp:1128
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
"QIng Zhiding Yongyu Roland MT-32/LAPC1/CM32I/CM64 Shuchu de Moren Shengyin "
"Shebei"
-#: gui/options.cpp:1137
+#: gui/options.cpp:1133
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Zhen Roland MT-32 (Jinyong GM Moni)"
-#: gui/options.cpp:1137 gui/options.cpp:1139
+#: gui/options.cpp:1133 gui/options.cpp:1135
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -1005,16 +1005,16 @@ msgstr ""
"Jiancha Shifou Nin Xiang Shiyong Lianjie Dao Jisuanji de Zhenshi de Yingjian "
"Roland Jianrong Shengyin Shebei"
-#: gui/options.cpp:1139
+#: gui/options.cpp:1135
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Zhen Roland MT-32 Shebei (Wu GM Moni)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid "Roland GS Device (enable MT-32 mappings)"
msgstr "Roland GS Shebei (Qiyong MT-32 Yingshe)"
-#: gui/options.cpp:1142
+#: gui/options.cpp:1138
msgid ""
"Check if you want to enable patch mappings to emulate an MT-32 on a Roland "
"GS device"
@@ -1022,357 +1022,357 @@ msgstr ""
"Jiancha Shifou Nin Xiang Qiyong patch Yingshe Lai Zai Roland GS Shebei "
"Shangmian Moni MT-32"
-#: gui/options.cpp:1151
+#: gui/options.cpp:1147
msgid "Don't use Roland MT-32 music"
msgstr "Buyao Shiyong Roland MT-32 Yinyue"
-#: gui/options.cpp:1178
+#: gui/options.cpp:1174
msgid "Text and Speech:"
msgstr "Wenzi he Yuyin:"
-#: gui/options.cpp:1182 gui/options.cpp:1192
+#: gui/options.cpp:1178 gui/options.cpp:1188
msgid "Speech"
msgstr "Yuyin"
-#: gui/options.cpp:1183 gui/options.cpp:1193
+#: gui/options.cpp:1179 gui/options.cpp:1189
msgid "Subtitles"
msgstr "Zimu"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1180
msgid "Both"
msgstr "Liangzhe"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1182
msgid "Subtitle speed:"
msgstr "Zimu Sudu:"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1184
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Wenben he Yuyin:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1188
msgid "Spch"
msgstr "Zimu"
-#: gui/options.cpp:1193
+#: gui/options.cpp:1189
msgid "Subs"
msgstr "Yuyin"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgctxt "lowres"
msgid "Both"
msgstr "Dou"
-#: gui/options.cpp:1194
+#: gui/options.cpp:1190
msgid "Show subtitles and play speech"
msgstr "Xianshi Zimu Bing Bofang Yuyin"
-#: gui/options.cpp:1196
+#: gui/options.cpp:1192
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Zimu Sudu:"
-#: gui/options.cpp:1212
+#: gui/options.cpp:1208
msgid "Music volume:"
msgstr "Yinyue Yinliang:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1210
msgctxt "lowres"
msgid "Music volume:"
msgstr "Yinyue Yinliang:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1217
msgid "Mute All"
msgstr "Quanbu Jinyin"
-#: gui/options.cpp:1224
+#: gui/options.cpp:1220
msgid "SFX volume:"
msgstr "Yinxiao Yinliang:"
-#: gui/options.cpp:1224 gui/options.cpp:1226 gui/options.cpp:1227
+#: gui/options.cpp:1220 gui/options.cpp:1222 gui/options.cpp:1223
msgid "Special sound effects volume"
msgstr "Texiao Yinliang"
-#: gui/options.cpp:1226
+#: gui/options.cpp:1222
msgctxt "lowres"
msgid "SFX volume:"
msgstr "Yinxiao Yinliang:"
-#: gui/options.cpp:1234
+#: gui/options.cpp:1230
msgid "Speech volume:"
msgstr "Yuyin Yinliang:"
-#: gui/options.cpp:1236
+#: gui/options.cpp:1232
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Yuyin Yinliang:"
-#: gui/options.cpp:1438
+#: gui/options.cpp:1434
msgid "Shader"
msgstr ""
-#: gui/options.cpp:1450
+#: gui/options.cpp:1446
#, fuzzy
msgid "Control"
msgstr "Kongzhi Shubiao"
-#: gui/options.cpp:1476
+#: gui/options.cpp:1472
msgid "FluidSynth Settings"
msgstr "FluidSynth Xuanxiang"
-#: gui/options.cpp:1507
+#: gui/options.cpp:1503
msgid "Theme Path:"
msgstr "Zhuti Lujing:"
-#: gui/options.cpp:1509
+#: gui/options.cpp:1505
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Zhuti Lujing:"
-#: gui/options.cpp:1515 gui/options.cpp:1517 gui/options.cpp:1518
+#: gui/options.cpp:1511 gui/options.cpp:1513 gui/options.cpp:1514
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr "Zhiding Suoyou Youxi huo ScummVM de Shuju Lujing"
-#: gui/options.cpp:1524
+#: gui/options.cpp:1520
msgid "Plugins Path:"
msgstr "Chajian Lujing:"
-#: gui/options.cpp:1526
+#: gui/options.cpp:1522
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Chajian Lujing:"
-#: gui/options.cpp:1537
+#: gui/options.cpp:1533
msgctxt "lowres"
msgid "Misc"
msgstr "Zaxiang"
-#: gui/options.cpp:1539
+#: gui/options.cpp:1535
msgid "Theme:"
msgstr "Zhuti:"
-#: gui/options.cpp:1543
+#: gui/options.cpp:1539
msgid "GUI Renderer:"
msgstr "Jiemian Xuanran:"
-#: gui/options.cpp:1555
+#: gui/options.cpp:1551
msgid "Autosave:"
msgstr "Zidong Baocun:"
-#: gui/options.cpp:1557
+#: gui/options.cpp:1553
msgctxt "lowres"
msgid "Autosave:"
msgstr "Zidong Baocun:"
-#: gui/options.cpp:1565
+#: gui/options.cpp:1561
msgid "Keys"
msgstr "Guanjianzi"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "GUI Language:"
msgstr "Jiemian Yuyan:"
-#: gui/options.cpp:1572
+#: gui/options.cpp:1568
msgid "Language of ScummVM GUI"
msgstr "ScummVM Jiemian Yuyan"
-#: gui/options.cpp:1600 gui/updates-dialog.cpp:86
+#: gui/options.cpp:1596 gui/updates-dialog.cpp:86
msgid "Update check:"
msgstr ""
-#: gui/options.cpp:1600
+#: gui/options.cpp:1596
msgid "How often to check ScummVM updates"
msgstr ""
-#: gui/options.cpp:1612
+#: gui/options.cpp:1608
msgid "Check now"
msgstr ""
-#: gui/options.cpp:1620
+#: gui/options.cpp:1616
msgid "Cloud"
msgstr ""
-#: gui/options.cpp:1622
+#: gui/options.cpp:1618
msgctxt "lowres"
msgid "Cloud"
msgstr ""
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Storage:"
msgstr ""
-#: gui/options.cpp:1627
+#: gui/options.cpp:1623
msgid "Active cloud storage"
msgstr ""
-#: gui/options.cpp:1634 gui/options.cpp:2210
+#: gui/options.cpp:1630 gui/options.cpp:2206
msgid "<none>"
msgstr ""
-#: gui/options.cpp:1638 backends/platform/wii/options.cpp:114
+#: gui/options.cpp:1634 backends/platform/wii/options.cpp:114
msgid "Username:"
msgstr "Yonghuming:"
-#: gui/options.cpp:1638
+#: gui/options.cpp:1634
msgid "Username used by this storage"
msgstr ""
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Used space:"
msgstr ""
-#: gui/options.cpp:1641
+#: gui/options.cpp:1637
msgid "Space used by ScummVM's saved games on this storage"
msgstr ""
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "Last sync time:"
msgstr ""
-#: gui/options.cpp:1644
+#: gui/options.cpp:1640
msgid "When the last saved games sync for this storage occured"
msgstr ""
-#: gui/options.cpp:1647 gui/storagewizarddialog.cpp:71
+#: gui/options.cpp:1643 gui/storagewizarddialog.cpp:71
msgid "Connect"
msgstr ""
-#: gui/options.cpp:1647
+#: gui/options.cpp:1643
msgid "Open wizard dialog to connect your cloud storage account"
msgstr ""
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh"
msgstr ""
-#: gui/options.cpp:1648
+#: gui/options.cpp:1644
msgid "Refresh current cloud storage information (username and usage)"
msgstr ""
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
#, fuzzy
msgid "Download"
msgstr "Xia"
-#: gui/options.cpp:1649
+#: gui/options.cpp:1645
msgid "Open downloads manager dialog"
msgstr ""
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run server"
msgstr ""
-#: gui/options.cpp:1651
+#: gui/options.cpp:1647
msgid "Run local webserver"
msgstr ""
-#: gui/options.cpp:1652 gui/options.cpp:2320
+#: gui/options.cpp:1648 gui/options.cpp:2316
#, fuzzy
msgid "Not running"
msgstr "Youxi Yunxing Cuowu:"
-#: gui/options.cpp:1656
+#: gui/options.cpp:1652
#, fuzzy
msgid "/root/ Path:"
msgstr "Qita Lujing:"
-#: gui/options.cpp:1656 gui/options.cpp:1658 gui/options.cpp:1659
+#: gui/options.cpp:1652 gui/options.cpp:1654 gui/options.cpp:1655
#, fuzzy
msgid "Specifies which directory the Files Manager can access"
msgstr "Zhiding Nin Jiang Youxi Baocun Zai le Nali"
-#: gui/options.cpp:1658
+#: gui/options.cpp:1654
#, fuzzy
msgctxt "lowres"
msgid "/root/ Path:"
msgstr "Qita Lujing:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
#, fuzzy
msgid "Server's port:"
msgstr "Fuwuqi:"
-#: gui/options.cpp:1668
+#: gui/options.cpp:1664
msgid ""
"Which port is used by the server\n"
"Auth with server is not available with non-default port"
msgstr ""
-#: gui/options.cpp:1681
+#: gui/options.cpp:1677
msgid "Apply"
msgstr ""
-#: gui/options.cpp:1824
+#: gui/options.cpp:1820
#, fuzzy
msgid "Failed to change cloud storage!"
msgstr "Wufa baocun Youxi"
-#: gui/options.cpp:1827
+#: gui/options.cpp:1823
msgid "Another cloud storage is already active."
msgstr ""
-#: gui/options.cpp:1895
+#: gui/options.cpp:1891
#, fuzzy
msgid "Theme does not support selected language!"
msgstr "Yingqing Chajian Buzhichi Baocun Zhuangtai"
-#: gui/options.cpp:1898
+#: gui/options.cpp:1894
#, fuzzy
msgid "Theme cannot be loaded!"
msgstr "Youxi Meiyou Jiazai"
-#: gui/options.cpp:1901
+#: gui/options.cpp:1897
msgid ""
"\n"
"Misc settings will be restored."
msgstr ""
-#: gui/options.cpp:1937
+#: gui/options.cpp:1933
msgid "The chosen directory cannot be written to. Please select another one."
msgstr "Zhiding de Mulu Buneng Xieru. Qing Xuanze Qita de Mulu."
-#: gui/options.cpp:1946
+#: gui/options.cpp:1942
msgid "Select directory for GUI themes"
msgstr "Xuanze Jiemian Zhuti de Mulu"
-#: gui/options.cpp:1956
+#: gui/options.cpp:1952
msgid "Select directory for extra files"
msgstr "Xuanze QIta Wenjian Mulu"
-#: gui/options.cpp:1967
+#: gui/options.cpp:1963
msgid "Select directory for plugins"
msgstr "Xuanze Chajian Mulu"
-#: gui/options.cpp:1979
+#: gui/options.cpp:1975
#, fuzzy
msgid "Select directory for Files Manager /root/"
msgstr "Xuanze QIta Wenjian Mulu"
-#: gui/options.cpp:2217
+#: gui/options.cpp:2213
#, c-format
msgid "%llu bytes"
msgstr ""
-#: gui/options.cpp:2225
+#: gui/options.cpp:2221
msgid "<right now>"
msgstr ""
-#: gui/options.cpp:2227
+#: gui/options.cpp:2223
#, fuzzy
msgid "<never>"
msgstr "Yongbu"
-#: gui/options.cpp:2311
+#: gui/options.cpp:2307
#, fuzzy
msgid "Stop server"
msgstr "Fuwuqi:"
-#: gui/options.cpp:2312
+#: gui/options.cpp:2308
msgid "Stop local webserver"
msgstr ""
-#: gui/options.cpp:2403
+#: gui/options.cpp:2399
msgid ""
"Request failed.\n"
"Check your Internet connection."
@@ -1834,8 +1834,8 @@ msgstr "~R~Fanhui Qidongqi"
#: 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:106
-#: engines/neverhood/menumodule.cpp:880 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:658
+#: engines/mohawk/riven.cpp:545 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
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
#: engines/toon/toon.cpp:3340 engines/tsage/scenes.cpp:599
@@ -1854,9 +1854,9 @@ msgstr "Baocun Youxi:"
#: engines/dm/loadsave.cpp:196 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:106 engines/neverhood/menumodule.cpp:880
-#: engines/parallaction/saveload.cpp:209 engines/pegasus/pegasus.cpp:379
-#: engines/sci/engine/guest_additions.cpp:659
+#: engines/mohawk/dialogs.cpp:106 engines/mohawk/riven.cpp:545
+#: 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
#: engines/sherlock/scalpel/scalpel.cpp:1250
#: engines/sherlock/tattoo/widget_files.cpp:75 engines/toltecs/menu.cpp:291
@@ -2169,7 +2169,7 @@ msgstr "Jinyong Dianji"
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Chuping 'Chumo Moshi' - Xuanting (Shoubing Dianji)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:190
+#: backends/events/symbiansdl/symbiansdl-events.cpp:192
msgid "Do you want to quit ?"
msgstr "Nin Zhende Yao Tuichu Ma?"
@@ -3329,7 +3329,7 @@ msgid ""
"works."
msgstr ""
-#: engines/mohawk/riven.cpp:416
+#: engines/mohawk/riven.cpp:432
msgid "You are missing the following required Riven data files:\n"
msgstr ""