diff options
195 files changed, 6390 insertions, 5099 deletions
diff --git a/backends/events/androidsdl/androidsdl-events.cpp b/backends/events/androidsdl/androidsdl-events.cpp index 0adcff817e..125f411289 100644 --- a/backends/events/androidsdl/androidsdl-events.cpp +++ b/backends/events/androidsdl/androidsdl-events.cpp @@ -26,7 +26,6 @@ #include "backends/events/androidsdl/androidsdl-events.h" #include "backends/platform/androidsdl/androidsdl-sdl.h" -#include <SDL_screenkeyboard.h> bool AndroidSdlEventSource::handleMouseButtonDown(SDL_Event &ev, Common::Event &event) { if (ev.button.button == SDL_BUTTON_LEFT) @@ -43,16 +42,8 @@ bool AndroidSdlEventSource::handleMouseButtonDown(SDL_Event &ev, Common::Event & else if (ev.button.button == SDL_BUTTON_MIDDLE) { event.type = Common::EVENT_MBUTTONDOWN; - static int show_onscreen = 0; - if (show_onscreen == 0) { - SDL_ANDROID_SetScreenKeyboardShown(0); - show_onscreen++; - } else if (show_onscreen==1) { - SDL_ANDROID_SetScreenKeyboardShown(1); - show_onscreen++; - } - if (show_onscreen == 2) - show_onscreen = 0; + const bool show_onscreen = g_system->getFeatureState(OSystem::kFeatureOnScreenControl); + g_system->setFeatureState(OSystem::kFeatureOnScreenControl, !show_onscreen); } #endif else diff --git a/backends/events/dinguxsdl/dinguxsdl-events.cpp b/backends/events/dinguxsdl/dinguxsdl-events.cpp index 0492c569e1..7730e8f915 100644 --- a/backends/events/dinguxsdl/dinguxsdl-events.cpp +++ b/backends/events/dinguxsdl/dinguxsdl-events.cpp @@ -72,54 +72,54 @@ bool DINGUXSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) { if (ev.key.keysym.sym == PAD_UP) { if (ev.type == SDL_KEYDOWN) { - _km.y_vel = -1; + _km.y_vel = -1 * MULTIPLIER; _km.y_down_count = 1; } else { - _km.y_vel = 0; + _km.y_vel = 0 * MULTIPLIER; _km.y_down_count = 0; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); return true; } else if (ev.key.keysym.sym == PAD_DOWN) { if (ev.type == SDL_KEYDOWN) { - _km.y_vel = 1; + _km.y_vel = 1 * MULTIPLIER; _km.y_down_count = 1; } else { - _km.y_vel = 0; + _km.y_vel = 0 * MULTIPLIER; _km.y_down_count = 0; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); return true; } else if (ev.key.keysym.sym == PAD_LEFT) { if (ev.type == SDL_KEYDOWN) { - _km.x_vel = -1; + _km.x_vel = -1 * MULTIPLIER; _km.x_down_count = 1; } else { - _km.x_vel = 0; + _km.x_vel = 0 * MULTIPLIER; _km.x_down_count = 0; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); return true; } else if (ev.key.keysym.sym == PAD_RIGHT) { if (ev.type == SDL_KEYDOWN) { - _km.x_vel = 1; + _km.x_vel = 1 * MULTIPLIER; _km.x_down_count = 1; } else { - _km.x_vel = 0; + _km.x_vel = 0 * MULTIPLIER; _km.x_down_count = 0; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); return true; } else if (ev.key.keysym.sym == BUT_Y) { // left mouse button @@ -129,7 +129,7 @@ bool DINGUXSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) { event.type = Common::EVENT_LBUTTONUP; } - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); return true; } else if (ev.key.keysym.sym == BUT_B) { // right mouse button @@ -139,7 +139,7 @@ bool DINGUXSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) { event.type = Common::EVENT_RBUTTONUP; } - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); return true; } else if (ev.key.keysym.sym == BUT_X) { // '.' skip dialogue diff --git a/backends/events/gph/gph-events.cpp b/backends/events/gph/gph-events.cpp index 88fc97d3d1..d59d0bead5 100644 --- a/backends/events/gph/gph-events.cpp +++ b/backends/events/gph/gph-events.cpp @@ -230,116 +230,116 @@ bool GPHEventSource::handleJoyButtonDown(SDL_Event &ev, Common::Event &event) { switch (ev.jbutton.button) { case BUTTON_UP: if (_km.y_down_count != 2) { - _km.y_vel = -1; + _km.y_vel = -1 * MULTIPLIER; _km.y_down_count = 1; } else { - _km.y_vel = -4; + _km.y_vel = -4 * MULTIPLIER; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BUTTON_DOWN: if (_km.y_down_count != 2) { - _km.y_vel = 1; + _km.y_vel = 1 * MULTIPLIER; _km.y_down_count = 1; } else { - _km.y_vel = 4; + _km.y_vel = 4 * MULTIPLIER; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BUTTON_LEFT: if (_km.x_down_count != 2) { - _km.x_vel = -1; + _km.x_vel = -1 * MULTIPLIER; _km.x_down_count = 1; } else { - _km.x_vel = -4; + _km.x_vel = -4 * MULTIPLIER; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BUTTON_RIGHT: if (_km.x_down_count != 3) { - _km.x_vel = 1; + _km.x_vel = 1 * MULTIPLIER; _km.x_down_count = 1; } else { - _km.x_vel = 4; + _km.x_vel = 4 * MULTIPLIER; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BUTTON_UPLEFT: if (_km.x_down_count != 2) { - _km.x_vel = -1; + _km.x_vel = -1 * MULTIPLIER; _km.x_down_count = 1; } else { - _km.x_vel = -4; + _km.x_vel = -4 * MULTIPLIER; } if (_km.y_down_count != 2) { - _km.y_vel = -1; + _km.y_vel = -1 * MULTIPLIER; _km.y_down_count = 1; } else { - _km.y_vel = -4; + _km.y_vel = -4 * MULTIPLIER; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BUTTON_UPRIGHT: if (_km.x_down_count != 2) { - _km.x_vel = 1; + _km.x_vel = 1 * MULTIPLIER; _km.x_down_count = 1; } else { - _km.x_vel = 4; + _km.x_vel = 4 * MULTIPLIER; } if (_km.y_down_count != 2) { - _km.y_vel = -1; + _km.y_vel = -1 * MULTIPLIER; _km.y_down_count = 1; } else { - _km.y_vel = -4; + _km.y_vel = -4 * MULTIPLIER; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BUTTON_DOWNLEFT: if (_km.x_down_count != 2) { - _km.x_vel = -1; + _km.x_vel = -1 * MULTIPLIER; _km.x_down_count = 1; } else { - _km.x_vel = -4; + _km.x_vel = -4 * MULTIPLIER; } if (_km.y_down_count != 2) { - _km.y_vel = 1; + _km.y_vel = 1 * MULTIPLIER; _km.y_down_count = 1; } else { - _km.y_vel = 4; + _km.y_vel = 4 * MULTIPLIER; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BUTTON_DOWNRIGHT: if (_km.x_down_count != 2) { - _km.x_vel = 1; + _km.x_vel = 1 * MULTIPLIER; _km.x_down_count = 1; } else { - _km.x_vel = 4; + _km.x_vel = 4 * MULTIPLIER; } if (_km.y_down_count != 2) { - _km.y_vel = 1; + _km.y_vel = 1 * MULTIPLIER; _km.y_down_count = 1; } else { - _km.y_vel = 4; + _km.y_vel = 4 * MULTIPLIER; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BUTTON_B: case BUTTON_CLICK: event.type = Common::EVENT_LBUTTONDOWN; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BUTTON_X: event.type = Common::EVENT_RBUTTONDOWN; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BUTTON_L: BUTTON_STATE_L = true; @@ -454,16 +454,16 @@ bool GPHEventSource::handleJoyButtonUp(SDL_Event &ev, Common::Event &event) { _km.x_vel = 0; _km.x_down_count = 0; event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BUTTON_B: case BUTTON_CLICK: event.type = Common::EVENT_LBUTTONUP; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BUTTON_X: event.type = Common::EVENT_RBUTTONUP; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BUTTON_L: BUTTON_STATE_L = false; diff --git a/backends/events/linuxmotosdl/linuxmotosdl-events.cpp b/backends/events/linuxmotosdl/linuxmotosdl-events.cpp index b0d443ff9f..00453a036c 100644 --- a/backends/events/linuxmotosdl/linuxmotosdl-events.cpp +++ b/backends/events/linuxmotosdl/linuxmotosdl-events.cpp @@ -130,53 +130,53 @@ bool LinuxmotoSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) { // Joystick to Mouse else if (ev.key.keysym.sym == SDLK_LEFT) { if (ev.type == SDL_KEYDOWN) { - _km.x_vel = -1; + _km.x_vel = -1 * MULTIPLIER; _km.x_down_count = 1; } else { - _km.x_vel = 0; + _km.x_vel = 0 * MULTIPLIER; _km.x_down_count = 0; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); return true; } else if (ev.key.keysym.sym == SDLK_RIGHT) { if (ev.type == SDL_KEYDOWN) { - _km.x_vel = 1; + _km.x_vel = 1 * MULTIPLIER; _km.x_down_count = 1; } else { - _km.x_vel = 0; + _km.x_vel = 0 * MULTIPLIER; _km.x_down_count = 0; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); return true; } else if (ev.key.keysym.sym == SDLK_DOWN) { if (ev.type == SDL_KEYDOWN) { - _km.y_vel = 1; + _km.y_vel = 1 * MULTIPLIER; _km.y_down_count = 1; } else { - _km.y_vel = 0; + _km.y_vel = 0 * MULTIPLIER; _km.y_down_count = 0; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); return true; } else if (ev.key.keysym.sym == SDLK_UP) { if (ev.type == SDL_KEYDOWN) { - _km.y_vel = -1; + _km.y_vel = -1 * MULTIPLIER; _km.y_down_count = 1; } else { - _km.y_vel = 0; + _km.y_vel = 0 * MULTIPLIER; _km.y_down_count = 0; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); return true; } else if (ev.key.keysym.sym == SDLK_RETURN) { @@ -187,7 +187,7 @@ bool LinuxmotoSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) { event.type = Common::EVENT_LBUTTONUP; } - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); return true; } else if (ev.key.keysym.sym == SDLK_PLUS) { @@ -197,7 +197,7 @@ bool LinuxmotoSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) { } else { event.type = Common::EVENT_RBUTTONUP; } - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); return true; } else if (ev.key.keysym.sym == SDLK_MINUS) { @@ -208,7 +208,7 @@ bool LinuxmotoSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) { event.type = Common::EVENT_LBUTTONUP; } - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); return true; } else { diff --git a/backends/events/maemosdl/maemosdl-events.cpp b/backends/events/maemosdl/maemosdl-events.cpp index 8b7514004a..e864c7d81c 100644 --- a/backends/events/maemosdl/maemosdl-events.cpp +++ b/backends/events/maemosdl/maemosdl-events.cpp @@ -96,7 +96,7 @@ bool MaemoSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) { } } else if (ev.key.keysym.sym == SDLK_F7) { event.type = Common::EVENT_RBUTTONDOWN; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); debug(9, "remapping to right click down"); return true; } else if (ev.key.keysym.sym == SDLK_F8) { @@ -134,7 +134,7 @@ bool MaemoSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) { } } else if (ev.key.keysym.sym == SDLK_F7) { event.type = Common::EVENT_RBUTTONUP; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); debug(9, "remapping to right click up"); return true; } else if (ev.key.keysym.sym == SDLK_F8) { diff --git a/backends/events/openpandora/op-events.cpp b/backends/events/openpandora/op-events.cpp index b9d5fa8c7b..abb1458d66 100644 --- a/backends/events/openpandora/op-events.cpp +++ b/backends/events/openpandora/op-events.cpp @@ -126,18 +126,18 @@ bool OPEventSource::remapKey(SDL_Event &ev, Common::Event &event) { switch (ev.key.keysym.sym) { case SDLK_LEFT: event.type = (ev.type == SDL_KEYDOWN) ? Common::EVENT_LBUTTONDOWN : Common::EVENT_LBUTTONUP; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); return true; break; case SDLK_RIGHT: event.type = (ev.type == SDL_KEYDOWN) ? Common::EVENT_RBUTTONDOWN : Common::EVENT_RBUTTONUP; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); return true; break; #if defined(SDL_BUTTON_MIDDLE) case SDLK_UP: event.type = (ev.type == SDL_KEYDOWN) ? Common::EVENT_MBUTTONDOWN : Common::EVENT_MBUTTONUP; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); return true; break; #endif @@ -150,12 +150,12 @@ bool OPEventSource::remapKey(SDL_Event &ev, Common::Event &event) { switch (ev.key.keysym.sym) { case SDLK_HOME: event.type = Common::EVENT_LBUTTONDOWN; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); return true; break; case SDLK_END: event.type = Common::EVENT_RBUTTONDOWN; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); return true; break; case SDLK_PAGEDOWN: @@ -188,12 +188,12 @@ bool OPEventSource::remapKey(SDL_Event &ev, Common::Event &event) { switch (ev.key.keysym.sym) { case SDLK_HOME: event.type = Common::EVENT_LBUTTONUP; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); return true; break; case SDLK_END: event.type = Common::EVENT_RBUTTONUP; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); return true; break; case SDLK_PAGEDOWN: diff --git a/backends/events/ps3sdl/ps3sdl-events.cpp b/backends/events/ps3sdl/ps3sdl-events.cpp index 1fc10559c2..01cdc2f0f6 100644 --- a/backends/events/ps3sdl/ps3sdl-events.cpp +++ b/backends/events/ps3sdl/ps3sdl-events.cpp @@ -60,11 +60,11 @@ bool PS3SdlEventSource::handleJoyButtonDown(SDL_Event &ev, Common::Event &event) switch (ev.jbutton.button) { case BTN_CROSS: // Left mouse button event.type = Common::EVENT_LBUTTONDOWN; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BTN_CIRCLE: // Right mouse button event.type = Common::EVENT_RBUTTONDOWN; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BTN_TRIANGLE: // Game menu event.type = Common::EVENT_KEYDOWN; @@ -98,11 +98,11 @@ bool PS3SdlEventSource::handleJoyButtonUp(SDL_Event &ev, Common::Event &event) { switch (ev.jbutton.button) { case BTN_CROSS: // Left mouse button event.type = Common::EVENT_LBUTTONUP; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BTN_CIRCLE: // Right mouse button event.type = Common::EVENT_RBUTTONUP; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BTN_TRIANGLE: // Game menu event.type = Common::EVENT_KEYUP; diff --git a/backends/events/sdl/sdl-events.cpp b/backends/events/sdl/sdl-events.cpp index 5fb66a7ec4..469f1d5a44 100644 --- a/backends/events/sdl/sdl-events.cpp +++ b/backends/events/sdl/sdl-events.cpp @@ -30,6 +30,10 @@ #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 @@ -175,15 +179,20 @@ void SdlEventSource::processMouseEvent(Common::Event &event, int x, int y) { } // Update the "keyboard mouse" coords - _km.x = x; - _km.y = y; + _km.x = x * MULTIPLIER; + _km.y = y * MULTIPLIER; } -void SdlEventSource::handleKbdMouse() { +bool SdlEventSource::handleKbdMouse(Common::Event &event) { + // returns true if an event is generated // Skip recording of these events uint32 curTime = g_system->getMillis(true); if (curTime >= _km.last_time + _km.delay_time) { + + int16 oldKmX = _km.x; + int16 oldKmY = _km.y; + _km.last_time = curTime; if (_km.x_down_count == 1) { _km.x_down_time = curTime; @@ -196,60 +205,84 @@ void SdlEventSource::handleKbdMouse() { if (_km.x_vel || _km.y_vel) { if (_km.x_down_count) { - if (curTime > _km.x_down_time + _km.delay_time * 12) { + if (curTime > _km.x_down_time + 300) { if (_km.x_vel > 0) - _km.x_vel++; + _km.x_vel += MULTIPLIER; else - _km.x_vel--; - } else if (curTime > _km.x_down_time + _km.delay_time * 8) { + _km.x_vel -= MULTIPLIER; + } else if (curTime > _km.x_down_time + 200) { if (_km.x_vel > 0) - _km.x_vel = 5; + _km.x_vel = 5 * MULTIPLIER; else - _km.x_vel = -5; + _km.x_vel = -5 * MULTIPLIER; } } if (_km.y_down_count) { - if (curTime > _km.y_down_time + _km.delay_time * 12) { + if (curTime > _km.y_down_time + 300) { if (_km.y_vel > 0) - _km.y_vel++; + _km.y_vel += MULTIPLIER; else - _km.y_vel--; - } else if (curTime > _km.y_down_time + _km.delay_time * 8) { + _km.y_vel -= MULTIPLIER; + } else if (curTime > _km.y_down_time + 200) { if (_km.y_vel > 0) - _km.y_vel = 5; + _km.y_vel = 5 * MULTIPLIER; else - _km.y_vel = -5; + _km.y_vel = -5 * MULTIPLIER; } } - _km.x += _km.x_vel; - _km.y += _km.y_vel; + // - The modifier key makes the mouse movement slower + // - The extra factor "delay/25" ensures velocities + // are independent of the kbdMouse update rate + // - all velocities were originally chosen + // at a delay of 25, so that is the reference used here + // - note: operator order is important to avoid overflow + if (_km.modifier) { + _km.x += ((_km.x_vel / 10) * ((int16)_km.delay_time)) / 25; + _km.y += ((_km.y_vel / 10) * ((int16)_km.delay_time)) / 25; + } else { + _km.x += (_km.x_vel * ((int16)_km.delay_time)) / 25; + _km.y += (_km.y_vel * ((int16)_km.delay_time)) / 25; + } if (_km.x < 0) { _km.x = 0; - _km.x_vel = -1; + _km.x_vel = -1 * MULTIPLIER; _km.x_down_count = 1; - } else if (_km.x > _km.x_max) { - _km.x = _km.x_max; - _km.x_vel = 1; + } else if (_km.x > _km.x_max * MULTIPLIER) { + _km.x = _km.x_max * MULTIPLIER; + _km.x_vel = 1 * MULTIPLIER; _km.x_down_count = 1; } if (_km.y < 0) { _km.y = 0; - _km.y_vel = -1; + _km.y_vel = -1 * MULTIPLIER; _km.y_down_count = 1; - } else if (_km.y > _km.y_max) { - _km.y = _km.y_max; - _km.y_vel = 1; + } else if (_km.y > _km.y_max * MULTIPLIER) { + _km.y = _km.y_max * MULTIPLIER; + _km.y_vel = 1 * MULTIPLIER; _km.y_down_count = 1; } if (_graphicsManager) { - _graphicsManager->getWindow()->warpMouseInWindow((Uint16)_km.x, (Uint16)_km.y); + _graphicsManager->getWindow()->warpMouseInWindow((Uint16)(_km.x / MULTIPLIER), (Uint16)(_km.y / MULTIPLIER)); + } + + if (_km.x != oldKmX || _km.y != oldKmY) { + // keep hi-res coordinates since + // processMouseEvent will overwrite them with lo-res numbers + oldKmX = _km.x; + oldKmY = _km.y; + event.type = Common::EVENT_MOUSEMOVE; + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); + _km.x = oldKmX; + _km.y = oldKmY; + return true; } } } + return false; } void SdlEventSource::SDLModToOSystemKeyFlags(SDLMod mod, Common::Event &event) { @@ -425,7 +458,6 @@ Common::KeyCode SdlEventSource::SDLToOSystemKeycode(const SDLKey key) { } bool SdlEventSource::pollEvent(Common::Event &event) { - handleKbdMouse(); #if SDL_VERSION_ATLEAST(2, 0, 0) // In case we still need to send a key up event for a key down from a @@ -451,6 +483,12 @@ bool SdlEventSource::pollEvent(Common::Event &event) { if (dispatchSDLEvent(ev, event)) return true; } + + // Handle mouse control via analog joystick and keyboard + if (handleKbdMouse(event)) { + return true; + } + return false; } @@ -485,7 +523,7 @@ bool SdlEventSource::dispatchSDLEvent(SDL_Event &ev, Common::Event &event) { // with a mouse wheel event. However, SDL2 does not supply // these, thus we use whatever we got last time. It seems // these are always stored in _km.x, _km.y. - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); if (yDir < 0) { event.type = Common::EVENT_WHEELDOWN; return true; @@ -712,10 +750,10 @@ bool SdlEventSource::handleMouseButtonUp(SDL_Event &ev, Common::Event &event) { bool SdlEventSource::handleJoyButtonDown(SDL_Event &ev, Common::Event &event) { if (ev.jbutton.button == JOY_BUT_LMOUSE) { event.type = Common::EVENT_LBUTTONDOWN; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); } else if (ev.jbutton.button == JOY_BUT_RMOUSE) { event.type = Common::EVENT_RBUTTONDOWN; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); } else { event.type = Common::EVENT_KEYDOWN; switch (ev.jbutton.button) { @@ -743,10 +781,10 @@ bool SdlEventSource::handleJoyButtonDown(SDL_Event &ev, Common::Event &event) { bool SdlEventSource::handleJoyButtonUp(SDL_Event &ev, Common::Event &event) { if (ev.jbutton.button == JOY_BUT_LMOUSE) { event.type = Common::EVENT_LBUTTONUP; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); } else if (ev.jbutton.button == JOY_BUT_RMOUSE) { event.type = Common::EVENT_RBUTTONUP; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); } else { event.type = Common::EVENT_KEYUP; switch (ev.jbutton.button) { @@ -772,23 +810,27 @@ bool SdlEventSource::handleJoyButtonUp(SDL_Event &ev, Common::Event &event) { } bool SdlEventSource::handleJoyAxisMotion(SDL_Event &ev, Common::Event &event) { + int axis = ev.jaxis.value; +#ifdef JOY_ANALOG + // conversion factor between keyboard mouse and joy axis value + int vel_to_axis = (1500 / MULTIPLIER); +#else if (axis > JOY_DEADZONE) { axis -= JOY_DEADZONE; - event.type = Common::EVENT_MOUSEMOVE; } else if (axis < -JOY_DEADZONE) { axis += JOY_DEADZONE; - event.type = Common::EVENT_MOUSEMOVE; } else axis = 0; +#endif if (ev.jaxis.axis == JOY_XAXIS) { #ifdef JOY_ANALOG - _km.x_vel = axis / 2000; + _km.x_vel = axis / vel_to_axis; _km.x_down_count = 0; #else if (axis != 0) { - _km.x_vel = (axis > 0) ? 1:-1; + _km.x_vel = (axis > 0) ? 1 * MULTIPLIER:-1 * MULTIPLIER; _km.x_down_count = 1; } else { _km.x_vel = 0; @@ -800,11 +842,11 @@ bool SdlEventSource::handleJoyAxisMotion(SDL_Event &ev, Common::Event &event) { axis = -axis; #endif #ifdef JOY_ANALOG - _km.y_vel = -axis / 2000; + _km.y_vel = -axis / vel_to_axis; _km.y_down_count = 0; #else if (axis != 0) { - _km.y_vel = (-axis > 0) ? 1: -1; + _km.y_vel = (-axis > 0) ? 1 * MULTIPLIER: -1 * MULTIPLIER; _km.y_down_count = 1; } else { _km.y_vel = 0; @@ -812,10 +854,27 @@ bool SdlEventSource::handleJoyAxisMotion(SDL_Event &ev, Common::Event &event) { } #endif } +#ifdef JOY_ANALOG + // radial and scaled analog joystick deadzone + float analogX = (float) (_km.x_vel * vel_to_axis); + float analogY = (float) (_km.y_vel * vel_to_axis); + float deadZone = (float) JOY_DEADZONE; + float scalingFactor = 1.0f; + float magnitude = 0.0f; + + magnitude = sqrt(analogX * analogX + analogY * analogY); + + if (magnitude >= deadZone) { + 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.y_vel = 0; + _km.x_vel = 0; + } +#endif - processMouseEvent(event, _km.x, _km.y); - - return true; + return false; } bool SdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) { @@ -889,8 +948,9 @@ bool SdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) { void SdlEventSource::resetKeyboardEmulation(int16 x_max, int16 y_max) { _km.x_max = x_max; _km.y_max = y_max; - _km.delay_time = 25; + _km.delay_time = 12; _km.last_time = 0; + _km.modifier = false; } bool SdlEventSource::handleResizeEvent(Common::Event &event, int w, int h) { diff --git a/backends/events/sdl/sdl-events.h b/backends/events/sdl/sdl-events.h index c43699420b..334bf8acfc 100644 --- a/backends/events/sdl/sdl-events.h +++ b/backends/events/sdl/sdl-events.h @@ -28,6 +28,8 @@ #include "common/events.h" +// multiplier used to increase resolution for keyboard/joystick mouse +#define MULTIPLIER 16 /** * The SDL event source. @@ -60,6 +62,7 @@ protected: struct KbdMouse { int16 x, y, x_vel, y_vel, x_max, y_max, x_down_count, y_down_count; uint32 last_time, delay_time, x_down_time, y_down_time; + bool modifier; }; KbdMouse _km; @@ -106,7 +109,7 @@ protected: virtual bool handleJoyButtonDown(SDL_Event &ev, Common::Event &event); virtual bool handleJoyButtonUp(SDL_Event &ev, Common::Event &event); virtual bool handleJoyAxisMotion(SDL_Event &ev, Common::Event &event); - virtual void handleKbdMouse(); + virtual bool handleKbdMouse(Common::Event &event); //@} diff --git a/backends/events/symbiansdl/symbiansdl-events.cpp b/backends/events/symbiansdl/symbiansdl-events.cpp index b0d2c25302..9272cbaf9d 100644 --- a/backends/events/symbiansdl/symbiansdl-events.cpp +++ b/backends/events/symbiansdl/symbiansdl-events.cpp @@ -56,76 +56,76 @@ bool SymbianSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) { switch (loop) { case GUI::ACTION_UP: if (ev.type == SDL_KEYDOWN) { - _km.y_vel = -1; + _km.y_vel = -1 * MULTIPLIER; _km.y_down_count = 1; } else { - _km.y_vel = 0; + _km.y_vel = 0 * MULTIPLIER; _km.y_down_count = 0; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); return true; case GUI::ACTION_DOWN: if (ev.type == SDL_KEYDOWN) { - _km.y_vel = 1; + _km.y_vel = 1 * MULTIPLIER; _km.y_down_count = 1; } else { - _km.y_vel = 0; + _km.y_vel = 0 * MULTIPLIER; _km.y_down_count = 0; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); return true; case GUI::ACTION_LEFT: if (ev.type == SDL_KEYDOWN) { - _km.x_vel = -1; + _km.x_vel = -1 * MULTIPLIER; _km.x_down_count = 1; } else { - _km.x_vel = 0; + _km.x_vel = 0 * MULTIPLIER; _km.x_down_count = 0; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); return true; case GUI::ACTION_RIGHT: if (ev.type == SDL_KEYDOWN) { - _km.x_vel = 1; + _km.x_vel = 1 * MULTIPLIER; _km.x_down_count = 1; } else { - _km.x_vel = 0; + _km.x_vel = 0 * MULTIPLIER; _km.x_down_count = 0; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); return true; case GUI::ACTION_LEFTCLICK: event.type = (ev.type == SDL_KEYDOWN ? Common::EVENT_LBUTTONDOWN : Common::EVENT_LBUTTONUP); - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); return true; case GUI::ACTION_RIGHTCLICK: event.type = (ev.type == SDL_KEYDOWN ? Common::EVENT_RBUTTONDOWN : Common::EVENT_RBUTTONUP); - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); return true; case GUI::ACTION_ZONE: if (ev.type == SDL_KEYDOWN) { for (int i = 0; i < TOTAL_ZONES; i++) - if (_km.x >= _zones[i].x && _km.y >= _zones[i].y && - _km.x <= _zones[i].x + _zones[i].width && _km.y <= _zones[i].y + _zones[i].height + if ( (_km.x / MULTIPLIER) >= _zones[i].x && (_km.y / MULTIPLIER) >= _zones[i].y && + (_km.x / MULTIPLIER) <= _zones[i].x + _zones[i].width && (_km.y / MULTIPLIER <= _zones[i].y + _zones[i].height ) { - _mouseXZone[i] = _km.x; - _mouseYZone[i] = _km.y; + _mouseXZone[i] = _km.x / MULTIPLIER; + _mouseYZone[i] = _km.y / MULTIPLIER; break; } _currentZone++; diff --git a/backends/events/wincesdl/wincesdl-events.cpp b/backends/events/wincesdl/wincesdl-events.cpp index d3141ee50c..7001d5fec6 100644 --- a/backends/events/wincesdl/wincesdl-events.cpp +++ b/backends/events/wincesdl/wincesdl-events.cpp @@ -48,8 +48,8 @@ void WINCESdlEventSource::processMouseEvent(Common::Event &event, int x, int y) event.mouse.y = y; // Update the "keyboard mouse" coords - _km.x = event.mouse.x; - _km.y = event.mouse.y; + _km.x = event.mouse.x * MULTIPLIER; + _km.y = event.mouse.y * MULTIPLIER; // Adjust for the screen scaling if (_graphicsMan->_zoomDown) @@ -69,7 +69,9 @@ bool WINCESdlEventSource::pollEvent(Common::Event &event) { memset(&event, 0, sizeof(Common::Event)); - handleKbdMouse(); + if (handleKbdMouse(event) { + return true; + } // If the screen changed, send an Common::EVENT_SCREEN_CHANGED int screenID = _graphicsMan->getScreenChangeID(); diff --git a/backends/platform/androidsdl/androidsdl-sdl.cpp b/backends/platform/androidsdl/androidsdl-sdl.cpp index d04512475a..920dad2234 100644 --- a/backends/platform/androidsdl/androidsdl-sdl.cpp +++ b/backends/platform/androidsdl/androidsdl-sdl.cpp @@ -27,6 +27,8 @@ #include "backends/platform/androidsdl/androidsdl-sdl.h" #include "backends/events/androidsdl/androidsdl-events.h" #include "backends/graphics/androidsdl/androidsdl-graphics.h" +#include <SDL_android.h> +#include <SDL_screenkeyboard.h> void OSystem_ANDROIDSDL::initBackend() { // Create the backend custom managers @@ -42,7 +44,101 @@ void OSystem_ANDROIDSDL::initBackend() { if (!ConfMan.hasKey("gfx_mode")) ConfMan.set("gfx_mode", "2x"); + + if (!ConfMan.hasKey("swap_menu_and_back_buttons")) + ConfMan.setBool("swap_menu_and_back_buttons", true); + else + swapMenuAndBackButtons(ConfMan.getBool("swap_menu_and_back_buttons")); + + if (!ConfMan.hasKey("touchpad_mouse_mode")) { + const bool enable = SDL_ANDROID_GetMouseEmulationMode(); + ConfMan.setBool("touchpad_mouse_mode", enable); + } else + touchpadMode(ConfMan.getBool("touchpad_mouse_mode")); + + if (!ConfMan.hasKey("onscreen_control")) { + const bool enable = SDL_ANDROID_GetScreenKeyboardShown(); + ConfMan.setBool("onscreen_control", enable); + } else + showOnScreenControl(ConfMan.getBool("onscreen_control")); // Call parent implementation of this method OSystem_POSIX::initBackend(); } + +void OSystem_ANDROIDSDL::showOnScreenControl(bool enable) { + if (enable) + SDL_ANDROID_SetScreenKeyboardShown(1); + else + SDL_ANDROID_SetScreenKeyboardShown(0); +} + +void OSystem_ANDROIDSDL::touchpadMode(bool enable) { + if (enable) + switchToRelativeMouseMode(); + else + switchToDirectMouseMode(); +} + +void OSystem_ANDROIDSDL::swapMenuAndBackButtons(bool enable) { + static int KEYCODE_MENU = 82; + static int KEYCODE_BACK = 4; + if (enable) { + SDL_ANDROID_SetAndroidKeycode(KEYCODE_BACK, SDLK_F13); + SDL_ANDROID_SetAndroidKeycode(KEYCODE_MENU, SDLK_ESCAPE); + } else { + SDL_ANDROID_SetAndroidKeycode(KEYCODE_BACK, SDLK_ESCAPE); + SDL_ANDROID_SetAndroidKeycode(KEYCODE_MENU, SDLK_F13); + } +} + +void OSystem_ANDROIDSDL::switchToDirectMouseMode() { + SDL_ANDROID_SetMouseEmulationMode(0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1); +} + +void OSystem_ANDROIDSDL::switchToRelativeMouseMode() { + SDL_ANDROID_SetMouseEmulationMode(1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1); +} + +void OSystem_ANDROIDSDL::setFeatureState(Feature f, bool enable) { + switch (f) { + case kFeatureTouchpadMode: + ConfMan.setBool("touchpad_mouse_mode", enable); + touchpadMode(enable); + break; + case kFeatureOnScreenControl: + ConfMan.setBool("onscreen_control", enable); + showOnScreenControl(enable); + break; + case kFeatureSwapMenuAndBackButtons: + ConfMan.setBool("swap_menu_and_back_buttons", enable); + swapMenuAndBackButtons(enable); + break; + } + + OSystem_POSIX::setFeatureState(f, enable); +} + +bool OSystem_ANDROIDSDL::getFeatureState(Feature f) { + switch (f) { + case kFeatureTouchpadMode: + return ConfMan.getBool("touchpad_mouse_mode"); + break; + case kFeatureOnScreenControl: + return ConfMan.getBool("onscreen_control"); + break; + case kFeatureSwapMenuAndBackButtons: + return ConfMan.getBool("swap_menu_and_back_buttons"); + break; + default: + return OSystem_POSIX::getFeatureState(f); + break; + } +} + +bool OSystem_ANDROIDSDL::hasFeature(Feature f) { + return (f == kFeatureTouchpadMode || + f == kFeatureOnScreenControl || + f == kFeatureSwapMenuAndBackButtons || + f == OSystem_POSIX::getFeatureState(f)); +} diff --git a/backends/platform/androidsdl/androidsdl-sdl.h b/backends/platform/androidsdl/androidsdl-sdl.h index 6ebe5022eb..e83f610d10 100644 --- a/backends/platform/androidsdl/androidsdl-sdl.h +++ b/backends/platform/androidsdl/androidsdl-sdl.h @@ -28,6 +28,14 @@ class OSystem_ANDROIDSDL : public OSystem_POSIX { public: virtual void initBackend(); + virtual void setFeatureState(Feature f, bool enable); + virtual bool getFeatureState(Feature f); + virtual bool hasFeature(Feature f); + void touchpadMode(bool enable); + void swapMenuAndBackButtons(bool enable); + void switchToDirectMouseMode(); + void switchToRelativeMouseMode(); + void showOnScreenControl(bool enable); #ifdef ENABLE_KEYMAPPER // FIXME: This just calls parent methods, is it needed? diff --git a/common/system.h b/common/system.h index 41f217fc0b..1b03fb0a15 100644 --- a/common/system.h +++ b/common/system.h @@ -336,7 +336,22 @@ public: * * This feature has no associated state. */ - kFeatureOpenUrl + kFeatureOpenUrl , + + /** + * show on-screen control + */ + kFeatureOnScreenControl, + + /** + * mouse emulation mode + */ + kFeatureTouchpadMode, + + /** + * swap menu and back buttons + */ + kFeatureSwapMenuAndBackButtons }; /** diff --git a/engines/adl/adl.cpp b/engines/adl/adl.cpp index 845fc524e1..58d5fa9e67 100644 --- a/engines/adl/adl.cpp +++ b/engines/adl/adl.cpp @@ -55,10 +55,11 @@ AdlEngine::AdlEngine(OSystem *syst, const AdlGameDescription *gd) : _dumpFile(nullptr), _display(nullptr), _graphics(nullptr), + _textMode(false), _isRestarting(false), _isRestoring(false), _isQuitting(false), - _skipOneCommand(false), + _abortScript(false), _gameDescription(gd), _console(nullptr), _messageIds(), @@ -911,10 +912,6 @@ byte AdlEngine::convertKey(uint16 ascii) const { } Common::String AdlEngine::getLine() { - // Original engine uses a global here, which isn't reset between - // calls and may not match actual mode - bool textMode = false; - while (1) { Common::String line = inputString(APPLECHAR('?')); @@ -922,8 +919,8 @@ Common::String AdlEngine::getLine() { return ""; if ((byte)line[0] == ('\r' | 0x80)) { - textMode = !textMode; - _display->setMode(textMode ? DISPLAY_MODE_TEXT : DISPLAY_MODE_MIXED); + _textMode = !_textMode; + _display->setMode(_textMode ? DISPLAY_MODE_TEXT : DISPLAY_MODE_MIXED); continue; } @@ -1320,20 +1317,18 @@ bool AdlEngine::doOneCommand(const Commands &commands, byte verb, byte noun) { Commands::const_iterator cmd; for (cmd = commands.begin(); cmd != commands.end(); ++cmd) { - - if (_skipOneCommand) { - _skipOneCommand = false; - continue; - } - ScriptEnv env(*cmd, _state.room, verb, noun); if (matchCommand(env)) { doActions(env); return true; } + + if (_abortScript) { + _abortScript = false; + return false; + } } - _skipOneCommand = false; return false; } @@ -1341,11 +1336,6 @@ void AdlEngine::doAllCommands(const Commands &commands, byte verb, byte noun) { Commands::const_iterator cmd; for (cmd = commands.begin(); cmd != commands.end(); ++cmd) { - if (_skipOneCommand) { - _skipOneCommand = false; - continue; - } - ScriptEnv env(*cmd, _state.room, verb, noun); if (matchCommand(env)) { doActions(env); @@ -1353,9 +1343,12 @@ void AdlEngine::doAllCommands(const Commands &commands, byte verb, byte noun) { if (_isRestarting) return; } - } - _skipOneCommand = false; + if (_abortScript) { + _abortScript = false; + return; + } + } } Common::String AdlEngine::toAscii(const Common::String &str) { diff --git a/engines/adl/adl.h b/engines/adl/adl.h index 3630cd69b9..d71d40816e 100644 --- a/engines/adl/adl.h +++ b/engines/adl/adl.h @@ -348,6 +348,7 @@ protected: Display *_display; GraphicsMan *_graphics; + bool _textMode; // Opcodes typedef Common::Functor1<ScriptEnv &, int> Opcode; @@ -391,7 +392,7 @@ protected: bool _isRestarting, _isRestoring, _isQuitting; bool _canSaveNow, _canRestoreNow; - bool _skipOneCommand; + bool _abortScript; const AdlGameDescription *_gameDescription; diff --git a/engines/adl/adl_v2.cpp b/engines/adl/adl_v2.cpp index 9653e2e40b..272e7801e7 100644 --- a/engines/adl/adl_v2.cpp +++ b/engines/adl/adl_v2.cpp @@ -37,6 +37,7 @@ AdlEngine_v2::~AdlEngine_v2() { AdlEngine_v2::AdlEngine_v2(OSystem *syst, const AdlGameDescription *gd) : AdlEngine(syst, gd), _linesPrinted(0), + _maxLines(4), _disk(nullptr), _itemRemoved(false), _roomOnScreen(0), @@ -151,9 +152,11 @@ void AdlEngine_v2::checkTextOverflow(char c) { ++_linesPrinted; - if (_linesPrinted < 4) - return; + if (_linesPrinted >= _maxLines) + handleTextOverflow(); +} +void AdlEngine_v2::handleTextOverflow() { _linesPrinted = 0; _display->updateTextScreen(); bell(); diff --git a/engines/adl/adl_v2.h b/engines/adl/adl_v2.h index f0af9eba22..5447974a2e 100644 --- a/engines/adl/adl_v2.h +++ b/engines/adl/adl_v2.h @@ -62,6 +62,7 @@ protected: int askForSlot(const Common::String &question); void checkTextOverflow(char c); + void handleTextOverflow(); int o2_isFirstTime(ScriptEnv &e); int o2_isRandomGT(ScriptEnv &e); @@ -85,7 +86,7 @@ protected: Common::String restoreInsert, restoreReplace; } _strings_v2; - uint _linesPrinted; + uint _linesPrinted, _maxLines; DiskImage *_disk; Common::Array<DataBlockPtr> _itemPics; bool _itemRemoved; diff --git a/engines/adl/adl_v4.cpp b/engines/adl/adl_v4.cpp index 8370bead6f..e8ee798199 100644 --- a/engines/adl/adl_v4.cpp +++ b/engines/adl/adl_v4.cpp @@ -127,7 +127,7 @@ void AdlEngine_v4::loadState(Common::ReadStream &stream) { if (size != expectedSize) error("Variable count mismatch (expected %i; found %i)", expectedSize, size); - for (uint i = getRegion(1).vars.size(); i < size; ++i) + for (uint i = getRegion(1).vars.size(); i < _state.vars.size(); ++i) _state.vars[i] = stream.readByte(); if (stream.err() || stream.eos()) @@ -238,6 +238,11 @@ void AdlEngine_v4::loadRegionInitDataOffsets(Common::ReadStream &stream, uint re } } +void AdlEngine_v4::initRoomState(RoomState &roomState) const { + roomState.picture = 1; + roomState.isFirstTime = 1; +} + void AdlEngine_v4::initRegions(const byte *roomsPerRegion, uint regions) { _state.regions.resize(regions); @@ -247,12 +252,8 @@ void AdlEngine_v4::initRegions(const byte *roomsPerRegion, uint regions) { regn.vars.resize(24); regn.rooms.resize(roomsPerRegion[r]); - for (uint rm = 0; rm < roomsPerRegion[r]; ++rm) { - // TODO: hires6 uses 0xff and has slightly different - // code working on these values - regn.rooms[rm].picture = 1; - regn.rooms[rm].isFirstTime = 1; - } + for (uint rm = 0; rm < roomsPerRegion[r]; ++rm) + initRoomState(regn.rooms[rm]); } } @@ -395,13 +396,16 @@ void AdlEngine_v4::backupRoomState(byte room) { backup.picture = getRoom(room).picture; } -void AdlEngine_v4::restoreRoomState(byte room) { +byte AdlEngine_v4::restoreRoomState(byte room) { const RoomState &backup = getCurRegion().rooms[room - 1]; if (backup.isFirstTime != 1) { getRoom(room).curPicture = getRoom(room).picture = backup.picture; getRoom(room).isFirstTime = false; + return 0; } + + return 1; } void AdlEngine_v4::backupVars() { diff --git a/engines/adl/adl_v4.h b/engines/adl/adl_v4.h index 08cea21181..ca9aeff492 100644 --- a/engines/adl/adl_v4.h +++ b/engines/adl/adl_v4.h @@ -81,7 +81,8 @@ protected: void loadRegion(byte region); void loadItemPicIndex(Common::ReadStream &stream, uint items); void backupRoomState(byte room); - void restoreRoomState(byte room); + virtual void initRoomState(RoomState &roomState) const; + virtual byte restoreRoomState(byte room); void backupVars(); void restoreVars(); diff --git a/engines/adl/adl_v5.cpp b/engines/adl/adl_v5.cpp index 795899c070..929ffff7f4 100644 --- a/engines/adl/adl_v5.cpp +++ b/engines/adl/adl_v5.cpp @@ -33,6 +33,27 @@ AdlEngine_v5::AdlEngine_v5(OSystem *syst, const AdlGameDescription *gd) : AdlEngine_v4(syst, gd) { } +void AdlEngine_v5::initRoomState(RoomState &roomState) const { + roomState.picture = 0xff; + roomState.isFirstTime = 0xff; +} + +byte AdlEngine_v5::restoreRoomState(byte room) { + const RoomState &backup = getCurRegion().rooms[room - 1]; + + if (backup.isFirstTime != 0xff) { + getRoom(room).curPicture = getRoom(room).picture = backup.picture; + + // CHECKME: Why doesn't this just copy the flag unconditionally? + if (backup.isFirstTime != 1) { + getRoom(room).isFirstTime = false; + return 0; + } + } + + return backup.isFirstTime; +} + AdlEngine_v5::RegionChunkType AdlEngine_v5::getRegionChunkType(const uint16 addr) const { switch (addr) { case 0x7b00: @@ -44,75 +65,6 @@ AdlEngine_v5::RegionChunkType AdlEngine_v5::getRegionChunkType(const uint16 addr } } -typedef Common::Functor1Mem<ScriptEnv &, int, AdlEngine_v5> OpcodeV5; -#define SetOpcodeTable(x) table = &x; -#define Opcode(x) table->push_back(new OpcodeV5(this, &AdlEngine_v5::x)) -#define OpcodeUnImpl() table->push_back(new OpcodeV5(this, 0)) - -void AdlEngine_v5::setupOpcodeTables() { - Common::Array<const Opcode *> *table = 0; - - SetOpcodeTable(_condOpcodes); - // 0x00 - OpcodeUnImpl(); - Opcode(o2_isFirstTime); - Opcode(o2_isRandomGT); - Opcode(o4_isItemInRoom); - // 0x04 - Opcode(o5_isNounNotInRoom); - Opcode(o1_isMovesGT); - Opcode(o1_isVarEQ); - Opcode(o2_isCarryingSomething); - // 0x08 - Opcode(o4_isVarGT); - Opcode(o1_isCurPicEQ); - Opcode(o5_skipOneCommand); - - SetOpcodeTable(_actOpcodes); - // 0x00 - OpcodeUnImpl(); - Opcode(o1_varAdd); - Opcode(o1_varSub); - Opcode(o1_varSet); - // 0x04 - Opcode(o1_listInv); - Opcode(o4_moveItem); - Opcode(o1_setRoom); - Opcode(o2_setCurPic); - // 0x08 - Opcode(o2_setPic); - Opcode(o1_printMsg); - Opcode(o5_dummy); - Opcode(o5_setTextMode); - // 0x0c - Opcode(o2_moveAllItems); - Opcode(o1_quit); - Opcode(o5_dummy); - Opcode(o2_save); - // 0x10 - Opcode(o2_restore); - Opcode(o1_restart); - Opcode(o5_setRegionRoom); - Opcode(o5_dummy); - // 0x14 - Opcode(o1_resetPic); - Opcode(o1_goDirection<IDI_DIR_NORTH>); - Opcode(o1_goDirection<IDI_DIR_SOUTH>); - Opcode(o1_goDirection<IDI_DIR_EAST>); - // 0x18 - Opcode(o1_goDirection<IDI_DIR_WEST>); - Opcode(o1_goDirection<IDI_DIR_UP>); - Opcode(o1_goDirection<IDI_DIR_DOWN>); - Opcode(o1_takeItem); - // 0x1c - Opcode(o1_dropItem); - Opcode(o1_setRoomPic); - Opcode(o_winGame); - OpcodeUnImpl(); - // 0x20 - Opcode(o2_initDisk); -} - int AdlEngine_v5::o5_isNounNotInRoom(ScriptEnv &e) { OP_DEBUG_1("\t&& NO_SUCH_ITEMS_IN_ROOM(%s)", itemRoomStr(e.arg(1)).c_str()); @@ -131,10 +83,10 @@ int AdlEngine_v5::o5_isNounNotInRoom(ScriptEnv &e) { return 1; } -int AdlEngine_v5::o5_skipOneCommand(ScriptEnv &e) { - OP_DEBUG_0("\t&& SKIP_ONE_COMMAND()"); +int AdlEngine_v5::o5_abortScript(ScriptEnv &e) { + OP_DEBUG_0("\t&& ABORT_SCRIPT()"); - _skipOneCommand = true; + _abortScript = true; setVar(2, 0); return -1; @@ -149,33 +101,54 @@ int AdlEngine_v5::o5_dummy(ScriptEnv &e) { int AdlEngine_v5::o5_setTextMode(ScriptEnv &e) { OP_DEBUG_1("\tSET_TEXT_MODE(%d)", e.arg(1)); - // TODO - // 1: 4-line mode - // 2: 24-line mode - switch (e.arg(1)) { + case 1: + if (_linesPrinted != 0) { + _display->printChar(APPLECHAR(' ')); + handleTextOverflow(); + _display->moveCursorTo(Common::Point(0, 23)); + _maxLines = 4; + } + return 1; + case 2: + _textMode = true; + _display->setMode(DISPLAY_MODE_TEXT); + _display->home(); + _maxLines = 24; + _linesPrinted = 0; + return 1; case 3: // We re-use the restarting flag here, to simulate a long jump _isRestarting = true; return -1; + default: + error("Invalid text mode %d", e.arg(1)); } - - return 1; } int AdlEngine_v5::o5_setRegionRoom(ScriptEnv &e) { OP_DEBUG_2("\tSET_REGION_ROOM(%d, %d)", e.arg(1), e.arg(2)); - // TODO - return 2; + getCurRoom().curPicture = getCurRoom().picture; + getCurRoom().isFirstTime = false; + switchRegion(e.arg(1)); + _state.room = e.arg(2); + restoreRoomState(_state.room); + return -1; } -int AdlEngine_v5::o_winGame(ScriptEnv &e) { - OP_DEBUG_0("\tWIN_GAME()"); +int AdlEngine_v5::o5_setRoomPic(ScriptEnv &e) { + const byte isFirstTime = restoreRoomState(e.arg(1)); - // TODO + // CHECKME: More peculiar isFirstTime handling (see also restoreRoomState). + // Is this here to prevent changing the backed up flag from 1 to 0? Since + // that could only happen if the room isFirstTime is 0 while the backed up flag + // is 1, is this scenario even possible? + if (isFirstTime != 0xff) + getRoom(e.arg(1)).isFirstTime = isFirstTime; - return 0; + o4_setRoomPic(e); + return 2; } } // End of namespace Adl diff --git a/engines/adl/adl_v5.h b/engines/adl/adl_v5.h index bb1cc3015a..473b244993 100644 --- a/engines/adl/adl_v5.h +++ b/engines/adl/adl_v5.h @@ -34,18 +34,17 @@ public: protected: AdlEngine_v5(OSystem *syst, const AdlGameDescription *gd); - // AdlEngine - virtual void setupOpcodeTables(); - // AdlEngine_v4 virtual RegionChunkType getRegionChunkType(const uint16 addr) const; + virtual void initRoomState(RoomState &roomState) const; + virtual byte restoreRoomState(byte room); int o5_isNounNotInRoom(ScriptEnv &e); - int o5_skipOneCommand(ScriptEnv &e); + int o5_abortScript(ScriptEnv &e); int o5_dummy(ScriptEnv &e); int o5_setTextMode(ScriptEnv &e); int o5_setRegionRoom(ScriptEnv &e); - int o_winGame(ScriptEnv &e); + int o5_setRoomPic(ScriptEnv &e); }; } // End of namespace Adl diff --git a/engines/adl/detection.cpp b/engines/adl/detection.cpp index 66bbe84ea2..02fadd255b 100644 --- a/engines/adl/detection.cpp +++ b/engines/adl/detection.cpp @@ -141,6 +141,21 @@ static const AdlGameDescription gameDescriptions[] = { }, GAME_TYPE_HIRES0 }, + { // Hi-Res Adventure #4: Ulysses and the Golden Fleece - Apple II - Load 'N' Go + { + "hires4", 0, + { + { "ULYSSESA.DSK", 0, "df21f28ae94440f958dbbcfdfaf0c36e", 143360 }, + { "ULYSSESB.DSK", 1, "c204e8fe265e9534049f3c0f816cc9fc", 143360 }, + AD_LISTEND + }, + Common::EN_ANY, + Common::kPlatformApple2, + ADGF_UNSTABLE, + GUIO2(GAMEOPTION_COLOR_DEFAULT_ON, GAMEOPTION_SCANLINES) + }, + GAME_TYPE_HIRES4 + }, { // Hi-Res Adventure #4: Ulysses and the Golden Fleece - Atari 8-bit - Re-release { "hires4", 0, diff --git a/engines/adl/hires6.cpp b/engines/adl/hires6.cpp index 91ab16313b..b3b66f6873 100644 --- a/engines/adl/hires6.cpp +++ b/engines/adl/hires6.cpp @@ -44,22 +44,162 @@ public: private: // AdlEngine + void gameLoop(); + void setupOpcodeTables(); void runIntro(); void init(); void initGameState(); void showRoom(); Common::String formatVerbError(const Common::String &verb) const; Common::String formatNounError(const Common::String &verb, const Common::String &noun) const; + void loadState(Common::ReadStream &stream); + void saveState(Common::WriteStream &stream); // AdlEngine_v2 void printString(const Common::String &str); + template <Direction D> + int o_goDirection(ScriptEnv &e); + int o_fluteSound(ScriptEnv &e); + static const uint kRegions = 3; static const uint kItems = 15; byte _currVerb, _currNoun; }; +void HiRes6Engine::gameLoop() { + AdlEngine_v5::gameLoop(); + + // Variable 25 starts at 5 and counts down every 160 moves. + // When it reaches 0, the game ends. This variable determines + // what you see when you "LOOK SUNS". + // Variable 39 is used to advance the suns based on game events, + // so even a fast player will see the suns getting closer together + // as he progresses. + if (getVar(39) != 0) { + if (getVar(39) < getVar(25)) + setVar(25, getVar(39)); + setVar(39, 0); + } + + if (getVar(25) != 0) { + if (getVar(25) > 5) + error("Variable 25 has unexpected value %d", getVar(25)); + if ((6 - getVar(25)) * 160 == _state.moves) + setVar(25, getVar(25) - 1); + } +} + +typedef Common::Functor1Mem<ScriptEnv &, int, HiRes6Engine> OpcodeH6; +#define SetOpcodeTable(x) table = &x; +#define Opcode(x) table->push_back(new OpcodeH6(this, &HiRes6Engine::x)) +#define OpcodeUnImpl() table->push_back(new OpcodeH6(this, 0)) + +void HiRes6Engine::setupOpcodeTables() { + Common::Array<const Opcode *> *table = 0; + + SetOpcodeTable(_condOpcodes); + // 0x00 + OpcodeUnImpl(); + Opcode(o2_isFirstTime); + Opcode(o2_isRandomGT); + Opcode(o4_isItemInRoom); + // 0x04 + Opcode(o5_isNounNotInRoom); + Opcode(o1_isMovesGT); + Opcode(o1_isVarEQ); + Opcode(o2_isCarryingSomething); + // 0x08 + Opcode(o4_isVarGT); + Opcode(o1_isCurPicEQ); + Opcode(o5_abortScript); + + SetOpcodeTable(_actOpcodes); + // 0x00 + OpcodeUnImpl(); + Opcode(o1_varAdd); + Opcode(o1_varSub); + Opcode(o1_varSet); + // 0x04 + Opcode(o1_listInv); + Opcode(o4_moveItem); + Opcode(o1_setRoom); + Opcode(o2_setCurPic); + // 0x08 + Opcode(o2_setPic); + Opcode(o1_printMsg); + Opcode(o5_dummy); + Opcode(o5_setTextMode); + // 0x0c + Opcode(o4_moveAllItems); + Opcode(o1_quit); + Opcode(o5_dummy); + Opcode(o4_save); + // 0x10 + Opcode(o4_restore); + Opcode(o1_restart); + Opcode(o5_setRegionRoom); + Opcode(o5_dummy); + // 0x14 + Opcode(o1_resetPic); + Opcode(o_goDirection<IDI_DIR_NORTH>); + Opcode(o_goDirection<IDI_DIR_SOUTH>); + Opcode(o_goDirection<IDI_DIR_EAST>); + // 0x18 + Opcode(o_goDirection<IDI_DIR_WEST>); + Opcode(o_goDirection<IDI_DIR_UP>); + Opcode(o_goDirection<IDI_DIR_DOWN>); + Opcode(o1_takeItem); + // 0x1c + Opcode(o1_dropItem); + Opcode(o5_setRoomPic); + Opcode(o_fluteSound); + OpcodeUnImpl(); + // 0x20 + Opcode(o2_initDisk); +} + +template <Direction D> +int HiRes6Engine::o_goDirection(ScriptEnv &e) { + OP_DEBUG_0((Common::String("\tGO_") + dirStr(D) + "()").c_str()); + + byte room = getCurRoom().connections[D]; + + if (room == 0) { + if (getVar(33) == 2) + setVar(34, getVar(34) + 1); + + printMessage(_messageIds.cantGoThere); + return -1; + } + + switchRoom(room); + + if (getVar(33) == 2) { + printMessage(102); + setVar(33, 0); + } + + return -1; +} + +int HiRes6Engine::o_fluteSound(ScriptEnv &e) { + OP_DEBUG_0("\tFLUTE_SOUND()"); + + Tones tones; + + tones.push_back(Tone(1072.0, 587.6)); + tones.push_back(Tone(1461.0, 495.8)); + tones.push_back(Tone(0.0, 1298.7)); + + playTones(tones, false); + + _linesPrinted = 0; + + return 0; +} + #define SECTORS_PER_TRACK 16 #define BYTES_PER_SECTOR 256 @@ -146,12 +286,9 @@ void HiRes6Engine::init() { _strings.lineFeeds = readStringAt(*stream, 0x408); - // Read opcode strings (TODO) _strings_v2.saveInsert = readStringAt(*stream, 0xad8); - readStringAt(*stream, 0xb95); // Confirm save - // _strings_v2.saveReplace + _strings_v2.saveReplace = readStringAt(*stream, 0xb95); _strings_v2.restoreInsert = readStringAt(*stream, 0xc07); - // _strings_v2.restoreReplace _strings.playAgain = readStringAt(*stream, 0xcdf, 0xff); _messageIds.cantGoThere = 249; @@ -275,10 +412,26 @@ Common::String HiRes6Engine::formatNounError(const Common::String &verb, const C return err; } +void HiRes6Engine::loadState(Common::ReadStream &stream) { + AdlEngine_v5::loadState(stream); + _state.moves = (getVar(39) << 8) | getVar(24); + setVar(39, 0); +} + +void HiRes6Engine::saveState(Common::WriteStream &stream) { + // Move counter is stuffed into variables, in order to save it + setVar(24, _state.moves & 0xff); + setVar(39, _state.moves >> 8); + AdlEngine_v5::saveState(stream); + setVar(39, 0); +} + void HiRes6Engine::printString(const Common::String &str) { Common::String s; uint found = 0; + // Variable 27 is 1 when Kira is present, 0 otherwise. It's used for choosing + // between singular and plural variants of a string. // This does not emulate the corner cases of the original, hence this check if (getVar(27) > 1) error("Invalid value %i encountered for variable 27", getVar(27)); @@ -294,21 +447,24 @@ void HiRes6Engine::printString(const Common::String &str) { } } - if (getVar(2) != 0xff) { - AdlEngine_v5::printString(s); - } else { + // Variables 2 and 26 are used for controlling the printing of room descriptions + if (getVar(2) == 0xff) { if (getVar(26) == 0) { + // This checks for special room description string " " if (str.size() != 1 || APPLECHAR(str[0]) != APPLECHAR(' ')) return AdlEngine_v5::printString(s); - setVar(2, APPLECHAR(' ')); - } else if (getVar(26) != 0xff) { - setVar(2, 'P'); - } else { + setVar(2, 160); + } else if (getVar(26) == 0xff) { + // Storing the room number in a variable allows for range comparisons setVar(26, _state.room); setVar(2, 1); + } else { + setVar(2, 80); } doAllCommands(_globalCommands, _currVerb, _currNoun); + } else { + AdlEngine_v5::printString(s); } } diff --git a/engines/adl/sound.cpp b/engines/adl/sound.cpp index 63eea45953..3d46ea0409 100644 --- a/engines/adl/sound.cpp +++ b/engines/adl/sound.cpp @@ -47,10 +47,9 @@ private: Speaker::Speaker(int sampleRate) : _rate(sampleRate), - _curSample(32767) { - - stopTone(); -} + _halfWaveLen(0), + _halfWaveRem(0), + _curSample(32767) { } void Speaker::startTone(double freq) { _halfWaveLen = _halfWaveRem = doubleToFrac(_rate / freq / 2); @@ -63,10 +62,15 @@ void Speaker::startTone(double freq) { void Speaker::stopTone() { _halfWaveLen = 0; - _halfWaveRem = intToFrac(32767); } void Speaker::generateSamples(int16 *buffer, int numSamples) { + if (_halfWaveLen == 0) { + // Silence + memset(buffer, 0, numSamples * sizeof(int16)); + return; + } + int offset = 0; while (offset < numSamples) { @@ -79,15 +83,14 @@ void Speaker::generateSamples(int16 *buffer, int numSamples) { // Compute next transition point _halfWaveRem += _halfWaveLen - FRAC_ONE; } else { - // Low/high level (incl. silence) + // Low/high level // Generate as many samples as we can const int samples = MIN(numSamples - offset, (int)fracToInt(_halfWaveRem)); Common::fill(buffer + offset, buffer + offset + samples, _curSample); offset += samples; - // Count down to level transition point, unless we're playing silence - if (_halfWaveLen > 0) - _halfWaveRem -= intToFrac(samples); + // Count down to level transition point + _halfWaveRem -= intToFrac(samples); } } } diff --git a/engines/cryo/eden.cpp b/engines/cryo/eden.cpp index b79eb4e984..a9476f8199 100644 --- a/engines/cryo/eden.cpp +++ b/engines/cryo/eden.cpp @@ -35,8 +35,6 @@ #include "graphics/screen.h" #include "graphics/palette.h" #include "common/timer.h" - -//#include "audio/audiostream.h" #include "audio/mixer.h" #include "cryo/defs.h" @@ -5334,7 +5332,7 @@ void EdenGame::save() { //SaveDialog(byte_37150, byte_37196->ff_A); //TODO strcpy(name, "edsave1.000"); - savegame(name); + saveGame(name); _vm->hideMouse(); CLBlitter_FillScreenView(0xFFFFFFFF); fadeToBlack(3); @@ -6369,55 +6367,126 @@ void EdenGame::phase560() { _gameRooms[127]._exits[1] = 0; } -void EdenGame::savegame(char *name) { - int32 size; - - Common::OutSaveFile *handle = g_system->getSavefileManager()->openForSaving(name); - if (!handle) +void EdenGame::saveGame(char *name) { + Common::OutSaveFile *fh = g_system->getSavefileManager()->openForSaving(name); + if (!fh) return; -#define CLFile_Write(h, ptr, size) \ -debug("writing 0x%X bytes", *size); \ -h->write(ptr, *size); + Common::Serializer s(nullptr, fh); - vavaoffsetout(); - size = (char *)(&_globals->_saveEnd) - (char *)(_globals); - CLFile_Write(handle, _globals, &size); - size = (char *)(&_gameIcons[134]) - (char *)(&_gameIcons[123]); - CLFile_Write(handle, &_gameIcons[123], &size); - lieuoffsetout(); - size = (char *)(&_areasTable[12]) - (char *)(&_areasTable[0]); - CLFile_Write(handle, &_areasTable[0], &size); - size = (char *)(&_gameRooms[423]) - (char *)(&_gameRooms[0]); - CLFile_Write(handle, &_gameRooms[0], &size); - size = (char *)(&_objects[42]) - (char *)(&_objects[0]); - CLFile_Write(handle, &_objects[0], &size); - size = (char *)(&_objectLocations[45]) - (char *)(&_objectLocations[0]); - CLFile_Write(handle, &_objectLocations[0], &size); - size = (char *)(&_followerList[14]) - (char *)(&_followerList[13]); - CLFile_Write(handle, &_followerList[13], &size); - size = (char *)(&_persons[PER_UNKN_3DE]) - (char *)(&_persons[PER_KING]); - CLFile_Write(handle, &_persons[PER_KING], &size); - bandeoffsetout(); - size = (char *)(&_tapes[16]) - (char *)(&_tapes[0]); - CLFile_Write(handle, &_tapes[0], &size); - size = (char *)(&_tabletView[6]) - (char *)(&_tabletView[0]); - CLFile_Write(handle, &_tabletView[0], &size); - size = (char *)(&_gameDialogs[10240]) - (char *)(&_gameDialogs[0]); //TODO: const size 10240 - CLFile_Write(handle, &_gameDialogs[0], &size); + syncGame(s); - delete handle; + delete fh; +} -#undef CLFile_Write +void EdenGame::syncGame(Common::Serializer s) { + syncGlobalPointers(s); + syncGlobalValues(s); - vavaoffsetin(); - lieuoffsetin(); - bandeoffsetin(); + // _gameIcons + // CHECKME: only from #123 to #133? + for (int i = 123; i < 134; i++) { + s.syncAsSint16LE(_gameIcons[i].sx); + s.syncAsSint16LE(_gameIcons[i].sy); + s.syncAsSint16LE(_gameIcons[i].ex); + s.syncAsSint16LE(_gameIcons[i].ey); + s.syncAsUint16LE(_gameIcons[i]._cursorId); + s.syncAsUint16LE(_gameIcons[i]._actionId); + s.syncAsUint16LE(_gameIcons[i]._objectId); + } + + syncCitadelRoomPointers(s); + + // _areasTable + for (int i = 0; i < 12; i++) { + s.syncAsByte(_areasTable[i]._num); + s.syncAsByte(_areasTable[i]._type); + s.syncAsUint16LE(_areasTable[i]._flags); + s.syncAsUint16LE(_areasTable[i]._firstRoomIdx); + s.syncAsByte(_areasTable[i]._citadelLevel); + s.syncAsByte(_areasTable[i]._placeNum); + s.syncAsSint16LE(_areasTable[i]._visitCount); + } + + // _gameRooms + for (int i = 0; i < 423; i++) { + s.syncAsByte(_gameRooms[i]._id); + for (int j = 0; j < 4; j++) + s.syncAsByte(_gameRooms[i]._exits[j]); + s.syncAsByte(_gameRooms[i]._flags); + s.syncAsUint16LE(_gameRooms[i]._bank); + s.syncAsUint16LE(_gameRooms[i]._party); + s.syncAsByte(_gameRooms[i]._level); + s.syncAsByte(_gameRooms[i]._video); + s.syncAsByte(_gameRooms[i]._location); + s.syncAsByte(_gameRooms[i]._backgroundBankNum); + } + + // _Objects + for (int i = 0; i < 42; i++) { + s.syncAsByte(_objects[i]._id); + s.syncAsByte(_objects[i]._flags); + s.syncAsSint16LE(_objects[i]._locations); + s.syncAsUint16LE(_objects[i]._itemMask); + s.syncAsUint16LE(_objects[i]._powerMask); + s.syncAsSint16LE(_objects[i]._count); + } + + for (int i = 0; i < 45; i++) + s.syncAsUint16LE(_objectLocations[i]); + + // _followerList[13] + // CHECKME: Only #13? + s.syncAsByte(_followerList[13]._id); + s.syncAsByte(_followerList[13]._spriteNum); + s.syncAsSint16LE(_followerList[13].sx); + s.syncAsSint16LE(_followerList[13].sy); + s.syncAsSint16LE(_followerList[13].ex); + s.syncAsSint16LE(_followerList[13].ey); + s.syncAsSint16LE(_followerList[13]._spriteBank); + s.syncAsSint16LE(_followerList[13].ff_C); + s.syncAsSint16LE(_followerList[13].ff_E); + + // _persons + for (int i = 0; i < 58; i++) { + s.syncAsUint16LE(_persons[i]._roomNum); + s.syncAsUint16LE(_persons[i]._actionId); + s.syncAsUint16LE(_persons[i]._partyMask); + s.syncAsByte(_persons[i]._id); + s.syncAsByte(_persons[i]._flags); + s.syncAsByte(_persons[i]._roomBankId); + s.syncAsByte(_persons[i]._spriteBank); + s.syncAsUint16LE(_persons[i]._items); + s.syncAsUint16LE(_persons[i]._powers); + s.syncAsByte(_persons[i]._targetLoc); + s.syncAsByte(_persons[i]._lastLoc); + s.syncAsByte(_persons[i]._speed); + s.syncAsByte(_persons[i]._steps); + } + + syncTapePointers(s); + + // _tapes + for (int i = 0; i < MAX_TAPES; i++) { + s.syncAsSint16LE(_tapes[i]._textNum); + s.syncAsSint16LE(_tapes[i]._party); + s.syncAsSint16LE(_tapes[i]._roomNum); + s.syncAsSint16LE(_tapes[i]._backgroundBankNum); + } + + // _tabletView + // CHECKME: Only 6 out of 12? + for (int i = 0; i < 6; i++) + s.syncAsByte(_tabletView[i]); - debug("* Game saved to %s", name); + // _gameDialogs + for (int i = 0; i < 10240; i++) + s.syncAsByte(_gameDialogs[i]); } void EdenGame::loadrestart() { + _quitFlag3 = true; +/* assert(0); //TODO: this won't work atm - all snapshots are BE int32 offs = 0; int32 size; @@ -6457,112 +6526,270 @@ void EdenGame::loadrestart() { size = (char *)(&_gameDialogs[10240]) - (char *)(&_gameDialogs[0]); //TODO: const size 10240 loadpartoffile(2495, &_gameDialogs[0], offs, size); _gameLoaded = true; + */ } void EdenGame::loadgame(char *name) { - Common::InSaveFile *handle = g_system->getSavefileManager()->openForLoading(name); - if (!handle) + Common::InSaveFile *fh = g_system->getSavefileManager()->openForLoading(name); + if (!fh) return; -#define CLFile_Read(h, ptr, size) \ - h->read(ptr, *size); - - int32 size = (char *)(&_globals->_saveEnd) - (char *)(_globals); - CLFile_Read(handle, _globals, &size); - vavaoffsetin(); - size = (char *)(&_gameIcons[134]) - (char *)(&_gameIcons[123]); - CLFile_Read(handle, &_gameIcons[123], &size); - size = (char *)(&_areasTable[12]) - (char *)(&_areasTable[0]); - CLFile_Read(handle, &_areasTable[0], &size); - lieuoffsetin(); - size = (char *)(&_gameRooms[423]) - (char *)(&_gameRooms[0]); - CLFile_Read(handle, &_gameRooms[0], &size); - size = (char *)(&_objects[42]) - (char *)(&_objects[0]); - CLFile_Read(handle, &_objects[0], &size); - size = (char *)(&_objectLocations[45]) - (char *)(&_objectLocations[0]); - CLFile_Read(handle, &_objectLocations[0], &size); - size = (char *)(&_followerList[14]) - (char *)(&_followerList[13]); - CLFile_Read(handle, &_followerList[13], &size); - size = (char *)(&_persons[55]) - (char *)(&_persons[0]); - CLFile_Read(handle, &_persons[0], &size); - size = (char *)(&_tapes[16]) - (char *)(&_tapes[0]); - CLFile_Read(handle, &_tapes[0], &size); - bandeoffsetin(); - size = (char *)(&_tabletView[6]) - (char *)(&_tabletView[0]); - CLFile_Read(handle, &_tabletView[0], &size); - size = (char *)(&_gameDialogs[10240]) - (char *)(&_gameDialogs[0]); //TODO: const size 10240 - CLFile_Read(handle, &_gameDialogs[0], &size); - - delete handle; -#undef CLFile_Read + Common::Serializer s(fh, nullptr); + syncGame(s); -// CLFile_Close(handle); + delete fh; _gameLoaded = true; - debug("* Game loaded from %s", name); } -#define NULLPTR (void*)0xFFFFFF -#define OFSOUT(val, base, typ) if (val) (val) = (typ*)((char*)(val) - (size_t)(base)); else (val) = (typ*)NULLPTR; +#define NULLPTR 0xFFFFFF +#define IDXOUT(val, base, typ, idx) if (val) (idx) = ((byte*)val - (byte*)base) / sizeof(typ); else (idx) = NULLPTR; #define OFSIN(val, base, typ) if ((void*)(val) != NULLPTR) (val) = (typ*)((char*)(val) + (size_t)(base)); else (val) = 0; -void EdenGame::vavaoffsetout() { - OFSOUT(_globals->_dialogPtr, _gameDialogs, Dialog); - OFSOUT(_globals->_nextDialogPtr, _gameDialogs, Dialog); - OFSOUT(_globals->_narratorDialogPtr, _gameDialogs, Dialog); - OFSOUT(_globals->_lastDialogPtr, _gameDialogs, Dialog); - OFSOUT(_globals->_tapePtr, _tapes, tape_t); - OFSOUT(_globals->_nextRoomIcon, _gameIcons, Icon); - OFSOUT(_globals->_roomPtr, _gameRooms, Room); - OFSOUT(_globals->_citaAreaFirstRoom, _gameRooms, Room); - OFSOUT(_globals->_areaPtr, _areasTable, Area); - OFSOUT(_globals->_lastAreaPtr, _areasTable, Area); - OFSOUT(_globals->_curAreaPtr, _areasTable, Area); - OFSOUT(_globals->_characterPtr, _persons, perso_t); - OFSOUT(_globals->_roomCharacterPtr, _persons, perso_t); -} - -void EdenGame::vavaoffsetin() { - OFSIN(_globals->_dialogPtr, _gameDialogs, Dialog); - OFSIN(_globals->_nextDialogPtr, _gameDialogs, Dialog); - OFSIN(_globals->_narratorDialogPtr, _gameDialogs, Dialog); - OFSIN(_globals->_lastDialogPtr, _gameDialogs, Dialog); - OFSIN(_globals->_tapePtr, _tapes, tape_t); - OFSIN(_globals->_nextRoomIcon, _gameIcons, Icon); - OFSIN(_globals->_roomPtr, _gameRooms, Room); - OFSIN(_globals->_citaAreaFirstRoom, _gameRooms, Room); - OFSIN(_globals->_areaPtr, _areasTable, Area); - OFSIN(_globals->_lastAreaPtr, _areasTable, Area); - OFSIN(_globals->_curAreaPtr, _areasTable, Area); - OFSIN(_globals->_characterPtr, _persons, perso_t); - OFSIN(_globals->_roomCharacterPtr, _persons, perso_t); -} - -void EdenGame::lieuoffsetout() { - for (int i = 0; i < 12; i++) - OFSOUT(_areasTable[i]._citadelRoomPtr, _gameRooms, Room); -} - -void EdenGame::lieuoffsetin() { - for (int i = 0; i < 12; i++) - OFSIN(_areasTable[i]._citadelRoomPtr, _gameRooms, Room); -} - -void EdenGame::bandeoffsetout() { - for (int i = 0; i < 16; i++) { - OFSOUT(_tapes[i]._perso, _persons, perso_t); - OFSOUT(_tapes[i]._dialog, _gameDialogs, Dialog); - } -} +void EdenGame::syncGlobalPointers(Common::Serializer s) { + uint32 dialogIdx, nextDialogIdx, narratorDialogIdx, lastDialogIdx, tapeIdx, nextRoomIconIdx, roomIdx; + uint32 citaAreaFirstRoomIdx, areaIdx, lastAreaIdx, curAreaIdx, characterIdx, roomCharacterIdx; + + if (s.isSaving()) { + IDXOUT(_globals->_dialogPtr, _gameDialogs, Dialog, dialogIdx); + IDXOUT(_globals->_nextDialogPtr, _gameDialogs, Dialog, nextDialogIdx); + IDXOUT(_globals->_narratorDialogPtr, _gameDialogs, Dialog, narratorDialogIdx); + IDXOUT(_globals->_lastDialogPtr, _gameDialogs, Dialog, lastDialogIdx); + IDXOUT(_globals->_tapePtr, _tapes, tape_t, tapeIdx); + IDXOUT(_globals->_nextRoomIcon, _gameIcons, Icon, nextRoomIconIdx); + IDXOUT(_globals->_roomPtr, _gameRooms, Room, roomIdx); + IDXOUT(_globals->_citaAreaFirstRoom, _gameRooms, Room, citaAreaFirstRoomIdx); + IDXOUT(_globals->_areaPtr, _areasTable, Area, areaIdx); + IDXOUT(_globals->_lastAreaPtr, _areasTable, Area, lastAreaIdx); + IDXOUT(_globals->_curAreaPtr, _areasTable, Area, curAreaIdx); + IDXOUT(_globals->_characterPtr, _persons, perso_t, characterIdx); + IDXOUT(_globals->_roomCharacterPtr, _persons, perso_t, roomCharacterIdx); + } + + s.syncAsUint32LE(dialogIdx); + s.syncAsUint32LE(nextDialogIdx); + s.syncAsUint32LE(narratorDialogIdx); + s.syncAsUint32LE(lastDialogIdx); + s.syncAsUint32LE(tapeIdx); + s.syncAsUint32LE(nextRoomIconIdx); + s.syncAsUint32LE(roomIdx); + s.syncAsUint32LE(citaAreaFirstRoomIdx); + s.syncAsUint32LE(areaIdx); + s.syncAsUint32LE(lastAreaIdx); + s.syncAsUint32LE(curAreaIdx); + s.syncAsUint32LE(characterIdx); + s.syncAsUint32LE(roomCharacterIdx); + + if (s.isLoading()) { + _globals->_dialogPtr = (dialogIdx == NULLPTR) ? nullptr : (Dialog *)getElem(_gameDialogs, dialogIdx); + _globals->_nextDialogPtr = (nextDialogIdx == NULLPTR) ? nullptr : (Dialog *)getElem(_gameDialogs, nextDialogIdx); + _globals->_narratorDialogPtr = (narratorDialogIdx == NULLPTR) ? nullptr : (Dialog *)getElem(_gameDialogs, narratorDialogIdx); + _globals->_lastDialogPtr = (lastDialogIdx == NULLPTR) ? nullptr : (Dialog *)getElem(_gameDialogs, lastDialogIdx); + _globals->_tapePtr = (tapeIdx == NULLPTR) ? nullptr : &_tapes[tapeIdx]; + _globals->_nextRoomIcon = (nextRoomIconIdx == NULLPTR) ? nullptr : &_gameIcons[nextRoomIconIdx]; + _globals->_roomPtr = (roomIdx == NULLPTR) ? nullptr : &_gameRooms[roomIdx]; + _globals->_citaAreaFirstRoom = (citaAreaFirstRoomIdx == NULLPTR) ? nullptr : &_gameRooms[citaAreaFirstRoomIdx]; + _globals->_areaPtr = (areaIdx == NULLPTR) ? nullptr : &_areasTable[areaIdx]; + _globals->_lastAreaPtr = (lastAreaIdx == NULLPTR) ? nullptr : &_areasTable[lastAreaIdx]; + _globals->_curAreaPtr = (curAreaIdx == NULLPTR) ? nullptr : &_areasTable[curAreaIdx]; + _globals->_characterPtr = (characterIdx == NULLPTR) ? nullptr : &_persons[characterIdx]; + _globals->_roomCharacterPtr = (roomCharacterIdx == NULLPTR) ? nullptr : &_persons[roomCharacterIdx]; + } +} + +void EdenGame::syncGlobalValues(Common::Serializer s) { + s.syncAsByte(_globals->_areaNum); + s.syncAsByte(_globals->_areaVisitCount); + s.syncAsByte(_globals->_menuItemIdLo); + s.syncAsByte(_globals->_menuItemIdHi); + s.syncAsUint16LE(_globals->_randomNumber); + s.syncAsUint16LE(_globals->_gameTime); + s.syncAsUint16LE(_globals->_gameDays); + s.syncAsUint16LE(_globals->_chrono); + s.syncAsUint16LE(_globals->_eloiDepartureDay); + s.syncAsUint16LE(_globals->_roomNum); + s.syncAsUint16LE(_globals->_newRoomNum); + s.syncAsUint16LE(_globals->_phaseNum); + s.syncAsUint16LE(_globals->_metPersonsMask1); + s.syncAsUint16LE(_globals->_party); + s.syncAsUint16LE(_globals->_partyOutside); + s.syncAsUint16LE(_globals->_metPersonsMask2); + s.syncAsUint16LE(_globals->_var1C); + s.syncAsUint16LE(_globals->_phaseActionsCount); + s.syncAsUint16LE(_globals->_curAreaFlags); + s.syncAsUint16LE(_globals->_curItemsMask); + s.syncAsUint16LE(_globals->_curPowersMask); + s.syncAsUint16LE(_globals->_curPersoItems); + s.syncAsUint16LE(_globals->_curCharacterPowers); + s.syncAsUint16LE(_globals->_wonItemsMask); + s.syncAsUint16LE(_globals->_wonPowersMask); + s.syncAsUint16LE(_globals->_stepsToFindAppleFast); + s.syncAsUint16LE(_globals->_stepsToFindAppleNormal); + s.syncAsUint16LE(_globals->_roomPersoItems); + s.syncAsUint16LE(_globals->_roomCharacterPowers); + s.syncAsUint16LE(_globals->_gameFlags); + s.syncAsUint16LE(_globals->_curVideoNum); + s.syncAsUint16LE(_globals->_morkusSpyVideoNum1); + s.syncAsUint16LE(_globals->_morkusSpyVideoNum2); + s.syncAsUint16LE(_globals->_morkusSpyVideoNum3); + s.syncAsUint16LE(_globals->_morkusSpyVideoNum4); + s.syncAsByte(_globals->_newMusicType); + s.syncAsByte(_globals->_var43); + s.syncAsByte(_globals->_videoSubtitleIndex); + s.syncAsByte(_globals->_partyInstruments); + s.syncAsByte(_globals->_monkGotRing); + s.syncAsByte(_globals->_chronoFlag); + s.syncAsByte(_globals->_curRoomFlags); + s.syncAsByte(_globals->_endGameFlag); + s.syncAsByte(_globals->_lastInfo); + + byte autoDialog; + if (s.isSaving()) + autoDialog = _globals->_autoDialog ? 1 : 0; + s.syncAsByte(autoDialog); + if (s.isLoading()) + _globals->_autoDialog = (autoDialog == 1); + + s.syncAsByte(_globals->_worldTyranSighted); + s.syncAsByte(_globals->_var4D); + s.syncAsByte(_globals->_var4E); + s.syncAsByte(_globals->_worldGaveGold); + s.syncAsByte(_globals->_worldHasTriceraptors); + s.syncAsByte(_globals->_worldHasVelociraptors); + s.syncAsByte(_globals->_worldHasTyran); + s.syncAsByte(_globals->_var53); + s.syncAsByte(_globals->_var54); + s.syncAsByte(_globals->_var55); + s.syncAsByte(_globals->_gameHours); + s.syncAsByte(_globals->_textToken1); + s.syncAsByte(_globals->_textToken2); + s.syncAsByte(_globals->_eloiHaveNews); + s.syncAsByte(_globals->_dialogFlags); + s.syncAsByte(_globals->_curAreaType); + s.syncAsByte(_globals->_curCitadelLevel); + s.syncAsByte(_globals->_newLocation); + s.syncAsByte(_globals->_prevLocation); + s.syncAsByte(_globals->_curPersoFlags); + s.syncAsByte(_globals->_var60); + s.syncAsByte(_globals->_eventType); + s.syncAsByte(_globals->_var62); + s.syncAsByte(_globals->_curObjectId); + s.syncAsByte(_globals->_curObjectFlags); + s.syncAsByte(_globals->_var65); + s.syncAsByte(_globals->_roomCharacterType); + s.syncAsByte(_globals->_roomCharacterFlags); + s.syncAsByte(_globals->_narratorSequence); + s.syncAsByte(_globals->_var69); + s.syncAsByte(_globals->_var6A); + s.syncAsByte(_globals->_frescoNumber); + s.syncAsByte(_globals->_var6C); + s.syncAsByte(_globals->_var6D); + s.syncAsByte(_globals->_labyrinthDirections); + s.syncAsByte(_globals->_labyrinthRoom); + +/* + CHECKME: *_sentenceBufferPtr +*/ + + s.syncAsByte(_globals->_lastInfoIdx); + s.syncAsByte(_globals->_nextInfoIdx); + +/* + CHECKME + * _persoSpritePtr + * _persoSpritePtr2 + * _curCharacterAnimPtr + * _varC2 +*/ + + s.syncAsSint16LE(_globals->_iconsIndex); + s.syncAsSint16LE(_globals->_curObjectCursor); + s.syncAsSint16LE(_globals->_varCA); + s.syncAsSint16LE(_globals->_varCC); + s.syncAsSint16LE(_globals->_characterImageBank); + s.syncAsUint16LE(_globals->_roomImgBank); + s.syncAsUint16LE(_globals->_characterBackgroundBankIdx); + s.syncAsUint16LE(_globals->_varD4); + s.syncAsUint16LE(_globals->_frescoeWidth); + s.syncAsUint16LE(_globals->_frescoeImgBank); + s.syncAsUint16LE(_globals->_varDA); + s.syncAsUint16LE(_globals->_varDC); + s.syncAsUint16LE(_globals->_roomBaseX); + s.syncAsUint16LE(_globals->_varE0); + s.syncAsUint16LE(_globals->_dialogType); + s.syncAsUint16LE(_globals->_varE4); + s.syncAsUint16LE(_globals->_currMusicNum); + s.syncAsSint16LE(_globals->_textNum); + s.syncAsUint16LE(_globals->_travelTime); + s.syncAsUint16LE(_globals->_varEC); + s.syncAsByte(_globals->_displayFlags); + s.syncAsByte(_globals->_oldDisplayFlags); + s.syncAsByte(_globals->_drawFlags); + s.syncAsByte(_globals->_varF1); + s.syncAsByte(_globals->_varF2); + s.syncAsByte(_globals->_menuFlags); + s.syncAsByte(_globals->_varF4); + s.syncAsByte(_globals->_varF5); + s.syncAsByte(_globals->_varF6); + s.syncAsByte(_globals->_varF7); + s.syncAsByte(_globals->_varF8); + s.syncAsByte(_globals->_varF9); + s.syncAsByte(_globals->_varFA); + s.syncAsByte(_globals->_animationFlags); + s.syncAsByte(_globals->_giveObj1); + s.syncAsByte(_globals->_giveObj2); + s.syncAsByte(_globals->_giveObj3); + s.syncAsByte(_globals->_var100); + s.syncAsByte(_globals->_roomVidNum); + s.syncAsByte(_globals->_mirrorEffect); + s.syncAsByte(_globals->_var103); + s.syncAsByte(_globals->_roomBackgroundBankNum); + s.syncAsByte(_globals->_valleyVidNum); + s.syncAsByte(_globals->_updatePaletteFlag); + s.syncAsByte(_globals->_inventoryScrollPos); + s.syncAsByte(_globals->_objCount); + s.syncAsByte(_globals->_textBankIndex); + s.syncAsByte(_globals->_prefLanguage); + for (int i = 0; i < 2; i++) { + s.syncAsByte(_globals->_prefMusicVol[i]); + s.syncAsByte(_globals->_prefVoiceVol[i]); + s.syncAsByte(_globals->_prefSoundVolume[i]); + } + s.syncAsByte(_globals->_citadelAreaNum); + s.syncAsByte(_globals->_var113); + s.syncAsByte(_globals->_lastPlaceNum); + s.syncAsByte(_globals->_saveEnd); +} + +void EdenGame::syncCitadelRoomPointers(Common::Serializer s) { + uint32 citadelRoomIdx; + for (int i = 0; i < 12; i++) { + if (s.isSaving()) + IDXOUT(_areasTable[i]._citadelRoomPtr, _gameRooms, Room, citadelRoomIdx); + s.syncAsUint32LE(citadelRoomIdx); + if (s.isLoading()) + _areasTable[i]._citadelRoomPtr = (citadelRoomIdx == NULLPTR) ? nullptr : &_gameRooms[citadelRoomIdx]; + } +} + +void EdenGame::syncTapePointers(Common::Serializer s) { + int persoIdx, dialogIdx; -void EdenGame::bandeoffsetin() { for (int i = 0; i < 16; i++) { - OFSIN(_tapes[i]._perso, _persons, perso_t); - OFSIN(_tapes[i]._dialog, _gameDialogs, Dialog); + if (s.isSaving()) { + IDXOUT(_tapes[i]._perso, _persons, perso_t, persoIdx); + IDXOUT(_tapes[i]._dialog, _gameDialogs, Dialog, dialogIdx); + } + + s.syncAsUint32LE(persoIdx); + s.syncAsUint32LE(dialogIdx); + + if (s.isLoading()) { + _tapes[i]._perso = (persoIdx == NULLPTR) ? nullptr : &_persons[persoIdx]; + _tapes[i]._dialog = (dialogIdx == NULLPTR) ? nullptr : (Dialog *)getElem(_gameDialogs, dialogIdx); + } } } -//// cond.c - char EdenGame::testCondition(int16 index) { bool endFl = false; uint16 stack[32]; diff --git a/engines/cryo/eden.h b/engines/cryo/eden.h index bdd1ba89ce..1fd5415163 100644 --- a/engines/cryo/eden.h +++ b/engines/cryo/eden.h @@ -24,6 +24,8 @@ #define CRYO_EDEN_H #include "common/file.h" +#include "common/savefile.h" +#include "common/serializer.h" #include "cryo/sound.h" #include "cryo/defs.h" @@ -461,15 +463,14 @@ private: void phase528(); void phase544(); void phase560(); - void savegame(char *name); + void saveGame(char *name); void loadrestart(); void loadgame(char *name); - void vavaoffsetout(); - void vavaoffsetin(); - void lieuoffsetout(); - void lieuoffsetin(); - void bandeoffsetout(); - void bandeoffsetin(); + void syncGame(Common::Serializer s); + void syncGlobalPointers(Common::Serializer s); + void syncGlobalValues(Common::Serializer s); + void syncCitadelRoomPointers(Common::Serializer s); + void syncTapePointers(Common::Serializer s); char testCondition(int16 index); uint16 operAdd(uint16 v1, uint16 v2); uint16 operSub(uint16 v1, uint16 v2); diff --git a/engines/director/archive.cpp b/engines/director/archive.cpp index c9b6cc1cfa..f426107ee3 100644 --- a/engines/director/archive.cpp +++ b/engines/director/archive.cpp @@ -441,14 +441,13 @@ bool RIFXArchive::openStream(Common::SeekableReadStream *stream, uint32 startOff debugCN(2, kDebugLoading, "CAS*: %d [", casSize); for (uint i = 0; i < casSize; i++) { - uint32 index = casStream.readUint32(); + uint32 index = casStream.readUint32BE(); + debugCN(2, kDebugLoading, "%d ", index); Resource &res = resources[index]; res.index = index; res.castId = i + 1; _types[castTag][res.castId] = res; - - debugCN(2, kDebugLoading, "%d ", index); } debugC(2, kDebugLoading, "]"); } diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp index 8b1e57cf18..ed5b05643c 100644 --- a/engines/director/cast.cpp +++ b/engines/director/cast.cpp @@ -95,7 +95,9 @@ TextCast::TextCast(Common::ReadStreamEndian &stream, uint16 version) { palinfo3 = stream.readUint16(); int t = stream.readUint32(); - assert(t == 0); // So far we saw only 0 here + if (t != 0) { // In D2 there are values + warning("TextCast: t: %x", t); + } initialRect = Score::readRect(stream); textShadow = static_cast<SizeType>(stream.readByte()); diff --git a/engines/director/detection.cpp b/engines/director/detection.cpp index c26084ac6c..43c5bf2b4f 100644 --- a/engines/director/detection.cpp +++ b/engines/director/detection.cpp @@ -78,6 +78,7 @@ static const PlainGameDescriptor directorGames[] = { { "jewels", "Jewels of the Oracle" }, { "jman", "The Journeyman Project" }, { "majestic", "Majestic Part I: Alien Encounter" }, + { "mediaband", "Meet Mediaband" }, { "melements", "Masters of the Elements" }, { "spyclub", "Spy Club" }, { "amber", "AMBER: Journeys Beyond"}, diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h index 15bdf37968..11f70e033c 100644 --- a/engines/director/detection_tables.h +++ b/engines/director/detection_tables.h @@ -69,8 +69,21 @@ static const DirectorGameDescription gameDescriptions[] = { { { "theapartment", + "D2", + AD_ENTRY1s("Main Menu", "fc56c179cb8c6d4938e61ee61fd0032c", 48325), // Original name is "тЂMain Menu" + Common::EN_ANY, + Common::kPlatformMacintosh, + ADGF_MACRESFORK, + GUIO1(GUIO_NOASPECT) + }, + GID_GENERIC, + 2 + }, + { + { + "theapartment", "D3", - AD_ENTRY1s("Main Menu", "9e838fe1a6af7992d656ca325e38dee5", 47911), + AD_ENTRY1s("Main Menu", "9e838fe1a6af7992d656ca325e38dee5", 47911), // Original name is "тЂMain Menu" Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK, @@ -83,7 +96,7 @@ static const DirectorGameDescription gameDescriptions[] = { { "theapartment", "D4", - AD_ENTRY1s("Main Menu", "ff86181f03fe6eb060f65a985ca0580d", 160612), + AD_ENTRY1s("Main Menu", "ff86181f03fe6eb060f65a985ca0580d", 160612),// Original name is "тЂMain Menu" Common::EN_ANY, Common::kPlatformMacintosh, ADGF_NO_FLAGS, @@ -291,6 +304,20 @@ static const DirectorGameDescription gameDescriptions[] = { 4 }, + { // Meet Mediaband + { + "mediaband", + "", + AD_ENTRY1s("MEDIABND.EXE", "0cfb9b4762e33ab56d656a0eb146a048", 717921), + Common::EN_ANY, + Common::kPlatformWindows, + ADGF_NO_FLAGS, + GUIO1(GUIO_NOASPECT) + }, + GID_GENERIC, + 4 + }, + { { // Masters of the Elements - English (from rootfather) diff --git a/engines/director/director.cpp b/engines/director/director.cpp index 4806b57cdf..bfe9a724be 100644 --- a/engines/director/director.cpp +++ b/engines/director/director.cpp @@ -42,9 +42,11 @@ DirectorEngine::DirectorEngine(OSystem *syst, const DirectorGameDescription *gam _rnd("director") { DebugMan.addDebugChannel(kDebugLingoExec, "lingoexec", "Lingo Execution"); DebugMan.addDebugChannel(kDebugLingoCompile, "lingocompile", "Lingo Compilation"); + DebugMan.addDebugChannel(kDebugLingoParse, "lingoparse", "Lingo code parsing"); DebugMan.addDebugChannel(kDebugLoading, "loading", "Loading"); DebugMan.addDebugChannel(kDebugImages, "images", "Image drawing"); DebugMan.addDebugChannel(kDebugText, "text", "Text rendering"); + DebugMan.addDebugChannel(kDebugEvents, "events", "Event processing"); g_director = this; @@ -83,12 +85,14 @@ DirectorEngine::DirectorEngine(OSystem *syst, const DirectorGameDescription *gam const Common::FSNode gameDataDir(ConfMan.get("path")); SearchMan.addSubDirectoryMatching(gameDataDir, "data"); SearchMan.addSubDirectoryMatching(gameDataDir, "install"); + SearchMan.addSubDirectoryMatching(gameDataDir, "main"); // Meet Mediaband _colorDepth = 8; // 256-color _key = 0; _keyCode = 0; _machineType = 9; // Macintosh IIci _playbackPaused = false; + g_director->_skipFrameAdvance = false; } DirectorEngine::~DirectorEngine() { @@ -136,13 +140,14 @@ Common::Error DirectorEngine::run() { //_mainArchive = new RIFFArchive(); //_mainArchive->openFile("bookshelf_example.mmm"); - if (getPlatform() == Common::kPlatformWindows) { - _sharedCastFile = "SHARDCST.MMM"; - } else { - if (getVersion() < 4) + if (getVersion() < 4) { + if (getPlatform() == Common::kPlatformWindows) { + _sharedCastFile = "SHARDCST.MMM"; + } else { _sharedCastFile = "Shared Cast"; - else - _sharedCastFile = "Shared.dir"; + } + } else { + _sharedCastFile = "Shared.dir"; } loadSharedCastsFrom(_sharedCastFile); diff --git a/engines/director/director.h b/engines/director/director.h index 001393bc97..fdbe8ded48 100644 --- a/engines/director/director.h +++ b/engines/director/director.h @@ -57,7 +57,9 @@ enum { kDebugLingoCompile = 1 << 1, kDebugLoading = 1 << 2, kDebugImages = 1 << 3, - kDebugText = 1 << 4 + kDebugText = 1 << 4, + kDebugEvents = 1 << 5, + kDebugLingoParse = 1 << 6 }; extern byte defaultPalette[768]; @@ -108,6 +110,7 @@ public: int _keyCode; int _machineType; bool _playbackPaused; + bool _skipFrameAdvance; Common::String _nextMovie; Common::String _nextMovieFrameS; diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp index fa9063d54e..3c73b82af1 100644 --- a/engines/director/frame.cpp +++ b/engines/director/frame.cpp @@ -727,7 +727,7 @@ Image::ImageDecoder *Frame::getImageFrom(uint16 spriteId) { BitmapCast *bc = NULL; if (_vm->getSharedBMP() != NULL && _vm->getSharedBMP()->contains(imgId)) { - debugC(2, kDebugImages, "Shared cast BMP: id: %d", imgId); + debugC(4, kDebugImages, "Shared cast BMP: id: %d", imgId); pic = _vm->getSharedBMP()->getVal(imgId); pic->seek(0); // TODO: this actually gets re-read every loop... we need to rewind it! bc = static_cast<BitmapCast *>(_vm->getSharedCasts()->getVal(spriteId)); @@ -740,14 +740,14 @@ Image::ImageDecoder *Frame::getImageFrom(uint16 spriteId) { if (_vm->getVersion() < 4) { int w = bc->initialRect.width(), h = bc->initialRect.height(); - debugC(2, kDebugImages, "id: %d, w: %d, h: %d, flags: %x, some: %x, unk1: %d, unk2: %d", + debugC(4, kDebugImages, "id: %d, w: %d, h: %d, flags: %x, some: %x, unk1: %d, unk2: %d", imgId, w, h, bc->flags, bc->someFlaggyThing, bc->unk1, bc->unk2); img = new BITDDecoder(w, h); } else if (_vm->getVersion() < 6) { bc = static_cast<BitmapCast *>(_vm->getCurrentScore()->_casts[spriteId]); int w = bc->initialRect.width(), h = bc->initialRect.height(); - debugC(2, kDebugImages, "id: %d, w: %d, h: %d, flags: %x, some: %x, unk1: %d, unk2: %d", + debugC(4, kDebugImages, "id: %d, w: %d, h: %d, flags: %x, some: %x, unk1: %d, unk2: %d", imgId, w, h, bc->flags, bc->someFlaggyThing, bc->unk1, bc->unk2); img = new BITDDecoderV4(w, h, bc->bitsPerPixel); } else { diff --git a/engines/director/images.cpp b/engines/director/images.cpp index 53e91ac494..4574165bb6 100644 --- a/engines/director/images.cpp +++ b/engines/director/images.cpp @@ -147,7 +147,7 @@ bool BITDDecoder::loadStream(Common::SeekableReadStream &stream) { // If the stream has exactly the required number of bits for this image, // we assume it is uncompressed. if (stream.size() * 8 == _surface->pitch * _surface->h) { - debugC(3, kDebugImages, "Skipping compression"); + debugC(6, kDebugImages, "Skipping compression"); for (y = 0; y < _surface->h; y++) { for (x = 0; x < _surface->pitch; ) { byte color = stream.readByte(); @@ -265,7 +265,7 @@ bool BITDDecoderV4::loadStream(Common::SeekableReadStream &stream) { // If the stream has exactly the required number of bits for this image, // we assume it is uncompressed. if (stream.size() * 8 == _surface->pitch * _surface->h) { - debugC(3, kDebugImages, "Skipping compression"); + debugC(6, kDebugImages, "Skipping compression"); for (y = 0; y < _surface->h; y++) { for (x = 0; x < _surface->pitch; ) { byte color = stream.readByte(); diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp index be0a191a5b..f4c26a2193 100644 --- a/engines/director/lingo/lingo-builtins.cpp +++ b/engines/director/lingo/lingo-builtins.cpp @@ -20,6 +20,7 @@ * */ +#include "common/system.h" #include "director/lingo/lingo.h" namespace Director { @@ -871,7 +872,8 @@ void Lingo::b_nothing(int nargs) { void Lingo::b_delay(int nargs) { Datum d = g_lingo->pop(); d.toInt(); - warning("STUB: b_delay(%d)", d.u.i); + + g_director->getCurrentScore()->_nextFrameTime = g_system->getMillis() + (float)d.u.i / 60 * 1000; } void Lingo::b_do(int nargs) { @@ -894,8 +896,6 @@ void Lingo::b_pass(int nargs) { void Lingo::b_pause(int nargs) { g_director->_playbackPaused = true; - - g_lingo->pushVoid(); // Fake value } void Lingo::b_playAccel(int nargs) { diff --git a/engines/director/lingo/lingo-funcs.cpp b/engines/director/lingo/lingo-funcs.cpp index 7056d9a863..ddc51f4149 100644 --- a/engines/director/lingo/lingo-funcs.cpp +++ b/engines/director/lingo/lingo-funcs.cpp @@ -223,6 +223,8 @@ void Lingo::func_goto(Datum &frame, Datum &movie) { if (frame.type == VOID) return; + _vm->_skipFrameAdvance = true; + if (frame.type == STRING) { if (_vm->getCurrentScore()) _vm->getCurrentScore()->setStartToLabel(*frame.u.s); @@ -240,6 +242,8 @@ void Lingo::func_gotoloop() { return; _vm->getCurrentScore()->gotoLoop(); + + g_director->_skipFrameAdvance = true; } void Lingo::func_gotonext() { @@ -247,6 +251,8 @@ void Lingo::func_gotonext() { return; _vm->getCurrentScore()->gotoNext(); + + g_director->_skipFrameAdvance = true; } void Lingo::func_gotoprevious() { @@ -254,6 +260,8 @@ void Lingo::func_gotoprevious() { return; _vm->getCurrentScore()->gotoPrevious(); + + g_director->_skipFrameAdvance = true; } void Lingo::func_cursor(int c) { diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp index c9a7be7ae5..48a5166b95 100644 --- a/engines/director/lingo/lingo-lex.cpp +++ b/engines/director/lingo/lingo-lex.cpp @@ -2549,7 +2549,7 @@ namespace Director { int Lingo::parse(const char *code) { YY_BUFFER_STATE bp; - if (debugChannelSet(-1, kDebugLingoCompile)) + if (debugChannelSet(-1, kDebugLingoParse)) yydebug = 1; else yydebug = 0; diff --git a/engines/director/lingo/lingo-lex.l b/engines/director/lingo/lingo-lex.l index a53a2f04de..37bad1247d 100644 --- a/engines/director/lingo/lingo-lex.l +++ b/engines/director/lingo/lingo-lex.l @@ -325,7 +325,7 @@ namespace Director { int Lingo::parse(const char *code) { YY_BUFFER_STATE bp; - if (debugChannelSet(-1, kDebugLingoCompile)) + if (debugChannelSet(-1, kDebugLingoParse)) yydebug = 1; else yydebug = 0; diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp index d90fac34c7..cf0038bfdc 100644 --- a/engines/director/lingo/lingo.cpp +++ b/engines/director/lingo/lingo.cpp @@ -158,7 +158,7 @@ const char *Lingo::findNextDefinition(const char *s) { } void Lingo::addCode(const char *code, ScriptType type, uint16 id) { - debugC(2, kDebugLingoCompile, "Add code \"%s\" for type %d with id %d", code, type, id); + debugC(2, kDebugLingoCompile, "Add code \"%s\" for type %s with id %d", code, scriptType2str(type), id); if (_scripts[type].contains(id)) { delete _scripts[type][id]; @@ -247,7 +247,7 @@ void Lingo::executeScript(ScriptType type, uint16 id) { return; } - debugC(2, kDebugLingoExec, "Executing script type: %d, id: %d", type, id); + debugC(2, kDebugLingoExec, "Executing script type: %s, id: %d", scriptType2str(type), id); _currentScript = _scripts[type][id]; _pc = 0; @@ -294,6 +294,8 @@ void Lingo::processEvent(LEvent event, ScriptType st, int entityId) { if (entityId <= 0) return; + debugC(1, kDebugEvents, "Lingo::processEvent(%s, %s, %d)", _eventHandlerTypes[event], scriptType2str(st), entityId); + _currentEntityId = entityId; if (!_eventHandlerTypes.contains(event)) @@ -303,7 +305,7 @@ void Lingo::processEvent(LEvent event, ScriptType st, int entityId) { call(_eventHandlerTypes[event], 0); // D4+ Events pop(); } else if (_scripts[st].contains(entityId)) { - executeScript(st, entityId - 1); // D3 list of scripts. + executeScript(st, entityId); // D3 list of scripts. } else { debugC(8, kDebugLingoExec, "STUB: processEvent(%s) for %d", _eventHandlerTypes[event], entityId); } diff --git a/engines/director/score.cpp b/engines/director/score.cpp index 31f97f76a3..975c6efe33 100644 --- a/engines/director/score.cpp +++ b/engines/director/score.cpp @@ -41,6 +41,24 @@ namespace Director { +const char *scriptTypes[] = { + "MovieScript", + "SpriteScript", + "FrameScript", + "CastScript" +}; + +const char *scriptType2str(ScriptType scr) { + if (scr < 0) + return "NoneScript"; + + if (scr > kMaxScriptType) + return "<unknown>"; + + return scriptTypes[scr]; +} + + Score::Score(DirectorEngine *vm, Archive *archive) { _vm = vm; _surface = new Graphics::ManagedSurface; @@ -142,10 +160,13 @@ void Score::loadArchive() { setSpriteCasts(); - //Common::Array<uint16> stxt = _movieArchive->getResourceIDList(MKTAG('S','T','X','T')); - //if (stxt.size() > 0) { - // loadScriptText(*_movieArchive->getResource(MKTAG('S','T','X','T'), *stxt.begin())); - //} + // Try to load movie script, it sits in resource A11 + if (_vm->getVersion() <= 3) { + Common::Array<uint16> stxt = _movieArchive->getResourceIDList(MKTAG('S','T','X','T')); + if (stxt.size() > 0) { + loadScriptText(*_movieArchive->getResource(MKTAG('S','T','X','T'), *stxt.begin())); + } + } } Score::~Score() { @@ -243,6 +264,8 @@ void Score::loadFrames(Common::SeekableSubReadStreamEndian &stream) { //Common::hexdump(channelData, ARRAYSIZE(channelData)); frame->readChannels(str); + debugC(3, kDebugLoading, "Frame %d actionId: %d", _frames.size(), frame->_actionId); + delete str; _frames.push_back(frame); @@ -484,12 +507,13 @@ void Score::loadActions(Common::SeekableSubReadStreamEndian &stream) { uint16 offset = count * 4 + 2; byte id = stream.readByte(); - /*byte subId = */ stream.readByte(); // I couldn't find how it used in continuity (except print). Frame actionId = 1 byte. + + byte subId = stream.readByte(); // I couldn't find how it used in continuity (except print). Frame actionId = 1 byte. uint16 stringPos = stream.readUint16() + offset; for (uint16 i = 0; i < count; i++) { uint16 nextId = stream.readByte(); - /*byte subId = */ stream.readByte(); + byte nextSubId = stream.readByte(); uint16 nextStringPos = stream.readUint16() + offset; uint16 streamPos = stream.pos(); @@ -500,12 +524,15 @@ void Score::loadActions(Common::SeekableSubReadStreamEndian &stream) { if (ch == 0x0d) { ch = '\n'; } - _actions[id] += ch; + _actions[i + 1] += ch; } + debugC(3, kDebugLoading, "id: %d nextId: %d subId: %d, code: %s", id, nextId, subId, _actions[id].c_str()); + stream.seek(streamPos); id = nextId; + subId = nextSubId; stringPos = nextStringPos; if (stringPos == stream.size()) @@ -639,6 +666,8 @@ void Score::gotoLoop() { } } } + + g_director->_skipFrameAdvance = true; } int Score::getCurrentLabelNumber() { @@ -657,11 +686,15 @@ int Score::getCurrentLabelNumber() { void Score::gotoNext() { // we can just try to use the current frame and get the next label _currentFrame = getNextLabelNumber(_currentFrame); + + g_director->_skipFrameAdvance = true; } void Score::gotoPrevious() { // we actually need the frame of the label prior to the most recent label. _currentFrame = getPreviousLabelNumber(getCurrentLabelNumber()); + + g_director->_skipFrameAdvance = true; } int Score::getNextLabelNumber(int referenceFrame) { @@ -839,7 +872,6 @@ void Score::startLoop() { _stopPlay = false; _nextFrameTime = 0; - _lingo->processEvent(kEventStartMovie, kMovieScript, 0); _frames[_currentFrame]->prepareFrame(this); while (!_stopPlay && _currentFrame < _frames.size()) { @@ -871,7 +903,7 @@ void Score::update() { } } - // TODO Director 6 step: send prepareFrame event to all sprites and the script channel in upcoming frame + // TODO: Director 6 step: send prepareFrame event to all sprites and the script channel in upcoming frame if (_vm->getVersion() >= 6) _lingo->processEvent(kEventPrepareFrame, kFrameScript, _currentFrame); @@ -884,9 +916,11 @@ void Score::update() { } } - if (!g_director->_playbackPaused) + if (!g_director->_playbackPaused && !g_director->_skipFrameAdvance) _currentFrame++; + g_director->_skipFrameAdvance = false; + if (_currentFrame >= _frames.size()) return; @@ -928,7 +962,7 @@ void Score::update() { } void Score::processEvents() { - //TODO: re-instate when we know which script to run. + // TODO: re-instate when we know which script to run. //if (_currentFrame > 0) // _lingo->processEvent(kEventIdle, _currentFrame - 1); @@ -944,9 +978,9 @@ void Score::processEvents() { if (event.type == Common::EVENT_LBUTTONDOWN) { Common::Point pos = g_system->getEventManager()->getMousePos(); - //D3 doesn't have both mouse up and down. + // D3 doesn't have both mouse up and down. if (_vm->getVersion() > 3) { - //TODO: check that this is the order of script execution! + // TODO: check that this is the order of script execution! uint16 spriteId = _frames[_currentFrame]->getSpriteIDFromPos(pos); _lingo->processEvent(kEventMouseDown, kCastScript, _frames[_currentFrame]->_sprites[spriteId]->_castId); _lingo->processEvent(kEventMouseDown, kSpriteScript, _frames[_currentFrame]->_sprites[spriteId]->_scriptId); @@ -958,11 +992,11 @@ void Score::processEvents() { uint16 spriteId = _frames[_currentFrame]->getSpriteIDFromPos(pos); if (_vm->getVersion() > 3) { - //TODO: check that this is the order of script execution! + // TODO: check that this is the order of script execution! _lingo->processEvent(kEventMouseUp, kCastScript, _frames[_currentFrame]->_sprites[spriteId]->_castId); _lingo->processEvent(kEventMouseUp, kSpriteScript, _frames[_currentFrame]->_sprites[spriteId]->_scriptId); } else { - //D3 doesn't have cast member or sprite scripts. Just Frame Scripts. + // D3 doesn't have cast member or sprite scripts. Just Frame Scripts. _lingo->processEvent(kEventMouseUp, kFrameScript, _frames[_currentFrame]->_sprites[spriteId]->_scriptId); } } @@ -988,7 +1022,7 @@ void Score::processEvents() { warning("Keycode: %d", _vm->_keyCode); } - //TODO: is movie script correct? Can this be elsewhere? + // TODO: is movie script correct? Can this be elsewhere? _lingo->processEvent(kEventKeyDown, kMovieScript, 0); } } diff --git a/engines/director/score.h b/engines/director/score.h index dca1b8fc02..6db5e33988 100644 --- a/engines/director/score.h +++ b/engines/director/score.h @@ -52,6 +52,8 @@ enum ScriptType { kMaxScriptType = 3 }; +const char *scriptType2str(ScriptType scr); + class Score { public: Score(DirectorEngine *vm, Archive *); @@ -110,6 +112,7 @@ public: Common::Rect _movieRect; bool _stopPlay; + uint32 _nextFrameTime; private: uint16 _versionMinor; @@ -123,7 +126,6 @@ private: uint16 _castArrayStart; uint16 _currentFrame; Common::String _currentLabel; - uint32 _nextFrameTime; uint32 _flags; uint16 _castArrayEnd; uint16 _movieScriptCount; diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp index 561b74d354..a3a690be59 100644 --- a/engines/sci/engine/savegame.cpp +++ b/engines/sci/engine/savegame.cpp @@ -456,9 +456,6 @@ void Script::syncStringHeap(Common::Serializer &s) { s.syncBytes(buf, blockSize); buf += blockSize; - - if (_buf - buf == 0) - break; } while (1); } else if (getSciVersion() >= SCI_VERSION_1_1 && getSciVersion() <= SCI_VERSION_2_1_LATE){ diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index 77c3d4e637..aaa1c8ccfe 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -2234,7 +2234,7 @@ bool ResourceManager::checkResourceDataForSignature(Resource *resource, const by if (signatureSize > resource->size) return false; - const uint32 signatureDWord = *((const uint32 *)signature); + const uint32 signatureDWord = READ_UINT32(signature); signature += 4; signatureSize -= 4; const uint32 searchLimit = resource->size - signatureSize + 1; diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp index 8465526243..5b7e14406a 100644 --- a/engines/scumm/actor.cpp +++ b/engines/scumm/actor.cpp @@ -937,7 +937,6 @@ L2A33:; } if ((_moving & 0x0F) == 3) { -L2C36:; setTmpFromActor(); if (!_walkDirX) { @@ -980,7 +979,6 @@ L2C36:; // 2ADA if ((_moving & 0x0F) == 4) { -L2CA3:; setTmpFromActor(); if (!_walkDirY) { @@ -1045,7 +1043,7 @@ L2CA3:; directionUpdate(); animateActor(newDirToOldDir(_facing)); - goto L2C36; + return; } else { // 2B39 @@ -1064,7 +1062,7 @@ L2CA3:; directionUpdate(); animateActor(newDirToOldDir(_facing)); - goto L2CA3; + return; } } } @@ -2416,6 +2414,7 @@ void Actor_v0::startAnimActor(int f) { return; _speaking = 1; + speakCheck(); return; } diff --git a/engines/titanic/carry/arm.cpp b/engines/titanic/carry/arm.cpp index 5105ea81b4..23b0710c30 100644 --- a/engines/titanic/carry/arm.cpp +++ b/engines/titanic/carry/arm.cpp @@ -35,55 +35,41 @@ BEGIN_MESSAGE_MAP(CArm, CCarry) ON_MESSAGE(MouseDragMoveMsg) END_MESSAGE_MAP() -CArm::CArm() : CCarry(), _string6("Key"), - _field138(0), _field158(0), _field16C(3), _field170(0), +CArm::CArm() : CCarry(), _heldItemName("Key"), + _puzzleUnused(0), _armUnlocked(false), _arboretumFrame(3), _unlockedFrame(0), _armRect(220, 208, 409, 350) { } void CArm::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); - file->writeQuotedLine(_string6, indent); - file->writeNumberLine(_field138, indent); - file->writeNumberLine(_hookedRect.left, indent); - file->writeNumberLine(_hookedRect.top, indent); - file->writeNumberLine(_hookedRect.right, indent); - file->writeNumberLine(_hookedRect.bottom, indent); - - file->writeQuotedLine(_string7, indent); - file->writeNumberLine(_field158, indent); - file->writeNumberLine(_armRect.left, indent); - file->writeNumberLine(_armRect.top, indent); - file->writeNumberLine(_armRect.right, indent); - file->writeNumberLine(_armRect.bottom, indent); - file->writeNumberLine(_field16C, indent); - file->writeNumberLine(_field170, indent); + file->writeQuotedLine(_heldItemName, indent); + file->writeNumberLine(_puzzleUnused, indent); + file->writeRect(_hookedRect, indent); + file->writeQuotedLine(_hookedTarget, indent); + file->writeNumberLine(_armUnlocked, indent); + file->writeRect(_armRect, indent); + file->writeNumberLine(_arboretumFrame, indent); + file->writeNumberLine(_unlockedFrame, indent); CCarry::save(file, indent); } void CArm::load(SimpleFile *file) { file->readNumber(); - _string6 = file->readString(); - _field138 = file->readNumber(); - _hookedRect.left = file->readNumber(); - _hookedRect.top = file->readNumber(); - _hookedRect.right = file->readNumber(); - _hookedRect.bottom = file->readNumber(); - - _string7 = file->readString(); - _field158 = file->readNumber(); - _armRect.left = file->readNumber(); - _armRect.top = file->readNumber(); - _armRect.right = file->readNumber(); - _armRect.bottom = file->readNumber(); - _field16C = file->readNumber(); - _field170 = file->readNumber(); + _heldItemName = file->readString(); + _puzzleUnused = file->readNumber(); + _hookedRect = file->readRect(); + _hookedTarget = file->readString(); + _armUnlocked = file->readNumber(); + _armRect = file->readRect(); + _arboretumFrame = file->readNumber(); + _unlockedFrame = file->readNumber(); CCarry::load(file); } bool CArm::PuzzleSolvedMsg(CPuzzleSolvedMsg *msg) { - _field138 = 0; + _puzzleUnused = 0; _canTake = true; CString name = getName(); @@ -101,13 +87,13 @@ bool CArm::PuzzleSolvedMsg(CPuzzleSolvedMsg *msg) { } bool CArm::TranslateObjectMsg(CTranslateObjectMsg *msg) { - Point newPos(_bounds.left - msg->_delta.x, _bounds.top - msg->_delta.y); + Point newPos(_bounds.left + msg->_delta.x, _bounds.top + msg->_delta.y); setPosition(newPos); return true; } bool CArm::UseWithOtherMsg(CUseWithOtherMsg *msg) { - if (_string6 != "None") { + if (_heldItemName != "None") { CShowTextMsg textMsg(ARM_ALREADY_HOLDING); textMsg.execute("PET"); return false; @@ -116,8 +102,8 @@ bool CArm::UseWithOtherMsg(CUseWithOtherMsg *msg) { hookedMsg._rect.translate(_bounds.left, _bounds.top); hookedMsg.execute("GondolierLeftLever"); - if (hookedMsg._result) { - _string7 = "GondolierLeftLever"; + if (hookedMsg._isHooked) { + _hookedTarget = "GondolierLeftLever"; } else { petAddToInventory(); } @@ -126,11 +112,13 @@ bool CArm::UseWithOtherMsg(CUseWithOtherMsg *msg) { hookedMsg._rect.translate(_bounds.left, _bounds.top); hookedMsg.execute("GondolierRightLever"); - if (hookedMsg._result) { - _string7 = "GondolierRightLever"; + if (hookedMsg._isHooked) { + _hookedTarget = "GondolierRightLever"; } else { petAddToInventory(); } + } else { + petAddToInventory(); } return true; @@ -142,13 +130,13 @@ bool CArm::MouseDragStartMsg(CMouseDragStartMsg *msg) { textMsg.execute("PET"); } else if (checkStartDragging(msg)) { hideMouse(); - _tempPos = msg->_mousePos - _bounds; - setPosition(msg->_mousePos - _tempPos); + _centroid = msg->_mousePos - _bounds; + setPosition(msg->_mousePos - _centroid); - if (!_string7.empty()) { + if (!_hookedTarget.empty()) { CActMsg actMsg("Unhook"); - actMsg.execute(_string7); - _string7.clear(); + actMsg.execute(_hookedTarget); + _hookedTarget.clear(); } loadFrame(_visibleFrame); @@ -161,39 +149,39 @@ bool CArm::MouseDragStartMsg(CMouseDragStartMsg *msg) { bool CArm::MaitreDHappyMsg(CMaitreDHappyMsg *msg) { CGameObject *petItem; if (find(getName(), &petItem, FIND_PET)) { - if (!_field158) + if (!_armUnlocked) playSound("z#47.wav"); - if (_string6 == "Key" || _string6 == "AuditoryCentre") { - CGameObject *child = dynamic_cast<CGameObject *>(getFirstChild()); - if (child) { - child->setVisible(true); - petAddToInventory(); + if (_heldItemName == "Key" || _heldItemName == "AuditoryCentre") { + CGameObject *heldItem = dynamic_cast<CGameObject *>(getFirstChild()); + if (heldItem) { + heldItem->setVisible(true); + heldItem->petAddToInventory(); } - _visibleFrame = _field170; + _visibleFrame = _unlockedFrame; loadFrame(_visibleFrame); - _string6 = "None"; + _heldItemName = "None"; petInvChange(); } } - _field158 = 1; + _armUnlocked = true; _canTake = true; return true; } bool CArm::PETGainedObjectMsg(CPETGainedObjectMsg *msg) { - if (_field158) { - if (_string6 == "Key" || _string6 == "AuditoryCentre") { + if (_armUnlocked) { + if (_heldItemName == "Key" || _heldItemName == "AuditoryCentre") { CCarry *child = dynamic_cast<CCarry *>(getFirstChild()); if (child) { - _visibleFrame = _field170; + _visibleFrame = _unlockedFrame; loadFrame(_visibleFrame); child->setVisible(true); child->petAddToInventory(); } - _string6 = "None"; + _heldItemName = "None"; } } @@ -201,11 +189,11 @@ bool CArm::PETGainedObjectMsg(CPETGainedObjectMsg *msg) { } bool CArm::MouseDragMoveMsg(CMouseDragMoveMsg *msg) { - setPosition(msg->_mousePos - _tempPos); + setPosition(msg->_mousePos - _centroid); - if (_string6 != "None" && compareViewNameTo("FrozenArboretum.Node 5.S")) { + if (_heldItemName == "None" && compareViewNameTo("FrozenArboretum.Node 5.S")) { loadFrame(_armRect.contains(msg->_mousePos) ? - _field16C : _visibleFrame); + _arboretumFrame : _visibleFrame); } return true; diff --git a/engines/titanic/carry/arm.h b/engines/titanic/carry/arm.h index fc8bba1f08..3eec4b6995 100644 --- a/engines/titanic/carry/arm.h +++ b/engines/titanic/carry/arm.h @@ -40,14 +40,14 @@ class CArm : public CCarry { bool PETGainedObjectMsg(CPETGainedObjectMsg *msg); bool MouseDragMoveMsg(CMouseDragMoveMsg *msg); private: - CString _string6; - int _field138; + CString _heldItemName; + int _puzzleUnused; Rect _hookedRect; - CString _string7; - int _field158; + CString _hookedTarget; + bool _armUnlocked; Rect _armRect; - int _field16C; - int _field170; + int _arboretumFrame; + int _unlockedFrame; public: CLASSDEF; CArm(); diff --git a/engines/titanic/carry/brain.cpp b/engines/titanic/carry/brain.cpp index b00f026718..73970c404c 100644 --- a/engines/titanic/carry/brain.cpp +++ b/engines/titanic/carry/brain.cpp @@ -33,14 +33,14 @@ BEGIN_MESSAGE_MAP(CBrain, CCarry) ON_MESSAGE(PETGainedObjectMsg) END_MESSAGE_MAP() -CBrain::CBrain() : CCarry(), _field134(0), _field138(0) { +CBrain::CBrain() : CCarry(), _pieceAdded(false), _perchGained(false) { } void CBrain::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); file->writePoint(_pos1, indent); - file->writeNumberLine(_field134, indent); - file->writeNumberLine(_field138, indent); + file->writeNumberLine(_pieceAdded, indent); + file->writeNumberLine(_perchGained, indent); CCarry::save(file, indent); } @@ -48,36 +48,38 @@ void CBrain::save(SimpleFile *file, int indent) { void CBrain::load(SimpleFile *file) { file->readNumber(); _pos1 = file->readPoint(); - _field134 = file->readNumber(); - _field138 = file->readNumber(); + _pieceAdded = file->readNumber(); + _perchGained = file->readNumber(); CCarry::load(file); } bool CBrain::UseWithOtherMsg(CUseWithOtherMsg *msg) { CBrainSlot *slot = dynamic_cast<CBrainSlot *>(msg->_other); - if (slot) { - if (slot->getName() == "CentralCore") { - setVisible(false); - petMoveToHiddenRoom(); - CAddHeadPieceMsg headpieceMsg(getName()); - headpieceMsg.execute("CentralCoreSlot"); - } - else if (!slot->_value1 && slot->getName() == "CentralCoreSlot") { - setVisible(false); - petMoveToHiddenRoom(); - CAddHeadPieceMsg headpieceMsg(getName()); - headpieceMsg.execute(msg->_other); - playSound("z#116.wav"); - setPosition(Point(0, 0)); - setVisible(false); - _field134 = 1; - } + if (!slot) + return CCarry::UseWithOtherMsg(msg); - return true; + if (isEquals("CentralCore")) { + setVisible(false); + petMoveToHiddenRoom(); + CAddHeadPieceMsg headpieceMsg(getName()); + headpieceMsg.execute("CentralCoreSlot"); + } else if (!slot->_occupied && slot->getName() != "CentralCoreSlot") { + // Brain card goes into vacant slot + setVisible(false); + petMoveToHiddenRoom(); + CAddHeadPieceMsg headpieceMsg(getName()); + headpieceMsg.execute(msg->_other); + playSound("z#116.wav"); + setPosition(Point(0, 0)); + setVisible(false); + _pieceAdded = true; } else { - return CCarry::UseWithOtherMsg(msg); + // Trying to put brain card into an already occupied slot + petAddToInventory(); } + + return true; } bool CBrain::VisibleMsg(CVisibleMsg *msg) { @@ -89,11 +91,11 @@ bool CBrain::MouseDragStartMsg(CMouseDragStartMsg *msg) { if (!checkStartDragging(msg)) return false; - if (_field134) { + if (_pieceAdded) { CTakeHeadPieceMsg headpieceMsg(getName()); headpieceMsg.execute("TitaniaControl"); - _field134 = 0; + _pieceAdded = false; setVisible(true); moveToView(); @@ -105,10 +107,10 @@ bool CBrain::MouseDragStartMsg(CMouseDragStartMsg *msg) { } bool CBrain::PassOnDragStartMsg(CPassOnDragStartMsg *msg) { - if (_field134) { + if (_pieceAdded) { CTakeHeadPieceMsg headpieceMsg(getName()); headpieceMsg.execute("TitaniaControl"); - _field134 = 0; + _pieceAdded = false; setVisible(true); moveToView(); @@ -120,10 +122,10 @@ bool CBrain::PassOnDragStartMsg(CPassOnDragStartMsg *msg) { } bool CBrain::PETGainedObjectMsg(CPETGainedObjectMsg *msg) { - if (!_field138) { + if (!_perchGained) { if (getName() == "Perch") { - stateInc38(); - _field138 = 1; + incParrotResponse(); + _perchGained = true; } } diff --git a/engines/titanic/carry/brain.h b/engines/titanic/carry/brain.h index bcba161e27..4c41378702 100644 --- a/engines/titanic/carry/brain.h +++ b/engines/titanic/carry/brain.h @@ -39,8 +39,8 @@ class CBrain : public CCarry { bool PETGainedObjectMsg(CPETGainedObjectMsg *msg); private: Point _pos1; - int _field134; - int _field138; + bool _pieceAdded; + bool _perchGained; public: CLASSDEF; CBrain(); diff --git a/engines/titanic/carry/carry.cpp b/engines/titanic/carry/carry.cpp index f6403b18b9..fd5b593fa3 100644 --- a/engines/titanic/carry/carry.cpp +++ b/engines/titanic/carry/carry.cpp @@ -44,30 +44,29 @@ BEGIN_MESSAGE_MAP(CCarry, CGameObject) ON_MESSAGE(PassOnDragStartMsg) END_MESSAGE_MAP() -CCarry::CCarry() : CGameObject(), _fieldDC(0), _canTake(true), - _field100(0), _field104(0), _field108(0), _field10C(0), - _itemFrame(0), _enterFrame(0), _enterFrameSet(false), _visibleFrame(0), - _string1("None"), - _fullViewName("NULL"), - _string3(g_vm->_strings[DOESNT_DO_ANYTHING]), - _string4(g_vm->_strings[DOESNT_WANT_THIS]) { +CCarry::CCarry() : CGameObject(), _unused5(0), _canTake(true), + _unusedR(0), _unusedG(0), _unusedB(0), _itemFrame(0), + _enterFrame(0), _enterFrameSet(false), _visibleFrame(0), + _npcUse("None"), _fullViewName("NULL"), + _doesNothingMsg(g_vm->_strings[DOESNT_DO_ANYTHING]), + _doesntWantMsg(g_vm->_strings[DOESNT_WANT_THIS]) { } void CCarry::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); - file->writeQuotedLine(_string1, indent); + file->writeQuotedLine(_npcUse, indent); file->writePoint(_origPos, indent); file->writeQuotedLine(_fullViewName, indent); - file->writeNumberLine(_fieldDC, indent); + file->writeNumberLine(_unused5, indent); file->writeNumberLine(_canTake, indent); - file->writeQuotedLine(_string3, indent); - file->writeQuotedLine(_string4, indent); - file->writePoint(_tempPos, indent); - file->writeNumberLine(_field104, indent); - file->writeNumberLine(_field108, indent); - file->writeNumberLine(_field10C, indent); + file->writeQuotedLine(_doesNothingMsg, indent); + file->writeQuotedLine(_doesntWantMsg, indent); + file->writePoint(_centroid, indent); + file->writeNumberLine(_unusedR, indent); + file->writeNumberLine(_unusedG, indent); + file->writeNumberLine(_unusedB, indent); file->writeNumberLine(_itemFrame, indent); - file->writeQuotedLine(_string5, indent); + file->writeQuotedLine(_unused6, indent); file->writeNumberLine(_enterFrame, indent); file->writeNumberLine(_enterFrameSet, indent); file->writeNumberLine(_visibleFrame, indent); @@ -77,19 +76,19 @@ void CCarry::save(SimpleFile *file, int indent) { void CCarry::load(SimpleFile *file) { file->readNumber(); - _string1 = file->readString(); + _npcUse = file->readString(); _origPos = file->readPoint(); _fullViewName = file->readString(); - _fieldDC = file->readNumber(); + _unused5 = file->readNumber(); _canTake = file->readNumber(); - _string3 = file->readString(); - _string4 = file->readString(); - _tempPos = file->readPoint(); - _field104 = file->readNumber(); - _field108 = file->readNumber(); - _field10C = file->readNumber(); + _doesNothingMsg = file->readString(); + _doesntWantMsg = file->readString(); + _centroid = file->readPoint(); + _unusedR = file->readNumber(); + _unusedG = file->readNumber(); + _unusedB = file->readNumber(); _itemFrame = file->readNumber(); - _string5 = file->readString(); + _unused6 = file->readString(); _enterFrame = file->readNumber(); _enterFrameSet = file->readNumber(); _visibleFrame = file->readNumber(); @@ -118,7 +117,7 @@ bool CCarry::MouseDragStartMsg(CMouseDragStartMsg *msg) { } bool CCarry::MouseDragMoveMsg(CMouseDragMoveMsg *msg) { - setPosition(msg->_mousePos - _tempPos); + setPosition(msg->_mousePos - _centroid); return true; } @@ -167,7 +166,7 @@ bool CCarry::UseWithCharMsg(CUseWithCharMsg *msg) { carryMsg._item = this; carryMsg.execute(succubus); } else { - CShowTextMsg textMsg(_string4); + CShowTextMsg textMsg(_doesntWantMsg); textMsg.execute("PET"); petAddToInventory(); } @@ -180,7 +179,7 @@ bool CCarry::LeaveViewMsg(CLeaveViewMsg *msg) { } bool CCarry::UseWithOtherMsg(CUseWithOtherMsg *msg) { - CShowTextMsg textMsg(_string3); + CShowTextMsg textMsg(_doesNothingMsg); textMsg.execute("PET"); if (!compareViewNameTo(_fullViewName) || _bounds.top >= 360) { @@ -233,13 +232,13 @@ bool CCarry::PassOnDragStartMsg(CPassOnDragStartMsg *msg) { loadFrame(_visibleFrame); if (msg->_value3) { - _tempPos.x = _bounds.width() / 2; - _tempPos.y = _bounds.height() / 2; + _centroid.x = _bounds.width() / 2; + _centroid.y = _bounds.height() / 2; } else { - _tempPos = msg->_mousePos - _bounds; + _centroid = msg->_mousePos - _bounds; } - setPosition(getMousePos() - _tempPos); + setPosition(getMousePos() - _centroid); return true; } diff --git a/engines/titanic/carry/carry.h b/engines/titanic/carry/carry.h index cb53df47a5..e9069da925 100644 --- a/engines/titanic/carry/carry.h +++ b/engines/titanic/carry/carry.h @@ -43,22 +43,20 @@ class CCarry : public CGameObject { bool MoveToStartPosMsg(CMoveToStartPosMsg *msg); bool EnterViewMsg(CEnterViewMsg *msg); bool PassOnDragStartMsg(CPassOnDragStartMsg *msg); -protected: - int _fieldDC; - CString _string3; - CString _string4; - Point _tempPos; - int _field100; - int _field104; - int _field108; - int _field10C; +private: + int _unused5; + CString _doesNothingMsg; + CString _doesntWantMsg; + int _unusedR, _unusedG, _unusedB; int _itemFrame; - CString _string5; + CString _unused6; int _enterFrame; bool _enterFrameSet; +protected: + Point _centroid; int _visibleFrame; public: - CString _string1; + CString _npcUse; bool _canTake; Point _origPos; CString _fullViewName; diff --git a/engines/titanic/carry/carry_parrot.cpp b/engines/titanic/carry/carry_parrot.cpp index 3a2f2c9368..4bb3a96bfb 100644 --- a/engines/titanic/carry/carry_parrot.cpp +++ b/engines/titanic/carry/carry_parrot.cpp @@ -113,7 +113,7 @@ bool CCarryParrot::MouseDragEndMsg(CMouseDragEndMsg *msg) { CTreeItem *perchedParrot = findUnder(getRoot(), "PerchedParrot"); detach(); addUnder(perchedParrot); - sound8(true); + stopSoundChannel(true); CPutParrotBackMsg backMsg(msg->_mousePos.x); backMsg.execute(perchedParrot); @@ -122,7 +122,7 @@ bool CCarryParrot::MouseDragEndMsg(CMouseDragEndMsg *msg) { _canTake = false; CParrot::_state = PARROT_ESCAPED; playSound("z#475.wav"); - sound8(true); + stopSoundChannel(true); moveUnder(findRoom()); CActMsg actMsg("Shut"); @@ -137,7 +137,7 @@ bool CCarryParrot::MouseDragEndMsg(CMouseDragEndMsg *msg) { setVisible(false); _canTake = false; playSound("z#475.wav"); - sound8(true); + stopSoundChannel(true); moveUnder(findRoom()); } } diff --git a/engines/titanic/carry/ear.cpp b/engines/titanic/carry/ear.cpp index 580ebd662f..c5196dc557 100644 --- a/engines/titanic/carry/ear.cpp +++ b/engines/titanic/carry/ear.cpp @@ -59,9 +59,11 @@ bool CEar::UseWithOtherMsg(CUseWithOtherMsg *msg) { CAddHeadPieceMsg addMsg(getName()); if (addMsg._value != "NULL") addMsg.execute(addMsg._value == "Ear1" ? "Ear1Slot" : "Ear2Slot"); - } - return CCarry::UseWithOtherMsg(msg); + return true; + } else { + return CCarry::UseWithOtherMsg(msg); + } } } // End of namespace Titanic diff --git a/engines/titanic/carry/head_piece.cpp b/engines/titanic/carry/head_piece.cpp index 1ce1d5ba1e..fa025158a5 100644 --- a/engines/titanic/carry/head_piece.cpp +++ b/engines/titanic/carry/head_piece.cpp @@ -60,7 +60,7 @@ bool CHeadPiece::SenseWorkingMsg(CSenseWorkingMsg *msg) { bool CHeadPiece::PETGainedObjectMsg(CPETGainedObjectMsg *msg) { _visibleFrame = 1; if (!_field13C) { - stateInc38(); + incParrotResponse(); _field13C = true; } diff --git a/engines/titanic/carry/magazine.cpp b/engines/titanic/carry/magazine.cpp index e68c63f8f9..94e853bda9 100644 --- a/engines/titanic/carry/magazine.cpp +++ b/engines/titanic/carry/magazine.cpp @@ -52,19 +52,18 @@ void CMagazine::load(SimpleFile *file) { } bool CMagazine::UseWithCharMsg(CUseWithCharMsg *msg) { + // WORKAROUND: Slight difference to original to ensure that when the + // magazine is used on an incorrect char, it's returned to inventory CDeskbot *deskbot = dynamic_cast<CDeskbot *>(msg->_character); - if (deskbot) { - if (deskbot->_deskbotActive) { - setVisible(false); - setPosition(Point(1000, 1000)); - CActMsg actMsg("2ndClassUpgrade"); - actMsg.execute("Deskbot"); - } - + if (deskbot && deskbot->_deskbotActive) { + setVisible(false); + setPosition(Point(1000, 1000)); + CActMsg actMsg("2ndClassUpgrade"); + actMsg.execute("Deskbot"); return true; - } else { - return CCarry::UseWithCharMsg(msg); } + + return CCarry::UseWithCharMsg(msg); } bool CMagazine::MouseDoubleClickMsg(CMouseDoubleClickMsg *msg) { @@ -77,17 +76,20 @@ bool CMagazine::VisibleMsg(CVisibleMsg *msg) { } bool CMagazine::UseWithOtherMsg(CUseWithOtherMsg *msg) { + // WORKAROUND: Slight difference to original to ensure that when the + // magazine is used on an incorrect object, it's returned to inventory if (msg->_other->getName() == "SwitchOnDeskbot") { - // TODO: other _field108 if - if (false) { + CDeskbot *deskbot = dynamic_cast<CDeskbot *>(msg->_other); + if (deskbot && deskbot->_deskbotActive) { setVisible(false); setPosition(Point(1000, 1000)); CActMsg actMsg("2ndClassUpgrade"); actMsg.execute("Deskbot"); + return true; } } - return true; + return CCarry::UseWithOtherMsg(msg); } } // End of namespace Titanic diff --git a/engines/titanic/carry/mouth.cpp b/engines/titanic/carry/mouth.cpp index e48929a391..d750fc969e 100644 --- a/engines/titanic/carry/mouth.cpp +++ b/engines/titanic/carry/mouth.cpp @@ -70,7 +70,7 @@ bool CMouth::PETGainedObjectMsg(CPETGainedObjectMsg *msg) { loadFrame(2); setVisible(true); if (!_field13C) { - stateInc38(); + incParrotResponse(); _field13C = true; } diff --git a/engines/titanic/core/background.cpp b/engines/titanic/core/background.cpp index 9f22f1e992..d6419f23db 100644 --- a/engines/titanic/core/background.cpp +++ b/engines/titanic/core/background.cpp @@ -58,7 +58,7 @@ void CBackground::load(SimpleFile *file) { bool CBackground::StatusChangeMsg(CStatusChangeMsg *msg) { setVisible(true); if (_isBlocking) { - playMovie(_startFrame, _endFrame, MOVIE_GAMESTATE); + playMovie(_startFrame, _endFrame, MOVIE_WAIT_FOR_FINISH); } else { playMovie(_startFrame, _endFrame, 0); } diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp index af7020532c..314746e496 100644 --- a/engines/titanic/core/game_object.cpp +++ b/engines/titanic/core/game_object.cpp @@ -56,26 +56,25 @@ void CGameObject::deinit() { CGameObject::CGameObject(): CNamedItem() { _bounds = Rect(0, 0, 15, 15); - _field34 = 0; - _field38 = 0; - _field3C = 0; + _unused1 = 0; + _unused2 = 0; + _unused3 = 0; _nonvisual = false; - _field44 = 0xF0; - _field48 = 0xF0; - _field4C = 0xFF; + _toggleR = 0xF0; + _toggleG = 0xF0; + _toggleB = 0xFF; _isPendingMail = false; _destRoomFlags = 0; _roomFlags = 0; _visible = true; - _field60 = 0; + _handleMouseFlag = false; _cursorId = CURSOR_ARROW; _initialFrame = 0; _frameNumber = -1; _text = nullptr; _textBorder = _textBorderRight = 0; - _field9C = 0; _surface = nullptr; - _fieldB8 = 0; + _unused4 = 0; } CGameObject::~CGameObject() { @@ -105,19 +104,19 @@ void CGameObject::save(SimpleFile *file, int indent) { file->writeNumberLine(getMovieFrame(), indent + 1); file->writeNumberLine(_cursorId, indent + 1); _movieClips.save(file, indent + 1); - file->writeNumberLine(_field60, indent + 1); + file->writeNumberLine(_handleMouseFlag, indent + 1); file->writeNumberLine(_nonvisual, indent + 1); file->writeQuotedLine(_resource, indent + 1); file->writeBounds(_bounds, indent + 1); - file->writeFloatLine(_field34, indent + 1); - file->writeFloatLine(_field38, indent + 1); - file->writeFloatLine(_field3C, indent + 1); + file->writeFloatLine(_unused1, indent + 1); + file->writeFloatLine(_unused2, indent + 1); + file->writeFloatLine(_unused3, indent + 1); - file->writeNumberLine(_field44, indent + 1); - file->writeNumberLine(_field48, indent + 1); - file->writeNumberLine(_field4C, indent + 1); - file->writeNumberLine(_fieldB8, indent + 1); + file->writeNumberLine(_toggleR, indent + 1); + file->writeNumberLine(_toggleG, indent + 1); + file->writeNumberLine(_toggleB, indent + 1); + file->writeNumberLine(_unused4, indent + 1); file->writeNumberLine(_visible, indent + 1); file->writeNumberLine(_isPendingMail, indent + 1); file->writeNumberLine(_destRoomFlags, indent + 1); @@ -153,7 +152,7 @@ void CGameObject::load(SimpleFile *file) { // Deliberate fall-through case 4: - _field60 = file->readNumber(); + _handleMouseFlag = file->readNumber(); // Deliberate fall-through case 3: @@ -166,13 +165,13 @@ void CGameObject::load(SimpleFile *file) { case 1: _bounds = file->readBounds(); - _field34 = file->readFloat(); - _field38 = file->readFloat(); - _field3C = file->readFloat(); - _field44 = file->readNumber(); - _field48 = file->readNumber(); - _field4C = file->readNumber(); - _fieldB8 = file->readNumber(); + _unused1 = file->readFloat(); + _unused2 = file->readFloat(); + _unused3 = file->readFloat(); + _toggleR = file->readNumber(); + _toggleG = file->readNumber(); + _toggleB = file->readNumber(); + _unused4 = file->readNumber(); _visible = file->readNumber() != 0; _isPendingMail = file->readNumber(); _destRoomFlags = file->readNumber(); @@ -543,15 +542,11 @@ void CGameObject::setGlobalSoundVolume(int mode, uint seconds, int handleIndex) } } -void CGameObject::sound8(bool flag) const { - getGameManager()->_sound.stopChannel(flag ? 3 : 0); +void CGameObject::stopSoundChannel(bool channel3) { + getGameManager()->_sound.stopChannel(channel3 ? 3 : 0); } void CGameObject::setVisible(bool val) { - if (_name.contains("ylinder")) { - warning("TODO"); - } - if (val != _visible) { _visible = val; makeDirty(); @@ -611,7 +606,7 @@ void CGameObject::playMovie(uint flags) { CGameObject *obj = (flags & MOVIE_NOTIFY_OBJECT) ? this : nullptr; if (_surface) { _surface->playMovie(flags, obj); - if (flags & MOVIE_GAMESTATE) + if (flags & MOVIE_WAIT_FOR_FINISH) getGameManager()->_gameState.addMovie(_surface->_movie); } } @@ -627,7 +622,7 @@ void CGameObject::playMovie(int startFrame, int endFrame, uint flags) { CGameObject *obj = (flags & MOVIE_NOTIFY_OBJECT) ? this : nullptr; if (_surface) { _surface->playMovie(startFrame, endFrame, flags, obj); - if (flags & MOVIE_GAMESTATE) + if (flags & MOVIE_WAIT_FOR_FINISH) getGameManager()->_gameState.addMovie(_surface->_movie); } } @@ -644,7 +639,7 @@ void CGameObject::playMovie(int startFrame, int endFrame, int initialFrame, uint CGameObject *obj = (flags & MOVIE_NOTIFY_OBJECT) ? this : nullptr; if (_surface) { _surface->playMovie(startFrame, endFrame, initialFrame, flags, obj); - if (flags & MOVIE_GAMESTATE) + if (flags & MOVIE_WAIT_FOR_FINISH) getGameManager()->_gameState.addMovie(_surface->_movie); } } @@ -1058,12 +1053,12 @@ bool CGameObject::stateGetParrotMet() const { return getGameManager()->_gameState.getParrotMet(); } -void CGameObject::stateInc38() { - getGameManager()->_gameState.inc38(); +void CGameObject::incParrotResponse() { + getGameManager()->_gameState.incParrotResponse(); } -int CGameObject::stateGet38() const { - return getGameManager()->_gameState._field38; +int CGameObject::getParrotResponse() const { + return getGameManager()->_gameState._parrotResponseIndex; } void CGameObject::quitGame() { @@ -1373,11 +1368,11 @@ void CGameObject::createCredits() { _credits->load(this, screenManager, _bounds); } -void CGameObject::fn10(int v1, int v2, int v3) { +void CGameObject::setToggleColor(byte r, byte g, byte b) { makeDirty(); - _field44 = v1; - _field48 = v2; - _field4C = v3; + _toggleR = r; + _toggleG = g; + _toggleB = b; } void CGameObject::movieSetAudioTiming(bool flag) { @@ -1429,8 +1424,8 @@ bool CGameObject::compareRoomFlags(RoomFlagsComparison compareType, uint flags1, } } -void CGameObject::setState1C(bool flag) { - getGameManager()->_gameState._field1C = flag; +void CGameObject::stateSetSoundMakerAllowed(bool flag) { + getGameManager()->_gameState._soundMakerAllowed = flag; } void CGameObject::addMail(uint destRoomFlags) { @@ -1648,9 +1643,9 @@ void CGameObject::starFn1(int v) { starControl->fn1(v); } -bool CGameObject::starFn2() { +bool CGameObject::starIsSolved() const { CStarControl *starControl = getStarControl(); - return starControl ? starControl->fn4() : false; + return starControl ? starControl->isSolved() : false; } /*------------------------------------------------------------------------*/ diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h index a56095c60f..b214cf8c9e 100644 --- a/engines/titanic/core/game_object.h +++ b/engines/titanic/core/game_object.h @@ -77,13 +77,11 @@ private: protected: static CCreditText *_credits; protected: - double _field34; - double _field38; - double _field3C; + double _unused1; + double _unused2; + double _unused3; bool _nonvisual; - int _field44; - int _field48; - int _field4C; + byte _toggleR, _toggleG, _toggleB; CMovieClipList _movieClips; int _initialFrame; CMovieRangeInfoList _movieRangeInfoList; @@ -91,11 +89,10 @@ protected: CTextControl *_text; uint _textBorder; uint _textBorderRight; - int _field9C; Common::Point _savedPos; CVideoSurface *_surface; CString _resource; - int _fieldB8; + int _unused4; protected: /** * Saves the current position the object is located at @@ -277,7 +274,10 @@ protected: */ void setGlobalSoundVolume(int mode, uint seconds, int handleIndex); - void sound8(bool flag) const; + /** + * Stops sound channel 3 or 0 + */ + void stopSoundChannel(bool channel3); /** * Adds a timer @@ -462,7 +462,11 @@ protected: */ void setPassengerClass(PassengerClass newClass); - void fn10(int v1, int v2, int v3); + /** + * Sets color RGB for toggles + * @remarks The color set isn't actually used anywhere + */ + void setToggleColor(byte r, byte g, byte b); /** * Gets the duration of a specified clip in milliseconds @@ -523,7 +527,7 @@ public: bool _isPendingMail; uint _destRoomFlags; uint _roomFlags; - int _field60; + bool _handleMouseFlag; CursorId _cursorId; bool _visible; public: @@ -942,7 +946,11 @@ public: CStarControl *getStarControl() const; void starFn1(int v); - bool starFn2(); + + /** + * Returns true if the starmap puzzle has been solved + */ + bool starIsSolved() const; /*--- CTrueTalkManager Methods ---*/ @@ -987,7 +995,10 @@ public: /*--- CGameState Methods ---*/ - void setState1C(bool flag); + /** + * Sets whether a background sound maker is allowed for the rooms if available + */ + void stateSetSoundMakerAllowed(bool flag); /** * Change to the next season @@ -1009,8 +1020,15 @@ public: */ bool stateGetParrotMet() const; - void stateInc38(); - int stateGet38() const; + /** + * Moves the parrot to the next idle response + */ + void incParrotResponse(); + + /** + * Gets the index to use for parrot idle responses + */ + int getParrotResponse() const; /** * Gets the game state node changed counter diff --git a/engines/titanic/core/saveable_object.cpp b/engines/titanic/core/saveable_object.cpp index 8bb8a92b7f..0257f6a087 100644 --- a/engines/titanic/core/saveable_object.cpp +++ b/engines/titanic/core/saveable_object.cpp @@ -955,6 +955,7 @@ DEFFN(CUseWithCharMsg); DEFFN(CUseWithOtherMsg); DEFFN(CVirtualKeyCharMsg); DEFFN(CVisibleMsg); +DEFFN(CCheckCodeWheelsMsg); DEFFN(CEnterBombRoom); DEFFN(CEnterBridge); @@ -1538,6 +1539,7 @@ void CSaveableObject::initClassList() { ADDFN(CUseWithOtherMsg, CMessage); ADDFN(CVirtualKeyCharMsg, CMessage); ADDFN(CVisibleMsg, CMessage); + ADDFN(CCheckCodeWheelsMsg, CMessage); ADDFN(CMovePlayerTo, CGameObject); ADDFN(CMovePlayerToFrom, CGameObject); diff --git a/engines/titanic/core/tree_item.cpp b/engines/titanic/core/tree_item.cpp index 97d06d7bbe..b9b9aca67f 100644 --- a/engines/titanic/core/tree_item.cpp +++ b/engines/titanic/core/tree_item.cpp @@ -274,7 +274,7 @@ CNamedItem *CTreeItem::findByName(const CString &name, bool subMatch) { itemName.toLowercase(); if (subMatch) { - if (itemName.left(name.size()).compareTo(nameLower)) + if (!itemName.left(nameLower.size()).compareTo(nameLower)) return dynamic_cast<CNamedItem *>(treeItem); } else { if (!itemName.compareTo(nameLower)) diff --git a/engines/titanic/core/turn_on_turn_off.cpp b/engines/titanic/core/turn_on_turn_off.cpp index a6051c7c6f..3c1e623b6e 100644 --- a/engines/titanic/core/turn_on_turn_off.cpp +++ b/engines/titanic/core/turn_on_turn_off.cpp @@ -58,7 +58,7 @@ void CTurnOnTurnOff::load(SimpleFile *file) { bool CTurnOnTurnOff::TurnOn(CTurnOn *msg) { if (!_isOn) { if (_isBlocking) - playMovie(_startFrameOn, _endFrameOn, MOVIE_GAMESTATE); + playMovie(_startFrameOn, _endFrameOn, MOVIE_WAIT_FOR_FINISH); else playMovie(_startFrameOn, _endFrameOn, MOVIE_NOTIFY_OBJECT); _isOn = true; @@ -70,7 +70,7 @@ bool CTurnOnTurnOff::TurnOn(CTurnOn *msg) { bool CTurnOnTurnOff::TurnOff(CTurnOff *msg) { if (_isOn) { if (_isBlocking) - playMovie(_startFrameOff, _endFrameOff, MOVIE_GAMESTATE); + playMovie(_startFrameOff, _endFrameOff, MOVIE_WAIT_FOR_FINISH); else playMovie(_startFrameOff, _endFrameOff, MOVIE_NOTIFY_OBJECT); _isOn = false; diff --git a/engines/titanic/core/view_item.cpp b/engines/titanic/core/view_item.cpp index 9109bcc5b2..15d187e194 100644 --- a/engines/titanic/core/view_item.cpp +++ b/engines/titanic/core/view_item.cpp @@ -260,7 +260,7 @@ bool CViewItem::handleMouseMsg(CMouseMsg *msg, bool flag) { CGameObject *gameObject = dynamic_cast<CGameObject *>(treeItem); if (gameObject) { if (gameObject->checkPoint(msg->_mousePos, false, true) && - (!flag || !gameObject->_field60)) { + (!flag || !gameObject->_handleMouseFlag)) { if (gameObjects.size() < 256) gameObjects.push_back(gameObject); } diff --git a/engines/titanic/game/arboretum_gate.cpp b/engines/titanic/game/arboretum_gate.cpp index 2a79c31339..903f5efb54 100644 --- a/engines/titanic/game/arboretum_gate.cpp +++ b/engines/titanic/game/arboretum_gate.cpp @@ -275,27 +275,27 @@ bool CArboretumGate::TurnOff(CTurnOff *msg) { if (!_disabled) { switch (_seasonNum) { case SEASON_SUMMER: - playMovie(_startFrameSummerOff, _endFrameSummerOff, MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT); + playMovie(_startFrameSummerOff, _endFrameSummerOff, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); break; case SEASON_AUTUMN: if (_gotSpeechCentre) { - playMovie(_startFrameAutumnOff2, _endFrameAutumnOff2, MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT); + playMovie(_startFrameAutumnOff2, _endFrameAutumnOff2, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); } else { - playMovie(_startFrameAutumnOff1, _endFrameAutumnOff1, MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT); + playMovie(_startFrameAutumnOff1, _endFrameAutumnOff1, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); } break; case SEASON_WINTER: if (_gotSpeechCentre) { - playMovie(_startFrameWinterOff2, _endFrameWinterOff2, MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT); + playMovie(_startFrameWinterOff2, _endFrameWinterOff2, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); } else { - playMovie(_startFrameWinterOff1, _endFrameWinterOff1, MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT); + playMovie(_startFrameWinterOff1, _endFrameWinterOff1, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); } break; case SEASON_SPRING: - playMovie(_startFrameSpringOff, _endFrameSpringOff, MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT); + playMovie(_startFrameSpringOff, _endFrameSpringOff, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); break; default: @@ -303,7 +303,7 @@ bool CArboretumGate::TurnOff(CTurnOff *msg) { } _disabled = true; - CArboretumGateMsg gateMsg; + CArboretumGateMsg gateMsg(1); gateMsg.execute("Arboretum", nullptr, MSGFLAG_SCAN); } @@ -318,27 +318,27 @@ bool CArboretumGate::TurnOn(CTurnOn *msg) { switch (_seasonNum) { case SEASON_SUMMER: - playMovie(_startFrameSummerOn, _endFrameSummerOn, MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT); + playMovie(_startFrameSummerOn, _endFrameSummerOn, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); break; case SEASON_AUTUMN: if (_gotSpeechCentre) { - playMovie(_startFrameAutumnOn2, _endFrameAutumnOn2, MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT); + playMovie(_startFrameAutumnOn2, _endFrameAutumnOn2, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); } else { - playMovie(_startFrameAutumnOn1, _endFrameAutumnOn1, MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT); + playMovie(_startFrameAutumnOn1, _endFrameAutumnOn1, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); } break; case SEASON_WINTER: if (_gotSpeechCentre) { - playMovie(_startFrameWinterOn2, _endFrameWinterOn2, MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT); + playMovie(_startFrameWinterOn2, _endFrameWinterOn2, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); } else { - playMovie(_startFrameWinterOn1, _endFrameWinterOn1, MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT); + playMovie(_startFrameWinterOn1, _endFrameWinterOn1, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); } break; case SEASON_SPRING: - playMovie(_startFrameSpringOn, _endFrameSpringOn, MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT); + playMovie(_startFrameSpringOn, _endFrameSpringOn, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); break; default: diff --git a/engines/titanic/game/bomb.cpp b/engines/titanic/game/bomb.cpp index f3f1129e22..17c10c5082 100644 --- a/engines/titanic/game/bomb.cpp +++ b/engines/titanic/game/bomb.cpp @@ -21,6 +21,7 @@ */ #include "titanic/game/bomb.h" +#include "titanic/game/code_wheel.h" namespace Titanic { @@ -36,19 +37,19 @@ BEGIN_MESSAGE_MAP(CBomb, CBackground) ON_MESSAGE(SetFrameMsg) END_MESSAGE_MAP() -static const char *const WAVE_NAMES1[] = { - "z#353.wav", "z#339.wav", "z#325.wav", "z#311.wav", "z#297.wav", +const int CORRECT_WHEELS = 23; + +static const char *const HUNDREDS_WAVS[] = { + "", "z#353.wav", "z#339.wav", "z#325.wav", "z#311.wav", "z#297.wav", "z#283.wav", "z#269.wav", "z#255.wav", "z#241.wav" }; -static const char *const WAVE_NAMES2[] = { +static const char *const HUNDREDS_AND_WAVS[] = { "", "z#352.wav", "z#338.wav", "z#324.wav", "z#310.wav", "z#296.wav", - "z#281.wav", "z#268.wav", "z#254.wav", "z#240.wav", "", "z#351.wav", - "z#337.wav", "z#323.wav", "z#309.wav", "z#295.wav", "z#282.wav", - "z#267.wav", "z#253.wav", "z#239.wav" + "z#281.wav", "z#268.wav", "z#254.wav", "z#240.wav" }; -static const char *const WAVE_NAMES3[100] = { +static const char *const COUNTDOWN_WAVS[100] = { "bombcountdown_c0.wav", "z#355.wav", "z#341.wav", "z#327.wav", "z#313.wav", "z#299.wav", "z#285.wav", "z#271.wav", "z#257.wav", "z#243.wav", "z#354.wav", "z#350.wav", "z#349.wav", "z#348.wav", "z#347.wav", @@ -72,28 +73,28 @@ static const char *const WAVE_NAMES3[100] = { }; CBomb::CBomb() : CBackground() { - _fieldE0 = 0; - _fieldE4 = 0; - _fieldE8 = 17; - _fieldEC = 9; - _fieldF0 = 0; + _active = false; + _numCorrectWheels = 0; + _tappedCtr = 17; + _hammerCtr = 9; + _commentCtr = 0; _countdown = 999; _soundHandle = 0; - _fieldFC = 0; + _unusedHandle = 0; _startingTicks = 0; _volume = 60; } void CBomb::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); - file->writeNumberLine(_fieldE0, indent); - file->writeNumberLine(_fieldE4, indent); - file->writeNumberLine(_fieldE8, indent); - file->writeNumberLine(_fieldEC, indent); - file->writeNumberLine(_fieldF0, indent); + file->writeNumberLine(_active, indent); + file->writeNumberLine(_numCorrectWheels, indent); + file->writeNumberLine(_tappedCtr, indent); + file->writeNumberLine(_hammerCtr, indent); + file->writeNumberLine(_commentCtr, indent); file->writeNumberLine(_countdown, indent); file->writeNumberLine(_soundHandle, indent); - file->writeNumberLine(_fieldFC, indent); + file->writeNumberLine(_unusedHandle, indent); file->writeNumberLine(_startingTicks, indent); file->writeNumberLine(_volume, indent); @@ -102,14 +103,14 @@ void CBomb::save(SimpleFile *file, int indent) { void CBomb::load(SimpleFile *file) { file->readNumber(); - _fieldE0 = file->readNumber(); - _fieldE4 = file->readNumber(); - _fieldE8 = file->readNumber(); - _fieldEC = file->readNumber(); - _fieldF0 = file->readNumber(); + _active = file->readNumber(); + _numCorrectWheels = file->readNumber(); + _tappedCtr = file->readNumber(); + _hammerCtr = file->readNumber(); + _commentCtr = file->readNumber(); _countdown = file->readNumber(); _soundHandle = file->readNumber(); - _fieldFC = file->readNumber(); + _unusedHandle = file->readNumber(); _startingTicks = file->readNumber(); _volume = file->readNumber(); @@ -117,34 +118,39 @@ void CBomb::load(SimpleFile *file) { } bool CBomb::StatusChangeMsg(CStatusChangeMsg *msg) { - _fieldE4 += msg->_newStatus; + // Check whether the wheels are corect + CCheckCodeWheelsMsg checkMsg; + checkMsg.execute(findRoom(), nullptr, MSGFLAG_SCAN); + + _numCorrectWheels = checkMsg._isCorrect ? CORRECT_WHEELS : 0; - if (_fieldE4 == 23) { + if (_numCorrectWheels == CORRECT_WHEELS) { + // Nobody likes a smartass startAnimTimer("Disarmed", 2000); lockMouse(); } - _fieldF0 %= 1000; - if (!(_fieldF0 % 20) && _countdown < 995) { + _commentCtr = (_commentCtr % 1000) + 1; + if (!(_commentCtr % 20) && _countdown < 995) { int val = getRandomNumber(5) + 25; - if (_fieldF0 < 20 || _fieldF0 > 80) + if (_commentCtr < 20 || _commentCtr > 80) val = 28; CString name; - switch (val - 25) { - case 0: + switch (val) { + case 25: name = "z#372.wav"; break; - case 1: + case 26: name = "z#371.wav"; break; - case 2: + case 27: name = "z#370.wav"; break; - case 3: + case 28: name = "z#369.wav"; break; - case 4: + case 29: name = "z#368.wav"; break; default: @@ -159,20 +165,22 @@ bool CBomb::StatusChangeMsg(CStatusChangeMsg *msg) { } bool CBomb::EnterViewMsg(CEnterViewMsg *msg) { - _fieldE4 = 2; + // WORKAROUND: Don't keep resetting wheels return true; } bool CBomb::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { playSound("z#62.wav"); - if (_fieldE0) { + if (_active) { stopSound(_soundHandle); - if (_fieldE4 < 23) { - _fieldE8 = MIN(_fieldE8 + 1, 23); + //stopSound(_unusedHandle); + + if (_numCorrectWheels < CORRECT_WHEELS) { + _tappedCtr = MIN(_tappedCtr + 1, 23); CString name; - switch (_fieldE8) { + switch (_tappedCtr) { case 18: name = "z#380.wav"; break; @@ -198,7 +206,7 @@ bool CBomb::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { } } else { _soundHandle = playSound("z#389.wav", _volume); - _fieldE0 = true; + _active = true; CActMsg actMsg("Arm Bomb"); actMsg.execute("EndExplodeShip"); } @@ -207,9 +215,9 @@ bool CBomb::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { } bool CBomb::EnterRoomMsg(CEnterRoomMsg *msg) { - _fieldE8 = 17; - _fieldEC = 9; - _fieldF0 = 0; + _tappedCtr = 17; + _hammerCtr = 9; + _commentCtr = 0; _startingTicks = getTicksCount(); return true; } @@ -219,11 +227,11 @@ bool CBomb::ActMsg(CActMsg *msg) { playSound("z#63.wav"); stopSound(_soundHandle); - if (_fieldEC < 17) - ++_fieldEC; + if (_hammerCtr < 17) + ++_hammerCtr; CString name; - switch (_fieldEC) { + switch (_hammerCtr) { case 10: name = "z#388.wav"; break; @@ -258,9 +266,19 @@ bool CBomb::ActMsg(CActMsg *msg) { } bool CBomb::TurnOn(CTurnOn *msg) { - if (!_fieldE0) { + if (!_active) { _soundHandle = playSound("z#389.wav", _volume); - _fieldE0 = true; + _active = true; + + // WORKAROUND: Only reset the code wheels back to 'O' value + // when first arming the bomb, not whenever the bomb view is entered + _numCorrectWheels = 2; + CRoomItem *room = findRoom(); + for (CTreeItem *treeItem = room; treeItem; treeItem = treeItem->scan(room)) { + CodeWheel *codeWheel = dynamic_cast<CodeWheel *>(treeItem); + if (codeWheel) + codeWheel->reset(); + } CActMsg actMsg("Arm Bomb"); actMsg.execute("EndExplodeShip"); @@ -282,7 +300,7 @@ bool CBomb::TimerMsg(CTimerMsg *msg) { CActMsg actMsg1("Disarm Bomb"); actMsg1.execute("EndExplodeShip"); - _fieldE0 = false; + _active = false; CActMsg actMsg2("Titania.Node 5.N"); actMsg2.execute("BombNav"); actMsg2.execute("EnterBombNav"); @@ -294,49 +312,54 @@ bool CBomb::TimerMsg(CTimerMsg *msg) { if (compareRoomNameTo("Titania")) { if (msg->_actionVal == 1 && getRandomNumber(9) == 0) { - if (!_fieldE0) + if (!_active) return true; CParrotSpeakMsg speakMsg("Bomb", "BombCountdown"); speakMsg.execute("PerchedParrot"); } - if (_fieldE0) { - if (isSoundActive(_soundHandle)) { + if (_active) { + if (!isSoundActive(_soundHandle)) { if (msg->_actionVal == 0) { addTimer(1, 1000, 0); } else { _soundHandle = 0; - int section = _countdown / 100; - int index = _countdown % 100; + int hundreds = _countdown / 100; + int remainder = _countdown % 100; if (_countdown >= 100) { - CString name1 = index ? WAVE_NAMES2[section] : - WAVE_NAMES1[section]; - playSound(name1, _volume); + // Play "x hundred and" or just "x hundred" + CString hName = remainder ? HUNDREDS_AND_WAVS[hundreds] : HUNDREDS_WAVS[hundreds]; + _soundHandle = playSound(hName, _volume); } - CString name2 = WAVE_NAMES3[index]; + CString ctrName = COUNTDOWN_WAVS[remainder]; if (_countdown == 10) { - name2 = "z#229.wav"; + ctrName = "z#229.wav"; _countdown = 998; } + // Play the sub-hundred portion of the countdown amount if (_soundHandle > 0) { - _soundHandle = queueSound(name2, _soundHandle, _volume); + _soundHandle = queueSound(ctrName, _soundHandle, _volume); } else { - _soundHandle = playSound(name2, _volume); + _soundHandle = playSound(ctrName, _volume); } + // Reduce countdown and schedule another timer --_countdown; addTimer(0, 1000, 0); } } else { + // Bomb speech currently active, so schedule the method' + // to re-trigger after 100ms to check if speech is finished addTimer(0, 100, 0); } } } else { - if (_fieldE0) { + // In rooms other than the bomb room + if (_active) { --_countdown; addTimer(6000); @@ -350,7 +373,7 @@ bool CBomb::TimerMsg(CTimerMsg *msg) { bool CBomb::TrueTalkGetStateValueMsg(CTrueTalkGetStateValueMsg *msg) { if (msg->_stateNum == 10) - msg->_stateVal = _fieldE0; + msg->_stateVal = _active ? 1 : 0; return true; } diff --git a/engines/titanic/game/bomb.h b/engines/titanic/game/bomb.h index f78c42cff0..c474abf554 100644 --- a/engines/titanic/game/bomb.h +++ b/engines/titanic/game/bomb.h @@ -40,14 +40,14 @@ class CBomb : public CBackground { bool SetFrameMsg(CSetFrameMsg *msg); DECLARE_MESSAGE_MAP; private: - int _fieldE0; - int _fieldE4; - int _fieldE8; - int _fieldEC; - int _fieldF0; + bool _active; + int _numCorrectWheels; + int _tappedCtr; + int _hammerCtr; + int _commentCtr; int _countdown; int _soundHandle; - int _fieldFC; + int _unusedHandle; int _startingTicks; int _volume; public: diff --git a/engines/titanic/game/brain_slot.cpp b/engines/titanic/game/brain_slot.cpp index 1518d9b0b3..c0eb145d59 100644 --- a/engines/titanic/game/brain_slot.cpp +++ b/engines/titanic/game/brain_slot.cpp @@ -33,14 +33,14 @@ BEGIN_MESSAGE_MAP(CBrainSlot, CGameObject) ON_MESSAGE(MouseDragStartMsg) END_MESSAGE_MAP() -int CBrainSlot::_added; +int CBrainSlot::_numAdded; bool CBrainSlot::_woken; void CBrainSlot::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); - file->writeNumberLine(_value1, indent); + file->writeNumberLine(_occupied, indent); file->writeQuotedLine(_target, indent); - file->writeNumberLine(_added, indent); + file->writeNumberLine(_numAdded, indent); file->writeNumberLine(_woken, indent); CGameObject::save(file, indent); @@ -48,9 +48,9 @@ void CBrainSlot::save(SimpleFile *file, int indent) { void CBrainSlot::load(SimpleFile *file) { file->readNumber(); - _value1 = file->readNumber(); + _occupied = file->readNumber(); _target = file->readString(); - _added = file->readNumber(); + _numAdded = file->readNumber(); _woken = file->readNumber(); CGameObject::load(file); @@ -58,12 +58,12 @@ void CBrainSlot::load(SimpleFile *file) { bool CBrainSlot::SetFrameMsg(CSetFrameMsg *msg) { loadFrame(msg->_frameNumber); - _value1 = 1; + _occupied = true; return true; } bool CBrainSlot::AddHeadPieceMsg(CAddHeadPieceMsg *msg) { - _added = 1; + _numAdded++; _cursorId = CURSOR_HAND; CAddHeadPieceMsg addMsg("NULL"); @@ -87,21 +87,21 @@ bool CBrainSlot::AddHeadPieceMsg(CAddHeadPieceMsg *msg) { if (addMsg._value != "NULL") addMsg.execute("TitaniaControl"); - if (addMsg._value == "OlfactoryCentre") + if (msg->_value == "OlfactoryCentre") loadFrame(2); - else if (addMsg._value == "AuditoryCentre") + else if (msg->_value == "AuditoryCentre") loadFrame(1); - else if (addMsg._value == "SpeechCentre") + else if (msg->_value == "SpeechCentre") loadFrame(3); - else if (addMsg._value == "VisionCentre") + else if (msg->_value == "VisionCentre") loadFrame(4); - else if (addMsg._value == "CentralCore") { + else if (msg->_value == "CentralCore") { CActMsg actMsg("Insert Central Core"); actMsg.execute("CentralCoreSlot"); } _target = msg->_value; - _value1 = 1; + _occupied = true; return true; } @@ -124,7 +124,7 @@ bool CBrainSlot::ActMsg(CActMsg *msg) { } bool CBrainSlot::MouseDragStartMsg(CMouseDragStartMsg *msg) { - if (!_value1 || _woken || !checkPoint(msg->_mousePos, false, true)) + if (!_occupied || _woken || !checkPoint(msg->_mousePos, false, true)) return false; _cursorId = CURSOR_ARROW; @@ -134,14 +134,14 @@ bool CBrainSlot::MouseDragStartMsg(CMouseDragStartMsg *msg) { takeMsg.execute("TitaniaControl"); loadFrame(isEquals("CentralCoreSlot") ? 21 : 0); - _value1 = 0; + _occupied = false; CPassOnDragStartMsg passMsg; passMsg._mousePos = msg->_mousePos; passMsg.execute(_target); msg->_dragItem = getRoot()->findByName(_target); - _added = 0; + _numAdded--; return true; } diff --git a/engines/titanic/game/brain_slot.h b/engines/titanic/game/brain_slot.h index 4d500cc59a..a85036303e 100644 --- a/engines/titanic/game/brain_slot.h +++ b/engines/titanic/game/brain_slot.h @@ -35,14 +35,14 @@ class CBrainSlot : public CGameObject { bool ActMsg(CActMsg *msg); bool MouseDragStartMsg(CMouseDragStartMsg *msg); public: - static int _added; + static int _numAdded; static bool _woken; public: - int _value1; + bool _occupied; CString _target; public: CLASSDEF; - CBrainSlot() : CGameObject(), _value1(0) {} + CBrainSlot() : CGameObject(), _occupied(false) {} /** * Save the data for the class to file diff --git a/engines/titanic/game/bridge_view.cpp b/engines/titanic/game/bridge_view.cpp index 5b2b8809d9..e8d70c8c43 100644 --- a/engines/titanic/game/bridge_view.cpp +++ b/engines/titanic/game/bridge_view.cpp @@ -31,13 +31,13 @@ END_MESSAGE_MAP() void CBridgeView::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); - file->writeNumberLine(_mode, indent); + file->writeNumberLine(_action, indent); CBackground::save(file, indent); } void CBridgeView::load(SimpleFile *file) { file->readNumber(); - _mode = file->readNumber(); + _action = (BridgeAction)file->readNumber(); CBackground::load(file); } @@ -47,13 +47,13 @@ bool CBridgeView::ActMsg(CActMsg *msg) { volumeMsg._secondsTransition = 1; if (msg->_action == "End") { - _mode = 4; + _action = BA_ENDING2; petLockInput(); petHide(); setVisible(true); playMovie(MOVIE_NOTIFY_OBJECT); } else if (msg->_action == "Go") { - _mode = 1; + _action = BA_GO; setVisible(true); volumeMsg._volume = 100; volumeMsg.execute("EngineSounds"); @@ -65,11 +65,11 @@ bool CBridgeView::ActMsg(CActMsg *msg) { onMsg.execute("EngineSounds"); if (msg->_action == "Cruise") { - _mode = 2; + _action = BA_CRUISE; setVisible(true); playMovie(MOVIE_NOTIFY_OBJECT); - } else if (msg->_action == "GoENd") { - _mode = 3; + } else if (msg->_action == "GoEnd") { + _action = BA_ENDING1; setVisible(true); CChangeMusicMsg musicMsg; musicMsg._flags = 1; @@ -86,21 +86,21 @@ bool CBridgeView::MovieEndMsg(CMovieEndMsg *msg) { CTurnOff offMsg; offMsg.execute("EngineSounds"); - switch (_mode) { - case 0: - case 1: + switch (_action) { + case BA_GO: + case BA_CRUISE: setVisible(false); decTransitions(); break; - case 2: { + case BA_ENDING1: { setVisible(false); CActMsg actMsg("End"); actMsg.execute("HomeSequence"); break; } - case 3: + case BA_ENDING2: setVisible(false); changeView("TheEnd.Node 3.N"); break; diff --git a/engines/titanic/game/bridge_view.h b/engines/titanic/game/bridge_view.h index 45cfa3f4c8..01bd6310ce 100644 --- a/engines/titanic/game/bridge_view.h +++ b/engines/titanic/game/bridge_view.h @@ -27,15 +27,19 @@ namespace Titanic { +enum BridgeAction { + BA_NONE = 0, BA_GO = 1, BA_CRUISE = 2, BA_ENDING1 = 3, BA_ENDING2 = 4 +}; + class CBridgeView : public CBackground { DECLARE_MESSAGE_MAP; bool ActMsg(CActMsg *msg); bool MovieEndMsg(CMovieEndMsg *msg); public: - int _mode; + BridgeAction _action; public: CLASSDEF; - CBridgeView() : CBackground(), _mode(0) {} + CBridgeView() : CBackground(), _action(BA_NONE) {} /** * Save the data for the class to file diff --git a/engines/titanic/game/captains_wheel.cpp b/engines/titanic/game/captains_wheel.cpp index 72d3cf70d9..1f0b177a67 100644 --- a/engines/titanic/game/captains_wheel.cpp +++ b/engines/titanic/game/captains_wheel.cpp @@ -34,17 +34,17 @@ BEGIN_MESSAGE_MAP(CCaptainsWheel, CBackground) END_MESSAGE_MAP() CCaptainsWheel::CCaptainsWheel() : CBackground(), - _fieldE0(0), _fieldE4(0), _fieldE8(0), _fieldEC(0), - _fieldF0(0), _fieldF4(0) { + _stopEnabled(false), _actionNum(0), _fieldE8(0), + _cruiseEnabled(false), _goEnabled(false), _fieldF4(0) { } void CCaptainsWheel::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); - file->writeNumberLine(_fieldE0, indent); - file->writeNumberLine(_fieldE4, indent); + file->writeNumberLine(_stopEnabled, indent); + file->writeNumberLine(_actionNum, indent); file->writeNumberLine(_fieldE8, indent); - file->writeNumberLine(_fieldEC, indent); - file->writeNumberLine(_fieldF0, indent); + file->writeNumberLine(_cruiseEnabled, indent); + file->writeNumberLine(_goEnabled, indent); file->writeNumberLine(_fieldF4, indent); CBackground::save(file, indent); @@ -52,19 +52,19 @@ void CCaptainsWheel::save(SimpleFile *file, int indent) { void CCaptainsWheel::load(SimpleFile *file) { file->readNumber(); - _fieldE0 = file->readNumber(); - _fieldE4 = file->readNumber(); + _stopEnabled = file->readNumber(); + _actionNum = file->readNumber(); _fieldE8 = file->readNumber(); - _fieldEC = file->readNumber(); - _fieldF0 = file->readNumber(); + _cruiseEnabled = file->readNumber(); + _goEnabled = file->readNumber(); _fieldF4 = file->readNumber(); CBackground::load(file); } bool CCaptainsWheel::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { - if (_fieldE0) { - _fieldE0 = false; + if (_stopEnabled) { + _stopEnabled = false; CTurnOff offMsg; offMsg.execute(this); playMovie(162, 168, 0); @@ -76,11 +76,11 @@ bool CCaptainsWheel::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { } bool CCaptainsWheel::LeaveViewMsg(CLeaveViewMsg *msg) { - if (_fieldE0) { - _fieldE0 = false; + if (_stopEnabled) { + _stopEnabled = false; CTurnOff offMsg; offMsg.execute(this); - playMovie(162, 168, MOVIE_GAMESTATE); + playMovie(162, 168, MOVIE_WAIT_FOR_FINISH); } return true; @@ -88,34 +88,34 @@ bool CCaptainsWheel::LeaveViewMsg(CLeaveViewMsg *msg) { bool CCaptainsWheel::ActMsg(CActMsg *msg) { if (msg->_action == "Spin") { - if (_fieldE0) { + if (_stopEnabled) { CTurnOn onMsg; onMsg.execute("RatchetySound"); - playMovie(8, 142, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(8, 142, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); } } else if (msg->_action == "Honk") { - if (_fieldE0) { - playMovie(150, 160, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + if (_stopEnabled) { + playMovie(150, 160, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); } } else if (msg->_action == "Go") { - if (!_fieldE0) { + if (!_stopEnabled) { incTransitions(); - _fieldE0 = false; - _fieldE4 = 1; + _stopEnabled = false; + _actionNum = 1; CTurnOff offMsg; offMsg.execute(this); - playMovie(162, 168, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(162, 168, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); } } else if (msg->_action == "Cruise") { - if (_fieldE0) { + if (_stopEnabled) { incTransitions(); - _fieldE0 = false; - _fieldE4 = 2; + _stopEnabled = false; + _actionNum = 2; CTurnOff offMsg; offMsg.execute(this); - playMovie(162, 168, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(162, 168, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); } } else if (msg->_action == "SetDestin") { playSound("a#44.wav"); @@ -124,9 +124,9 @@ bool CCaptainsWheel::ActMsg(CActMsg *msg) { volumeMsg.execute("EngineSounds"); CTurnOn onMsg; onMsg.execute("EngineSounds"); - _fieldF0 = 1; + _goEnabled = true; } else if (msg->_action == "ClearDestin") { - _fieldF0 = 0; + _goEnabled = false; } return true; @@ -152,17 +152,17 @@ bool CCaptainsWheel::TurnOn(CTurnOn *msg) { signalMsg.execute("WheelSpin"); signalMsg.execute("SeagullHorn"); - if (_fieldE0) { + if (_stopEnabled) { signalMsg.execute("WheelStopButt"); signalMsg.execute("StopHotSpot"); } - if (_fieldEC) { + if (_cruiseEnabled) { signalMsg.execute("WheelCruiseButt"); signalMsg.execute("CruiseHotSpot"); } - if (_fieldF0) { + if (_goEnabled) { signalMsg.execute("WheelGoButt"); signalMsg.execute("GoHotSpot"); } @@ -172,7 +172,7 @@ bool CCaptainsWheel::TurnOn(CTurnOn *msg) { bool CCaptainsWheel::MovieEndMsg(CMovieEndMsg *msg) { if (msg->_endFrame == 8) { - _fieldE0 = true; + _stopEnabled = true; CTurnOn onMsg; onMsg.execute(this); } @@ -183,9 +183,9 @@ bool CCaptainsWheel::MovieEndMsg(CMovieEndMsg *msg) { } if (msg->_endFrame == 168) { - switch (_fieldE4) { + switch (_actionNum) { case 1: { - CActMsg actMsg(starFn2() ? "GoEnd" : "Go"); + CActMsg actMsg(starIsSolved() ? "GoEnd" : "Go"); actMsg.execute("GoSequence"); break; } @@ -200,7 +200,7 @@ bool CCaptainsWheel::MovieEndMsg(CMovieEndMsg *msg) { break; } - _fieldE4 = 0; + _actionNum = 0; } return true; diff --git a/engines/titanic/game/captains_wheel.h b/engines/titanic/game/captains_wheel.h index 3aca45c21f..7dce1ac6ee 100644 --- a/engines/titanic/game/captains_wheel.h +++ b/engines/titanic/game/captains_wheel.h @@ -36,11 +36,11 @@ class CCaptainsWheel : public CBackground { bool TurnOn(CTurnOn *msg); bool MovieEndMsg(CMovieEndMsg *msg); public: - int _fieldE0; - int _fieldE4; + bool _stopEnabled; + int _actionNum; int _fieldE8; - int _fieldEC; - int _fieldF0; + bool _cruiseEnabled; + bool _goEnabled; int _fieldF4; public: CLASSDEF; diff --git a/engines/titanic/game/cdrom.cpp b/engines/titanic/game/cdrom.cpp index 0d1cd3a6f2..d8d31ecc1a 100644 --- a/engines/titanic/game/cdrom.cpp +++ b/engines/titanic/game/cdrom.cpp @@ -38,21 +38,21 @@ CCDROM::CCDROM() : CGameObject() { void CCDROM::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); - file->writePoint(_tempPos, indent); + file->writePoint(_centroid, indent); CGameObject::save(file, indent); } void CCDROM::load(SimpleFile *file) { file->readNumber(); - _tempPos = file->readPoint(); + _centroid = file->readPoint(); CGameObject::load(file); } bool CCDROM::MouseDragStartMsg(CMouseDragStartMsg *msg) { if (checkStartDragging(msg)) { hideMouse(); - _tempPos = msg->_mousePos - _bounds; - setPosition(msg->_mousePos - _tempPos); + _centroid = msg->_mousePos - _bounds; + setPosition(msg->_mousePos - _centroid); return true; } else { return false; @@ -77,7 +77,7 @@ bool CCDROM::MouseDragEndMsg(CMouseDragEndMsg *msg) { } bool CCDROM::MouseDragMoveMsg(CMouseDragMoveMsg *msg) { - setPosition(msg->_mousePos - _tempPos); + setPosition(msg->_mousePos - _centroid); return true; } diff --git a/engines/titanic/game/cdrom.h b/engines/titanic/game/cdrom.h index 017914830c..12175f6450 100644 --- a/engines/titanic/game/cdrom.h +++ b/engines/titanic/game/cdrom.h @@ -36,7 +36,7 @@ class CCDROM : public CGameObject { bool MouseDragMoveMsg(CMouseDragMoveMsg *msg); bool ActMsg(CActMsg *msg); private: - Point _tempPos; + Point _centroid; public: CLASSDEF; CCDROM(); diff --git a/engines/titanic/game/chicken_dispensor.cpp b/engines/titanic/game/chicken_dispensor.cpp index 8a56f43fff..89873dcc4d 100644 --- a/engines/titanic/game/chicken_dispensor.cpp +++ b/engines/titanic/game/chicken_dispensor.cpp @@ -89,10 +89,10 @@ bool CChickenDispensor::StatusChangeMsg(CStatusChangeMsg *msg) { setVisible(true); if (_disabled) { - playMovie(0, 12, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(0, 12, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); playSound("z#400.wav"); } else { - playMovie(12, 16, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(12, 16, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); } break; @@ -186,7 +186,7 @@ bool CChickenDispensor::MouseDragStartMsg(CMouseDragStartMsg *msg) { bool CChickenDispensor::TurnOff(CTurnOff *msg) { if (getMovieFrame() != 16) setVisible(false); - playMovie(16, 12, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(16, 12, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); _dispensed = false; return true; diff --git a/engines/titanic/game/code_wheel.cpp b/engines/titanic/game/code_wheel.cpp index 441fddec02..1df99ae749 100644 --- a/engines/titanic/game/code_wheel.cpp +++ b/engines/titanic/game/code_wheel.cpp @@ -30,17 +30,25 @@ BEGIN_MESSAGE_MAP(CodeWheel, CBomb) ON_MESSAGE(EnterViewMsg) ON_MESSAGE(MouseButtonUpMsg) ON_MESSAGE(MovieEndMsg) + ON_MESSAGE(CheckCodeWheelsMsg) END_MESSAGE_MAP() -CodeWheel::CodeWheel() : CBomb(), _field108(0), _state(4), - _field110(0), _field114(0), _field118(0) { +static const int START_FRAMES[15] = { + 0, 5, 10, 15, 19, 24, 28, 33, 38, 42, 47, 52, 57, 61, 66 +}; +static const int END_FRAMES[15] = { + 5, 10, 15, 19, 24, 28, 33, 38, 42, 47, 52, 57, 61, 66, 70 +}; + +CodeWheel::CodeWheel() : CBomb(), _correctValue(0), _value(4), + _matched(false), _field114(0), _field118(0) { } void CodeWheel::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); - file->writeNumberLine(_field108, indent); - file->writeNumberLine(_state, indent); - file->writeNumberLine(_field110, indent); + file->writeNumberLine(_correctValue, indent); + file->writeNumberLine(_value, indent); + file->writeNumberLine(_matched, indent); if (g_vm->isGerman()) { file->writeNumberLine(_field114, indent); file->writeNumberLine(_field118, indent); @@ -51,9 +59,9 @@ void CodeWheel::save(SimpleFile *file, int indent) { void CodeWheel::load(SimpleFile *file) { file->readNumber(); - _field108 = file->readNumber(); - _state = file->readNumber(); - _field110 = file->readNumber(); + _correctValue = file->readNumber(); + _value = file->readNumber(); + _matched = file->readNumber(); if (g_vm->isGerman()) { _field114 = file->readNumber(); _field118 = file->readNumber(); @@ -63,29 +71,24 @@ void CodeWheel::load(SimpleFile *file) { } bool CodeWheel::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { - static const int START_FRAMES[15] = { - 0, 5, 10, 15, 19, 24, 28, 33, 38, 42, 47, 52, 57, 61, 66 - }; - static const int END_FRAMES[15] = { - 5, 10, 15, 19, 24, 28, 33, 38, 42, 47, 52, 57, 61, 66, 70 - }; - int yp = _bounds.top + _bounds.height() / 2; + _matched = false; + if (msg->_mousePos.y > yp) { - if (_state == _field108) - _field110 = true; + if (_value == _correctValue) + _matched = true; - _state = (_state + 1) % 15; - playMovie(START_FRAMES[_state], END_FRAMES[_state], - MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT); + _value = (_value + 1) % 15; + playMovie(START_FRAMES[_value], END_FRAMES[_value], + MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); } else { - if (_state == _field108) - _field110 = true; + if (_value == _correctValue) + _matched = true; - playMovie(START_FRAMES[14 - _state] + 68, END_FRAMES[14 - _state] + 68, - MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT); + playMovie(START_FRAMES[14 - _value] + 68, END_FRAMES[14 - _value] + 68, + MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); - _state = (_state <= 0) ? 14 : _state - 1; + _value = (_value <= 0) ? 14 : _value - 1; } playSound("z#59.wav"); @@ -93,8 +96,8 @@ bool CodeWheel::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { } bool CodeWheel::EnterViewMsg(CEnterViewMsg *msg) { - loadFrame(24); - _state = 4; + // WORKAROUND: Don't keep resetting code wheels back to default + loadFrame(END_FRAMES[_value]); return true; } @@ -104,15 +107,18 @@ bool CodeWheel::MouseButtonUpMsg(CMouseButtonUpMsg *msg) { bool CodeWheel::MovieEndMsg(CMovieEndMsg *msg) { sleep(200); + + // Signal that a code wheel has changed CStatusChangeMsg changeMsg; - changeMsg._newStatus = 0; - if (_field110) - changeMsg._newStatus = -1; - if (_field108 == _state) - changeMsg._newStatus = 1; changeMsg.execute("Bomb"); return true; } +bool CodeWheel::CheckCodeWheelsMsg(CCheckCodeWheelsMsg *msg) { + if (_value != _correctValue) + msg->_isCorrect = false; + return true; +} + } // End of namespace Titanic diff --git a/engines/titanic/game/code_wheel.h b/engines/titanic/game/code_wheel.h index de246f56c4..3d19eeb53c 100644 --- a/engines/titanic/game/code_wheel.h +++ b/engines/titanic/game/code_wheel.h @@ -33,10 +33,11 @@ class CodeWheel : public CBomb { bool EnterViewMsg(CEnterViewMsg *msg); bool MouseButtonUpMsg(CMouseButtonUpMsg *msg); bool MovieEndMsg(CMovieEndMsg *msg); + bool CheckCodeWheelsMsg(CCheckCodeWheelsMsg *msg); private: - int _field108; - int _state; - int _field110; + int _correctValue; + int _value; + bool _matched; // German specific fields int _field114; int _field118; @@ -53,6 +54,11 @@ public: * Load the data for the class from file */ virtual void load(SimpleFile *file); + + /** + * Resets a code wheel back to the default 'O' value + */ + void reset() { _value = 4; } }; } // End of namespace Titanic diff --git a/engines/titanic/game/computer_screen.cpp b/engines/titanic/game/computer_screen.cpp index 98bef6eb63..7d549d0497 100644 --- a/engines/titanic/game/computer_screen.cpp +++ b/engines/titanic/game/computer_screen.cpp @@ -47,10 +47,10 @@ void CComputerScreen::load(SimpleFile *file) { bool CComputerScreen::ActMsg(CActMsg *msg) { if (msg->_action == "newCD1" || msg->_action == "newCD2") { - playMovie(27, 53, MOVIE_GAMESTATE); - playMovie(19, 26, MOVIE_GAMESTATE); + playMovie(27, 53, MOVIE_WAIT_FOR_FINISH); + playMovie(19, 26, MOVIE_WAIT_FOR_FINISH); } else if (msg->_action == "newSTCD") { - playMovie(0, 18, MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT); + playMovie(0, 18, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); } return true; diff --git a/engines/titanic/game/end_sequence_control.cpp b/engines/titanic/game/end_sequence_control.cpp index 033a7752a3..0f3a97c3a2 100644 --- a/engines/titanic/game/end_sequence_control.cpp +++ b/engines/titanic/game/end_sequence_control.cpp @@ -77,7 +77,7 @@ bool CEndSequenceControl::EnterRoomMsg(CEnterRoomMsg *msg) { bool CEndSequenceControl::EnterViewMsg(CEnterViewMsg *msg) { movieSetAudioTiming(true); - playMovie(MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); return true; } diff --git a/engines/titanic/game/fan_control.cpp b/engines/titanic/game/fan_control.cpp index ca664764ea..7ed22fd560 100644 --- a/engines/titanic/game/fan_control.cpp +++ b/engines/titanic/game/fan_control.cpp @@ -121,7 +121,7 @@ bool CFanControl::StatusChangeMsg(CStatusChangeMsg *msg) { // It's puret time incTransitions(); _starlingsDying = true; - playMovie(12, 18, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(12, 18, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); } else { playMovie(12, 18, 0); } diff --git a/engines/titanic/game/games_console.cpp b/engines/titanic/game/games_console.cpp index 40311f70ee..6c13f4b862 100644 --- a/engines/titanic/game/games_console.cpp +++ b/engines/titanic/game/games_console.cpp @@ -56,7 +56,7 @@ bool CGamesConsole::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { bool CGamesConsole::LeaveViewMsg(CLeaveViewMsg *msg) { if (_active) { _active = false; - playMovie(23, 44, MOVIE_GAMESTATE); + playMovie(23, 44, MOVIE_WAIT_FOR_FINISH); } return true; diff --git a/engines/titanic/game/glass_smasher.cpp b/engines/titanic/game/glass_smasher.cpp index 2123f2dfd0..7de034c2ee 100644 --- a/engines/titanic/game/glass_smasher.cpp +++ b/engines/titanic/game/glass_smasher.cpp @@ -42,7 +42,7 @@ void CGlassSmasher::load(SimpleFile *file) { bool CGlassSmasher::StatusChangeMsg(CStatusChangeMsg *msg) { setVisible(true); playSound("b#40.wav"); - playMovie(MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); return true; } diff --git a/engines/titanic/game/gondolier/gondolier_base.cpp b/engines/titanic/game/gondolier/gondolier_base.cpp index f3dc31c9f5..8b753ec264 100644 --- a/engines/titanic/game/gondolier/gondolier_base.cpp +++ b/engines/titanic/game/gondolier/gondolier_base.cpp @@ -28,45 +28,45 @@ BEGIN_MESSAGE_MAP(CGondolierBase, CGameObject) ON_MESSAGE(PuzzleSolvedMsg) END_MESSAGE_MAP() -int CGondolierBase::_v1; +bool CGondolierBase::_chestOpen; bool CGondolierBase::_puzzleSolved; int CGondolierBase::_volume1; int CGondolierBase::_v4; -int CGondolierBase::_v5; int CGondolierBase::_volume2; int CGondolierBase::_v7; -int CGondolierBase::_v8; -int CGondolierBase::_v9; -int CGondolierBase::_v10; +bool CGondolierBase::_rightSliderHooked; +bool CGondolierBase::_leftSliderHooked; +bool CGondolierBase::_priorLeftSliderHooked; +bool CGondolierBase::_priorRightSliderHooked; void CGondolierBase::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); - file->writeNumberLine(_v1, indent); + file->writeNumberLine(_chestOpen, indent); file->writeNumberLine(_puzzleSolved, indent); file->writeNumberLine(_volume1, indent); file->writeNumberLine(_v4, indent); - file->writeNumberLine(_v5, indent); + file->writeNumberLine(_rightSliderHooked, indent); file->writeNumberLine(_volume2, indent); file->writeNumberLine(_v7, indent); - file->writeNumberLine(_v8, indent); - file->writeNumberLine(_v9, indent); - file->writeNumberLine(_v10, indent); + file->writeNumberLine(_leftSliderHooked, indent); + file->writeNumberLine(_priorLeftSliderHooked, indent); + file->writeNumberLine(_priorRightSliderHooked, indent); CGameObject::save(file, indent); } void CGondolierBase::load(SimpleFile *file) { file->readNumber(); - _v1 = file->readNumber(); + _chestOpen = file->readNumber(); _puzzleSolved = file->readNumber(); _volume1 = file->readNumber(); _v4 = file->readNumber(); - _v5 = file->readNumber(); + _rightSliderHooked = file->readNumber(); _volume2 = file->readNumber(); _v7 = file->readNumber(); - _v8 = file->readNumber(); - _v9 = file->readNumber(); - _v10 = file->readNumber(); + _leftSliderHooked = file->readNumber(); + _priorLeftSliderHooked = file->readNumber(); + _priorRightSliderHooked = file->readNumber(); CGameObject::load(file); } diff --git a/engines/titanic/game/gondolier/gondolier_base.h b/engines/titanic/game/gondolier/gondolier_base.h index 06d77ba85f..3b5df9f371 100644 --- a/engines/titanic/game/gondolier/gondolier_base.h +++ b/engines/titanic/game/gondolier/gondolier_base.h @@ -31,16 +31,16 @@ class CGondolierBase : public CGameObject { DECLARE_MESSAGE_MAP; bool PuzzleSolvedMsg(CPuzzleSolvedMsg *msg); protected: - static int _v1; + static bool _chestOpen; static bool _puzzleSolved; static int _volume1; static int _v4; - static int _v5; static int _volume2; static int _v7; - static int _v8; - static int _v9; - static int _v10; + static bool _leftSliderHooked; + static bool _rightSliderHooked; + static bool _priorLeftSliderHooked; + static bool _priorRightSliderHooked; public: CLASSDEF; diff --git a/engines/titanic/game/gondolier/gondolier_chest.cpp b/engines/titanic/game/gondolier/gondolier_chest.cpp index cf6656732b..6058b582f7 100644 --- a/engines/titanic/game/gondolier/gondolier_chest.cpp +++ b/engines/titanic/game/gondolier/gondolier_chest.cpp @@ -41,13 +41,13 @@ void CGondolierChest::load(SimpleFile *file) { } bool CGondolierChest::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { - if (!_v1) + if (!_chestOpen) playMovie(0, 14, MOVIE_NOTIFY_OBJECT); else if (msg->_mousePos.y < 330) return false; - else if (!_v8 && !_v5) { + else if (!_leftSliderHooked && !_rightSliderHooked) { playMovie(14, 29, 0); - _v1 = 0; + _chestOpen = false; } return true; @@ -55,7 +55,7 @@ bool CGondolierChest::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { bool CGondolierChest::MovieEndMsg(CMovieEndMsg *msg) { if (msg->_endFrame == 14) - _v1 = 1; + _chestOpen = true; return true; } diff --git a/engines/titanic/game/gondolier/gondolier_mixer.cpp b/engines/titanic/game/gondolier/gondolier_mixer.cpp index fc71ddd357..205d1f42da 100644 --- a/engines/titanic/game/gondolier/gondolier_mixer.cpp +++ b/engines/titanic/game/gondolier/gondolier_mixer.cpp @@ -141,7 +141,7 @@ bool CGondolierMixer::SignalObject(CSignalObject *msg) { if (msg->_strValue == "Fly") { _v4 = CLIP(msg->_numValue, 0, 10); - if (!_v8) { + if (!_leftSliderHooked) { _v7 = 10 - _v4; CStatusChangeMsg statusMsg; statusMsg._newStatus = _v7; @@ -152,7 +152,7 @@ bool CGondolierMixer::SignalObject(CSignalObject *msg) { if (msg->_strValue == "Tos") { _v7 = CLIP(msg->_numValue, 0, 10); - if (!_v5) { + if (!_rightSliderHooked) { _v4 = 10 - _v7; CStatusChangeMsg statusMsg; statusMsg._newStatus = _v4; @@ -160,7 +160,7 @@ bool CGondolierMixer::SignalObject(CSignalObject *msg) { } } - if (!_v4 && !_v7 && _v5 && _v8) { + if (!_v4 && !_v7 && _rightSliderHooked && _leftSliderHooked) { _puzzleSolved = true; CStatusChangeMsg statusMsg; statusMsg._newStatus = 1; diff --git a/engines/titanic/game/gondolier/gondolier_slider.cpp b/engines/titanic/game/gondolier/gondolier_slider.cpp index e7ca61de9c..b5edac57d4 100644 --- a/engines/titanic/game/gondolier/gondolier_slider.cpp +++ b/engines/titanic/game/gondolier/gondolier_slider.cpp @@ -24,7 +24,10 @@ namespace Titanic { -static const int ARRAY[11] = { 0, 0, 1, 4, 9, 15, 21, 27, 32, 35, 36 }; +/** + * Y offsets within slider for each successive thumbnail position + */ +static const int Y_OFFSETS[11] = { 0, 0, 1, 4, 9, 15, 21, 27, 32, 35, 36 }; BEGIN_MESSAGE_MAP(CGondolierSlider, CGondolierBase) ON_MESSAGE(MouseButtonDownMsg) @@ -40,86 +43,66 @@ BEGIN_MESSAGE_MAP(CGondolierSlider, CGondolierBase) END_MESSAGE_MAP() CGondolierSlider::CGondolierSlider() : CGondolierBase(), - _fieldBC(0), _fieldC0(0), _fieldC4(0), _fieldC8(0), - _arrayIndex(0), _string1("NULL"), _fieldFC(0), _field118(0) { + _sliderIndex(0), _stringUnused("NULL"), _sliderNum(0), _dragging(false) { } void CGondolierSlider::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); - file->writeNumberLine(_fieldBC, indent); - file->writeNumberLine(_fieldC0, indent); - file->writeNumberLine(_fieldC4, indent); - file->writeNumberLine(_fieldC8, indent); - file->writeNumberLine(_sliderRect1.left, indent); - file->writeNumberLine(_sliderRect1.top, indent); - file->writeNumberLine(_sliderRect1.right, indent); - file->writeNumberLine(_sliderRect1.bottom, indent); - file->writeNumberLine(_sliderRect2.left, indent); - file->writeNumberLine(_sliderRect2.top, indent); - file->writeNumberLine(_sliderRect2.right, indent); - file->writeNumberLine(_sliderRect2.bottom, indent); - file->writeNumberLine(_sliderRect1.left, indent); - file->writeQuotedLine(_string1, indent); - file->writeNumberLine(_fieldFC, indent); - file->writeQuotedLine(_string2, indent); - file->writeQuotedLine(_string3, indent); - file->writeNumberLine(_field118, indent); + file->writeRect(_rectUnused, indent); + file->writeRect(_thumbRect, indent); + file->writeRect(_defaultThumbRect, indent); + file->writeNumberLine(_sliderIndex, indent); + file->writeQuotedLine(_stringUnused, indent); + file->writeNumberLine(_sliderNum, indent); + file->writeQuotedLine(_armName, indent); + file->writeQuotedLine(_signalTarget, indent); + file->writeNumberLine(_dragging, indent); CGondolierBase::save(file, indent); } void CGondolierSlider::load(SimpleFile *file) { file->readNumber(); - _fieldBC = file->readNumber(); - _fieldC0 = file->readNumber(); - _fieldC4 = file->readNumber(); - _fieldC8 = file->readNumber(); - _sliderRect1.left = file->readNumber(); - _sliderRect1.top = file->readNumber(); - _sliderRect1.right = file->readNumber(); - _sliderRect1.bottom = file->readNumber(); - _sliderRect2.left = file->readNumber(); - _sliderRect2.top = file->readNumber(); - _sliderRect2.right = file->readNumber(); - _sliderRect2.bottom = file->readNumber(); - _arrayIndex = file->readNumber(); - _string1 = file->readString(); - _fieldFC = file->readNumber(); - _string2 = file->readString(); - _string3 = file->readString(); - _field118 = file->readNumber(); + _rectUnused = file->readRect(); + _thumbRect = file->readRect(); + _defaultThumbRect = file->readRect(); + _sliderIndex = file->readNumber(); + _stringUnused = file->readString(); + _sliderNum = file->readNumber(); + _armName = file->readString(); + _signalTarget = file->readString(); + _dragging = file->readNumber(); CGondolierBase::load(file); } bool CGondolierSlider::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { - if (!_v1) + if (!_chestOpen) return false; - if (_fieldFC ? _v5 : _v8) + if (_sliderNum ? _rightSliderHooked : _leftSliderHooked) return false; - return _sliderRect1.contains(msg->_mousePos); + return _thumbRect.contains(msg->_mousePos); } bool CGondolierSlider::MouseDragMoveMsg(CMouseDragMoveMsg *msg) { - if (!(_fieldFC ? _v5 : _v8)) { + if (!(_sliderNum ? _rightSliderHooked : _leftSliderHooked)) { int minVal = 0x7FFFFFFF; int foundIndex = -1; - int yp = (_sliderRect2.top + _sliderRect2.bottom) / 2 + int yp = (_defaultThumbRect.top + _defaultThumbRect.bottom) / 2 + _bounds.top - msg->_mousePos.y; for (int idx = 0; idx < 11; ++idx) { - int yv = yp + ARRAY[idx]; - if (yv < 0) - yv = -yv; - if (yv < minVal) { - minVal = yv; + int yDiff = ABS(yp + Y_OFFSETS[idx]); + + if (yDiff < minVal) { + minVal = yDiff; foundIndex = idx; } } if (foundIndex >= 0) { - _arrayIndex = foundIndex; + _sliderIndex = foundIndex; CSignalObject signalMsg; signalMsg.execute(this); } @@ -135,70 +118,70 @@ bool CGondolierSlider::EnterViewMsg(CEnterViewMsg *msg) { } bool CGondolierSlider::MouseDragStartMsg(CMouseDragStartMsg *msg) { - if (!_v1) + if (!_chestOpen) return false; - if (_fieldFC ? _v5 : _v8) + if (_sliderNum ? _rightSliderHooked : _leftSliderHooked) return false; - _field118 = checkStartDragging(msg); - return _field118; + _dragging = checkStartDragging(msg); + return _dragging; } bool CGondolierSlider::StatusChangeMsg(CStatusChangeMsg *msg) { - _arrayIndex = CLIP(10 - msg->_newStatus, 0, 10); - _sliderRect1 = _sliderRect2; - _sliderRect1.translate(_bounds.left, _bounds.top); - _sliderRect1.translate(0, ARRAY[_arrayIndex]); + _sliderIndex = CLIP(10 - msg->_newStatus, 0, 10); + _thumbRect = _defaultThumbRect; + _thumbRect.translate(_bounds.left, _bounds.top); + _thumbRect.translate(0, Y_OFFSETS[_sliderIndex]); - loadFrame(_arrayIndex); + loadFrame(_sliderIndex); return true; } bool CGondolierSlider::MouseDragEndMsg(CMouseDragEndMsg *msg) { - _field118 = false; + _dragging = false; return true; } bool CGondolierSlider::IsHookedOnMsg(CIsHookedOnMsg *msg) { - if (_fieldFC ? _v5 : _v8) + if (_sliderNum ? _rightSliderHooked : _leftSliderHooked) return false; - if (!_sliderRect1.intersects(msg->_rect)) { - _string2 = CString(); - msg->_result = false; + if (!_thumbRect.intersects(msg->_rect)) { + _armName = CString(); + msg->_isHooked = false; } else { - _string2 = _string1; - if (_fieldFC) { - _v5 = _v9 = 1; + _armName = msg->_armName; + if (_sliderNum) { + _rightSliderHooked = _priorLeftSliderHooked = true; } else { - _v8 = _v10 = 1; + _leftSliderHooked = _priorRightSliderHooked = true; } - msg->_result = true; + msg->_isHooked = true; } return true; } bool CGondolierSlider::FrameMsg(CFrameMsg *msg) { - if (_fieldFC ? _v5 : _v8) { - if (_arrayIndex < 10) { - ++_arrayIndex; + if (_sliderNum ? _rightSliderHooked : _leftSliderHooked) { + if (_sliderIndex < 10) { + ++_sliderIndex; CSignalObject signalMsg; signalMsg.execute(this); int yp = 0; - if (_arrayIndex > 0) - yp = ARRAY[_arrayIndex] - ARRAY[_arrayIndex - 1]; + if (_sliderIndex > 0) + yp = Y_OFFSETS[_sliderIndex] - Y_OFFSETS[_sliderIndex - 1]; - if (!_string2.empty()) { + if (!_armName.empty()) { CTranslateObjectMsg transMsg; transMsg._delta = Point(0, yp); - transMsg.execute(_string2); + transMsg.execute(_armName); } } - } else if (_fieldFC ? _v10 : _v9) { - if (!_field118 && !_puzzleSolved && _arrayIndex > 0) { + } else if (_sliderNum ? _priorRightSliderHooked : _priorLeftSliderHooked) { + if (!_dragging && !_puzzleSolved && _sliderIndex > 0) { CSignalObject signalMsg; signalMsg.execute(this); } @@ -208,28 +191,28 @@ bool CGondolierSlider::FrameMsg(CFrameMsg *msg) { } bool CGondolierSlider::SignalObject(CSignalObject *msg) { - _arrayIndex = CLIP(_arrayIndex, 0, 10); - _sliderRect1 = _sliderRect2; - _sliderRect1.translate(_bounds.left, _bounds.top); - _sliderRect1.translate(0, ARRAY[_arrayIndex]); - loadFrame(_arrayIndex); + _sliderIndex = CLIP(_sliderIndex, 0, 10); + _thumbRect = _defaultThumbRect; + _thumbRect.translate(_bounds.left, _bounds.top); + _thumbRect.translate(0, Y_OFFSETS[_sliderIndex]); + loadFrame(_sliderIndex); CSignalObject signalMsg; - signalMsg._numValue = 10 - _arrayIndex; - signalMsg._strValue = _fieldFC ? "Fly" : "Tos"; - signalMsg.execute(_string3); + signalMsg._numValue = 10 - _sliderIndex; + signalMsg._strValue = _sliderNum ? "Fly" : "Tos"; + signalMsg.execute(_signalTarget); return true; } bool CGondolierSlider::ActMsg(CActMsg *msg) { if (msg->_action == "Unhook") { - if (_fieldFC) { - _v5 = _v9 = 0; - _v10 = _v8; + if (_sliderNum) { + _rightSliderHooked = _priorLeftSliderHooked = false; + _priorRightSliderHooked = _leftSliderHooked; } else { - _v8 = _v10 = 0; - _v9 = _v5; + _leftSliderHooked = _priorRightSliderHooked = false; + _priorLeftSliderHooked = _rightSliderHooked; } } diff --git a/engines/titanic/game/gondolier/gondolier_slider.h b/engines/titanic/game/gondolier/gondolier_slider.h index d1562f5b2d..0679c0d993 100644 --- a/engines/titanic/game/gondolier/gondolier_slider.h +++ b/engines/titanic/game/gondolier/gondolier_slider.h @@ -40,18 +40,15 @@ class CGondolierSlider : public CGondolierBase { bool SignalObject(CSignalObject *msg); bool ActMsg(CActMsg *msg); private: - int _fieldBC; - int _fieldC0; - int _fieldC4; - int _fieldC8; - Rect _sliderRect1; - Rect _sliderRect2; - int _arrayIndex; - CString _string1; - int _fieldFC; - CString _string2; - CString _string3; - bool _field118; + Rect _rectUnused; + Rect _thumbRect; + Rect _defaultThumbRect; + int _sliderIndex; + CString _stringUnused; + int _sliderNum; + CString _armName; + CString _signalTarget; + bool _dragging; public: CLASSDEF; CGondolierSlider(); diff --git a/engines/titanic/game/hammer_dispensor.cpp b/engines/titanic/game/hammer_dispensor.cpp index 2450868b14..82aeec12cb 100644 --- a/engines/titanic/game/hammer_dispensor.cpp +++ b/engines/titanic/game/hammer_dispensor.cpp @@ -77,9 +77,9 @@ bool CHammerDispensor::EnterViewMsg(CEnterViewMsg *msg) { bool CHammerDispensor::LeaveViewMsg(CLeaveViewMsg *msg) { if (_isOpen) - playMovie(32, 50, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(32, 50, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); else - playMovie(0, 7, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(0, 7, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); _panUp = true; _isOpen = false; diff --git a/engines/titanic/game/head_slot.cpp b/engines/titanic/game/head_slot.cpp index 06c366abd6..f8a65715ad 100644 --- a/engines/titanic/game/head_slot.cpp +++ b/engines/titanic/game/head_slot.cpp @@ -37,77 +37,77 @@ BEGIN_MESSAGE_MAP(CHeadSlot, CGameObject) ON_MESSAGE(MouseDragStartMsg) END_MESSAGE_MAP() -int CHeadSlot::_v1; +bool CHeadSlot::_titaniaWoken; -CHeadSlot::CHeadSlot() : CGameObject(), _string1("NotWorking"), _string2("NULL"), - _fieldBC(0), _fieldD8(0), _fieldDC(27), _fieldE0(56), - _fieldE4(82), _fieldE8(112), _fieldEC(false) { +CHeadSlot::CHeadSlot() : CGameObject(), _senseState("NotWorking"), _target("NULL"), + _occupied(false), _timerDuration(0), _frameNum1(27), _frameNum2(56), + _frameNum3(82), _frameNum4(112), _workingFlag(false) { } void CHeadSlot::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); - file->writeNumberLine(_fieldBC, indent); - file->writeQuotedLine(_string1, indent); - file->writeQuotedLine(_string2, indent); - file->writeNumberLine(_fieldD8, indent); - file->writeNumberLine(_fieldDC, indent); - file->writeNumberLine(_fieldE0, indent); - file->writeNumberLine(_fieldE4, indent); - file->writeNumberLine(_fieldE8, indent); - file->writeNumberLine(_v1, indent); - file->writeNumberLine(_fieldEC, indent); + file->writeNumberLine(_occupied, indent); + file->writeQuotedLine(_senseState, indent); + file->writeQuotedLine(_target, indent); + file->writeNumberLine(_timerDuration, indent); + file->writeNumberLine(_frameNum1, indent); + file->writeNumberLine(_frameNum2, indent); + file->writeNumberLine(_frameNum3, indent); + file->writeNumberLine(_frameNum4, indent); + file->writeNumberLine(_titaniaWoken, indent); + file->writeNumberLine(_workingFlag, indent); CGameObject::save(file, indent); } void CHeadSlot::load(SimpleFile *file) { file->readNumber(); - _fieldBC = file->readNumber(); - _string1 = file->readString(); - _string2 = file->readString(); - _fieldD8 = file->readNumber(); - _fieldDC = file->readNumber(); - _fieldE0 = file->readNumber(); - _fieldE4 = file->readNumber(); - _fieldE8 = file->readNumber(); - _v1 = file->readNumber(); - _fieldEC = file->readNumber(); + _occupied = file->readNumber(); + _senseState = file->readString(); + _target = file->readString(); + _timerDuration = file->readNumber(); + _frameNum1 = file->readNumber(); + _frameNum2 = file->readNumber(); + _frameNum3 = file->readNumber(); + _frameNum4 = file->readNumber(); + _titaniaWoken = file->readNumber(); + _workingFlag = file->readNumber(); CGameObject::load(file); } bool CHeadSlot::AddHeadPieceMsg(CAddHeadPieceMsg *msg) { setVisible(true); - _fieldBC = 1; - _string2 = msg->_value; - playMovie(_fieldDC, _fieldE8, 0); + _occupied = true; + _target = msg->_value; + playMovie(_frameNum1, _frameNum4, 0); _cursorId = CURSOR_HAND; msg->execute("TitaniaControl"); return true; } bool CHeadSlot::SenseWorkingMsg(CSenseWorkingMsg *msg) { - if (_fieldEC) - playMovie(_fieldE4, _fieldE8, 0); + if (_workingFlag) + playMovie(_frameNum3, _frameNum4, 0); - _string1 = msg->_value; - _fieldEC = false; + _senseState = msg->_value; + _workingFlag = false; return true; } bool CHeadSlot::EnterViewMsg(CEnterViewMsg *msg) { setVisible(true); - if (_v1) + if (_titaniaWoken) _cursorId = CURSOR_ARROW; - if (_v1 == 1 || _string1 == "Working") { - playMovie(_fieldE0, _fieldE4, MOVIE_GAMESTATE); - _fieldEC = true; - } else if (_fieldBC) { - playMovie(_fieldE0, _fieldE8, MOVIE_GAMESTATE); - _fieldEC = false; + if (_titaniaWoken || _senseState == "Working") { + playMovie(_frameNum2, _frameNum3, MOVIE_WAIT_FOR_FINISH); + _workingFlag = true; + } else if (_occupied) { + playMovie(_frameNum2, _frameNum4, MOVIE_WAIT_FOR_FINISH); + _workingFlag = false; } else { - playMovie(0, _fieldDC, MOVIE_GAMESTATE); + playMovie(0, _frameNum1, MOVIE_WAIT_FOR_FINISH); } addTimer(5000 + getRandomNumber(3000)); @@ -118,16 +118,15 @@ bool CHeadSlot::LeaveViewMsg(CLeaveViewMsg *msg) { if (getName() == "YepItsASlot") { stopMovie(); - if (_fieldBC) { - loadFrame(_fieldE0); - playMovie(_fieldE0, _fieldE8, MOVIE_GAMESTATE); - _fieldEC = false; + if (_occupied) { + loadFrame(_frameNum2); + playMovie(_frameNum2, _frameNum4, MOVIE_WAIT_FOR_FINISH); } else { - loadFrame(_fieldDC); - playMovie(_fieldDC, _fieldE0, MOVIE_GAMESTATE); + loadFrame(_frameNum1); + playMovie(_frameNum1, _frameNum2, MOVIE_WAIT_FOR_FINISH); } - _fieldEC = false; + _workingFlag = false; } return true; @@ -138,19 +137,19 @@ bool CHeadSlot::LoadSuccessMsg(CLoadSuccessMsg *msg) { } bool CHeadSlot::TimerMsg(CTimerMsg *msg) { - if (compareViewNameTo("Titania.Node 15.S") && CBrainSlot::_added == 5 - && _fieldBC == 1) { - if (_string1 == "Working" && !_fieldEC) { - playMovie(_fieldE0, _fieldE4, 0); - _fieldEC = true; - } else if (_string1 == "Random") { - playMovie(_fieldE0, _fieldE8, 0); + if (compareViewNameTo("Titania.Node 15.S") && CBrainSlot::_numAdded == 5 + && _occupied) { + if (_senseState == "Working" && !_workingFlag) { + playMovie(_frameNum2, _frameNum3, 0); + _workingFlag = true; + } else if (_senseState == "Random") { + playMovie(_frameNum2, _frameNum4, 0); } } if (compareViewNameTo("Titania.Node 15.S")) { - _fieldD8 = 7000 + getRandomNumber(5000); - addTimer(_fieldD8); + _timerDuration = 7000 + getRandomNumber(5000); + addTimer(_timerDuration); } return true; @@ -158,27 +157,29 @@ bool CHeadSlot::TimerMsg(CTimerMsg *msg) { bool CHeadSlot::ActMsg(CActMsg *msg) { if (msg->_action == "Woken") - _v1 = 1; + _titaniaWoken = true; return true; } bool CHeadSlot::MouseDragStartMsg(CMouseDragStartMsg *msg) { - if (_fieldBC && !_v1 && checkPoint(msg->_mousePos, false, true)) { + if (_occupied && !_titaniaWoken && checkPoint(msg->_mousePos, false, true)) { CPassOnDragStartMsg passMsg; passMsg._mousePos = msg->_mousePos; - passMsg.execute(_string2); + passMsg.execute(_target); - msg->_dragItem = getRoot()->findByName(_string2); + msg->_dragItem = getRoot()->findByName(_target); _cursorId = CURSOR_ARROW; - _fieldBC = 0; - _fieldEC = false; - _string2 = "NULL"; + _occupied = false; + _workingFlag = false; + _target = "NULL"; stopMovie(); loadFrame(0); - playMovie(0, _fieldDC, 0); + playMovie(0, _frameNum1, 0); + + return true; } - return true; + return false; } } // End of namespace Titanic diff --git a/engines/titanic/game/head_slot.h b/engines/titanic/game/head_slot.h index 2767db3b61..1474e03ff3 100644 --- a/engines/titanic/game/head_slot.h +++ b/engines/titanic/game/head_slot.h @@ -38,17 +38,17 @@ class CHeadSlot : public CGameObject { bool ActMsg(CActMsg *msg); bool MouseDragStartMsg(CMouseDragStartMsg *msg); public: - static int _v1; + static bool _titaniaWoken; public: - int _fieldBC; - CString _string1; - CString _string2; - int _fieldD8; - int _fieldDC; - int _fieldE0; - int _fieldE4; - int _fieldE8; - bool _fieldEC; + bool _occupied; + CString _senseState; + CString _target; + int _timerDuration; + int _frameNum1; + int _frameNum2; + int _frameNum3; + int _frameNum4; + bool _workingFlag; public: CLASSDEF; CHeadSlot(); diff --git a/engines/titanic/game/head_smash_event.cpp b/engines/titanic/game/head_smash_event.cpp index 5ec3d299d5..dd5e516b0d 100644 --- a/engines/titanic/game/head_smash_event.cpp +++ b/engines/titanic/game/head_smash_event.cpp @@ -42,7 +42,7 @@ void CHeadSmashEvent::load(SimpleFile *file) { bool CHeadSmashEvent::ActMsg(CActMsg *msg) { if (msg->_action == "PlayToEnd") { setVisible(true); - playMovie(MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); } return true; diff --git a/engines/titanic/game/long_stick_dispenser.cpp b/engines/titanic/game/long_stick_dispenser.cpp index bf2dae53be..c340cae75b 100644 --- a/engines/titanic/game/long_stick_dispenser.cpp +++ b/engines/titanic/game/long_stick_dispenser.cpp @@ -109,9 +109,9 @@ bool CLongStickDispenser::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { bool CLongStickDispenser::LeaveViewMsg(CLeaveViewMsg *msg) { if (_fieldC0 == 1) { if (_fieldC4) { - playMovie(19, 38, MOVIE_GAMESTATE); + playMovie(19, 38, MOVIE_WAIT_FOR_FINISH); } else { - playMovie(0, 18, MOVIE_GAMESTATE); + playMovie(0, 18, MOVIE_WAIT_FOR_FINISH); _fieldBC = 1; } diff --git a/engines/titanic/game/nut_replacer.cpp b/engines/titanic/game/nut_replacer.cpp index 6b05d1d0e9..3b1247fd8c 100644 --- a/engines/titanic/game/nut_replacer.cpp +++ b/engines/titanic/game/nut_replacer.cpp @@ -41,7 +41,7 @@ void CNutReplacer::load(SimpleFile *file) { bool CNutReplacer::ReplaceBowlAndNutsMsg(CReplaceBowlAndNutsMsg *msg) { setVisible(true); - playMovie(MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT); + playMovie(MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); return true; } diff --git a/engines/titanic/game/parrot/parrot_nut_eater.cpp b/engines/titanic/game/parrot/parrot_nut_eater.cpp index b9697d7b61..7196d76ccb 100644 --- a/engines/titanic/game/parrot/parrot_nut_eater.cpp +++ b/engines/titanic/game/parrot/parrot_nut_eater.cpp @@ -67,7 +67,7 @@ bool CParrotNutEater::ReplaceBowlAndNutsMsg(CReplaceBowlAndNutsMsg *msg) { bool CParrotNutEater::NutPuzzleMsg(CNutPuzzleMsg *msg) { if (msg->_value == "Jiggle") { setVisible(true); - playMovie(MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); movieEvent(68); movieEvent(132); playSound("z#215.wav"); diff --git a/engines/titanic/game/phonograph.cpp b/engines/titanic/game/phonograph.cpp index f43bb3a60b..b86fa0b6e0 100644 --- a/engines/titanic/game/phonograph.cpp +++ b/engines/titanic/game/phonograph.cpp @@ -34,8 +34,8 @@ BEGIN_MESSAGE_MAP(CPhonograph, CMusicPlayer) END_MESSAGE_MAP() CPhonograph::CPhonograph() : CMusicPlayer(), - _isPlaying(false), _isRecording(false), _isDisabled(false), _fieldEC(0), - _fieldF0(0), _fieldF4(0) { + _isPlaying(false), _isRecording(false), _isDisabled(false), + _playUnpressedFrame(false), _playPressedFrame(false), _unused5(0) { } void CPhonograph::save(SimpleFile *file, int indent) { @@ -44,9 +44,9 @@ void CPhonograph::save(SimpleFile *file, int indent) { file->writeNumberLine(_isPlaying, indent); file->writeNumberLine(_isRecording, indent); file->writeNumberLine(_isDisabled, indent); - file->writeNumberLine(_fieldEC, indent); - file->writeNumberLine(_fieldF0, indent); - file->writeNumberLine(_fieldF4, indent); + file->writeNumberLine(_playUnpressedFrame, indent); + file->writeNumberLine(_playPressedFrame, indent); + file->writeNumberLine(_unused5, indent); CMusicPlayer::save(file, indent); } @@ -57,9 +57,9 @@ void CPhonograph::load(SimpleFile *file) { _isPlaying = file->readNumber(); _isRecording = file->readNumber(); _isDisabled = file->readNumber(); - _fieldEC = file->readNumber(); - _fieldF0 = file->readNumber(); - _fieldF4 = file->readNumber(); + _playUnpressedFrame = file->readNumber(); + _playPressedFrame = file->readNumber(); + _unused5 = file->readNumber(); CMusicPlayer::load(file); } @@ -83,7 +83,7 @@ bool CPhonograph::PhonographPlayMsg(CPhonographPlayMsg *msg) { _isPlaying = true; msg->_value = 1; } else { - stopGlobalSound(0, -1); + stopGlobalSound(false, -1); playGlobalSound(cylinderMsg._name, -2, true, true, 0); _isPlaying = true; msg->_value = 1; @@ -98,7 +98,6 @@ bool CPhonograph::PhonographStopMsg(CPhonographStopMsg *msg) { if (!holderMsg._isPresent) return true; - _isPlaying = false; CQueryCylinderMsg cylinderMsg; cylinderMsg.execute(holderMsg._target); diff --git a/engines/titanic/game/phonograph.h b/engines/titanic/game/phonograph.h index 4cce6ecefd..6630a18f27 100644 --- a/engines/titanic/game/phonograph.h +++ b/engines/titanic/game/phonograph.h @@ -41,9 +41,9 @@ protected: bool _isPlaying; bool _isRecording; bool _isDisabled; - int _fieldEC; - int _fieldF0; - int _fieldF4; + int _playUnpressedFrame; + int _playPressedFrame; + int _unused5; public: CLASSDEF; CPhonograph(); diff --git a/engines/titanic/game/phonograph_lid.cpp b/engines/titanic/game/phonograph_lid.cpp index e4e5f4882c..cde9415e02 100644 --- a/engines/titanic/game/phonograph_lid.cpp +++ b/engines/titanic/game/phonograph_lid.cpp @@ -76,7 +76,7 @@ bool CPhonographLid::LockPhonographMsg(CLockPhonographMsg *msg) { bool CPhonographLid::LeaveViewMsg(CLeaveViewMsg *msg) { if (_open) { - playMovie(27, 55, MOVIE_GAMESTATE); + playMovie(27, 55, MOVIE_WAIT_FOR_FINISH); _open = false; } diff --git a/engines/titanic/game/play_on_act.cpp b/engines/titanic/game/play_on_act.cpp index 9c368c335d..ffed45c11f 100644 --- a/engines/titanic/game/play_on_act.cpp +++ b/engines/titanic/game/play_on_act.cpp @@ -45,7 +45,7 @@ bool CPlayOnAct::ActMsg(CActMsg *msg) { playMovie(0); } else if (msg->_action == "PlayToEnd") { setVisible(true); - playMovie(MOVIE_GAMESTATE); + playMovie(MOVIE_WAIT_FOR_FINISH); } return true; diff --git a/engines/titanic/game/port_hole.cpp b/engines/titanic/game/port_hole.cpp index 25807b1b1d..9111561588 100644 --- a/engines/titanic/game/port_hole.cpp +++ b/engines/titanic/game/port_hole.cpp @@ -79,7 +79,7 @@ bool CPortHole::MovieEndMsg(CMovieEndMsg *msg) { bool CPortHole::LeaveViewMsg(CLeaveViewMsg *msg) { if (_open) { playSound(_closeSoundName); - playMovie(14, 26, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(14, 26, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); _open = false; } diff --git a/engines/titanic/game/replacement_ear.cpp b/engines/titanic/game/replacement_ear.cpp index e8bd384207..d1274e92db 100644 --- a/engines/titanic/game/replacement_ear.cpp +++ b/engines/titanic/game/replacement_ear.cpp @@ -40,7 +40,7 @@ void CReplacementEar::load(SimpleFile *file) { bool CReplacementEar::VisibleMsg(CVisibleMsg *msg) { setVisible(true); - playMovie(MOVIE_GAMESTATE); + playMovie(MOVIE_WAIT_FOR_FINISH); playSound("z#64.wav"); return true; } diff --git a/engines/titanic/game/restaurant_cylinder_holder.cpp b/engines/titanic/game/restaurant_cylinder_holder.cpp index 05f731d32d..eddd4d2288 100644 --- a/engines/titanic/game/restaurant_cylinder_holder.cpp +++ b/engines/titanic/game/restaurant_cylinder_holder.cpp @@ -66,15 +66,15 @@ void CRestaurantCylinderHolder::load(SimpleFile *file) { bool CRestaurantCylinderHolder::EjectCylinderMsg(CEjectCylinderMsg *msg) { _field11C = true; - bool hasCylinder = findByName("Phonograph Cylinder") != nullptr; + bool hasCylinder = findByName("Phonograph Cylinder", true) != nullptr; if (_isOpen) { playClip(hasCylinder ? "CloseHolder_Full" : "CloseHolder_Empty", - MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); _dropEnabled = true; } else { playClip(hasCylinder ? "OpenHolder_Full" : "OpenHolder_Empty", - MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); } playSound(_ejectSoundName, 50); diff --git a/engines/titanic/game/restaurant_phonograph.cpp b/engines/titanic/game/restaurant_phonograph.cpp index a2c8892201..3b35514a52 100644 --- a/engines/titanic/game/restaurant_phonograph.cpp +++ b/engines/titanic/game/restaurant_phonograph.cpp @@ -36,11 +36,11 @@ BEGIN_MESSAGE_MAP(CRestaurantPhonograph, CPhonograph) END_MESSAGE_MAP() CRestaurantPhonograph::CRestaurantPhonograph() : CPhonograph(), - _fieldF8(1), _field114(0) {} + _isLocked(true), _field114(0) {} void CRestaurantPhonograph::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); - file->writeNumberLine(_fieldF8, indent); + file->writeNumberLine(_isLocked, indent); file->writeQuotedLine(_ejectSoundName, indent); file->writeQuotedLine(_stopSoundName, indent); @@ -51,7 +51,7 @@ void CRestaurantPhonograph::save(SimpleFile *file, int indent) { void CRestaurantPhonograph::load(SimpleFile *file) { file->readNumber(); - _fieldF8 = file->readNumber(); + _isLocked = file->readNumber(); _ejectSoundName = file->readString(); _stopSoundName = file->readString(); _field114 = file->readNumber(); @@ -60,20 +60,22 @@ void CRestaurantPhonograph::load(SimpleFile *file) { } bool CRestaurantPhonograph::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { - if (!_fieldF8 && !_isPlaying) { + if (!_isLocked && !_isPlaying) { CQueryCylinderHolderMsg holderMsg; holderMsg.execute(this); if (!holderMsg._isOpen) { + // Start playing immediately CPhonographPlayMsg playMsg; playMsg.execute(this); } else if (holderMsg._isPresent) { + // Need to close the cylinder holder before playing CEjectCylinderMsg ejectMsg; - ejectMsg.execute(this); + ejectMsg.execute(this, nullptr, MSGFLAG_SCAN); _isDisabled = true; if (_field114) { - loadFrame(_fieldEC); + loadFrame(_playUnpressedFrame); playSound(_ejectSoundName); } } @@ -83,9 +85,11 @@ bool CRestaurantPhonograph::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { } bool CRestaurantPhonograph::PhonographPlayMsg(CPhonographPlayMsg *msg) { + CPhonograph::PhonographPlayMsg(msg); + if (_isPlaying) { if (findView() == getView() && (!_isDisabled || !_field114)) { - loadFrame(_fieldEC); + loadFrame(_playUnpressedFrame); playSound(_ejectSoundName); } @@ -94,7 +98,7 @@ bool CRestaurantPhonograph::PhonographPlayMsg(CPhonographPlayMsg *msg) { CRestaurantMusicChanged musicMsg(nameMsg._name); musicMsg.execute(findRoom()); } else { - loadFrame(_fieldF0); + loadFrame(_playPressedFrame); } return true; @@ -105,11 +109,11 @@ bool CRestaurantPhonograph::PhonographStopMsg(CPhonographStopMsg *msg) { CPhonograph::PhonographStopMsg(msg); if (_isPlaying) { - loadFrame(_fieldF0); + loadFrame(_playUnpressedFrame); + } else { + loadFrame(_playPressedFrame); if (flag) playSound(_stopSoundName); - } else { - loadFrame(_fieldEC); } return true; @@ -135,12 +139,12 @@ bool CRestaurantPhonograph::EjectCylinderMsg(CEjectCylinderMsg *msg) { } bool CRestaurantPhonograph::QueryPhonographState(CQueryPhonographState *msg) { - msg->_value = _fieldF8; + msg->_value = _isLocked; return true; } bool CRestaurantPhonograph::LockPhonographMsg(CLockPhonographMsg *msg) { - _fieldF8 = msg->_value; + _isLocked = msg->_value; return true; } diff --git a/engines/titanic/game/restaurant_phonograph.h b/engines/titanic/game/restaurant_phonograph.h index 8f72eaf58f..67248447ab 100644 --- a/engines/titanic/game/restaurant_phonograph.h +++ b/engines/titanic/game/restaurant_phonograph.h @@ -37,7 +37,7 @@ class CRestaurantPhonograph : public CPhonograph { bool QueryPhonographState(CQueryPhonographState *msg); bool LockPhonographMsg(CLockPhonographMsg *msg); private: - int _fieldF8; + bool _isLocked; CString _ejectSoundName; CString _stopSoundName; int _field114; diff --git a/engines/titanic/game/season_background.cpp b/engines/titanic/game/season_background.cpp index 20ad6aca1d..d663c405ce 100644 --- a/engines/titanic/game/season_background.cpp +++ b/engines/titanic/game/season_background.cpp @@ -65,39 +65,39 @@ bool CSeasonBackground::ChangeSeasonMsg(CChangeSeasonMsg *msg) { switch (_seasonNum) { case SEASON_SUMMER: - playMovie(0, 45, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(0, 45, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); _defaultFrame = 45; break; case SEASON_AUTUMN: if (_flag) { - playMovie(232, 278, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(232, 278, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); _defaultFrame = 278; } else { - playMovie(45, 91, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(45, 91, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); _defaultFrame = 91; } break; case SEASON_WINTER: if (_flag) { - playMovie(278, 326, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(278, 326, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); _defaultFrame = 326; } else { CStatusChangeMsg changeMsg; changeMsg._newStatus = 0; changeMsg.execute("PickUpSpeechCentre"); - playMovie(91, 139, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(91, 139, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); _defaultFrame = 139; } break; case SEASON_SPRING: if (_flag) { - playMovie(326, 417, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(326, 417, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); _defaultFrame = 417; } else { - playMovie(139, 228, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(139, 228, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); _defaultFrame = 228; } break; diff --git a/engines/titanic/game/sgt/armchair.cpp b/engines/titanic/game/sgt/armchair.cpp index 681b1ae61d..6c0e7fe0ca 100644 --- a/engines/titanic/game/sgt/armchair.cpp +++ b/engines/titanic/game/sgt/armchair.cpp @@ -55,7 +55,7 @@ bool CArmchair::TurnOn(CTurnOn *msg) { _endFrame = 10; } - playMovie(_startFrame, _endFrame, MOVIE_GAMESTATE); + playMovie(_startFrame, _endFrame, MOVIE_WAIT_FOR_FINISH); playSound("b#0.wav"); _statics->_armchair = "Open"; _isClosed = false; @@ -70,7 +70,7 @@ bool CArmchair::TurnOff(CTurnOff *msg) { _startFrame = 11; _endFrame = 21; _isClosed = true; - playMovie(11, 21, MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT); + playMovie(11, 21, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); playSound("b#0.wav"); } diff --git a/engines/titanic/game/sgt/basin.cpp b/engines/titanic/game/sgt/basin.cpp index ce34a49250..fe3216e002 100644 --- a/engines/titanic/game/sgt/basin.cpp +++ b/engines/titanic/game/sgt/basin.cpp @@ -48,7 +48,7 @@ bool CBasin::TurnOn(CTurnOn *msg) { _isClosed = false; _startFrame = 0; _endFrame = 6; - playMovie(0, 6, MOVIE_GAMESTATE); + playMovie(0, 6, MOVIE_WAIT_FOR_FINISH); playSound("b#13.wav"); } @@ -61,7 +61,7 @@ bool CBasin::TurnOff(CTurnOff *msg) { _isClosed = true; _startFrame = 8; _endFrame = 14; - playMovie(8, 14, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(8, 14, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); playSound("b#13.wav"); } diff --git a/engines/titanic/game/sgt/bedfoot.cpp b/engines/titanic/game/sgt/bedfoot.cpp index d84a73f0a5..8f90e0f100 100644 --- a/engines/titanic/game/sgt/bedfoot.cpp +++ b/engines/titanic/game/sgt/bedfoot.cpp @@ -53,7 +53,7 @@ bool CBedfoot::TurnOn(CTurnOn *msg) { playSound("b#4.wav"); } - playMovie(_startFrame, _endFrame, MOVIE_GAMESTATE); + playMovie(_startFrame, _endFrame, MOVIE_WAIT_FOR_FINISH); } else if (_statics->_bedfoot == "RestingUnderTV") { _isClosed = false; _startFrame = 8; @@ -65,7 +65,7 @@ bool CBedfoot::TurnOn(CTurnOn *msg) { playSound("192_436_bed hits floor.wav"); } - playMovie(_startFrame, _endFrame, MOVIE_GAMESTATE); + playMovie(_startFrame, _endFrame, MOVIE_WAIT_FOR_FINISH); } if (_statics->_bedfoot == "Open") @@ -94,7 +94,7 @@ bool CBedfoot::TurnOff(CTurnOff *msg) { _endFrame = 25; } - playMovie(_startFrame, _endFrame, MOVIE_GAMESTATE); + playMovie(_startFrame, _endFrame, MOVIE_WAIT_FOR_FINISH); playSound("b#7.wav"); } else if (_statics->_bedfoot == "NotOnWashstand" && _statics->_bedhead == "ClosedWrong") { @@ -109,14 +109,14 @@ bool CBedfoot::TurnOff(CTurnOff *msg) { _endFrame = 25; } - playMovie(_startFrame, _endFrame, MOVIE_GAMESTATE); + playMovie(_startFrame, _endFrame, MOVIE_WAIT_FOR_FINISH); playSound("b#7.wav"); } else if (_statics->_bedfoot == "RestingUTV" && _statics->_tv == "Closed") { _statics->_bedfoot = "Closed"; _startFrame = 25; _endFrame = 30; - playMovie(25, 30, MOVIE_GAMESTATE); + playMovie(25, 30, MOVIE_WAIT_FOR_FINISH); playSound("b#7.wav"); } diff --git a/engines/titanic/game/sgt/bedhead.cpp b/engines/titanic/game/sgt/bedhead.cpp index b42c1c1146..1356afea83 100644 --- a/engines/titanic/game/sgt/bedhead.cpp +++ b/engines/titanic/game/sgt/bedhead.cpp @@ -110,7 +110,7 @@ bool CBedhead::TurnOn(CTurnOn *msg) { setVisible(true); _statics->_bedhead = entry._name4; - playMovie(entry._startFrame, entry._endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(entry._startFrame, entry._endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); playSound("b#6.wav"); _isClosed = false; } @@ -157,7 +157,7 @@ bool CBedhead::TurnOff(CTurnOff *msg) { setVisible(true); _statics->_bedhead = entry._name4; - playMovie(entry._startFrame, entry._endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(entry._startFrame, entry._endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); playSound("193_436_bed fold up 1.wav"); _isClosed = false; } diff --git a/engines/titanic/game/sgt/chest_of_drawers.cpp b/engines/titanic/game/sgt/chest_of_drawers.cpp index 9e00d4fde7..648308fc8f 100644 --- a/engines/titanic/game/sgt/chest_of_drawers.cpp +++ b/engines/titanic/game/sgt/chest_of_drawers.cpp @@ -46,7 +46,7 @@ bool CChestOfDrawers::TurnOn(CTurnOn *msg) { _statics->_chestOfDrawers = "Open"; _startFrame = 1; _endFrame = 14; - playMovie(1, 14, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(1, 14, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); playSound("b#11.wav"); } @@ -62,7 +62,7 @@ bool CChestOfDrawers::TurnOff(CTurnOff *msg) { _startFrame = 14; _endFrame = 27; - playMovie(14, 27, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(14, 27, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); playSound("b#11.wav"); } diff --git a/engines/titanic/game/sgt/desk.cpp b/engines/titanic/game/sgt/desk.cpp index a31efe9e5d..1aea9a8ab3 100644 --- a/engines/titanic/game/sgt/desk.cpp +++ b/engines/titanic/game/sgt/desk.cpp @@ -47,7 +47,7 @@ bool CDesk::TurnOn(CTurnOn *msg) { _isClosed = false; _startFrame = 1; _endFrame = 26; - playMovie(1, 26, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(1, 26, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); playSound("b#12.wav"); } @@ -64,7 +64,7 @@ bool CDesk::TurnOff(CTurnOff *msg) { _isClosed = true; _startFrame = 26; _endFrame = 51; - playMovie(26, 51, MOVIE_GAMESTATE); + playMovie(26, 51, MOVIE_WAIT_FOR_FINISH); playSound("b#9.wav"); } diff --git a/engines/titanic/game/sgt/deskchair.cpp b/engines/titanic/game/sgt/deskchair.cpp index 2b25f57d03..23b6ad64d7 100644 --- a/engines/titanic/game/sgt/deskchair.cpp +++ b/engines/titanic/game/sgt/deskchair.cpp @@ -48,7 +48,7 @@ bool CDeskchair::TurnOn(CTurnOn *msg) { _isClosed = false; _startFrame = 0; _endFrame = 16; - playMovie(0, 16, MOVIE_GAMESTATE); + playMovie(0, 16, MOVIE_WAIT_FOR_FINISH); playSound("b#8.wav"); } @@ -61,7 +61,7 @@ bool CDeskchair::TurnOff(CTurnOff *msg) { _isClosed = true; _startFrame = 16; _endFrame = 32; - playMovie(16, 32, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(16, 32, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); playSound("b#2.wav"); } diff --git a/engines/titanic/game/sgt/drawer.cpp b/engines/titanic/game/sgt/drawer.cpp index 68752b3d2f..7288bbdc61 100644 --- a/engines/titanic/game/sgt/drawer.cpp +++ b/engines/titanic/game/sgt/drawer.cpp @@ -53,7 +53,7 @@ bool CDrawer::TurnOn(CTurnOn *msg) { _endFrame = 75; setVisible(true); _statics->_drawer = "Open"; - playMovie(_startFrame, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(_startFrame, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); playSound("b#10.wav"); } @@ -66,7 +66,7 @@ bool CDrawer::TurnOff(CTurnOff *msg) { _startFrame = 75; _endFrame = 100; _isClosed = true; - playMovie(_startFrame, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(_startFrame, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); playSound("b#10.wav"); } diff --git a/engines/titanic/game/sgt/sgt_doors.cpp b/engines/titanic/game/sgt/sgt_doors.cpp index 71eae9800c..2dabd21077 100644 --- a/engines/titanic/game/sgt/sgt_doors.cpp +++ b/engines/titanic/game/sgt/sgt_doors.cpp @@ -60,9 +60,9 @@ bool CSGTDoors::EnterViewMsg(CEnterViewMsg *msg) { if (pet->getRooms1CC() == 1) playMovie(START_FRAMES[roomNum], END_FRAMES[roomNum], - MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); else - playMovie(0, 12, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(0, 12, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); } return true; @@ -89,9 +89,9 @@ bool CSGTDoors::LeaveRoomMsg(CLeaveRoomMsg *msg) { if (pet->getRooms1CC() == 1) playMovie(START_FRAMES[roomNum], END_FRAMES[roomNum], - MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); else - playMovie(12, 25, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(12, 25, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); } return true; diff --git a/engines/titanic/game/sgt/sgt_navigation.cpp b/engines/titanic/game/sgt/sgt_navigation.cpp index 031226226f..d0b57ba1ec 100644 --- a/engines/titanic/game/sgt/sgt_navigation.cpp +++ b/engines/titanic/game/sgt/sgt_navigation.cpp @@ -71,9 +71,9 @@ bool CSGTNavigation::StatusChangeMsg(CStatusChangeMsg *msg) { int startVal = pet->getRooms1CC(); if (startVal > _statics->_changeViewNum) - playMovie(FRAMES[startVal], FRAMES[_statics->_changeViewNum], MOVIE_GAMESTATE); + playMovie(FRAMES[startVal], FRAMES[_statics->_changeViewNum], MOVIE_WAIT_FOR_FINISH); else - playMovie(FRAMES[startVal + 3], FRAMES[_statics->_changeViewNum + 3], MOVIE_GAMESTATE); + playMovie(FRAMES[startVal + 3], FRAMES[_statics->_changeViewNum + 3], MOVIE_WAIT_FOR_FINISH); _cursorId = _statics->_changeViewNum != 1 ? CURSOR_MOVE_FORWARD : CURSOR_INVALID; diff --git a/engines/titanic/game/sgt/sgt_tv.cpp b/engines/titanic/game/sgt/sgt_tv.cpp index ebec334781..5ce7c5b20e 100644 --- a/engines/titanic/game/sgt/sgt_tv.cpp +++ b/engines/titanic/game/sgt/sgt_tv.cpp @@ -46,7 +46,7 @@ bool CSGTTV::TurnOff(CTurnOff *msg) { _isClosed = true; _startFrame = 6; _endFrame = 12; - playMovie(6, 12, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(6, 12, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); } return true; @@ -60,7 +60,7 @@ bool CSGTTV::TurnOn(CTurnOn *msg) { _isClosed = false; _startFrame = 1; _endFrame = 6; - playMovie(1, 6, MOVIE_GAMESTATE); + playMovie(1, 6, MOVIE_WAIT_FOR_FINISH); } return true; diff --git a/engines/titanic/game/sgt/toilet.cpp b/engines/titanic/game/sgt/toilet.cpp index 544cdda0c6..0f796c2b9d 100644 --- a/engines/titanic/game/sgt/toilet.cpp +++ b/engines/titanic/game/sgt/toilet.cpp @@ -50,7 +50,7 @@ bool CToilet::TurnOn(CTurnOn *msg) { _isClosed = false; _startFrame = 0; _endFrame = 11; - playMovie(0, 11, MOVIE_GAMESTATE); + playMovie(0, 11, MOVIE_WAIT_FOR_FINISH); playSound("b#1.wav"); } @@ -64,7 +64,7 @@ bool CToilet::TurnOff(CTurnOff *msg) { _isClosed = true; _startFrame = 11; _endFrame = 18; - playMovie(11, 18, MOVIE_GAMESTATE); + playMovie(11, 18, MOVIE_WAIT_FOR_FINISH); playSound("b#1.wav"); } diff --git a/engines/titanic/game/sgt/vase.cpp b/engines/titanic/game/sgt/vase.cpp index f9ee292be2..e7b427c28f 100644 --- a/engines/titanic/game/sgt/vase.cpp +++ b/engines/titanic/game/sgt/vase.cpp @@ -47,7 +47,7 @@ bool CVase::TurnOn(CTurnOn *msg) { _isClosed = false; _startFrame = 1; _endFrame = 12; - playMovie(1, 12, MOVIE_GAMESTATE); + playMovie(1, 12, MOVIE_WAIT_FOR_FINISH); } return true; @@ -61,7 +61,7 @@ bool CVase::TurnOff(CTurnOff *msg) { _isClosed = true; _startFrame = 12; _endFrame = 25; - playMovie(12, 25, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(12, 25, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); } return true; diff --git a/engines/titanic/game/sgt/washstand.cpp b/engines/titanic/game/sgt/washstand.cpp index 5be722bec4..217e36c1e9 100644 --- a/engines/titanic/game/sgt/washstand.cpp +++ b/engines/titanic/game/sgt/washstand.cpp @@ -47,7 +47,7 @@ bool CWashstand::TurnOn(CTurnOn *msg) { _isClosed = false; _startFrame = 0; _endFrame = 14; - playMovie(0, 14, MOVIE_GAMESTATE); + playMovie(0, 14, MOVIE_WAIT_FOR_FINISH); playSound("b#14.wav"); } @@ -61,7 +61,7 @@ bool CWashstand::TurnOff(CTurnOff *msg) { _isClosed = true; _startFrame = 14; _endFrame = 28; - playMovie(14, 28, MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT); + playMovie(14, 28, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); playSound("b#14.wav"); } diff --git a/engines/titanic/game/starling_puret.cpp b/engines/titanic/game/starling_puret.cpp index 2f1909d963..f598f134ba 100644 --- a/engines/titanic/game/starling_puret.cpp +++ b/engines/titanic/game/starling_puret.cpp @@ -59,7 +59,7 @@ bool CStarlingPuret::EnterViewMsg(CEnterViewMsg *msg) { changeMsg._newStatus = 1; changeMsg.execute("PromDeckStarlings"); - playMovie(MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); CSignalObject signalMsg; signalMsg._numValue = 4; signalMsg.execute("PromDeckStarlings"); diff --git a/engines/titanic/game/sub_glass.cpp b/engines/titanic/game/sub_glass.cpp index 041f49097d..48cc84815a 100644 --- a/engines/titanic/game/sub_glass.cpp +++ b/engines/titanic/game/sub_glass.cpp @@ -88,7 +88,7 @@ bool CSUBGlass::SignalObject(CSignalObject *msg) { setVisible(true); if (_signalStartFrame >= 0) { - playMovie(_signalStartFrame, _signalEndFrame, MOVIE_GAMESTATE); + playMovie(_signalStartFrame, _signalEndFrame, MOVIE_WAIT_FOR_FINISH); playSound("z#30.wav"); _fieldBC = false; } diff --git a/engines/titanic/game/sweet_bowl.cpp b/engines/titanic/game/sweet_bowl.cpp index 7a3832e7c2..a1d0dc2b01 100644 --- a/engines/titanic/game/sweet_bowl.cpp +++ b/engines/titanic/game/sweet_bowl.cpp @@ -55,7 +55,7 @@ bool CSweetBowl::EnterViewMsg(CEnterViewMsg *msg) { bool CSweetBowl::ActMsg(CActMsg *msg) { if (msg->_action == "Jiggle") { setVisible(true); - playMovie(MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT); + playMovie(MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); playSound(getRandomNumber(1) == 1 ? "b#42.wav" : "b#43.wav"); } diff --git a/engines/titanic/game/throw_tv_down_well.cpp b/engines/titanic/game/throw_tv_down_well.cpp index be61f6e9ab..680fc7e29f 100644 --- a/engines/titanic/game/throw_tv_down_well.cpp +++ b/engines/titanic/game/throw_tv_down_well.cpp @@ -60,7 +60,7 @@ bool CThrowTVDownWell::ActMsg(CActMsg *msg) { } bool CThrowTVDownWell::EnterViewMsg(CEnterViewMsg *msg) { - playMovie(MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); movieEvent(49); return true; } diff --git a/engines/titanic/game/transport/lift.cpp b/engines/titanic/game/transport/lift.cpp index a6f45bda98..8dfc55905a 100644 --- a/engines/titanic/game/transport/lift.cpp +++ b/engines/titanic/game/transport/lift.cpp @@ -120,20 +120,20 @@ bool CLift::StatusChangeMsg(CStatusChangeMsg *msg) { if (oldClass == newClass) { debugStr = CString::format("Same (%d-%d)", _startFrame, _endFrame); - playMovie(_startFrame, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(_startFrame, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); } else if (oldClass == 1 && newClass == 2) { debugStr = CString::format("1 to 2 (%d-108, 108-%d)", _startFrame, _endFrame); - playMovie(_startFrame, 108, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); - playMovie(108, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(_startFrame, 108, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); + playMovie(108, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); } else if (oldClass == 1 && newClass == 3) { debugStr = CString::format("1 to 3 (%d-108, 108-190, 190-%d)", _startFrame, _endFrame); - playMovie(_startFrame, 108, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); - playMovie(108, 190, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); - playMovie(190, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(_startFrame, 108, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); + playMovie(108, 190, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); + playMovie(190, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); } else { debugStr = CString::format("2 to 3 (%d-190, 190-%d)", _startFrame, _endFrame); - playMovie(_startFrame, 190, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); - playMovie(190, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(_startFrame, 190, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); + playMovie(190, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); } } @@ -144,20 +144,20 @@ bool CLift::StatusChangeMsg(CStatusChangeMsg *msg) { if (oldClass == newClass) { debugStr = CString::format("Same (%d-%d)", _startFrame, _endFrame); - playMovie(_startFrame, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(_startFrame, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); } else if (oldClass == 3 && newClass == 2) { debugStr = CString::format("3 to 2 (%d-407, 407-%d)", _startFrame, _endFrame); - playMovie(_startFrame, 407, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); - playMovie(407, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(_startFrame, 407, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); + playMovie(407, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); } else if (oldClass == 3 && newClass == 1) { debugStr = CString::format("3 to 1 (%d-407, 407-489, 489-%d)", _startFrame, _endFrame); - playMovie(_startFrame, 407, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); - playMovie(407, 489, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); - playMovie(489, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(_startFrame, 407, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); + playMovie(407, 489, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); + playMovie(489, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); } else { debugStr = CString::format("2 to 1 (%d-489, 489-%d)", _startFrame, _endFrame); - playMovie(_startFrame, 489, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); - playMovie(489, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(_startFrame, 489, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); + playMovie(489, _endFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); } } diff --git a/engines/titanic/game/transport/pellerator.cpp b/engines/titanic/game/transport/pellerator.cpp index 095202d176..0228f9bc8b 100644 --- a/engines/titanic/game/transport/pellerator.cpp +++ b/engines/titanic/game/transport/pellerator.cpp @@ -83,7 +83,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) { playMovie(315, 323, 0); for (int idx = 0; idx < 3; ++idx) playMovie(299, 304, 0); - playMovie(305, 313, MOVIE_GAMESTATE); + playMovie(305, 313, MOVIE_WAIT_FOR_FINISH); break; case 2: @@ -95,7 +95,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) { playMovie(153, 197, 0); for (int idx = 0; idx < 5; ++idx) playMovie(253, 263, 0); - playMovie(290, 293, MOVIE_GAMESTATE); + playMovie(290, 293, MOVIE_WAIT_FOR_FINISH); break; case 4: @@ -107,7 +107,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) { playMovie(253, 263, 0); for (int idx = 0; idx < 7; ++idx) playMovie(336, 341, 0); - playMovie(342, 348, MOVIE_GAMESTATE); + playMovie(342, 348, MOVIE_WAIT_FOR_FINISH); break; case 5: @@ -130,7 +130,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) { playMovie(315, 323, 0); for (int idx = 0; idx < 3; ++idx) playMovie(299, 304, 0); - playMovie(305, 313, MOVIE_GAMESTATE); + playMovie(305, 313, MOVIE_WAIT_FOR_FINISH); break; case 2: @@ -139,7 +139,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) { playMovie(299, 304, 0); for (int idx = 0; idx < 15; ++idx) playMovie(245, 255, 0); - playMovie(264, 267, MOVIE_GAMESTATE); + playMovie(264, 267, MOVIE_WAIT_FOR_FINISH); ++_destination; break; @@ -149,7 +149,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) { playMovie(245, 255, 0); for (int idx = 0; idx < 7; ++idx) playMovie(336, 341, 0); - playMovie(342, 348, MOVIE_GAMESTATE); + playMovie(342, 348, MOVIE_WAIT_FOR_FINISH); break; case 5: @@ -160,7 +160,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) { playMovie(245, 255, 0); for (int idx = 0; idx < 3; ++idx) playMovie(299, 304, 0); - playMovie(305, 313, MOVIE_GAMESTATE); + playMovie(305, 313, MOVIE_WAIT_FOR_FINISH); break; default: @@ -184,7 +184,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) { playMovie(351, 359, 0); for (int idx = 0; idx < 3; ++idx) playMovie(336, 341, 0); - playMovie(342, 348, MOVIE_GAMESTATE); + playMovie(342, 348, MOVIE_WAIT_FOR_FINISH); break; case 3: @@ -196,7 +196,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) { playMovie(245, 255, 0); for (int idx = 0; idx < 3; ++idx) playMovie(336, 341, 0); - playMovie(342, 348, MOVIE_GAMESTATE); + playMovie(342, 348, MOVIE_WAIT_FOR_FINISH); --_destination; break; @@ -209,7 +209,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) { playMovie(78, 149, 0); for (int idx = 0; idx < 5; ++idx) playMovie(245, 255, 0); - playMovie(264, 267, MOVIE_GAMESTATE); + playMovie(264, 267, MOVIE_WAIT_FOR_FINISH); break; case 5: @@ -221,7 +221,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) { playMovie(78, 149, 0); for (int idx = 0; idx < 3; ++idx) playMovie(336, 341, 0); - playMovie(342, 348, MOVIE_GAMESTATE); + playMovie(342, 348, MOVIE_WAIT_FOR_FINISH); break; default: @@ -236,7 +236,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) { playMovie(351, 359, 0); for (int idx = 0; idx < 3; ++idx) playMovie(336, 341, 0); - playMovie(342, 348, MOVIE_GAMESTATE); + playMovie(342, 348, MOVIE_WAIT_FOR_FINISH); break; case 3: @@ -245,7 +245,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) { playMovie(253, 263, 0); for (int idx = 0; idx < 3; ++idx) playMovie(336, 341, 0); - playMovie(342, 348, MOVIE_GAMESTATE); + playMovie(342, 348, MOVIE_WAIT_FOR_FINISH); --_destination; break; @@ -255,7 +255,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) { playMovie(299, 304, 0); for (int idx = 0; idx < 15; ++idx) playMovie(253, 263, 0); - playMovie(290, 293, MOVIE_GAMESTATE); + playMovie(290, 293, MOVIE_WAIT_FOR_FINISH); break; case 5: @@ -266,7 +266,7 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) { playMovie(253, 263, 0); for (int idx = 0; idx < 3; ++idx) playMovie(336, 341, 0); - playMovie(342, 348, MOVIE_GAMESTATE); + playMovie(342, 348, MOVIE_WAIT_FOR_FINISH); break; default: diff --git a/engines/titanic/game/wheel_button.cpp b/engines/titanic/game/wheel_button.cpp index 730a5d9005..71532e52af 100644 --- a/engines/titanic/game/wheel_button.cpp +++ b/engines/titanic/game/wheel_button.cpp @@ -31,33 +31,33 @@ BEGIN_MESSAGE_MAP(CWheelButton, CBackground) END_MESSAGE_MAP() CWheelButton::CWheelButton() : CBackground(), - _fieldE0(false), _timerId(0), _fieldE8(0) { + _blinking(false), _timerId(0), _unused5(0) { } void CWheelButton::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); - file->writeNumberLine(_fieldE0, indent); + file->writeNumberLine(_blinking, indent); file->writeNumberLine(_timerId, indent); - file->writeNumberLine(_fieldE8, indent); + file->writeNumberLine(_unused5, indent); CBackground::save(file, indent); } void CWheelButton::load(SimpleFile *file) { file->readNumber(); - _fieldE0 = file->readNumber(); + _blinking = file->readNumber(); _timerId = file->readNumber(); - _fieldE8 = file->readNumber(); + _unused5 = file->readNumber(); CBackground::load(file); } bool CWheelButton::SignalObject(CSignalObject *msg) { - bool oldFlag = _fieldE0; - _fieldE0 = msg->_numValue != 0; + bool oldBlinking = _blinking; + _blinking = msg->_numValue != 0; - if (oldFlag != _fieldE0) { - if (_fieldE0) { + if (oldBlinking != _blinking) { + if (_blinking) { _timerId = addTimer(500, 500); } else { stopAnimTimer(_timerId); diff --git a/engines/titanic/game/wheel_button.h b/engines/titanic/game/wheel_button.h index 2725e60622..7bdcecef75 100644 --- a/engines/titanic/game/wheel_button.h +++ b/engines/titanic/game/wheel_button.h @@ -33,9 +33,9 @@ class CWheelButton : public CBackground { bool TimerMsg(CTimerMsg *msg); bool LeaveViewMsg(CLeaveViewMsg *msg); public: - bool _fieldE0; + bool _blinking; int _timerId; - int _fieldE8; + int _unused5; public: CLASSDEF; CWheelButton(); diff --git a/engines/titanic/game/wheel_hotspot.cpp b/engines/titanic/game/wheel_hotspot.cpp index aeca7130b5..aec1c8b96d 100644 --- a/engines/titanic/game/wheel_hotspot.cpp +++ b/engines/titanic/game/wheel_hotspot.cpp @@ -31,36 +31,36 @@ END_MESSAGE_MAP() void CWheelHotSpot::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); - file->writeNumberLine(_fieldE0, indent); - file->writeNumberLine(_fieldE4, indent); + file->writeNumberLine(_active, indent); + file->writeNumberLine(_action, indent); CBackground::save(file, indent); } void CWheelHotSpot::load(SimpleFile *file) { file->readNumber(); - _fieldE0 = file->readNumber(); - _fieldE4 = file->readNumber(); + _active = file->readNumber(); + _action = (WheelHotspotAction)file->readNumber(); CBackground::load(file); } bool CWheelHotSpot::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { - if (_fieldE0) { + if (_active) { CActMsg actMsg; - switch (_fieldE4) { - case 1: + switch (_action) { + case WH_STOP: actMsg._action = "Stop"; actMsg.execute("CaptainsWheel"); break; - case 2: + case WH_CRUISE: actMsg._action = "Cruise"; actMsg.execute("CaptainsWheel"); break; - case 3: + case WH_GO: actMsg._action = "Go"; actMsg.execute("CaptainsWheel"); break; @@ -68,7 +68,7 @@ bool CWheelHotSpot::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { default: break; } - } else if (_fieldE4 == 3) { + } else if (_action == WH_GO) { petDisplayMessage(GO_WHERE); } @@ -76,7 +76,7 @@ bool CWheelHotSpot::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { } bool CWheelHotSpot::SignalObject(CSignalObject *msg) { - _fieldE0 = msg->_numValue != 0; + _active = msg->_numValue != 0; return true; } diff --git a/engines/titanic/game/wheel_hotspot.h b/engines/titanic/game/wheel_hotspot.h index e9071a2fa4..41da0fba81 100644 --- a/engines/titanic/game/wheel_hotspot.h +++ b/engines/titanic/game/wheel_hotspot.h @@ -27,16 +27,20 @@ namespace Titanic { +enum WheelHotspotAction { + WH_NONE = 0, WH_STOP = 1, WH_CRUISE = 2, WH_GO = 3 +}; + class CWheelHotSpot : public CBackground { DECLARE_MESSAGE_MAP; bool MouseButtonDownMsg(CMouseButtonDownMsg *msg); bool SignalObject(CSignalObject *msg); public: - int _fieldE0; - int _fieldE4; + bool _active; + WheelHotspotAction _action; public: CLASSDEF; - CWheelHotSpot() : CBackground(), _fieldE0(0), _fieldE4(0) {} + CWheelHotSpot() : CBackground(), _active(false), _action(WH_NONE) {} /** * Save the data for the class to file diff --git a/engines/titanic/game/wheel_spin_horn.cpp b/engines/titanic/game/wheel_spin_horn.cpp index b01cc678df..c299ffc8ff 100644 --- a/engines/titanic/game/wheel_spin_horn.cpp +++ b/engines/titanic/game/wheel_spin_horn.cpp @@ -24,20 +24,39 @@ namespace Titanic { +BEGIN_MESSAGE_MAP(CWheelSpinHorn, CWheelSpin) + ON_MESSAGE(MouseButtonDownMsg) +END_MESSAGE_MAP() + void CWheelSpinHorn::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); - file->writeQuotedLine(_string1, indent); - file->writeQuotedLine(_string2, indent); + file->writeQuotedLine(_soundName, indent); + file->writeQuotedLine(_message, indent); CWheelSpin::save(file, indent); } void CWheelSpinHorn::load(SimpleFile *file) { file->readNumber(); - _string1 = file->readString(); - _string2 = file->readString(); + _soundName = file->readString(); + _message = file->readString(); CWheelSpin::load(file); } +bool CWheelSpinHorn::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { + if (_active) { + if (!_soundName.empty()) + playSound(_soundName); + + if (!_message.empty()) + petDisplayMessage(_message); + + CActMsg actMsg("Honk"); + actMsg.execute("CaptainsWheel"); + } + + return true; +} + } // End of namespace Titanic diff --git a/engines/titanic/game/wheel_spin_horn.h b/engines/titanic/game/wheel_spin_horn.h index 21182253b3..b8546b01b6 100644 --- a/engines/titanic/game/wheel_spin_horn.h +++ b/engines/titanic/game/wheel_spin_horn.h @@ -28,9 +28,11 @@ namespace Titanic { class CWheelSpinHorn : public CWheelSpin { + DECLARE_MESSAGE_MAP; + bool MouseButtonDownMsg(CMouseButtonDownMsg *msg); public: - CString _string1; - CString _string2; + CString _soundName; + CString _message; public: CLASSDEF; diff --git a/engines/titanic/game_manager.cpp b/engines/titanic/game_manager.cpp index 96aeda1b83..5f51498e93 100644 --- a/engines/titanic/game_manager.cpp +++ b/engines/titanic/game_manager.cpp @@ -276,7 +276,7 @@ void CGameManager::frameMessage(CRoomItem *room) { CFrameMsg frameMsg(g_vm->_events->getTicksCount()); frameMsg.execute(room, nullptr, MSGFLAG_SCAN); - if (!_soundMaker) { + if (_gameState._soundMakerAllowed && !_soundMaker) { // Check for a sound maker in the room _soundMaker = dynamic_cast<CBackgroundSoundMaker *>( _project->findByName("zBackgroundSoundMaker")); diff --git a/engines/titanic/game_state.cpp b/engines/titanic/game_state.cpp index 964d6e604a..7ddd16ab22 100644 --- a/engines/titanic/game_state.cpp +++ b/engines/titanic/game_state.cpp @@ -46,8 +46,8 @@ bool CGameStateMovieList::empty() { CGameState::CGameState(CGameManager *gameManager) : _gameManager(gameManager), _gameLocation(this), _passengerClass(NO_CLASS), _priorClass(NO_CLASS), _mode(GSMODE_NONE), _seasonNum(SEASON_SUMMER), - _petActive(false), _field1C(false), _quitGame(false), _parrotMet(false), - _nodeChangeCtr(0), _nodeEnterTicks(0), _field38(0) { + _petActive(false), _soundMakerAllowed(false), _quitGame(false), _parrotMet(false), + _nodeChangeCtr(0), _nodeEnterTicks(0), _parrotResponseIndex(0) { } void CGameState::save(SimpleFile *file) const { @@ -56,9 +56,9 @@ void CGameState::save(SimpleFile *file) const { file->writeNumber(_priorClass); file->writeNumber(_seasonNum); file->writeNumber(_parrotMet); - file->writeNumber(_field38); + file->writeNumber(_parrotResponseIndex); _gameLocation.save(file); - file->writeNumber(_field1C); + file->writeNumber(_soundMakerAllowed); } void CGameState::load(SimpleFile *file) { @@ -67,10 +67,10 @@ void CGameState::load(SimpleFile *file) { _priorClass = (PassengerClass)file->readNumber(); _seasonNum = (Season)file->readNumber(); _parrotMet = file->readNumber(); - _field38 = file->readNumber(); + _parrotResponseIndex = file->readNumber(); _gameLocation.load(file); - _field1C = file->readNumber(); + _soundMakerAllowed = file->readNumber(); _nodeChangeCtr = 0; _nodeEnterTicks = 0; } diff --git a/engines/titanic/game_state.h b/engines/titanic/game_state.h index 5d0f67c02c..547e8f8221 100644 --- a/engines/titanic/game_state.h +++ b/engines/titanic/game_state.h @@ -69,13 +69,13 @@ public: GameStateMode _mode; Season _seasonNum; bool _petActive; - bool _field1C; + bool _soundMakerAllowed; bool _quitGame; bool _parrotMet; uint _nodeChangeCtr; uint32 _nodeEnterTicks; Point _mousePos; - int _field38; + int _parrotResponseIndex; public: CGameState(CGameManager *gameManager); @@ -151,9 +151,21 @@ public: */ bool getParrotMet() const { return _parrotMet; } + /** + * Gets the counter for the number of times different nodes have + * been entered + */ int getNodeChangedCtr() const { return _nodeChangeCtr; } + + /** + * Gets the node enter ticks amount + */ uint32 getNodeEnterTicks() const { return _nodeEnterTicks; } - void inc38() { ++_field38; } + + /** + * Increments the index to use for parrot idle responses + */ + void incParrotResponse() { ++_parrotResponseIndex; } }; } // End of namespace Titanic diff --git a/engines/titanic/gfx/toggle_switch.cpp b/engines/titanic/gfx/toggle_switch.cpp index 815f96cb5a..dae9acba0e 100644 --- a/engines/titanic/gfx/toggle_switch.cpp +++ b/engines/titanic/gfx/toggle_switch.cpp @@ -52,9 +52,9 @@ void CToggleSwitch::load(SimpleFile *file) { bool CToggleSwitch::MouseButtonUpMsg(CMouseButtonUpMsg *msg) { _pressed = !_pressed; if (_pressed) - fn10(0, 0, 0); + setToggleColor(0, 0, 0); else - fn10(0xff, 0xff, 0xff); + setToggleColor(0xff, 0xff, 0xff); return true; } diff --git a/engines/titanic/messages/messages.h b/engines/titanic/messages/messages.h index f70acdcfb2..a1e9ccbf9d 100644 --- a/engines/titanic/messages/messages.h +++ b/engines/titanic/messages/messages.h @@ -273,7 +273,7 @@ MESSAGE1(CGetChevRoomNum, int, roomNum, 0); MESSAGE2(CHoseConnectedMsg, bool, connected, true, CGameObject *, object, nullptr); MESSAGE0(CInitializeAnimMsg); MESSAGE1(CIsEarBowlPuzzleDone, int, value, 0); -MESSAGE3(CIsHookedOnMsg, Rect, rect, Rect(), bool, result, false, CString, string1, ""); +MESSAGE3(CIsHookedOnMsg, Rect, rect, Rect(), bool, isHooked, false, CString, armName, ""); MESSAGE1(CIsParrotPresentMsg, bool, value, false); MESSAGE1(CKeyCharMsg, int, key, 32); MESSAGE2(CLeaveNodeMsg, CNodeItem *, oldNode, nullptr, CNodeItem *, newNode, nullptr); @@ -378,6 +378,7 @@ MESSAGE1(CUseWithCharMsg, CCharacter *, character, nullptr); MESSAGE1(CUseWithOtherMsg, CGameObject *, other, 0); MESSAGE1(CVirtualKeyCharMsg, Common::KeyState, keyState, Common::KeyState()); MESSAGE1(CVisibleMsg, bool, visible, true); +MESSAGE1(CCheckCodeWheelsMsg, bool, isCorrect, true); } // End of namespace Titanic diff --git a/engines/titanic/moves/enter_bridge.cpp b/engines/titanic/moves/enter_bridge.cpp index fb44fe2e02..a9fbb5aff1 100644 --- a/engines/titanic/moves/enter_bridge.cpp +++ b/engines/titanic/moves/enter_bridge.cpp @@ -45,7 +45,7 @@ bool CEnterBridge::EnterRoomMsg(CEnterRoomMsg *msg) { CActMsg actMsg("Disable"); actMsg.execute("ShipAnnouncements"); - setState1C(false); + stateSetSoundMakerAllowed(false); _flag = false; } diff --git a/engines/titanic/moves/enter_sec_class_state.cpp b/engines/titanic/moves/enter_sec_class_state.cpp index af2bc4ac00..9ea8ae732a 100644 --- a/engines/titanic/moves/enter_sec_class_state.cpp +++ b/engines/titanic/moves/enter_sec_class_state.cpp @@ -85,9 +85,9 @@ bool CEnterSecClassState::StatusChangeMsg(CStatusChangeMsg *msg) { if (msg->_newStatus != 3) { if (msg->_newStatus == 2 && _mode == 1) - playMovie(0, 10, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(0, 10, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); else if (msg->_newStatus == 1) - playMovie(11, 21, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(11, 21, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); } _cursorId = msg->_newStatus == 2 ? CURSOR_MOVE_FORWARD : CURSOR_INVALID; diff --git a/engines/titanic/npcs/barbot.cpp b/engines/titanic/npcs/barbot.cpp index 58575d1c35..489ed39c4b 100644 --- a/engines/titanic/npcs/barbot.cpp +++ b/engines/titanic/npcs/barbot.cpp @@ -166,7 +166,7 @@ bool CBarbot::ActMsg(CActMsg *msg) { playRange(_frames[7]); playRange(_frames[8]); playRange(_frames[13]); - playRange(_frames[40], MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playRange(_frames[40], MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); _frameNum = _frames[40]._endFrame; } } else if (msg->_action == "GiveBackVisCentre") { @@ -316,7 +316,7 @@ bool CBarbot::TurnOn(CTurnOn *msg) { playRange(_frames[38], MOVIE_NOTIFY_OBJECT); playRange(_frames[58], MOVIE_NOTIFY_OBJECT); playRange(_frames[57], MOVIE_NOTIFY_OBJECT); - playRange(_frames[56], MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playRange(_frames[56], MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); _frameNum = _frames[56]._endFrame; } else { playRange(_frames[38]); @@ -363,13 +363,13 @@ bool CBarbot::TurnOff(CTurnOff *msg) { if (_visCenterOnCounter) { // Barbot will put away the vision center - playRange(_frames[28], MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playRange(_frames[28], MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); _frameNum = _frames[28]._endFrame; _visCenterOnCounter = false; _field134 = 1; } - playRange(_frames[29], MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playRange(_frames[29], MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); movieEvent(_frames[29]._startFrame); _frameNum = _frames[29]._endFrame; _fieldC4 = 0; @@ -560,7 +560,7 @@ bool CBarbot::TrueTalkTriggerActionMsg(CTrueTalkTriggerActionMsg *msg) { _frameNum = _frames[27]._endFrame; } else if (!_gottenDrunk && _drunkFlag) { playRange(_frames[45], MOVIE_NOTIFY_OBJECT); - playRange(_frames[44], MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playRange(_frames[44], MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); _frameNum = _frames[44]._endFrame; } break; diff --git a/engines/titanic/npcs/bellbot.cpp b/engines/titanic/npcs/bellbot.cpp index 26c9b13e40..36c57fe467 100644 --- a/engines/titanic/npcs/bellbot.cpp +++ b/engines/titanic/npcs/bellbot.cpp @@ -89,7 +89,7 @@ bool CBellBot::OnSummonBotMsg(COnSummonBotMsg *msg) { _npcFlags &= ~NPCFLAG_MOVE_LOOP; } - playClip("Walk On", MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playClip("Walk On", MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); movieEvent(); _npcFlags |= NPCFLAG_MOVING; @@ -135,13 +135,13 @@ bool CBellBot::MovieEndMsg(CMovieEndMsg *msg) { } bool CBellBot::Use(CUse *msg) { - dynamic_cast<CCarry *>(msg->_item)->_string1 = "Bellbot"; + dynamic_cast<CCarry *>(msg->_item)->_npcUse = "Bellbot"; return true; } bool CBellBot::DismissBotMsg(CDismissBotMsg *msg) { if (_npcFlags & NPCFLAG_MOVING) { - playClip("Walk Off", MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playClip("Walk Off", MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); if (_npcFlags & NPCFLAG_START_IDLING) { _npcFlags &= ~NPCFLAG_START_IDLING; performAction(true); @@ -168,7 +168,7 @@ bool CBellBot::TrueTalkTriggerActionMsg(CTrueTalkTriggerActionMsg *msg) { case 5: _npcFlags &= ~NPCFLAG_MOVE_START; - playClip("Walk Off", MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playClip("Walk Off", MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); movieEvent(); break; diff --git a/engines/titanic/npcs/bilge_succubus.cpp b/engines/titanic/npcs/bilge_succubus.cpp index 63d0006885..4db4d8d595 100644 --- a/engines/titanic/npcs/bilge_succubus.cpp +++ b/engines/titanic/npcs/bilge_succubus.cpp @@ -75,9 +75,9 @@ bool CBilgeSuccUBus::PETReceiveMsg(CPETReceiveMsg *msg) { if (_style) { if (_receiveStartFrame >= 0) - playMovie(_receiveStartFrame, _receiveEndFrame, MOVIE_GAMESTATE); + playMovie(_receiveStartFrame, _receiveEndFrame, MOVIE_WAIT_FOR_FINISH); if (_afterReceiveStartFrame >= 0) - playMovie(_afterReceiveStartFrame, _afterReceiveEndFrame, MOVIE_GAMESTATE); + playMovie(_afterReceiveStartFrame, _afterReceiveEndFrame, MOVIE_WAIT_FOR_FINISH); playSound("z#28.wav", 70); } else if (!_isOn) { @@ -94,7 +94,7 @@ bool CBilgeSuccUBus::PETReceiveMsg(CPETReceiveMsg *msg) { if (mailObject) { _mailP = mailObject; if (_receiveStartFrame >= 0) - playMovie(_receiveStartFrame, _receiveEndFrame, MOVIE_GAMESTATE); + playMovie(_receiveStartFrame, _receiveEndFrame, MOVIE_WAIT_FOR_FINISH); } else { petDisplayMessage(2, NOTHING_TO_DELIVER); } @@ -138,20 +138,20 @@ bool CBilgeSuccUBus::PETDeliverMsg(CPETDeliverMsg *msg) { playMovie(_sendStartFrame, _sendEndFrame, MOVIE_NOTIFY_OBJECT); if (_sneezing2StartFrame >= 0) { - playMovie(_trayOutStartFrame, _trayOutEndFrame, MOVIE_GAMESTATE); - playMovie(_sneezing1StartFrame, _sneezing1EndFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); - playMovie(_sneezing2StartFrame, _sneezing2EndFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(_trayOutStartFrame, _trayOutEndFrame, MOVIE_WAIT_FOR_FINISH); + playMovie(_sneezing1StartFrame, _sneezing1EndFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); + playMovie(_sneezing2StartFrame, _sneezing2EndFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); incTransitions(); } } else { startTalking(this, 230012); _sendAction = SA_EATEN; if (_sendStartFrame >= 0) - playMovie(_sendStartFrame, _sendEndFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(_sendStartFrame, _sendEndFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); if (_receiveStartFrame >= 0) - playMovie(_receiveStartFrame, _receiveEndFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(_receiveStartFrame, _receiveEndFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); if (_afterReceiveStartFrame >= 0) - playMovie(_afterReceiveStartFrame, _afterReceiveEndFrame, MOVIE_GAMESTATE); + playMovie(_afterReceiveStartFrame, _afterReceiveEndFrame, MOVIE_WAIT_FOR_FINISH); } } else { if (_isFeathers) { @@ -159,17 +159,17 @@ bool CBilgeSuccUBus::PETDeliverMsg(CPETDeliverMsg *msg) { _sendAction = SA_BILGE_FEATHERS; if (_sendStartFrame >= 0) - playMovie(_sendStartFrame, _sendEndFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(_sendStartFrame, _sendEndFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); if (_receiveStartFrame >= 0) - playMovie(_receiveStartFrame, _receiveEndFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(_receiveStartFrame, _receiveEndFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); if (_afterReceiveStartFrame >= 0) - playMovie(_afterReceiveStartFrame, _afterReceiveEndFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(_afterReceiveStartFrame, _afterReceiveEndFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); } else { sendMail(petRoomFlags, roomFlags); startTalking(this, 230012); if (_sendStartFrame >= 0) { _sendAction = SA_BILGE_SENT; - playMovie(_sendStartFrame, _sendEndFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(_sendStartFrame, _sendEndFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); } } } diff --git a/engines/titanic/npcs/deskbot.cpp b/engines/titanic/npcs/deskbot.cpp index 56f4d98f18..2b88160e47 100644 --- a/engines/titanic/npcs/deskbot.cpp +++ b/engines/titanic/npcs/deskbot.cpp @@ -306,7 +306,7 @@ bool CDeskbot::TurnOff(CTurnOff *msg) { performAction(1, findView()); _npcFlags = (_npcFlags & ~(NPCFLAG_SPEAKING | NPCFLAG_IDLING | NPCFLAG_START_IDLING)) | NPCFLAG_MOVE_LOOP; - playClip("Closing", MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT); + playClip("Closing", MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); } return true; diff --git a/engines/titanic/npcs/doorbot.cpp b/engines/titanic/npcs/doorbot.cpp index 79e3dafed4..03d723a384 100644 --- a/engines/titanic/npcs/doorbot.cpp +++ b/engines/titanic/npcs/doorbot.cpp @@ -95,7 +95,7 @@ bool CDoorbot::MovieEndMsg(CMovieEndMsg *msg) { case 6: if (clipExistsByEnd("Cloak On", msg->_endFrame)) { petShow(); - setState1C(true); + stateSetSoundMakerAllowed(true); changeView("ServiceElevator.Node 1.S"); changeView("ServiceElevator.Node 1.N"); } @@ -129,7 +129,7 @@ bool CDoorbot::MovieEndMsg(CMovieEndMsg *msg) { _introMovieNum = 0; } else if (clipExistsByEnd("Cloak On", msg->_endFrame)) { petShow(); - setState1C(true); + stateSetSoundMakerAllowed(true); changeView("ServiceElevator.Node 1.S"); } else { CTrueTalkNPC::MovieEndMsg(msg); @@ -185,7 +185,7 @@ bool CDoorbot::OnSummonBotMsg(COnSummonBotMsg *msg) { } playClip(getRandomNumber(1) ? "Whizz On Left" : "Whizz On Right", - MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); movieEvent(); _npcFlags |= NPCFLAG_MOVE_END; @@ -200,7 +200,7 @@ bool CDoorbot::TrueTalkTriggerActionMsg(CTrueTalkTriggerActionMsg *msg) { case 4: _npcFlags = (_npcFlags & ~NPCFLAG_IDLING) | NPCFLAG_SUMMON_BELLBOT; - playClip("Whizz Off Left", MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playClip("Whizz Off Left", MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); break; case 28: { @@ -387,7 +387,7 @@ bool CDoorbot::PutBotBackInHisBoxMsg(CPutBotBackInHisBoxMsg *msg) { bool CDoorbot::DismissBotMsg(CDismissBotMsg *msg) { if (_npcFlags & NPCFLAG_MOVE_END) { playClip(getRandomNumber(1) ? "Whizz Off Left" : "Whizz Off Right", - MOVIE_STOP_PREVIOUS | MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + MOVIE_STOP_PREVIOUS | MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); movieEvent(); if (_npcFlags & NPCFLAG_START_IDLING) { diff --git a/engines/titanic/npcs/maitre_d.cpp b/engines/titanic/npcs/maitre_d.cpp index 88eceab46b..6ac69d9079 100644 --- a/engines/titanic/npcs/maitre_d.cpp +++ b/engines/titanic/npcs/maitre_d.cpp @@ -40,25 +40,24 @@ BEGIN_MESSAGE_MAP(CMaitreD, CTrueTalkNPC) ON_MESSAGE(TriggerNPCEvent) END_MESSAGE_MAP() -int CMaitreD::_v1; - CMaitreD::CMaitreD() : CTrueTalkNPC(), - _string2("z#40.wav"), _string3("z#40.wav"), _field108(0), _field118(1), - _field11C(0), _field12C(0), _field130(1), _field134(0), _timerId(0) { + _priorMusicName("z#40.wav"), _musicName("z#40.wav"), _unused5(0), _hasMusic(true), + _musicSet(false), _fightFlag(false), _unused6(true), _savedFightFlag(false), + _timerId(0), _defeated(false) { } void CMaitreD::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); - file->writeNumberLine(_field108, indent); - file->writeQuotedLine(_string2, indent); - file->writeNumberLine(_field118, indent); - file->writeNumberLine(_field11C, indent); - file->writeQuotedLine(_string3, indent); - file->writeNumberLine(_field12C, indent); - file->writeNumberLine(_field130, indent); - - file->writeNumberLine(_v1, indent); - file->writeNumberLine(_field134, indent); + file->writeNumberLine(_unused5, indent); + file->writeQuotedLine(_priorMusicName, indent); + file->writeNumberLine(_hasMusic, indent); + file->writeNumberLine(_musicSet, indent); + file->writeQuotedLine(_musicName, indent); + file->writeNumberLine(_fightFlag, indent); + file->writeNumberLine(_unused6, indent); + + file->writeNumberLine(_defeated, indent); + file->writeNumberLine(_savedFightFlag, indent); file->writeNumberLine(_timerId, indent); CTrueTalkNPC::save(file, indent); @@ -66,16 +65,16 @@ void CMaitreD::save(SimpleFile *file, int indent) { void CMaitreD::load(SimpleFile *file) { file->readNumber(); - _field108 = file->readNumber(); - _string2 = file->readString(); - _field118 = file->readNumber(); - _field11C = file->readNumber(); - _string3 = file->readString(); - _field12C = file->readNumber(); - _field130 = file->readNumber(); - - _v1 = file->readNumber(); - _field134 = file->readNumber(); + _unused5 = file->readNumber(); + _priorMusicName = file->readString(); + _hasMusic = file->readNumber(); + _musicSet = file->readNumber(); + _musicName = file->readString(); + _fightFlag = file->readNumber(); + _unused6 = file->readNumber(); + + _defeated = file->readNumber(); + _savedFightFlag = file->readNumber(); _timerId = file->readNumber(); CTrueTalkNPC::load(file); @@ -83,10 +82,10 @@ void CMaitreD::load(SimpleFile *file) { bool CMaitreD::RestaurantMusicChanged(CRestaurantMusicChanged *msg) { if (msg->_value.empty()) { - _field118 = 0; + _hasMusic = false; } else { - _string3 = msg->_value; - _field118 = _field11C = 1; + _musicName = msg->_value; + _hasMusic = _musicSet = true; } return true; @@ -94,15 +93,15 @@ bool CMaitreD::RestaurantMusicChanged(CRestaurantMusicChanged *msg) { bool CMaitreD::TrueTalkTriggerActionMsg(CTrueTalkTriggerActionMsg *msg) { if (msg->_action == 8) { - _field12C = 1; + _fightFlag = true; stopAnimTimer(_timerId); _timerId = startAnimTimer("MD Fight", 3500, 0); } else if (msg->_action == 9) { stopAnimTimer(_timerId); _timerId = 0; } else if (msg->_action == 10) { - _field12C = 0; - _v1 = 1; + _fightFlag = false; + _defeated = true; stopAnimTimer(_timerId); _timerId = 0; @@ -115,12 +114,17 @@ bool CMaitreD::TrueTalkTriggerActionMsg(CTrueTalkTriggerActionMsg *msg) { bool CMaitreD::EnterViewMsg(CEnterViewMsg *msg) { setTalking(this, true, findView()); - _field12C = _field134; + _fightFlag = _savedFightFlag; + + if (_musicName != "STMusic" && (!_musicSet || _priorMusicName == _musicName)) + return true; - if (_string3 == "STMusic" && (!_field11C || _string2 == _string3)) + // WORKAROUND: It's possible in the original to not have a music handler set + // if you start and stop the phonograph, then save and restore the game + if (!CMusicRoom::_musicHandler) return true; - if (_string3.contains("nasty ambient")) + if (_musicName.contains("nasty ambient")) startTalking(this, 111, findView()); else if (!CMusicRoom::_musicHandler->checkInstrument(SNAKE)) startTalking(this, 114, findView()); @@ -135,16 +139,17 @@ bool CMaitreD::EnterViewMsg(CEnterViewMsg *msg) { happyMsg.execute("MaitreD Right Arm"); } + _priorMusicName = _musicName; return true; } bool CMaitreD::LeaveViewMsg(CLeaveViewMsg *msg) { - _field134 = _field12C; + _savedFightFlag = _fightFlag; performAction(true); stopAnimTimer(_timerId); _timerId = 0; - _field12C = 0; + _fightFlag = false; return true; } @@ -158,7 +163,7 @@ bool CMaitreD::NPCPlayTalkingAnimationMsg(CNPCPlayTalkingAnimationMsg *msg) { msg->_names = NAMES; CAnimateMaitreDMsg animMsg; - if (_field12C) + if (_fightFlag) animMsg._value = 0; animMsg.execute(this); } @@ -168,7 +173,7 @@ bool CMaitreD::NPCPlayTalkingAnimationMsg(CNPCPlayTalkingAnimationMsg *msg) { bool CMaitreD::TimerMsg(CTimerMsg *msg) { if (msg->_action == "MD Fight") { - if (_field12C && compareViewNameTo("1stClassRestaurant.MaitreD Node.N")) { + if (_fightFlag && compareViewNameTo("1stClassRestaurant.MaitreD Node.N")) { startTalking(this, 131, findView()); } } else { @@ -179,7 +184,7 @@ bool CMaitreD::TimerMsg(CTimerMsg *msg) { } bool CMaitreD::TrueTalkNotifySpeechStartedMsg(CTrueTalkNotifySpeechStartedMsg *msg) { - if (_field12C) { + if (_fightFlag) { stopAnimTimer(_timerId); _timerId = 0; } @@ -189,7 +194,7 @@ bool CMaitreD::TrueTalkNotifySpeechStartedMsg(CTrueTalkNotifySpeechStartedMsg *m } bool CMaitreD::TrueTalkNotifySpeechEndedMsg(CTrueTalkNotifySpeechEndedMsg *msg) { - if (_field12C) { + if (_fightFlag) { stopAnimTimer(_timerId); _timerId = startAnimTimer("MD Fight", 3000 + getRandomNumber(3000)); } @@ -199,7 +204,7 @@ bool CMaitreD::TrueTalkNotifySpeechEndedMsg(CTrueTalkNotifySpeechEndedMsg *msg) } bool CMaitreD::LoadSuccessMsg(CLoadSuccessMsg *msg) { - if (_field12C) { + if (_fightFlag) { _timerId = startAnimTimer("MD Fight", 3000 + getRandomNumber(3000)); } diff --git a/engines/titanic/npcs/maitre_d.h b/engines/titanic/npcs/maitre_d.h index 878c32cc0b..6677a587a8 100644 --- a/engines/titanic/npcs/maitre_d.h +++ b/engines/titanic/npcs/maitre_d.h @@ -41,17 +41,16 @@ class CMaitreD : public CTrueTalkNPC { bool TextInputMsg(CTextInputMsg *msg); bool TriggerNPCEvent(CTriggerNPCEvent *msg); private: - static int _v1; -private: - int _field108; - CString _string2; - int _field118; - int _field11C; - CString _string3; - int _field12C; - int _field130; - int _field134; + int _unused5; + CString _priorMusicName; + bool _hasMusic; + bool _musicSet; + CString _musicName; + bool _fightFlag; + bool _unused6; + bool _savedFightFlag; int _timerId; + bool _defeated; public: CLASSDEF; CMaitreD(); diff --git a/engines/titanic/npcs/parrot.cpp b/engines/titanic/npcs/parrot.cpp index b570bea6ae..6a48837d08 100644 --- a/engines/titanic/npcs/parrot.cpp +++ b/engines/titanic/npcs/parrot.cpp @@ -43,6 +43,7 @@ BEGIN_MESSAGE_MAP(CParrot, CTrueTalkNPC) ON_MESSAGE(PreEnterViewMsg) ON_MESSAGE(PanningAwayFromParrotMsg) ON_MESSAGE(LeaveRoomMsg) + ON_MESSAGE(TrueTalkNotifySpeechEndedMsg) END_MESSAGE_MAP() bool CParrot::_eatingChicken; @@ -475,7 +476,7 @@ bool CParrot::NPCPlayIdleAnimationMsg(CNPCPlayIdleAnimationMsg *msg) { } } else { int id = -1; - switch (stateGet38()) { + switch (getParrotResponse()) { case 0: id = 280107; break; @@ -729,4 +730,15 @@ bool CParrot::LeaveRoomMsg(CLeaveRoomMsg *msg) { return true; } +bool CParrot::TrueTalkNotifySpeechEndedMsg(CTrueTalkNotifySpeechEndedMsg *msg) { + if (msg->_dialogueId == 80022) { + // WORKAROUND: End of parrot speech after having fixed Titania + unlockMouse(); + changeView("Titania.Node 18.N", ""); + } + + return CTrueTalkNPC::TrueTalkNotifySpeechEndedMsg(msg); +} + + } // End of namespace Titanic diff --git a/engines/titanic/npcs/parrot.h b/engines/titanic/npcs/parrot.h index c178a2086a..d3558dfa3e 100644 --- a/engines/titanic/npcs/parrot.h +++ b/engines/titanic/npcs/parrot.h @@ -51,6 +51,7 @@ class CParrot : public CTrueTalkNPC { bool PreEnterViewMsg(CPreEnterViewMsg *msg); bool PanningAwayFromParrotMsg(CPanningAwayFromParrotMsg *msg); bool LeaveRoomMsg(CLeaveRoomMsg *msg); + bool TrueTalkNotifySpeechEndedMsg(CTrueTalkNotifySpeechEndedMsg *msg); public: static bool _eatingChicken; static bool _takeOff; diff --git a/engines/titanic/npcs/succubus.cpp b/engines/titanic/npcs/succubus.cpp index 71272fad03..ef681f64b8 100644 --- a/engines/titanic/npcs/succubus.cpp +++ b/engines/titanic/npcs/succubus.cpp @@ -701,11 +701,11 @@ bool CSuccUBus::TurnOff(CTurnOff *msg) { if (_offStartFrame >= 0) { playSound("z#27.wav", 100); - playMovie(_offStartFrame, _offEndFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(_offStartFrame, _offEndFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); } if (!_signalFlag && _endingStartFrame >= 0) - playMovie(_endingStartFrame, _endingEndFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); + playMovie(_endingStartFrame, _endingEndFrame, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH); _isOn = false; performAction(true); diff --git a/engines/titanic/npcs/titania.cpp b/engines/titanic/npcs/titania.cpp index db0c85d5f5..e0ea4f1459 100644 --- a/engines/titanic/npcs/titania.cpp +++ b/engines/titanic/npcs/titania.cpp @@ -43,7 +43,7 @@ CTitania::CTitania() : CCharacter() { _ear2 = false; _nose = false; _mouth = false; - _showIntro = true; + _showSpeech = true; } void CTitania::save(SimpleFile *file, int indent) { @@ -59,7 +59,7 @@ void CTitania::save(SimpleFile *file, int indent) { file->writeNumberLine(_ear2, indent); file->writeNumberLine(_nose, indent); file->writeNumberLine(_mouth, indent); - file->writeNumberLine(_showIntro, indent); + file->writeNumberLine(_showSpeech, indent); CCharacter::save(file, indent); } @@ -77,7 +77,7 @@ void CTitania::load(SimpleFile *file) { _ear2 = file->readNumber(); _nose = file->readNumber(); _mouth = file->readNumber(); - _showIntro = file->readNumber(); + _showSpeech = file->readNumber(); CCharacter::load(file); } @@ -99,7 +99,7 @@ bool CTitania::AddHeadPieceMsg(CAddHeadPieceMsg *msg) { _eye2 = true; } else if (msg->_value == "Ear1") { _ear1 = true; - } else if (msg->_value == "Ear2") { + } else if (msg->_value == "Ear 2") { _ear2 = true; } else if (msg->_value == "Mouth") { _mouth = true; @@ -197,8 +197,8 @@ bool CTitania::ActMsg(CActMsg *msg) { } bool CTitania::EnterViewMsg(CEnterViewMsg *msg) { - if (_showIntro) { - _showIntro = false; + if (_showSpeech) { + _showSpeech = false; disableMouse(); petHide(); @@ -216,8 +216,11 @@ bool CTitania::EnterViewMsg(CEnterViewMsg *msg) { } bool CTitania::TimerMsg(CTimerMsg *msg) { - changeView("Titania.Node 18.N", ""); + // WORKAROUND: The original uses the disc change dialog as a pause + // to allow the parrot speech to finish. I've rewritten it to instead + // use the standard TrueTalkNotifySpeechEndedMsg message instead startTalking("PerchedParrot", 80022); + lockMouse(); return true; } diff --git a/engines/titanic/npcs/titania.h b/engines/titanic/npcs/titania.h index 61f8c86018..f94442d317 100644 --- a/engines/titanic/npcs/titania.h +++ b/engines/titanic/npcs/titania.h @@ -46,7 +46,7 @@ private: bool _ear2; bool _nose; bool _mouth; - bool _showIntro; + bool _showSpeech; public: CLASSDEF; CTitania(); diff --git a/engines/titanic/sound/music_room_instrument.cpp b/engines/titanic/sound/music_room_instrument.cpp index 5e7bd9bb8c..b92329850b 100644 --- a/engines/titanic/sound/music_room_instrument.cpp +++ b/engines/titanic/sound/music_room_instrument.cpp @@ -234,7 +234,7 @@ void CMusicRoomInstrument::update(int val) { double tempVal = 46.0 - ((double)(val - 14) * 1.43); int frameNum = _field4C; - int frameNum1 = (tempVal - frameNum) * 0.25; + int frameNum1 = (int)((tempVal - frameNum) * 0.25); _gameObjects[1]->playMovie(frameNum1, frameNum1, MOVIE_STOP_PREVIOUS); frameNum += frameNum1; diff --git a/engines/titanic/sound/titania_speech.cpp b/engines/titanic/sound/titania_speech.cpp index d0ff423342..1adce7a5ac 100644 --- a/engines/titanic/sound/titania_speech.cpp +++ b/engines/titanic/sound/titania_speech.cpp @@ -34,16 +34,16 @@ END_MESSAGE_MAP() void CTitaniaSpeech::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); - file->writeNumberLine(_paraNum, indent); - file->writeNumberLine(_frameNum, indent); + file->writeNumberLine(_actionNum, indent); + file->writeNumberLine(_backgroundFrame, indent); CGameObject::save(file, indent); } void CTitaniaSpeech::load(SimpleFile *file) { file->readNumber(); - _paraNum = file->readNumber(); - _frameNum = file->readNumber(); + _actionNum = file->readNumber(); + _backgroundFrame = file->readNumber(); CGameObject::load(file); } @@ -54,16 +54,16 @@ bool CTitaniaSpeech::ActMsg(CActMsg *msg) { CActMsg actMsg; if (msg->_action == "TitaniaSpeech") { - switch (_paraNum) { - case 0: + switch (_actionNum) { + case 1: movieSetAudioTiming(true); loadSound("a#12.wav"); sleep(1000); - playMovie(0, 187, MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT); + playMovie(0, 187, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); movieEvent(0); break; - case 1: + case 2: loadSound("a#11.wav"); addTimer(0); startAnimTimer("Para2", 300); @@ -74,34 +74,34 @@ bool CTitaniaSpeech::ActMsg(CActMsg *msg) { startAnimTimer("NextPara", 30000); break; - case 2: + case 3: visibleMsg._visible = false; visibleMsg.execute("TitaniaStillControl"); loadSound("a#10.wav"); - playMovie(585, 706, MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT); + playMovie(585, 706, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); playSound("a#10.wav"); break; - case 3: + case 4: visibleMsg._visible = false; visibleMsg.execute("TitaniaStillControl"); loadSound("a#9.wav"); - playMovie(707, 905, MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT); + playMovie(707, 905, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); playSound("a#9.wav"); break; - case 4: + case 5: visibleMsg._visible = false; visibleMsg.execute("TitaniaStillControl"); loadSound("a#8.wav"); - playMovie(906, 938, MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT); + playMovie(906, 938, MOVIE_WAIT_FOR_FINISH | MOVIE_NOTIFY_OBJECT); playSound("a#8.wav"); break; default: sleep(3000); actMsg._action = "SleepTitania"; - actMsg.execute(this); + actMsg.execute("TitaniaControl"); } } @@ -109,10 +109,10 @@ bool CTitaniaSpeech::ActMsg(CActMsg *msg) { } bool CTitaniaSpeech::MovieEndMsg(CMovieEndMsg *msg) { - if (_paraNum == 5) { + if (_actionNum == 5) { startAnimTimer("NextPara", 0); } else { - if (_paraNum != 1) + if (_actionNum != 1) addTimer(0); startAnimTimer("NextPara", 3000); } @@ -135,12 +135,12 @@ bool CTitaniaSpeech::TimerMsg(CTimerMsg *msg) { if (msg->_action == "NextPara") { visibleMsg.execute("TitaniaStillControl"); - ++_paraNum; + ++_actionNum; actMsg.execute(this); } else if (msg->_action == "Para2") { playSound("a#11.wav"); } else { - frameMsg._frameNumber = _frameNum; + frameMsg._frameNumber = _backgroundFrame++; frameMsg.execute("TitaniaStillControl"); } diff --git a/engines/titanic/sound/titania_speech.h b/engines/titanic/sound/titania_speech.h index 2244bb01af..48e0b7bdad 100644 --- a/engines/titanic/sound/titania_speech.h +++ b/engines/titanic/sound/titania_speech.h @@ -36,10 +36,11 @@ class CTitaniaSpeech : public CGameObject { bool TimerMsg(CTimerMsg *msg); bool EnterRoomMsg(CEnterRoomMsg *msg); private: - int _paraNum, _frameNum; + int _actionNum; + int _backgroundFrame; public: CLASSDEF; - CTitaniaSpeech() : CGameObject(), _paraNum(1), _frameNum(0) {} + CTitaniaSpeech() : CGameObject(), _actionNum(1), _backgroundFrame(0) {} /** * Save the data for the class to file diff --git a/engines/titanic/star_control/star_control.cpp b/engines/titanic/star_control/star_control.cpp index dcb004231a..a1c4f33ad2 100644 --- a/engines/titanic/star_control/star_control.cpp +++ b/engines/titanic/star_control/star_control.cpp @@ -133,8 +133,8 @@ void CStarControl::fn1(int action) { // TODO } -bool CStarControl::fn4() { - return _starField.get6(); +bool CStarControl::isSolved() const { + return _starField.isSolved(); } bool CStarControl::canSetStarDestination() const { diff --git a/engines/titanic/star_control/star_control.h b/engines/titanic/star_control/star_control.h index bf964b7cfa..0ee7c6530e 100644 --- a/engines/titanic/star_control/star_control.h +++ b/engines/titanic/star_control/star_control.h @@ -69,7 +69,11 @@ public: virtual void draw(CScreenManager *screenManager); void fn1(int action); - bool fn4(); + + /** + * Returns true if the starfield puzzle has been solved + */ + bool isSolved() const; /** * Returns true if a star destination can be set diff --git a/engines/titanic/star_control/star_field.cpp b/engines/titanic/star_control/star_field.cpp index 0dbc5fd700..7502f84d3d 100644 --- a/engines/titanic/star_control/star_field.cpp +++ b/engines/titanic/star_control/star_field.cpp @@ -26,7 +26,7 @@ namespace Titanic { CStarField::CStarField() : _val1(0), _val2(0), _val3(0), _val4(true), - _val5(0), _val6(false) { + _val5(0), _isSolved(false) { } void CStarField::load(SimpleFile *file) { @@ -36,7 +36,7 @@ void CStarField::load(SimpleFile *file) { _val2 = file->readNumber(); _val3 = file->readNumber(); _val4 = file->readNumber(); - _val6 = file->readNumber(); + _isSolved = file->readNumber(); } void CStarField::save(SimpleFile *file, int indent) { @@ -46,7 +46,7 @@ void CStarField::save(SimpleFile *file, int indent) { file->writeNumberLine(_val2, indent); file->writeNumberLine(_val3, indent); file->writeNumberLine(_val4, indent); - file->writeNumberLine(_val6, indent); + file->writeNumberLine(_isSolved, indent); } bool CStarField::initDocument() { @@ -119,12 +119,12 @@ int CStarField::get5() const { return _val5; } -void CStarField::update6() { - _val6 = _sub8._field8 == 2; +void CStarField::setSolved() { + _isSolved = _sub8._field8 == 2; } -int CStarField::get6() const { - return _val6; +bool CStarField::isSolved() const { + return _isSolved; } } // End of namespace Titanic diff --git a/engines/titanic/star_control/star_field.h b/engines/titanic/star_control/star_field.h index 91cefbb457..41f01894f4 100644 --- a/engines/titanic/star_control/star_field.h +++ b/engines/titanic/star_control/star_field.h @@ -44,7 +44,7 @@ private: int _val3; bool _val4; int _val5; - bool _val6; + bool _isSolved; public: CStarField(); @@ -77,8 +77,16 @@ public: bool set4(bool val); int get88() const; int get5() const; - void update6(); - int get6() const; + + /** + * Sets the flag that the starfield has been solved + */ + void setSolved(); + + /** + * Returns true if the starfield puzzle has been solved + */ + bool isSolved() const; }; } // End of namespace Titanic diff --git a/engines/titanic/support/avi_surface.cpp b/engines/titanic/support/avi_surface.cpp index 42e3618b97..a1dbecbe1c 100644 --- a/engines/titanic/support/avi_surface.cpp +++ b/engines/titanic/support/avi_surface.cpp @@ -284,10 +284,13 @@ void AVISurface::copyMovieFrame(const Graphics::Surface &src, Graphics::ManagedS if (src.format.bytesPerPixel == 1) { // Paletted 8-bit, so convert to 16-bit and copy over - Graphics::Surface *s = src.convertTo(dest.format, _decoder->getPalette()); - dest.blitFrom(*s, copyRect, Common::Point(0, 0)); - s->free(); - delete s; + const byte *palette = _decoder->getPalette(); + if (palette) { + Graphics::Surface *s = src.convertTo(dest.format, palette); + dest.blitFrom(*s, copyRect, Common::Point(0, 0)); + s->free(); + delete s; + } } else if (src.format.bytesPerPixel == 2) { // Source is already 16-bit, with no alpha, so do a straight copy dest.blitFrom(src, copyRect, Common::Point(0, 0)); diff --git a/engines/titanic/support/avi_surface.h b/engines/titanic/support/avi_surface.h index f45db3599e..d3442a12f7 100644 --- a/engines/titanic/support/avi_surface.h +++ b/engines/titanic/support/avi_surface.h @@ -34,8 +34,11 @@ class CSoundManager; class CVideoSurface; enum MovieFlag { - MOVIE_REPEAT = 1, MOVIE_STOP_PREVIOUS = 2, MOVIE_NOTIFY_OBJECT = 4, - MOVIE_REVERSE = 8, MOVIE_GAMESTATE = 0x10 + MOVIE_REPEAT = 1, // Repeat movie + MOVIE_STOP_PREVIOUS = 2, // Stop any prior movie playing on the object + MOVIE_NOTIFY_OBJECT = 4, // Notify the object when the movie finishes + MOVIE_REVERSE = 8, // Play the movie in reverse + MOVIE_WAIT_FOR_FINISH = 0x10 // Let finish before playing next movie for object }; class AVIDecoder : public Video::AVIDecoder { diff --git a/engines/titanic/support/files_manager.cpp b/engines/titanic/support/files_manager.cpp index fc09c5702c..cf706974a7 100644 --- a/engines/titanic/support/files_manager.cpp +++ b/engines/titanic/support/files_manager.cpp @@ -106,7 +106,7 @@ void CFilesManager::loadDrive() { } void CFilesManager::insertCD(CScreenManager *screenManager) { - // We not support running game directly from the original CDs, + // We don't support running the game directly from the original CDs, // so this method can remain stubbed } diff --git a/engines/titanic/true_talk/tt_title_script.cpp b/engines/titanic/true_talk/tt_title_script.cpp index 2effb96cc7..b69318dbe5 100644 --- a/engines/titanic/true_talk/tt_title_script.cpp +++ b/engines/titanic/true_talk/tt_title_script.cpp @@ -24,8 +24,7 @@ namespace Titanic { -TTTitleScript::TTTitleScript() : TTscriptBase(1, "", 0, "", 0, -1, -1, -1, 0), - _field50(0), _field5C(-1), _field60(0) { +TTTitleScript::TTTitleScript() : TTscriptBase(1, "", 0, "", 0, -1, -1, -1, 0) { } } // End of namespace Titanic diff --git a/engines/titanic/true_talk/tt_title_script.h b/engines/titanic/true_talk/tt_title_script.h index f02e591c54..03d1b04ac7 100644 --- a/engines/titanic/true_talk/tt_title_script.h +++ b/engines/titanic/true_talk/tt_title_script.h @@ -29,11 +29,6 @@ namespace Titanic { class TTTitleScript : public TTscriptBase { -private: - int _field50; - TTstring _string1; - int _field5C; - int _field60; public: TTTitleScript(); }; diff --git a/gui/options.cpp b/gui/options.cpp index aa5f7b46bb..53fba2f371 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -136,6 +136,10 @@ OptionsDialog::~OptionsDialog() { } void OptionsDialog::init() { + _enableControlSettings = false; + _onscreenCheckbox = 0; + _touchpadCheckbox = 0; + _swapMenuAndBackBtnsCheckbox = 0; _enableGraphicSettings = false; _gfxPopUp = 0; _gfxPopUpDesc = 0; @@ -202,6 +206,29 @@ void OptionsDialog::build() { _guioptionsString = ConfMan.get("guioptions", _domain); _guioptions = parseGameGUIOptions(_guioptionsString); } + + // Control options + if (g_system->hasFeature(OSystem::kFeatureOnScreenControl)) { + if (ConfMan.hasKey("onscreen_control", _domain)) { + bool onscreenState = g_system->getFeatureState(OSystem::kFeatureOnScreenControl); + if (_onscreenCheckbox != 0) + _onscreenCheckbox->setState(onscreenState); + } + } + if (g_system->hasFeature(OSystem::kFeatureTouchpadMode)) { + if (ConfMan.hasKey("touchpad_mouse_mode", _domain)) { + bool touchpadState = g_system->getFeatureState(OSystem::kFeatureTouchpadMode); + if (_touchpadCheckbox != 0) + _touchpadCheckbox->setState(touchpadState); + } + } + if (g_system->hasFeature(OSystem::kFeatureSwapMenuAndBackButtons)) { + if (ConfMan.hasKey("swap_menu_and_back_buttons", _domain)) { + bool state = g_system->getFeatureState(OSystem::kFeatureSwapMenuAndBackButtons); + if (_swapMenuAndBackBtnsCheckbox != 0) + _swapMenuAndBackBtnsCheckbox->setState(state); + } + } // Graphic options if (_fullscreenCheckbox) { @@ -380,6 +407,25 @@ void OptionsDialog::open() { } void OptionsDialog::apply() { + // Control options + if (_enableControlSettings) { + if (g_system->hasFeature(OSystem::kFeatureOnScreenControl)) { + if (ConfMan.getBool("onscreen_control", _domain) != _onscreenCheckbox->getState()) { + g_system->setFeatureState(OSystem::kFeatureOnScreenControl, _onscreenCheckbox->getState()); + } + } + if (g_system->hasFeature(OSystem::kFeatureTouchpadMode)) { + if (ConfMan.getBool("touchpad_mouse_mode", _domain) != _touchpadCheckbox->getState()) { + g_system->setFeatureState(OSystem::kFeatureTouchpadMode, _touchpadCheckbox->getState()); + } + } + if (g_system->hasFeature(OSystem::kFeatureSwapMenuAndBackButtons)) { + if (ConfMan.getBool("swap_menu_and_back_buttons", _domain) != _swapMenuAndBackBtnsCheckbox->getState()) { + g_system->setFeatureState(OSystem::kFeatureSwapMenuAndBackButtons, _swapMenuAndBackBtnsCheckbox->getState()); + } + } + } + // Graphic options bool graphicsModeChanged = false; if (_fullscreenCheckbox) { @@ -705,7 +751,7 @@ void OptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data Dialog::handleCommand(sender, cmd, data); } } - + void OptionsDialog::setGraphicSettingsState(bool enabled) { _enableGraphicSettings = enabled; @@ -831,6 +877,22 @@ void OptionsDialog::setSubtitleSettingsState(bool enabled) { _subSpeedSlider->setEnabled(ena); _subSpeedLabel->setEnabled(ena); } + + void OptionsDialog::addControlControls(GuiObject *boss, const Common::String &prefix) { + // Show On-Screen control + if (g_system->hasFeature(OSystem::kFeatureOnScreenControl)) + _onscreenCheckbox = new CheckboxWidget(boss, prefix + "grOnScreenCheckbox", _("Show On-screen control")); + + // Touchpad Mouse mode + if (g_system->hasFeature(OSystem::kFeatureTouchpadMode)) + _touchpadCheckbox = new CheckboxWidget(boss, prefix + "grTouchpadCheckbox", _("Touchpad mouse mode")); + + // Swap menu and back buttons + if (g_system->hasFeature(OSystem::kFeatureSwapMenuAndBackButtons)) + _swapMenuAndBackBtnsCheckbox = new CheckboxWidget(boss, prefix + "grSwapMenuAndBackBtnsCheckbox", _("Swap Menu and Back buttons")); + + _enableControlSettings = true; + } void OptionsDialog::addGraphicControls(GuiObject *boss, const Common::String &prefix) { const OSystem::GraphicsMode *gm = g_system->getSupportedGraphicsModes(); @@ -1279,7 +1341,17 @@ GlobalOptionsDialog::~GlobalOptionsDialog() { void GlobalOptionsDialog::build() { // The tab widget TabWidget *tab = new TabWidget(this, "GlobalOptions.TabWidget"); - + + // + // The control tab (currently visible only for AndroidSDL platform, visibility checking by features + // + if (g_system->hasFeature(OSystem::kFeatureTouchpadMode) || + g_system->hasFeature(OSystem::kFeatureOnScreenControl) || + g_system->hasFeature(OSystem::kFeatureSwapMenuAndBackButtons)) { + tab->addTab(_("Control")); + addControlControls(tab, "GlobalOptions_Control."); + } + // // 1) The graphics tab // @@ -2013,7 +2085,7 @@ void GlobalOptionsDialog::reflowLayout() { void GlobalOptionsDialog::setupCloudTab() { int serverLabelPosition = -1; //no override #ifdef USE_LIBCURL - _selectedStorageIndex = _storagePopUp->getSelectedTag(); + _selectedStorageIndex = (_storagePopUp ? _storagePopUp->getSelectedTag() : Cloud::kStorageNoneId); if (_storagePopUpDesc) _storagePopUpDesc->setVisible(true); if (_storagePopUp) _storagePopUp->setVisible(true); diff --git a/gui/options.h b/gui/options.h index 1b15258ab5..6b6cb92378 100644 --- a/gui/options.h +++ b/gui/options.h @@ -86,6 +86,8 @@ protected: virtual void clean(); void rebuild(); + + void addControlControls(GuiObject *boss, const Common::String &prefix); void addGraphicControls(GuiObject *boss, const Common::String &prefix); void addAudioControls(GuiObject *boss, const Common::String &prefix); void addMIDIControls(GuiObject *boss, const Common::String &prefix); @@ -112,6 +114,16 @@ protected: int _pathsTabId; private: + + // + // Control controls + // + bool _enableControlSettings; + + CheckboxWidget *_touchpadCheckbox; + CheckboxWidget *_onscreenCheckbox; + CheckboxWidget *_swapMenuAndBackBtnsCheckbox; + // // Graphics controls // diff --git a/gui/themes/default.inc b/gui/themes/default.inc index a83fd788ad..d8baae8d0e 100644 --- a/gui/themes/default.inc +++ b/gui/themes/default.inc @@ -813,6 +813,19 @@ const char *defaultXML1 = "<?xml version = '1.0'?>" "</layout>" "</layout>" "</dialog>" +"<dialog name='GlobalOptions_Control' overlays='Dialog.GlobalOptions.TabWidget'>" +"<layout type='vertical' padding='16,16,16,16' spacing='8'>" +"<widget name='grOnScreenCheckbox' " +"type='Checkbox' " +"/>" +"<widget name='grTouchpadCheckbox' " +"type='Checkbox' " +"/>" +"<widget name='grSwapMenuAndBackBtnsCheckbox' " +"type='Checkbox' " +"/>" +"</layout>" +"</dialog>" "<dialog name='GlobalOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'>" "<layout type='vertical' padding='16,16,16,16' spacing='8'>" "<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" @@ -2355,6 +2368,19 @@ const char *defaultXML1 = "<?xml version = '1.0'?>" "</layout>" "</layout>" "</dialog>" +"<dialog name='GlobalOptions_Control' overlays='Dialog.GlobalOptions.TabWidget'>" +"<layout type='vertical' padding='16,16,16,16' spacing='6'>" +"<widget name='grOnScreenCheckbox' " +"type='Checkbox' " +"/>" +"<widget name='grTouchpadCheckbox' " +"type='Checkbox' " +"/>" +"<widget name='grSwapMenuAndBackBtnsCheckbox' " +"type='Checkbox' " +"/>" +"</layout>" +"</dialog>" "<dialog name='GlobalOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'>" "<layout type='vertical' padding='16,16,16,16' spacing='8'>" "<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>" diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip Binary files differindex 400b997b93..d90289a4be 100644 --- a/gui/themes/scummclassic.zip +++ b/gui/themes/scummclassic.zip diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx index b3100d4b92..aa91cdb35f 100644 --- a/gui/themes/scummclassic/classic_layout.stx +++ b/gui/themes/scummclassic/classic_layout.stx @@ -237,6 +237,20 @@ </layout> </layout> </dialog> + + <dialog name = 'GlobalOptions_Control' overlays = 'Dialog.GlobalOptions.TabWidget'> + <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> + <widget name = 'grOnScreenCheckbox' + type = 'Checkbox' + /> + <widget name = 'grTouchpadCheckbox' + type = 'Checkbox' + /> + <widget name = 'grSwapMenuAndBackBtnsCheckbox' + type = 'Checkbox' + /> + </layout> + </dialog> <dialog name = 'GlobalOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx index 7879e05a97..c925a39d18 100644 --- a/gui/themes/scummclassic/classic_layout_lowres.stx +++ b/gui/themes/scummclassic/classic_layout_lowres.stx @@ -234,6 +234,20 @@ </layout> </layout> </dialog> + + <dialog name = 'GlobalOptions_Control' overlays = 'Dialog.GlobalOptions.TabWidget'> + <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> + <widget name = 'grOnScreenCheckbox' + type = 'Checkbox' + /> + <widget name = 'grTouchpadCheckbox' + type = 'Checkbox' + /> + <widget name = 'grSwapMenuAndBackBtnsCheckbox' + type = 'Checkbox' + /> + </layout> + </dialog> <dialog name = 'GlobalOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip Binary files differindex 673d67ed87..f10102503e 100644 --- a/gui/themes/scummmodern.zip +++ b/gui/themes/scummmodern.zip diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx index 9cadc11e13..80b913a3a4 100644 --- a/gui/themes/scummmodern/scummmodern_layout.stx +++ b/gui/themes/scummmodern/scummmodern_layout.stx @@ -251,6 +251,20 @@ </layout> </layout> </dialog> + + <dialog name = 'GlobalOptions_Control' overlays = 'Dialog.GlobalOptions.TabWidget'> + <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> + <widget name = 'grOnScreenCheckbox' + type = 'Checkbox' + /> + <widget name = 'grTouchpadCheckbox' + type = 'Checkbox' + /> + <widget name = 'grSwapMenuAndBackBtnsCheckbox' + type = 'Checkbox' + /> + </layout> + </dialog> <dialog name = 'GlobalOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx index 7ef5fc5ee1..308ba44b7e 100644 --- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx +++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx @@ -232,6 +232,20 @@ </layout> </layout> </dialog> + + <dialog name = 'GlobalOptions_Control' overlays = 'Dialog.GlobalOptions.TabWidget'> + <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> + <widget name = 'grOnScreenCheckbox' + type = 'Checkbox' + /> + <widget name = 'grTouchpadCheckbox' + type = 'Checkbox' + /> + <widget name = 'grSwapMenuAndBackBtnsCheckbox' + type = 'Checkbox' + /> + </layout> + </dialog> <dialog name = 'GlobalOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> diff --git a/po/be_BY.po b/po/be_BY.po index a6c12ef5f1..0bda29ea6f 100644 --- a/po/be_BY.po +++ b/po/be_BY.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-02-11 08:56+0100\n" +"POT-Creation-Date: 2017-02-21 23:29+0100\n" "PO-Revision-Date: 2016-12-31 15:15+0000\n" "Last-Translator: Ivan Lukyanov <lid-gr@tut.by>\n" "Language-Team: Belarusian <https://translations.scummvm.org/projects/scummvm/" @@ -59,7 +59,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:1515 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69 +#: gui/options.cpp:1587 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:443 #: gui/saveload-dialog.cpp:717 gui/saveload-dialog.cpp:1111 @@ -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:522 -#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1517 +#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1589 #: gui/saveload-dialog.cpp:1112 engines/engine.cpp:477 engines/engine.cpp:488 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 @@ -241,7 +241,7 @@ msgstr "" "беларускую" #: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:121 -#: gui/options.cpp:845 gui/options.cpp:858 gui/options.cpp:1410 +#: gui/options.cpp:907 gui/options.cpp:920 gui/options.cpp:1482 #: audio/null.cpp:41 msgid "<default>" msgstr "<па змаўчанні>" @@ -264,11 +264,11 @@ msgstr "Платформа:" msgid "Engine" msgstr "Рухавічок" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "Graphics" msgstr "Графіка" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "GFX" msgstr "Грф" @@ -281,7 +281,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Перакрыць глабальныя налады графікі" -#: gui/editgamedialog.cpp:196 gui/options.cpp:1292 +#: gui/editgamedialog.cpp:196 gui/options.cpp:1364 msgid "Audio" msgstr "Аўдыё" @@ -294,11 +294,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Перакрыць глабальныя налады аўдыё" -#: gui/editgamedialog.cpp:210 gui/options.cpp:1297 +#: gui/editgamedialog.cpp:210 gui/options.cpp:1369 msgid "Volume" msgstr "Гучнасць" -#: gui/editgamedialog.cpp:212 gui/options.cpp:1299 +#: gui/editgamedialog.cpp:212 gui/options.cpp:1371 msgctxt "lowres" msgid "Volume" msgstr "Гучнасць" @@ -312,7 +312,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Перакрыць глабальныя налады гучнасці" -#: gui/editgamedialog.cpp:226 gui/options.cpp:1307 +#: gui/editgamedialog.cpp:226 gui/options.cpp:1379 msgid "MIDI" msgstr "MIDI" @@ -325,7 +325,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Перакрыць глабальныя налады MIDI" -#: gui/editgamedialog.cpp:241 gui/options.cpp:1317 +#: gui/editgamedialog.cpp:241 gui/options.cpp:1389 msgid "MT-32" msgstr "MT-32" @@ -338,11 +338,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Перакрыць глабальныя налады MT-32" -#: gui/editgamedialog.cpp:255 gui/options.cpp:1324 +#: gui/editgamedialog.cpp:255 gui/options.cpp:1396 msgid "Paths" msgstr "Шляхі" -#: gui/editgamedialog.cpp:257 gui/options.cpp:1326 +#: gui/editgamedialog.cpp:257 gui/options.cpp:1398 msgctxt "lowres" msgid "Paths" msgstr "Шляхі" @@ -356,7 +356,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Шлях да гульні:" -#: gui/editgamedialog.cpp:271 gui/options.cpp:1350 +#: gui/editgamedialog.cpp:271 gui/options.cpp:1422 msgid "Extra Path:" msgstr "Дад. шлях:" @@ -365,44 +365,44 @@ msgstr "Дад. шлях:" msgid "Specifies path to additional data used by the game" msgstr "Паказвае шлях да дадатковых файлаў, дадзеных для гульні" -#: gui/editgamedialog.cpp:273 gui/options.cpp:1352 +#: gui/editgamedialog.cpp:273 gui/options.cpp:1424 msgctxt "lowres" msgid "Extra Path:" msgstr "Дад. шлях:" -#: gui/editgamedialog.cpp:280 gui/options.cpp:1334 +#: gui/editgamedialog.cpp:280 gui/options.cpp:1406 msgid "Save Path:" msgstr "Захаванні гульняў:" #: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282 -#: gui/editgamedialog.cpp:283 gui/options.cpp:1334 gui/options.cpp:1336 -#: gui/options.cpp:1337 +#: gui/editgamedialog.cpp:283 gui/options.cpp:1406 gui/options.cpp:1408 +#: gui/options.cpp:1409 msgid "Specifies where your saved games are put" msgstr "Паказвае шлях да захаванняў гульні" -#: gui/editgamedialog.cpp:282 gui/options.cpp:1336 +#: gui/editgamedialog.cpp:282 gui/options.cpp:1408 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:1345 -#: gui/options.cpp:1353 gui/options.cpp:1362 gui/options.cpp:1542 -#: gui/options.cpp:1548 gui/options.cpp:1556 gui/options.cpp:1579 -#: gui/options.cpp:1608 gui/options.cpp:1614 gui/options.cpp:1621 -#: gui/options.cpp:1629 gui/options.cpp:1812 gui/options.cpp:1815 -#: gui/options.cpp:1822 gui/options.cpp:1832 +#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1417 +#: gui/options.cpp:1425 gui/options.cpp:1434 gui/options.cpp:1614 +#: gui/options.cpp:1620 gui/options.cpp:1628 gui/options.cpp:1651 +#: gui/options.cpp:1680 gui/options.cpp:1686 gui/options.cpp:1693 +#: gui/options.cpp:1701 gui/options.cpp:1884 gui/options.cpp:1887 +#: gui/options.cpp:1894 gui/options.cpp:1904 msgctxt "path" msgid "None" msgstr "Не зададзены" #: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404 -#: gui/editgamedialog.cpp:522 gui/options.cpp:1536 gui/options.cpp:1602 -#: gui/options.cpp:1818 backends/platform/wii/options.cpp:56 +#: gui/editgamedialog.cpp:522 gui/options.cpp:1608 gui/options.cpp:1674 +#: gui/options.cpp:1890 backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Па змаўчанні" -#: gui/editgamedialog.cpp:450 gui/options.cpp:1826 +#: gui/editgamedialog.cpp:450 gui/options.cpp:1898 msgid "Select SoundFont" msgstr "Абярыце SoundFont" @@ -410,7 +410,7 @@ msgstr "Абярыце SoundFont" msgid "Select additional game directory" msgstr "Абярыце дадатковую дырэкторыю гульні" -#: gui/editgamedialog.cpp:502 gui/options.cpp:1749 +#: gui/editgamedialog.cpp:502 gui/options.cpp:1821 msgid "Select directory for saved games" msgstr "Абярыце дырэкторыю для захаванняў" @@ -503,7 +503,7 @@ msgstr "Сінусоіда" msgid "Triangle" msgstr "Трохкутная" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1370 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1442 msgid "Misc" msgstr "Рознае" @@ -821,104 +821,117 @@ msgstr "44 кГц" msgid "48 kHz" msgstr "48 кГц" -#: gui/options.cpp:289 gui/options.cpp:552 gui/options.cpp:690 -#: gui/options.cpp:759 gui/options.cpp:970 +#: gui/options.cpp:316 gui/options.cpp:598 gui/options.cpp:736 +#: gui/options.cpp:805 gui/options.cpp:1032 msgctxt "soundfont" msgid "None" msgstr "Не зададзены" -#: gui/options.cpp:456 +#: gui/options.cpp:502 msgid "Failed to apply some of the graphic options changes:" msgstr "Не атрымалася ўжыць змены некаторых графічных налад:" -#: gui/options.cpp:468 +#: gui/options.cpp:514 msgid "the video mode could not be changed." msgstr "відэарэжым не можа быць зменены." -#: gui/options.cpp:474 +#: gui/options.cpp:520 msgid "the aspect ratio setting could not be changed" msgstr "рэжым карэктыроўкі суадносін бакоў не можа быць зменены" -#: gui/options.cpp:480 +#: gui/options.cpp:526 msgid "the fullscreen setting could not be changed" msgstr "поўнаэкранны рэжым не можа быць зменены" -#: gui/options.cpp:486 +#: gui/options.cpp:532 msgid "the filtering setting could not be changed" msgstr "рэжым фільтравання не можа быць зменены" -#: gui/options.cpp:842 +#: gui/options.cpp:884 +msgid "Show On-screen control" +msgstr "" + +#: gui/options.cpp:888 +#, fuzzy +msgid "Touchpad mouse mode" +msgstr "Рэжым тачпада выключаны." + +#: gui/options.cpp:892 +msgid "Swap Menu and Back buttons" +msgstr "" + +#: gui/options.cpp:904 msgid "Graphics mode:" msgstr "Граф. рэжым:" -#: gui/options.cpp:856 +#: gui/options.cpp:918 msgid "Render mode:" msgstr "Рэжым растру:" -#: gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:918 gui/options.cpp:919 msgid "Special dithering modes supported by some games" msgstr "Спецыяльныя рэжымы рэндэрынгу, падтрымоўваныя некаторымі гульнямі" -#: gui/options.cpp:868 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 +#: gui/options.cpp:930 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2460 msgid "Fullscreen mode" msgstr "Поўнаэкранны рэжым" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Filter graphics" msgstr "Фільтраванне графікі" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Use linear filtering when scaling graphics" msgstr "Выкарыстоўваць лінейную фільтрацыю для павелічэння адрознення" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Aspect ratio correction" msgstr "Карэкцыя суадносін бакоў" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Correct aspect ratio for 320x200 games" msgstr "Карэктаваць суадносіны бакоў для гульняў з адрозненнем 320x200" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Preferred Device:" msgstr "Упадабаная прылада:" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Music Device:" msgstr "Гукавая прылада:" -#: gui/options.cpp:882 gui/options.cpp:884 +#: gui/options.cpp:944 gui/options.cpp:946 msgid "Specifies preferred sound device or sound card emulator" msgstr "Зазначае ўпадабаную гукавую прыладу ці эмулятар гукавой карты" -#: gui/options.cpp:882 gui/options.cpp:884 gui/options.cpp:885 +#: gui/options.cpp:944 gui/options.cpp:946 gui/options.cpp:947 msgid "Specifies output sound device or sound card emulator" msgstr "Зазначае выходную гукавую прыладу ці эмулятар гукавой карты" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Упадабаная:" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Music Device:" msgstr "Гукавая прылада:" -#: gui/options.cpp:911 +#: gui/options.cpp:973 msgid "AdLib emulator:" msgstr "Эмулятар AdLib:" -#: gui/options.cpp:911 gui/options.cpp:912 +#: gui/options.cpp:973 gui/options.cpp:974 msgid "AdLib is used for music in many games" msgstr "Гукавая карта AdLib выкарыстоўваецца многімі гульнямі" -#: gui/options.cpp:922 +#: gui/options.cpp:984 msgid "Output rate:" msgstr "Чашчыня гуку:" -#: gui/options.cpp:922 gui/options.cpp:923 +#: gui/options.cpp:984 gui/options.cpp:985 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -926,64 +939,64 @@ msgstr "" "Большыя значэнні задаюць лепшую якасць гуку, аднак яны могуць не " "падтрымлівацца вашай гукавой картай" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "GM Device:" msgstr "Прылада GM:" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "Specifies default sound device for General MIDI output" msgstr "Зазначае выходную гукавую прыладу для MIDI" -#: gui/options.cpp:944 +#: gui/options.cpp:1006 msgid "Don't use General MIDI music" msgstr "Не выкарыстоўваць музыку для General MIDI" -#: gui/options.cpp:955 gui/options.cpp:1017 +#: gui/options.cpp:1017 gui/options.cpp:1079 msgid "Use first available device" msgstr "Выкарыстоўваць першую даступную прыладу" -#: gui/options.cpp:967 +#: gui/options.cpp:1029 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:967 gui/options.cpp:969 gui/options.cpp:970 +#: gui/options.cpp:1029 gui/options.cpp:1031 gui/options.cpp:1032 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "" "SoundFont'ы падтрымліваюцца некаторымі гукавымі картамі, FluidSynth ды " "Timidity" -#: gui/options.cpp:969 +#: gui/options.cpp:1031 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Mixed AdLib/MIDI mode" msgstr "Змешаны рэжым AdLib/MIDI" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Use both MIDI and AdLib sound generation" msgstr "Выкарыстоўваць і MIDI, і AdLib для генерацыі гуку" -#: gui/options.cpp:978 +#: gui/options.cpp:1040 msgid "MIDI gain:" msgstr "Узмацненне MIDI:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "MT-32 Device:" msgstr "Нал. MT-32:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Паказвае гукавую прыладу па змаўчанні для вываду на Roland MT-32/LAPC1/CM32l/" "CM64" -#: gui/options.cpp:993 +#: gui/options.cpp:1055 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Сапраўдны Roland MT-32 (забараніць эмуляцыю GM)" -#: gui/options.cpp:993 gui/options.cpp:995 +#: gui/options.cpp:1055 gui/options.cpp:1057 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -991,16 +1004,16 @@ msgstr "" "Адзначце, калі ў вас падключана Roland-сумяшчальная гукавая прылада і вы " "жадаеце яе выкарыстоўваць" -#: gui/options.cpp:995 +#: gui/options.cpp:1057 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Сапраўдны Roland MT-32 (без эмуляцыі GM)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Рэжым Roland GS (дазволіць мапінг MT-32)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -1008,265 +1021,270 @@ msgstr "" "Адзначце, калі жадаеце дазволіць мапінг для эмуляцыі MT-32 на прыладзе " "Rolans GS" -#: gui/options.cpp:1007 +#: gui/options.cpp:1069 msgid "Don't use Roland MT-32 music" msgstr "Не выкарыстоўваць музыку для MT-32" -#: gui/options.cpp:1034 +#: gui/options.cpp:1096 msgid "Text and Speech:" msgstr "Тэкст і агучка:" -#: gui/options.cpp:1038 gui/options.cpp:1048 +#: gui/options.cpp:1100 gui/options.cpp:1110 msgid "Speech" msgstr "Агучка" -#: gui/options.cpp:1039 gui/options.cpp:1049 +#: gui/options.cpp:1101 gui/options.cpp:1111 msgid "Subtitles" msgstr "Субтытры" -#: gui/options.cpp:1040 +#: gui/options.cpp:1102 msgid "Both" msgstr "Абое" -#: gui/options.cpp:1042 +#: gui/options.cpp:1104 msgid "Subtitle speed:" msgstr "Хуткасць тытраў:" -#: gui/options.cpp:1044 +#: gui/options.cpp:1106 msgctxt "lowres" msgid "Text and Speech:" msgstr "Тэкст і агучка:" -#: gui/options.cpp:1048 +#: gui/options.cpp:1110 msgid "Spch" msgstr "Агуч" -#: gui/options.cpp:1049 +#: gui/options.cpp:1111 msgid "Subs" msgstr "Суб" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgctxt "lowres" msgid "Both" msgstr "Абое" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgid "Show subtitles and play speech" msgstr "Паказваць субтытры і прайграваць гаворку" -#: gui/options.cpp:1052 +#: gui/options.cpp:1114 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Хуткасць тытраў:" -#: gui/options.cpp:1068 +#: gui/options.cpp:1130 msgid "Music volume:" msgstr "Гучн. музыкі:" -#: gui/options.cpp:1070 +#: gui/options.cpp:1132 msgctxt "lowres" msgid "Music volume:" msgstr "Гучн. музыкі:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1139 msgid "Mute All" msgstr "Выкл. усё" -#: gui/options.cpp:1080 +#: gui/options.cpp:1142 msgid "SFX volume:" msgstr "Гучнасць SFX:" -#: gui/options.cpp:1080 gui/options.cpp:1082 gui/options.cpp:1083 +#: gui/options.cpp:1142 gui/options.cpp:1144 gui/options.cpp:1145 msgid "Special sound effects volume" msgstr "Гучнасць спецыяльных гукавых эфектаў" -#: gui/options.cpp:1082 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "SFX volume:" msgstr "Гучнасць SFX:" -#: gui/options.cpp:1090 +#: gui/options.cpp:1152 msgid "Speech volume:" msgstr "Гучн. агучкі:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1154 msgctxt "lowres" msgid "Speech volume:" msgstr "Гучн. агучкі:" -#: gui/options.cpp:1311 +#: gui/options.cpp:1351 +#, fuzzy +msgid "Control" +msgstr "Кіраванне мышшу" + +#: gui/options.cpp:1383 msgid "FluidSynth Settings" msgstr "Налады FluidSynth" -#: gui/options.cpp:1342 +#: gui/options.cpp:1414 msgid "Theme Path:" msgstr "Шлях да тэм:" -#: gui/options.cpp:1344 +#: gui/options.cpp:1416 msgctxt "lowres" msgid "Theme Path:" msgstr "Шлях да тэм:" -#: gui/options.cpp:1350 gui/options.cpp:1352 gui/options.cpp:1353 +#: gui/options.cpp:1422 gui/options.cpp:1424 gui/options.cpp:1425 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Паказвае шлях да дадатковых файлаў дадзеных, выкарыстоўваных усімі гульнямі " "або ScummVM" -#: gui/options.cpp:1359 +#: gui/options.cpp:1431 msgid "Plugins Path:" msgstr "Шлях да плагінаў:" -#: gui/options.cpp:1361 +#: gui/options.cpp:1433 msgctxt "lowres" msgid "Plugins Path:" msgstr "Шлях да плагінаў:" -#: gui/options.cpp:1372 +#: gui/options.cpp:1444 msgctxt "lowres" msgid "Misc" msgstr "Рознае" -#: gui/options.cpp:1374 +#: gui/options.cpp:1446 msgid "Theme:" msgstr "Тэма:" -#: gui/options.cpp:1378 +#: gui/options.cpp:1450 msgid "GUI Renderer:" msgstr "Малявалка GUI:" -#: gui/options.cpp:1390 +#: gui/options.cpp:1462 msgid "Autosave:" msgstr "Аўтазахаванне:" -#: gui/options.cpp:1392 +#: gui/options.cpp:1464 msgctxt "lowres" msgid "Autosave:" msgstr "Аўтазахаванне:" -#: gui/options.cpp:1400 +#: gui/options.cpp:1472 msgid "Keys" msgstr "Клавішы" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "GUI Language:" msgstr "Мова GUI:" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "Language of ScummVM GUI" msgstr "Мова графічнага інтэрфейсу ScummVM" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "Update check:" msgstr "Правяраць абнаўленні:" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "How often to check ScummVM updates" msgstr "Як часта правяраць абнаўленні ScummVM" -#: gui/options.cpp:1447 +#: gui/options.cpp:1519 msgid "Check now" msgstr "Праверыць цяпер" -#: gui/options.cpp:1455 +#: gui/options.cpp:1527 msgid "Cloud" msgstr "Воблака" -#: gui/options.cpp:1457 +#: gui/options.cpp:1529 msgctxt "lowres" msgid "Cloud" msgstr "Воблака" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Storage:" msgstr "Воблака:" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Active cloud storage" msgstr "Актыўнае воблачнае сховішча" -#: gui/options.cpp:1469 gui/options.cpp:2026 +#: gui/options.cpp:1541 gui/options.cpp:2098 msgid "<none>" msgstr "<няма>" -#: gui/options.cpp:1473 backends/platform/wii/options.cpp:114 +#: gui/options.cpp:1545 backends/platform/wii/options.cpp:114 msgid "Username:" msgstr "Карыстач:" -#: gui/options.cpp:1473 +#: gui/options.cpp:1545 msgid "Username used by this storage" msgstr "Імя карыстача ў гэтым воблаку" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Used space:" msgstr "Карыстаны аб'ём:" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Space used by ScummVM's saved games on this storage" msgstr "Аб'ём, заняты захаваннямі гульняў ScummVM на гэтым воблаку" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "Last sync time:" msgstr "Апошняя сінхранізацыя:" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "When the last saved games sync for this storage occured" msgstr "Калі рабілася апошняя сінхранізацыя з гэтым воблакам" -#: gui/options.cpp:1482 gui/storagewizarddialog.cpp:71 +#: gui/options.cpp:1554 gui/storagewizarddialog.cpp:71 msgid "Connect" msgstr "Далучыць" -#: gui/options.cpp:1482 +#: gui/options.cpp:1554 msgid "Open wizard dialog to connect your cloud storage account" msgstr "Адкрывае дыялог для налады далучэння да воблака" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh" msgstr "Абнавіць" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh current cloud storage information (username and usage)" msgstr "Абнаўляе бягучую інфармацыю пра воблака (імя карыстача і аб'ём)" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Download" msgstr "Загрузіць" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Open downloads manager dialog" msgstr "Адкрывае менеджар загрузак" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run server" msgstr "Запусціць сервер" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run local webserver" msgstr "Запускае лакальны вэб-сервер" -#: gui/options.cpp:1487 gui/options.cpp:2136 +#: gui/options.cpp:1559 gui/options.cpp:2208 msgid "Not running" msgstr "Не запушчаны" -#: gui/options.cpp:1491 +#: gui/options.cpp:1563 msgid "/root/ Path:" msgstr "Каранёвая дырэкторыя:" -#: gui/options.cpp:1491 gui/options.cpp:1493 gui/options.cpp:1494 +#: gui/options.cpp:1563 gui/options.cpp:1565 gui/options.cpp:1566 msgid "Specifies which directory the Files Manager can access" msgstr "Паказвае шлях да дырэкторыі, куды будзе мець доступ Менеджар файлаў" -#: gui/options.cpp:1493 +#: gui/options.cpp:1565 msgctxt "lowres" msgid "/root/ Path:" msgstr "Корань:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "Server's port:" msgstr "Порт сервера:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "" "Which port is used by the server\n" "Auth with server is not available with non-default port" @@ -1274,19 +1292,19 @@ msgstr "" "Нумар порта, выкарыстоўваны серверам\n" "Усталяванне доступу працуе толькі з портам па змаўчанні" -#: gui/options.cpp:1516 +#: gui/options.cpp:1588 msgid "Apply" msgstr "Ужыць" -#: gui/options.cpp:1682 +#: gui/options.cpp:1754 msgid "Failed to change cloud storage!" msgstr "Не атрымалася змяніць воблака!" -#: gui/options.cpp:1685 +#: gui/options.cpp:1757 msgid "Another cloud storage is already active." msgstr "Ужо актыўна іншае воблачнае сховішча." -#: gui/options.cpp:1721 +#: gui/options.cpp:1793 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1294,48 +1312,48 @@ msgstr "" "Тэма, абраная вамі, не падтрымлівае бягучую мову. Калі вы жадаеце " "выкарыстоўваць гэтую тэму, вам неабходна спачатку пераключыцца на іншую мову." -#: gui/options.cpp:1756 +#: gui/options.cpp:1828 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Не магу пісаць у абраную дырэкторыю. Калі ласка, азначце іншую." -#: gui/options.cpp:1765 +#: gui/options.cpp:1837 msgid "Select directory for GUI themes" msgstr "Абярыце дырэкторыю для тэм GUI" -#: gui/options.cpp:1775 +#: gui/options.cpp:1847 msgid "Select directory for extra files" msgstr "Абярыце дырэкторыю з дадатковымі файламі" -#: gui/options.cpp:1786 +#: gui/options.cpp:1858 msgid "Select directory for plugins" msgstr "Абярыце дырэкторыю з плагінамі" -#: gui/options.cpp:1798 +#: gui/options.cpp:1870 msgid "Select directory for Files Manager /root/" msgstr "Абярыце дырэкторыю для кораня ў Менеджары файлаў" -#: gui/options.cpp:2033 +#: gui/options.cpp:2105 #, c-format msgid "%llu bytes" msgstr "%llu байтаў" -#: gui/options.cpp:2041 +#: gui/options.cpp:2113 msgid "<right now>" msgstr "<зараз>" -#: gui/options.cpp:2043 +#: gui/options.cpp:2115 msgid "<never>" msgstr "<ніколі>" -#: gui/options.cpp:2127 +#: gui/options.cpp:2199 msgid "Stop server" msgstr "Спыніць сервер" -#: gui/options.cpp:2128 +#: gui/options.cpp:2200 msgid "Stop local webserver" msgstr "Спыняе лакальны вэб-сервер" -#: gui/options.cpp:2219 +#: gui/options.cpp:2291 msgid "" "Request failed.\n" "Check your Internet connection." diff --git a/po/ca_ES.po b/po/ca_ES.po index 92b88c0344..6cbd4bc0c6 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.6.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n" -"POT-Creation-Date: 2017-02-11 08:56+0100\n" -"PO-Revision-Date: 2016-12-04 15:46+0000\n" +"POT-Creation-Date: 2017-02-21 23:29+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/" "scummvm/ca/>\n" @@ -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:1515 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69 +#: gui/options.cpp:1587 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:443 #: gui/saveload-dialog.cpp:717 gui/saveload-dialog.cpp:1111 @@ -79,9 +79,8 @@ msgid "Choose" msgstr "Escull" #: gui/downloaddialog.cpp:48 -#, fuzzy msgid "Select directory where to download game data" -msgstr "Seleccioneu el directori amb les dades del joc" +msgstr "Seleccioneu el directori on descarregar les dades del joc" #: gui/downloaddialog.cpp:49 gui/editgamedialog.cpp:470 gui/launcher.cpp:197 msgid "Select directory with game data" @@ -89,30 +88,32 @@ msgstr "Seleccioneu el directori amb les dades del joc" #: gui/downloaddialog.cpp:51 gui/downloaddialog.cpp:263 msgid "From: " -msgstr "" +msgstr "Des de: " #: gui/downloaddialog.cpp:52 gui/downloaddialog.cpp:264 msgid "To: " -msgstr "" +msgstr "Fins: " #: gui/downloaddialog.cpp:63 msgid "Cancel download" -msgstr "" +msgstr "CancelЗlar descрrrega" #: gui/downloaddialog.cpp:65 msgctxt "lowres" msgid "Cancel download" -msgstr "" +msgstr "CancelЗlar descрrrega" #: gui/downloaddialog.cpp:67 msgid "Hide" -msgstr "" +msgstr "Amagar" #: gui/downloaddialog.cpp:117 msgid "" "It looks like your connection is limited. Do you really want to download " "files with it?" msgstr "" +"Sembla que estрs utilitzant una connexiѓ limitada. Estрs segur que vols " +"descarregar els arxius?" #: gui/downloaddialog.cpp:118 gui/downloaddialog.cpp:152 #: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217 @@ -149,10 +150,12 @@ msgid "" "Cannot create a directory to download - the specified directory has a file " "with the same name." msgstr "" +"No s'ha pogut crear un directori per la descрrrega. El directori contщ un " +"arxiu amb el mateix nom." #: gui/downloaddialog.cpp:146 gui/editgamedialog.cpp:293 #: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:522 -#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1517 +#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1589 #: gui/saveload-dialog.cpp:1112 engines/engine.cpp:477 engines/engine.cpp:488 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 @@ -176,16 +179,18 @@ msgid "" "The \"%s\" already exists in the specified directory.\n" "Do you really want to download files into that directory?" msgstr "" +"Ja existeix un directori %s a la ruta especificada.\n" +"Estрs segur que vols descarregar els arxius dins d'aquest directori?" #: gui/downloaddialog.cpp:251 #, c-format msgid "Downloaded %s %s / %s %s" -msgstr "" +msgstr "Descarregat: %s %s / %s %s" #: gui/downloaddialog.cpp:258 -#, fuzzy, c-format +#, c-format msgid "Download speed: %s %s" -msgstr "S'ha acabat la cerca!" +msgstr "Velocitat de descрrrega: %s %s" #: gui/editgamedialog.cpp:132 msgid "Game" @@ -236,7 +241,7 @@ msgstr "" "Anglшs" #: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:121 -#: gui/options.cpp:845 gui/options.cpp:858 gui/options.cpp:1410 +#: gui/options.cpp:907 gui/options.cpp:920 gui/options.cpp:1482 #: audio/null.cpp:41 msgid "<default>" msgstr "<per defecte>" @@ -259,11 +264,11 @@ msgstr "Platafor.:" msgid "Engine" msgstr "Motor" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "Graphics" msgstr "Grрfics" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "GFX" msgstr "GFX" @@ -276,7 +281,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Canviar les opcions de grрfics" -#: gui/editgamedialog.cpp:196 gui/options.cpp:1292 +#: gui/editgamedialog.cpp:196 gui/options.cpp:1364 msgid "Audio" msgstr "Рudio" @@ -289,11 +294,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Canviar les opcions d'рudio" -#: gui/editgamedialog.cpp:210 gui/options.cpp:1297 +#: gui/editgamedialog.cpp:210 gui/options.cpp:1369 msgid "Volume" msgstr "Volum" -#: gui/editgamedialog.cpp:212 gui/options.cpp:1299 +#: gui/editgamedialog.cpp:212 gui/options.cpp:1371 msgctxt "lowres" msgid "Volume" msgstr "Volum" @@ -307,7 +312,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Canviar les opcions de volum" -#: gui/editgamedialog.cpp:226 gui/options.cpp:1307 +#: gui/editgamedialog.cpp:226 gui/options.cpp:1379 msgid "MIDI" msgstr "MIDI" @@ -320,7 +325,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Canviar les opcions de MIDI" -#: gui/editgamedialog.cpp:241 gui/options.cpp:1317 +#: gui/editgamedialog.cpp:241 gui/options.cpp:1389 msgid "MT-32" msgstr "MT-32" @@ -333,11 +338,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Canviar les opcions de MT-32" -#: gui/editgamedialog.cpp:255 gui/options.cpp:1324 +#: gui/editgamedialog.cpp:255 gui/options.cpp:1396 msgid "Paths" msgstr "Camins" -#: gui/editgamedialog.cpp:257 gui/options.cpp:1326 +#: gui/editgamedialog.cpp:257 gui/options.cpp:1398 msgctxt "lowres" msgid "Paths" msgstr "Camins" @@ -351,7 +356,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Camэ joc:" -#: gui/editgamedialog.cpp:271 gui/options.cpp:1350 +#: gui/editgamedialog.cpp:271 gui/options.cpp:1422 msgid "Extra Path:" msgstr "Camэ extra:" @@ -360,44 +365,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:1352 +#: gui/editgamedialog.cpp:273 gui/options.cpp:1424 msgctxt "lowres" msgid "Extra Path:" msgstr "Camэ extra:" -#: gui/editgamedialog.cpp:280 gui/options.cpp:1334 +#: gui/editgamedialog.cpp:280 gui/options.cpp:1406 msgid "Save Path:" msgstr "Camэ de partides:" #: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282 -#: gui/editgamedialog.cpp:283 gui/options.cpp:1334 gui/options.cpp:1336 -#: gui/options.cpp:1337 +#: gui/editgamedialog.cpp:283 gui/options.cpp:1406 gui/options.cpp:1408 +#: gui/options.cpp:1409 msgid "Specifies where your saved games are put" msgstr "Especifica on es desaran les partides" -#: gui/editgamedialog.cpp:282 gui/options.cpp:1336 +#: gui/editgamedialog.cpp:282 gui/options.cpp:1408 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:1345 -#: gui/options.cpp:1353 gui/options.cpp:1362 gui/options.cpp:1542 -#: gui/options.cpp:1548 gui/options.cpp:1556 gui/options.cpp:1579 -#: gui/options.cpp:1608 gui/options.cpp:1614 gui/options.cpp:1621 -#: gui/options.cpp:1629 gui/options.cpp:1812 gui/options.cpp:1815 -#: gui/options.cpp:1822 gui/options.cpp:1832 +#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1417 +#: gui/options.cpp:1425 gui/options.cpp:1434 gui/options.cpp:1614 +#: gui/options.cpp:1620 gui/options.cpp:1628 gui/options.cpp:1651 +#: gui/options.cpp:1680 gui/options.cpp:1686 gui/options.cpp:1693 +#: gui/options.cpp:1701 gui/options.cpp:1884 gui/options.cpp:1887 +#: gui/options.cpp:1894 gui/options.cpp:1904 msgctxt "path" msgid "None" msgstr "Cap" #: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404 -#: gui/editgamedialog.cpp:522 gui/options.cpp:1536 gui/options.cpp:1602 -#: gui/options.cpp:1818 backends/platform/wii/options.cpp:56 +#: gui/editgamedialog.cpp:522 gui/options.cpp:1608 gui/options.cpp:1674 +#: gui/options.cpp:1890 backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Per defecte" -#: gui/editgamedialog.cpp:450 gui/options.cpp:1826 +#: gui/editgamedialog.cpp:450 gui/options.cpp:1898 msgid "Select SoundFont" msgstr "Seleccioneu el fitxer SoundFont" @@ -405,7 +410,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:1749 +#: gui/editgamedialog.cpp:502 gui/options.cpp:1821 msgid "Select directory for saved games" msgstr "Seleccioneu el directori de les partides desades" @@ -422,28 +427,27 @@ msgstr "" #: gui/editrecorddialog.cpp:58 msgid "Author:" -msgstr "" +msgstr "Autor:" #: gui/editrecorddialog.cpp:60 msgid "Notes:" -msgstr "" +msgstr "Notes:" #: gui/editrecorddialog.cpp:68 gui/predictivedialog.cpp:74 msgid "Ok" -msgstr "" +msgstr "Acceptar" #: gui/filebrowser-dialog.cpp:49 msgid "Choose file for loading" -msgstr "" +msgstr "Tria l'arxiu a carregar" #: gui/filebrowser-dialog.cpp:49 msgid "Enter filename for saving" msgstr "" #: gui/filebrowser-dialog.cpp:132 -#, fuzzy msgid "Do you really want to overwrite the file?" -msgstr "Realment voleu suprimir aquesta partida?" +msgstr "Realment vols sobreescriure aquest arxiu?" #: gui/fluidsynth-dialog.cpp:68 msgid "Reverb" @@ -497,7 +501,7 @@ msgstr "Sinus" msgid "Triangle" msgstr "Triangle" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1370 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1442 msgid "Misc" msgstr "Misc" @@ -711,9 +715,8 @@ msgid "Do you really want to remove this game configuration?" msgstr "Realment voleu suprimir la configuraciѓ d'aquest joc?" #: gui/launcher.cpp:473 -#, fuzzy msgid "Do you want to load saved game?" -msgstr "Voleu carregar o desar el joc?" +msgstr "Desitges carregar la partida guardada?" #: gui/launcher.cpp:522 msgid "This game does not support loading games from the launcher." @@ -773,14 +776,12 @@ msgid "Edit record description" msgstr "" #: gui/onscreendialog.cpp:108 -#, fuzzy msgid "Switch to Game" -msgstr "Commuta" +msgstr "Tornar al joc" #: gui/onscreendialog.cpp:110 -#, fuzzy msgid "Fast replay" -msgstr "Mode rрpid" +msgstr "Repeticiѓ rрpida" #: gui/options.cpp:119 common/updates.cpp:56 msgid "Never" @@ -822,106 +823,117 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:289 gui/options.cpp:552 gui/options.cpp:690 -#: gui/options.cpp:759 gui/options.cpp:970 +#: gui/options.cpp:316 gui/options.cpp:598 gui/options.cpp:736 +#: gui/options.cpp:805 gui/options.cpp:1032 msgctxt "soundfont" msgid "None" msgstr "Cap" -#: gui/options.cpp:456 +#: gui/options.cpp:502 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:468 +#: gui/options.cpp:514 msgid "the video mode could not be changed." msgstr "no s'ha pogut canviar el mode de vэdeo." -#: gui/options.cpp:474 +#: gui/options.cpp:520 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:480 +#: gui/options.cpp:526 msgid "the fullscreen setting could not be changed" msgstr "no s'ha pogut canviar l'ajust de pantalla completa" -#: gui/options.cpp:486 -#, fuzzy +#: gui/options.cpp:532 msgid "the filtering setting could not be changed" -msgstr "no s'ha pogut canviar l'ajust de pantalla completa" +msgstr "no s'han pogut canviar els ajustes de filtratge" + +#: gui/options.cpp:884 +msgid "Show On-screen control" +msgstr "" + +#: gui/options.cpp:888 +#, fuzzy +msgid "Touchpad mouse mode" +msgstr "Mode Touchpad desactivat." -#: gui/options.cpp:842 +#: gui/options.cpp:892 +msgid "Swap Menu and Back buttons" +msgstr "" + +#: gui/options.cpp:904 msgid "Graphics mode:" msgstr "Mode grрfic:" -#: gui/options.cpp:856 +#: gui/options.cpp:918 msgid "Render mode:" msgstr "Mode de pintat:" -#: gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:918 gui/options.cpp:919 msgid "Special dithering modes supported by some games" msgstr "Modes de tramat especials suportats per alguns jocs" -#: gui/options.cpp:868 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 +#: gui/options.cpp:930 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2460 msgid "Fullscreen mode" msgstr "Mode pantalla completa" -#: gui/options.cpp:871 -#, fuzzy +#: gui/options.cpp:933 msgid "Filter graphics" -msgstr "Grрfics" +msgstr "Filtres de grрfics" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Use linear filtering when scaling graphics" msgstr "" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Aspect ratio correction" msgstr "Correcciѓ de la relaciѓ d'aspecte" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Correct aspect ratio for 320x200 games" msgstr "Corregeix la relaciѓ d'aspecte per jocs de 320x200" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Preferred Device:" msgstr "Disp. preferit:" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:882 gui/options.cpp:884 +#: gui/options.cpp:944 gui/options.cpp:946 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:882 gui/options.cpp:884 gui/options.cpp:885 +#: gui/options.cpp:944 gui/options.cpp:946 gui/options.cpp:947 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:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Disp. preferit:" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:911 +#: gui/options.cpp:973 msgid "AdLib emulator:" msgstr "Emulador AdLib:" -#: gui/options.cpp:911 gui/options.cpp:912 +#: gui/options.cpp:973 gui/options.cpp:974 msgid "AdLib is used for music in many games" msgstr "AdLib s'utilitza per la mњsica de molts jocs" -#: gui/options.cpp:922 +#: gui/options.cpp:984 msgid "Output rate:" msgstr "Freq. sortida:" -#: gui/options.cpp:922 gui/options.cpp:923 +#: gui/options.cpp:984 gui/options.cpp:985 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -929,63 +941,63 @@ msgstr "" "Valors mщs alts especifiquen millor qualitat de so perђ pot ser que la " "vostra tarja de so no ho suporti" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "GM Device:" msgstr "Dispositiu GM:" -#: gui/options.cpp:933 +#: gui/options.cpp:995 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:944 +#: gui/options.cpp:1006 msgid "Don't use General MIDI music" msgstr "No utilitzis mњsica General MIDI" -#: gui/options.cpp:955 gui/options.cpp:1017 +#: gui/options.cpp:1017 gui/options.cpp:1079 msgid "Use first available device" msgstr "Utilitza el primer dispositiu disponible" -#: gui/options.cpp:967 +#: gui/options.cpp:1029 msgid "SoundFont:" msgstr "Fitxer SoundFont:" -#: gui/options.cpp:967 gui/options.cpp:969 gui/options.cpp:970 +#: gui/options.cpp:1029 gui/options.cpp:1031 gui/options.cpp:1032 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "Algunes targes de so, FluidSynth i Timidity suporten SoundFont" -#: gui/options.cpp:969 +#: gui/options.cpp:1031 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Mixed AdLib/MIDI mode" msgstr "Mode combinat AdLib/MIDI" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Use both MIDI and AdLib sound generation" msgstr "Utilitza MIDI i la generaciѓ de so AdLib alhora" -#: gui/options.cpp:978 +#: gui/options.cpp:1040 msgid "MIDI gain:" msgstr "Guany MIDI:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "MT-32 Device:" msgstr "Disposit. MT-32:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 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:993 +#: gui/options.cpp:1055 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 real (desactiva l'emulaciѓ GM)" -#: gui/options.cpp:993 gui/options.cpp:995 +#: gui/options.cpp:1055 gui/options.cpp:1057 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -993,306 +1005,303 @@ msgstr "" "Marqueu si voleu utilitzar el vostre dispositiu hardware real de so " "compatible amb Roland connectat al vostre ordinador" -#: gui/options.cpp:995 +#: gui/options.cpp:1057 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 real (sense emulaciѓ GM)" -#: gui/options.cpp:998 -#, fuzzy +#: gui/options.cpp:1060 msgid "Roland GS Device (enable MT-32 mappings)" -msgstr "Mode Roland GS (desactiva el mapeig GM)" +msgstr "Dispositiu Roland GS (activar conversiѓ MT-32)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" msgstr "" -#: gui/options.cpp:1007 +#: gui/options.cpp:1069 msgid "Don't use Roland MT-32 music" msgstr "No utilitzis mњsica de Roland MT-32" -#: gui/options.cpp:1034 +#: gui/options.cpp:1096 msgid "Text and Speech:" msgstr "Text i Veus:" -#: gui/options.cpp:1038 gui/options.cpp:1048 +#: gui/options.cpp:1100 gui/options.cpp:1110 msgid "Speech" msgstr "Veus" -#: gui/options.cpp:1039 gui/options.cpp:1049 +#: gui/options.cpp:1101 gui/options.cpp:1111 msgid "Subtitles" msgstr "Subtэtols" -#: gui/options.cpp:1040 +#: gui/options.cpp:1102 msgid "Both" msgstr "Ambdѓs" -#: gui/options.cpp:1042 +#: gui/options.cpp:1104 msgid "Subtitle speed:" msgstr "Velocitat de subt.:" -#: gui/options.cpp:1044 +#: gui/options.cpp:1106 msgctxt "lowres" msgid "Text and Speech:" msgstr "Text i Veus:" -#: gui/options.cpp:1048 +#: gui/options.cpp:1110 msgid "Spch" msgstr "Veus" -#: gui/options.cpp:1049 +#: gui/options.cpp:1111 msgid "Subs" msgstr "Subt" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgctxt "lowres" msgid "Both" msgstr "Ambdѓs" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgid "Show subtitles and play speech" msgstr "Mostra els subtэtols i reprodueix la veu" -#: gui/options.cpp:1052 +#: gui/options.cpp:1114 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Veloc. de subt.:" -#: gui/options.cpp:1068 +#: gui/options.cpp:1130 msgid "Music volume:" msgstr "Volum de mњsica:" -#: gui/options.cpp:1070 +#: gui/options.cpp:1132 msgctxt "lowres" msgid "Music volume:" msgstr "Volum de mњsica:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1139 msgid "Mute All" msgstr "Silenciar tot" -#: gui/options.cpp:1080 +#: gui/options.cpp:1142 msgid "SFX volume:" msgstr "Volum d'efectes:" -#: gui/options.cpp:1080 gui/options.cpp:1082 gui/options.cpp:1083 +#: gui/options.cpp:1142 gui/options.cpp:1144 gui/options.cpp:1145 msgid "Special sound effects volume" msgstr "Volum dels sons d'efectes especials" -#: gui/options.cpp:1082 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "SFX volume:" msgstr "Volum d'efectes:" -#: gui/options.cpp:1090 +#: gui/options.cpp:1152 msgid "Speech volume:" msgstr "Volum de veus:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1154 msgctxt "lowres" msgid "Speech volume:" msgstr "Volum de veus:" -#: gui/options.cpp:1311 +#: gui/options.cpp:1351 +#, fuzzy +msgid "Control" +msgstr "Controla el ratolэ" + +#: gui/options.cpp:1383 msgid "FluidSynth Settings" msgstr "Configuraciѓ de FluidSynth" -#: gui/options.cpp:1342 +#: gui/options.cpp:1414 msgid "Theme Path:" msgstr "Camэ dels temes:" -#: gui/options.cpp:1344 +#: gui/options.cpp:1416 msgctxt "lowres" msgid "Theme Path:" msgstr "Camэ temes:" -#: gui/options.cpp:1350 gui/options.cpp:1352 gui/options.cpp:1353 +#: gui/options.cpp:1422 gui/options.cpp:1424 gui/options.cpp:1425 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:1359 +#: gui/options.cpp:1431 msgid "Plugins Path:" msgstr "Camэ dels connectors:" -#: gui/options.cpp:1361 +#: gui/options.cpp:1433 msgctxt "lowres" msgid "Plugins Path:" msgstr "Camэ de connectors:" -#: gui/options.cpp:1372 +#: gui/options.cpp:1444 msgctxt "lowres" msgid "Misc" msgstr "Misc" -#: gui/options.cpp:1374 +#: gui/options.cpp:1446 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1378 +#: gui/options.cpp:1450 msgid "GUI Renderer:" msgstr "Pintat GUI:" -#: gui/options.cpp:1390 +#: gui/options.cpp:1462 msgid "Autosave:" msgstr "Desat automрtic:" -#: gui/options.cpp:1392 +#: gui/options.cpp:1464 msgctxt "lowres" msgid "Autosave:" msgstr "Auto-desat:" -#: gui/options.cpp:1400 +#: gui/options.cpp:1472 msgid "Keys" msgstr "Tecles" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "GUI Language:" msgstr "Idioma GUI:" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "Language of ScummVM GUI" msgstr "Idioma de la interfэcie d'usuari de ScummVM" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "Update check:" msgstr "" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "How often to check ScummVM updates" msgstr "" -#: gui/options.cpp:1447 +#: gui/options.cpp:1519 msgid "Check now" msgstr "" -#: gui/options.cpp:1455 +#: gui/options.cpp:1527 msgid "Cloud" msgstr "" -#: gui/options.cpp:1457 +#: gui/options.cpp:1529 msgctxt "lowres" msgid "Cloud" msgstr "" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Storage:" msgstr "" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Active cloud storage" msgstr "" -#: gui/options.cpp:1469 gui/options.cpp:2026 +#: gui/options.cpp:1541 gui/options.cpp:2098 msgid "<none>" msgstr "" -#: gui/options.cpp:1473 backends/platform/wii/options.cpp:114 +#: gui/options.cpp:1545 backends/platform/wii/options.cpp:114 msgid "Username:" msgstr "Nom d'usuari:" -#: gui/options.cpp:1473 +#: gui/options.cpp:1545 msgid "Username used by this storage" msgstr "" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Used space:" msgstr "" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Space used by ScummVM's saved games on this storage" msgstr "" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "Last sync time:" msgstr "" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "When the last saved games sync for this storage occured" msgstr "" -#: gui/options.cpp:1482 gui/storagewizarddialog.cpp:71 +#: gui/options.cpp:1554 gui/storagewizarddialog.cpp:71 msgid "Connect" msgstr "" -#: gui/options.cpp:1482 +#: gui/options.cpp:1554 msgid "Open wizard dialog to connect your cloud storage account" msgstr "" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh" msgstr "" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh current cloud storage information (username and usage)" msgstr "" -#: gui/options.cpp:1484 -#, fuzzy +#: gui/options.cpp:1556 msgid "Download" -msgstr "Avall" +msgstr "Descarregar" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Open downloads manager dialog" msgstr "" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run server" msgstr "" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run local webserver" msgstr "" -#: gui/options.cpp:1487 gui/options.cpp:2136 -#, fuzzy +#: gui/options.cpp:1559 gui/options.cpp:2208 msgid "Not running" -msgstr "Error al executar el joc:" +msgstr "Aturat" -#: gui/options.cpp:1491 -#, fuzzy +#: gui/options.cpp:1563 msgid "/root/ Path:" -msgstr "Camэ extra:" +msgstr "Directori /arrel/:" -#: gui/options.cpp:1491 gui/options.cpp:1493 gui/options.cpp:1494 -#, fuzzy +#: gui/options.cpp:1563 gui/options.cpp:1565 gui/options.cpp:1566 msgid "Specifies which directory the Files Manager can access" -msgstr "Especifica on es desaran les partides" +msgstr "Especifica els directoris accessibles per al gestor d'arxius" -#: gui/options.cpp:1493 -#, fuzzy +#: gui/options.cpp:1565 msgctxt "lowres" msgid "/root/ Path:" -msgstr "Camэ extra:" +msgstr "Directori /arrel/:" -#: gui/options.cpp:1503 -#, fuzzy +#: gui/options.cpp:1575 msgid "Server's port:" -msgstr "Servidor:" +msgstr "Port del servidor:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "" "Which port is used by the server\n" "Auth with server is not available with non-default port" msgstr "" -#: gui/options.cpp:1516 +#: gui/options.cpp:1588 msgid "Apply" msgstr "" -#: gui/options.cpp:1682 -#, fuzzy +#: gui/options.cpp:1754 msgid "Failed to change cloud storage!" -msgstr "No s'ha pogut desar l'estat del joc" +msgstr "Fallada al canviar l'emmagatzematge en lэnia!" -#: gui/options.cpp:1685 +#: gui/options.cpp:1757 msgid "Another cloud storage is already active." msgstr "" -#: gui/options.cpp:1721 +#: gui/options.cpp:1793 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1300,53 +1309,50 @@ msgstr "" "El tema que heu seleccionat no suporta l'idioma actual. Si voleu utilitzar " "aquest tema primer haureu de canviar a un altre idioma." -#: gui/options.cpp:1756 +#: gui/options.cpp:1828 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:1765 +#: gui/options.cpp:1837 msgid "Select directory for GUI themes" msgstr "Seleccioneu el directori dels temes" -#: gui/options.cpp:1775 +#: gui/options.cpp:1847 msgid "Select directory for extra files" msgstr "Seleccioneu el directori dels fitxers extra" -#: gui/options.cpp:1786 +#: gui/options.cpp:1858 msgid "Select directory for plugins" msgstr "Seleccioneu el directori dels connectors" -#: gui/options.cpp:1798 -#, fuzzy +#: gui/options.cpp:1870 msgid "Select directory for Files Manager /root/" -msgstr "Seleccioneu el directori dels fitxers extra" +msgstr "Selecciona el directori /arrel/ per al gestor d'arxius" -#: gui/options.cpp:2033 +#: gui/options.cpp:2105 #, c-format msgid "%llu bytes" msgstr "" -#: gui/options.cpp:2041 +#: gui/options.cpp:2113 msgid "<right now>" msgstr "" -#: gui/options.cpp:2043 -#, fuzzy +#: gui/options.cpp:2115 msgid "<never>" -msgstr "Mai" +msgstr "<mai>" -#: gui/options.cpp:2127 -#, fuzzy +#: gui/options.cpp:2199 msgid "Stop server" -msgstr "Servidor:" +msgstr "Aturar servidor" -#: gui/options.cpp:2128 +#: gui/options.cpp:2200 msgid "Stop local webserver" msgstr "" -#: gui/options.cpp:2219 +#: gui/options.cpp:2291 msgid "" "Request failed.\n" "Check your Internet connection." @@ -1362,9 +1368,8 @@ msgid "add" msgstr "" #: gui/predictivedialog.cpp:92 gui/predictivedialog.cpp:167 -#, fuzzy msgid "Delete char" -msgstr "Suprimeix" +msgstr "Suprimeix personatge" #: gui/predictivedialog.cpp:97 gui/predictivedialog.cpp:171 msgid "<" @@ -1399,9 +1404,8 @@ msgid "Record" msgstr "" #: gui/recorderdialog.cpp:71 -#, fuzzy msgid "Playback" -msgstr "Jugar" +msgstr "Reproducciѓ" #: gui/recorderdialog.cpp:73 msgid "Edit" @@ -1418,19 +1422,16 @@ msgid "Notes: " msgstr "" #: gui/recorderdialog.cpp:154 -#, fuzzy msgid "Do you really want to delete this record?" -msgstr "Realment voleu suprimir aquesta partida?" +msgstr "Realment voleu suprimir aquest enregistrament?" #: gui/recorderdialog.cpp:173 -#, fuzzy msgid "Unknown Author" -msgstr "Error desconegut" +msgstr "Autor desconegut" #: gui/remotebrowser.cpp:128 -#, fuzzy msgid "ScummVM could not access the directory!" -msgstr "ScummVM no ha pogut obrir el directori especificat!" +msgstr "ScummVM no ha pogut accedir al directori especificat!" #: gui/saveload-dialog.cpp:334 msgid "List view" @@ -1469,9 +1470,8 @@ msgid "Playtime: " msgstr "Temps de joc: " #: gui/saveload-dialog.cpp:577 gui/saveload-dialog.cpp:665 -#, fuzzy msgid "Untitled saved game" -msgstr "Partida sense tэtol" +msgstr "Partida sense nom" #: gui/saveload-dialog.cpp:718 msgid "Next" @@ -1516,9 +1516,8 @@ msgid "in the following field and press 'Connect':" msgstr "" #: gui/storagewizarddialog.cpp:69 -#, fuzzy msgid "Open URL" -msgstr "Obre" +msgstr "Obre URL" #: gui/storagewizarddialog.cpp:70 msgid "Paste" @@ -1613,9 +1612,8 @@ msgid "(You can always enable it in the options dialog on the Misc tab)" msgstr "" #: gui/updates-dialog.cpp:92 -#, fuzzy msgid "Check for updates automatically" -msgstr "Comprova les actualitzacions..." +msgstr "Comprova les actualitzacions automрticament" #: gui/updates-dialog.cpp:111 msgid "Proceed" @@ -1710,9 +1708,8 @@ msgid "Could not find suitable engine plugin" msgstr "No s'ha pogut trobar un connector de motor apropiat" #: common/error.cpp:68 -#, fuzzy msgid "Engine plugin does not support saved games" -msgstr "El connector de motor no suporta el nivell partides desades'" +msgstr "El connector de motor no suporta partides desades" #: common/error.cpp:71 msgid "User canceled" @@ -1762,9 +1759,8 @@ msgid "Monthly" msgstr "" #: common/updates.cpp:64 -#, fuzzy msgid "<Bad value>" -msgstr "Neteja el valor" +msgstr "<Valor incorrecte>" #: engines/advancedDetector.cpp:335 #, c-format @@ -1893,9 +1889,8 @@ msgid "Could not apply fullscreen setting." msgstr "No s'ha pogut aplicar l'ajust de pantalla completa." #: engines/engine.cpp:373 -#, fuzzy msgid "Could not apply filtering setting." -msgstr "No s'ha pogut aplicar l'ajust de pantalla completa." +msgstr "No s'ha pogut aplicar la configuraciѓ de filtratge." #: engines/engine.cpp:473 msgid "" @@ -2026,9 +2021,8 @@ msgid "FM-Towns Audio" msgstr "" #: audio/softsynth/fmtowns_pc98/towns_pc98_plugins.cpp:58 -#, fuzzy msgid "PC-98 Audio" -msgstr "Рudio" +msgstr "PC-98 Рudio" #: audio/softsynth/mt32.cpp:175 msgid "Initializing MT-32 Emulator" @@ -2051,9 +2045,8 @@ msgid "C64 Audio Emulator" msgstr "Emulador d'рudio C64" #: backends/cloud/storage.cpp:211 -#, fuzzy msgid "Saved games sync complete." -msgstr "S'ha acabat la cerca!" +msgstr "Sincronitzaciѓ dels jocs desats completada." #: backends/cloud/storage.cpp:222 msgid "Saved games sync was cancelled." @@ -2073,14 +2066,12 @@ msgid "" msgstr "" #: backends/cloud/storage.cpp:330 -#, fuzzy msgid "Download complete." -msgstr "S'ha acabat la cerca!" +msgstr "Descрrrega completada." #: backends/cloud/storage.cpp:340 -#, fuzzy msgid "Download failed." -msgstr "Carrega partida:" +msgstr "La descрrrega ha fallat." #: backends/events/default/default-events.cpp:196 msgid "Do you really want to return to the Launcher?" @@ -2155,9 +2146,8 @@ msgstr "Vols sortir?" #. I18N: Trackpad mode toggle status. #: backends/events/webossdl/webossdl-events.cpp:308 -#, fuzzy msgid "Trackpad mode is now" -msgstr "Mode Touchpad desactivat." +msgstr "El mode trackpad estр" #. I18N: Trackpad mode on or off. #. I18N: Auto-drag on or off. @@ -2185,9 +2175,8 @@ msgid "Swipe three fingers to the right to toggle." msgstr "" #: backends/graphics/opengl/opengl-graphics.cpp:146 -#, fuzzy msgid "OpenGL" -msgstr "Obre" +msgstr "OpenGL" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:617 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2462 @@ -2211,15 +2200,13 @@ msgstr "S'ha desactivat la correcciѓ de la relaciѓ d'aspecte" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:753 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2362 -#, fuzzy msgid "Filtering enabled" -msgstr "Clicat activat" +msgstr "Filtratge activat" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:755 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2364 -#, fuzzy msgid "Filtering disabled" -msgstr "Clicat desactivat" +msgstr "Filtratge desactivat" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:47 #: backends/graphics/wincesdl/wincesdl-graphics.cpp:88 @@ -2509,9 +2496,8 @@ msgid "[ Media ]" msgstr "" #: backends/platform/tizen/fs.cpp:275 -#, fuzzy msgid "[ Shared ]" -msgstr "Comparticiѓ:" +msgstr "[ Compartit ]" #: backends/platform/wii/options.cpp:51 msgid "Video" @@ -2786,9 +2772,8 @@ msgid "" msgstr "" #: engines/adl/detection.cpp:45 engines/adl/detection.cpp:55 -#, fuzzy msgid "Color mode" -msgstr "Mode clic" +msgstr "Mode de color" #: engines/adl/detection.cpp:46 engines/adl/detection.cpp:56 msgid "Use color graphics" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index b04d1730f2..429c462603 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-02-11 08:56+0100\n" +"POT-Creation-Date: 2017-02-21 23:29+0100\n" "PO-Revision-Date: 2016-12-04 15:43+0000\n" "Last-Translator: Eugene Sandulenko <sev@scummvm.org>\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:1515 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69 +#: gui/options.cpp:1587 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:443 #: gui/saveload-dialog.cpp:717 gui/saveload-dialog.cpp:1111 @@ -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:522 -#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1517 +#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1589 #: gui/saveload-dialog.cpp:1112 engines/engine.cpp:477 engines/engine.cpp:488 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 @@ -241,7 +241,7 @@ msgid "" msgstr "Jazyk hry. Toto z vaЙэ Љpanьlskщ verze neudьlс Anglickou" #: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:121 -#: gui/options.cpp:845 gui/options.cpp:858 gui/options.cpp:1410 +#: gui/options.cpp:907 gui/options.cpp:920 gui/options.cpp:1482 #: audio/null.cpp:41 msgid "<default>" msgstr "<v§chozэ>" @@ -264,11 +264,11 @@ msgstr "Platforma:" msgid "Engine" msgstr "Jсdro" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "Graphics" msgstr "Obraz" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "GFX" msgstr "GFX" @@ -281,7 +281,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Potlaшit globсlnэ nastavenэ obrazu" -#: gui/editgamedialog.cpp:196 gui/options.cpp:1292 +#: gui/editgamedialog.cpp:196 gui/options.cpp:1364 msgid "Audio" msgstr "Zvuk" @@ -294,11 +294,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Potlaшit globсlnэ nastavenэ zvuku" -#: gui/editgamedialog.cpp:210 gui/options.cpp:1297 +#: gui/editgamedialog.cpp:210 gui/options.cpp:1369 msgid "Volume" msgstr "Hlasitost" -#: gui/editgamedialog.cpp:212 gui/options.cpp:1299 +#: gui/editgamedialog.cpp:212 gui/options.cpp:1371 msgctxt "lowres" msgid "Volume" msgstr "Hlasitost" @@ -312,7 +312,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Potlaшit globсlnэ nastavenэ hlasitosti" -#: gui/editgamedialog.cpp:226 gui/options.cpp:1307 +#: gui/editgamedialog.cpp:226 gui/options.cpp:1379 msgid "MIDI" msgstr "MIDI" @@ -325,7 +325,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Potlaшit globсlnэ nastavenэ MIDI" -#: gui/editgamedialog.cpp:241 gui/options.cpp:1317 +#: gui/editgamedialog.cpp:241 gui/options.cpp:1389 msgid "MT-32" msgstr "MT-32" @@ -338,11 +338,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Potlaшit globсlnэ nastavenэ MT-32" -#: gui/editgamedialog.cpp:255 gui/options.cpp:1324 +#: gui/editgamedialog.cpp:255 gui/options.cpp:1396 msgid "Paths" msgstr "Cesty" -#: gui/editgamedialog.cpp:257 gui/options.cpp:1326 +#: gui/editgamedialog.cpp:257 gui/options.cpp:1398 msgctxt "lowres" msgid "Paths" msgstr "Cesty" @@ -356,7 +356,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Cesta Hry:" -#: gui/editgamedialog.cpp:271 gui/options.cpp:1350 +#: gui/editgamedialog.cpp:271 gui/options.cpp:1422 msgid "Extra Path:" msgstr "Dodateшnс Cesta:" @@ -365,44 +365,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:1352 +#: gui/editgamedialog.cpp:273 gui/options.cpp:1424 msgctxt "lowres" msgid "Extra Path:" msgstr "Dodateшnс Cesta:" -#: gui/editgamedialog.cpp:280 gui/options.cpp:1334 +#: gui/editgamedialog.cpp:280 gui/options.cpp:1406 msgid "Save Path:" msgstr "Cesta pro uloОenэ:" #: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282 -#: gui/editgamedialog.cpp:283 gui/options.cpp:1334 gui/options.cpp:1336 -#: gui/options.cpp:1337 +#: gui/editgamedialog.cpp:283 gui/options.cpp:1406 gui/options.cpp:1408 +#: gui/options.cpp:1409 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:1336 +#: gui/editgamedialog.cpp:282 gui/options.cpp:1408 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:1345 -#: gui/options.cpp:1353 gui/options.cpp:1362 gui/options.cpp:1542 -#: gui/options.cpp:1548 gui/options.cpp:1556 gui/options.cpp:1579 -#: gui/options.cpp:1608 gui/options.cpp:1614 gui/options.cpp:1621 -#: gui/options.cpp:1629 gui/options.cpp:1812 gui/options.cpp:1815 -#: gui/options.cpp:1822 gui/options.cpp:1832 +#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1417 +#: gui/options.cpp:1425 gui/options.cpp:1434 gui/options.cpp:1614 +#: gui/options.cpp:1620 gui/options.cpp:1628 gui/options.cpp:1651 +#: gui/options.cpp:1680 gui/options.cpp:1686 gui/options.cpp:1693 +#: gui/options.cpp:1701 gui/options.cpp:1884 gui/options.cpp:1887 +#: gui/options.cpp:1894 gui/options.cpp:1904 msgctxt "path" msgid "None" msgstr "Ўсdnщ" #: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404 -#: gui/editgamedialog.cpp:522 gui/options.cpp:1536 gui/options.cpp:1602 -#: gui/options.cpp:1818 backends/platform/wii/options.cpp:56 +#: gui/editgamedialog.cpp:522 gui/options.cpp:1608 gui/options.cpp:1674 +#: gui/options.cpp:1890 backends/platform/wii/options.cpp:56 msgid "Default" msgstr "V§chozэ" -#: gui/editgamedialog.cpp:450 gui/options.cpp:1826 +#: gui/editgamedialog.cpp:450 gui/options.cpp:1898 msgid "Select SoundFont" msgstr "Vybrat SoundFont" @@ -410,7 +410,7 @@ msgstr "Vybrat SoundFont" msgid "Select additional game directory" msgstr "Vyberte dodateшn§ adresсј hry" -#: gui/editgamedialog.cpp:502 gui/options.cpp:1749 +#: gui/editgamedialog.cpp:502 gui/options.cpp:1821 msgid "Select directory for saved games" msgstr "Vyberte adresсј pro uloОenщ hry" @@ -502,7 +502,7 @@ msgstr "Sinus" msgid "Triangle" msgstr "Trojњhelnэk" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1370 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1442 msgid "Misc" msgstr "Rљznщ" @@ -820,106 +820,119 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:289 gui/options.cpp:552 gui/options.cpp:690 -#: gui/options.cpp:759 gui/options.cpp:970 +#: gui/options.cpp:316 gui/options.cpp:598 gui/options.cpp:736 +#: gui/options.cpp:805 gui/options.cpp:1032 msgctxt "soundfont" msgid "None" msgstr "Ўсdnщ" -#: gui/options.cpp:456 +#: gui/options.cpp:502 msgid "Failed to apply some of the graphic options changes:" msgstr "Nelze pouОэt nьkterщ zmьny moОnostэ grafiky:" -#: gui/options.cpp:468 +#: gui/options.cpp:514 msgid "the video mode could not be changed." msgstr "reОim obrazu nemohl b§t zmьnьn." -#: gui/options.cpp:474 +#: gui/options.cpp:520 msgid "the aspect ratio setting could not be changed" msgstr "nastavenэ pomьru stran nemohlo b§t zmьnьno" -#: gui/options.cpp:480 +#: gui/options.cpp:526 msgid "the fullscreen setting could not be changed" msgstr "nastavenэ celщ obrazovky nemohlo b§t zmьnьno" -#: gui/options.cpp:486 +#: gui/options.cpp:532 #, fuzzy msgid "the filtering setting could not be changed" msgstr "nastavenэ celщ obrazovky nemohlo b§t zmьnьno" -#: gui/options.cpp:842 +#: gui/options.cpp:884 +msgid "Show On-screen control" +msgstr "" + +#: gui/options.cpp:888 +#, fuzzy +msgid "Touchpad mouse mode" +msgstr "Touchpad reОim vypnut." + +#: gui/options.cpp:892 +msgid "Swap Menu and Back buttons" +msgstr "" + +#: gui/options.cpp:904 msgid "Graphics mode:" msgstr "ReОim obrazu:" -#: gui/options.cpp:856 +#: gui/options.cpp:918 msgid "Render mode:" msgstr "ReОim vykreslenэ:" -#: gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:918 gui/options.cpp:919 msgid "Special dithering modes supported by some games" msgstr "Speciсlnэ reОimy chvьnэ podporovanщ nьkter§mi hrami" -#: gui/options.cpp:868 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 +#: gui/options.cpp:930 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2460 msgid "Fullscreen mode" msgstr "ReОim celщ obrazovky" -#: gui/options.cpp:871 +#: gui/options.cpp:933 #, fuzzy msgid "Filter graphics" msgstr "PouОэt barevnщ grafiky" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Use linear filtering when scaling graphics" msgstr "" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Aspect ratio correction" msgstr "Korekce pomьru stran" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Correct aspect ratio for 320x200 games" msgstr "Korigovat pomьr stran pro hry 320x200" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Preferred Device:" msgstr "Prioritnэ Zaјэzenэ:" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Music Device:" msgstr "Hudebnэ zaјэzenэ:" -#: gui/options.cpp:882 gui/options.cpp:884 +#: gui/options.cpp:944 gui/options.cpp:946 msgid "Specifies preferred sound device or sound card emulator" msgstr "Stanovэ prioritnэ zvukovщ zaјэzenэ nebo emulсtor zvukovщ karty" -#: gui/options.cpp:882 gui/options.cpp:884 gui/options.cpp:885 +#: gui/options.cpp:944 gui/options.cpp:946 gui/options.cpp:947 msgid "Specifies output sound device or sound card emulator" msgstr "Stanovэ v§stupnэ zvukovщ zaјэzenэ nebo emulсtor zvukovщ karty" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Prioritnэ Zaј.:" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Music Device:" msgstr "Hudebnэ zaјэzenэ:" -#: gui/options.cpp:911 +#: gui/options.cpp:973 msgid "AdLib emulator:" msgstr "AdLib emulсtor:" -#: gui/options.cpp:911 gui/options.cpp:912 +#: gui/options.cpp:973 gui/options.cpp:974 msgid "AdLib is used for music in many games" msgstr "AdLib se pouОэvс pro hudbu v mnoha hrсch" -#: gui/options.cpp:922 +#: gui/options.cpp:984 msgid "Output rate:" msgstr "V§stup. frekvence:" -#: gui/options.cpp:922 gui/options.cpp:923 +#: gui/options.cpp:984 gui/options.cpp:985 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -927,62 +940,62 @@ msgstr "" "VyЙЙэ hodnota zpљsobэ lepЙэ kvalitu zvuku, ale nemusэ b§t podporovсna VaЙi " "zvukovou kartou" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "GM Device:" msgstr "GM Zaјэzenэ:" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "Specifies default sound device for General MIDI output" msgstr "Stanovэ v§chozэ zvukovщ zaјэzenэ pro v§stup General MIDI" -#: gui/options.cpp:944 +#: gui/options.cpp:1006 msgid "Don't use General MIDI music" msgstr "NepouОэvat hudbu General MIDI" -#: gui/options.cpp:955 gui/options.cpp:1017 +#: gui/options.cpp:1017 gui/options.cpp:1079 msgid "Use first available device" msgstr "PouОэt prvnэ dostupnщ zaјэzenэ" -#: gui/options.cpp:967 +#: gui/options.cpp:1029 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:967 gui/options.cpp:969 gui/options.cpp:970 +#: gui/options.cpp:1029 gui/options.cpp:1031 gui/options.cpp:1032 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:969 +#: gui/options.cpp:1031 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Mixed AdLib/MIDI mode" msgstr "SmэЙen§ reОim AdLib/MIDI" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Use both MIDI and AdLib sound generation" msgstr "PouОэt obь zvukovщ generace MIDI a AdLib" -#: gui/options.cpp:978 +#: gui/options.cpp:1040 msgid "MIDI gain:" msgstr "Zesэlenэ MIDI:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "MT-32 Device:" msgstr "Zaјэzenэ MT-32:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 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:993 +#: gui/options.cpp:1055 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Opravdov§ Roland MT-32 (vypne GM emulaci)" -#: gui/options.cpp:993 gui/options.cpp:995 +#: gui/options.cpp:1055 gui/options.cpp:1057 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -990,16 +1003,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:995 +#: gui/options.cpp:1057 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Opravdov§ Roland MT-32 (Осdnс GM emulace)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Zaјэzenэ Roland GS (zapne mapovсnэ MT-32)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -1007,266 +1020,271 @@ 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:1007 +#: gui/options.cpp:1069 msgid "Don't use Roland MT-32 music" msgstr "NepouОэvat hudbu Roland MT-32" -#: gui/options.cpp:1034 +#: gui/options.cpp:1096 msgid "Text and Speech:" msgstr "Text a иeш:" -#: gui/options.cpp:1038 gui/options.cpp:1048 +#: gui/options.cpp:1100 gui/options.cpp:1110 msgid "Speech" msgstr "иeш" -#: gui/options.cpp:1039 gui/options.cpp:1049 +#: gui/options.cpp:1101 gui/options.cpp:1111 msgid "Subtitles" msgstr "Titulky" -#: gui/options.cpp:1040 +#: gui/options.cpp:1102 msgid "Both" msgstr "Oba" -#: gui/options.cpp:1042 +#: gui/options.cpp:1104 msgid "Subtitle speed:" msgstr "Rychlost titulkљ:" -#: gui/options.cpp:1044 +#: gui/options.cpp:1106 msgctxt "lowres" msgid "Text and Speech:" msgstr "Text a иeш:" -#: gui/options.cpp:1048 +#: gui/options.cpp:1110 msgid "Spch" msgstr "иeш" -#: gui/options.cpp:1049 +#: gui/options.cpp:1111 msgid "Subs" msgstr "Titl" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgctxt "lowres" msgid "Both" msgstr "Oba" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgid "Show subtitles and play speech" msgstr "Zobrazit titulky a pјehrсvat јeш" -#: gui/options.cpp:1052 +#: gui/options.cpp:1114 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Rychlost titulkљ:" -#: gui/options.cpp:1068 +#: gui/options.cpp:1130 msgid "Music volume:" msgstr "Hlasitost hudby:" -#: gui/options.cpp:1070 +#: gui/options.cpp:1132 msgctxt "lowres" msgid "Music volume:" msgstr "Hlasitost hudby:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1139 msgid "Mute All" msgstr "Ztlumit VЙe" -#: gui/options.cpp:1080 +#: gui/options.cpp:1142 msgid "SFX volume:" msgstr "Hlasitost zvukљ:" -#: gui/options.cpp:1080 gui/options.cpp:1082 gui/options.cpp:1083 +#: gui/options.cpp:1142 gui/options.cpp:1144 gui/options.cpp:1145 msgid "Special sound effects volume" msgstr "Hlasitost speciсlnэch zvukov§ch efektљ" -#: gui/options.cpp:1082 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "SFX volume:" msgstr "Hlasitost zvukљ:" -#: gui/options.cpp:1090 +#: gui/options.cpp:1152 msgid "Speech volume:" msgstr "Hlasitost јeшi:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1154 msgctxt "lowres" msgid "Speech volume:" msgstr "Hlasitost јeшi:" -#: gui/options.cpp:1311 +#: gui/options.cpp:1351 +#, fuzzy +msgid "Control" +msgstr "Ovlсdсnэ MyЙi" + +#: gui/options.cpp:1383 msgid "FluidSynth Settings" msgstr "Nastavenэ FluidSynth" -#: gui/options.cpp:1342 +#: gui/options.cpp:1414 msgid "Theme Path:" msgstr "Cesta ke Vzhledu:" -#: gui/options.cpp:1344 +#: gui/options.cpp:1416 msgctxt "lowres" msgid "Theme Path:" msgstr "Cesta ke Vzhledu:" -#: gui/options.cpp:1350 gui/options.cpp:1352 gui/options.cpp:1353 +#: gui/options.cpp:1422 gui/options.cpp:1424 gui/options.cpp:1425 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:1359 +#: gui/options.cpp:1431 msgid "Plugins Path:" msgstr "Cesta k Pluginљm:" -#: gui/options.cpp:1361 +#: gui/options.cpp:1433 msgctxt "lowres" msgid "Plugins Path:" msgstr "Cesta k Pluginљm:" -#: gui/options.cpp:1372 +#: gui/options.cpp:1444 msgctxt "lowres" msgid "Misc" msgstr "Rљznщ" -#: gui/options.cpp:1374 +#: gui/options.cpp:1446 msgid "Theme:" msgstr "Vzhled:" -#: gui/options.cpp:1378 +#: gui/options.cpp:1450 msgid "GUI Renderer:" msgstr "GUI Vykreslovaш:" -#: gui/options.cpp:1390 +#: gui/options.cpp:1462 msgid "Autosave:" msgstr "Autouklсdсnэ:" -#: gui/options.cpp:1392 +#: gui/options.cpp:1464 msgctxt "lowres" msgid "Autosave:" msgstr "Autouklсdсnэ:" -#: gui/options.cpp:1400 +#: gui/options.cpp:1472 msgid "Keys" msgstr "Klсvesy" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "GUI Language:" msgstr "Jazyk GUI:" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "Language of ScummVM GUI" msgstr "Jazyk GUI ScummVM" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "Update check:" msgstr "Kontrola aktualizacэ:" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "How often to check ScummVM updates" msgstr "Jak шasto ScummVM kontroluje aktualizace" -#: gui/options.cpp:1447 +#: gui/options.cpp:1519 msgid "Check now" msgstr "Zkontrolovat nynэ" -#: gui/options.cpp:1455 +#: gui/options.cpp:1527 msgid "Cloud" msgstr "Cloud" -#: gui/options.cpp:1457 +#: gui/options.cpp:1529 msgctxt "lowres" msgid "Cloud" msgstr "Cloud" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Storage:" msgstr "кloОiЙtь:" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Active cloud storage" msgstr "Aktivnэ cloudovщ њloОiЙtь" -#: gui/options.cpp:1469 gui/options.cpp:2026 +#: gui/options.cpp:1541 gui/options.cpp:2098 msgid "<none>" msgstr "<Осdnщ>" -#: gui/options.cpp:1473 backends/platform/wii/options.cpp:114 +#: gui/options.cpp:1545 backends/platform/wii/options.cpp:114 msgid "Username:" msgstr "UОivatelskщ jmщno:" -#: gui/options.cpp:1473 +#: gui/options.cpp:1545 msgid "Username used by this storage" msgstr "UОivatelskс jmщna kterс toto њloОiЙtь vyuОэvajэ" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Used space:" msgstr "VyuОit§ prostor:" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 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:1479 +#: gui/options.cpp:1551 msgid "Last sync time:" msgstr "Datum poslednэ synchronizace:" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "When the last saved games sync for this storage occured" msgstr "Kdy byla provedena poslednэ synchronizace uloОen§ch her" -#: gui/options.cpp:1482 gui/storagewizarddialog.cpp:71 +#: gui/options.cpp:1554 gui/storagewizarddialog.cpp:71 msgid "Connect" msgstr "Pјipojit" -#: gui/options.cpp:1482 +#: gui/options.cpp:1554 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:1483 +#: gui/options.cpp:1555 msgid "Refresh" msgstr "Obnovit" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 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:1484 +#: gui/options.cpp:1556 msgid "Download" msgstr "Stсhnout" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Open downloads manager dialog" msgstr "Otevјэt dialogovщ okno sprсvce stahovanэ" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run server" msgstr "Spustit server" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run local webserver" msgstr "Spustit mэstnэ internetov§ server" -#: gui/options.cpp:1487 gui/options.cpp:2136 +#: gui/options.cpp:1559 gui/options.cpp:2208 msgid "Not running" msgstr "NespuЙtьno" -#: gui/options.cpp:1491 +#: gui/options.cpp:1563 msgid "/root/ Path:" msgstr "Cesta /root/:" -#: gui/options.cpp:1491 gui/options.cpp:1493 gui/options.cpp:1494 +#: gui/options.cpp:1563 gui/options.cpp:1565 gui/options.cpp:1566 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:1493 +#: gui/options.cpp:1565 msgctxt "lowres" msgid "/root/ Path:" msgstr "Cesta /root/:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "Server's port:" msgstr "Port serveru:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "" "Which port is used by the server\n" "Auth with server is not available with non-default port" @@ -1274,19 +1292,19 @@ msgstr "" "Kter§ port server pouОэvс\n" "PјihlсЙenэ pomocэ serveru nenэ dostupnщ pјi pouОitэ nestandardnэho portu" -#: gui/options.cpp:1516 +#: gui/options.cpp:1588 msgid "Apply" msgstr "" -#: gui/options.cpp:1682 +#: gui/options.cpp:1754 msgid "Failed to change cloud storage!" msgstr "Nelze zmьnit cloudovщ њloОiЙtь!" -#: gui/options.cpp:1685 +#: gui/options.cpp:1757 msgid "Another cloud storage is already active." msgstr "Jinщ cloudovщ њloОiЙtь jiО je aktivnэ." -#: gui/options.cpp:1721 +#: gui/options.cpp:1793 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1294,48 +1312,48 @@ msgstr "" "Vzhled, kter§ jste zvolili, nepodporuje VсЙ souшasn§ jazyk. Pokud chcete " "tento vzhled pouОэt, musэte nejdјэve pјepnout na jin§ jazyk." -#: gui/options.cpp:1756 +#: gui/options.cpp:1828 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:1765 +#: gui/options.cpp:1837 msgid "Select directory for GUI themes" msgstr "Vyberte adresсј pro vhledy GUI" -#: gui/options.cpp:1775 +#: gui/options.cpp:1847 msgid "Select directory for extra files" msgstr "Vyberte adresсј pro dodateшnщ soubory" -#: gui/options.cpp:1786 +#: gui/options.cpp:1858 msgid "Select directory for plugins" msgstr "Vyberte adresсј pro zсsuvnщ moduly" -#: gui/options.cpp:1798 +#: gui/options.cpp:1870 msgid "Select directory for Files Manager /root/" msgstr "Vyberte adresсј pro koјen Sprсvce souborљ" -#: gui/options.cpp:2033 +#: gui/options.cpp:2105 #, c-format msgid "%llu bytes" msgstr "%llu bajtљ" -#: gui/options.cpp:2041 +#: gui/options.cpp:2113 msgid "<right now>" msgstr "<prсvь nynэ>" -#: gui/options.cpp:2043 +#: gui/options.cpp:2115 msgid "<never>" msgstr "<nikdy>" -#: gui/options.cpp:2127 +#: gui/options.cpp:2199 msgid "Stop server" msgstr "Zastavit server" -#: gui/options.cpp:2128 +#: gui/options.cpp:2200 msgid "Stop local webserver" msgstr "Zastavit mэstnэ internetov§ server" -#: gui/options.cpp:2219 +#: gui/options.cpp:2291 msgid "" "Request failed.\n" "Check your Internet connection." diff --git a/po/da_DK.po b/po/da_DK.po index 3d012a78f0..1176b8b20c 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-02-11 08:56+0100\n" +"POT-Creation-Date: 2017-02-21 23:29+0100\n" "PO-Revision-Date: 2016-12-29 07:29+0000\n" "Last-Translator: poulsen93 <poulsen93@gmail.com>\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:1515 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69 +#: gui/options.cpp:1587 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:443 #: gui/saveload-dialog.cpp:717 gui/saveload-dialog.cpp:1111 @@ -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:522 -#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1517 +#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1589 #: gui/saveload-dialog.cpp:1112 engines/engine.cpp:477 engines/engine.cpp:488 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 @@ -236,7 +236,7 @@ msgstr "" "engelsk" #: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:121 -#: gui/options.cpp:845 gui/options.cpp:858 gui/options.cpp:1410 +#: gui/options.cpp:907 gui/options.cpp:920 gui/options.cpp:1482 #: audio/null.cpp:41 msgid "<default>" msgstr "<standard>" @@ -259,11 +259,11 @@ msgstr "Platform:" msgid "Engine" msgstr "Motor" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "Graphics" msgstr "Grafik" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "GFX" msgstr "GFX" @@ -276,7 +276,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Overstyr globale grafik indstillinger" -#: gui/editgamedialog.cpp:196 gui/options.cpp:1292 +#: gui/editgamedialog.cpp:196 gui/options.cpp:1364 msgid "Audio" msgstr "Lyd" @@ -289,11 +289,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Overstyr globale lyd indstillinger" -#: gui/editgamedialog.cpp:210 gui/options.cpp:1297 +#: gui/editgamedialog.cpp:210 gui/options.cpp:1369 msgid "Volume" msgstr "Lydstyrke" -#: gui/editgamedialog.cpp:212 gui/options.cpp:1299 +#: gui/editgamedialog.cpp:212 gui/options.cpp:1371 msgctxt "lowres" msgid "Volume" msgstr "Lydstyrke" @@ -307,7 +307,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Overstyr globale lydstyrke indstillinger" -#: gui/editgamedialog.cpp:226 gui/options.cpp:1307 +#: gui/editgamedialog.cpp:226 gui/options.cpp:1379 msgid "MIDI" msgstr "MIDI" @@ -320,7 +320,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Overstyr globale MIDI indstillinger" -#: gui/editgamedialog.cpp:241 gui/options.cpp:1317 +#: gui/editgamedialog.cpp:241 gui/options.cpp:1389 msgid "MT-32" msgstr "MT-32" @@ -333,11 +333,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Overstyr globale MT-32 indstillinger" -#: gui/editgamedialog.cpp:255 gui/options.cpp:1324 +#: gui/editgamedialog.cpp:255 gui/options.cpp:1396 msgid "Paths" msgstr "Stier" -#: gui/editgamedialog.cpp:257 gui/options.cpp:1326 +#: gui/editgamedialog.cpp:257 gui/options.cpp:1398 msgctxt "lowres" msgid "Paths" msgstr "Stier" @@ -351,7 +351,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Spil sti:" -#: gui/editgamedialog.cpp:271 gui/options.cpp:1350 +#: gui/editgamedialog.cpp:271 gui/options.cpp:1422 msgid "Extra Path:" msgstr "Ekstra sti:" @@ -360,44 +360,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:1352 +#: gui/editgamedialog.cpp:273 gui/options.cpp:1424 msgctxt "lowres" msgid "Extra Path:" msgstr "Ekstra sti:" -#: gui/editgamedialog.cpp:280 gui/options.cpp:1334 +#: gui/editgamedialog.cpp:280 gui/options.cpp:1406 msgid "Save Path:" msgstr "Gemme sti:" #: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282 -#: gui/editgamedialog.cpp:283 gui/options.cpp:1334 gui/options.cpp:1336 -#: gui/options.cpp:1337 +#: gui/editgamedialog.cpp:283 gui/options.cpp:1406 gui/options.cpp:1408 +#: gui/options.cpp:1409 msgid "Specifies where your saved games are put" msgstr "Angiver hvor dine gemmer bliver lagt" -#: gui/editgamedialog.cpp:282 gui/options.cpp:1336 +#: gui/editgamedialog.cpp:282 gui/options.cpp:1408 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:1345 -#: gui/options.cpp:1353 gui/options.cpp:1362 gui/options.cpp:1542 -#: gui/options.cpp:1548 gui/options.cpp:1556 gui/options.cpp:1579 -#: gui/options.cpp:1608 gui/options.cpp:1614 gui/options.cpp:1621 -#: gui/options.cpp:1629 gui/options.cpp:1812 gui/options.cpp:1815 -#: gui/options.cpp:1822 gui/options.cpp:1832 +#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1417 +#: gui/options.cpp:1425 gui/options.cpp:1434 gui/options.cpp:1614 +#: gui/options.cpp:1620 gui/options.cpp:1628 gui/options.cpp:1651 +#: gui/options.cpp:1680 gui/options.cpp:1686 gui/options.cpp:1693 +#: gui/options.cpp:1701 gui/options.cpp:1884 gui/options.cpp:1887 +#: gui/options.cpp:1894 gui/options.cpp:1904 msgctxt "path" msgid "None" msgstr "Ingen" #: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404 -#: gui/editgamedialog.cpp:522 gui/options.cpp:1536 gui/options.cpp:1602 -#: gui/options.cpp:1818 backends/platform/wii/options.cpp:56 +#: gui/editgamedialog.cpp:522 gui/options.cpp:1608 gui/options.cpp:1674 +#: gui/options.cpp:1890 backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/editgamedialog.cpp:450 gui/options.cpp:1826 +#: gui/editgamedialog.cpp:450 gui/options.cpp:1898 msgid "Select SoundFont" msgstr "Vцlg SoundFont" @@ -405,7 +405,7 @@ msgstr "Vцlg SoundFont" msgid "Select additional game directory" msgstr "Vцlg ekstra spil bibliotek" -#: gui/editgamedialog.cpp:502 gui/options.cpp:1749 +#: gui/editgamedialog.cpp:502 gui/options.cpp:1821 msgid "Select directory for saved games" msgstr "Vцlg bibliotek til spil gemmer" @@ -495,7 +495,7 @@ msgstr "Sinus" msgid "Triangle" msgstr "Triangulцr" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1370 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1442 msgid "Misc" msgstr "Andet" @@ -814,106 +814,119 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:289 gui/options.cpp:552 gui/options.cpp:690 -#: gui/options.cpp:759 gui/options.cpp:970 +#: gui/options.cpp:316 gui/options.cpp:598 gui/options.cpp:736 +#: gui/options.cpp:805 gui/options.cpp:1032 msgctxt "soundfont" msgid "None" msgstr "Ingen" -#: gui/options.cpp:456 +#: gui/options.cpp:502 msgid "Failed to apply some of the graphic options changes:" msgstr "Anvendelse af цndringer for grafiske indstillinger fejlede:" -#: gui/options.cpp:468 +#: gui/options.cpp:514 msgid "the video mode could not be changed." msgstr "videotilstanden kunne ikke цndres." -#: gui/options.cpp:474 +#: gui/options.cpp:520 msgid "the aspect ratio setting could not be changed" msgstr "billedformat indstillingen ikke kunne цndres" -#: gui/options.cpp:480 +#: gui/options.cpp:526 msgid "the fullscreen setting could not be changed" msgstr "fuld skцrm indstillingen kunne ikke цndres" -#: gui/options.cpp:486 +#: gui/options.cpp:532 #, fuzzy msgid "the filtering setting could not be changed" msgstr "fuld skцrm indstillingen kunne ikke цndres" -#: gui/options.cpp:842 +#: gui/options.cpp:884 +msgid "Show On-screen control" +msgstr "" + +#: gui/options.cpp:888 +#, fuzzy +msgid "Touchpad mouse mode" +msgstr "Pegeplade tilstand deaktiveret." + +#: gui/options.cpp:892 +msgid "Swap Menu and Back buttons" +msgstr "" + +#: gui/options.cpp:904 msgid "Graphics mode:" msgstr "Grafik tilstand:" -#: gui/options.cpp:856 +#: gui/options.cpp:918 msgid "Render mode:" msgstr "Rendere tilstand:" -#: gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:918 gui/options.cpp:919 msgid "Special dithering modes supported by some games" msgstr "Speciel farvereduceringstilstand understјttet a nogle spil" -#: gui/options.cpp:868 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 +#: gui/options.cpp:930 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2460 msgid "Fullscreen mode" msgstr "Fuldskцrms tilstand" -#: gui/options.cpp:871 +#: gui/options.cpp:933 #, fuzzy msgid "Filter graphics" msgstr "Grafik" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Use linear filtering when scaling graphics" msgstr "" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Aspect ratio correction" msgstr "Billedformat korrektion" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Correct aspect ratio for 320x200 games" msgstr "Korrekt billedformat til 320x200 spil" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Preferred Device:" msgstr "Foretruk. enhed:" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Music Device:" msgstr "Musik enhed:" -#: gui/options.cpp:882 gui/options.cpp:884 +#: gui/options.cpp:944 gui/options.cpp:946 msgid "Specifies preferred sound device or sound card emulator" msgstr "Angiver foretukket lyd enhed eller lydkort emulator" -#: gui/options.cpp:882 gui/options.cpp:884 gui/options.cpp:885 +#: gui/options.cpp:944 gui/options.cpp:946 gui/options.cpp:947 msgid "Specifies output sound device or sound card emulator" msgstr "Angiver lyd udgangsenhed eller lydkorts emulator" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Foretruk. enh.:" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Music Device:" msgstr "Musik enhed:" -#: gui/options.cpp:911 +#: gui/options.cpp:973 msgid "AdLib emulator:" msgstr "AdLib emulator:" -#: gui/options.cpp:911 gui/options.cpp:912 +#: gui/options.cpp:973 gui/options.cpp:974 msgid "AdLib is used for music in many games" msgstr "AdLib bliver brugt til musik i mange spil" -#: gui/options.cpp:922 +#: gui/options.cpp:984 msgid "Output rate:" msgstr "Udgangsfrekvens:" -#: gui/options.cpp:922 gui/options.cpp:923 +#: gui/options.cpp:984 gui/options.cpp:985 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -921,60 +934,60 @@ msgstr "" "Hјjere vцrdi angiver bedre lyd kvalitet, men understјttes mхske ikke af dit " "lydkort" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "GM Device:" msgstr "GM enhed:" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "Specifies default sound device for General MIDI output" msgstr "Angiver standard lyd enhed for Generel MIDI-udgang" -#: gui/options.cpp:944 +#: gui/options.cpp:1006 msgid "Don't use General MIDI music" msgstr "Brug ikke Generel MIDI musik" -#: gui/options.cpp:955 gui/options.cpp:1017 +#: gui/options.cpp:1017 gui/options.cpp:1079 msgid "Use first available device" msgstr "Brug fјrste tilgцngelig enhed" -#: gui/options.cpp:967 +#: gui/options.cpp:1029 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:967 gui/options.cpp:969 gui/options.cpp:970 +#: gui/options.cpp:1029 gui/options.cpp:1031 gui/options.cpp:1032 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:969 +#: gui/options.cpp:1031 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Mixed AdLib/MIDI mode" msgstr "Blandet AdLib/MIDI tilstand" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Use both MIDI and AdLib sound generation" msgstr "Brug bхde MIDI og AdLib lyd generering" -#: gui/options.cpp:978 +#: gui/options.cpp:1040 msgid "MIDI gain:" msgstr "MIDI lydstyrke:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "MT-32 Device:" msgstr "MT-32 enhed:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 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:993 +#: gui/options.cpp:1055 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Цgte Roland MT-32 (undlad GM emulering)" -#: gui/options.cpp:993 gui/options.cpp:995 +#: gui/options.cpp:1055 gui/options.cpp:1057 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -982,16 +995,16 @@ msgstr "" "Kryds af hvis du vil bruge din rigtige hardware Roland-kompatible lyd enhed " "tilsluttet til din computer" -#: gui/options.cpp:995 +#: gui/options.cpp:1057 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Цgte Roland MT-32 (ingen GM emulering)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland GS enhed (aktivщr MT-32 tilknytninger)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -999,288 +1012,293 @@ msgstr "" "Kryds af hvis du vil aktivere patch tilknytninger, for at emulere en MT-32 " "pх en Roland GS enhed" -#: gui/options.cpp:1007 +#: gui/options.cpp:1069 msgid "Don't use Roland MT-32 music" msgstr "Brug ikke Roland MT-32 musik" -#: gui/options.cpp:1034 +#: gui/options.cpp:1096 msgid "Text and Speech:" msgstr "Tekst og tale:" -#: gui/options.cpp:1038 gui/options.cpp:1048 +#: gui/options.cpp:1100 gui/options.cpp:1110 msgid "Speech" msgstr "Tale" -#: gui/options.cpp:1039 gui/options.cpp:1049 +#: gui/options.cpp:1101 gui/options.cpp:1111 msgid "Subtitles" msgstr "Undertekster" -#: gui/options.cpp:1040 +#: gui/options.cpp:1102 msgid "Both" msgstr "Begge" -#: gui/options.cpp:1042 +#: gui/options.cpp:1104 msgid "Subtitle speed:" msgstr "Tekst hastighed:" -#: gui/options.cpp:1044 +#: gui/options.cpp:1106 msgctxt "lowres" msgid "Text and Speech:" msgstr "Tekst og tale:" -#: gui/options.cpp:1048 +#: gui/options.cpp:1110 msgid "Spch" msgstr "Tale" -#: gui/options.cpp:1049 +#: gui/options.cpp:1111 msgid "Subs" msgstr "Tekst" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgctxt "lowres" msgid "Both" msgstr "Begge" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgid "Show subtitles and play speech" msgstr "Vis undertekster og afspil tale" -#: gui/options.cpp:1052 +#: gui/options.cpp:1114 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Tekst hastighed:" -#: gui/options.cpp:1068 +#: gui/options.cpp:1130 msgid "Music volume:" msgstr "Musik lydstyrke:" -#: gui/options.cpp:1070 +#: gui/options.cpp:1132 msgctxt "lowres" msgid "Music volume:" msgstr "Musik lydstyrke:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1139 msgid "Mute All" msgstr "Mute alle" -#: gui/options.cpp:1080 +#: gui/options.cpp:1142 msgid "SFX volume:" msgstr "SFX lydstyrke:" -#: gui/options.cpp:1080 gui/options.cpp:1082 gui/options.cpp:1083 +#: gui/options.cpp:1142 gui/options.cpp:1144 gui/options.cpp:1145 msgid "Special sound effects volume" msgstr "Lydstyrke for specielle lydeffekter" -#: gui/options.cpp:1082 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "SFX volume:" msgstr "SFX lydstyrke:" -#: gui/options.cpp:1090 +#: gui/options.cpp:1152 msgid "Speech volume:" msgstr "Tale lydstyrke:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1154 msgctxt "lowres" msgid "Speech volume:" msgstr "Tale lydstyrke:" -#: gui/options.cpp:1311 +#: gui/options.cpp:1351 +#, fuzzy +msgid "Control" +msgstr "Kontrollщr mus" + +#: gui/options.cpp:1383 msgid "FluidSynth Settings" msgstr "FluidSynth indstillinger" -#: gui/options.cpp:1342 +#: gui/options.cpp:1414 msgid "Theme Path:" msgstr "Tema sti:" -#: gui/options.cpp:1344 +#: gui/options.cpp:1416 msgctxt "lowres" msgid "Theme Path:" msgstr "Tema sti:" -#: gui/options.cpp:1350 gui/options.cpp:1352 gui/options.cpp:1353 +#: gui/options.cpp:1422 gui/options.cpp:1424 gui/options.cpp:1425 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:1359 +#: gui/options.cpp:1431 msgid "Plugins Path:" msgstr "Plugin sti:" -#: gui/options.cpp:1361 +#: gui/options.cpp:1433 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugin sti:" -#: gui/options.cpp:1372 +#: gui/options.cpp:1444 msgctxt "lowres" msgid "Misc" msgstr "Andet" -#: gui/options.cpp:1374 +#: gui/options.cpp:1446 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1378 +#: gui/options.cpp:1450 msgid "GUI Renderer:" msgstr "GUI renderer:" -#: gui/options.cpp:1390 +#: gui/options.cpp:1462 msgid "Autosave:" msgstr "Auto gemme:" -#: gui/options.cpp:1392 +#: gui/options.cpp:1464 msgctxt "lowres" msgid "Autosave:" msgstr "Auto gemme:" -#: gui/options.cpp:1400 +#: gui/options.cpp:1472 msgid "Keys" msgstr "Taster" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "GUI Language:" msgstr "Sprog:" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "Language of ScummVM GUI" msgstr "Sprog for brugerfladen i ScummVM" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "Update check:" msgstr "" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "How often to check ScummVM updates" msgstr "" -#: gui/options.cpp:1447 +#: gui/options.cpp:1519 msgid "Check now" msgstr "" -#: gui/options.cpp:1455 +#: gui/options.cpp:1527 msgid "Cloud" msgstr "" -#: gui/options.cpp:1457 +#: gui/options.cpp:1529 msgctxt "lowres" msgid "Cloud" msgstr "" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Storage:" msgstr "" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Active cloud storage" msgstr "" -#: gui/options.cpp:1469 gui/options.cpp:2026 +#: gui/options.cpp:1541 gui/options.cpp:2098 msgid "<none>" msgstr "" -#: gui/options.cpp:1473 backends/platform/wii/options.cpp:114 +#: gui/options.cpp:1545 backends/platform/wii/options.cpp:114 msgid "Username:" msgstr "Bruger:" -#: gui/options.cpp:1473 +#: gui/options.cpp:1545 msgid "Username used by this storage" msgstr "" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Used space:" msgstr "" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Space used by ScummVM's saved games on this storage" msgstr "" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "Last sync time:" msgstr "" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "When the last saved games sync for this storage occured" msgstr "" -#: gui/options.cpp:1482 gui/storagewizarddialog.cpp:71 +#: gui/options.cpp:1554 gui/storagewizarddialog.cpp:71 msgid "Connect" msgstr "" -#: gui/options.cpp:1482 +#: gui/options.cpp:1554 msgid "Open wizard dialog to connect your cloud storage account" msgstr "" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh" msgstr "" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh current cloud storage information (username and usage)" msgstr "" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 #, fuzzy msgid "Download" msgstr "Ned" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Open downloads manager dialog" msgstr "" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run server" msgstr "" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run local webserver" msgstr "" -#: gui/options.cpp:1487 gui/options.cpp:2136 +#: gui/options.cpp:1559 gui/options.cpp:2208 #, fuzzy msgid "Not running" msgstr "Fejl ved kјrsel af spil:" -#: gui/options.cpp:1491 +#: gui/options.cpp:1563 #, fuzzy msgid "/root/ Path:" msgstr "Ekstra sti:" -#: gui/options.cpp:1491 gui/options.cpp:1493 gui/options.cpp:1494 +#: gui/options.cpp:1563 gui/options.cpp:1565 gui/options.cpp:1566 #, fuzzy msgid "Specifies which directory the Files Manager can access" msgstr "Angiver hvor dine gemmer bliver lagt" -#: gui/options.cpp:1493 +#: gui/options.cpp:1565 #, fuzzy msgctxt "lowres" msgid "/root/ Path:" msgstr "Ekstra sti:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 #, fuzzy msgid "Server's port:" msgstr "Server:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "" "Which port is used by the server\n" "Auth with server is not available with non-default port" msgstr "" -#: gui/options.cpp:1516 +#: gui/options.cpp:1588 msgid "Apply" msgstr "" -#: gui/options.cpp:1682 +#: gui/options.cpp:1754 #, fuzzy msgid "Failed to change cloud storage!" msgstr "Mislykkedes at gemme spil" -#: gui/options.cpp:1685 +#: gui/options.cpp:1757 msgid "Another cloud storage is already active." msgstr "" -#: gui/options.cpp:1721 +#: gui/options.cpp:1793 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1288,51 +1306,51 @@ msgstr "" "Temaet du valgte understјtter ikke dit aktuelle sprog. Hvis du јnsker at " "bruge dette tema, skal du skifte til et andet sprog fјrst." -#: gui/options.cpp:1756 +#: gui/options.cpp:1828 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:1765 +#: gui/options.cpp:1837 msgid "Select directory for GUI themes" msgstr "Vцlg bibliotek for GUI temaer" -#: gui/options.cpp:1775 +#: gui/options.cpp:1847 msgid "Select directory for extra files" msgstr "Vцlg bibliotek for ekstra filer" -#: gui/options.cpp:1786 +#: gui/options.cpp:1858 msgid "Select directory for plugins" msgstr "Vцlg bibliotek for plugins" -#: gui/options.cpp:1798 +#: gui/options.cpp:1870 #, fuzzy msgid "Select directory for Files Manager /root/" msgstr "Vцlg bibliotek for ekstra filer" -#: gui/options.cpp:2033 +#: gui/options.cpp:2105 #, c-format msgid "%llu bytes" msgstr "" -#: gui/options.cpp:2041 +#: gui/options.cpp:2113 msgid "<right now>" msgstr "" -#: gui/options.cpp:2043 +#: gui/options.cpp:2115 #, fuzzy msgid "<never>" msgstr "Aldrig" -#: gui/options.cpp:2127 +#: gui/options.cpp:2199 #, fuzzy msgid "Stop server" msgstr "Server:" -#: gui/options.cpp:2128 +#: gui/options.cpp:2200 msgid "Stop local webserver" msgstr "" -#: gui/options.cpp:2219 +#: gui/options.cpp:2291 msgid "" "Request failed.\n" "Check your Internet connection." diff --git a/po/de_DE.po b/po/de_DE.po index c1650206f6..190e4698fb 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-02-11 08:56+0100\n" +"POT-Creation-Date: 2017-02-21 23:29+0100\n" "PO-Revision-Date: 2017-02-08 21:48+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:1515 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69 +#: gui/options.cpp:1587 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:443 #: gui/saveload-dialog.cpp:717 gui/saveload-dialog.cpp:1111 @@ -158,7 +158,7 @@ msgstr "" #: gui/downloaddialog.cpp:146 gui/editgamedialog.cpp:293 #: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:522 -#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1517 +#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1589 #: gui/saveload-dialog.cpp:1112 engines/engine.cpp:477 engines/engine.cpp:488 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 @@ -244,7 +244,7 @@ msgstr "" "nicht in eine deutsche verwandeln" #: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:121 -#: gui/options.cpp:845 gui/options.cpp:858 gui/options.cpp:1410 +#: gui/options.cpp:907 gui/options.cpp:920 gui/options.cpp:1482 #: audio/null.cpp:41 msgid "<default>" msgstr "<Standard>" @@ -267,11 +267,11 @@ msgstr "Plattform:" msgid "Engine" msgstr "Engine" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "Graphics" msgstr "Grafik" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "GFX" msgstr "GFX" @@ -284,7 +284,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Globale Grafik-Einstellungen ќbergehen" -#: gui/editgamedialog.cpp:196 gui/options.cpp:1292 +#: gui/editgamedialog.cpp:196 gui/options.cpp:1364 msgid "Audio" msgstr "Audio" @@ -297,11 +297,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Globale Audio-Einstellungen ќbergehen" -#: gui/editgamedialog.cpp:210 gui/options.cpp:1297 +#: gui/editgamedialog.cpp:210 gui/options.cpp:1369 msgid "Volume" msgstr "Lautstфrke" -#: gui/editgamedialog.cpp:212 gui/options.cpp:1299 +#: gui/editgamedialog.cpp:212 gui/options.cpp:1371 msgctxt "lowres" msgid "Volume" msgstr "Lautst." @@ -315,7 +315,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Globale Lautstфrke-Einstellungen ќbergehen" -#: gui/editgamedialog.cpp:226 gui/options.cpp:1307 +#: gui/editgamedialog.cpp:226 gui/options.cpp:1379 msgid "MIDI" msgstr "MIDI" @@ -328,7 +328,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Globale MIDI-Einstellungen ќbergehen" -#: gui/editgamedialog.cpp:241 gui/options.cpp:1317 +#: gui/editgamedialog.cpp:241 gui/options.cpp:1389 msgid "MT-32" msgstr "MT-32" @@ -341,11 +341,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Globale MT-32-Einstellungen ќbergehen" -#: gui/editgamedialog.cpp:255 gui/options.cpp:1324 +#: gui/editgamedialog.cpp:255 gui/options.cpp:1396 msgid "Paths" msgstr "Pfade" -#: gui/editgamedialog.cpp:257 gui/options.cpp:1326 +#: gui/editgamedialog.cpp:257 gui/options.cpp:1398 msgctxt "lowres" msgid "Paths" msgstr "Pfade" @@ -359,7 +359,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Spielpfad:" -#: gui/editgamedialog.cpp:271 gui/options.cpp:1350 +#: gui/editgamedialog.cpp:271 gui/options.cpp:1422 msgid "Extra Path:" msgstr "Extras:" @@ -368,44 +368,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:1352 +#: gui/editgamedialog.cpp:273 gui/options.cpp:1424 msgctxt "lowres" msgid "Extra Path:" msgstr "Extras:" -#: gui/editgamedialog.cpp:280 gui/options.cpp:1334 +#: gui/editgamedialog.cpp:280 gui/options.cpp:1406 msgid "Save Path:" msgstr "Spielstфnde:" #: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282 -#: gui/editgamedialog.cpp:283 gui/options.cpp:1334 gui/options.cpp:1336 -#: gui/options.cpp:1337 +#: gui/editgamedialog.cpp:283 gui/options.cpp:1406 gui/options.cpp:1408 +#: gui/options.cpp:1409 msgid "Specifies where your saved games are put" msgstr "Legt fest, wo die Spielstфnde gespeichert werden" -#: gui/editgamedialog.cpp:282 gui/options.cpp:1336 +#: gui/editgamedialog.cpp:282 gui/options.cpp:1408 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:1345 -#: gui/options.cpp:1353 gui/options.cpp:1362 gui/options.cpp:1542 -#: gui/options.cpp:1548 gui/options.cpp:1556 gui/options.cpp:1579 -#: gui/options.cpp:1608 gui/options.cpp:1614 gui/options.cpp:1621 -#: gui/options.cpp:1629 gui/options.cpp:1812 gui/options.cpp:1815 -#: gui/options.cpp:1822 gui/options.cpp:1832 +#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1417 +#: gui/options.cpp:1425 gui/options.cpp:1434 gui/options.cpp:1614 +#: gui/options.cpp:1620 gui/options.cpp:1628 gui/options.cpp:1651 +#: gui/options.cpp:1680 gui/options.cpp:1686 gui/options.cpp:1693 +#: gui/options.cpp:1701 gui/options.cpp:1884 gui/options.cpp:1887 +#: gui/options.cpp:1894 gui/options.cpp:1904 msgctxt "path" msgid "None" msgstr "Keiner" #: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404 -#: gui/editgamedialog.cpp:522 gui/options.cpp:1536 gui/options.cpp:1602 -#: gui/options.cpp:1818 backends/platform/wii/options.cpp:56 +#: gui/editgamedialog.cpp:522 gui/options.cpp:1608 gui/options.cpp:1674 +#: gui/options.cpp:1890 backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/editgamedialog.cpp:450 gui/options.cpp:1826 +#: gui/editgamedialog.cpp:450 gui/options.cpp:1898 msgid "Select SoundFont" msgstr "SoundFont auswфhlen" @@ -413,7 +413,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:1749 +#: gui/editgamedialog.cpp:502 gui/options.cpp:1821 msgid "Select directory for saved games" msgstr "Verzeichnis fќr Spielstфnde auswфhlen" @@ -506,7 +506,7 @@ msgstr "Sinus" msgid "Triangle" msgstr "Dreieck" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1370 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1442 msgid "Misc" msgstr "Sonstiges" @@ -829,105 +829,118 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:289 gui/options.cpp:552 gui/options.cpp:690 -#: gui/options.cpp:759 gui/options.cpp:970 +#: gui/options.cpp:316 gui/options.cpp:598 gui/options.cpp:736 +#: gui/options.cpp:805 gui/options.cpp:1032 msgctxt "soundfont" msgid "None" msgstr "Kein SoundFont" -#: gui/options.cpp:456 +#: gui/options.cpp:502 msgid "Failed to apply some of the graphic options changes:" msgstr "Folgende Grafikoptionen konnten nicht geфndert werden:" -#: gui/options.cpp:468 +#: gui/options.cpp:514 msgid "the video mode could not be changed." msgstr "Grafikmodus konnte nicht geфndert werden." -#: gui/options.cpp:474 +#: gui/options.cpp:520 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:480 +#: gui/options.cpp:526 msgid "the fullscreen setting could not be changed" msgstr "Vollbildeinstellung konnte nicht geфndert werden" -#: gui/options.cpp:486 +#: gui/options.cpp:532 msgid "the filtering setting could not be changed" msgstr "Die Filtereinstellung konnte nicht geфndert werden" -#: gui/options.cpp:842 +#: gui/options.cpp:884 +msgid "Show On-screen control" +msgstr "" + +#: gui/options.cpp:888 +#, fuzzy +msgid "Touchpad mouse mode" +msgstr "Touchpad-Modus ausgeschaltet." + +#: gui/options.cpp:892 +msgid "Swap Menu and Back buttons" +msgstr "" + +#: gui/options.cpp:904 msgid "Graphics mode:" msgstr "Grafikmodus:" -#: gui/options.cpp:856 +#: gui/options.cpp:918 msgid "Render mode:" msgstr "Render-Modus:" -#: gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:918 gui/options.cpp:919 msgid "Special dithering modes supported by some games" msgstr "Spezielle Farbmischungsmethoden werden von manchen Spielen unterstќtzt" -#: gui/options.cpp:868 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 +#: gui/options.cpp:930 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2460 msgid "Fullscreen mode" msgstr "Vollbildmodus" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Filter graphics" msgstr "Bilineare Filterung" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Use linear filtering when scaling graphics" msgstr "Verwende bilineare Filterung zur Grafik-Skalierung" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Aspect ratio correction" msgstr "Seitenverhфltnis korrigieren" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Correct aspect ratio for 320x200 games" msgstr "Seitenverhфltnis fќr Spiele mit der Auflіsung 320x200 korrigieren" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Preferred Device:" msgstr "Bevorzugtes Gerфt:" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Music Device:" msgstr "Musikgerфt:" -#: gui/options.cpp:882 gui/options.cpp:884 +#: gui/options.cpp:944 gui/options.cpp:946 msgid "Specifies preferred sound device or sound card emulator" msgstr "" "Legt das bevorzugte Tonwiedergabe-Gerфt oder den Soundkarten-Emulator fest" -#: gui/options.cpp:882 gui/options.cpp:884 gui/options.cpp:885 +#: gui/options.cpp:944 gui/options.cpp:946 gui/options.cpp:947 msgid "Specifies output sound device or sound card emulator" msgstr "Legt das Musikwiedergabe-Gerфt oder den Soundkarten-Emulator fest" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Standard-Gerфt:" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Music Device:" msgstr "Musikgerфt:" -#: gui/options.cpp:911 +#: gui/options.cpp:973 msgid "AdLib emulator:" msgstr "AdLib-Emulator:" -#: gui/options.cpp:911 gui/options.cpp:912 +#: gui/options.cpp:973 gui/options.cpp:974 msgid "AdLib is used for music in many games" msgstr "AdLib wird fќr die Musik in vielen Spielen verwendet" -#: gui/options.cpp:922 +#: gui/options.cpp:984 msgid "Output rate:" msgstr "Ausgabefrequenz:" -#: gui/options.cpp:922 gui/options.cpp:923 +#: gui/options.cpp:984 gui/options.cpp:985 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -935,64 +948,64 @@ msgstr "" "Hіhere Werte bewirken eine bessere Soundqualitфt, werden aber mіglicherweise " "nicht von jeder Soundkarte unterstќtzt" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "GM Device:" msgstr "GM-Gerфt:" -#: gui/options.cpp:933 +#: gui/options.cpp:995 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:944 +#: gui/options.cpp:1006 msgid "Don't use General MIDI music" msgstr "Keine General-MIDI-Musik" -#: gui/options.cpp:955 gui/options.cpp:1017 +#: gui/options.cpp:1017 gui/options.cpp:1079 msgid "Use first available device" msgstr "Erstes verfќgbares Gerфt" -#: gui/options.cpp:967 +#: gui/options.cpp:1029 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:967 gui/options.cpp:969 gui/options.cpp:970 +#: gui/options.cpp:1029 gui/options.cpp:1031 gui/options.cpp:1032 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:969 +#: gui/options.cpp:1031 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Mixed AdLib/MIDI mode" msgstr "Gemischter AdLib/MIDI-Modus" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Use both MIDI and AdLib sound generation" msgstr "Kombiniert MIDI-Musik mit AdLib-Soundeffekten" -#: gui/options.cpp:978 +#: gui/options.cpp:1040 msgid "MIDI gain:" msgstr "MIDI-Lautstфrke:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "MT-32 Device:" msgstr "MT-32-Gerфt:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 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:993 +#: gui/options.cpp:1055 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Echte Roland MT-32 (GM-Emulation deaktiviert)" -#: gui/options.cpp:993 gui/options.cpp:995 +#: gui/options.cpp:1055 gui/options.cpp:1057 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -1000,16 +1013,16 @@ msgstr "" "Wфhlen Sie dies aus, wenn Sie ein echtes Roland-kompatibles Soundgerфt " "verwenden" -#: gui/options.cpp:995 +#: gui/options.cpp:1057 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Echte Roland MT-32 (keine GM-Emulation)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland-GS-Gerфt (MT-32-Zuweisungen aktivieren)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -1017,270 +1030,275 @@ msgstr "" "Auswфhlen, wenn Sie ausbessernde Instrumentzuweisungen aktivieren mіchten, " "um MT-32 auf einem Roland-GS-Gerфt zu emulieren" -#: gui/options.cpp:1007 +#: gui/options.cpp:1069 msgid "Don't use Roland MT-32 music" msgstr "Keine Roland-MT-32-Musik" -#: gui/options.cpp:1034 +#: gui/options.cpp:1096 msgid "Text and Speech:" msgstr "Sprache und Text:" -#: gui/options.cpp:1038 gui/options.cpp:1048 +#: gui/options.cpp:1100 gui/options.cpp:1110 msgid "Speech" msgstr "Sprache" -#: gui/options.cpp:1039 gui/options.cpp:1049 +#: gui/options.cpp:1101 gui/options.cpp:1111 msgid "Subtitles" msgstr "Untertitel" -#: gui/options.cpp:1040 +#: gui/options.cpp:1102 msgid "Both" msgstr "Beides" -#: gui/options.cpp:1042 +#: gui/options.cpp:1104 msgid "Subtitle speed:" msgstr "Untertitel-Tempo:" -#: gui/options.cpp:1044 +#: gui/options.cpp:1106 msgctxt "lowres" msgid "Text and Speech:" msgstr "Text u. Sprache:" -#: gui/options.cpp:1048 +#: gui/options.cpp:1110 msgid "Spch" msgstr "Spr." -#: gui/options.cpp:1049 +#: gui/options.cpp:1111 msgid "Subs" msgstr "Text" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgctxt "lowres" msgid "Both" msgstr "S+T" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgid "Show subtitles and play speech" msgstr "Untertitel anzeigen und Sprachausgabe aktivieren" -#: gui/options.cpp:1052 +#: gui/options.cpp:1114 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Text-Tempo:" -#: gui/options.cpp:1068 +#: gui/options.cpp:1130 msgid "Music volume:" msgstr "Musiklautstфrke:" -#: gui/options.cpp:1070 +#: gui/options.cpp:1132 msgctxt "lowres" msgid "Music volume:" msgstr "Musiklautstфrke:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1139 msgid "Mute All" msgstr "Stumm" -#: gui/options.cpp:1080 +#: gui/options.cpp:1142 msgid "SFX volume:" msgstr "Effektlautstфrke:" -#: gui/options.cpp:1080 gui/options.cpp:1082 gui/options.cpp:1083 +#: gui/options.cpp:1142 gui/options.cpp:1144 gui/options.cpp:1145 msgid "Special sound effects volume" msgstr "Lautstфrke spezieller Gerфusch-Effekte" -#: gui/options.cpp:1082 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "SFX volume:" msgstr "Effektlautst.:" -#: gui/options.cpp:1090 +#: gui/options.cpp:1152 msgid "Speech volume:" msgstr "Sprachlautstфrke:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1154 msgctxt "lowres" msgid "Speech volume:" msgstr "Sprachlautst.:" -#: gui/options.cpp:1311 +#: gui/options.cpp:1351 +#, fuzzy +msgid "Control" +msgstr "Maus steuern" + +#: gui/options.cpp:1383 msgid "FluidSynth Settings" msgstr "FluidSynth-Einstellungen" -#: gui/options.cpp:1342 +#: gui/options.cpp:1414 msgid "Theme Path:" msgstr "Themen:" -#: gui/options.cpp:1344 +#: gui/options.cpp:1416 msgctxt "lowres" msgid "Theme Path:" msgstr "Themen:" -#: gui/options.cpp:1350 gui/options.cpp:1352 gui/options.cpp:1353 +#: gui/options.cpp:1422 gui/options.cpp:1424 gui/options.cpp:1425 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:1359 +#: gui/options.cpp:1431 msgid "Plugins Path:" msgstr "Plugins:" -#: gui/options.cpp:1361 +#: gui/options.cpp:1433 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugins:" -#: gui/options.cpp:1372 +#: gui/options.cpp:1444 msgctxt "lowres" msgid "Misc" msgstr "Andere" -#: gui/options.cpp:1374 +#: gui/options.cpp:1446 msgid "Theme:" msgstr "Thema:" -#: gui/options.cpp:1378 +#: gui/options.cpp:1450 msgid "GUI Renderer:" msgstr "GUI-Renderer:" -#: gui/options.cpp:1390 +#: gui/options.cpp:1462 msgid "Autosave:" msgstr "Autom. Speichern:" -#: gui/options.cpp:1392 +#: gui/options.cpp:1464 msgctxt "lowres" msgid "Autosave:" msgstr "Autospeichern:" -#: gui/options.cpp:1400 +#: gui/options.cpp:1472 msgid "Keys" msgstr "Tasten" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "GUI Language:" msgstr "Sprache:" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "Language of ScummVM GUI" msgstr "Sprache der ScummVM-Oberflфche" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "Update check:" msgstr "Updates suchen:" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "How often to check ScummVM updates" msgstr "Wie oft nach Aktualisierungen von ScummVM suchen?" -#: gui/options.cpp:1447 +#: gui/options.cpp:1519 msgid "Check now" msgstr "Jetzt prќfen" -#: gui/options.cpp:1455 +#: gui/options.cpp:1527 msgid "Cloud" msgstr "Cloud" -#: gui/options.cpp:1457 +#: gui/options.cpp:1529 msgctxt "lowres" msgid "Cloud" msgstr "Cloud" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Storage:" msgstr "Cloud-Speicher:" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Active cloud storage" msgstr "Aktiver Cloud-Speicher" -#: gui/options.cpp:1469 gui/options.cpp:2026 +#: gui/options.cpp:1541 gui/options.cpp:2098 msgid "<none>" msgstr "<keiner>" -#: gui/options.cpp:1473 backends/platform/wii/options.cpp:114 +#: gui/options.cpp:1545 backends/platform/wii/options.cpp:114 msgid "Username:" msgstr "Benutzername:" -#: gui/options.cpp:1473 +#: gui/options.cpp:1545 msgid "Username used by this storage" msgstr "Benutzername, der von diesem Cloud-Speicher verwendet wird" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Used space:" msgstr "Belegter Speicher:" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 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:1479 +#: gui/options.cpp:1551 msgid "Last sync time:" msgstr "Letzte Sync.:" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "When the last saved games sync for this storage occured" msgstr "Zeitpunkt der letzten Spielstand-Synchronisierung" -#: gui/options.cpp:1482 gui/storagewizarddialog.cpp:71 +#: gui/options.cpp:1554 gui/storagewizarddialog.cpp:71 msgid "Connect" msgstr "Verbinden" -#: gui/options.cpp:1482 +#: gui/options.cpp:1554 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:1483 +#: gui/options.cpp:1555 msgid "Refresh" msgstr "Aktualisieren" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh current cloud storage information (username and usage)" msgstr "" "Aktualisiert die Informationen ќber diesen Cloud-Speicher (Benutzername und " "Belegung)" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Download" msgstr "Herunterladen" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Open downloads manager dialog" msgstr "жffnet den Download-Manager" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run server" msgstr "Server starten" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run local webserver" msgstr "Startet den lokalen Webserver" -#: gui/options.cpp:1487 gui/options.cpp:2136 +#: gui/options.cpp:1559 gui/options.cpp:2208 msgid "Not running" msgstr "Nicht gestartet" -#: gui/options.cpp:1491 +#: gui/options.cpp:1563 msgid "/root/ Path:" msgstr "/root/-Pfad:" -#: gui/options.cpp:1491 gui/options.cpp:1493 gui/options.cpp:1494 +#: gui/options.cpp:1563 gui/options.cpp:1565 gui/options.cpp:1566 msgid "Specifies which directory the Files Manager can access" msgstr "Legt fest, auf welches Verzeichnis der Dateimanager zugreifen darf" -#: gui/options.cpp:1493 +#: gui/options.cpp:1565 msgctxt "lowres" msgid "/root/ Path:" msgstr "/root/-Pfad:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "Server's port:" msgstr "Server-Port:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "" "Which port is used by the server\n" "Auth with server is not available with non-default port" @@ -1289,20 +1307,20 @@ msgstr "" "Authentifizierung mit dem Server ist nicht verfќgbar, wenn ein anderer Port " "verwendet wird" -#: gui/options.cpp:1516 +#: gui/options.cpp:1588 msgid "Apply" msgstr "мbernehmen" -#: gui/options.cpp:1682 +#: gui/options.cpp:1754 msgid "Failed to change cloud storage!" msgstr "Konnte den Cloud-Speicher nicht фndern!" -#: gui/options.cpp:1685 +#: gui/options.cpp:1757 msgid "Another cloud storage is already active." msgstr "Ein anderer Cloud-Speicher arbeitet gerade." # Nicht ќbersetzen, da diese Nachricht nur fќr nicht-lateinische Sprachen relevant ist. -#: gui/options.cpp:1721 +#: gui/options.cpp:1793 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1311,51 +1329,51 @@ msgstr "" "dieses Thema benutzen wollen, mќssen Sie erst zu einer anderen Sprache " "wechseln." -#: gui/options.cpp:1756 +#: gui/options.cpp:1828 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:1765 +#: gui/options.cpp:1837 msgid "Select directory for GUI themes" msgstr "Verzeichnis fќr Oberflфchen-Themen" -#: gui/options.cpp:1775 +#: gui/options.cpp:1847 msgid "Select directory for extra files" msgstr "Verzeichnis fќr zusфtzliche Dateien auswфhlen" -#: gui/options.cpp:1786 +#: gui/options.cpp:1858 msgid "Select directory for plugins" msgstr "Verzeichnis fќr Erweiterungen auswфhlen" -#: gui/options.cpp:1798 +#: gui/options.cpp:1870 msgid "Select directory for Files Manager /root/" msgstr "" "Wфhlen Sie das Verzeichnis aus, welches als Stammverzeichnis ('root') dient" -#: gui/options.cpp:2033 +#: gui/options.cpp:2105 #, c-format msgid "%llu bytes" msgstr "%llu Bytes" -#: gui/options.cpp:2041 +#: gui/options.cpp:2113 msgid "<right now>" msgstr "<gerade eben>" -#: gui/options.cpp:2043 +#: gui/options.cpp:2115 msgid "<never>" msgstr "<nie>" -#: gui/options.cpp:2127 +#: gui/options.cpp:2199 msgid "Stop server" msgstr "Server anhalten" -#: gui/options.cpp:2128 +#: gui/options.cpp:2200 msgid "Stop local webserver" msgstr "Lokalen Webserver anhalten" -#: gui/options.cpp:2219 +#: gui/options.cpp:2291 msgid "" "Request failed.\n" "Check your Internet connection." @@ -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-02-11 08:56+0100\n" +"POT-Creation-Date: 2017-02-21 23:29+0100\n" "PO-Revision-Date: 2017-01-07 02:29+0000\n" "Last-Translator: Filippos Karapetis <bluegr@gmail.com>\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:1515 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69 +#: gui/options.cpp:1587 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:443 #: gui/saveload-dialog.cpp:717 gui/saveload-dialog.cpp:1111 @@ -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:522 -#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1517 +#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1589 #: gui/saveload-dialog.cpp:1112 engines/engine.cpp:477 engines/engine.cpp:488 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 @@ -241,7 +241,7 @@ msgstr "" "№сщїэщфщя§ ѓсђ ѓх Сууыщъо" #: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:121 -#: gui/options.cpp:845 gui/options.cpp:858 gui/options.cpp:1410 +#: gui/options.cpp:907 gui/options.cpp:920 gui/options.cpp:1482 #: audio/null.cpp:41 msgid "<default>" msgstr "<№ёяъсшяёщѓьнэч>" @@ -264,11 +264,11 @@ msgstr "аысєіќёьс:" msgid "Engine" msgstr "Ьчїсэо" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "Graphics" msgstr "Уёсіщъм" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "GFX" msgstr "Уёсі." @@ -281,7 +281,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "асёмъсьјч ёѕшь, уёсіщъўэ" -#: gui/editgamedialog.cpp:196 gui/options.cpp:1292 +#: gui/editgamedialog.cpp:196 gui/options.cpp:1364 msgid "Audio" msgstr "Йїяђ" @@ -294,11 +294,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "асёмъсьјч ёѕшь. оїяѕ" -#: gui/editgamedialog.cpp:210 gui/options.cpp:1297 +#: gui/editgamedialog.cpp:210 gui/options.cpp:1369 msgid "Volume" msgstr "Иэєсѓч" -#: gui/editgamedialog.cpp:212 gui/options.cpp:1299 +#: gui/editgamedialog.cpp:212 gui/options.cpp:1371 msgctxt "lowres" msgid "Volume" msgstr "Иэєсѓч" @@ -312,7 +312,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "асёмъсьјч ёѕшь. нэєсѓчђ" -#: gui/editgamedialog.cpp:226 gui/options.cpp:1307 +#: gui/editgamedialog.cpp:226 gui/options.cpp:1379 msgid "MIDI" msgstr "MIDI" @@ -325,7 +325,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "асёмъсьјч ёѕшь. MIDI" -#: gui/editgamedialog.cpp:241 gui/options.cpp:1317 +#: gui/editgamedialog.cpp:241 gui/options.cpp:1389 msgid "MT-32" msgstr "MT-32" @@ -338,11 +338,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "асёмъсьјч ёѕшь. MT-32" -#: gui/editgamedialog.cpp:255 gui/options.cpp:1324 +#: gui/editgamedialog.cpp:255 gui/options.cpp:1396 msgid "Paths" msgstr "жмъхыящ" -#: gui/editgamedialog.cpp:257 gui/options.cpp:1326 +#: gui/editgamedialog.cpp:257 gui/options.cpp:1398 msgctxt "lowres" msgid "Paths" msgstr "жмъхыящ" @@ -356,7 +356,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "жмъхыяђ асщїэщфщя§:" -#: gui/editgamedialog.cpp:271 gui/options.cpp:1350 +#: gui/editgamedialog.cpp:271 gui/options.cpp:1422 msgid "Extra Path:" msgstr "жмъхыяђ Июєёс:" @@ -366,44 +366,44 @@ msgid "Specifies path to additional data used by the game" msgstr "" "Ъсшяёпцхщ фщсфёяьо ущс №ёќѓшхєс фхфяьнэс №яѕ їёчѓщья№ящя§эєсщ с№ќ єя №сщїэпфщ" -#: gui/editgamedialog.cpp:273 gui/options.cpp:1352 +#: gui/editgamedialog.cpp:273 gui/options.cpp:1424 msgctxt "lowres" msgid "Extra Path:" msgstr "жмъхыяђ Июєёс:" -#: gui/editgamedialog.cpp:280 gui/options.cpp:1334 +#: gui/editgamedialog.cpp:280 gui/options.cpp:1406 msgid "Save Path:" msgstr "жмъхыяђ С№яшоъхѕѓчђ:" #: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282 -#: gui/editgamedialog.cpp:283 gui/options.cpp:1334 gui/options.cpp:1336 -#: gui/options.cpp:1337 +#: gui/editgamedialog.cpp:283 gui/options.cpp:1406 gui/options.cpp:1408 +#: gui/options.cpp:1409 msgid "Specifies where your saved games are put" msgstr "Ъсшяёпцхщ єчэ єя№яшхѓпс єљэ с№яшчъхѕьнэљэ №сщїэщфщўэ ѓсђ" -#: gui/editgamedialog.cpp:282 gui/options.cpp:1336 +#: gui/editgamedialog.cpp:282 gui/options.cpp:1408 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:1345 -#: gui/options.cpp:1353 gui/options.cpp:1362 gui/options.cpp:1542 -#: gui/options.cpp:1548 gui/options.cpp:1556 gui/options.cpp:1579 -#: gui/options.cpp:1608 gui/options.cpp:1614 gui/options.cpp:1621 -#: gui/options.cpp:1629 gui/options.cpp:1812 gui/options.cpp:1815 -#: gui/options.cpp:1822 gui/options.cpp:1832 +#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1417 +#: gui/options.cpp:1425 gui/options.cpp:1434 gui/options.cpp:1614 +#: gui/options.cpp:1620 gui/options.cpp:1628 gui/options.cpp:1651 +#: gui/options.cpp:1680 gui/options.cpp:1686 gui/options.cpp:1693 +#: gui/options.cpp:1701 gui/options.cpp:1884 gui/options.cpp:1887 +#: gui/options.cpp:1894 gui/options.cpp:1904 msgctxt "path" msgid "None" msgstr "Ъсэнэс" #: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404 -#: gui/editgamedialog.cpp:522 gui/options.cpp:1536 gui/options.cpp:1602 -#: gui/options.cpp:1818 backends/platform/wii/options.cpp:56 +#: gui/editgamedialog.cpp:522 gui/options.cpp:1608 gui/options.cpp:1674 +#: gui/options.cpp:1890 backends/platform/wii/options.cpp:56 msgid "Default" msgstr "аёяъсшяёщѓьнэя" -#: gui/editgamedialog.cpp:450 gui/options.cpp:1826 +#: gui/editgamedialog.cpp:450 gui/options.cpp:1898 msgid "Select SoundFont" msgstr "Х№щынюєх SoundFont" @@ -411,7 +411,7 @@ msgstr "Х№щынюєх SoundFont" msgid "Select additional game directory" msgstr "Х№щынюєх №ёќѓшхєя імъхыя №сщїэщфщя§" -#: gui/editgamedialog.cpp:502 gui/options.cpp:1749 +#: gui/editgamedialog.cpp:502 gui/options.cpp:1821 msgid "Select directory for saved games" msgstr "Х№щынюєх імъхыя ущс с№яшчъхѕьнэс №сщїэпфщс" @@ -506,7 +506,7 @@ msgstr "Чьпєяэя" msgid "Triangle" msgstr "дёпуљэя" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1370 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1442 msgid "Misc" msgstr "Фщміяёс" @@ -836,106 +836,119 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:289 gui/options.cpp:552 gui/options.cpp:690 -#: gui/options.cpp:759 gui/options.cpp:970 +#: gui/options.cpp:316 gui/options.cpp:598 gui/options.cpp:736 +#: gui/options.cpp:805 gui/options.cpp:1032 msgctxt "soundfont" msgid "None" msgstr "Ъсэнэс" -#: gui/options.cpp:456 +#: gui/options.cpp:502 msgid "Failed to apply some of the graphic options changes:" msgstr "Фхэ оєсэ фѕэсєо ч хісёьяуо яёщѓьнэљэ сыысуўэ ѓєщђ х№щыяунђ уёсіщъўэ:" -#: gui/options.cpp:468 +#: gui/options.cpp:514 msgid "the video mode could not be changed." msgstr "фхэ оєсэ фѕэсєо ч сыысуо єчђ ыхщєяѕёупсђ тпэєхя." -#: gui/options.cpp:474 +#: gui/options.cpp:520 msgid "the aspect ratio setting could not be changed" msgstr "фхэ оєсэ фѕэсєо ч сыысуо єчђ фщќёшљѓчђ сэсыяупсђ фщсѓємѓхљэ" -#: gui/options.cpp:480 +#: gui/options.cpp:526 msgid "the fullscreen setting could not be changed" msgstr "фхэ оєсэ фѕэсєо ч сыысуо єчђ ё§шьщѓчђ №ыоёяѕђ яшќэчђ" -#: gui/options.cpp:486 +#: gui/options.cpp:532 msgid "the filtering setting could not be changed" msgstr "фхэ оєсэ фѕэсєо ч сыысуо єчђ ё§шьщѓчђ іщыєёсёпѓьсєяђ" -#: gui/options.cpp:842 +#: gui/options.cpp:884 +msgid "Show On-screen control" +msgstr "" + +#: gui/options.cpp:888 +#, fuzzy +msgid "Touchpad mouse mode" +msgstr "Ыхщєяѕёупс Touchpad с№хэхёуя№ящчьнэч." + +#: gui/options.cpp:892 +msgid "Swap Menu and Back buttons" +msgstr "" + +#: gui/options.cpp:904 msgid "Graphics mode:" msgstr "Ыхщєяѕёупс уёсіщъўэ:" -#: gui/options.cpp:856 +#: gui/options.cpp:918 msgid "Render mode:" msgstr "Ыхщєяѕёупс с№ќфяѓчђ:" -#: gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:918 gui/options.cpp:919 msgid "Special dithering modes supported by some games" msgstr "" "Хщфщънђ ыхщєяѕёупхђ їёљьсєщъођ сэєщ№сёмшхѓчђ ящ я№япхђ ѕ№яѓєчёпцяэєсщ с№ќ " "яёщѓьнэс №сщїэпфщс" -#: gui/options.cpp:868 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 +#: gui/options.cpp:930 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2460 msgid "Fullscreen mode" msgstr "Ыхщєяѕёупс №ыоёяѕђ яшќэчђ" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Filter graphics" msgstr "жпыєёя уёсіщъўэ" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Use linear filtering when scaling graphics" msgstr "зёоѓч уёсььщъя§ іщыєёсёпѓьсєяђ ущс єчэ ъыщьмъљѓч уёсіщъўэ" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Aspect ratio correction" msgstr "Фщќёшљѓч сэсыяупсђ фщсѓємѓхљэ" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Correct aspect ratio for 320x200 games" msgstr "Фщќёшљѓч сэсыяупсђ фщсѓємѓхљэ ущс №сщїэпфщс 320x200" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Preferred Device:" msgstr "аёяєщьўьхэч ѓѕѓъхѕо:" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Music Device:" msgstr "гѕѓъхѕо Ьяѕѓщъођ:" -#: gui/options.cpp:882 gui/options.cpp:884 +#: gui/options.cpp:944 gui/options.cpp:946 msgid "Specifies preferred sound device or sound card emulator" msgstr "Ъсшяёпцхщ єчэ №ёяєщьўьхэч ѓѕѓъхѕо хюќфяѕ оїяѕ о хюяьящљєо ъмёєсђ оїяѕ" -#: gui/options.cpp:882 gui/options.cpp:884 gui/options.cpp:885 +#: gui/options.cpp:944 gui/options.cpp:946 gui/options.cpp:947 msgid "Specifies output sound device or sound card emulator" msgstr "Ъсшяёпцхщ єч ѓѕѓъхѕо хюќфяѕ оїяѕ о хюяьящљєо ъмёєсђ оїяѕ" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "аёяєщь. гѕѓъ.:" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Music Device:" msgstr "гѕѓъ. Ьяѕѓ.:" -#: gui/options.cpp:911 +#: gui/options.cpp:973 msgid "AdLib emulator:" msgstr "Хюяьящљєођ Adlib:" -#: gui/options.cpp:911 gui/options.cpp:912 +#: gui/options.cpp:973 gui/options.cpp:974 msgid "AdLib is used for music in many games" msgstr "Ч Adlib їёчѓщья№ящхпєсщ ущс ьяѕѓщъо ѓх №яыым №сщїэпфщс" -#: gui/options.cpp:922 +#: gui/options.cpp:984 msgid "Output rate:" msgstr "бѕшьќђ хюќфяѕ:" -#: gui/options.cpp:922 gui/options.cpp:923 +#: gui/options.cpp:984 gui/options.cpp:985 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -943,63 +956,63 @@ msgstr "" "ејчыќєхёч єщьо ъсшяёпцхщ ъсы§єхёч №ящќєчєс оїяѕ, сыым ь№яёхп эс ьчэ " "ѕ№яѓєчёпцхєсщ с№ќ єчэ ъмёєс оїяѕ ѓсђ" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "GM Device:" msgstr "гѕѓъхѕо GM:" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "Specifies default sound device for General MIDI output" msgstr "Ъсшяёпцхщ №ёях№щыхуьнэч ѓѕѓъхѕо оїяѕ ущс єчэ нюяфя General MIDI" -#: gui/options.cpp:944 +#: gui/options.cpp:1006 msgid "Don't use General MIDI music" msgstr "Ьч їёоѓч ьяѕѓщъођ General MIDI" -#: gui/options.cpp:955 gui/options.cpp:1017 +#: gui/options.cpp:1017 gui/options.cpp:1079 msgid "Use first available device" msgstr "зёоѓч №ёўєчђ фщсшнѓщьчђ ѓѕѓъхѕођ" -#: gui/options.cpp:967 +#: gui/options.cpp:1029 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:967 gui/options.cpp:969 gui/options.cpp:970 +#: gui/options.cpp:1029 gui/options.cpp:1031 gui/options.cpp:1032 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "" "дя SoundFont ѕ№яѓєчёпцхєсщ с№ќ ьхёщънђ ъмёєхђ оїяѕ, єя FluidSynth ъсщ єя " "Timidity" -#: gui/options.cpp:969 +#: gui/options.cpp:1031 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Mixed AdLib/MIDI mode" msgstr "Ьщъєо ыхщєяѕёупс Adlib/MIDI" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Use both MIDI and AdLib sound generation" msgstr "зёоѓч MIDI ъсщ Adlib ущс фчьщяѕёупс оїяѕ" -#: gui/options.cpp:978 +#: gui/options.cpp:1040 msgid "MIDI gain:" msgstr "С§ючѓч MIDI:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "MT-32 Device:" msgstr "гѕѓъхѕо MT-32:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Ъсшяёпцхщ №ёях№щыхуьнэч ѓѕѓъхѕо оїяѕ ущс нюяфя Roland MT-32/LAPC1/CM32l/CM64" -#: gui/options.cpp:993 +#: gui/options.cpp:1055 msgid "True Roland MT-32 (disable GM emulation)" msgstr "аёсуьсєщъо Roland MT-32 (с№хэхёуя№япчѓч хюяьящљєо GM)" -#: gui/options.cpp:993 gui/options.cpp:995 +#: gui/options.cpp:1055 gui/options.cpp:1057 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -1007,16 +1020,16 @@ msgstr "" "Х№щынюєх сэ шныхєх эс їёчѓщья№ящоѓхєх ѓѕѓъхѕо оїяѕ ѓѕьтсєо ьх Roland, ч " "я№япс хпэсщ ѓѕэфхфхьнэч ѓєяэ ѕ№яыяущѓєо ѓсђ" -#: gui/options.cpp:995 +#: gui/options.cpp:1057 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "аёсуьсєщъо Roland MT-32 (їљёпђ хюяьяпљѓч GM)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "гѕѓъхѕо Roland GS (хэхёуя№япчѓч сэєщѓєящїпѓхљэ MT-32)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -1024,272 +1037,277 @@ msgstr "" "Х№щынюєх сэ шныхєх эс хэхёуя№ящоѓхєх фщяёшљьнэхђ сэєщѓєящїпѓхщђ ущс эс " "хюяьящўѓхєх ьщс MT-32 ѓх ѓѕѓъхѕо Roland GS" -#: gui/options.cpp:1007 +#: gui/options.cpp:1069 msgid "Don't use Roland MT-32 music" msgstr "Ьч їёоѓч ьяѕѓщъођ Roland MT-32" -#: gui/options.cpp:1034 +#: gui/options.cpp:1096 msgid "Text and Speech:" msgstr "Ъхпьхэя ъсщ Яьщыпс:" -#: gui/options.cpp:1038 gui/options.cpp:1048 +#: gui/options.cpp:1100 gui/options.cpp:1110 msgid "Speech" msgstr "Яьщыпс" -#: gui/options.cpp:1039 gui/options.cpp:1049 +#: gui/options.cpp:1101 gui/options.cpp:1111 msgid "Subtitles" msgstr "е№ќєщєыящ" -#: gui/options.cpp:1040 +#: gui/options.cpp:1102 msgid "Both" msgstr "Ъсщ єс фѕя" -#: gui/options.cpp:1042 +#: gui/options.cpp:1104 msgid "Subtitle speed:" msgstr "дсї§єчєс ѕ№яєпєыљэ:" -#: gui/options.cpp:1044 +#: gui/options.cpp:1106 msgctxt "lowres" msgid "Text and Speech:" msgstr "Ъхпьхэя ъсщ Яьщыпс:" -#: gui/options.cpp:1048 +#: gui/options.cpp:1110 msgid "Spch" msgstr "Яьщыпс" -#: gui/options.cpp:1049 +#: gui/options.cpp:1111 msgid "Subs" msgstr "е№ќє." -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgctxt "lowres" msgid "Both" msgstr "Ъсщ єс фѕя" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgid "Show subtitles and play speech" msgstr "аёятяыо ѕ№яєпєыљэ ъсщ сэс№сёсуљуо іљэођ" -#: gui/options.cpp:1052 +#: gui/options.cpp:1114 msgctxt "lowres" msgid "Subtitle speed:" msgstr "дсї§єчєс ѕ№ќє.:" -#: gui/options.cpp:1068 +#: gui/options.cpp:1130 msgid "Music volume:" msgstr "Иэєсѓч ьяѕѓщъођ:" -#: gui/options.cpp:1070 +#: gui/options.cpp:1132 msgctxt "lowres" msgid "Music volume:" msgstr "Иэєсѓч ьяѕѓщъођ:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1139 msgid "Mute All" msgstr "гпусѓч Мыљэ" -#: gui/options.cpp:1080 +#: gui/options.cpp:1142 msgid "SFX volume:" msgstr "Иэєсѓч хін:" -#: gui/options.cpp:1080 gui/options.cpp:1082 gui/options.cpp:1083 +#: gui/options.cpp:1142 gui/options.cpp:1144 gui/options.cpp:1145 msgid "Special sound effects volume" msgstr "Иэєсѓч хщфщъўэ съяѕѓєщъўэ хін" -#: gui/options.cpp:1082 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "SFX volume:" msgstr "Иэєсѓч хін:" -#: gui/options.cpp:1090 +#: gui/options.cpp:1152 msgid "Speech volume:" msgstr "Иэєсѓч яьщыпсђ:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1154 msgctxt "lowres" msgid "Speech volume:" msgstr "Иэєсѓч яьщыпсђ:" -#: gui/options.cpp:1311 +#: gui/options.cpp:1351 +#, fuzzy +msgid "Control" +msgstr "Иыхуїяђ аяэєщъщя§" + +#: gui/options.cpp:1383 msgid "FluidSynth Settings" msgstr "бѕшьпѓхщђ FluidSynth" -#: gui/options.cpp:1342 +#: gui/options.cpp:1414 msgid "Theme Path:" msgstr "жмъхыяђ Шньсєяђ:" -#: gui/options.cpp:1344 +#: gui/options.cpp:1416 msgctxt "lowres" msgid "Theme Path:" msgstr "жмъхыяђ Шньсєяђ:" -#: gui/options.cpp:1350 gui/options.cpp:1352 gui/options.cpp:1353 +#: gui/options.cpp:1422 gui/options.cpp:1424 gui/options.cpp:1425 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Ъсшяёпцхщ єч фщсфёяьо ущс №ёќѓшхєс фхфяьнэс №яѕ їёчѓщья№ящя§эєсщ с№ќ ќыс єс " "№сщїэпфщс о єя ScummVM" -#: gui/options.cpp:1359 +#: gui/options.cpp:1431 msgid "Plugins Path:" msgstr "Фщсфёяьо аёќѓшхєљэ:" -#: gui/options.cpp:1361 +#: gui/options.cpp:1433 msgctxt "lowres" msgid "Plugins Path:" msgstr "Фщсфё. аёќѓш.:" -#: gui/options.cpp:1372 +#: gui/options.cpp:1444 msgctxt "lowres" msgid "Misc" msgstr "Ыящ№м" -#: gui/options.cpp:1374 +#: gui/options.cpp:1446 msgid "Theme:" msgstr "Шньс:" -#: gui/options.cpp:1378 +#: gui/options.cpp:1450 msgid "GUI Renderer:" msgstr "С№хщъќэщѓч GUI:" -#: gui/options.cpp:1390 +#: gui/options.cpp:1462 msgid "Autosave:" msgstr "Сѕєќьсєч с№яшоъхѕѓч:" -#: gui/options.cpp:1392 +#: gui/options.cpp:1464 msgctxt "lowres" msgid "Autosave:" msgstr "Сѕєќь. с№яш.:" -#: gui/options.cpp:1400 +#: gui/options.cpp:1472 msgid "Keys" msgstr "аыоъєёс" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "GUI Language:" msgstr "Уыўѓѓс GUI:" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "Language of ScummVM GUI" msgstr "Уыўѓѓс єяѕ ScummVM GUI" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "Update check:" msgstr "Иыхуїяђ сэстсшьпѓхљэ:" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "How often to check ScummVM updates" msgstr "гѕїэќєчєс хынуїяѕ хэчьхёўѓхљэ єяѕ ScummVM" -#: gui/options.cpp:1447 +#: gui/options.cpp:1519 msgid "Check now" msgstr "Хынуюєх єўёс" -#: gui/options.cpp:1455 +#: gui/options.cpp:1527 msgid "Cloud" msgstr "г§ээхія" -#: gui/options.cpp:1457 +#: gui/options.cpp:1529 msgctxt "lowres" msgid "Cloud" msgstr "г§ээхія" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Storage:" msgstr "С№яшоъхѕѓч:" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Active cloud storage" msgstr "Хэхёуо с№яшоъхѕѓч ѓ§ээхіяѕ" -#: gui/options.cpp:1469 gui/options.cpp:2026 +#: gui/options.cpp:1541 gui/options.cpp:2098 msgid "<none>" msgstr "<ъсьпс>" -#: gui/options.cpp:1473 backends/platform/wii/options.cpp:114 +#: gui/options.cpp:1545 backends/platform/wii/options.cpp:114 msgid "Username:" msgstr "Мэяьс їёоѓєч:" -#: gui/options.cpp:1473 +#: gui/options.cpp:1545 msgid "Username used by this storage" msgstr "дя ќэяьс їёоѓєч №яѕ їёчѓщья№ящхпєсщ с№ќ сѕєо єчэ с№яшоъч" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Used space:" msgstr "зёчѓщья№ящчьнэяђ їўёяђ:" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Space used by ScummVM's saved games on this storage" msgstr "" "зўёяђ №яѕ їёчѓщья№ящхпєсщ с№ќ єс с№яшчъхѕьнэс №сщїэпфщс єяѕ ScummVM ѓх сѕєо " "єчэ с№яшоъч" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "Last sync time:" msgstr "дхыхѕєспс ўёс ѓѕуїёяэщѓья§:" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "When the last saved games sync for this storage occured" msgstr "" "аќєх №ёсуьсєя№ящошчъх я єхыхѕєспяђ ѓѕуїёяэщѓьќђ с№яшчъхѕьнэљэ №сщїэщфщўэ" -#: gui/options.cpp:1482 gui/storagewizarddialog.cpp:71 +#: gui/options.cpp:1554 gui/storagewizarddialog.cpp:71 msgid "Connect" msgstr "г§эфхѓч" -#: gui/options.cpp:1482 +#: gui/options.cpp:1554 msgid "Open wizard dialog to connect your cloud storage account" msgstr "" "Сэяпюєх єя фщмыяуя яфчуя§ ущс эс ѓѕэфнѓхєх єя ыяусёщсѓьќ єя§ ѓ§ээхіяѕ " "с№яшоъхѕѓођ ѓсђ" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh" msgstr "Сэсэнљѓч" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh current cloud storage information (username and usage)" msgstr "" "Сэсэнљѓч №ычёяіяёщўэ єёнїяэєяђ їўёяѕ с№яшоъхѕѓчђ ѓєя ѓ§ээхія (ќэяьс їёоѓєч " "ъсщ їёоѓч)" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Download" msgstr "Ьхєсіќёєљѓч" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Open downloads manager dialog" msgstr "Жэящуьс фщсыќуяѕ фщсїхпёщѓчђ ьхєсіяёєўѓхљэ" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run server" msgstr "Хъєныхѓч фщсъяьщѓєо" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run local webserver" msgstr "Хъєныхѓч єя№щъя§ фщсъяьщѓєо web" -#: gui/options.cpp:1487 gui/options.cpp:2136 +#: gui/options.cpp:1559 gui/options.cpp:2208 msgid "Not running" msgstr "Фхэ хъєхыхпєсщ" -#: gui/options.cpp:1491 +#: gui/options.cpp:1563 msgid "/root/ Path:" msgstr "/root/ Фщсфёяьо:" -#: gui/options.cpp:1491 gui/options.cpp:1493 gui/options.cpp:1494 +#: gui/options.cpp:1563 gui/options.cpp:1565 gui/options.cpp:1566 msgid "Specifies which directory the Files Manager can access" msgstr "Ъсшяёпцхщ єя імъхыя ѓєяэ я№япя нїхщ №ёќѓтсѓч я File Manager" -#: gui/options.cpp:1493 +#: gui/options.cpp:1565 msgctxt "lowres" msgid "/root/ Path:" msgstr "/root/ Фщсфёяьо:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "Server's port:" msgstr "Ш§ёс хюѕ№чёхєчєо:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "" "Which port is used by the server\n" "Auth with server is not available with non-default port" @@ -1297,19 +1315,19 @@ msgstr "" "аящм ш§ёс їёчѓщья№ящхпєсщ с№ќ єя фщсъяьщѓєо\n" "Фхэ хпэсщ фщсшнѓщьч ч №щѓєя№япчѓч ьх єя фщсъяьщѓєо ѓх ьч-№ёях№щыхуьнэч ш§ёс" -#: gui/options.cpp:1516 +#: gui/options.cpp:1588 msgid "Apply" msgstr "Хісёьяуо" -#: gui/options.cpp:1682 +#: gui/options.cpp:1754 msgid "Failed to change cloud storage!" msgstr "Сфѕэсьпс сыысуођ с№яшоъхѕѓчђ ѓ§ээхіяѕ!" -#: gui/options.cpp:1685 +#: gui/options.cpp:1757 msgid "Another cloud storage is already active." msgstr "Ьщс мыыч с№яшоъхѕѓч ѓ§ээхіяѕ хпэсщ офч хэхёуо." -#: gui/options.cpp:1721 +#: gui/options.cpp:1793 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1318,50 +1336,50 @@ msgstr "" "эс їёчѓщья№ящоѓхєх сѕєќ єя шньс шс №ён№хщ №ёўєс эс сыымюхєх ѓх ъм№ящс мыыч " "уыўѓѓс." -#: gui/options.cpp:1756 +#: gui/options.cpp:1828 msgid "The chosen directory cannot be written to. Please select another one." msgstr "" "Фхэ оєсэ фѕэсєо ч хууёсіо ѓєяэ х№щыхуьнэя імъхыя. асёсъсыў х№щынюєх ъм№ящяэ " "мыыя." -#: gui/options.cpp:1765 +#: gui/options.cpp:1837 msgid "Select directory for GUI themes" msgstr "Х№щынюєх імъхыя ущс шньсєс GUI" -#: gui/options.cpp:1775 +#: gui/options.cpp:1847 msgid "Select directory for extra files" msgstr "Х№щынюєх імъхыя ущс нюєёс сёїхпс" -#: gui/options.cpp:1786 +#: gui/options.cpp:1858 msgid "Select directory for plugins" msgstr "Х№щынюєх імъхыя ущс №ёќѓшхєс" -#: gui/options.cpp:1798 +#: gui/options.cpp:1870 msgid "Select directory for Files Manager /root/" msgstr "Х№щынюєх імъхыя ущс єя /root/ єяѕ Фщсїхщёщѓєо Сёїхпљэ" -#: gui/options.cpp:2033 +#: gui/options.cpp:2105 #, c-format msgid "%llu bytes" msgstr "%llu bytes" -#: gui/options.cpp:2041 +#: gui/options.cpp:2113 msgid "<right now>" msgstr "<мьхѓс>" -#: gui/options.cpp:2043 +#: gui/options.cpp:2115 msgid "<never>" msgstr "<№яєн>" -#: gui/options.cpp:2127 +#: gui/options.cpp:2199 msgid "Stop server" msgstr "Фщсъя№о хюѕ№чёхєчєо" -#: gui/options.cpp:2128 +#: gui/options.cpp:2200 msgid "Stop local webserver" msgstr "Фщсъя№о єя№щъя§ хюѕ№чёхєчєо web" -#: gui/options.cpp:2219 +#: gui/options.cpp:2291 msgid "" "Request failed.\n" "Check your Internet connection." diff --git a/po/es_ES.po b/po/es_ES.po index b702455c55..0c8d53f2fd 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-02-11 08:56+0100\n" +"POT-Creation-Date: 2017-02-21 23:29+0100\n" "PO-Revision-Date: 2017-01-15 22:05+0000\n" "Last-Translator: Rodrigo Vegas Sсnchez-Ferrero <rodrigo.vegas@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:1515 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69 +#: gui/options.cpp:1587 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:443 #: gui/saveload-dialog.cpp:717 gui/saveload-dialog.cpp:1111 @@ -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:522 -#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1517 +#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1589 #: gui/saveload-dialog.cpp:1112 engines/engine.cpp:477 engines/engine.cpp:488 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 @@ -241,7 +241,7 @@ msgstr "" "juego" #: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:121 -#: gui/options.cpp:845 gui/options.cpp:858 gui/options.cpp:1410 +#: gui/options.cpp:907 gui/options.cpp:920 gui/options.cpp:1482 #: audio/null.cpp:41 msgid "<default>" msgstr "<por defecto>" @@ -264,11 +264,11 @@ msgstr "Plat.:" msgid "Engine" msgstr "Motor" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "Graphics" msgstr "Grсficos" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "GFX" msgstr "Grсf." @@ -281,7 +281,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Opciones grсficas especэficas" -#: gui/editgamedialog.cpp:196 gui/options.cpp:1292 +#: gui/editgamedialog.cpp:196 gui/options.cpp:1364 msgid "Audio" msgstr "Sonido" @@ -294,11 +294,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Opciones de sonido especэficas" -#: gui/editgamedialog.cpp:210 gui/options.cpp:1297 +#: gui/editgamedialog.cpp:210 gui/options.cpp:1369 msgid "Volume" msgstr "Volumen" -#: gui/editgamedialog.cpp:212 gui/options.cpp:1299 +#: gui/editgamedialog.cpp:212 gui/options.cpp:1371 msgctxt "lowres" msgid "Volume" msgstr "Volumen" @@ -312,7 +312,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Opciones de volumen especэficas" -#: gui/editgamedialog.cpp:226 gui/options.cpp:1307 +#: gui/editgamedialog.cpp:226 gui/options.cpp:1379 msgid "MIDI" msgstr "MIDI" @@ -325,7 +325,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Opciones de MIDI especэficas" -#: gui/editgamedialog.cpp:241 gui/options.cpp:1317 +#: gui/editgamedialog.cpp:241 gui/options.cpp:1389 msgid "MT-32" msgstr "MT-32" @@ -338,11 +338,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Opciones de MT-32 especэficas" -#: gui/editgamedialog.cpp:255 gui/options.cpp:1324 +#: gui/editgamedialog.cpp:255 gui/options.cpp:1396 msgid "Paths" msgstr "Rutas" -#: gui/editgamedialog.cpp:257 gui/options.cpp:1326 +#: gui/editgamedialog.cpp:257 gui/options.cpp:1398 msgctxt "lowres" msgid "Paths" msgstr "Rutas" @@ -356,7 +356,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Juego:" -#: gui/editgamedialog.cpp:271 gui/options.cpp:1350 +#: gui/editgamedialog.cpp:271 gui/options.cpp:1422 msgid "Extra Path:" msgstr "Adicional:" @@ -365,44 +365,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:1352 +#: gui/editgamedialog.cpp:273 gui/options.cpp:1424 msgctxt "lowres" msgid "Extra Path:" msgstr "Adicional:" -#: gui/editgamedialog.cpp:280 gui/options.cpp:1334 +#: gui/editgamedialog.cpp:280 gui/options.cpp:1406 msgid "Save Path:" msgstr "Partidas:" #: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282 -#: gui/editgamedialog.cpp:283 gui/options.cpp:1334 gui/options.cpp:1336 -#: gui/options.cpp:1337 +#: gui/editgamedialog.cpp:283 gui/options.cpp:1406 gui/options.cpp:1408 +#: gui/options.cpp:1409 msgid "Specifies where your saved games are put" msgstr "Especifica dѓnde guardar tus partidas" -#: gui/editgamedialog.cpp:282 gui/options.cpp:1336 +#: gui/editgamedialog.cpp:282 gui/options.cpp:1408 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:1345 -#: gui/options.cpp:1353 gui/options.cpp:1362 gui/options.cpp:1542 -#: gui/options.cpp:1548 gui/options.cpp:1556 gui/options.cpp:1579 -#: gui/options.cpp:1608 gui/options.cpp:1614 gui/options.cpp:1621 -#: gui/options.cpp:1629 gui/options.cpp:1812 gui/options.cpp:1815 -#: gui/options.cpp:1822 gui/options.cpp:1832 +#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1417 +#: gui/options.cpp:1425 gui/options.cpp:1434 gui/options.cpp:1614 +#: gui/options.cpp:1620 gui/options.cpp:1628 gui/options.cpp:1651 +#: gui/options.cpp:1680 gui/options.cpp:1686 gui/options.cpp:1693 +#: gui/options.cpp:1701 gui/options.cpp:1884 gui/options.cpp:1887 +#: gui/options.cpp:1894 gui/options.cpp:1904 msgctxt "path" msgid "None" msgstr "Ninguna" #: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404 -#: gui/editgamedialog.cpp:522 gui/options.cpp:1536 gui/options.cpp:1602 -#: gui/options.cpp:1818 backends/platform/wii/options.cpp:56 +#: gui/editgamedialog.cpp:522 gui/options.cpp:1608 gui/options.cpp:1674 +#: gui/options.cpp:1890 backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Por defecto" -#: gui/editgamedialog.cpp:450 gui/options.cpp:1826 +#: gui/editgamedialog.cpp:450 gui/options.cpp:1898 msgid "Select SoundFont" msgstr "Selecciona un SoundFont" @@ -410,7 +410,7 @@ msgstr "Selecciona un SoundFont" msgid "Select additional game directory" msgstr "Selecciona el directorio adicional" -#: gui/editgamedialog.cpp:502 gui/options.cpp:1749 +#: gui/editgamedialog.cpp:502 gui/options.cpp:1821 msgid "Select directory for saved games" msgstr "Selecciona el directorio para partidas guardadas" @@ -502,7 +502,7 @@ msgstr "Seno" msgid "Triangle" msgstr "Triсngulo" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1370 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1442 msgid "Misc" msgstr "Otras" @@ -825,107 +825,120 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:289 gui/options.cpp:552 gui/options.cpp:690 -#: gui/options.cpp:759 gui/options.cpp:970 +#: gui/options.cpp:316 gui/options.cpp:598 gui/options.cpp:736 +#: gui/options.cpp:805 gui/options.cpp:1032 msgctxt "soundfont" msgid "None" msgstr "Ninguno" -#: gui/options.cpp:456 +#: gui/options.cpp:502 msgid "Failed to apply some of the graphic options changes:" msgstr "Fallo al aplicar algunos cambios en las opciones grсficas:" -#: gui/options.cpp:468 +#: gui/options.cpp:514 msgid "the video mode could not be changed." msgstr "no se ha podido cambiar el modo de vэdeo." -#: gui/options.cpp:474 +#: gui/options.cpp:520 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:480 +#: gui/options.cpp:526 msgid "the fullscreen setting could not be changed" msgstr "no se ha podido cambiar el ajuste a pantalla completa" -#: gui/options.cpp:486 +#: gui/options.cpp:532 msgid "the filtering setting could not be changed" msgstr "no se han podido cambiar los ajustes de filtrado" -#: gui/options.cpp:842 +#: gui/options.cpp:884 +msgid "Show On-screen control" +msgstr "" + +#: gui/options.cpp:888 +#, fuzzy +msgid "Touchpad mouse mode" +msgstr "Modo Touchpad desactivado." + +#: gui/options.cpp:892 +msgid "Swap Menu and Back buttons" +msgstr "" + +#: gui/options.cpp:904 msgid "Graphics mode:" msgstr "Modo grсfico:" -#: gui/options.cpp:856 +#: gui/options.cpp:918 msgid "Render mode:" msgstr "Renderizado:" -#: gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:918 gui/options.cpp:919 msgid "Special dithering modes supported by some games" msgstr "Modos especiales de difuminado compatibles con algunos juegos" -#: gui/options.cpp:868 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 +#: gui/options.cpp:930 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2460 msgid "Fullscreen mode" msgstr "Pantalla completa" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Filter graphics" msgstr "Filtros de grсficos" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Use linear filtering when scaling graphics" msgstr "Usar filtrado lineal para escalar grсficos" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Aspect ratio correction" msgstr "Correcciѓn de la relaciѓn de aspecto" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Correct aspect ratio for 320x200 games" msgstr "Corregir relaciѓn de aspecto en juegos de 320x200" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Preferred Device:" msgstr "Disp. preferido:" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:882 gui/options.cpp:884 +#: gui/options.cpp:944 gui/options.cpp:946 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:882 gui/options.cpp:884 gui/options.cpp:885 +#: gui/options.cpp:944 gui/options.cpp:946 gui/options.cpp:947 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:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Disp. preferido:" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:911 +#: gui/options.cpp:973 msgid "AdLib emulator:" msgstr "Emul. AdLib:" -#: gui/options.cpp:911 gui/options.cpp:912 +#: gui/options.cpp:973 gui/options.cpp:974 msgid "AdLib is used for music in many games" msgstr "AdLib es usado para la mњsica en muchos juegos" -#: gui/options.cpp:922 +#: gui/options.cpp:984 msgid "Output rate:" msgstr "Frec. de salida:" -#: gui/options.cpp:922 gui/options.cpp:923 +#: gui/options.cpp:984 gui/options.cpp:985 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -933,66 +946,66 @@ msgstr "" "Los valores mсs altos ofrecen mayor calidad, pero puede que la tarjeta de " "sonido no lo soporte" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "GM Device:" msgstr "Dispositivo GM:" -#: gui/options.cpp:933 +#: gui/options.cpp:995 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:944 +#: gui/options.cpp:1006 msgid "Don't use General MIDI music" msgstr "No usar mњsica General MIDI" -#: gui/options.cpp:955 gui/options.cpp:1017 +#: gui/options.cpp:1017 gui/options.cpp:1079 msgid "Use first available device" msgstr "Utilizar el primer dispositivo disponible" -#: gui/options.cpp:967 +#: gui/options.cpp:1029 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:967 gui/options.cpp:969 gui/options.cpp:970 +#: gui/options.cpp:1029 gui/options.cpp:1031 gui/options.cpp:1032 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:969 +#: gui/options.cpp:1031 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Mixed AdLib/MIDI mode" msgstr "Modo AdLib/MIDI" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Use both MIDI and AdLib sound generation" msgstr "Usar tanto MIDI como AdLib en la generaciѓn de sonido" -#: gui/options.cpp:978 +#: gui/options.cpp:1040 msgid "MIDI gain:" msgstr "Ganancia MIDI:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "MT-32 Device:" msgstr "Disp. MT-32:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 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:993 +#: gui/options.cpp:1055 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 autщntica (desactivar emulaciѓn GM)" -#: gui/options.cpp:993 gui/options.cpp:995 +#: gui/options.cpp:1055 gui/options.cpp:1057 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -1000,16 +1013,16 @@ msgstr "" "Marcar si se quiere usar un dispositivo de sonido real conectado al " "ordenador y compatible con Roland" -#: gui/options.cpp:995 +#: gui/options.cpp:1057 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 real (sin emulaciѓn GM)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Dispositivo Roland GS (activar conversiѓn MT-32)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -1017,266 +1030,271 @@ msgstr "" "Marca esta opciѓn si quieres activar la conversiѓn para emular una MT-32 en " "un dispositivo Roland GS" -#: gui/options.cpp:1007 +#: gui/options.cpp:1069 msgid "Don't use Roland MT-32 music" msgstr "No usar mњsica Roland MT-32" -#: gui/options.cpp:1034 +#: gui/options.cpp:1096 msgid "Text and Speech:" msgstr "Texto y voces:" -#: gui/options.cpp:1038 gui/options.cpp:1048 +#: gui/options.cpp:1100 gui/options.cpp:1110 msgid "Speech" msgstr "Voces" -#: gui/options.cpp:1039 gui/options.cpp:1049 +#: gui/options.cpp:1101 gui/options.cpp:1111 msgid "Subtitles" msgstr "Subtэtulos" -#: gui/options.cpp:1040 +#: gui/options.cpp:1102 msgid "Both" msgstr "Ambos" -#: gui/options.cpp:1042 +#: gui/options.cpp:1104 msgid "Subtitle speed:" msgstr "Vel. de subtэtulos:" -#: gui/options.cpp:1044 +#: gui/options.cpp:1106 msgctxt "lowres" msgid "Text and Speech:" msgstr "Texto y voces:" -#: gui/options.cpp:1048 +#: gui/options.cpp:1110 msgid "Spch" msgstr "Voz" -#: gui/options.cpp:1049 +#: gui/options.cpp:1111 msgid "Subs" msgstr "Subt" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgctxt "lowres" msgid "Both" msgstr "V&S" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgid "Show subtitles and play speech" msgstr "Reproducir voces y subtэtulos" -#: gui/options.cpp:1052 +#: gui/options.cpp:1114 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Vel. de subt.:" -#: gui/options.cpp:1068 +#: gui/options.cpp:1130 msgid "Music volume:" msgstr "Mњsica:" -#: gui/options.cpp:1070 +#: gui/options.cpp:1132 msgctxt "lowres" msgid "Music volume:" msgstr "Mњsica:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1139 msgid "Mute All" msgstr "Silenciar" -#: gui/options.cpp:1080 +#: gui/options.cpp:1142 msgid "SFX volume:" msgstr "Efectos:" -#: gui/options.cpp:1080 gui/options.cpp:1082 gui/options.cpp:1083 +#: gui/options.cpp:1142 gui/options.cpp:1144 gui/options.cpp:1145 msgid "Special sound effects volume" msgstr "Volumen de los efectos de sonido" -#: gui/options.cpp:1082 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "SFX volume:" msgstr "Efectos:" -#: gui/options.cpp:1090 +#: gui/options.cpp:1152 msgid "Speech volume:" msgstr "Voces:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1154 msgctxt "lowres" msgid "Speech volume:" msgstr "Voces:" -#: gui/options.cpp:1311 +#: gui/options.cpp:1351 +#, fuzzy +msgid "Control" +msgstr "Control del ratѓn" + +#: gui/options.cpp:1383 msgid "FluidSynth Settings" msgstr "Opciones de FluidSynth" -#: gui/options.cpp:1342 +#: gui/options.cpp:1414 msgid "Theme Path:" msgstr "Temas:" -#: gui/options.cpp:1344 +#: gui/options.cpp:1416 msgctxt "lowres" msgid "Theme Path:" msgstr "Temas:" -#: gui/options.cpp:1350 gui/options.cpp:1352 gui/options.cpp:1353 +#: gui/options.cpp:1422 gui/options.cpp:1424 gui/options.cpp:1425 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:1359 +#: gui/options.cpp:1431 msgid "Plugins Path:" msgstr "Plugins:" -#: gui/options.cpp:1361 +#: gui/options.cpp:1433 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugins:" -#: gui/options.cpp:1372 +#: gui/options.cpp:1444 msgctxt "lowres" msgid "Misc" msgstr "Otras" -#: gui/options.cpp:1374 +#: gui/options.cpp:1446 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1378 +#: gui/options.cpp:1450 msgid "GUI Renderer:" msgstr "Interfaz:" -#: gui/options.cpp:1390 +#: gui/options.cpp:1462 msgid "Autosave:" msgstr "Autoguardado:" -#: gui/options.cpp:1392 +#: gui/options.cpp:1464 msgctxt "lowres" msgid "Autosave:" msgstr "Autoguardado:" -#: gui/options.cpp:1400 +#: gui/options.cpp:1472 msgid "Keys" msgstr "Teclas" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "GUI Language:" msgstr "Idioma:" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "Language of ScummVM GUI" msgstr "Idioma de la interfaz de ScummVM" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "Update check:" msgstr "Buscar actualizaciones:" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "How often to check ScummVM updates" msgstr "Frecuencia con la que se buscan actualizaciones" -#: gui/options.cpp:1447 +#: gui/options.cpp:1519 msgid "Check now" msgstr "Buscar ahora" -#: gui/options.cpp:1455 +#: gui/options.cpp:1527 msgid "Cloud" msgstr "Nube" -#: gui/options.cpp:1457 +#: gui/options.cpp:1529 msgctxt "lowres" msgid "Cloud" msgstr "Nube" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Storage:" msgstr "Almacenamiento:" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Active cloud storage" msgstr "Almacenamiento activo" -#: gui/options.cpp:1469 gui/options.cpp:2026 +#: gui/options.cpp:1541 gui/options.cpp:2098 msgid "<none>" msgstr "<ninguno>" -#: gui/options.cpp:1473 backends/platform/wii/options.cpp:114 +#: gui/options.cpp:1545 backends/platform/wii/options.cpp:114 msgid "Username:" msgstr "Usuario:" -#: gui/options.cpp:1473 +#: gui/options.cpp:1545 msgid "Username used by this storage" msgstr "Nombre de usuario utilizado para este almacenamiento" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Used space:" msgstr "Espacio utilizado:" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Space used by ScummVM's saved games on this storage" msgstr "Espacio utilizado para las partidas guardadas en este almacenamiento" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "Last sync time:" msgstr "кltima sincronizaciѓn:" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 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:1482 gui/storagewizarddialog.cpp:71 +#: gui/options.cpp:1554 gui/storagewizarddialog.cpp:71 msgid "Connect" msgstr "Conectar" -#: gui/options.cpp:1482 +#: gui/options.cpp:1554 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:1483 +#: gui/options.cpp:1555 msgid "Refresh" msgstr "Refrescar" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 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:1484 +#: gui/options.cpp:1556 msgid "Download" msgstr "Descargar" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Open downloads manager dialog" msgstr "Abrir el gestor de descargas" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run server" msgstr "Habilitar servidor" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run local webserver" msgstr "Habilitar el servidor local" -#: gui/options.cpp:1487 gui/options.cpp:2136 +#: gui/options.cpp:1559 gui/options.cpp:2208 msgid "Not running" msgstr "Detenido" -#: gui/options.cpp:1491 +#: gui/options.cpp:1563 msgid "/root/ Path:" msgstr "Directorio /raэz/:" -#: gui/options.cpp:1491 gui/options.cpp:1493 gui/options.cpp:1494 +#: gui/options.cpp:1563 gui/options.cpp:1565 gui/options.cpp:1566 msgid "Specifies which directory the Files Manager can access" msgstr "Especifica los directorios accesibles para el gestor de archivos" -#: gui/options.cpp:1493 +#: gui/options.cpp:1565 msgctxt "lowres" msgid "/root/ Path:" msgstr "/raэz/:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "Server's port:" msgstr "Puerto del servidor:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "" "Which port is used by the server\n" "Auth with server is not available with non-default port" @@ -1284,19 +1302,19 @@ msgstr "" "Puerto utilizado por el servidor\n" "La autentificaciѓn solo es posible con el puerto predeterminado" -#: gui/options.cpp:1516 +#: gui/options.cpp:1588 msgid "Apply" msgstr "Aplicar" -#: gui/options.cpp:1682 +#: gui/options.cpp:1754 msgid "Failed to change cloud storage!" msgstr "ЁFallo al cambiar el almacenamiento en lэnea!" -#: gui/options.cpp:1685 +#: gui/options.cpp:1757 msgid "Another cloud storage is already active." msgstr "Ya se ha habilitado otro almacenamiento en lэnea." -#: gui/options.cpp:1721 +#: gui/options.cpp:1793 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1304,48 +1322,48 @@ msgstr "" "El tema seleccionado no es compatible con el idioma actual. Debes cambiar el " "idioma si quieres usar este tema." -#: gui/options.cpp:1756 +#: gui/options.cpp:1828 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:1765 +#: gui/options.cpp:1837 msgid "Select directory for GUI themes" msgstr "Selecciona el directorio de temas" -#: gui/options.cpp:1775 +#: gui/options.cpp:1847 msgid "Select directory for extra files" msgstr "Selecciona el directorio adicional" -#: gui/options.cpp:1786 +#: gui/options.cpp:1858 msgid "Select directory for plugins" msgstr "Selecciona el directorio de plugins" -#: gui/options.cpp:1798 +#: gui/options.cpp:1870 msgid "Select directory for Files Manager /root/" msgstr "Selecciona el directorio /raэz/ para el gestor de archivos" -#: gui/options.cpp:2033 +#: gui/options.cpp:2105 #, c-format msgid "%llu bytes" msgstr "%llu bytes" -#: gui/options.cpp:2041 +#: gui/options.cpp:2113 msgid "<right now>" msgstr "<ahora>" -#: gui/options.cpp:2043 +#: gui/options.cpp:2115 msgid "<never>" msgstr "<nunca>" -#: gui/options.cpp:2127 +#: gui/options.cpp:2199 msgid "Stop server" msgstr "Detener servidor" -#: gui/options.cpp:2128 +#: gui/options.cpp:2200 msgid "Stop local webserver" msgstr "Detener el servidor local" -#: gui/options.cpp:2219 +#: gui/options.cpp:2291 msgid "" "Request failed.\n" "Check your Internet connection." @@ -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-02-11 08:56+0100\n" +"POT-Creation-Date: 2017-02-21 23:29+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:1515 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69 +#: gui/options.cpp:1587 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:443 #: gui/saveload-dialog.cpp:717 gui/saveload-dialog.cpp:1111 @@ -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:522 -#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1517 +#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1589 #: gui/saveload-dialog.cpp:1112 engines/engine.cpp:477 engines/engine.cpp:488 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 @@ -235,7 +235,7 @@ msgstr "" "Jokoaren hizkuntza. Honek ez du zure ingelesezko bertsioa frantsesera pasako" #: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:121 -#: gui/options.cpp:845 gui/options.cpp:858 gui/options.cpp:1410 +#: gui/options.cpp:907 gui/options.cpp:920 gui/options.cpp:1482 #: audio/null.cpp:41 msgid "<default>" msgstr "<lehenetsia>" @@ -258,11 +258,11 @@ msgstr "Plataforma:" msgid "Engine" msgstr "Motorea" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "Graphics" msgstr "Grafikoak" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "GFX" msgstr "GFX" @@ -275,7 +275,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Ezarpen grafiko globalak baliogabetu" -#: gui/editgamedialog.cpp:196 gui/options.cpp:1292 +#: gui/editgamedialog.cpp:196 gui/options.cpp:1364 msgid "Audio" msgstr "Soinua" @@ -288,11 +288,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Soinu ezarpen globalak baliogabetu" -#: gui/editgamedialog.cpp:210 gui/options.cpp:1297 +#: gui/editgamedialog.cpp:210 gui/options.cpp:1369 msgid "Volume" msgstr "Bolumena" -#: gui/editgamedialog.cpp:212 gui/options.cpp:1299 +#: gui/editgamedialog.cpp:212 gui/options.cpp:1371 msgctxt "lowres" msgid "Volume" msgstr "Bolumena" @@ -306,7 +306,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Bolumen ezarpen globalak baliogabetu" -#: gui/editgamedialog.cpp:226 gui/options.cpp:1307 +#: gui/editgamedialog.cpp:226 gui/options.cpp:1379 msgid "MIDI" msgstr "MIDI" @@ -319,7 +319,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "MIDI ezarpen globalak baliogabetu" -#: gui/editgamedialog.cpp:241 gui/options.cpp:1317 +#: gui/editgamedialog.cpp:241 gui/options.cpp:1389 msgid "MT-32" msgstr "MT-32" @@ -332,11 +332,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "MT-32 ezarpen globalak baliogabetu" -#: gui/editgamedialog.cpp:255 gui/options.cpp:1324 +#: gui/editgamedialog.cpp:255 gui/options.cpp:1396 msgid "Paths" msgstr "Bide-izenak" -#: gui/editgamedialog.cpp:257 gui/options.cpp:1326 +#: gui/editgamedialog.cpp:257 gui/options.cpp:1398 msgctxt "lowres" msgid "Paths" msgstr "Bideak" @@ -350,7 +350,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Jokoa:" -#: gui/editgamedialog.cpp:271 gui/options.cpp:1350 +#: gui/editgamedialog.cpp:271 gui/options.cpp:1422 msgid "Extra Path:" msgstr "Gehigarriak:" @@ -359,44 +359,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:1352 +#: gui/editgamedialog.cpp:273 gui/options.cpp:1424 msgctxt "lowres" msgid "Extra Path:" msgstr "Gehigarria:" -#: gui/editgamedialog.cpp:280 gui/options.cpp:1334 +#: gui/editgamedialog.cpp:280 gui/options.cpp:1406 msgid "Save Path:" msgstr "Partida gordeak:" #: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282 -#: gui/editgamedialog.cpp:283 gui/options.cpp:1334 gui/options.cpp:1336 -#: gui/options.cpp:1337 +#: gui/editgamedialog.cpp:283 gui/options.cpp:1406 gui/options.cpp:1408 +#: gui/options.cpp:1409 msgid "Specifies where your saved games are put" msgstr "Zure gordetako partidak non gordeko diren zehazten du" -#: gui/editgamedialog.cpp:282 gui/options.cpp:1336 +#: gui/editgamedialog.cpp:282 gui/options.cpp:1408 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:1345 -#: gui/options.cpp:1353 gui/options.cpp:1362 gui/options.cpp:1542 -#: gui/options.cpp:1548 gui/options.cpp:1556 gui/options.cpp:1579 -#: gui/options.cpp:1608 gui/options.cpp:1614 gui/options.cpp:1621 -#: gui/options.cpp:1629 gui/options.cpp:1812 gui/options.cpp:1815 -#: gui/options.cpp:1822 gui/options.cpp:1832 +#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1417 +#: gui/options.cpp:1425 gui/options.cpp:1434 gui/options.cpp:1614 +#: gui/options.cpp:1620 gui/options.cpp:1628 gui/options.cpp:1651 +#: gui/options.cpp:1680 gui/options.cpp:1686 gui/options.cpp:1693 +#: gui/options.cpp:1701 gui/options.cpp:1884 gui/options.cpp:1887 +#: gui/options.cpp:1894 gui/options.cpp:1904 msgctxt "path" msgid "None" msgstr "Bat ere ez" #: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404 -#: gui/editgamedialog.cpp:522 gui/options.cpp:1536 gui/options.cpp:1602 -#: gui/options.cpp:1818 backends/platform/wii/options.cpp:56 +#: gui/editgamedialog.cpp:522 gui/options.cpp:1608 gui/options.cpp:1674 +#: gui/options.cpp:1890 backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Lehenetsia" -#: gui/editgamedialog.cpp:450 gui/options.cpp:1826 +#: gui/editgamedialog.cpp:450 gui/options.cpp:1898 msgid "Select SoundFont" msgstr "SoundFont-a aukeratu" @@ -404,7 +404,7 @@ msgstr "SoundFont-a aukeratu" msgid "Select additional game directory" msgstr "Direktorio gehigarria aukeratu" -#: gui/editgamedialog.cpp:502 gui/options.cpp:1749 +#: gui/editgamedialog.cpp:502 gui/options.cpp:1821 msgid "Select directory for saved games" msgstr "Partida gordeen direktorioa aukeratu" @@ -494,7 +494,7 @@ msgstr "Sinua" msgid "Triangle" msgstr "Triangelua" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1370 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1442 msgid "Misc" msgstr "Beste" @@ -814,106 +814,119 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:289 gui/options.cpp:552 gui/options.cpp:690 -#: gui/options.cpp:759 gui/options.cpp:970 +#: gui/options.cpp:316 gui/options.cpp:598 gui/options.cpp:736 +#: gui/options.cpp:805 gui/options.cpp:1032 msgctxt "soundfont" msgid "None" msgstr "Bat ere ez" -#: gui/options.cpp:456 +#: gui/options.cpp:502 msgid "Failed to apply some of the graphic options changes:" msgstr "Ezin izan da grafikoen aukeretako batzuk aplikatu:" -#: gui/options.cpp:468 +#: gui/options.cpp:514 msgid "the video mode could not be changed." msgstr "ezin izan da bideo-modua aldatu." -#: gui/options.cpp:474 +#: gui/options.cpp:520 msgid "the aspect ratio setting could not be changed" msgstr "formatu-ratioaren ezarpena ezin izan da aldatu" -#: gui/options.cpp:480 +#: gui/options.cpp:526 msgid "the fullscreen setting could not be changed" msgstr "ezin izan da pantaila-osoaren ezarpena aldatu" -#: gui/options.cpp:486 +#: gui/options.cpp:532 #, fuzzy msgid "the filtering setting could not be changed" msgstr "ezin izan da pantaila-osoaren ezarpena aldatu" -#: gui/options.cpp:842 +#: gui/options.cpp:884 +msgid "Show On-screen control" +msgstr "" + +#: gui/options.cpp:888 +#, fuzzy +msgid "Touchpad mouse mode" +msgstr "Touchpad modua desgaituta." + +#: gui/options.cpp:892 +msgid "Swap Menu and Back buttons" +msgstr "" + +#: gui/options.cpp:904 msgid "Graphics mode:" msgstr "Modu grafikoa:" -#: gui/options.cpp:856 +#: gui/options.cpp:918 msgid "Render mode:" msgstr "Renderizazioa:" -#: gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:918 gui/options.cpp:919 msgid "Special dithering modes supported by some games" msgstr "Joko batzuk onarturiko lausotze-modu bereziak" -#: gui/options.cpp:868 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 +#: gui/options.cpp:930 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2460 msgid "Fullscreen mode" msgstr "Pantaila osoa" -#: gui/options.cpp:871 +#: gui/options.cpp:933 #, fuzzy msgid "Filter graphics" msgstr "Grafikoak" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Use linear filtering when scaling graphics" msgstr "" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Aspect ratio correction" msgstr "Formatu-ratioaren zuzenketa" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Correct aspect ratio for 320x200 games" msgstr "320x200 jokoentzako formatu-ratioa zuzendu" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Preferred Device:" msgstr "Gogoko gailua:" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Music Device:" msgstr "Musika gailua:" -#: gui/options.cpp:882 gui/options.cpp:884 +#: gui/options.cpp:944 gui/options.cpp:946 msgid "Specifies preferred sound device or sound card emulator" msgstr "Gogoko soinu txartel edo emuladorea zein den ezartzen du" -#: gui/options.cpp:882 gui/options.cpp:884 gui/options.cpp:885 +#: gui/options.cpp:944 gui/options.cpp:946 gui/options.cpp:947 msgid "Specifies output sound device or sound card emulator" msgstr "Irteerako soinu txartel edo emuladorea ezartzen du" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Gail. gogokoa:" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Music Device:" msgstr "Musika gailua:" -#: gui/options.cpp:911 +#: gui/options.cpp:973 msgid "AdLib emulator:" msgstr "AdLib emuladorea:" -#: gui/options.cpp:911 gui/options.cpp:912 +#: gui/options.cpp:973 gui/options.cpp:974 msgid "AdLib is used for music in many games" msgstr "AdLib musikarako hainbat jokotan erabiltzen da" -#: gui/options.cpp:922 +#: gui/options.cpp:984 msgid "Output rate:" msgstr "Irteera maizt.:" -#: gui/options.cpp:922 gui/options.cpp:923 +#: gui/options.cpp:984 gui/options.cpp:985 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -921,64 +934,64 @@ msgstr "" "Balio altuagoek soinu kalitate hobea ezartzen dute, baina baliteke zure " "soinu-txartela bateragarria ez izatea" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "GM Device:" msgstr "GM gailua:" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "Specifies default sound device for General MIDI output" msgstr "Defektuzko soinu txartela ezartzen du General MIDI irteerarako" -#: gui/options.cpp:944 +#: gui/options.cpp:1006 msgid "Don't use General MIDI music" msgstr "Ez erabili General MIDI musika" -#: gui/options.cpp:955 gui/options.cpp:1017 +#: gui/options.cpp:1017 gui/options.cpp:1079 msgid "Use first available device" msgstr "Erabilgarri dagoen lehen gailua erabili" -#: gui/options.cpp:967 +#: gui/options.cpp:1029 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:967 gui/options.cpp:969 gui/options.cpp:970 +#: gui/options.cpp:1029 gui/options.cpp:1031 gui/options.cpp:1032 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:969 +#: gui/options.cpp:1031 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Mixed AdLib/MIDI mode" msgstr "AdLib/MIDI modua" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Use both MIDI and AdLib sound generation" msgstr "Soinua sortzerakoan MIDI eta AdLib erabili" -#: gui/options.cpp:978 +#: gui/options.cpp:1040 msgid "MIDI gain:" msgstr "MIDI irabazia:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "MT-32 Device:" msgstr "MT-32 gailua:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 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:993 +#: gui/options.cpp:1055 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Benetako Roland MT-32 (GM emulazio gabe)" -#: gui/options.cpp:993 gui/options.cpp:995 +#: gui/options.cpp:1055 gui/options.cpp:1057 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -986,16 +999,16 @@ msgstr "" "Markatu ordenagailura konektaturiko Roland-ekin bateragarria den soinu-" "gailua erabiltzeko" -#: gui/options.cpp:995 +#: gui/options.cpp:1057 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Benetako Roland MT-32 (GM emulazio gabe)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland GS Gailua (gaitu MT-32 bihurketak)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -1003,289 +1016,294 @@ msgstr "" "Markatu Roland GS gailu batean MT-32 bat emulatzea ahalbidetzen " "dutenbihurketak gaitzeko" -#: gui/options.cpp:1007 +#: gui/options.cpp:1069 msgid "Don't use Roland MT-32 music" msgstr "Ez erabili Roland MT-32 musika" -#: gui/options.cpp:1034 +#: gui/options.cpp:1096 msgid "Text and Speech:" msgstr "Testu eta ahotsa:" -#: gui/options.cpp:1038 gui/options.cpp:1048 +#: gui/options.cpp:1100 gui/options.cpp:1110 msgid "Speech" msgstr "Ahotsa" -#: gui/options.cpp:1039 gui/options.cpp:1049 +#: gui/options.cpp:1101 gui/options.cpp:1111 msgid "Subtitles" msgstr "Azpitituluak" -#: gui/options.cpp:1040 +#: gui/options.cpp:1102 msgid "Both" msgstr "Biak" -#: gui/options.cpp:1042 +#: gui/options.cpp:1104 msgid "Subtitle speed:" msgstr "Azpitit. abiadura:" -#: gui/options.cpp:1044 +#: gui/options.cpp:1106 msgctxt "lowres" msgid "Text and Speech:" msgstr "Testu eta ahotsa:" -#: gui/options.cpp:1048 +#: gui/options.cpp:1110 msgid "Spch" msgstr "Ahots." -#: gui/options.cpp:1049 +#: gui/options.cpp:1111 msgid "Subs" msgstr "Azp." -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgctxt "lowres" msgid "Both" msgstr "Biak" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgid "Show subtitles and play speech" msgstr "Ahotsak erreproduzitu eta azpitituluak erakutsi" -#: gui/options.cpp:1052 +#: gui/options.cpp:1114 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Azpit. abiadura:" -#: gui/options.cpp:1068 +#: gui/options.cpp:1130 msgid "Music volume:" msgstr "Musika:" -#: gui/options.cpp:1070 +#: gui/options.cpp:1132 msgctxt "lowres" msgid "Music volume:" msgstr "Musika:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1139 msgid "Mute All" msgstr "Mututu dena" -#: gui/options.cpp:1080 +#: gui/options.cpp:1142 msgid "SFX volume:" msgstr "Efektuak:" -#: gui/options.cpp:1080 gui/options.cpp:1082 gui/options.cpp:1083 +#: gui/options.cpp:1142 gui/options.cpp:1144 gui/options.cpp:1145 msgid "Special sound effects volume" msgstr "Soinu efektu berezien bolumena" -#: gui/options.cpp:1082 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "SFX volume:" msgstr "Efektuak:" -#: gui/options.cpp:1090 +#: gui/options.cpp:1152 msgid "Speech volume:" msgstr "Ahotsak:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1154 msgctxt "lowres" msgid "Speech volume:" msgstr "Ahotsak:" -#: gui/options.cpp:1311 +#: gui/options.cpp:1351 +#, fuzzy +msgid "Control" +msgstr "Saguaren kontrola" + +#: gui/options.cpp:1383 msgid "FluidSynth Settings" msgstr "FluidSynth Ezarpenak" -#: gui/options.cpp:1342 +#: gui/options.cpp:1414 msgid "Theme Path:" msgstr "Gaiak:" -#: gui/options.cpp:1344 +#: gui/options.cpp:1416 msgctxt "lowres" msgid "Theme Path:" msgstr "Gaiak:" -#: gui/options.cpp:1350 gui/options.cpp:1352 gui/options.cpp:1353 +#: gui/options.cpp:1422 gui/options.cpp:1424 gui/options.cpp:1425 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:1359 +#: gui/options.cpp:1431 msgid "Plugins Path:" msgstr "Pluginak:" -#: gui/options.cpp:1361 +#: gui/options.cpp:1433 msgctxt "lowres" msgid "Plugins Path:" msgstr "Pluginak:" -#: gui/options.cpp:1372 +#: gui/options.cpp:1444 msgctxt "lowres" msgid "Misc" msgstr "Beste" -#: gui/options.cpp:1374 +#: gui/options.cpp:1446 msgid "Theme:" msgstr "Gaia:" -#: gui/options.cpp:1378 +#: gui/options.cpp:1450 msgid "GUI Renderer:" msgstr "Interfazea:" -#: gui/options.cpp:1390 +#: gui/options.cpp:1462 msgid "Autosave:" msgstr "Autogordetzea:" -#: gui/options.cpp:1392 +#: gui/options.cpp:1464 msgctxt "lowres" msgid "Autosave:" msgstr "Autogordetzea:" -#: gui/options.cpp:1400 +#: gui/options.cpp:1472 msgid "Keys" msgstr "Teklak" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "GUI Language:" msgstr "Hizkuntza:" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "Language of ScummVM GUI" msgstr "ScummVM interfazearen hizkuntza" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "Update check:" msgstr "" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "How often to check ScummVM updates" msgstr "" -#: gui/options.cpp:1447 +#: gui/options.cpp:1519 msgid "Check now" msgstr "" -#: gui/options.cpp:1455 +#: gui/options.cpp:1527 msgid "Cloud" msgstr "" -#: gui/options.cpp:1457 +#: gui/options.cpp:1529 msgctxt "lowres" msgid "Cloud" msgstr "" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Storage:" msgstr "" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Active cloud storage" msgstr "" -#: gui/options.cpp:1469 gui/options.cpp:2026 +#: gui/options.cpp:1541 gui/options.cpp:2098 msgid "<none>" msgstr "" -#: gui/options.cpp:1473 backends/platform/wii/options.cpp:114 +#: gui/options.cpp:1545 backends/platform/wii/options.cpp:114 msgid "Username:" msgstr "Erabiltzaile-izena:" -#: gui/options.cpp:1473 +#: gui/options.cpp:1545 msgid "Username used by this storage" msgstr "" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Used space:" msgstr "" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Space used by ScummVM's saved games on this storage" msgstr "" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "Last sync time:" msgstr "" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "When the last saved games sync for this storage occured" msgstr "" -#: gui/options.cpp:1482 gui/storagewizarddialog.cpp:71 +#: gui/options.cpp:1554 gui/storagewizarddialog.cpp:71 msgid "Connect" msgstr "" -#: gui/options.cpp:1482 +#: gui/options.cpp:1554 msgid "Open wizard dialog to connect your cloud storage account" msgstr "" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh" msgstr "" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh current cloud storage information (username and usage)" msgstr "" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 #, fuzzy msgid "Download" msgstr "Behera" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Open downloads manager dialog" msgstr "" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run server" msgstr "" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run local webserver" msgstr "" -#: gui/options.cpp:1487 gui/options.cpp:2136 +#: gui/options.cpp:1559 gui/options.cpp:2208 #, fuzzy msgid "Not running" msgstr "Jokoa exekutatzean errorea:" -#: gui/options.cpp:1491 +#: gui/options.cpp:1563 #, fuzzy msgid "/root/ Path:" msgstr "Gehigarriak:" -#: gui/options.cpp:1491 gui/options.cpp:1493 gui/options.cpp:1494 +#: gui/options.cpp:1563 gui/options.cpp:1565 gui/options.cpp:1566 #, fuzzy msgid "Specifies which directory the Files Manager can access" msgstr "Zure gordetako partidak non gordeko diren zehazten du" -#: gui/options.cpp:1493 +#: gui/options.cpp:1565 #, fuzzy msgctxt "lowres" msgid "/root/ Path:" msgstr "Gehigarriak:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 #, fuzzy msgid "Server's port:" msgstr "Zerbitzaria:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "" "Which port is used by the server\n" "Auth with server is not available with non-default port" msgstr "" -#: gui/options.cpp:1516 +#: gui/options.cpp:1588 msgid "Apply" msgstr "" -#: gui/options.cpp:1682 +#: gui/options.cpp:1754 #, fuzzy msgid "Failed to change cloud storage!" msgstr "Ezin izan da jokoa gorde" -#: gui/options.cpp:1685 +#: gui/options.cpp:1757 msgid "Another cloud storage is already active." msgstr "" -#: gui/options.cpp:1721 +#: gui/options.cpp:1793 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1293,51 +1311,51 @@ msgstr "" "Aukeraturiko gaia ez da zure hizkuntzarekin bateragarria. Gai hau erabili " "nahi baduzu, aurretik beste hizkuntza batera pasa behar duzu." -#: gui/options.cpp:1756 +#: gui/options.cpp:1828 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:1765 +#: gui/options.cpp:1837 msgid "Select directory for GUI themes" msgstr "Gaien direktorioa aukeratu" -#: gui/options.cpp:1775 +#: gui/options.cpp:1847 msgid "Select directory for extra files" msgstr "Fitxategi gehigarrien direktorioa aukeratu" -#: gui/options.cpp:1786 +#: gui/options.cpp:1858 msgid "Select directory for plugins" msgstr "Pluginen direktorioa aukeratu" -#: gui/options.cpp:1798 +#: gui/options.cpp:1870 #, fuzzy msgid "Select directory for Files Manager /root/" msgstr "Fitxategi gehigarrien direktorioa aukeratu" -#: gui/options.cpp:2033 +#: gui/options.cpp:2105 #, c-format msgid "%llu bytes" msgstr "" -#: gui/options.cpp:2041 +#: gui/options.cpp:2113 msgid "<right now>" msgstr "" -#: gui/options.cpp:2043 +#: gui/options.cpp:2115 #, fuzzy msgid "<never>" msgstr "Inoiz ez" -#: gui/options.cpp:2127 +#: gui/options.cpp:2199 #, fuzzy msgid "Stop server" msgstr "Zerbitzaria:" -#: gui/options.cpp:2128 +#: gui/options.cpp:2200 msgid "Stop local webserver" msgstr "" -#: gui/options.cpp:2219 +#: gui/options.cpp:2291 msgid "" "Request failed.\n" "Check your Internet connection." diff --git a/po/fi_FI.po b/po/fi_FI.po index 24648b167a..07d754c166 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-02-11 08:56+0100\n" +"POT-Creation-Date: 2017-02-21 23:29+0100\n" "PO-Revision-Date: 2017-01-06 16:03+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:1515 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69 +#: gui/options.cpp:1587 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:443 #: gui/saveload-dialog.cpp:717 gui/saveload-dialog.cpp:1111 @@ -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:522 -#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1517 +#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1589 #: gui/saveload-dialog.cpp:1112 engines/engine.cpp:477 engines/engine.cpp:488 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 @@ -240,7 +240,7 @@ msgstr "" "englanninkieliseksi" #: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:121 -#: gui/options.cpp:845 gui/options.cpp:858 gui/options.cpp:1410 +#: gui/options.cpp:907 gui/options.cpp:920 gui/options.cpp:1482 #: audio/null.cpp:41 msgid "<default>" msgstr "<oletus>" @@ -263,11 +263,11 @@ msgstr "Alusta:" msgid "Engine" msgstr "Pelimoottori" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "Graphics" msgstr "Grafiikka" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "GFX" msgstr "GFX" @@ -280,7 +280,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Ohita globaalit grafiikka-asetukset" -#: gui/editgamedialog.cpp:196 gui/options.cpp:1292 +#: gui/editgamedialog.cpp:196 gui/options.cpp:1364 msgid "Audio" msgstr "Ффni" @@ -293,11 +293,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Ohita globaalit ффniasetukset" -#: gui/editgamedialog.cpp:210 gui/options.cpp:1297 +#: gui/editgamedialog.cpp:210 gui/options.cpp:1369 msgid "Volume" msgstr "Voimakkuus" -#: gui/editgamedialog.cpp:212 gui/options.cpp:1299 +#: gui/editgamedialog.cpp:212 gui/options.cpp:1371 msgctxt "lowres" msgid "Volume" msgstr "Voimakkuus" @@ -311,7 +311,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Ohita globaalit ффnenvoimakkuusasetukset" -#: gui/editgamedialog.cpp:226 gui/options.cpp:1307 +#: gui/editgamedialog.cpp:226 gui/options.cpp:1379 msgid "MIDI" msgstr "MIDI" @@ -324,7 +324,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Ohita globaalit MIDI-asetukset" -#: gui/editgamedialog.cpp:241 gui/options.cpp:1317 +#: gui/editgamedialog.cpp:241 gui/options.cpp:1389 msgid "MT-32" msgstr "MT-32" @@ -337,11 +337,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Ohita globaalit MT-32 asetukset" -#: gui/editgamedialog.cpp:255 gui/options.cpp:1324 +#: gui/editgamedialog.cpp:255 gui/options.cpp:1396 msgid "Paths" msgstr "Polut" -#: gui/editgamedialog.cpp:257 gui/options.cpp:1326 +#: gui/editgamedialog.cpp:257 gui/options.cpp:1398 msgctxt "lowres" msgid "Paths" msgstr "Polut" @@ -355,7 +355,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Pelin polku:" -#: gui/editgamedialog.cpp:271 gui/options.cpp:1350 +#: gui/editgamedialog.cpp:271 gui/options.cpp:1422 msgid "Extra Path:" msgstr "Lisфkansio:" @@ -364,44 +364,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:1352 +#: gui/editgamedialog.cpp:273 gui/options.cpp:1424 msgctxt "lowres" msgid "Extra Path:" msgstr "Lisфkansio:" -#: gui/editgamedialog.cpp:280 gui/options.cpp:1334 +#: gui/editgamedialog.cpp:280 gui/options.cpp:1406 msgid "Save Path:" msgstr "Tallennuskansio:" #: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282 -#: gui/editgamedialog.cpp:283 gui/options.cpp:1334 gui/options.cpp:1336 -#: gui/options.cpp:1337 +#: gui/editgamedialog.cpp:283 gui/options.cpp:1406 gui/options.cpp:1408 +#: gui/options.cpp:1409 msgid "Specifies where your saved games are put" msgstr "Mффrittфф polun pelitallennuksille" -#: gui/editgamedialog.cpp:282 gui/options.cpp:1336 +#: gui/editgamedialog.cpp:282 gui/options.cpp:1408 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:1345 -#: gui/options.cpp:1353 gui/options.cpp:1362 gui/options.cpp:1542 -#: gui/options.cpp:1548 gui/options.cpp:1556 gui/options.cpp:1579 -#: gui/options.cpp:1608 gui/options.cpp:1614 gui/options.cpp:1621 -#: gui/options.cpp:1629 gui/options.cpp:1812 gui/options.cpp:1815 -#: gui/options.cpp:1822 gui/options.cpp:1832 +#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1417 +#: gui/options.cpp:1425 gui/options.cpp:1434 gui/options.cpp:1614 +#: gui/options.cpp:1620 gui/options.cpp:1628 gui/options.cpp:1651 +#: gui/options.cpp:1680 gui/options.cpp:1686 gui/options.cpp:1693 +#: gui/options.cpp:1701 gui/options.cpp:1884 gui/options.cpp:1887 +#: gui/options.cpp:1894 gui/options.cpp:1904 msgctxt "path" msgid "None" msgstr "Ei mффritelty" #: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404 -#: gui/editgamedialog.cpp:522 gui/options.cpp:1536 gui/options.cpp:1602 -#: gui/options.cpp:1818 backends/platform/wii/options.cpp:56 +#: gui/editgamedialog.cpp:522 gui/options.cpp:1608 gui/options.cpp:1674 +#: gui/options.cpp:1890 backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Oletus" -#: gui/editgamedialog.cpp:450 gui/options.cpp:1826 +#: gui/editgamedialog.cpp:450 gui/options.cpp:1898 msgid "Select SoundFont" msgstr "Valitse SoundFont" @@ -409,7 +409,7 @@ msgstr "Valitse SoundFont" msgid "Select additional game directory" msgstr "Valitse lisфhakemisto pelille" -#: gui/editgamedialog.cpp:502 gui/options.cpp:1749 +#: gui/editgamedialog.cpp:502 gui/options.cpp:1821 msgid "Select directory for saved games" msgstr "Valitse hakemisto pelitallennuksille" @@ -501,7 +501,7 @@ msgstr "Sini" msgid "Triangle" msgstr "Kolmio" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1370 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1442 msgid "Misc" msgstr "Muut" @@ -821,106 +821,119 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:289 gui/options.cpp:552 gui/options.cpp:690 -#: gui/options.cpp:759 gui/options.cpp:970 +#: gui/options.cpp:316 gui/options.cpp:598 gui/options.cpp:736 +#: gui/options.cpp:805 gui/options.cpp:1032 msgctxt "soundfont" msgid "None" msgstr "Ei kфytіssф" -#: gui/options.cpp:456 +#: gui/options.cpp:502 msgid "Failed to apply some of the graphic options changes:" msgstr "Joitain grafiikka-asetuksia ei saatu asetettua:" -#: gui/options.cpp:468 +#: gui/options.cpp:514 msgid "the video mode could not be changed." msgstr "videotilaa ei voitu vaihtaa." -#: gui/options.cpp:474 +#: gui/options.cpp:520 msgid "the aspect ratio setting could not be changed" msgstr "kuvasuhdekorjausasetusta ei voitu muuttaa" -#: gui/options.cpp:480 +#: gui/options.cpp:526 msgid "the fullscreen setting could not be changed" msgstr "kokoruututilaa ei voitu muuttaa" -#: gui/options.cpp:486 +#: gui/options.cpp:532 msgid "the filtering setting could not be changed" msgstr "Suodatusasetusta ei voitu muuttaa" -#: gui/options.cpp:842 +#: gui/options.cpp:884 +msgid "Show On-screen control" +msgstr "" + +#: gui/options.cpp:888 +#, fuzzy +msgid "Touchpad mouse mode" +msgstr "Touchpad tila pois pффltф." + +#: gui/options.cpp:892 +msgid "Swap Menu and Back buttons" +msgstr "" + +#: gui/options.cpp:904 msgid "Graphics mode:" msgstr "Grafiikkatila:" -#: gui/options.cpp:856 +#: gui/options.cpp:918 msgid "Render mode:" msgstr "Renderіintitila:" -#: gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:918 gui/options.cpp:919 msgid "Special dithering modes supported by some games" msgstr "Erityiset dithering asetukset joita jotkut pelit tukevat" -#: gui/options.cpp:868 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 +#: gui/options.cpp:930 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2460 msgid "Fullscreen mode" msgstr "Kokoruututila" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Filter graphics" msgstr "Suodata grafiikka" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Use linear filtering when scaling graphics" msgstr "Kфytф bilineaarista suodatinta grafiikan skaalauksessa" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Aspect ratio correction" msgstr "Kuvasuhteen korjaus" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Correct aspect ratio for 320x200 games" msgstr "Korjaa kuvasuhde 320x200 peleille" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Preferred Device:" msgstr "Ensisijainen laite:" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Music Device:" msgstr "Musiikkilaite:" -#: gui/options.cpp:882 gui/options.cpp:884 +#: gui/options.cpp:944 gui/options.cpp:946 msgid "Specifies preferred sound device or sound card emulator" msgstr "" "Mффrittфф ффnilaitteen tai ффnikorttiemulaattorin jota ensisijaisesti tulisi " "kфyttфф" -#: gui/options.cpp:882 gui/options.cpp:884 gui/options.cpp:885 +#: gui/options.cpp:944 gui/options.cpp:946 gui/options.cpp:947 msgid "Specifies output sound device or sound card emulator" msgstr "Mффrittфф ффnikortin tai ффnikorttia emuloivan ohjelmiston" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Ensisijainen:" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Music Device:" msgstr "Musiikkilaite:" -#: gui/options.cpp:911 +#: gui/options.cpp:973 msgid "AdLib emulator:" msgstr "AdLib emulaattori:" -#: gui/options.cpp:911 gui/options.cpp:912 +#: gui/options.cpp:973 gui/options.cpp:974 msgid "AdLib is used for music in many games" msgstr "AdLibiф kфytetффn monien pelien musiikeissa" -#: gui/options.cpp:922 +#: gui/options.cpp:984 msgid "Output rate:" msgstr "Taajuus:" -#: gui/options.cpp:922 gui/options.cpp:923 +#: gui/options.cpp:984 gui/options.cpp:985 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -928,61 +941,61 @@ msgstr "" "Isommat taajuudet merkitsevфt parempaa ффnenlaatua, mutta ффnikorttisi ei " "ehkф tue niitф" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "GM Device:" msgstr "GM laite:" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "Specifies default sound device for General MIDI output" msgstr "Mффrittфф oletuksena kфytettфvфn ффnilaitteen General MIDIlle" -#: gui/options.cpp:944 +#: gui/options.cpp:1006 msgid "Don't use General MIDI music" msgstr "Фlф kфytф General MIDIф musiikissa" -#: gui/options.cpp:955 gui/options.cpp:1017 +#: gui/options.cpp:1017 gui/options.cpp:1079 msgid "Use first available device" msgstr "Kфytф ensimmфistф laitetta" -#: gui/options.cpp:967 +#: gui/options.cpp:1029 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:967 gui/options.cpp:969 gui/options.cpp:970 +#: gui/options.cpp:1029 gui/options.cpp:1031 gui/options.cpp:1032 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "" "Jotkut ффnikortit tukevat ффnifonttia (SoundFont), FluidSynth ja Timidity" -#: gui/options.cpp:969 +#: gui/options.cpp:1031 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Mixed AdLib/MIDI mode" msgstr "Yhdistetty AdLib/MIDI tila" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Use both MIDI and AdLib sound generation" msgstr "Kфytф sekф MIDIф ettф Adlibiф ффnentuotantoon" -#: gui/options.cpp:978 +#: gui/options.cpp:1040 msgid "MIDI gain:" msgstr "MIDIn ффnilisфys:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "MT-32 Device:" msgstr "MT-32 laite:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 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:993 +#: gui/options.cpp:1055 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Aito Roland MT-32 (ei GM emulointia)" -#: gui/options.cpp:993 gui/options.cpp:995 +#: gui/options.cpp:1055 gui/options.cpp:1057 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -990,16 +1003,16 @@ msgstr "" "Valitse jos haluat kфyttфф aitoa Roland-yhteensopivaa laittetta joka on " "kytketty tietokoneeseesi" -#: gui/options.cpp:995 +#: gui/options.cpp:1057 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Aito Roland MT-32 (ei GM emulointia)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland GS Laite (aktivoi MT-32 mappaukset)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -1007,265 +1020,270 @@ msgstr "" "Valitse jos haluat kфyttфф patch mappingia MT-32:n emulointiin Roland GS " "laitteella" -#: gui/options.cpp:1007 +#: gui/options.cpp:1069 msgid "Don't use Roland MT-32 music" msgstr "Фlф kфytф Roland MT-32 musiikkia" -#: gui/options.cpp:1034 +#: gui/options.cpp:1096 msgid "Text and Speech:" msgstr "Tekstitys ja puhe:" -#: gui/options.cpp:1038 gui/options.cpp:1048 +#: gui/options.cpp:1100 gui/options.cpp:1110 msgid "Speech" msgstr "Puhe" -#: gui/options.cpp:1039 gui/options.cpp:1049 +#: gui/options.cpp:1101 gui/options.cpp:1111 msgid "Subtitles" msgstr "Tekstitys" -#: gui/options.cpp:1040 +#: gui/options.cpp:1102 msgid "Both" msgstr "Molemmat" -#: gui/options.cpp:1042 +#: gui/options.cpp:1104 msgid "Subtitle speed:" msgstr "Tekstityksen nopeus:" -#: gui/options.cpp:1044 +#: gui/options.cpp:1106 msgctxt "lowres" msgid "Text and Speech:" msgstr "Tekstitys ja puhe:" -#: gui/options.cpp:1048 +#: gui/options.cpp:1110 msgid "Spch" msgstr "Puhe" -#: gui/options.cpp:1049 +#: gui/options.cpp:1111 msgid "Subs" msgstr "Tekstit" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgctxt "lowres" msgid "Both" msgstr "Molemmat" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgid "Show subtitles and play speech" msgstr "Nфytф tekstitys ja kфytф puhetta" -#: gui/options.cpp:1052 +#: gui/options.cpp:1114 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Tekstityksen nopeus:" -#: gui/options.cpp:1068 +#: gui/options.cpp:1130 msgid "Music volume:" msgstr "Musiikki:" -#: gui/options.cpp:1070 +#: gui/options.cpp:1132 msgctxt "lowres" msgid "Music volume:" msgstr "Musiikki:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1139 msgid "Mute All" msgstr "Vaimenna" -#: gui/options.cpp:1080 +#: gui/options.cpp:1142 msgid "SFX volume:" msgstr "Ффniefektit:" -#: gui/options.cpp:1080 gui/options.cpp:1082 gui/options.cpp:1083 +#: gui/options.cpp:1142 gui/options.cpp:1144 gui/options.cpp:1145 msgid "Special sound effects volume" msgstr "Erikoisefektit" -#: gui/options.cpp:1082 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "SFX volume:" msgstr "Ффniefektit:" -#: gui/options.cpp:1090 +#: gui/options.cpp:1152 msgid "Speech volume:" msgstr "Puhe:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1154 msgctxt "lowres" msgid "Speech volume:" msgstr "Puhe:" -#: gui/options.cpp:1311 +#: gui/options.cpp:1351 +#, fuzzy +msgid "Control" +msgstr "Ohjaa hiirtф" + +#: gui/options.cpp:1383 msgid "FluidSynth Settings" msgstr "FluidSynth asetukset" -#: gui/options.cpp:1342 +#: gui/options.cpp:1414 msgid "Theme Path:" msgstr "Teemojen polku:" -#: gui/options.cpp:1344 +#: gui/options.cpp:1416 msgctxt "lowres" msgid "Theme Path:" msgstr "Teemojen polku:" -#: gui/options.cpp:1350 gui/options.cpp:1352 gui/options.cpp:1353 +#: gui/options.cpp:1422 gui/options.cpp:1424 gui/options.cpp:1425 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:1359 +#: gui/options.cpp:1431 msgid "Plugins Path:" msgstr "Pluginien sijainti:" -#: gui/options.cpp:1361 +#: gui/options.cpp:1433 msgctxt "lowres" msgid "Plugins Path:" msgstr "Pluginien sijainti:" -#: gui/options.cpp:1372 +#: gui/options.cpp:1444 msgctxt "lowres" msgid "Misc" msgstr "Muut" -#: gui/options.cpp:1374 +#: gui/options.cpp:1446 msgid "Theme:" msgstr "Teema:" -#: gui/options.cpp:1378 +#: gui/options.cpp:1450 msgid "GUI Renderer:" msgstr "GUI renderіijф:" -#: gui/options.cpp:1390 +#: gui/options.cpp:1462 msgid "Autosave:" msgstr "Autom. tallennus:" -#: gui/options.cpp:1392 +#: gui/options.cpp:1464 msgctxt "lowres" msgid "Autosave:" msgstr "Autom. tallennus:" -#: gui/options.cpp:1400 +#: gui/options.cpp:1472 msgid "Keys" msgstr "Nфppфimet" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "GUI Language:" msgstr "ScummVM:n kieli:" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "Language of ScummVM GUI" msgstr "ScummVM kфyttіliittymфn kieli" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "Update check:" msgstr "Pфivitystarkistus:" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "How often to check ScummVM updates" msgstr "Kuinka usein tarkistetaan onko ScummVM:ффn pфivityksiф" -#: gui/options.cpp:1447 +#: gui/options.cpp:1519 msgid "Check now" msgstr "Tarkista nyt" -#: gui/options.cpp:1455 +#: gui/options.cpp:1527 msgid "Cloud" msgstr "Pilvi" -#: gui/options.cpp:1457 +#: gui/options.cpp:1529 msgctxt "lowres" msgid "Cloud" msgstr "Pilvi" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Storage:" msgstr "Tallennustila:" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Active cloud storage" msgstr "Aktiivinen pilvitallennus" -#: gui/options.cpp:1469 gui/options.cpp:2026 +#: gui/options.cpp:1541 gui/options.cpp:2098 msgid "<none>" msgstr "<tyhjф>" -#: gui/options.cpp:1473 backends/platform/wii/options.cpp:114 +#: gui/options.cpp:1545 backends/platform/wii/options.cpp:114 msgid "Username:" msgstr "Kфyttфjфnimi:" -#: gui/options.cpp:1473 +#: gui/options.cpp:1545 msgid "Username used by this storage" msgstr "Tallennustilan kфyttфjфnimi" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Used space:" msgstr "Kфytetty tila:" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Space used by ScummVM's saved games on this storage" msgstr "ScummVM:n pelitallennusten kфyttфmф tila tallennustilassa" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "Last sync time:" msgstr "Viimeisin synkronointi:" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "When the last saved games sync for this storage occured" msgstr "Milloin pelitallennukset viimeksi synkronoitiin tфhфn tallennustilaan" -#: gui/options.cpp:1482 gui/storagewizarddialog.cpp:71 +#: gui/options.cpp:1554 gui/storagewizarddialog.cpp:71 msgid "Connect" msgstr "Yhdistф" -#: gui/options.cpp:1482 +#: gui/options.cpp:1554 msgid "Open wizard dialog to connect your cloud storage account" msgstr "Avaa velhodialogi pilvitilan tiliin kirjautumiseen" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh" msgstr "Pфivitф" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 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:1484 +#: gui/options.cpp:1556 msgid "Download" msgstr "Lataa" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Open downloads manager dialog" msgstr "Avaa lataustenhallintadialogi" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run server" msgstr "Kфynnistф palvelin" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run local webserver" msgstr "Kфynnistф paikallinen webpalvelin" -#: gui/options.cpp:1487 gui/options.cpp:2136 +#: gui/options.cpp:1559 gui/options.cpp:2208 msgid "Not running" msgstr "Ei kфynnissф" -#: gui/options.cpp:1491 +#: gui/options.cpp:1563 msgid "/root/ Path:" msgstr "/root/-polku:" -#: gui/options.cpp:1491 gui/options.cpp:1493 gui/options.cpp:1494 +#: gui/options.cpp:1563 gui/options.cpp:1565 gui/options.cpp:1566 msgid "Specifies which directory the Files Manager can access" msgstr "Mффrittфф hakemiston johon tiedostonhallinnalla on pффsy" -#: gui/options.cpp:1493 +#: gui/options.cpp:1565 msgctxt "lowres" msgid "/root/ Path:" msgstr "/root/-polku:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "Server's port:" msgstr "Palvelimen portti:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "" "Which port is used by the server\n" "Auth with server is not available with non-default port" @@ -1273,19 +1291,19 @@ msgstr "" "Palvelimen kфyttфmф portti\n" "Autentikaatio palvelimella on mahdollista vain vakioportilla" -#: gui/options.cpp:1516 +#: gui/options.cpp:1588 msgid "Apply" msgstr "Kфytф" -#: gui/options.cpp:1682 +#: gui/options.cpp:1754 msgid "Failed to change cloud storage!" msgstr "Pilvitallennustilan vaihtaminen epфonnistui!" -#: gui/options.cpp:1685 +#: gui/options.cpp:1757 msgid "Another cloud storage is already active." msgstr "Toinen pilvitila on jo aktiivinen." -#: gui/options.cpp:1721 +#: gui/options.cpp:1793 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1293,48 +1311,48 @@ msgstr "" "Valitsemasi teema ei tue nykyistф valitsemaasi kieltф. Vaihda kieli ensin, " "ja yritф sitten uudelleen." -#: gui/options.cpp:1756 +#: gui/options.cpp:1828 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Valittuun hakemistoon ei voi kirjoittaa. Valitse toinen hakemisto." -#: gui/options.cpp:1765 +#: gui/options.cpp:1837 msgid "Select directory for GUI themes" msgstr "Valitse hakemisto kфyttіliittymфn teemoille" -#: gui/options.cpp:1775 +#: gui/options.cpp:1847 msgid "Select directory for extra files" msgstr "Valitse hakemisto lisфtiedostoille" -#: gui/options.cpp:1786 +#: gui/options.cpp:1858 msgid "Select directory for plugins" msgstr "Valitse hakemisto plugineille" -#: gui/options.cpp:1798 +#: gui/options.cpp:1870 msgid "Select directory for Files Manager /root/" msgstr "Valitse /root/ hakemisto tiedostonhallinnalle" -#: gui/options.cpp:2033 +#: gui/options.cpp:2105 #, c-format msgid "%llu bytes" msgstr "%llu tavua" -#: gui/options.cpp:2041 +#: gui/options.cpp:2113 msgid "<right now>" msgstr "<nyt>" -#: gui/options.cpp:2043 +#: gui/options.cpp:2115 msgid "<never>" msgstr "<ei koskaan>" -#: gui/options.cpp:2127 +#: gui/options.cpp:2199 msgid "Stop server" msgstr "Pysфytф palvelin" -#: gui/options.cpp:2128 +#: gui/options.cpp:2200 msgid "Stop local webserver" msgstr "Pysфytф paikallinen webpalvelin" -#: gui/options.cpp:2219 +#: gui/options.cpp:2291 msgid "" "Request failed.\n" "Check your Internet connection." diff --git a/po/fr_FR.po b/po/fr_FR.po index cadbc1a594..cb0ee2ceeb 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-02-11 08:56+0100\n" +"POT-Creation-Date: 2017-02-21 23:29+0100\n" "PO-Revision-Date: 2017-02-04 10:14+0000\n" "Last-Translator: Purple T <zeonk@hotmail.com>\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:1515 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69 +#: gui/options.cpp:1587 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:443 #: gui/saveload-dialog.cpp:717 gui/saveload-dialog.cpp:1111 @@ -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:522 -#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1517 +#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1589 #: gui/saveload-dialog.cpp:1112 engines/engine.cpp:477 engines/engine.cpp:488 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 @@ -241,7 +241,7 @@ msgstr "" "espagnole du jeu." #: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:121 -#: gui/options.cpp:845 gui/options.cpp:858 gui/options.cpp:1410 +#: gui/options.cpp:907 gui/options.cpp:920 gui/options.cpp:1482 #: audio/null.cpp:41 msgid "<default>" msgstr "<dщfaut>" @@ -264,11 +264,11 @@ msgstr "Systшme :" msgid "Engine" msgstr "Moteur" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "Graphics" msgstr "Graphique" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "GFX" msgstr "GFX" @@ -281,7 +281,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Rщglages spщcifiques р ce jeu" -#: gui/editgamedialog.cpp:196 gui/options.cpp:1292 +#: gui/editgamedialog.cpp:196 gui/options.cpp:1364 msgid "Audio" msgstr "Audio" @@ -294,11 +294,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Rщglages spщcifiques р ce jeu" -#: gui/editgamedialog.cpp:210 gui/options.cpp:1297 +#: gui/editgamedialog.cpp:210 gui/options.cpp:1369 msgid "Volume" msgstr "Volume" -#: gui/editgamedialog.cpp:212 gui/options.cpp:1299 +#: gui/editgamedialog.cpp:212 gui/options.cpp:1371 msgctxt "lowres" msgid "Volume" msgstr "Volume" @@ -312,7 +312,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Rщglages spщcifiques р ce jeu" -#: gui/editgamedialog.cpp:226 gui/options.cpp:1307 +#: gui/editgamedialog.cpp:226 gui/options.cpp:1379 msgid "MIDI" msgstr "MIDI" @@ -325,7 +325,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Rщglages spщcifiques р ce jeu" -#: gui/editgamedialog.cpp:241 gui/options.cpp:1317 +#: gui/editgamedialog.cpp:241 gui/options.cpp:1389 msgid "MT-32" msgstr "MT-32" @@ -338,11 +338,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Rщglages spщcifiques р ce jeu" -#: gui/editgamedialog.cpp:255 gui/options.cpp:1324 +#: gui/editgamedialog.cpp:255 gui/options.cpp:1396 msgid "Paths" msgstr "Chemins" -#: gui/editgamedialog.cpp:257 gui/options.cpp:1326 +#: gui/editgamedialog.cpp:257 gui/options.cpp:1398 msgctxt "lowres" msgid "Paths" msgstr "Chemins" @@ -356,7 +356,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Chemin du Jeu :" -#: gui/editgamedialog.cpp:271 gui/options.cpp:1350 +#: gui/editgamedialog.cpp:271 gui/options.cpp:1422 msgid "Extra Path:" msgstr "Extra :" @@ -366,44 +366,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:1352 +#: gui/editgamedialog.cpp:273 gui/options.cpp:1424 msgctxt "lowres" msgid "Extra Path:" msgstr "Extra :" -#: gui/editgamedialog.cpp:280 gui/options.cpp:1334 +#: gui/editgamedialog.cpp:280 gui/options.cpp:1406 msgid "Save Path:" msgstr "Sauvegardes :" #: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282 -#: gui/editgamedialog.cpp:283 gui/options.cpp:1334 gui/options.cpp:1336 -#: gui/options.cpp:1337 +#: gui/editgamedialog.cpp:283 gui/options.cpp:1406 gui/options.cpp:1408 +#: gui/options.cpp:1409 msgid "Specifies where your saved games are put" msgstr "Dщfinie l'emplacement oљ les fichiers de sauvegarde sont crщщs" -#: gui/editgamedialog.cpp:282 gui/options.cpp:1336 +#: gui/editgamedialog.cpp:282 gui/options.cpp:1408 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:1345 -#: gui/options.cpp:1353 gui/options.cpp:1362 gui/options.cpp:1542 -#: gui/options.cpp:1548 gui/options.cpp:1556 gui/options.cpp:1579 -#: gui/options.cpp:1608 gui/options.cpp:1614 gui/options.cpp:1621 -#: gui/options.cpp:1629 gui/options.cpp:1812 gui/options.cpp:1815 -#: gui/options.cpp:1822 gui/options.cpp:1832 +#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1417 +#: gui/options.cpp:1425 gui/options.cpp:1434 gui/options.cpp:1614 +#: gui/options.cpp:1620 gui/options.cpp:1628 gui/options.cpp:1651 +#: gui/options.cpp:1680 gui/options.cpp:1686 gui/options.cpp:1693 +#: gui/options.cpp:1701 gui/options.cpp:1884 gui/options.cpp:1887 +#: gui/options.cpp:1894 gui/options.cpp:1904 msgctxt "path" msgid "None" msgstr "Aucun" #: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404 -#: gui/editgamedialog.cpp:522 gui/options.cpp:1536 gui/options.cpp:1602 -#: gui/options.cpp:1818 backends/platform/wii/options.cpp:56 +#: gui/editgamedialog.cpp:522 gui/options.cpp:1608 gui/options.cpp:1674 +#: gui/options.cpp:1890 backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Dщfaut" -#: gui/editgamedialog.cpp:450 gui/options.cpp:1826 +#: gui/editgamedialog.cpp:450 gui/options.cpp:1898 msgid "Select SoundFont" msgstr "Choisir une banque de sons" @@ -411,7 +411,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:1749 +#: gui/editgamedialog.cpp:502 gui/options.cpp:1821 msgid "Select directory for saved games" msgstr "Sщlectionner le rщpertoire pour les sauvegardes" @@ -504,7 +504,7 @@ msgstr "Sinus" msgid "Triangle" msgstr "Triangle" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1370 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1442 msgid "Misc" msgstr "Divers" @@ -826,108 +826,121 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:289 gui/options.cpp:552 gui/options.cpp:690 -#: gui/options.cpp:759 gui/options.cpp:970 +#: gui/options.cpp:316 gui/options.cpp:598 gui/options.cpp:736 +#: gui/options.cpp:805 gui/options.cpp:1032 msgctxt "soundfont" msgid "None" msgstr "Aucune" -#: gui/options.cpp:456 +#: gui/options.cpp:502 msgid "Failed to apply some of the graphic options changes:" msgstr "Certaines options graphiques n'ont pu ъtre changщes :" -#: gui/options.cpp:468 +#: gui/options.cpp:514 msgid "the video mode could not be changed." msgstr "le mode vidщo n'a pu ъtre changщ." -#: gui/options.cpp:474 +#: gui/options.cpp:520 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:480 +#: gui/options.cpp:526 msgid "the fullscreen setting could not be changed" msgstr "le mode plein щcran n'a pu ъtre changщ" -#: gui/options.cpp:486 +#: gui/options.cpp:532 msgid "the filtering setting could not be changed" msgstr "le mode de filtrage n'a pu ъtre changщ" -#: gui/options.cpp:842 +#: gui/options.cpp:884 +msgid "Show On-screen control" +msgstr "" + +#: gui/options.cpp:888 +#, fuzzy +msgid "Touchpad mouse mode" +msgstr "Mode touchpad dщsactivщ." + +#: gui/options.cpp:892 +msgid "Swap Menu and Back buttons" +msgstr "" + +#: gui/options.cpp:904 msgid "Graphics mode:" msgstr "Mode graphique :" -#: gui/options.cpp:856 +#: gui/options.cpp:918 msgid "Render mode:" msgstr "Mode de rendu :" -#: gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:918 gui/options.cpp:919 msgid "Special dithering modes supported by some games" msgstr "Mode spщcial de tramage supportщ par certains jeux" -#: gui/options.cpp:868 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 +#: gui/options.cpp:930 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2460 msgid "Fullscreen mode" msgstr "Plein щcran" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Filter graphics" msgstr "Filtrer les graphiques" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Use linear filtering when scaling graphics" msgstr "" "Utiliser une interpolation bi-linщaire lors du changement d'щchelle des " "graphiques" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Aspect ratio correction" msgstr "Correction du rapport d'aspect" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Correct aspect ratio for 320x200 games" msgstr "Corrige le rapport d'aspect pour les jeux en 320x200" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Preferred Device:" msgstr "Sortie Prщfщrщe :" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Music Device:" msgstr "Sortie Audio :" -#: gui/options.cpp:882 gui/options.cpp:884 +#: gui/options.cpp:944 gui/options.cpp:946 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:882 gui/options.cpp:884 gui/options.cpp:885 +#: gui/options.cpp:944 gui/options.cpp:946 gui/options.cpp:947 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:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Sortie Prщfщrщe :" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Music Device:" msgstr "Sortie Audio :" -#: gui/options.cpp:911 +#: gui/options.cpp:973 msgid "AdLib emulator:" msgstr "Щmulateur AdLib :" -#: gui/options.cpp:911 gui/options.cpp:912 +#: gui/options.cpp:973 gui/options.cpp:974 msgid "AdLib is used for music in many games" msgstr "AdLib est utilisщ pour la musique dans de nombreux jeux" -#: gui/options.cpp:922 +#: gui/options.cpp:984 msgid "Output rate:" msgstr "Frщquence :" -#: gui/options.cpp:922 gui/options.cpp:923 +#: gui/options.cpp:984 gui/options.cpp:985 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -935,64 +948,64 @@ msgstr "" "Une valeur plus щlevщe donne une meilleure qualitщ audio mais peut ne pas " "ъtre supportщe par votre carte son" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "GM Device:" msgstr "Sortie GM :" -#: gui/options.cpp:933 +#: gui/options.cpp:995 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:944 +#: gui/options.cpp:1006 msgid "Don't use General MIDI music" msgstr "Ne pas utiliser la musique General MIDI" -#: gui/options.cpp:955 gui/options.cpp:1017 +#: gui/options.cpp:1017 gui/options.cpp:1079 msgid "Use first available device" msgstr "Utiliser le premier pщriphщrique disponible" -#: gui/options.cpp:967 +#: gui/options.cpp:1029 msgid "SoundFont:" msgstr "Banque de sons :" -#: gui/options.cpp:967 gui/options.cpp:969 gui/options.cpp:970 +#: gui/options.cpp:1029 gui/options.cpp:1031 gui/options.cpp:1032 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:969 +#: gui/options.cpp:1031 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont :" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Mixed AdLib/MIDI mode" msgstr "Mode mixte AdLib/MIDI" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Use both MIDI and AdLib sound generation" msgstr "Utiliser р la fois MIDI et AdLib" -#: gui/options.cpp:978 +#: gui/options.cpp:1040 msgid "MIDI gain:" msgstr "Gain MIDI :" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "MT-32 Device:" msgstr "Sortie MT-32 :" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 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:993 +#: gui/options.cpp:1055 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 exacte (dщsactive l'щmulation GM)" -#: gui/options.cpp:993 gui/options.cpp:995 +#: gui/options.cpp:1055 gui/options.cpp:1057 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -1000,16 +1013,16 @@ msgstr "" "Vщrifie si vous voulez utiliser un pщriphщrique audio compatible Roland " "connectщ р l'ordinateur" -#: gui/options.cpp:995 +#: gui/options.cpp:1057 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 exacte (pas d'щmu GM)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland GS (active le mappage MT-32)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -1017,267 +1030,272 @@ 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:1007 +#: gui/options.cpp:1069 msgid "Don't use Roland MT-32 music" msgstr "Ne pas utiliser la musique Roland MT-32" -#: gui/options.cpp:1034 +#: gui/options.cpp:1096 msgid "Text and Speech:" msgstr "Dialogue :" -#: gui/options.cpp:1038 gui/options.cpp:1048 +#: gui/options.cpp:1100 gui/options.cpp:1110 msgid "Speech" msgstr "Voix" -#: gui/options.cpp:1039 gui/options.cpp:1049 +#: gui/options.cpp:1101 gui/options.cpp:1111 msgid "Subtitles" msgstr "Sous-titres" -#: gui/options.cpp:1040 +#: gui/options.cpp:1102 msgid "Both" msgstr "Les deux" -#: gui/options.cpp:1042 +#: gui/options.cpp:1104 msgid "Subtitle speed:" msgstr "Vitesse des ST :" -#: gui/options.cpp:1044 +#: gui/options.cpp:1106 msgctxt "lowres" msgid "Text and Speech:" msgstr "Dialogue :" -#: gui/options.cpp:1048 +#: gui/options.cpp:1110 msgid "Spch" msgstr "Voix" -#: gui/options.cpp:1049 +#: gui/options.cpp:1111 msgid "Subs" msgstr "Subs" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgctxt "lowres" msgid "Both" msgstr "V&S" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgid "Show subtitles and play speech" msgstr "Affiche les sous-titres et joue les dialogues audio" -#: gui/options.cpp:1052 +#: gui/options.cpp:1114 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Vitesse des ST :" -#: gui/options.cpp:1068 +#: gui/options.cpp:1130 msgid "Music volume:" msgstr "Volume Musique :" -#: gui/options.cpp:1070 +#: gui/options.cpp:1132 msgctxt "lowres" msgid "Music volume:" msgstr "Musique :" -#: gui/options.cpp:1077 +#: gui/options.cpp:1139 msgid "Mute All" msgstr "Silence" -#: gui/options.cpp:1080 +#: gui/options.cpp:1142 msgid "SFX volume:" msgstr "Volume Bruitage :" -#: gui/options.cpp:1080 gui/options.cpp:1082 gui/options.cpp:1083 +#: gui/options.cpp:1142 gui/options.cpp:1144 gui/options.cpp:1145 msgid "Special sound effects volume" msgstr "Volume des effets spщciaux sonores" -#: gui/options.cpp:1082 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "SFX volume:" msgstr "Bruitage :" -#: gui/options.cpp:1090 +#: gui/options.cpp:1152 msgid "Speech volume:" msgstr "Volume Dialogues :" -#: gui/options.cpp:1092 +#: gui/options.cpp:1154 msgctxt "lowres" msgid "Speech volume:" msgstr "Dialogues :" -#: gui/options.cpp:1311 +#: gui/options.cpp:1351 +#, fuzzy +msgid "Control" +msgstr "Contrєles la Souris" + +#: gui/options.cpp:1383 msgid "FluidSynth Settings" msgstr "Paramшtres FluidSynth" -#: gui/options.cpp:1342 +#: gui/options.cpp:1414 msgid "Theme Path:" msgstr "Thшmes :" -#: gui/options.cpp:1344 +#: gui/options.cpp:1416 msgctxt "lowres" msgid "Theme Path:" msgstr "Thшmes :" -#: gui/options.cpp:1350 gui/options.cpp:1352 gui/options.cpp:1353 +#: gui/options.cpp:1422 gui/options.cpp:1424 gui/options.cpp:1425 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:1359 +#: gui/options.cpp:1431 msgid "Plugins Path:" msgstr "Plugins :" -#: gui/options.cpp:1361 +#: gui/options.cpp:1433 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugins :" -#: gui/options.cpp:1372 +#: gui/options.cpp:1444 msgctxt "lowres" msgid "Misc" msgstr "Divers" -#: gui/options.cpp:1374 +#: gui/options.cpp:1446 msgid "Theme:" msgstr "Thшme :" -#: gui/options.cpp:1378 +#: gui/options.cpp:1450 msgid "GUI Renderer:" msgstr "Interface :" -#: gui/options.cpp:1390 +#: gui/options.cpp:1462 msgid "Autosave:" msgstr "Sauvegarde auto :" -#: gui/options.cpp:1392 +#: gui/options.cpp:1464 msgctxt "lowres" msgid "Autosave:" msgstr "Sauvegarde :" -#: gui/options.cpp:1400 +#: gui/options.cpp:1472 msgid "Keys" msgstr "Touches" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "GUI Language:" msgstr "Langue :" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "Language of ScummVM GUI" msgstr "Langue de l'interface graphique de ScummVM" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "Update check:" msgstr "Vщrif. mises р jour :" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "How often to check ScummVM updates" msgstr "Frщquence des vщrifications" -#: gui/options.cpp:1447 +#: gui/options.cpp:1519 msgid "Check now" msgstr "Maintenant" -#: gui/options.cpp:1455 +#: gui/options.cpp:1527 msgid "Cloud" msgstr "Nuage" -#: gui/options.cpp:1457 +#: gui/options.cpp:1529 msgctxt "lowres" msgid "Cloud" msgstr "Nuage" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Storage:" msgstr "Stockage :" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Active cloud storage" msgstr "Service de stockage actif" -#: gui/options.cpp:1469 gui/options.cpp:2026 +#: gui/options.cpp:1541 gui/options.cpp:2098 msgid "<none>" msgstr "<aucun>" -#: gui/options.cpp:1473 backends/platform/wii/options.cpp:114 +#: gui/options.cpp:1545 backends/platform/wii/options.cpp:114 msgid "Username:" msgstr "Nom d'utilisateur :" -#: gui/options.cpp:1473 +#: gui/options.cpp:1545 msgid "Username used by this storage" msgstr "Nom d'utilisateur pour ce service" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Used space:" msgstr "Espace utilisщ :" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 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:1479 +#: gui/options.cpp:1551 msgid "Last sync time:" msgstr "Synchronisщ :" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 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:1482 gui/storagewizarddialog.cpp:71 +#: gui/options.cpp:1554 gui/storagewizarddialog.cpp:71 msgid "Connect" msgstr "Se connecter" -#: gui/options.cpp:1482 +#: gui/options.cpp:1554 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:1483 +#: gui/options.cpp:1555 msgid "Refresh" msgstr "Rafraюchir" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 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:1484 +#: gui/options.cpp:1556 msgid "Download" msgstr "Tщlщcharger" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Open downloads manager dialog" msgstr "Ouvrir le gestionnaire de tщlщchargement" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run server" msgstr "Dщmarrer serveur" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run local webserver" msgstr "Dщmarre le serveur web local" -#: gui/options.cpp:1487 gui/options.cpp:2136 +#: gui/options.cpp:1559 gui/options.cpp:2208 msgid "Not running" msgstr "Arrъtщ" -#: gui/options.cpp:1491 +#: gui/options.cpp:1563 msgid "/root/ Path:" msgstr "Chemin /racine/ :" -#: gui/options.cpp:1491 gui/options.cpp:1493 gui/options.cpp:1494 +#: gui/options.cpp:1563 gui/options.cpp:1565 gui/options.cpp:1566 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:1493 +#: gui/options.cpp:1565 msgctxt "lowres" msgid "/root/ Path:" msgstr "/racine/ :" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "Server's port:" msgstr "Port :" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "" "Which port is used by the server\n" "Auth with server is not available with non-default port" @@ -1285,19 +1303,19 @@ msgstr "" "Port utilisщ par le serveur\n" "Authentification avec le serveur n'est disponible qu'avec le port par dщfaut" -#: gui/options.cpp:1516 +#: gui/options.cpp:1588 msgid "Apply" msgstr "Appliquer" -#: gui/options.cpp:1682 +#: gui/options.cpp:1754 msgid "Failed to change cloud storage!" msgstr "Echec du changement de service de stockage !" -#: gui/options.cpp:1685 +#: gui/options.cpp:1757 msgid "Another cloud storage is already active." msgstr "Un autre service de stockage est dщjр actif." -#: gui/options.cpp:1721 +#: gui/options.cpp:1793 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1305,50 +1323,50 @@ msgstr "" "Le thшme que vous avez sщlectionnщ ne support pas la langue franчaise. Si " "vous voulez l'utiliser vous devez d'abord changer de langue." -#: gui/options.cpp:1756 +#: gui/options.cpp:1828 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:1765 +#: gui/options.cpp:1837 msgid "Select directory for GUI themes" msgstr "Sщlectionner le rщpertoire des thшmes d'interface" -#: gui/options.cpp:1775 +#: gui/options.cpp:1847 msgid "Select directory for extra files" msgstr "Sщlectionner le rщpertoire pour les fichiers supplщmentaires" -#: gui/options.cpp:1786 +#: gui/options.cpp:1858 msgid "Select directory for plugins" msgstr "Sщlectionner le rщpertoire des plugins" -#: gui/options.cpp:1798 +#: gui/options.cpp:1870 msgid "Select directory for Files Manager /root/" msgstr "Indique le rщpertoire pour la /racine/ du Gestionnaire de Fichiers" -#: gui/options.cpp:2033 +#: gui/options.cpp:2105 #, c-format msgid "%llu bytes" msgstr "%llu octets" -#: gui/options.cpp:2041 +#: gui/options.cpp:2113 msgid "<right now>" msgstr "<maintenant>" -#: gui/options.cpp:2043 +#: gui/options.cpp:2115 msgid "<never>" msgstr "<jamais>" -#: gui/options.cpp:2127 +#: gui/options.cpp:2199 msgid "Stop server" msgstr "Arrъter serveur" -#: gui/options.cpp:2128 +#: gui/options.cpp:2200 msgid "Stop local webserver" msgstr "Arrъter le serveur" -#: gui/options.cpp:2219 +#: gui/options.cpp:2291 msgid "" "Request failed.\n" "Check your Internet connection." diff --git a/po/gl_ES.po b/po/gl_ES.po index 4b3fca1351..8f49bbf6be 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-02-11 08:56+0100\n" +"POT-Creation-Date: 2017-02-21 23:29+0100\n" "PO-Revision-Date: 2016-11-28 15:51+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:1515 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69 +#: gui/options.cpp:1587 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:443 #: gui/saveload-dialog.cpp:717 gui/saveload-dialog.cpp:1111 @@ -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:522 -#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1517 +#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1589 #: gui/saveload-dialog.cpp:1112 engines/engine.cpp:477 engines/engine.cpp:488 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 @@ -239,7 +239,7 @@ msgid "" 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:121 -#: gui/options.cpp:845 gui/options.cpp:858 gui/options.cpp:1410 +#: gui/options.cpp:907 gui/options.cpp:920 gui/options.cpp:1482 #: audio/null.cpp:41 msgid "<default>" msgstr "<por defecto>" @@ -262,11 +262,11 @@ msgstr "Plataforma:" msgid "Engine" msgstr "Motor" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "Graphics" msgstr "Grсficos" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "GFX" msgstr "Efectos grсficos" @@ -279,7 +279,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Anular a configuraciѓn dos grсficos" -#: gui/editgamedialog.cpp:196 gui/options.cpp:1292 +#: gui/editgamedialog.cpp:196 gui/options.cpp:1364 msgid "Audio" msgstr "Son" @@ -292,11 +292,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Anular a configuraciѓn do son" -#: gui/editgamedialog.cpp:210 gui/options.cpp:1297 +#: gui/editgamedialog.cpp:210 gui/options.cpp:1369 msgid "Volume" msgstr "Volume" -#: gui/editgamedialog.cpp:212 gui/options.cpp:1299 +#: gui/editgamedialog.cpp:212 gui/options.cpp:1371 msgctxt "lowres" msgid "Volume" msgstr "Volume" @@ -310,7 +310,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Anular a configuraciѓn do volume" -#: gui/editgamedialog.cpp:226 gui/options.cpp:1307 +#: gui/editgamedialog.cpp:226 gui/options.cpp:1379 msgid "MIDI" msgstr "MIDI" @@ -323,7 +323,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Anular a configuraciѓn de MIDI" -#: gui/editgamedialog.cpp:241 gui/options.cpp:1317 +#: gui/editgamedialog.cpp:241 gui/options.cpp:1389 msgid "MT-32" msgstr "MT-32" @@ -336,11 +336,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Anular a configuraciѓn de MT-32" -#: gui/editgamedialog.cpp:255 gui/options.cpp:1324 +#: gui/editgamedialog.cpp:255 gui/options.cpp:1396 msgid "Paths" msgstr "Camiёos" -#: gui/editgamedialog.cpp:257 gui/options.cpp:1326 +#: gui/editgamedialog.cpp:257 gui/options.cpp:1398 msgctxt "lowres" msgid "Paths" msgstr "Camiёos" @@ -354,7 +354,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Camiёo do xogo:" -#: gui/editgamedialog.cpp:271 gui/options.cpp:1350 +#: gui/editgamedialog.cpp:271 gui/options.cpp:1422 msgid "Extra Path:" msgstr "Camiёo adicional:" @@ -363,44 +363,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:1352 +#: gui/editgamedialog.cpp:273 gui/options.cpp:1424 msgctxt "lowres" msgid "Extra Path:" msgstr "Camiёo adicional:" -#: gui/editgamedialog.cpp:280 gui/options.cpp:1334 +#: gui/editgamedialog.cpp:280 gui/options.cpp:1406 msgid "Save Path:" msgstr "Camiёo de gardado:" #: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282 -#: gui/editgamedialog.cpp:283 gui/options.cpp:1334 gui/options.cpp:1336 -#: gui/options.cpp:1337 +#: gui/editgamedialog.cpp:283 gui/options.cpp:1406 gui/options.cpp:1408 +#: gui/options.cpp:1409 msgid "Specifies where your saved games are put" msgstr "Especifica o lugar dos ficheiros de gardado" -#: gui/editgamedialog.cpp:282 gui/options.cpp:1336 +#: gui/editgamedialog.cpp:282 gui/options.cpp:1408 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:1345 -#: gui/options.cpp:1353 gui/options.cpp:1362 gui/options.cpp:1542 -#: gui/options.cpp:1548 gui/options.cpp:1556 gui/options.cpp:1579 -#: gui/options.cpp:1608 gui/options.cpp:1614 gui/options.cpp:1621 -#: gui/options.cpp:1629 gui/options.cpp:1812 gui/options.cpp:1815 -#: gui/options.cpp:1822 gui/options.cpp:1832 +#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1417 +#: gui/options.cpp:1425 gui/options.cpp:1434 gui/options.cpp:1614 +#: gui/options.cpp:1620 gui/options.cpp:1628 gui/options.cpp:1651 +#: gui/options.cpp:1680 gui/options.cpp:1686 gui/options.cpp:1693 +#: gui/options.cpp:1701 gui/options.cpp:1884 gui/options.cpp:1887 +#: gui/options.cpp:1894 gui/options.cpp:1904 msgctxt "path" msgid "None" msgstr "Ningњn" #: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404 -#: gui/editgamedialog.cpp:522 gui/options.cpp:1536 gui/options.cpp:1602 -#: gui/options.cpp:1818 backends/platform/wii/options.cpp:56 +#: gui/editgamedialog.cpp:522 gui/options.cpp:1608 gui/options.cpp:1674 +#: gui/options.cpp:1890 backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Predefinido" -#: gui/editgamedialog.cpp:450 gui/options.cpp:1826 +#: gui/editgamedialog.cpp:450 gui/options.cpp:1898 msgid "Select SoundFont" msgstr "Seleccionar SoundFont" @@ -408,7 +408,7 @@ msgstr "Seleccionar SoundFont" msgid "Select additional game directory" msgstr "Selecciona un directorio con datos adicionais" -#: gui/editgamedialog.cpp:502 gui/options.cpp:1749 +#: gui/editgamedialog.cpp:502 gui/options.cpp:1821 msgid "Select directory for saved games" msgstr "Selecciona un directorio para ficheiros de gardado" @@ -501,7 +501,7 @@ msgstr "Seno" msgid "Triangle" msgstr "Triсngulo" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1370 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1442 msgid "Misc" msgstr "Misc." @@ -820,104 +820,117 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:289 gui/options.cpp:552 gui/options.cpp:690 -#: gui/options.cpp:759 gui/options.cpp:970 +#: gui/options.cpp:316 gui/options.cpp:598 gui/options.cpp:736 +#: gui/options.cpp:805 gui/options.cpp:1032 msgctxt "soundfont" msgid "None" msgstr "Ningunha" -#: gui/options.cpp:456 +#: gui/options.cpp:502 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:468 +#: gui/options.cpp:514 msgid "the video mode could not be changed." msgstr "non se puido cambiar o modo de vэdeo." -#: gui/options.cpp:474 +#: gui/options.cpp:520 msgid "the aspect ratio setting could not be changed" msgstr "non se puido cambiar a proporciѓn." -#: gui/options.cpp:480 +#: gui/options.cpp:526 msgid "the fullscreen setting could not be changed" msgstr "non se puido cambiar a configuraciѓn de pantalla completa." -#: gui/options.cpp:486 +#: gui/options.cpp:532 msgid "the filtering setting could not be changed" msgstr "non se puido cambiar a configuraciѓn de filtrado." -#: gui/options.cpp:842 +#: gui/options.cpp:884 +msgid "Show On-screen control" +msgstr "" + +#: gui/options.cpp:888 +#, fuzzy +msgid "Touchpad mouse mode" +msgstr "Modo Panel tсctil desactivado." + +#: gui/options.cpp:892 +msgid "Swap Menu and Back buttons" +msgstr "" + +#: gui/options.cpp:904 msgid "Graphics mode:" msgstr "Grсficos:" -#: gui/options.cpp:856 +#: gui/options.cpp:918 msgid "Render mode:" msgstr "Procesamento:" -#: gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:918 gui/options.cpp:919 msgid "Special dithering modes supported by some games" msgstr "Modos de interpolaciѓn de cores compatibles con algњns xogos" -#: gui/options.cpp:868 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 +#: gui/options.cpp:930 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2460 msgid "Fullscreen mode" msgstr "Pantalla completa" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Filter graphics" msgstr "Filtrar grсficos" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Use linear filtering when scaling graphics" msgstr "Empregar filtrado linear ao escalar grсficos" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Aspect ratio correction" msgstr "Correcciѓn de proporciѓn" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Correct aspect ratio for 320x200 games" msgstr "Corrixir a proporciѓn para os xogos en 320x200" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Preferred Device:" msgstr "Dispositivo preferido:" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Music Device:" msgstr "Dispositivo de mњsica:" -#: gui/options.cpp:882 gui/options.cpp:884 +#: gui/options.cpp:944 gui/options.cpp:946 msgid "Specifies preferred sound device or sound card emulator" msgstr "Especifica o dispositivo ou emulador de tarxeta de son preferido" -#: gui/options.cpp:882 gui/options.cpp:884 gui/options.cpp:885 +#: gui/options.cpp:944 gui/options.cpp:946 gui/options.cpp:947 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:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Disp. preferido:" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Music Device:" msgstr "Disp. mњsica:" -#: gui/options.cpp:911 +#: gui/options.cpp:973 msgid "AdLib emulator:" msgstr "Emulador de AdLib:" -#: gui/options.cpp:911 gui/options.cpp:912 +#: gui/options.cpp:973 gui/options.cpp:974 msgid "AdLib is used for music in many games" msgstr "Moitos xogos empregan AdLib para a mњsica" -#: gui/options.cpp:922 +#: gui/options.cpp:984 msgid "Output rate:" msgstr "Taxa de saэda:" -#: gui/options.cpp:922 gui/options.cpp:923 +#: gui/options.cpp:984 gui/options.cpp:985 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -925,80 +938,80 @@ msgstr "" "A maior valor, maior calidade do son, mais talvez non sexa compatible coa " "tarxeta" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "GM Device:" msgstr "Dispositivo de GM:" -#: gui/options.cpp:933 +#: gui/options.cpp:995 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:944 +#: gui/options.cpp:1006 msgid "Don't use General MIDI music" msgstr "Non empregar mњsica en General MIDI" -#: gui/options.cpp:955 gui/options.cpp:1017 +#: gui/options.cpp:1017 gui/options.cpp:1079 msgid "Use first available device" msgstr "Empregar o primeiro dispositivo dispoёible" -#: gui/options.cpp:967 +#: gui/options.cpp:1029 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:967 gui/options.cpp:969 gui/options.cpp:970 +#: gui/options.cpp:1029 gui/options.cpp:1031 gui/options.cpp:1032 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:969 +#: gui/options.cpp:1031 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Mixed AdLib/MIDI mode" msgstr "Modo AdLib/MIDI mixto" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Use both MIDI and AdLib sound generation" msgstr "Empregar xeraciѓn de son MIDI e mсis AdLib" -#: gui/options.cpp:978 +#: gui/options.cpp:1040 msgid "MIDI gain:" msgstr "Ganancia de MIDI:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "MT-32 Device:" msgstr "Dispositivo de MT-32:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 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:993 +#: gui/options.cpp:1055 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 verdadeiro (sen emulaciѓn de GM)" -#: gui/options.cpp:993 gui/options.cpp:995 +#: gui/options.cpp:1055 gui/options.cpp:1057 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:995 +#: gui/options.cpp:1057 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 (sen emulaciѓn de GM)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Dispositivo Roland GS (activar atribuciѓn MT-32)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -1006,270 +1019,275 @@ msgstr "" "Marcar para activar a atribuciѓn de parches e emular MT-32 nun dispositivo " "Roland GS" -#: gui/options.cpp:1007 +#: gui/options.cpp:1069 msgid "Don't use Roland MT-32 music" msgstr "Non empregar mњsica en Roland MT-32" -#: gui/options.cpp:1034 +#: gui/options.cpp:1096 msgid "Text and Speech:" msgstr "Texto e voz:" -#: gui/options.cpp:1038 gui/options.cpp:1048 +#: gui/options.cpp:1100 gui/options.cpp:1110 msgid "Speech" msgstr "Voz" -#: gui/options.cpp:1039 gui/options.cpp:1049 +#: gui/options.cpp:1101 gui/options.cpp:1111 msgid "Subtitles" msgstr "Subtэtulos" -#: gui/options.cpp:1040 +#: gui/options.cpp:1102 msgid "Both" msgstr "Ambos" -#: gui/options.cpp:1042 +#: gui/options.cpp:1104 msgid "Subtitle speed:" msgstr "Velocidade dos subtэtulos:" -#: gui/options.cpp:1044 +#: gui/options.cpp:1106 msgctxt "lowres" msgid "Text and Speech:" msgstr "Texto e voz:" -#: gui/options.cpp:1048 +#: gui/options.cpp:1110 msgid "Spch" msgstr "Voz" -#: gui/options.cpp:1049 +#: gui/options.cpp:1111 msgid "Subs" msgstr "Subs" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgctxt "lowres" msgid "Both" msgstr "Ambos" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgid "Show subtitles and play speech" msgstr "Mostrar os subtэtulos e reproducir as voces" -#: gui/options.cpp:1052 +#: gui/options.cpp:1114 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Velocidade subs:" -#: gui/options.cpp:1068 +#: gui/options.cpp:1130 msgid "Music volume:" msgstr "Volume de mњsica:" -#: gui/options.cpp:1070 +#: gui/options.cpp:1132 msgctxt "lowres" msgid "Music volume:" msgstr "Volume mњsica:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1139 msgid "Mute All" msgstr "Silenciar todo" -#: gui/options.cpp:1080 +#: gui/options.cpp:1142 msgid "SFX volume:" msgstr "Volume de efectos:" -#: gui/options.cpp:1080 gui/options.cpp:1082 gui/options.cpp:1083 +#: gui/options.cpp:1142 gui/options.cpp:1144 gui/options.cpp:1145 msgid "Special sound effects volume" msgstr "Volume dos efectos de son" -#: gui/options.cpp:1082 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "SFX volume:" msgstr "Volume efectos:" -#: gui/options.cpp:1090 +#: gui/options.cpp:1152 msgid "Speech volume:" msgstr "Volume de voz:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1154 msgctxt "lowres" msgid "Speech volume:" msgstr "Volume voz:" -#: gui/options.cpp:1311 +#: gui/options.cpp:1351 +#, fuzzy +msgid "Control" +msgstr "Rato" + +#: gui/options.cpp:1383 msgid "FluidSynth Settings" msgstr "Configuraciѓn de FluidSynth" -#: gui/options.cpp:1342 +#: gui/options.cpp:1414 msgid "Theme Path:" msgstr "Camiёo do tema:" -#: gui/options.cpp:1344 +#: gui/options.cpp:1416 msgctxt "lowres" msgid "Theme Path:" msgstr "Camiёo tema:" -#: gui/options.cpp:1350 gui/options.cpp:1352 gui/options.cpp:1353 +#: gui/options.cpp:1422 gui/options.cpp:1424 gui/options.cpp:1425 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:1359 +#: gui/options.cpp:1431 msgid "Plugins Path:" msgstr "Camiёo dos complementos:" -#: gui/options.cpp:1361 +#: gui/options.cpp:1433 msgctxt "lowres" msgid "Plugins Path:" msgstr "Camiёo complementos:" -#: gui/options.cpp:1372 +#: gui/options.cpp:1444 msgctxt "lowres" msgid "Misc" msgstr "Misc." -#: gui/options.cpp:1374 +#: gui/options.cpp:1446 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1378 +#: gui/options.cpp:1450 msgid "GUI Renderer:" msgstr "Procesamento da interfaz:" -#: gui/options.cpp:1390 +#: gui/options.cpp:1462 msgid "Autosave:" msgstr "Autogardado:" -#: gui/options.cpp:1392 +#: gui/options.cpp:1464 msgctxt "lowres" msgid "Autosave:" msgstr "Autogardado:" -#: gui/options.cpp:1400 +#: gui/options.cpp:1472 msgid "Keys" msgstr "Teclas" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "GUI Language:" msgstr "Idioma de interfaz:" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "Language of ScummVM GUI" msgstr "Idioma da interfaz de ScummVM" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "Update check:" msgstr "Comprobaciѓn de actualizaciѓns:" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "How often to check ScummVM updates" msgstr "Frecuencia de comprobaciѓn das actualizaciѓns de ScummVM" -#: gui/options.cpp:1447 +#: gui/options.cpp:1519 msgid "Check now" msgstr "Comprobar agora" -#: gui/options.cpp:1455 +#: gui/options.cpp:1527 msgid "Cloud" msgstr "Nube" -#: gui/options.cpp:1457 +#: gui/options.cpp:1529 msgctxt "lowres" msgid "Cloud" msgstr "Nube" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Storage:" msgstr "Almacenamento:" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Active cloud storage" msgstr "Almacenamento na nube activo" -#: gui/options.cpp:1469 gui/options.cpp:2026 +#: gui/options.cpp:1541 gui/options.cpp:2098 msgid "<none>" msgstr "<ningњn>" -#: gui/options.cpp:1473 backends/platform/wii/options.cpp:114 +#: gui/options.cpp:1545 backends/platform/wii/options.cpp:114 msgid "Username:" msgstr "Nome de usuario:" -#: gui/options.cpp:1473 +#: gui/options.cpp:1545 msgid "Username used by this storage" msgstr "Nome de usuario empregado por este almacenamento" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Used space:" msgstr "Espazo empregado:" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Space used by ScummVM's saved games on this storage" msgstr "" "Espazo empregado polas partidas gardadas de ScummVM neste almacenamento." -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "Last sync time:" msgstr "кltima sincronizaciѓn:" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 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:1482 gui/storagewizarddialog.cpp:71 +#: gui/options.cpp:1554 gui/storagewizarddialog.cpp:71 msgid "Connect" msgstr "Conectar" -#: gui/options.cpp:1482 +#: gui/options.cpp:1554 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:1483 +#: gui/options.cpp:1555 msgid "Refresh" msgstr "Actualizar" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 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:1484 +#: gui/options.cpp:1556 msgid "Download" msgstr "Descargar" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Open downloads manager dialog" msgstr "Abre o diсlogo do xestor de descargas." -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run server" msgstr "Executar servidor" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run local webserver" msgstr "Executar servidor web local" -#: gui/options.cpp:1487 gui/options.cpp:2136 +#: gui/options.cpp:1559 gui/options.cpp:2208 msgid "Not running" msgstr "Non se estс a executar" -#: gui/options.cpp:1491 +#: gui/options.cpp:1563 msgid "/root/ Path:" msgstr "Camiёo de /root/:" -#: gui/options.cpp:1491 gui/options.cpp:1493 gui/options.cpp:1494 +#: gui/options.cpp:1563 gui/options.cpp:1565 gui/options.cpp:1566 msgid "Specifies which directory the Files Manager can access" msgstr "Especifica o directorio de acceso do xestor de ficheiros." -#: gui/options.cpp:1493 +#: gui/options.cpp:1565 msgctxt "lowres" msgid "/root/ Path:" msgstr "Camiёo de /root/:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "Server's port:" msgstr "Porto do servidor:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "" "Which port is used by the server\n" "Auth with server is not available with non-default port" @@ -1277,19 +1295,19 @@ msgstr "" "O porto empregado polo servidor.\n" "Autenticaciѓn non dispoёible con portos non predeterminados." -#: gui/options.cpp:1516 +#: gui/options.cpp:1588 msgid "Apply" msgstr "Aplicar" -#: gui/options.cpp:1682 +#: gui/options.cpp:1754 msgid "Failed to change cloud storage!" msgstr "Erro ao cambiar o almacenamento na nube!" -#: gui/options.cpp:1685 +#: gui/options.cpp:1757 msgid "Another cloud storage is already active." msgstr "Xa estс activo outro almacenamento na nube." -#: gui/options.cpp:1721 +#: gui/options.cpp:1793 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1297,48 +1315,48 @@ msgstr "" "O tema seleccionado non щ compatible co idioma actual. Para empregar o tema, " "deberсs cambiar antes o idioma da interfaz." -#: gui/options.cpp:1756 +#: gui/options.cpp:1828 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Non щ posible escribir no directorio elixido. Selecciona outro." -#: gui/options.cpp:1765 +#: gui/options.cpp:1837 msgid "Select directory for GUI themes" msgstr "Seleccionar directorio para temas de interfaz" -#: gui/options.cpp:1775 +#: gui/options.cpp:1847 msgid "Select directory for extra files" msgstr "Seleccionar directorio para ficheiros adicionais" -#: gui/options.cpp:1786 +#: gui/options.cpp:1858 msgid "Select directory for plugins" msgstr "Seleccionar directorio para complementos" -#: gui/options.cpp:1798 +#: gui/options.cpp:1870 msgid "Select directory for Files Manager /root/" msgstr "Seleccionar directorio para /root/ de xestor de ficheiros" -#: gui/options.cpp:2033 +#: gui/options.cpp:2105 #, c-format msgid "%llu bytes" msgstr "%llu bytes" -#: gui/options.cpp:2041 +#: gui/options.cpp:2113 msgid "<right now>" msgstr "<agora mesmo>" -#: gui/options.cpp:2043 +#: gui/options.cpp:2115 msgid "<never>" msgstr "<nunca>" -#: gui/options.cpp:2127 +#: gui/options.cpp:2199 msgid "Stop server" msgstr "Deter servidor" -#: gui/options.cpp:2128 +#: gui/options.cpp:2200 msgid "Stop local webserver" msgstr "Deter servidor web local" -#: gui/options.cpp:2219 +#: gui/options.cpp:2291 msgid "" "Request failed.\n" "Check your Internet connection." diff --git a/po/hu_HU.po b/po/hu_HU.po index c82ee1fece..b4d75d00bc 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-02-11 08:56+0100\n" +"POT-Creation-Date: 2017-02-21 23:29+0100\n" "PO-Revision-Date: 2017-01-08 06:09+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:1515 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69 +#: gui/options.cpp:1587 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:443 #: gui/saveload-dialog.cpp:717 gui/saveload-dialog.cpp:1111 @@ -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:522 -#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1517 +#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1589 #: gui/saveload-dialog.cpp:1112 engines/engine.cpp:477 engines/engine.cpp:488 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 @@ -239,7 +239,7 @@ 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:121 -#: gui/options.cpp:845 gui/options.cpp:858 gui/options.cpp:1410 +#: gui/options.cpp:907 gui/options.cpp:920 gui/options.cpp:1482 #: audio/null.cpp:41 msgid "<default>" msgstr "<alapщrtelmezett>" @@ -262,11 +262,11 @@ msgstr "Platform:" msgid "Engine" msgstr "Motor" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "Graphics" msgstr "Grafika" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "GFX" msgstr "GFX" @@ -279,7 +279,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:1292 +#: gui/editgamedialog.cpp:196 gui/options.cpp:1364 msgid "Audio" msgstr "Audiѓ" @@ -292,11 +292,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:1297 +#: gui/editgamedialog.cpp:210 gui/options.cpp:1369 msgid "Volume" msgstr "Hangerѕ" -#: gui/editgamedialog.cpp:212 gui/options.cpp:1299 +#: gui/editgamedialog.cpp:212 gui/options.cpp:1371 msgctxt "lowres" msgid "Volume" msgstr "Hangerѕ" @@ -310,7 +310,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:1307 +#: gui/editgamedialog.cpp:226 gui/options.cpp:1379 msgid "MIDI" msgstr "MIDI" @@ -323,7 +323,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:1317 +#: gui/editgamedialog.cpp:241 gui/options.cpp:1389 msgid "MT-32" msgstr "MT-32" @@ -336,11 +336,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:1324 +#: gui/editgamedialog.cpp:255 gui/options.cpp:1396 msgid "Paths" msgstr "Mappсk" -#: gui/editgamedialog.cpp:257 gui/options.cpp:1326 +#: gui/editgamedialog.cpp:257 gui/options.cpp:1398 msgctxt "lowres" msgid "Paths" msgstr "Mappсk" @@ -354,7 +354,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Jсtщk Mappa:" -#: gui/editgamedialog.cpp:271 gui/options.cpp:1350 +#: gui/editgamedialog.cpp:271 gui/options.cpp:1422 msgid "Extra Path:" msgstr "Extra Mappa:" @@ -363,44 +363,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:1352 +#: gui/editgamedialog.cpp:273 gui/options.cpp:1424 msgctxt "lowres" msgid "Extra Path:" msgstr "Extra Mappa:" -#: gui/editgamedialog.cpp:280 gui/options.cpp:1334 +#: gui/editgamedialog.cpp:280 gui/options.cpp:1406 msgid "Save Path:" msgstr "Mentщs Mappa:" #: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282 -#: gui/editgamedialog.cpp:283 gui/options.cpp:1334 gui/options.cpp:1336 -#: gui/options.cpp:1337 +#: gui/editgamedialog.cpp:283 gui/options.cpp:1406 gui/options.cpp:1408 +#: gui/options.cpp:1409 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:1336 +#: gui/editgamedialog.cpp:282 gui/options.cpp:1408 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:1345 -#: gui/options.cpp:1353 gui/options.cpp:1362 gui/options.cpp:1542 -#: gui/options.cpp:1548 gui/options.cpp:1556 gui/options.cpp:1579 -#: gui/options.cpp:1608 gui/options.cpp:1614 gui/options.cpp:1621 -#: gui/options.cpp:1629 gui/options.cpp:1812 gui/options.cpp:1815 -#: gui/options.cpp:1822 gui/options.cpp:1832 +#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1417 +#: gui/options.cpp:1425 gui/options.cpp:1434 gui/options.cpp:1614 +#: gui/options.cpp:1620 gui/options.cpp:1628 gui/options.cpp:1651 +#: gui/options.cpp:1680 gui/options.cpp:1686 gui/options.cpp:1693 +#: gui/options.cpp:1701 gui/options.cpp:1884 gui/options.cpp:1887 +#: gui/options.cpp:1894 gui/options.cpp:1904 msgctxt "path" msgid "None" msgstr "Nincs" #: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404 -#: gui/editgamedialog.cpp:522 gui/options.cpp:1536 gui/options.cpp:1602 -#: gui/options.cpp:1818 backends/platform/wii/options.cpp:56 +#: gui/editgamedialog.cpp:522 gui/options.cpp:1608 gui/options.cpp:1674 +#: gui/options.cpp:1890 backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Alapщrtelmezett" -#: gui/editgamedialog.cpp:450 gui/options.cpp:1826 +#: gui/editgamedialog.cpp:450 gui/options.cpp:1898 msgid "Select SoundFont" msgstr "SoundFont kivсlasztсs" @@ -408,7 +408,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:1749 +#: gui/editgamedialog.cpp:502 gui/options.cpp:1821 msgid "Select directory for saved games" msgstr "Vсlaszz jсtщkmentщseknek mappсt" @@ -500,7 +500,7 @@ msgstr "Szэnusz" msgid "Triangle" msgstr "Hсromszіg" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1370 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1442 msgid "Misc" msgstr "Vegyes" @@ -818,165 +818,178 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:289 gui/options.cpp:552 gui/options.cpp:690 -#: gui/options.cpp:759 gui/options.cpp:970 +#: gui/options.cpp:316 gui/options.cpp:598 gui/options.cpp:736 +#: gui/options.cpp:805 gui/options.cpp:1032 msgctxt "soundfont" msgid "None" msgstr "Nincs" -#: gui/options.cpp:456 +#: gui/options.cpp:502 msgid "Failed to apply some of the graphic options changes:" msgstr "Nщhсny grafikus opciѓ vсltoztatсsa sikertelen:" -#: gui/options.cpp:468 +#: gui/options.cpp:514 msgid "the video mode could not be changed." msgstr "a videѓmѓd nem vсltozott." -#: gui/options.cpp:474 +#: gui/options.cpp:520 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:480 +#: gui/options.cpp:526 msgid "the fullscreen setting could not be changed" msgstr "a teljeskщpernyѕs beсllэtсs nem vсltozott" -#: gui/options.cpp:486 +#: gui/options.cpp:532 msgid "the filtering setting could not be changed" msgstr "a szћrщsi beсllэtсst nem lehet megvсltoztatni" -#: gui/options.cpp:842 +#: gui/options.cpp:884 +msgid "Show On-screen control" +msgstr "" + +#: gui/options.cpp:888 +#, fuzzy +msgid "Touchpad mouse mode" +msgstr "Touchpad mѓd letiltva." + +#: gui/options.cpp:892 +msgid "Swap Menu and Back buttons" +msgstr "" + +#: gui/options.cpp:904 msgid "Graphics mode:" msgstr "Grafikus mѓd:" -#: gui/options.cpp:856 +#: gui/options.cpp:918 msgid "Render mode:" msgstr "Kirajzolсs mѓd:" -#: gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:918 gui/options.cpp:919 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:868 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 +#: gui/options.cpp:930 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2460 msgid "Fullscreen mode" msgstr "Teljeskщpernyѕs mѓd" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Filter graphics" msgstr "Grafika szћrщse" -#: gui/options.cpp:871 +#: gui/options.cpp:933 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:874 +#: gui/options.cpp:936 msgid "Aspect ratio correction" msgstr "Kщpmщretarсny korrekciѓ" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Correct aspect ratio for 320x200 games" msgstr "Helyes oldalarсny a 320x200 jсtщkokhoz" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Preferred Device:" msgstr "Elsѕdleges eszkіz:" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Music Device:" msgstr "Zene eszkіz:" -#: gui/options.cpp:882 gui/options.cpp:884 +#: gui/options.cpp:944 gui/options.cpp:946 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:882 gui/options.cpp:884 gui/options.cpp:885 +#: gui/options.cpp:944 gui/options.cpp:946 gui/options.cpp:947 msgid "Specifies output sound device or sound card emulator" msgstr "Hangeszkіz vagy hangkсrtya emulсtor beсllэtсsok" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Elsѕdleges eszk.:" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Music Device:" msgstr "Zene eszkіz:" -#: gui/options.cpp:911 +#: gui/options.cpp:973 msgid "AdLib emulator:" msgstr "AdLib emulсtor:" -#: gui/options.cpp:911 gui/options.cpp:912 +#: gui/options.cpp:973 gui/options.cpp:974 msgid "AdLib is used for music in many games" msgstr "AdLib meghajtѓt sok jсtщk hasznсlja zenщhez" -#: gui/options.cpp:922 +#: gui/options.cpp:984 msgid "Output rate:" msgstr "Kimeneti rсta:" -#: gui/options.cpp:922 gui/options.cpp:923 +#: gui/options.cpp:984 gui/options.cpp:985 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" msgstr "" "Nagyobb щrtщkek jobb hangminѕsщget adnak, de nem minden hangkсrtya tсmogatja" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "GM Device:" msgstr "GM Eszkіz:" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "Specifies default sound device for General MIDI output" msgstr "Alapщrtelmezett hangeszkіz General MIDI kimenethez" -#: gui/options.cpp:944 +#: gui/options.cpp:1006 msgid "Don't use General MIDI music" msgstr "Ne hasznсlj General MIDI zenщt" -#: gui/options.cpp:955 gui/options.cpp:1017 +#: gui/options.cpp:1017 gui/options.cpp:1079 msgid "Use first available device" msgstr "Elsѕ elщrhetѕ eszkіz hasznсlata" -#: gui/options.cpp:967 +#: gui/options.cpp:1029 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:967 gui/options.cpp:969 gui/options.cpp:970 +#: gui/options.cpp:1029 gui/options.cpp:1031 gui/options.cpp:1032 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:969 +#: gui/options.cpp:1031 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Mixed AdLib/MIDI mode" msgstr "Vegyes AdLib/MIDI mѓd" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Use both MIDI and AdLib sound generation" msgstr "MIDI щs AdLib hanggenerсtorok hasznсlata" -#: gui/options.cpp:978 +#: gui/options.cpp:1040 msgid "MIDI gain:" msgstr "MIDI erѕsэtщs:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "MT-32 Device:" msgstr "MT-32 Eszkіz:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 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:993 +#: gui/options.cpp:1055 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 Hardver (GM emulсciѓ tiltva)" -#: gui/options.cpp:993 gui/options.cpp:995 +#: gui/options.cpp:1055 gui/options.cpp:1057 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -984,16 +997,16 @@ msgstr "" "Jelіld be, ha hardveres Roland-Kompatibilis hangeszkіz van csatlakoztatva a " "gщpedhez щs hasznсlni akarod" -#: gui/options.cpp:995 +#: gui/options.cpp:1057 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 Hardver (GM emulсciѓ nincs)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland GS eszkіz (MT-32 mapping engedщlyezщs)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -1001,264 +1014,269 @@ 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:1007 +#: gui/options.cpp:1069 msgid "Don't use Roland MT-32 music" msgstr "Ne hasznсlj Roland MT-32 zenщt" -#: gui/options.cpp:1034 +#: gui/options.cpp:1096 msgid "Text and Speech:" msgstr "Szіveg щs beszщd:" -#: gui/options.cpp:1038 gui/options.cpp:1048 +#: gui/options.cpp:1100 gui/options.cpp:1110 msgid "Speech" msgstr "Csak beszщd" -#: gui/options.cpp:1039 gui/options.cpp:1049 +#: gui/options.cpp:1101 gui/options.cpp:1111 msgid "Subtitles" msgstr "Csak felirat" -#: gui/options.cpp:1040 +#: gui/options.cpp:1102 msgid "Both" msgstr "Mind" -#: gui/options.cpp:1042 +#: gui/options.cpp:1104 msgid "Subtitle speed:" msgstr "Felirat sebessщg:" -#: gui/options.cpp:1044 +#: gui/options.cpp:1106 msgctxt "lowres" msgid "Text and Speech:" msgstr "Felirat щs beszщd:" -#: gui/options.cpp:1048 +#: gui/options.cpp:1110 msgid "Spch" msgstr "Besz" -#: gui/options.cpp:1049 +#: gui/options.cpp:1111 msgid "Subs" msgstr "Text" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgctxt "lowres" msgid "Both" msgstr "Mind" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgid "Show subtitles and play speech" msgstr "Hang щs feliratok megjelenэtщse" -#: gui/options.cpp:1052 +#: gui/options.cpp:1114 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Felirat sebessщg:" -#: gui/options.cpp:1068 +#: gui/options.cpp:1130 msgid "Music volume:" msgstr "Zene hangerѕ:" -#: gui/options.cpp:1070 +#: gui/options.cpp:1132 msgctxt "lowres" msgid "Music volume:" msgstr "Zene hangerѕ:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1139 msgid "Mute All" msgstr "жsszes nщmэtсsa" -#: gui/options.cpp:1080 +#: gui/options.cpp:1142 msgid "SFX volume:" msgstr "SFX hangerѕ:" -#: gui/options.cpp:1080 gui/options.cpp:1082 gui/options.cpp:1083 +#: gui/options.cpp:1142 gui/options.cpp:1144 gui/options.cpp:1145 msgid "Special sound effects volume" msgstr "Speciсlis hangeffektusok hangereje" -#: gui/options.cpp:1082 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "SFX volume:" msgstr "SFX hangerѕ:" -#: gui/options.cpp:1090 +#: gui/options.cpp:1152 msgid "Speech volume:" msgstr "Beszщd hangerѕ:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1154 msgctxt "lowres" msgid "Speech volume:" msgstr "Beszщd hangerѕ:" -#: gui/options.cpp:1311 +#: gui/options.cpp:1351 +#, fuzzy +msgid "Control" +msgstr "Egщr irсnyitсs" + +#: gui/options.cpp:1383 msgid "FluidSynth Settings" msgstr "FluidSynth Beсllэtсsa" -#: gui/options.cpp:1342 +#: gui/options.cpp:1414 msgid "Theme Path:" msgstr "Tщma Mappa:" -#: gui/options.cpp:1344 +#: gui/options.cpp:1416 msgctxt "lowres" msgid "Theme Path:" msgstr "Tщma Mappa:" -#: gui/options.cpp:1350 gui/options.cpp:1352 gui/options.cpp:1353 +#: gui/options.cpp:1422 gui/options.cpp:1424 gui/options.cpp:1425 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:1359 +#: gui/options.cpp:1431 msgid "Plugins Path:" msgstr "Plugin Mappa:" -#: gui/options.cpp:1361 +#: gui/options.cpp:1433 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugin Mappa:" -#: gui/options.cpp:1372 +#: gui/options.cpp:1444 msgctxt "lowres" msgid "Misc" msgstr "Vegyes" -#: gui/options.cpp:1374 +#: gui/options.cpp:1446 msgid "Theme:" msgstr "Tщma:" -#: gui/options.cpp:1378 +#: gui/options.cpp:1450 msgid "GUI Renderer:" msgstr "GUI Renderelѕ:" -#: gui/options.cpp:1390 +#: gui/options.cpp:1462 msgid "Autosave:" msgstr "Automentщs:" -#: gui/options.cpp:1392 +#: gui/options.cpp:1464 msgctxt "lowres" msgid "Autosave:" msgstr "Automentщs:" -#: gui/options.cpp:1400 +#: gui/options.cpp:1472 msgid "Keys" msgstr "Billentyћk" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "GUI Language:" msgstr "GUI nyelve:" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "Language of ScummVM GUI" msgstr "A ScummVM GUI nyelve" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "Update check:" msgstr "Frissэtщs ellenѕrzщs:" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "How often to check ScummVM updates" msgstr "Milyen gyakran ellenѕrizze a ScummVM frissэtщseket" -#: gui/options.cpp:1447 +#: gui/options.cpp:1519 msgid "Check now" msgstr "Ellenѕrzщs most" -#: gui/options.cpp:1455 +#: gui/options.cpp:1527 msgid "Cloud" msgstr "Felhѕ" -#: gui/options.cpp:1457 +#: gui/options.cpp:1529 msgctxt "lowres" msgid "Cloud" msgstr "Felhѕ" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Storage:" msgstr "Tсrolѓ:" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Active cloud storage" msgstr "Aktэv felhѕ tсrolѓ" -#: gui/options.cpp:1469 gui/options.cpp:2026 +#: gui/options.cpp:1541 gui/options.cpp:2098 msgid "<none>" msgstr "<nincs>" -#: gui/options.cpp:1473 backends/platform/wii/options.cpp:114 +#: gui/options.cpp:1545 backends/platform/wii/options.cpp:114 msgid "Username:" msgstr "Felhasznсlѓ:" -#: gui/options.cpp:1473 +#: gui/options.cpp:1545 msgid "Username used by this storage" msgstr "Felhasznсlѓnщv ehhez a tсrolѓhoz" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Used space:" msgstr "Hasznсlt hely:" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 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:1479 +#: gui/options.cpp:1551 msgid "Last sync time:" msgstr "Utolsѓ szinkron:" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 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:1482 gui/storagewizarddialog.cpp:71 +#: gui/options.cpp:1554 gui/storagewizarddialog.cpp:71 msgid "Connect" msgstr "Csatlakozсs" -#: gui/options.cpp:1482 +#: gui/options.cpp:1554 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:1483 +#: gui/options.cpp:1555 msgid "Refresh" msgstr "Frissэtщs" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 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:1484 +#: gui/options.cpp:1556 msgid "Download" msgstr "Letіltщs" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Open downloads manager dialog" msgstr "Letіltщskezelѕ pсrbeszщdablak megnyitсsa" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run server" msgstr "Szerver futtatсs" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run local webserver" msgstr "Helyi webszerver futtatсsa" -#: gui/options.cpp:1487 gui/options.cpp:2136 +#: gui/options.cpp:1559 gui/options.cpp:2208 msgid "Not running" msgstr "Nem fut" -#: gui/options.cpp:1491 +#: gui/options.cpp:1563 msgid "/root/ Path:" msgstr "/gyіkщr/ кtvonal:" -#: gui/options.cpp:1491 gui/options.cpp:1493 gui/options.cpp:1494 +#: gui/options.cpp:1563 gui/options.cpp:1565 gui/options.cpp:1566 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:1493 +#: gui/options.cpp:1565 msgctxt "lowres" msgid "/root/ Path:" msgstr "/gyіkщr/ кtvonal:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "Server's port:" msgstr "Szerver portja:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "" "Which port is used by the server\n" "Auth with server is not available with non-default port" @@ -1266,19 +1284,19 @@ msgstr "" "Melyik portot hasznсlja a szerver\n" "Szerver engedщly nem elщrhetѕ nem alapщrtelmezett porttal" -#: gui/options.cpp:1516 +#: gui/options.cpp:1588 msgid "Apply" msgstr "Alkalmaz" -#: gui/options.cpp:1682 +#: gui/options.cpp:1754 msgid "Failed to change cloud storage!" msgstr "Felhѕtсrolѓ csere nem sikerќlt!" -#: gui/options.cpp:1685 +#: gui/options.cpp:1757 msgid "Another cloud storage is already active." msgstr "Egy mсsik felhѕtсrolѓ mсr aktэv." -#: gui/options.cpp:1721 +#: gui/options.cpp:1793 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1286,48 +1304,48 @@ msgstr "" "A kivсlasztott tщma nem tсmogatja a nyelvedet. Ha hasznсlni akarod ezt a " "tщmсt, elѕszѕr vсlts сt egy mсsik nyelvre." -#: gui/options.cpp:1756 +#: gui/options.cpp:1828 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:1765 +#: gui/options.cpp:1837 msgid "Select directory for GUI themes" msgstr "GUI tщma mappa kivсlasztсsa" -#: gui/options.cpp:1775 +#: gui/options.cpp:1847 msgid "Select directory for extra files" msgstr "Mappa vсlasztсs az extra fсjloknak" -#: gui/options.cpp:1786 +#: gui/options.cpp:1858 msgid "Select directory for plugins" msgstr "Plugin mappa kivсlasztсsa" -#: gui/options.cpp:1798 +#: gui/options.cpp:1870 msgid "Select directory for Files Manager /root/" msgstr "Vсlassz mappсt a Fсjlkezelѕnek /gyіkщr/" -#: gui/options.cpp:2033 +#: gui/options.cpp:2105 #, c-format msgid "%llu bytes" msgstr "%llu byte" -#: gui/options.cpp:2041 +#: gui/options.cpp:2113 msgid "<right now>" msgstr "<щpp most>" -#: gui/options.cpp:2043 +#: gui/options.cpp:2115 msgid "<never>" msgstr "<soha>" -#: gui/options.cpp:2127 +#: gui/options.cpp:2199 msgid "Stop server" msgstr "Szerver leсllэtсs" -#: gui/options.cpp:2128 +#: gui/options.cpp:2200 msgid "Stop local webserver" msgstr "Helyi webszerver leсllэtсsa" -#: gui/options.cpp:2219 +#: gui/options.cpp:2291 msgid "" "Request failed.\n" "Check your Internet connection." diff --git a/po/it_IT.po b/po/it_IT.po index 87ea90fcdd..407c86b13b 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n" -"POT-Creation-Date: 2017-02-11 08:56+0100\n" +"POT-Creation-Date: 2017-02-21 23:29+0100\n" "PO-Revision-Date: 2017-01-06 21:05+0000\n" "Last-Translator: Walter Agazzi <tag2015@gmail.com>\n" "Language-Team: Italian <https://translations.scummvm.org/projects/scummvm/" @@ -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:1515 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69 +#: gui/options.cpp:1587 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:443 #: gui/saveload-dialog.cpp:717 gui/saveload-dialog.cpp:1111 @@ -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:522 -#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1517 +#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1589 #: gui/saveload-dialog.cpp:1112 engines/engine.cpp:477 engines/engine.cpp:488 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 @@ -240,7 +240,7 @@ msgstr "" "Lingua del gioco. Un gioco inglese non potrр risultare tradotto in italiano" #: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:121 -#: gui/options.cpp:845 gui/options.cpp:858 gui/options.cpp:1410 +#: gui/options.cpp:907 gui/options.cpp:920 gui/options.cpp:1482 #: audio/null.cpp:41 msgid "<default>" msgstr "<predefinito>" @@ -263,11 +263,11 @@ msgstr "Piattaf.:" msgid "Engine" msgstr "Motore" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "Graphics" msgstr "Grafica" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "GFX" msgstr "Grafica" @@ -280,7 +280,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Ignora le impostazioni grafiche globali" -#: gui/editgamedialog.cpp:196 gui/options.cpp:1292 +#: gui/editgamedialog.cpp:196 gui/options.cpp:1364 msgid "Audio" msgstr "Audio" @@ -293,11 +293,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Ignora le impostazioni audio globali" -#: gui/editgamedialog.cpp:210 gui/options.cpp:1297 +#: gui/editgamedialog.cpp:210 gui/options.cpp:1369 msgid "Volume" msgstr "Volume" -#: gui/editgamedialog.cpp:212 gui/options.cpp:1299 +#: gui/editgamedialog.cpp:212 gui/options.cpp:1371 msgctxt "lowres" msgid "Volume" msgstr "Volume" @@ -311,7 +311,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Ignora le impostazioni globali di volume" -#: gui/editgamedialog.cpp:226 gui/options.cpp:1307 +#: gui/editgamedialog.cpp:226 gui/options.cpp:1379 msgid "MIDI" msgstr "MIDI" @@ -324,7 +324,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Ignora le impostazioni MIDI globali" -#: gui/editgamedialog.cpp:241 gui/options.cpp:1317 +#: gui/editgamedialog.cpp:241 gui/options.cpp:1389 msgid "MT-32" msgstr "MT-32" @@ -337,11 +337,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Ignora le impostazioni MT-32 globali" -#: gui/editgamedialog.cpp:255 gui/options.cpp:1324 +#: gui/editgamedialog.cpp:255 gui/options.cpp:1396 msgid "Paths" msgstr "Percorsi" -#: gui/editgamedialog.cpp:257 gui/options.cpp:1326 +#: gui/editgamedialog.cpp:257 gui/options.cpp:1398 msgctxt "lowres" msgid "Paths" msgstr "Perc" @@ -355,7 +355,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Perc. gioco:" -#: gui/editgamedialog.cpp:271 gui/options.cpp:1350 +#: gui/editgamedialog.cpp:271 gui/options.cpp:1422 msgid "Extra Path:" msgstr "Percorso extra:" @@ -364,44 +364,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:1352 +#: gui/editgamedialog.cpp:273 gui/options.cpp:1424 msgctxt "lowres" msgid "Extra Path:" msgstr "Perc. extra:" -#: gui/editgamedialog.cpp:280 gui/options.cpp:1334 +#: gui/editgamedialog.cpp:280 gui/options.cpp:1406 msgid "Save Path:" msgstr "Salvataggi:" #: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282 -#: gui/editgamedialog.cpp:283 gui/options.cpp:1334 gui/options.cpp:1336 -#: gui/options.cpp:1337 +#: gui/editgamedialog.cpp:283 gui/options.cpp:1406 gui/options.cpp:1408 +#: gui/options.cpp:1409 msgid "Specifies where your saved games are put" msgstr "Specifica dove archiviare i salvataggi" -#: gui/editgamedialog.cpp:282 gui/options.cpp:1336 +#: gui/editgamedialog.cpp:282 gui/options.cpp:1408 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:1345 -#: gui/options.cpp:1353 gui/options.cpp:1362 gui/options.cpp:1542 -#: gui/options.cpp:1548 gui/options.cpp:1556 gui/options.cpp:1579 -#: gui/options.cpp:1608 gui/options.cpp:1614 gui/options.cpp:1621 -#: gui/options.cpp:1629 gui/options.cpp:1812 gui/options.cpp:1815 -#: gui/options.cpp:1822 gui/options.cpp:1832 +#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1417 +#: gui/options.cpp:1425 gui/options.cpp:1434 gui/options.cpp:1614 +#: gui/options.cpp:1620 gui/options.cpp:1628 gui/options.cpp:1651 +#: gui/options.cpp:1680 gui/options.cpp:1686 gui/options.cpp:1693 +#: gui/options.cpp:1701 gui/options.cpp:1884 gui/options.cpp:1887 +#: gui/options.cpp:1894 gui/options.cpp:1904 msgctxt "path" msgid "None" msgstr "Nessuno" #: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404 -#: gui/editgamedialog.cpp:522 gui/options.cpp:1536 gui/options.cpp:1602 -#: gui/options.cpp:1818 backends/platform/wii/options.cpp:56 +#: gui/editgamedialog.cpp:522 gui/options.cpp:1608 gui/options.cpp:1674 +#: gui/options.cpp:1890 backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Predefinito" -#: gui/editgamedialog.cpp:450 gui/options.cpp:1826 +#: gui/editgamedialog.cpp:450 gui/options.cpp:1898 msgid "Select SoundFont" msgstr "Seleziona SoundFont" @@ -409,7 +409,7 @@ msgstr "Seleziona SoundFont" msgid "Select additional game directory" msgstr "Seleziona la cartella di gioco aggiuntiva" -#: gui/editgamedialog.cpp:502 gui/options.cpp:1749 +#: gui/editgamedialog.cpp:502 gui/options.cpp:1821 msgid "Select directory for saved games" msgstr "Seleziona la cartella dei salvataggi" @@ -502,7 +502,7 @@ msgstr "Seno" msgid "Triangle" msgstr "Triangolo" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1370 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1442 msgid "Misc" msgstr "Varie" @@ -826,106 +826,119 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:289 gui/options.cpp:552 gui/options.cpp:690 -#: gui/options.cpp:759 gui/options.cpp:970 +#: gui/options.cpp:316 gui/options.cpp:598 gui/options.cpp:736 +#: gui/options.cpp:805 gui/options.cpp:1032 msgctxt "soundfont" msgid "None" msgstr "Nessuno" -#: gui/options.cpp:456 +#: gui/options.cpp:502 msgid "Failed to apply some of the graphic options changes:" msgstr "Impossibile applicare alcuni dei cambiamenti nelle opzioni grafiche:" -#: gui/options.cpp:468 +#: gui/options.cpp:514 msgid "the video mode could not be changed." msgstr "impossibile modificare la modalitр video." -#: gui/options.cpp:474 +#: gui/options.cpp:520 msgid "the aspect ratio setting could not be changed" msgstr "impossibile modificare l'impostazione proporzioni" -#: gui/options.cpp:480 +#: gui/options.cpp:526 msgid "the fullscreen setting could not be changed" msgstr "impossibile modificare l'impostazione schermo intero" -#: gui/options.cpp:486 +#: gui/options.cpp:532 msgid "the filtering setting could not be changed" msgstr "Impossibile modificare le impostazioni del filtro video" -#: gui/options.cpp:842 +#: gui/options.cpp:884 +msgid "Show On-screen control" +msgstr "" + +#: gui/options.cpp:888 +#, fuzzy +msgid "Touchpad mouse mode" +msgstr "Modalitр touchpad disattivata." + +#: gui/options.cpp:892 +msgid "Swap Menu and Back buttons" +msgstr "" + +#: gui/options.cpp:904 msgid "Graphics mode:" msgstr "Modalitр grafica:" -#: gui/options.cpp:856 +#: gui/options.cpp:918 msgid "Render mode:" msgstr "Resa grafica:" -#: gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:918 gui/options.cpp:919 msgid "Special dithering modes supported by some games" msgstr "Modalitр di resa grafica speciali supportate da alcuni giochi" -#: gui/options.cpp:868 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 +#: gui/options.cpp:930 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2460 msgid "Fullscreen mode" msgstr "Modalitр a schermo intero" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Filter graphics" msgstr "Applica filtro grafico" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Use linear filtering when scaling graphics" msgstr "Usa filtro lineare per lo scaling della grafica" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Aspect ratio correction" msgstr "Correzione proporzioni" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Correct aspect ratio for 320x200 games" msgstr "Corregge le proporzioni dei giochi con risoluzione a 320x200" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Preferred Device:" msgstr "Disp. preferito:" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Music Device:" msgstr "Dispositivo audio:" -#: gui/options.cpp:882 gui/options.cpp:884 +#: gui/options.cpp:944 gui/options.cpp:946 msgid "Specifies preferred sound device or sound card emulator" msgstr "" "Specifica il dispositivo audio o l'emulatore della scheda audio preferiti" -#: gui/options.cpp:882 gui/options.cpp:884 gui/options.cpp:885 +#: gui/options.cpp:944 gui/options.cpp:946 gui/options.cpp:947 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:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Disp. preferito:" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Music Device:" msgstr "Disposit. audio:" -#: gui/options.cpp:911 +#: gui/options.cpp:973 msgid "AdLib emulator:" msgstr "Emulatore AdLib:" -#: gui/options.cpp:911 gui/options.cpp:912 +#: gui/options.cpp:973 gui/options.cpp:974 msgid "AdLib is used for music in many games" msgstr "AdLib ш utilizzato per la musica in molti giochi" -#: gui/options.cpp:922 +#: gui/options.cpp:984 msgid "Output rate:" msgstr "Frequenza:" -#: gui/options.cpp:922 gui/options.cpp:923 +#: gui/options.cpp:984 gui/options.cpp:985 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -933,62 +946,62 @@ msgstr "" "Valori piљ alti restituiscono un suono di maggior qualitр, ma potrebbero non " "essere supportati dalla tua scheda audio" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "GM Device:" msgstr "Dispositivo GM:" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "Specifies default sound device for General MIDI output" msgstr "Specifica il dispositivo audio predefinito per l'output General MIDI" -#: gui/options.cpp:944 +#: gui/options.cpp:1006 msgid "Don't use General MIDI music" msgstr "Non utilizzare la musica General MIDI" -#: gui/options.cpp:955 gui/options.cpp:1017 +#: gui/options.cpp:1017 gui/options.cpp:1079 msgid "Use first available device" msgstr "Utilizza il primo dispositivo disponibile" -#: gui/options.cpp:967 +#: gui/options.cpp:1029 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:967 gui/options.cpp:969 gui/options.cpp:970 +#: gui/options.cpp:1029 gui/options.cpp:1031 gui/options.cpp:1032 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "SoundFont ш supportato da alcune schede audio, FluidSynth e Timidity" -#: gui/options.cpp:969 +#: gui/options.cpp:1031 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Mixed AdLib/MIDI mode" msgstr "Modalitр mista AdLib/MIDI" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Use both MIDI and AdLib sound generation" msgstr "Utilizza generazione di suono sia MIDI che AdLib" -#: gui/options.cpp:978 +#: gui/options.cpp:1040 msgid "MIDI gain:" msgstr "Guadagno MIDI:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "MT-32 Device:" msgstr "Disposit. MT-32:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 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:993 +#: gui/options.cpp:1055 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 effettivo (disattiva emulazione GM)" -#: gui/options.cpp:993 gui/options.cpp:995 +#: gui/options.cpp:1055 gui/options.cpp:1057 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -996,16 +1009,16 @@ msgstr "" "Seleziona se vuoi usare il dispositivo hardware audio compatibile con Roland " "che ш connesso al tuo computer" -#: gui/options.cpp:995 +#: gui/options.cpp:1057 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 effettivo (disat.emul.GM)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Dispositivo Roland GS (attiva mappature MT-32)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -1013,266 +1026,271 @@ msgstr "" "Seleziona se vuoi attivare le mappature per emulare un MT-32 su un " "dispositivo Roland GS" -#: gui/options.cpp:1007 +#: gui/options.cpp:1069 msgid "Don't use Roland MT-32 music" msgstr "Non utilizzare la musica Roland MT-32" -#: gui/options.cpp:1034 +#: gui/options.cpp:1096 msgid "Text and Speech:" msgstr "Testo e voci:" -#: gui/options.cpp:1038 gui/options.cpp:1048 +#: gui/options.cpp:1100 gui/options.cpp:1110 msgid "Speech" msgstr "Voci" -#: gui/options.cpp:1039 gui/options.cpp:1049 +#: gui/options.cpp:1101 gui/options.cpp:1111 msgid "Subtitles" msgstr "Sottotitoli" -#: gui/options.cpp:1040 +#: gui/options.cpp:1102 msgid "Both" msgstr "Entrambi" -#: gui/options.cpp:1042 +#: gui/options.cpp:1104 msgid "Subtitle speed:" msgstr "Velocitр testo:" -#: gui/options.cpp:1044 +#: gui/options.cpp:1106 msgctxt "lowres" msgid "Text and Speech:" msgstr "Testo e voci:" -#: gui/options.cpp:1048 +#: gui/options.cpp:1110 msgid "Spch" msgstr "Voci" -#: gui/options.cpp:1049 +#: gui/options.cpp:1111 msgid "Subs" msgstr "Sub" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgctxt "lowres" msgid "Both" msgstr "Entr." -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgid "Show subtitles and play speech" msgstr "Mostra i sottotitoli e attiva le voci" -#: gui/options.cpp:1052 +#: gui/options.cpp:1114 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Velocitр testo:" -#: gui/options.cpp:1068 +#: gui/options.cpp:1130 msgid "Music volume:" msgstr "Volume musica:" -#: gui/options.cpp:1070 +#: gui/options.cpp:1132 msgctxt "lowres" msgid "Music volume:" msgstr "Volume musica:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1139 msgid "Mute All" msgstr "Disattiva audio" -#: gui/options.cpp:1080 +#: gui/options.cpp:1142 msgid "SFX volume:" msgstr "Volume effetti:" -#: gui/options.cpp:1080 gui/options.cpp:1082 gui/options.cpp:1083 +#: gui/options.cpp:1142 gui/options.cpp:1144 gui/options.cpp:1145 msgid "Special sound effects volume" msgstr "Volume degli effetti sonori" -#: gui/options.cpp:1082 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "SFX volume:" msgstr "Volume effetti:" -#: gui/options.cpp:1090 +#: gui/options.cpp:1152 msgid "Speech volume:" msgstr "Volume voci:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1154 msgctxt "lowres" msgid "Speech volume:" msgstr "Volume voci:" -#: gui/options.cpp:1311 +#: gui/options.cpp:1351 +#, fuzzy +msgid "Control" +msgstr "Controllo mouse" + +#: gui/options.cpp:1383 msgid "FluidSynth Settings" msgstr "Impostazioni FluidSynth" -#: gui/options.cpp:1342 +#: gui/options.cpp:1414 msgid "Theme Path:" msgstr "Percorso temi:" -#: gui/options.cpp:1344 +#: gui/options.cpp:1416 msgctxt "lowres" msgid "Theme Path:" msgstr "Perc. temi:" -#: gui/options.cpp:1350 gui/options.cpp:1352 gui/options.cpp:1353 +#: gui/options.cpp:1422 gui/options.cpp:1424 gui/options.cpp:1425 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:1359 +#: gui/options.cpp:1431 msgid "Plugins Path:" msgstr "Percorso plugin:" -#: gui/options.cpp:1361 +#: gui/options.cpp:1433 msgctxt "lowres" msgid "Plugins Path:" msgstr "Perc. plugin:" -#: gui/options.cpp:1372 +#: gui/options.cpp:1444 msgctxt "lowres" msgid "Misc" msgstr "Varie" -#: gui/options.cpp:1374 +#: gui/options.cpp:1446 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1378 +#: gui/options.cpp:1450 msgid "GUI Renderer:" msgstr "Renderer GUI:" -#: gui/options.cpp:1390 +#: gui/options.cpp:1462 msgid "Autosave:" msgstr "Autosalva:" -#: gui/options.cpp:1392 +#: gui/options.cpp:1464 msgctxt "lowres" msgid "Autosave:" msgstr "Salvataggio automatico:" -#: gui/options.cpp:1400 +#: gui/options.cpp:1472 msgid "Keys" msgstr "Tasti" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "GUI Language:" msgstr "Lingua GUI:" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "Language of ScummVM GUI" msgstr "Lingua dell'interfaccia grafica di ScummVM" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "Update check:" msgstr "Controllo aggiornamenti:" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "How often to check ScummVM updates" msgstr "Frequenza delle verifiche disponibilitр aggiornamenti" -#: gui/options.cpp:1447 +#: gui/options.cpp:1519 msgid "Check now" msgstr "Controlla ora" -#: gui/options.cpp:1455 +#: gui/options.cpp:1527 msgid "Cloud" msgstr "Cloud" -#: gui/options.cpp:1457 +#: gui/options.cpp:1529 msgctxt "lowres" msgid "Cloud" msgstr "Cloud" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Storage:" msgstr "Servizio cloud:" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Active cloud storage" msgstr "Servizio di archiviazione cloud attivo" -#: gui/options.cpp:1469 gui/options.cpp:2026 +#: gui/options.cpp:1541 gui/options.cpp:2098 msgid "<none>" msgstr "<nessuno>" -#: gui/options.cpp:1473 backends/platform/wii/options.cpp:114 +#: gui/options.cpp:1545 backends/platform/wii/options.cpp:114 msgid "Username:" msgstr "Nome utente:" -#: gui/options.cpp:1473 +#: gui/options.cpp:1545 msgid "Username used by this storage" msgstr "Nome utilizzato per questo spazio di archiviazione" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Used space:" msgstr "Spazio su disco utilizzato:" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 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:1479 +#: gui/options.cpp:1551 msgid "Last sync time:" msgstr "Ultima sincronizzazione:" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "When the last saved games sync for this storage occured" msgstr "" "Ultima sincronizzazione dei salvataggi in questo spazio di archiviazione" -#: gui/options.cpp:1482 gui/storagewizarddialog.cpp:71 +#: gui/options.cpp:1554 gui/storagewizarddialog.cpp:71 msgid "Connect" msgstr "Connetti" -#: gui/options.cpp:1482 +#: gui/options.cpp:1554 msgid "Open wizard dialog to connect your cloud storage account" msgstr "Apri assistente di connessione all'account di archiviazione su Cloud" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh" msgstr "Aggiorna" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 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:1484 +#: gui/options.cpp:1556 msgid "Download" msgstr "Scarica" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Open downloads manager dialog" msgstr "Apri finestra di gestione dei download" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run server" msgstr "Avvia server" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run local webserver" msgstr "Avvia webserver locale" -#: gui/options.cpp:1487 gui/options.cpp:2136 +#: gui/options.cpp:1559 gui/options.cpp:2208 msgid "Not running" msgstr "Non avviato" -#: gui/options.cpp:1491 +#: gui/options.cpp:1563 msgid "/root/ Path:" msgstr "Percorso base:" -#: gui/options.cpp:1491 gui/options.cpp:1493 gui/options.cpp:1494 +#: gui/options.cpp:1563 gui/options.cpp:1565 gui/options.cpp:1566 msgid "Specifies which directory the Files Manager can access" msgstr "Specifica quali cartelle sono accessibili dal File Manager" -#: gui/options.cpp:1493 +#: gui/options.cpp:1565 msgctxt "lowres" msgid "/root/ Path:" msgstr "Percorso base:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "Server's port:" msgstr "Porta del Server:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "" "Which port is used by the server\n" "Auth with server is not available with non-default port" @@ -1280,19 +1298,19 @@ msgstr "" "Porta utillizzata dal server\n" "L'autenticazione non ш disponibile tramite una porta personalizzata" -#: gui/options.cpp:1516 +#: gui/options.cpp:1588 msgid "Apply" msgstr "Applica" -#: gui/options.cpp:1682 +#: gui/options.cpp:1754 msgid "Failed to change cloud storage!" msgstr "Impossibile cambiare dispositivo di archiviazione Cloud!" -#: gui/options.cpp:1685 +#: gui/options.cpp:1757 msgid "Another cloud storage is already active." msgstr "Un altro servizio di archiviazione cloud ш giр attivo." -#: gui/options.cpp:1721 +#: gui/options.cpp:1793 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1300,48 +1318,48 @@ msgstr "" "Il tema che hai selezionato non supporta la lingua attuale. Se vuoi " "utilizzare questo tema devi prima cambiare la lingua." -#: gui/options.cpp:1756 +#: gui/options.cpp:1828 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:1765 +#: gui/options.cpp:1837 msgid "Select directory for GUI themes" msgstr "Seleziona la cartella dei temi dell'interfaccia" -#: gui/options.cpp:1775 +#: gui/options.cpp:1847 msgid "Select directory for extra files" msgstr "Seleziona la cartella dei file aggiuntivi" -#: gui/options.cpp:1786 +#: gui/options.cpp:1858 msgid "Select directory for plugins" msgstr "Seleziona la cartella dei plugin" -#: gui/options.cpp:1798 +#: gui/options.cpp:1870 msgid "Select directory for Files Manager /root/" msgstr "Seleziona la cartella di partenza del File Manager" -#: gui/options.cpp:2033 +#: gui/options.cpp:2105 #, c-format msgid "%llu bytes" msgstr "%lIu bytes" -#: gui/options.cpp:2041 +#: gui/options.cpp:2113 msgid "<right now>" msgstr "<adesso>" -#: gui/options.cpp:2043 +#: gui/options.cpp:2115 msgid "<never>" msgstr "<mai>" -#: gui/options.cpp:2127 +#: gui/options.cpp:2199 msgid "Stop server" msgstr "Arresta server" -#: gui/options.cpp:2128 +#: gui/options.cpp:2200 msgid "Stop local webserver" msgstr "Arresta webserver locale" -#: gui/options.cpp:2219 +#: gui/options.cpp:2291 msgid "" "Request failed.\n" "Check your Internet connection." diff --git a/po/nb_NO.po b/po/nb_NO.po index f3e43f0c4f..03b6cbcd71 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-02-11 08:56+0100\n" +"POT-Creation-Date: 2017-02-21 23:29+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:1515 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69 +#: gui/options.cpp:1587 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:443 #: gui/saveload-dialog.cpp:717 gui/saveload-dialog.cpp:1111 @@ -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:522 -#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1517 +#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1589 #: gui/saveload-dialog.cpp:1112 engines/engine.cpp:477 engines/engine.cpp:488 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 @@ -242,7 +242,7 @@ msgstr "" "versjon" #: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:121 -#: gui/options.cpp:845 gui/options.cpp:858 gui/options.cpp:1410 +#: gui/options.cpp:907 gui/options.cpp:920 gui/options.cpp:1482 #: audio/null.cpp:41 msgid "<default>" msgstr "<standard>" @@ -265,11 +265,11 @@ msgstr "Plattform:" msgid "Engine" msgstr "Motor" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "Graphics" msgstr "Grafikk" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "GFX" msgstr "GFX" @@ -282,7 +282,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Overstyr globale grafikkinstillinger" -#: gui/editgamedialog.cpp:196 gui/options.cpp:1292 +#: gui/editgamedialog.cpp:196 gui/options.cpp:1364 msgid "Audio" msgstr "Lyd" @@ -295,11 +295,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Overstyr globale lydinstillinger" -#: gui/editgamedialog.cpp:210 gui/options.cpp:1297 +#: gui/editgamedialog.cpp:210 gui/options.cpp:1369 msgid "Volume" msgstr "Volum" -#: gui/editgamedialog.cpp:212 gui/options.cpp:1299 +#: gui/editgamedialog.cpp:212 gui/options.cpp:1371 msgctxt "lowres" msgid "Volume" msgstr "Volum" @@ -313,7 +313,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Overstyr globale voluminstillinger" -#: gui/editgamedialog.cpp:226 gui/options.cpp:1307 +#: gui/editgamedialog.cpp:226 gui/options.cpp:1379 msgid "MIDI" msgstr "MIDI" @@ -326,7 +326,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Overstyr globale MIDI-instillinger" -#: gui/editgamedialog.cpp:241 gui/options.cpp:1317 +#: gui/editgamedialog.cpp:241 gui/options.cpp:1389 msgid "MT-32" msgstr "MT-32" @@ -339,11 +339,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Overstyr globale MT-32-instillinger" -#: gui/editgamedialog.cpp:255 gui/options.cpp:1324 +#: gui/editgamedialog.cpp:255 gui/options.cpp:1396 msgid "Paths" msgstr "Sti" -#: gui/editgamedialog.cpp:257 gui/options.cpp:1326 +#: gui/editgamedialog.cpp:257 gui/options.cpp:1398 msgctxt "lowres" msgid "Paths" msgstr "Sti" @@ -357,7 +357,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Spillsti:" -#: gui/editgamedialog.cpp:271 gui/options.cpp:1350 +#: gui/editgamedialog.cpp:271 gui/options.cpp:1422 msgid "Extra Path:" msgstr "Ekstrasti:" @@ -366,44 +366,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:1352 +#: gui/editgamedialog.cpp:273 gui/options.cpp:1424 msgctxt "lowres" msgid "Extra Path:" msgstr "Ekstrasti:" -#: gui/editgamedialog.cpp:280 gui/options.cpp:1334 +#: gui/editgamedialog.cpp:280 gui/options.cpp:1406 msgid "Save Path:" msgstr "Lagringssti:" #: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282 -#: gui/editgamedialog.cpp:283 gui/options.cpp:1334 gui/options.cpp:1336 -#: gui/options.cpp:1337 +#: gui/editgamedialog.cpp:283 gui/options.cpp:1406 gui/options.cpp:1408 +#: gui/options.cpp:1409 msgid "Specifies where your saved games are put" msgstr "Bestemmer sti til lagrede spill" -#: gui/editgamedialog.cpp:282 gui/options.cpp:1336 +#: gui/editgamedialog.cpp:282 gui/options.cpp:1408 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:1345 -#: gui/options.cpp:1353 gui/options.cpp:1362 gui/options.cpp:1542 -#: gui/options.cpp:1548 gui/options.cpp:1556 gui/options.cpp:1579 -#: gui/options.cpp:1608 gui/options.cpp:1614 gui/options.cpp:1621 -#: gui/options.cpp:1629 gui/options.cpp:1812 gui/options.cpp:1815 -#: gui/options.cpp:1822 gui/options.cpp:1832 +#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1417 +#: gui/options.cpp:1425 gui/options.cpp:1434 gui/options.cpp:1614 +#: gui/options.cpp:1620 gui/options.cpp:1628 gui/options.cpp:1651 +#: gui/options.cpp:1680 gui/options.cpp:1686 gui/options.cpp:1693 +#: gui/options.cpp:1701 gui/options.cpp:1884 gui/options.cpp:1887 +#: gui/options.cpp:1894 gui/options.cpp:1904 msgctxt "path" msgid "None" msgstr "Ingen" #: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404 -#: gui/editgamedialog.cpp:522 gui/options.cpp:1536 gui/options.cpp:1602 -#: gui/options.cpp:1818 backends/platform/wii/options.cpp:56 +#: gui/editgamedialog.cpp:522 gui/options.cpp:1608 gui/options.cpp:1674 +#: gui/options.cpp:1890 backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/editgamedialog.cpp:450 gui/options.cpp:1826 +#: gui/editgamedialog.cpp:450 gui/options.cpp:1898 msgid "Select SoundFont" msgstr "Velg SoundFont" @@ -411,7 +411,7 @@ msgstr "Velg SoundFont" msgid "Select additional game directory" msgstr "Velg mappe med ytterligere data" -#: gui/editgamedialog.cpp:502 gui/options.cpp:1749 +#: gui/editgamedialog.cpp:502 gui/options.cpp:1821 msgid "Select directory for saved games" msgstr "Velg mappe for lagrede spill" @@ -503,7 +503,7 @@ msgstr "Sinus" msgid "Triangle" msgstr "Trekant" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1370 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1442 msgid "Misc" msgstr "Diverse" @@ -823,104 +823,117 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:289 gui/options.cpp:552 gui/options.cpp:690 -#: gui/options.cpp:759 gui/options.cpp:970 +#: gui/options.cpp:316 gui/options.cpp:598 gui/options.cpp:736 +#: gui/options.cpp:805 gui/options.cpp:1032 msgctxt "soundfont" msgid "None" msgstr "Ingen" -#: gui/options.cpp:456 +#: gui/options.cpp:502 msgid "Failed to apply some of the graphic options changes:" msgstr "Klarte ikke х aktivere enkelte av endringene i grafikkinstillinger:" -#: gui/options.cpp:468 +#: gui/options.cpp:514 msgid "the video mode could not be changed." msgstr "videomodusen kunne ikke endres." -#: gui/options.cpp:474 +#: gui/options.cpp:520 msgid "the aspect ratio setting could not be changed" msgstr "aspektrate-innstillingen kunne ikke endres" -#: gui/options.cpp:480 +#: gui/options.cpp:526 msgid "the fullscreen setting could not be changed" msgstr "fullskjermsinnstillingen kunne ikke endres" -#: gui/options.cpp:486 +#: gui/options.cpp:532 msgid "the filtering setting could not be changed" msgstr "filterinnstillingen kunne ikke endres" -#: gui/options.cpp:842 +#: gui/options.cpp:884 +msgid "Show On-screen control" +msgstr "" + +#: gui/options.cpp:888 +#, fuzzy +msgid "Touchpad mouse mode" +msgstr "Touchpad-modus deaktivert." + +#: gui/options.cpp:892 +msgid "Swap Menu and Back buttons" +msgstr "" + +#: gui/options.cpp:904 msgid "Graphics mode:" msgstr "Grafikkmodus:" -#: gui/options.cpp:856 +#: gui/options.cpp:918 msgid "Render mode:" msgstr "Tegnemodus:" -#: gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:918 gui/options.cpp:919 msgid "Special dithering modes supported by some games" msgstr "Spesiel dithering-modus stјttet av enkelte spill" -#: gui/options.cpp:868 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 +#: gui/options.cpp:930 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2460 msgid "Fullscreen mode" msgstr "Fullskjermsmodus" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Filter graphics" msgstr "Filtrer grafikk" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Use linear filtering when scaling graphics" msgstr "" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Aspect ratio correction" msgstr "Aspekt-rate korrigering" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Correct aspect ratio for 320x200 games" msgstr "Korriger aspekt-rate for 320x200-spill" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Preferred Device:" msgstr "Foretrukket enhet:" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Music Device:" msgstr "Musikkenhet:" -#: gui/options.cpp:882 gui/options.cpp:884 +#: gui/options.cpp:944 gui/options.cpp:946 msgid "Specifies preferred sound device or sound card emulator" msgstr "Velger foretrukket lydenhet eller lydkort-emulator" -#: gui/options.cpp:882 gui/options.cpp:884 gui/options.cpp:885 +#: gui/options.cpp:944 gui/options.cpp:946 gui/options.cpp:947 msgid "Specifies output sound device or sound card emulator" msgstr "Velger ut-lydenhet eller lydkortemulator" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Foretrukket enh.:" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Music Device:" msgstr "Musikkenhet:" -#: gui/options.cpp:911 +#: gui/options.cpp:973 msgid "AdLib emulator:" msgstr "AdLib-emulator:" -#: gui/options.cpp:911 gui/options.cpp:912 +#: gui/options.cpp:973 gui/options.cpp:974 msgid "AdLib is used for music in many games" msgstr "AdLib brukes til musikk i mange spill" -#: gui/options.cpp:922 +#: gui/options.cpp:984 msgid "Output rate:" msgstr "Utrate:" -#: gui/options.cpp:922 gui/options.cpp:923 +#: gui/options.cpp:984 gui/options.cpp:985 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -928,60 +941,60 @@ msgstr "" "Hјyere verdier gir bedre lydkvalitet, men stјttes kanskje ikke av ditt " "lydkort" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "GM Device:" msgstr "GM-enhet:" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "Specifies default sound device for General MIDI output" msgstr "Velger standard lydenhet for General MIDI-utdata" -#: gui/options.cpp:944 +#: gui/options.cpp:1006 msgid "Don't use General MIDI music" msgstr "Ikke bruk General MIDI-musikk" -#: gui/options.cpp:955 gui/options.cpp:1017 +#: gui/options.cpp:1017 gui/options.cpp:1079 msgid "Use first available device" msgstr "Bruk fјrste tilgjengelige enhet" -#: gui/options.cpp:967 +#: gui/options.cpp:1029 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:967 gui/options.cpp:969 gui/options.cpp:970 +#: gui/options.cpp:1029 gui/options.cpp:1031 gui/options.cpp:1032 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:969 +#: gui/options.cpp:1031 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Mixed AdLib/MIDI mode" msgstr "Mikset AdLib/MIDI-modus" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Use both MIDI and AdLib sound generation" msgstr "Bruk bхde MIDI- og AdLib- lydgenerering" -#: gui/options.cpp:978 +#: gui/options.cpp:1040 msgid "MIDI gain:" msgstr "MIDI gain:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "MT-32 Device:" msgstr "MT-32 Enhet:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 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:993 +#: gui/options.cpp:1055 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Ekte Roland MT-32 (deaktiver GM-emulering)" -#: gui/options.cpp:993 gui/options.cpp:995 +#: gui/options.cpp:1055 gui/options.cpp:1057 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -989,16 +1002,16 @@ msgstr "" "Velg hvis du har et ekte Roland-kompatible lydkort tilkoblet maskinen, og " "vil bruke dette" -#: gui/options.cpp:995 +#: gui/options.cpp:1057 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Ekte Roland MT-32 (deaktiver GM-emulering)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland GS Modus (aktiver MT32-mapping)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -1006,263 +1019,268 @@ msgstr "" "Aktiver hvis du vil slх pх patch mappinger for х emulere en MT-32 eller " "Roland GS enhet" -#: gui/options.cpp:1007 +#: gui/options.cpp:1069 msgid "Don't use Roland MT-32 music" msgstr "Ikke bruk Roland MT-32-musikk" -#: gui/options.cpp:1034 +#: gui/options.cpp:1096 msgid "Text and Speech:" msgstr "Tekst og Tale:" -#: gui/options.cpp:1038 gui/options.cpp:1048 +#: gui/options.cpp:1100 gui/options.cpp:1110 msgid "Speech" msgstr "Tale" -#: gui/options.cpp:1039 gui/options.cpp:1049 +#: gui/options.cpp:1101 gui/options.cpp:1111 msgid "Subtitles" msgstr "Undertekster" -#: gui/options.cpp:1040 +#: gui/options.cpp:1102 msgid "Both" msgstr "Begge" -#: gui/options.cpp:1042 +#: gui/options.cpp:1104 msgid "Subtitle speed:" msgstr "Teksthastighet:" -#: gui/options.cpp:1044 +#: gui/options.cpp:1106 msgctxt "lowres" msgid "Text and Speech:" msgstr "Tekst og Tale:" -#: gui/options.cpp:1048 +#: gui/options.cpp:1110 msgid "Spch" msgstr "Tale" -#: gui/options.cpp:1049 +#: gui/options.cpp:1111 msgid "Subs" msgstr "Tekst" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgctxt "lowres" msgid "Both" msgstr "Begge" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgid "Show subtitles and play speech" msgstr "Vis undertekster, og spill av tale" -#: gui/options.cpp:1052 +#: gui/options.cpp:1114 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Underteksthastighet:" -#: gui/options.cpp:1068 +#: gui/options.cpp:1130 msgid "Music volume:" msgstr "Musikkvolum:" -#: gui/options.cpp:1070 +#: gui/options.cpp:1132 msgctxt "lowres" msgid "Music volume:" msgstr "Musikkvolum:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1139 msgid "Mute All" msgstr "Demp alle" -#: gui/options.cpp:1080 +#: gui/options.cpp:1142 msgid "SFX volume:" msgstr "Lydeffektvolum:" -#: gui/options.cpp:1080 gui/options.cpp:1082 gui/options.cpp:1083 +#: gui/options.cpp:1142 gui/options.cpp:1144 gui/options.cpp:1145 msgid "Special sound effects volume" msgstr "Volum for spesielle lydeffekter" -#: gui/options.cpp:1082 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "SFX volume:" msgstr "Lydeffektvolum:" -#: gui/options.cpp:1090 +#: gui/options.cpp:1152 msgid "Speech volume:" msgstr "Talevolum:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1154 msgctxt "lowres" msgid "Speech volume:" msgstr "Talevolum:" -#: gui/options.cpp:1311 +#: gui/options.cpp:1351 +#, fuzzy +msgid "Control" +msgstr "Styr Mus" + +#: gui/options.cpp:1383 msgid "FluidSynth Settings" msgstr "FluidSynth-instillinger" -#: gui/options.cpp:1342 +#: gui/options.cpp:1414 msgid "Theme Path:" msgstr "Temasti:" -#: gui/options.cpp:1344 +#: gui/options.cpp:1416 msgctxt "lowres" msgid "Theme Path:" msgstr "Temasti:" -#: gui/options.cpp:1350 gui/options.cpp:1352 gui/options.cpp:1353 +#: gui/options.cpp:1422 gui/options.cpp:1424 gui/options.cpp:1425 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:1359 +#: gui/options.cpp:1431 msgid "Plugins Path:" msgstr "Pluginsti:" -#: gui/options.cpp:1361 +#: gui/options.cpp:1433 msgctxt "lowres" msgid "Plugins Path:" msgstr "Pluginsti:" -#: gui/options.cpp:1372 +#: gui/options.cpp:1444 msgctxt "lowres" msgid "Misc" msgstr "Div" -#: gui/options.cpp:1374 +#: gui/options.cpp:1446 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1378 +#: gui/options.cpp:1450 msgid "GUI Renderer:" msgstr "GUI-tegner:" -#: gui/options.cpp:1390 +#: gui/options.cpp:1462 msgid "Autosave:" msgstr "Autolagre:" -#: gui/options.cpp:1392 +#: gui/options.cpp:1464 msgctxt "lowres" msgid "Autosave:" msgstr "Autolagre:" -#: gui/options.cpp:1400 +#: gui/options.cpp:1472 msgid "Keys" msgstr "Taster" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "GUI Language:" msgstr "GUI-sprхk:" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "Language of ScummVM GUI" msgstr "Sprхk i ScummVM-GUIet" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "Update check:" msgstr "Oppdateringssjekk:" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "How often to check ScummVM updates" msgstr "Hvor ofte det skal sjekkes for ScummVM-oppdateringer" -#: gui/options.cpp:1447 +#: gui/options.cpp:1519 msgid "Check now" msgstr "Sjekk nх" -#: gui/options.cpp:1455 +#: gui/options.cpp:1527 msgid "Cloud" msgstr "Sky" -#: gui/options.cpp:1457 +#: gui/options.cpp:1529 msgctxt "lowres" msgid "Cloud" msgstr "Sky" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Storage:" msgstr "Lagring:" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Active cloud storage" msgstr "Aktiv skylagring" -#: gui/options.cpp:1469 gui/options.cpp:2026 +#: gui/options.cpp:1541 gui/options.cpp:2098 msgid "<none>" msgstr "<ingen>" -#: gui/options.cpp:1473 backends/platform/wii/options.cpp:114 +#: gui/options.cpp:1545 backends/platform/wii/options.cpp:114 msgid "Username:" msgstr "Brukernavn:" -#: gui/options.cpp:1473 +#: gui/options.cpp:1545 msgid "Username used by this storage" msgstr "Brukernavn for denne lagringsmхten" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Used space:" msgstr "Brukt plass:" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 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:1479 +#: gui/options.cpp:1551 msgid "Last sync time:" msgstr "Forrige synctidspunkt:" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 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:1482 gui/storagewizarddialog.cpp:71 +#: gui/options.cpp:1554 gui/storagewizarddialog.cpp:71 msgid "Connect" msgstr "Koble til" -#: gui/options.cpp:1482 +#: gui/options.cpp:1554 msgid "Open wizard dialog to connect your cloud storage account" msgstr "Хpne veiviserdialog for х koble til skylagringen din" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh" msgstr "Oppfrisk" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh current cloud storage information (username and usage)" msgstr "Oppfrisk gjeldende skylagringsinformasjon (brukernavn og bruk)" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Download" msgstr "Last ned" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Open downloads manager dialog" msgstr "Хpne nedlastingsbehandlerdialog" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run server" msgstr "Kjјr server" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run local webserver" msgstr "Kjјr lokal webserver" -#: gui/options.cpp:1487 gui/options.cpp:2136 +#: gui/options.cpp:1559 gui/options.cpp:2208 msgid "Not running" msgstr "Kjјrer ikke" -#: gui/options.cpp:1491 +#: gui/options.cpp:1563 msgid "/root/ Path:" msgstr "/root/ Sti:" -#: gui/options.cpp:1491 gui/options.cpp:1493 gui/options.cpp:1494 +#: gui/options.cpp:1563 gui/options.cpp:1565 gui/options.cpp:1566 msgid "Specifies which directory the Files Manager can access" msgstr "Angi mappe som filbehandleren skal ha tilgang til" -#: gui/options.cpp:1493 +#: gui/options.cpp:1565 msgctxt "lowres" msgid "/root/ Path:" msgstr "/root/ Sti:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "Server's port:" msgstr "Serverport:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "" "Which port is used by the server\n" "Auth with server is not available with non-default port" @@ -1270,19 +1288,19 @@ msgstr "" "Hvilken port som brukes av serveren\n" "Autentisering med server stјttes ikke med ikke-standard port" -#: gui/options.cpp:1516 +#: gui/options.cpp:1588 msgid "Apply" msgstr "" -#: gui/options.cpp:1682 +#: gui/options.cpp:1754 msgid "Failed to change cloud storage!" msgstr "Klarte ikke х kontakte skylagring!" -#: gui/options.cpp:1685 +#: gui/options.cpp:1757 msgid "Another cloud storage is already active." msgstr "En annen skylagring er allerede aktiv." -#: gui/options.cpp:1721 +#: gui/options.cpp:1793 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1290,48 +1308,48 @@ msgstr "" "Temaet du valgte stјtter ikke det aktive sprхket. Hvis du vil bruke dette " "temaet, mх du bytte til et annet sprхk fјrst." -#: gui/options.cpp:1756 +#: gui/options.cpp:1828 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:1765 +#: gui/options.cpp:1837 msgid "Select directory for GUI themes" msgstr "Velg mappe for GUI-temaer" -#: gui/options.cpp:1775 +#: gui/options.cpp:1847 msgid "Select directory for extra files" msgstr "Velg mappe for ytterligere filer" -#: gui/options.cpp:1786 +#: gui/options.cpp:1858 msgid "Select directory for plugins" msgstr "Velg mappe for plugins" -#: gui/options.cpp:1798 +#: gui/options.cpp:1870 msgid "Select directory for Files Manager /root/" msgstr "Velg mappe for filbehandler /root/" -#: gui/options.cpp:2033 +#: gui/options.cpp:2105 #, c-format msgid "%llu bytes" msgstr "%llu bytes" -#: gui/options.cpp:2041 +#: gui/options.cpp:2113 msgid "<right now>" msgstr "<med en gang>" -#: gui/options.cpp:2043 +#: gui/options.cpp:2115 msgid "<never>" msgstr "<aldri>" -#: gui/options.cpp:2127 +#: gui/options.cpp:2199 msgid "Stop server" msgstr "Stopp server" -#: gui/options.cpp:2128 +#: gui/options.cpp:2200 msgid "Stop local webserver" msgstr "Stopp lokal webserver" -#: gui/options.cpp:2219 +#: gui/options.cpp:2291 msgid "" "Request failed.\n" "Check your Internet connection." diff --git a/po/nl_NL.po b/po/nl_NL.po index a966eecb5b..654cdef8d1 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-02-11 08:56+0100\n" +"POT-Creation-Date: 2017-02-21 23:29+0100\n" "PO-Revision-Date: 2017-01-02 18:38+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:1515 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69 +#: gui/options.cpp:1587 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:443 #: gui/saveload-dialog.cpp:717 gui/saveload-dialog.cpp:1111 @@ -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:522 -#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1517 +#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1589 #: gui/saveload-dialog.cpp:1112 engines/engine.cpp:477 engines/engine.cpp:488 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 @@ -239,7 +239,7 @@ 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:121 -#: gui/options.cpp:845 gui/options.cpp:858 gui/options.cpp:1410 +#: gui/options.cpp:907 gui/options.cpp:920 gui/options.cpp:1482 #: audio/null.cpp:41 msgid "<default>" msgstr "<standaard>" @@ -262,11 +262,11 @@ msgstr "Platform:" msgid "Engine" msgstr "Engine" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "Graphics" msgstr "Beeld" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "GFX" msgstr "GFX" @@ -279,7 +279,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Negeer algemene grafische instellingen" -#: gui/editgamedialog.cpp:196 gui/options.cpp:1292 +#: gui/editgamedialog.cpp:196 gui/options.cpp:1364 msgid "Audio" msgstr "Geluid" @@ -292,11 +292,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Negeer algemene audio instellingen" -#: gui/editgamedialog.cpp:210 gui/options.cpp:1297 +#: gui/editgamedialog.cpp:210 gui/options.cpp:1369 msgid "Volume" msgstr "Volume" -#: gui/editgamedialog.cpp:212 gui/options.cpp:1299 +#: gui/editgamedialog.cpp:212 gui/options.cpp:1371 msgctxt "lowres" msgid "Volume" msgstr "Volume" @@ -310,7 +310,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Negeer algemene volume instellingen" -#: gui/editgamedialog.cpp:226 gui/options.cpp:1307 +#: gui/editgamedialog.cpp:226 gui/options.cpp:1379 msgid "MIDI" msgstr "MIDI" @@ -323,7 +323,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Negeer algemene MIDI instellingen" -#: gui/editgamedialog.cpp:241 gui/options.cpp:1317 +#: gui/editgamedialog.cpp:241 gui/options.cpp:1389 msgid "MT-32" msgstr "MT-32" @@ -336,11 +336,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Negeer algemene MT-32 instellingen" -#: gui/editgamedialog.cpp:255 gui/options.cpp:1324 +#: gui/editgamedialog.cpp:255 gui/options.cpp:1396 msgid "Paths" msgstr "Paden" -#: gui/editgamedialog.cpp:257 gui/options.cpp:1326 +#: gui/editgamedialog.cpp:257 gui/options.cpp:1398 msgctxt "lowres" msgid "Paths" msgstr "Paden" @@ -354,7 +354,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Spel Pad:" -#: gui/editgamedialog.cpp:271 gui/options.cpp:1350 +#: gui/editgamedialog.cpp:271 gui/options.cpp:1422 msgid "Extra Path:" msgstr "Extra Pad:" @@ -363,44 +363,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:1352 +#: gui/editgamedialog.cpp:273 gui/options.cpp:1424 msgctxt "lowres" msgid "Extra Path:" msgstr "Extra Pad:" -#: gui/editgamedialog.cpp:280 gui/options.cpp:1334 +#: gui/editgamedialog.cpp:280 gui/options.cpp:1406 msgid "Save Path:" msgstr "Bewaar Pad:" #: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282 -#: gui/editgamedialog.cpp:283 gui/options.cpp:1334 gui/options.cpp:1336 -#: gui/options.cpp:1337 +#: gui/editgamedialog.cpp:283 gui/options.cpp:1406 gui/options.cpp:1408 +#: gui/options.cpp:1409 msgid "Specifies where your saved games are put" msgstr "Bepaalt waar opgeslagen spellen worden bewaard" -#: gui/editgamedialog.cpp:282 gui/options.cpp:1336 +#: gui/editgamedialog.cpp:282 gui/options.cpp:1408 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:1345 -#: gui/options.cpp:1353 gui/options.cpp:1362 gui/options.cpp:1542 -#: gui/options.cpp:1548 gui/options.cpp:1556 gui/options.cpp:1579 -#: gui/options.cpp:1608 gui/options.cpp:1614 gui/options.cpp:1621 -#: gui/options.cpp:1629 gui/options.cpp:1812 gui/options.cpp:1815 -#: gui/options.cpp:1822 gui/options.cpp:1832 +#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1417 +#: gui/options.cpp:1425 gui/options.cpp:1434 gui/options.cpp:1614 +#: gui/options.cpp:1620 gui/options.cpp:1628 gui/options.cpp:1651 +#: gui/options.cpp:1680 gui/options.cpp:1686 gui/options.cpp:1693 +#: gui/options.cpp:1701 gui/options.cpp:1884 gui/options.cpp:1887 +#: gui/options.cpp:1894 gui/options.cpp:1904 msgctxt "path" msgid "None" msgstr "Geen" #: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404 -#: gui/editgamedialog.cpp:522 gui/options.cpp:1536 gui/options.cpp:1602 -#: gui/options.cpp:1818 backends/platform/wii/options.cpp:56 +#: gui/editgamedialog.cpp:522 gui/options.cpp:1608 gui/options.cpp:1674 +#: gui/options.cpp:1890 backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standaard" -#: gui/editgamedialog.cpp:450 gui/options.cpp:1826 +#: gui/editgamedialog.cpp:450 gui/options.cpp:1898 msgid "Select SoundFont" msgstr "Selecteer SoundFont" @@ -408,7 +408,7 @@ msgstr "Selecteer SoundFont" msgid "Select additional game directory" msgstr "Selecteer additionele speldatamap" -#: gui/editgamedialog.cpp:502 gui/options.cpp:1749 +#: gui/editgamedialog.cpp:502 gui/options.cpp:1821 msgid "Select directory for saved games" msgstr "Selecteer map voor opgeslagen spellen" @@ -501,7 +501,7 @@ msgstr "Sinus" msgid "Triangle" msgstr "Driehoek" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1370 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1442 msgid "Misc" msgstr "Overig" @@ -825,104 +825,117 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:289 gui/options.cpp:552 gui/options.cpp:690 -#: gui/options.cpp:759 gui/options.cpp:970 +#: gui/options.cpp:316 gui/options.cpp:598 gui/options.cpp:736 +#: gui/options.cpp:805 gui/options.cpp:1032 msgctxt "soundfont" msgid "None" msgstr "Geen" -#: gui/options.cpp:456 +#: gui/options.cpp:502 msgid "Failed to apply some of the graphic options changes:" msgstr "Sommige grafische opties konden niet worden toegepast:" -#: gui/options.cpp:468 +#: gui/options.cpp:514 msgid "the video mode could not be changed." msgstr "de videomodus kon niet veranderd worden." -#: gui/options.cpp:474 +#: gui/options.cpp:520 msgid "the aspect ratio setting could not be changed" msgstr "de pixelverhoudinginstelling kon niet veranderd worden" -#: gui/options.cpp:480 +#: gui/options.cpp:526 msgid "the fullscreen setting could not be changed" msgstr "de volledig-scherminstelling kon niet veranderd worden" -#: gui/options.cpp:486 +#: gui/options.cpp:532 msgid "the filtering setting could not be changed" msgstr "de filterinstelling kon niet veranderd worden" -#: gui/options.cpp:842 +#: gui/options.cpp:884 +msgid "Show On-screen control" +msgstr "" + +#: gui/options.cpp:888 +#, fuzzy +msgid "Touchpad mouse mode" +msgstr "Touchpadmodus uitgeschakeld." + +#: gui/options.cpp:892 +msgid "Swap Menu and Back buttons" +msgstr "" + +#: gui/options.cpp:904 msgid "Graphics mode:" msgstr "Grafische modus:" -#: gui/options.cpp:856 +#: gui/options.cpp:918 msgid "Render mode:" msgstr "Render modus:" -#: gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:918 gui/options.cpp:919 msgid "Special dithering modes supported by some games" msgstr "Speciale ditheringmodi die door sommige games ondersteund worden" -#: gui/options.cpp:868 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 +#: gui/options.cpp:930 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2460 msgid "Fullscreen mode" msgstr "Volledig-scherm modus" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Filter graphics" msgstr "Filter afbeeldingen" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Use linear filtering when scaling graphics" msgstr "Gebruik lineair filteren tijdens het schalen van afbeeldingen" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Aspect ratio correction" msgstr "Pixelverhoudingcorrectie" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Correct aspect ratio for 320x200 games" msgstr "Corrigeer de pixelverhouding voor 320x200 spellen" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Preferred Device:" msgstr "Voorkeursapparaat:" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Music Device:" msgstr "Muziekapparaat:" -#: gui/options.cpp:882 gui/options.cpp:884 +#: gui/options.cpp:944 gui/options.cpp:946 msgid "Specifies preferred sound device or sound card emulator" msgstr "Specificeert het voorkeurs geluidsapparaat of geluidskaartemulator" -#: gui/options.cpp:882 gui/options.cpp:884 gui/options.cpp:885 +#: gui/options.cpp:944 gui/options.cpp:946 gui/options.cpp:947 msgid "Specifies output sound device or sound card emulator" msgstr "Specificeert geluidsapparaat of geluidskaartemulator" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Voorkeursapparaat:" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Music Device:" msgstr "Muziekapparaat:" -#: gui/options.cpp:911 +#: gui/options.cpp:973 msgid "AdLib emulator:" msgstr "AdLib emulator:" -#: gui/options.cpp:911 gui/options.cpp:912 +#: gui/options.cpp:973 gui/options.cpp:974 msgid "AdLib is used for music in many games" msgstr "AdLib word in vele spelen voor muziek gebruikt" -#: gui/options.cpp:922 +#: gui/options.cpp:984 msgid "Output rate:" msgstr "Output snelheid:" -#: gui/options.cpp:922 gui/options.cpp:923 +#: gui/options.cpp:984 gui/options.cpp:985 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -930,63 +943,63 @@ msgstr "" "Hogere waarden geven betere geluidskwaliteit maar worden mogelijk niet " "ondersteund door uw geluidskaart" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "GM Device:" msgstr "GM Apparaat:" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "Specifies default sound device for General MIDI output" msgstr "Specificeert het standaard geluidsapparaat voor General MIDI" -#: gui/options.cpp:944 +#: gui/options.cpp:1006 msgid "Don't use General MIDI music" msgstr "Geen General MIDI muziek gebruiken" -#: gui/options.cpp:955 gui/options.cpp:1017 +#: gui/options.cpp:1017 gui/options.cpp:1079 msgid "Use first available device" msgstr "Gebruik eerst beschikbare apparaat" -#: gui/options.cpp:967 +#: gui/options.cpp:1029 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:967 gui/options.cpp:969 gui/options.cpp:970 +#: gui/options.cpp:1029 gui/options.cpp:1031 gui/options.cpp:1032 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "" "SoundFont wordt ondersteund door FluidSynth, Timidity en sommige " "geluidskaarten" -#: gui/options.cpp:969 +#: gui/options.cpp:1031 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Mixed AdLib/MIDI mode" msgstr "Gemengde AdLib/MIDI modus" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Use both MIDI and AdLib sound generation" msgstr "Gebruik zowel MIDI als AdLib geluid" -#: gui/options.cpp:978 +#: gui/options.cpp:1040 msgid "MIDI gain:" msgstr "MIDI versterking:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "MT-32 Device:" msgstr "MT-32 Apparaat:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 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:993 +#: gui/options.cpp:1055 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Waarheidsgetrouwe Roland MT-32 (GM emulatie uitschakelen)" -#: gui/options.cpp:993 gui/options.cpp:995 +#: gui/options.cpp:1055 gui/options.cpp:1057 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -994,16 +1007,16 @@ msgstr "" "Selecteer als u een hardware Roland-compatible geluidsapparaat gekoppeld aan " "uw computer wilt gebruiken" -#: gui/options.cpp:995 +#: gui/options.cpp:1057 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Echte Roland MT-32 (geen GM emulatie)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland GS Device (met MT-32 mappings)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -1011,265 +1024,270 @@ msgstr "" "Selecteer dit als u patchmappings wilt om een MT-32 op een Roland GS " "apparaat te emuleren" -#: gui/options.cpp:1007 +#: gui/options.cpp:1069 msgid "Don't use Roland MT-32 music" msgstr "Geen Roland MT-32 muziek gebruiken" -#: gui/options.cpp:1034 +#: gui/options.cpp:1096 msgid "Text and Speech:" msgstr "Spraak en/of tekst:" -#: gui/options.cpp:1038 gui/options.cpp:1048 +#: gui/options.cpp:1100 gui/options.cpp:1110 msgid "Speech" msgstr "Spraak" -#: gui/options.cpp:1039 gui/options.cpp:1049 +#: gui/options.cpp:1101 gui/options.cpp:1111 msgid "Subtitles" msgstr "Tekst" -#: gui/options.cpp:1040 +#: gui/options.cpp:1102 msgid "Both" msgstr "Beide" -#: gui/options.cpp:1042 +#: gui/options.cpp:1104 msgid "Subtitle speed:" msgstr "Snelheid tekst:" -#: gui/options.cpp:1044 +#: gui/options.cpp:1106 msgctxt "lowres" msgid "Text and Speech:" msgstr "Spraak en/of text:" -#: gui/options.cpp:1048 +#: gui/options.cpp:1110 msgid "Spch" msgstr "Sprk" -#: gui/options.cpp:1049 +#: gui/options.cpp:1111 msgid "Subs" msgstr "Text" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgctxt "lowres" msgid "Both" msgstr "Beide" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgid "Show subtitles and play speech" msgstr "Toon tekst en speel spraak af" -#: gui/options.cpp:1052 +#: gui/options.cpp:1114 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Snelheid text:" -#: gui/options.cpp:1068 +#: gui/options.cpp:1130 msgid "Music volume:" msgstr "Muziek volume:" -#: gui/options.cpp:1070 +#: gui/options.cpp:1132 msgctxt "lowres" msgid "Music volume:" msgstr "Muziek volume:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1139 msgid "Mute All" msgstr "Alles Dempen" -#: gui/options.cpp:1080 +#: gui/options.cpp:1142 msgid "SFX volume:" msgstr "SFX volume:" -#: gui/options.cpp:1080 gui/options.cpp:1082 gui/options.cpp:1083 +#: gui/options.cpp:1142 gui/options.cpp:1144 gui/options.cpp:1145 msgid "Special sound effects volume" msgstr "Volume voor speciale geluidseffecten" -#: gui/options.cpp:1082 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "SFX volume:" msgstr "SFX volume:" -#: gui/options.cpp:1090 +#: gui/options.cpp:1152 msgid "Speech volume:" msgstr "Spraak volume:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1154 msgctxt "lowres" msgid "Speech volume:" msgstr "Spraak volume:" -#: gui/options.cpp:1311 +#: gui/options.cpp:1351 +#, fuzzy +msgid "Control" +msgstr "Muis Besturing" + +#: gui/options.cpp:1383 msgid "FluidSynth Settings" msgstr "FluidSynth Instellingen" -#: gui/options.cpp:1342 +#: gui/options.cpp:1414 msgid "Theme Path:" msgstr "Thema Pad:" -#: gui/options.cpp:1344 +#: gui/options.cpp:1416 msgctxt "lowres" msgid "Theme Path:" msgstr "Thema Pad:" -#: gui/options.cpp:1350 gui/options.cpp:1352 gui/options.cpp:1353 +#: gui/options.cpp:1422 gui/options.cpp:1424 gui/options.cpp:1425 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:1359 +#: gui/options.cpp:1431 msgid "Plugins Path:" msgstr "Plugins Pad:" -#: gui/options.cpp:1361 +#: gui/options.cpp:1433 msgctxt "lowres" msgid "Plugins Path:" msgstr "Plugins Pad:" -#: gui/options.cpp:1372 +#: gui/options.cpp:1444 msgctxt "lowres" msgid "Misc" msgstr "Overig" -#: gui/options.cpp:1374 +#: gui/options.cpp:1446 msgid "Theme:" msgstr "Thema:" -#: gui/options.cpp:1378 +#: gui/options.cpp:1450 msgid "GUI Renderer:" msgstr "GUI Renderer:" -#: gui/options.cpp:1390 +#: gui/options.cpp:1462 msgid "Autosave:" msgstr "Auto opslaan:" -#: gui/options.cpp:1392 +#: gui/options.cpp:1464 msgctxt "lowres" msgid "Autosave:" msgstr "Auto opslaan:" -#: gui/options.cpp:1400 +#: gui/options.cpp:1472 msgid "Keys" msgstr "Toetsen" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "GUI Language:" msgstr "GUI Taal:" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "Language of ScummVM GUI" msgstr "Taal van de ScummVM GUI" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "Update check:" msgstr "Update controle:" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "How often to check ScummVM updates" msgstr "Hoe vaak checken op ScummVM updates" -#: gui/options.cpp:1447 +#: gui/options.cpp:1519 msgid "Check now" msgstr "Controleer nu" -#: gui/options.cpp:1455 +#: gui/options.cpp:1527 msgid "Cloud" msgstr "Cloud" -#: gui/options.cpp:1457 +#: gui/options.cpp:1529 msgctxt "lowres" msgid "Cloud" msgstr "Cloud" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Storage:" msgstr "Opslag:" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Active cloud storage" msgstr "Actieve cloud opslag" -#: gui/options.cpp:1469 gui/options.cpp:2026 +#: gui/options.cpp:1541 gui/options.cpp:2098 msgid "<none>" msgstr "<geen>" -#: gui/options.cpp:1473 backends/platform/wii/options.cpp:114 +#: gui/options.cpp:1545 backends/platform/wii/options.cpp:114 msgid "Username:" msgstr "Gebruikersnaam:" -#: gui/options.cpp:1473 +#: gui/options.cpp:1545 msgid "Username used by this storage" msgstr "Gebruikersnaam gebruikt voor deze opslag" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Used space:" msgstr "Gebruikte ruimte:" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Space used by ScummVM's saved games on this storage" msgstr "Ruimte in gebruikt door ScummVM's opgeslagen spellen op deze opslag" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "Last sync time:" msgstr "Laatste synchronisatie:" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "When the last saved games sync for this storage occured" msgstr "Wanneer de laatste synchronisatie voor deze opslag is geweest" -#: gui/options.cpp:1482 gui/storagewizarddialog.cpp:71 +#: gui/options.cpp:1554 gui/storagewizarddialog.cpp:71 msgid "Connect" msgstr "Verbinden" -#: gui/options.cpp:1482 +#: gui/options.cpp:1554 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:1483 +#: gui/options.cpp:1555 msgid "Refresh" msgstr "Ververs" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh current cloud storage information (username and usage)" msgstr "Ververs de huidige opslag informatie (gebruikersnaam en gebruik)" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Download" msgstr "Download" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Open downloads manager dialog" msgstr "Open downloads manager dialoogvenster" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run server" msgstr "Start server" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run local webserver" msgstr "Draai lokale webserver" -#: gui/options.cpp:1487 gui/options.cpp:2136 +#: gui/options.cpp:1559 gui/options.cpp:2208 msgid "Not running" msgstr "Draait niet" -#: gui/options.cpp:1491 +#: gui/options.cpp:1563 msgid "/root/ Path:" msgstr "/root/ Pad:" -#: gui/options.cpp:1491 gui/options.cpp:1493 gui/options.cpp:1494 +#: gui/options.cpp:1563 gui/options.cpp:1565 gui/options.cpp:1566 msgid "Specifies which directory the Files Manager can access" msgstr "Bepaalt welke map de Bestanden Manager gebruiken mag" -#: gui/options.cpp:1493 +#: gui/options.cpp:1565 msgctxt "lowres" msgid "/root/ Path:" msgstr "/root/ Pad:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "Server's port:" msgstr "Serverport:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "" "Which port is used by the server\n" "Auth with server is not available with non-default port" @@ -1277,19 +1295,19 @@ msgstr "" "Welke port is gebruikt voor de server\n" "Auth met server is niet beschikbaar met een niet standaard port" -#: gui/options.cpp:1516 +#: gui/options.cpp:1588 msgid "Apply" msgstr "Toepassen" -#: gui/options.cpp:1682 +#: gui/options.cpp:1754 msgid "Failed to change cloud storage!" msgstr "Veranderen van cloud opslag mislukt!" -#: gui/options.cpp:1685 +#: gui/options.cpp:1757 msgid "Another cloud storage is already active." msgstr "Er is al een andere cloud opslag actief." -#: gui/options.cpp:1721 +#: gui/options.cpp:1793 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1297,49 +1315,49 @@ msgstr "" "Het thema dat u heeft geselecteerd ondersteunt uw gekozen taal niet. Als u " "dit thema wilt gebruiken dient u eerst een andere taal te selecteren." -#: gui/options.cpp:1756 +#: gui/options.cpp:1828 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:1765 +#: gui/options.cpp:1837 msgid "Select directory for GUI themes" msgstr "Selecteer map voor GUI themas" -#: gui/options.cpp:1775 +#: gui/options.cpp:1847 msgid "Select directory for extra files" msgstr "Selecteer map voor extra bestanden" -#: gui/options.cpp:1786 +#: gui/options.cpp:1858 msgid "Select directory for plugins" msgstr "Selecteer map voor plugins" -#: gui/options.cpp:1798 +#: gui/options.cpp:1870 msgid "Select directory for Files Manager /root/" msgstr "Selecteer map voor Bestanden Manager /root/" -#: gui/options.cpp:2033 +#: gui/options.cpp:2105 #, c-format msgid "%llu bytes" msgstr "%llu bytes" -#: gui/options.cpp:2041 +#: gui/options.cpp:2113 msgid "<right now>" msgstr "<nu>" -#: gui/options.cpp:2043 +#: gui/options.cpp:2115 msgid "<never>" msgstr "<nooit>" -#: gui/options.cpp:2127 +#: gui/options.cpp:2199 msgid "Stop server" msgstr "Stop server" -#: gui/options.cpp:2128 +#: gui/options.cpp:2200 msgid "Stop local webserver" msgstr "Stop lokale webserver" -#: gui/options.cpp:2219 +#: gui/options.cpp:2291 msgid "" "Request failed.\n" "Check your Internet connection." diff --git a/po/nn_NO.po b/po/nn_NO.po index 9c1cafbc23..15f68859ba 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-02-11 08:56+0100\n" +"POT-Creation-Date: 2017-02-21 23:29+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:1515 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69 +#: gui/options.cpp:1587 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:443 #: gui/saveload-dialog.cpp:717 gui/saveload-dialog.cpp:1111 @@ -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:522 -#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1517 +#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1589 #: gui/saveload-dialog.cpp:1112 engines/engine.cpp:477 engines/engine.cpp:488 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 @@ -237,7 +237,7 @@ msgstr "" "engelsk versjon" #: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:121 -#: gui/options.cpp:845 gui/options.cpp:858 gui/options.cpp:1410 +#: gui/options.cpp:907 gui/options.cpp:920 gui/options.cpp:1482 #: audio/null.cpp:41 msgid "<default>" msgstr "<standard>" @@ -260,11 +260,11 @@ msgstr "Plattform:" msgid "Engine" msgstr "Motor" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "Graphics" msgstr "Grafikk" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "GFX" msgstr "GFX" @@ -277,7 +277,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Overstyr globale grafikkinstillingar" -#: gui/editgamedialog.cpp:196 gui/options.cpp:1292 +#: gui/editgamedialog.cpp:196 gui/options.cpp:1364 msgid "Audio" msgstr "Lyd" @@ -290,11 +290,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Overstyr globale lydinstillingar" -#: gui/editgamedialog.cpp:210 gui/options.cpp:1297 +#: gui/editgamedialog.cpp:210 gui/options.cpp:1369 msgid "Volume" msgstr "Volum" -#: gui/editgamedialog.cpp:212 gui/options.cpp:1299 +#: gui/editgamedialog.cpp:212 gui/options.cpp:1371 msgctxt "lowres" msgid "Volume" msgstr "Volum" @@ -308,7 +308,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Overstyr globale voluminstillingar" -#: gui/editgamedialog.cpp:226 gui/options.cpp:1307 +#: gui/editgamedialog.cpp:226 gui/options.cpp:1379 msgid "MIDI" msgstr "MIDI" @@ -321,7 +321,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Overstyr globale MIDI-instillingar" -#: gui/editgamedialog.cpp:241 gui/options.cpp:1317 +#: gui/editgamedialog.cpp:241 gui/options.cpp:1389 msgid "MT-32" msgstr "MT-32" @@ -334,11 +334,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Overstyr globale MT-32-instillingar" -#: gui/editgamedialog.cpp:255 gui/options.cpp:1324 +#: gui/editgamedialog.cpp:255 gui/options.cpp:1396 msgid "Paths" msgstr "Stiar" -#: gui/editgamedialog.cpp:257 gui/options.cpp:1326 +#: gui/editgamedialog.cpp:257 gui/options.cpp:1398 msgctxt "lowres" msgid "Paths" msgstr "Stiar" @@ -352,7 +352,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Spelsti:" -#: gui/editgamedialog.cpp:271 gui/options.cpp:1350 +#: gui/editgamedialog.cpp:271 gui/options.cpp:1422 msgid "Extra Path:" msgstr "Ekstrasti:" @@ -361,44 +361,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:1352 +#: gui/editgamedialog.cpp:273 gui/options.cpp:1424 msgctxt "lowres" msgid "Extra Path:" msgstr "Ekstrasti:" -#: gui/editgamedialog.cpp:280 gui/options.cpp:1334 +#: gui/editgamedialog.cpp:280 gui/options.cpp:1406 msgid "Save Path:" msgstr "Lagringssti:" #: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282 -#: gui/editgamedialog.cpp:283 gui/options.cpp:1334 gui/options.cpp:1336 -#: gui/options.cpp:1337 +#: gui/editgamedialog.cpp:283 gui/options.cpp:1406 gui/options.cpp:1408 +#: gui/options.cpp:1409 msgid "Specifies where your saved games are put" msgstr "Veljer kor lagra spel vert lagra" -#: gui/editgamedialog.cpp:282 gui/options.cpp:1336 +#: gui/editgamedialog.cpp:282 gui/options.cpp:1408 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:1345 -#: gui/options.cpp:1353 gui/options.cpp:1362 gui/options.cpp:1542 -#: gui/options.cpp:1548 gui/options.cpp:1556 gui/options.cpp:1579 -#: gui/options.cpp:1608 gui/options.cpp:1614 gui/options.cpp:1621 -#: gui/options.cpp:1629 gui/options.cpp:1812 gui/options.cpp:1815 -#: gui/options.cpp:1822 gui/options.cpp:1832 +#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1417 +#: gui/options.cpp:1425 gui/options.cpp:1434 gui/options.cpp:1614 +#: gui/options.cpp:1620 gui/options.cpp:1628 gui/options.cpp:1651 +#: gui/options.cpp:1680 gui/options.cpp:1686 gui/options.cpp:1693 +#: gui/options.cpp:1701 gui/options.cpp:1884 gui/options.cpp:1887 +#: gui/options.cpp:1894 gui/options.cpp:1904 msgctxt "path" msgid "None" msgstr "Ingen" #: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404 -#: gui/editgamedialog.cpp:522 gui/options.cpp:1536 gui/options.cpp:1602 -#: gui/options.cpp:1818 backends/platform/wii/options.cpp:56 +#: gui/editgamedialog.cpp:522 gui/options.cpp:1608 gui/options.cpp:1674 +#: gui/options.cpp:1890 backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/editgamedialog.cpp:450 gui/options.cpp:1826 +#: gui/editgamedialog.cpp:450 gui/options.cpp:1898 msgid "Select SoundFont" msgstr "Vel SoundFont" @@ -406,7 +406,7 @@ msgstr "Vel SoundFont" msgid "Select additional game directory" msgstr "Vel mappe med tileggsdata for spelet" -#: gui/editgamedialog.cpp:502 gui/options.cpp:1749 +#: gui/editgamedialog.cpp:502 gui/options.cpp:1821 msgid "Select directory for saved games" msgstr "Vel mappe for lagra spel" @@ -496,7 +496,7 @@ msgstr "Sinus" msgid "Triangle" msgstr "Triangel" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1370 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1442 msgid "Misc" msgstr "Diverse" @@ -814,106 +814,119 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:289 gui/options.cpp:552 gui/options.cpp:690 -#: gui/options.cpp:759 gui/options.cpp:970 +#: gui/options.cpp:316 gui/options.cpp:598 gui/options.cpp:736 +#: gui/options.cpp:805 gui/options.cpp:1032 msgctxt "soundfont" msgid "None" msgstr "Ingen" -#: gui/options.cpp:456 +#: gui/options.cpp:502 msgid "Failed to apply some of the graphic options changes:" msgstr "Klarte ikkje х aktivere nokre av grafikkvalendringane:" -#: gui/options.cpp:468 +#: gui/options.cpp:514 msgid "the video mode could not be changed." msgstr "Kunne ikkje endre videomodus." -#: gui/options.cpp:474 +#: gui/options.cpp:520 msgid "the aspect ratio setting could not be changed" msgstr "aspektrate-innstillinga kunne ikkje endrast" -#: gui/options.cpp:480 +#: gui/options.cpp:526 msgid "the fullscreen setting could not be changed" msgstr "Fullskjerminstillinga kunne ikkje endrast" -#: gui/options.cpp:486 +#: gui/options.cpp:532 #, fuzzy msgid "the filtering setting could not be changed" msgstr "Fullskjerminstillinga kunne ikkje endrast" -#: gui/options.cpp:842 +#: gui/options.cpp:884 +msgid "Show On-screen control" +msgstr "" + +#: gui/options.cpp:888 +#, fuzzy +msgid "Touchpad mouse mode" +msgstr "Touchpadmodus avslхtt." + +#: gui/options.cpp:892 +msgid "Swap Menu and Back buttons" +msgstr "" + +#: gui/options.cpp:904 msgid "Graphics mode:" msgstr "Grafikkmodus:" -#: gui/options.cpp:856 +#: gui/options.cpp:918 msgid "Render mode:" msgstr "Teiknemodus:" -#: gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:918 gui/options.cpp:919 msgid "Special dithering modes supported by some games" msgstr "Spesielle dithering-modus som stјttast av nokre spel" -#: gui/options.cpp:868 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 +#: gui/options.cpp:930 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2460 msgid "Fullscreen mode" msgstr "Fullskjermsmodus" -#: gui/options.cpp:871 +#: gui/options.cpp:933 #, fuzzy msgid "Filter graphics" msgstr "Grafikk" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Use linear filtering when scaling graphics" msgstr "" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Aspect ratio correction" msgstr "Aspekt-korrigering" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Correct aspect ratio for 320x200 games" msgstr "Rett opp aspekt for 320x200 spel" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Preferred Device:" msgstr "Fјretrukken eining:" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Music Device:" msgstr "Musikkeining:" -#: gui/options.cpp:882 gui/options.cpp:884 +#: gui/options.cpp:944 gui/options.cpp:946 msgid "Specifies preferred sound device or sound card emulator" msgstr "" -#: gui/options.cpp:882 gui/options.cpp:884 gui/options.cpp:885 +#: gui/options.cpp:944 gui/options.cpp:946 gui/options.cpp:947 msgid "Specifies output sound device or sound card emulator" msgstr "" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Music Device:" msgstr "Musikkeining:" -#: gui/options.cpp:911 +#: gui/options.cpp:973 msgid "AdLib emulator:" msgstr "AdLib emulator:" -#: gui/options.cpp:911 gui/options.cpp:912 +#: gui/options.cpp:973 gui/options.cpp:974 msgid "AdLib is used for music in many games" msgstr "AdLib nyttast til musikk i mange spel" -#: gui/options.cpp:922 +#: gui/options.cpp:984 msgid "Output rate:" msgstr "" -#: gui/options.cpp:922 gui/options.cpp:923 +#: gui/options.cpp:984 gui/options.cpp:985 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -921,60 +934,60 @@ msgstr "" "Hјgare verdier gir betre lydkvalitet, men stјttast kanskje ikkje av " "lydkortet ditt" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "GM Device:" msgstr "GM Eining:" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "Specifies default sound device for General MIDI output" msgstr "Veljer standard lydeining for General MIDI avspeling" -#: gui/options.cpp:944 +#: gui/options.cpp:1006 msgid "Don't use General MIDI music" msgstr "Ikkje nytt General MIDI musikk" -#: gui/options.cpp:955 gui/options.cpp:1017 +#: gui/options.cpp:1017 gui/options.cpp:1079 msgid "Use first available device" msgstr "Nytt fјrste tilgjengelege eining" -#: gui/options.cpp:967 +#: gui/options.cpp:1029 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:967 gui/options.cpp:969 gui/options.cpp:970 +#: gui/options.cpp:1029 gui/options.cpp:1031 gui/options.cpp:1032 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "SoundFont stјttast av enkelte lydkort, FluidSynth og Timidity" -#: gui/options.cpp:969 +#: gui/options.cpp:1031 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Mixed AdLib/MIDI mode" msgstr "Blanda AdLib/MIDI-modus" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Use both MIDI and AdLib sound generation" msgstr "Nytt bхe MIDI og AdLib lydskaping" -#: gui/options.cpp:978 +#: gui/options.cpp:1040 msgid "MIDI gain:" msgstr "MIDI gain:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "MT-32 Device:" msgstr "MT-32 Eining:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 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:993 +#: gui/options.cpp:1055 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Ekte Roland MT-32 (deaktiver GM-emulering)" -#: gui/options.cpp:993 gui/options.cpp:995 +#: gui/options.cpp:1055 gui/options.cpp:1057 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -982,303 +995,307 @@ msgstr "" "Vel om du vil nytte din Roland-kompatible lydeining som du har tilkopla " "datamaskina di" -#: gui/options.cpp:995 +#: gui/options.cpp:1057 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Ekte Roland MT-32 (ingen GS-emulering)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" msgstr "" -#: gui/options.cpp:1007 +#: gui/options.cpp:1069 msgid "Don't use Roland MT-32 music" msgstr "Ikkje nytt Roland MT-32 musikk" -#: gui/options.cpp:1034 +#: gui/options.cpp:1096 msgid "Text and Speech:" msgstr "Tekst og Tale:" -#: gui/options.cpp:1038 gui/options.cpp:1048 +#: gui/options.cpp:1100 gui/options.cpp:1110 msgid "Speech" msgstr "Tale" -#: gui/options.cpp:1039 gui/options.cpp:1049 +#: gui/options.cpp:1101 gui/options.cpp:1111 msgid "Subtitles" msgstr "Teksting" -#: gui/options.cpp:1040 +#: gui/options.cpp:1102 msgid "Both" msgstr "Begge" -#: gui/options.cpp:1042 +#: gui/options.cpp:1104 msgid "Subtitle speed:" msgstr "Undertekstfart:" -#: gui/options.cpp:1044 +#: gui/options.cpp:1106 msgctxt "lowres" msgid "Text and Speech:" msgstr "Tekst og Tale:" -#: gui/options.cpp:1048 +#: gui/options.cpp:1110 msgid "Spch" msgstr "Tale" -#: gui/options.cpp:1049 +#: gui/options.cpp:1111 msgid "Subs" msgstr "Tekst" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgctxt "lowres" msgid "Both" msgstr "Bхe" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgid "Show subtitles and play speech" msgstr "Vis teksting og spel av tale" -#: gui/options.cpp:1052 +#: gui/options.cpp:1114 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Undertekstfart:" -#: gui/options.cpp:1068 +#: gui/options.cpp:1130 msgid "Music volume:" msgstr "Musikkvolum:" -#: gui/options.cpp:1070 +#: gui/options.cpp:1132 msgctxt "lowres" msgid "Music volume:" msgstr "Musikkvolum:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1139 msgid "Mute All" msgstr "Demp alle" -#: gui/options.cpp:1080 +#: gui/options.cpp:1142 msgid "SFX volume:" msgstr "Lydeffektvolum:" -#: gui/options.cpp:1080 gui/options.cpp:1082 gui/options.cpp:1083 +#: gui/options.cpp:1142 gui/options.cpp:1144 gui/options.cpp:1145 msgid "Special sound effects volume" msgstr "Spesiallydeffekt volum" -#: gui/options.cpp:1082 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "SFX volume:" msgstr "Lydeffektvolum:" -#: gui/options.cpp:1090 +#: gui/options.cpp:1152 msgid "Speech volume:" msgstr "Talevolum:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1154 msgctxt "lowres" msgid "Speech volume:" msgstr "Talevolum:" -#: gui/options.cpp:1311 +#: gui/options.cpp:1351 +msgid "Control" +msgstr "" + +#: gui/options.cpp:1383 msgid "FluidSynth Settings" msgstr "FluidSynth instillingar" -#: gui/options.cpp:1342 +#: gui/options.cpp:1414 msgid "Theme Path:" msgstr "Temasti:" -#: gui/options.cpp:1344 +#: gui/options.cpp:1416 msgctxt "lowres" msgid "Theme Path:" msgstr "Temasti:" -#: gui/options.cpp:1350 gui/options.cpp:1352 gui/options.cpp:1353 +#: gui/options.cpp:1422 gui/options.cpp:1424 gui/options.cpp:1425 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" -#: gui/options.cpp:1359 +#: gui/options.cpp:1431 msgid "Plugins Path:" msgstr "Pluginsti:" -#: gui/options.cpp:1361 +#: gui/options.cpp:1433 msgctxt "lowres" msgid "Plugins Path:" msgstr "Pluginsti:" -#: gui/options.cpp:1372 +#: gui/options.cpp:1444 msgctxt "lowres" msgid "Misc" msgstr "Div" -#: gui/options.cpp:1374 +#: gui/options.cpp:1446 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1378 +#: gui/options.cpp:1450 msgid "GUI Renderer:" msgstr "GUI-teiknar:" -#: gui/options.cpp:1390 +#: gui/options.cpp:1462 msgid "Autosave:" msgstr "Autolagre:" -#: gui/options.cpp:1392 +#: gui/options.cpp:1464 msgctxt "lowres" msgid "Autosave:" msgstr "Autolagre:" -#: gui/options.cpp:1400 +#: gui/options.cpp:1472 msgid "Keys" msgstr "Tastar" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "GUI Language:" msgstr "GUI-sprхk:" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "Language of ScummVM GUI" msgstr "Sprхk i ScummVM-GUIet" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "Update check:" msgstr "" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "How often to check ScummVM updates" msgstr "" -#: gui/options.cpp:1447 +#: gui/options.cpp:1519 msgid "Check now" msgstr "" -#: gui/options.cpp:1455 +#: gui/options.cpp:1527 msgid "Cloud" msgstr "" -#: gui/options.cpp:1457 +#: gui/options.cpp:1529 msgctxt "lowres" msgid "Cloud" msgstr "" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Storage:" msgstr "" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Active cloud storage" msgstr "" -#: gui/options.cpp:1469 gui/options.cpp:2026 +#: gui/options.cpp:1541 gui/options.cpp:2098 msgid "<none>" msgstr "" -#: gui/options.cpp:1473 backends/platform/wii/options.cpp:114 +#: gui/options.cpp:1545 backends/platform/wii/options.cpp:114 msgid "Username:" msgstr "Brukarnamn:" -#: gui/options.cpp:1473 +#: gui/options.cpp:1545 msgid "Username used by this storage" msgstr "" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Used space:" msgstr "" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Space used by ScummVM's saved games on this storage" msgstr "" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "Last sync time:" msgstr "" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "When the last saved games sync for this storage occured" msgstr "" -#: gui/options.cpp:1482 gui/storagewizarddialog.cpp:71 +#: gui/options.cpp:1554 gui/storagewizarddialog.cpp:71 msgid "Connect" msgstr "" -#: gui/options.cpp:1482 +#: gui/options.cpp:1554 msgid "Open wizard dialog to connect your cloud storage account" msgstr "" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh" msgstr "" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh current cloud storage information (username and usage)" msgstr "" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 #, fuzzy msgid "Download" msgstr "Ned" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Open downloads manager dialog" msgstr "" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run server" msgstr "" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run local webserver" msgstr "" -#: gui/options.cpp:1487 gui/options.cpp:2136 +#: gui/options.cpp:1559 gui/options.cpp:2208 #, fuzzy msgid "Not running" msgstr "Feil under kјyring av spel:" -#: gui/options.cpp:1491 +#: gui/options.cpp:1563 #, fuzzy msgid "/root/ Path:" msgstr "Ekstrasti:" -#: gui/options.cpp:1491 gui/options.cpp:1493 gui/options.cpp:1494 +#: gui/options.cpp:1563 gui/options.cpp:1565 gui/options.cpp:1566 #, fuzzy msgid "Specifies which directory the Files Manager can access" msgstr "Veljer kor lagra spel vert lagra" -#: gui/options.cpp:1493 +#: gui/options.cpp:1565 #, fuzzy msgctxt "lowres" msgid "/root/ Path:" msgstr "Ekstrasti:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 #, fuzzy msgid "Server's port:" msgstr "Teinar:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "" "Which port is used by the server\n" "Auth with server is not available with non-default port" msgstr "" -#: gui/options.cpp:1516 +#: gui/options.cpp:1588 msgid "Apply" msgstr "" -#: gui/options.cpp:1682 +#: gui/options.cpp:1754 #, fuzzy msgid "Failed to change cloud storage!" msgstr "Klarte ikkje lagre spel" -#: gui/options.cpp:1685 +#: gui/options.cpp:1757 msgid "Another cloud storage is already active." msgstr "" -#: gui/options.cpp:1721 +#: gui/options.cpp:1793 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1286,51 +1303,51 @@ msgstr "" "Temaet du har valt stјttar ikkje det aktive sprхket. Om du vil nytte dette " "temaet mх du bytte til eit anna sprхk fјrst." -#: gui/options.cpp:1756 +#: gui/options.cpp:1828 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:1765 +#: gui/options.cpp:1837 msgid "Select directory for GUI themes" msgstr "Vel ei mappe for GUI-tema" -#: gui/options.cpp:1775 +#: gui/options.cpp:1847 msgid "Select directory for extra files" msgstr "Vel ei mappe for ekstra filer" -#: gui/options.cpp:1786 +#: gui/options.cpp:1858 msgid "Select directory for plugins" msgstr "Vel ei mappe for plugins" -#: gui/options.cpp:1798 +#: gui/options.cpp:1870 #, fuzzy msgid "Select directory for Files Manager /root/" msgstr "Vel ei mappe for ekstra filer" -#: gui/options.cpp:2033 +#: gui/options.cpp:2105 #, c-format msgid "%llu bytes" msgstr "" -#: gui/options.cpp:2041 +#: gui/options.cpp:2113 msgid "<right now>" msgstr "" -#: gui/options.cpp:2043 +#: gui/options.cpp:2115 #, fuzzy msgid "<never>" msgstr "Aldri" -#: gui/options.cpp:2127 +#: gui/options.cpp:2199 #, fuzzy msgid "Stop server" msgstr "Teinar:" -#: gui/options.cpp:2128 +#: gui/options.cpp:2200 msgid "Stop local webserver" msgstr "" -#: gui/options.cpp:2219 +#: gui/options.cpp:2291 msgid "" "Request failed.\n" "Check your Internet connection." diff --git a/po/pl_PL.po b/po/pl_PL.po index cc9cf823cd..295b9cb5ee 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-02-11 08:56+0100\n" +"POT-Creation-Date: 2017-02-21 23:29+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:1515 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69 +#: gui/options.cpp:1587 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:443 #: gui/saveload-dialog.cpp:717 gui/saveload-dialog.cpp:1111 @@ -160,7 +160,7 @@ msgstr "" #: gui/downloaddialog.cpp:146 gui/editgamedialog.cpp:293 #: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:522 -#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1517 +#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1589 #: gui/saveload-dialog.cpp:1112 engines/engine.cpp:477 engines/engine.cpp:488 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 @@ -244,7 +244,7 @@ msgid "" msgstr "Jъzyk gry. Nie zmieni to hiszpaёskiej wersji gry w angielskБ" #: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:121 -#: gui/options.cpp:845 gui/options.cpp:858 gui/options.cpp:1410 +#: gui/options.cpp:907 gui/options.cpp:920 gui/options.cpp:1482 #: audio/null.cpp:41 msgid "<default>" msgstr "<domyЖlne>" @@ -267,11 +267,11 @@ msgstr "Platforma:" msgid "Engine" msgstr "Silnik" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "Graphics" msgstr "Grafika" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "GFX" msgstr "Grafika" @@ -284,7 +284,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "UПyj wГasnych ustawieё grafiki" -#: gui/editgamedialog.cpp:196 gui/options.cpp:1292 +#: gui/editgamedialog.cpp:196 gui/options.cpp:1364 msgid "Audio" msgstr "DМwiъk" @@ -297,11 +297,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "UПyj wГasnych ustawieё dМwiъku" -#: gui/editgamedialog.cpp:210 gui/options.cpp:1297 +#: gui/editgamedialog.cpp:210 gui/options.cpp:1369 msgid "Volume" msgstr "GГoЖnoЖц" -#: gui/editgamedialog.cpp:212 gui/options.cpp:1299 +#: gui/editgamedialog.cpp:212 gui/options.cpp:1371 msgctxt "lowres" msgid "Volume" msgstr "GГoЖnoЖц" @@ -315,7 +315,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:1307 +#: gui/editgamedialog.cpp:226 gui/options.cpp:1379 msgid "MIDI" msgstr "MIDI" @@ -328,7 +328,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "UПyj wГasnych ustawieё MIDI" -#: gui/editgamedialog.cpp:241 gui/options.cpp:1317 +#: gui/editgamedialog.cpp:241 gui/options.cpp:1389 msgid "MT-32" msgstr "MT-32" @@ -341,11 +341,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "UПyj wГasnych ustawieё MT-32" -#: gui/editgamedialog.cpp:255 gui/options.cpp:1324 +#: gui/editgamedialog.cpp:255 gui/options.cpp:1396 msgid "Paths" msgstr "ІcieПki" -#: gui/editgamedialog.cpp:257 gui/options.cpp:1326 +#: gui/editgamedialog.cpp:257 gui/options.cpp:1398 msgctxt "lowres" msgid "Paths" msgstr "ІcieПki" @@ -359,7 +359,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "ІcieПka gry:" -#: gui/editgamedialog.cpp:271 gui/options.cpp:1350 +#: gui/editgamedialog.cpp:271 gui/options.cpp:1422 msgid "Extra Path:" msgstr "Іc. dodatkѓw:" @@ -368,44 +368,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:1352 +#: gui/editgamedialog.cpp:273 gui/options.cpp:1424 msgctxt "lowres" msgid "Extra Path:" msgstr "Іc. dodatkѓw:" -#: gui/editgamedialog.cpp:280 gui/options.cpp:1334 +#: gui/editgamedialog.cpp:280 gui/options.cpp:1406 msgid "Save Path:" msgstr "ІcieПka zapisѓw:" #: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282 -#: gui/editgamedialog.cpp:283 gui/options.cpp:1334 gui/options.cpp:1336 -#: gui/options.cpp:1337 +#: gui/editgamedialog.cpp:283 gui/options.cpp:1406 gui/options.cpp:1408 +#: gui/options.cpp:1409 msgid "Specifies where your saved games are put" msgstr "OkreЖla gdzie zapisywaц stan gry" -#: gui/editgamedialog.cpp:282 gui/options.cpp:1336 +#: gui/editgamedialog.cpp:282 gui/options.cpp:1408 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:1345 -#: gui/options.cpp:1353 gui/options.cpp:1362 gui/options.cpp:1542 -#: gui/options.cpp:1548 gui/options.cpp:1556 gui/options.cpp:1579 -#: gui/options.cpp:1608 gui/options.cpp:1614 gui/options.cpp:1621 -#: gui/options.cpp:1629 gui/options.cpp:1812 gui/options.cpp:1815 -#: gui/options.cpp:1822 gui/options.cpp:1832 +#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1417 +#: gui/options.cpp:1425 gui/options.cpp:1434 gui/options.cpp:1614 +#: gui/options.cpp:1620 gui/options.cpp:1628 gui/options.cpp:1651 +#: gui/options.cpp:1680 gui/options.cpp:1686 gui/options.cpp:1693 +#: gui/options.cpp:1701 gui/options.cpp:1884 gui/options.cpp:1887 +#: gui/options.cpp:1894 gui/options.cpp:1904 msgctxt "path" msgid "None" msgstr "Brak" #: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404 -#: gui/editgamedialog.cpp:522 gui/options.cpp:1536 gui/options.cpp:1602 -#: gui/options.cpp:1818 backends/platform/wii/options.cpp:56 +#: gui/editgamedialog.cpp:522 gui/options.cpp:1608 gui/options.cpp:1674 +#: gui/options.cpp:1890 backends/platform/wii/options.cpp:56 msgid "Default" msgstr "DomyЖlnie" -#: gui/editgamedialog.cpp:450 gui/options.cpp:1826 +#: gui/editgamedialog.cpp:450 gui/options.cpp:1898 msgid "Select SoundFont" msgstr "Wybierz SoundFont" @@ -413,7 +413,7 @@ msgstr "Wybierz SoundFont" msgid "Select additional game directory" msgstr "Wybierz dodatkowy katalog gry" -#: gui/editgamedialog.cpp:502 gui/options.cpp:1749 +#: gui/editgamedialog.cpp:502 gui/options.cpp:1821 msgid "Select directory for saved games" msgstr "Wybierz katalog dla zapisѓw" @@ -505,7 +505,7 @@ msgstr "Sinus" msgid "Triangle" msgstr "TrѓjkБt" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1370 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1442 msgid "Misc" msgstr "RѓПne" @@ -821,104 +821,117 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:289 gui/options.cpp:552 gui/options.cpp:690 -#: gui/options.cpp:759 gui/options.cpp:970 +#: gui/options.cpp:316 gui/options.cpp:598 gui/options.cpp:736 +#: gui/options.cpp:805 gui/options.cpp:1032 msgctxt "soundfont" msgid "None" msgstr "Brak" -#: gui/options.cpp:456 +#: gui/options.cpp:502 msgid "Failed to apply some of the graphic options changes:" msgstr "Nie udaГo siъ zastosowaц czъЖci zmian opcji grafiki:" -#: gui/options.cpp:468 +#: gui/options.cpp:514 msgid "the video mode could not be changed." msgstr "nie udaГo siъ zmieniц trybu wideo." -#: gui/options.cpp:474 +#: gui/options.cpp:520 msgid "the aspect ratio setting could not be changed" msgstr "nie udaГo siъ zmieniц formatu obrazu" -#: gui/options.cpp:480 +#: gui/options.cpp:526 msgid "the fullscreen setting could not be changed" msgstr "nie udaГo siъ zmieniц trybu peГnoekranowego" -#: gui/options.cpp:486 +#: gui/options.cpp:532 msgid "the filtering setting could not be changed" msgstr "nie udaГo siъ zmieniц trybu filtrowania" -#: gui/options.cpp:842 +#: gui/options.cpp:884 +msgid "Show On-screen control" +msgstr "" + +#: gui/options.cpp:888 +#, fuzzy +msgid "Touchpad mouse mode" +msgstr "Tryb touchpada wyГБczony." + +#: gui/options.cpp:892 +msgid "Swap Menu and Back buttons" +msgstr "" + +#: gui/options.cpp:904 msgid "Graphics mode:" msgstr "Tryb grafiki:" -#: gui/options.cpp:856 +#: gui/options.cpp:918 msgid "Render mode:" msgstr "Renderer:" -#: gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:918 gui/options.cpp:919 msgid "Special dithering modes supported by some games" msgstr "Specjalne tryby ditheringu wspierane przez niektѓre gry" -#: gui/options.cpp:868 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 +#: gui/options.cpp:930 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2460 msgid "Fullscreen mode" msgstr "PeГny ekran" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Filter graphics" msgstr "Filtrowanie obrazu" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Use linear filtering when scaling graphics" msgstr "UПywa filtrowania dwuliniowego przy skalowaniu obrazu" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Aspect ratio correction" msgstr "Korekcja formatu obrazu" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Correct aspect ratio for 320x200 games" msgstr "Korekcja formatu obrazu dla gier 320x200" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Preferred Device:" msgstr "Pref. urzБdzenie:" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Music Device:" msgstr "Urz. muzyczne:" -#: gui/options.cpp:882 gui/options.cpp:884 +#: gui/options.cpp:944 gui/options.cpp:946 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:882 gui/options.cpp:884 gui/options.cpp:885 +#: gui/options.cpp:944 gui/options.cpp:946 gui/options.cpp:947 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:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Pref. urzБdzenie:" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Music Device:" msgstr "Urz. muzyczne:" -#: gui/options.cpp:911 +#: gui/options.cpp:973 msgid "AdLib emulator:" msgstr "Emulator AdLib:" -#: gui/options.cpp:911 gui/options.cpp:912 +#: gui/options.cpp:973 gui/options.cpp:974 msgid "AdLib is used for music in many games" msgstr "AdLib jest uПywany do muzyki w wielu grach" -#: gui/options.cpp:922 +#: gui/options.cpp:984 msgid "Output rate:" msgstr "Czъst. wyj.:" -#: gui/options.cpp:922 gui/options.cpp:923 +#: gui/options.cpp:984 gui/options.cpp:985 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -926,63 +939,63 @@ msgstr "" "WyПsze wartoЖci dajБ lepszБ jakoЖц dМwiъku, ale mogБ byц nieobsГugiwane " "przez twojБ kartъ dМwiъkowБ" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "GM Device:" msgstr "UrzБdzenie GM:" -#: gui/options.cpp:933 +#: gui/options.cpp:995 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:944 +#: gui/options.cpp:1006 msgid "Don't use General MIDI music" msgstr "Nie uПywaj muzyki General MIDI" -#: gui/options.cpp:955 gui/options.cpp:1017 +#: gui/options.cpp:1017 gui/options.cpp:1079 msgid "Use first available device" msgstr "UПyj pierwszego dostъpnego urzБdzenia" -#: gui/options.cpp:967 +#: gui/options.cpp:1029 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:967 gui/options.cpp:969 gui/options.cpp:970 +#: gui/options.cpp:1029 gui/options.cpp:1031 gui/options.cpp:1032 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:969 +#: gui/options.cpp:1031 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Mixed AdLib/MIDI mode" msgstr "Tryb miksowanego AdLib/MIDI" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 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:978 +#: gui/options.cpp:1040 msgid "MIDI gain:" msgstr "Wzm. MIDI:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "MT-32 Device:" msgstr "UrzБdzenie MT-32:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 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:993 +#: gui/options.cpp:1055 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Prawdziwy Roland MT-32 (wyГБcz emulacjъ GM)" -#: gui/options.cpp:993 gui/options.cpp:995 +#: gui/options.cpp:1055 gui/options.cpp:1057 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -990,16 +1003,16 @@ msgstr "" "Zaznacz, jeЖli chcesz uПywaц swojej prawdziwej karty kompatybilnej z Roland " "podГБczonej do twojego komputera" -#: gui/options.cpp:995 +#: gui/options.cpp:1057 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Prawdziwy Roland MT-32 (brak emulacji GM)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland w trybie GS (wГБcz mapowanie MT-32)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -1007,265 +1020,270 @@ msgstr "" "Zaznacz, jeЖli chcesz wГБczyц Гatki mapowania pozwalajБce na emulacjъ MT-32 " "na urzБdzeniu Roland GS" -#: gui/options.cpp:1007 +#: gui/options.cpp:1069 msgid "Don't use Roland MT-32 music" msgstr "Nie uПywaj muzyki Roland MT-32" -#: gui/options.cpp:1034 +#: gui/options.cpp:1096 msgid "Text and Speech:" msgstr "Tekst i mowa:" -#: gui/options.cpp:1038 gui/options.cpp:1048 +#: gui/options.cpp:1100 gui/options.cpp:1110 msgid "Speech" msgstr "Mowa" -#: gui/options.cpp:1039 gui/options.cpp:1049 +#: gui/options.cpp:1101 gui/options.cpp:1111 msgid "Subtitles" msgstr "Napisy" -#: gui/options.cpp:1040 +#: gui/options.cpp:1102 msgid "Both" msgstr "Oba" -#: gui/options.cpp:1042 +#: gui/options.cpp:1104 msgid "Subtitle speed:" msgstr "Prъd. napisѓw:" -#: gui/options.cpp:1044 +#: gui/options.cpp:1106 msgctxt "lowres" msgid "Text and Speech:" msgstr "Tekst i mowa:" -#: gui/options.cpp:1048 +#: gui/options.cpp:1110 msgid "Spch" msgstr "Mowa" -#: gui/options.cpp:1049 +#: gui/options.cpp:1111 msgid "Subs" msgstr "Napisy" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgctxt "lowres" msgid "Both" msgstr "Oba" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgid "Show subtitles and play speech" msgstr "WyЖwietlaj napisy i odtwarzaj mowъ" -#: gui/options.cpp:1052 +#: gui/options.cpp:1114 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Prъd. napisѓw:" -#: gui/options.cpp:1068 +#: gui/options.cpp:1130 msgid "Music volume:" msgstr "GГoЖnoЖц muzyki:" -#: gui/options.cpp:1070 +#: gui/options.cpp:1132 msgctxt "lowres" msgid "Music volume:" msgstr "GГoЖnoЖц muzyki:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1139 msgid "Mute All" msgstr "Wycisz" -#: gui/options.cpp:1080 +#: gui/options.cpp:1142 msgid "SFX volume:" msgstr "GГ. efekt. dМw.:" -#: gui/options.cpp:1080 gui/options.cpp:1082 gui/options.cpp:1083 +#: gui/options.cpp:1142 gui/options.cpp:1144 gui/options.cpp:1145 msgid "Special sound effects volume" msgstr "GГoЖnoЖц efektѓw dМw." -#: gui/options.cpp:1082 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "SFX volume:" msgstr "GГ. efekt. dМw.:" -#: gui/options.cpp:1090 +#: gui/options.cpp:1152 msgid "Speech volume:" msgstr "GГoЖnoЖц mowy:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1154 msgctxt "lowres" msgid "Speech volume:" msgstr "GГoЖnoЖц mowy:" -#: gui/options.cpp:1311 +#: gui/options.cpp:1351 +#, fuzzy +msgid "Control" +msgstr "Steruj myszkБ" + +#: gui/options.cpp:1383 msgid "FluidSynth Settings" msgstr "Ustawienia FluidSynth" -#: gui/options.cpp:1342 +#: gui/options.cpp:1414 msgid "Theme Path:" msgstr "ІcieПka stylu:" -#: gui/options.cpp:1344 +#: gui/options.cpp:1416 msgctxt "lowres" msgid "Theme Path:" msgstr "ІcieПka stylu:" -#: gui/options.cpp:1350 gui/options.cpp:1352 gui/options.cpp:1353 +#: gui/options.cpp:1422 gui/options.cpp:1424 gui/options.cpp:1425 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:1359 +#: gui/options.cpp:1431 msgid "Plugins Path:" msgstr "ІcieПka wtyczek:" -#: gui/options.cpp:1361 +#: gui/options.cpp:1433 msgctxt "lowres" msgid "Plugins Path:" msgstr "ІcieПka wtyczek:" -#: gui/options.cpp:1372 +#: gui/options.cpp:1444 msgctxt "lowres" msgid "Misc" msgstr "RѓПne" -#: gui/options.cpp:1374 +#: gui/options.cpp:1446 msgid "Theme:" msgstr "Styl:" -#: gui/options.cpp:1378 +#: gui/options.cpp:1450 msgid "GUI Renderer:" msgstr "Renderer interf.:" -#: gui/options.cpp:1390 +#: gui/options.cpp:1462 msgid "Autosave:" msgstr "Autozapis:" -#: gui/options.cpp:1392 +#: gui/options.cpp:1464 msgctxt "lowres" msgid "Autosave:" msgstr "Autozapis:" -#: gui/options.cpp:1400 +#: gui/options.cpp:1472 msgid "Keys" msgstr "Klawisze" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "GUI Language:" msgstr "Jъzyk interfejsu:" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "Language of ScummVM GUI" msgstr "Jъzyk interfejsu ScummVM" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "Update check:" msgstr "SprawdМ aktualizacje:" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "How often to check ScummVM updates" msgstr "CzъstotliwoЖц automatycznego wyszukiwania aktualizacji ScummVM" -#: gui/options.cpp:1447 +#: gui/options.cpp:1519 msgid "Check now" msgstr "SprawdМ teraz" -#: gui/options.cpp:1455 +#: gui/options.cpp:1527 msgid "Cloud" msgstr "Chmura" -#: gui/options.cpp:1457 +#: gui/options.cpp:1529 msgctxt "lowres" msgid "Cloud" msgstr "Chmura" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Storage:" msgstr "Dostawca:" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Active cloud storage" msgstr "Wybrany dostawca przechowywania w chmurze" -#: gui/options.cpp:1469 gui/options.cpp:2026 +#: gui/options.cpp:1541 gui/options.cpp:2098 msgid "<none>" msgstr "<brak>" -#: gui/options.cpp:1473 backends/platform/wii/options.cpp:114 +#: gui/options.cpp:1545 backends/platform/wii/options.cpp:114 msgid "Username:" msgstr "Nazwa uПytkownika:" -#: gui/options.cpp:1473 +#: gui/options.cpp:1545 msgid "Username used by this storage" msgstr "Nazwa uПytkownika w tej usГudze" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Used space:" msgstr "UПywane miejsce:" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 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:1479 +#: gui/options.cpp:1551 msgid "Last sync time:" msgstr "Ostatnia synchronizacja:" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 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:1482 gui/storagewizarddialog.cpp:71 +#: gui/options.cpp:1554 gui/storagewizarddialog.cpp:71 msgid "Connect" msgstr "PoГБcz" -#: gui/options.cpp:1482 +#: gui/options.cpp:1554 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:1483 +#: gui/options.cpp:1555 msgid "Refresh" msgstr "OdЖwieП" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 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:1484 +#: gui/options.cpp:1556 msgid "Download" msgstr "Pobierz" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Open downloads manager dialog" msgstr "Otwiera okno dialogowe zarzБdzania pobieraniem" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run server" msgstr "Uruchom serwer" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run local webserver" msgstr "Uruchamia lokalny serwer WWW" -#: gui/options.cpp:1487 gui/options.cpp:2136 +#: gui/options.cpp:1559 gui/options.cpp:2208 msgid "Not running" msgstr "Nie uruchomiono" -#: gui/options.cpp:1491 +#: gui/options.cpp:1563 msgid "/root/ Path:" msgstr "ІcieПka bazowa:" -#: gui/options.cpp:1491 gui/options.cpp:1493 gui/options.cpp:1494 +#: gui/options.cpp:1563 gui/options.cpp:1565 gui/options.cpp:1566 msgid "Specifies which directory the Files Manager can access" msgstr "OkreЖla ЖcieПkъ gГѓwnБ dla menedПera plikѓw" -#: gui/options.cpp:1493 +#: gui/options.cpp:1565 msgctxt "lowres" msgid "/root/ Path:" msgstr "GГѓwna /:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "Server's port:" msgstr "Port:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "" "Which port is used by the server\n" "Auth with server is not available with non-default port" @@ -1273,19 +1291,19 @@ msgstr "" "OkreЖla port uПywany do komunikacji z serwerem.\n" "(Uwierzytelnianie jest dostъpne jedynie na domyЖlnym porcie.)" -#: gui/options.cpp:1516 +#: gui/options.cpp:1588 msgid "Apply" msgstr "Zastosuj" -#: gui/options.cpp:1682 +#: gui/options.cpp:1754 msgid "Failed to change cloud storage!" msgstr "Nie udaГo siъ zmieniц dostawcy przechowywania!" -#: gui/options.cpp:1685 +#: gui/options.cpp:1757 msgid "Another cloud storage is already active." msgstr "Inna usГuga przechowywania jest juП aktywna." -#: gui/options.cpp:1721 +#: gui/options.cpp:1793 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1293,48 +1311,48 @@ msgstr "" "Wybrany styl nie obsГuguje obecnego jъzyka. JeЖli chcesz go uПywaц, zmieё " "najpierw swѓj jъzyk." -#: gui/options.cpp:1756 +#: gui/options.cpp:1828 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Ten katalog jest zabezpieczony przed zapisem. Wybierz inny." -#: gui/options.cpp:1765 +#: gui/options.cpp:1837 msgid "Select directory for GUI themes" msgstr "Wybierz katalog dla stylѓw GUI" -#: gui/options.cpp:1775 +#: gui/options.cpp:1847 msgid "Select directory for extra files" msgstr "Wybierz katalog dla dodatkowych plikѓw" -#: gui/options.cpp:1786 +#: gui/options.cpp:1858 msgid "Select directory for plugins" msgstr "Wybierz katalog dla wtyczek" -#: gui/options.cpp:1798 +#: gui/options.cpp:1870 msgid "Select directory for Files Manager /root/" msgstr "Wybierz gГѓwny katalog dla menedПera plikѓw" -#: gui/options.cpp:2033 +#: gui/options.cpp:2105 #, c-format msgid "%llu bytes" msgstr "%llu B" -#: gui/options.cpp:2041 +#: gui/options.cpp:2113 msgid "<right now>" msgstr "<teraz>" -#: gui/options.cpp:2043 +#: gui/options.cpp:2115 msgid "<never>" msgstr "<nigdy>" -#: gui/options.cpp:2127 +#: gui/options.cpp:2199 msgid "Stop server" msgstr "Zatrzymaj serwer" -#: gui/options.cpp:2128 +#: gui/options.cpp:2200 msgid "Stop local webserver" msgstr "Zatrzymuje lokalny serwer WWW" -#: gui/options.cpp:2219 +#: gui/options.cpp:2291 msgid "" "Request failed.\n" "Check your Internet connection." diff --git a/po/pt_BR.po b/po/pt_BR.po index a48c742162..6994a58b8b 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-02-11 08:56+0100\n" +"POT-Creation-Date: 2017-02-21 23:29+0100\n" "PO-Revision-Date: 2016-12-22 21:50+0000\n" "Last-Translator: Alexandre Folle de Menezes <afmenez@terra.com.br>\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:1515 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69 +#: gui/options.cpp:1587 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:443 #: gui/saveload-dialog.cpp:717 gui/saveload-dialog.cpp:1111 @@ -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:522 -#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1517 +#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1589 #: gui/saveload-dialog.cpp:1112 engines/engine.cpp:477 engines/engine.cpp:488 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 @@ -241,7 +241,7 @@ msgid "" 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:121 -#: gui/options.cpp:845 gui/options.cpp:858 gui/options.cpp:1410 +#: gui/options.cpp:907 gui/options.cpp:920 gui/options.cpp:1482 #: audio/null.cpp:41 msgid "<default>" msgstr "<padrуo>" @@ -265,11 +265,11 @@ msgstr "Sistema:" msgid "Engine" msgstr "Examinar" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "Graphics" msgstr "Grсficos" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "GFX" msgstr "GFX" @@ -282,7 +282,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Sobrepor configuraчуo global de grсficos" -#: gui/editgamedialog.cpp:196 gui/options.cpp:1292 +#: gui/editgamedialog.cpp:196 gui/options.cpp:1364 msgid "Audio" msgstr "Сudio" @@ -295,11 +295,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Sobrepor configuraчуo global de сudio" -#: gui/editgamedialog.cpp:210 gui/options.cpp:1297 +#: gui/editgamedialog.cpp:210 gui/options.cpp:1369 msgid "Volume" msgstr "Volume" -#: gui/editgamedialog.cpp:212 gui/options.cpp:1299 +#: gui/editgamedialog.cpp:212 gui/options.cpp:1371 msgctxt "lowres" msgid "Volume" msgstr "Volume" @@ -313,7 +313,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Sobrepor configuraчуo global de volume" -#: gui/editgamedialog.cpp:226 gui/options.cpp:1307 +#: gui/editgamedialog.cpp:226 gui/options.cpp:1379 msgid "MIDI" msgstr "MIDI" @@ -326,7 +326,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Sobrepor configuraчуo global de MIDI" -#: gui/editgamedialog.cpp:241 gui/options.cpp:1317 +#: gui/editgamedialog.cpp:241 gui/options.cpp:1389 msgid "MT-32" msgstr "MT-32" @@ -339,11 +339,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Sobrepor configuraчуo global de MT-32" -#: gui/editgamedialog.cpp:255 gui/options.cpp:1324 +#: gui/editgamedialog.cpp:255 gui/options.cpp:1396 msgid "Paths" msgstr "Pastas" -#: gui/editgamedialog.cpp:257 gui/options.cpp:1326 +#: gui/editgamedialog.cpp:257 gui/options.cpp:1398 msgctxt "lowres" msgid "Paths" msgstr "Pastas" @@ -357,7 +357,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Pasta do Jogo:" -#: gui/editgamedialog.cpp:271 gui/options.cpp:1350 +#: gui/editgamedialog.cpp:271 gui/options.cpp:1422 msgid "Extra Path:" msgstr "Pasta de Extras:" @@ -366,44 +366,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:1352 +#: gui/editgamedialog.cpp:273 gui/options.cpp:1424 msgctxt "lowres" msgid "Extra Path:" msgstr "Pasta de Extras:" -#: gui/editgamedialog.cpp:280 gui/options.cpp:1334 +#: gui/editgamedialog.cpp:280 gui/options.cpp:1406 msgid "Save Path:" msgstr "Pasta para Salvar:" #: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282 -#: gui/editgamedialog.cpp:283 gui/options.cpp:1334 gui/options.cpp:1336 -#: gui/options.cpp:1337 +#: gui/editgamedialog.cpp:283 gui/options.cpp:1406 gui/options.cpp:1408 +#: gui/options.cpp:1409 msgid "Specifies where your saved games are put" msgstr "Especifique onde guardar seus jogos salvos" -#: gui/editgamedialog.cpp:282 gui/options.cpp:1336 +#: gui/editgamedialog.cpp:282 gui/options.cpp:1408 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:1345 -#: gui/options.cpp:1353 gui/options.cpp:1362 gui/options.cpp:1542 -#: gui/options.cpp:1548 gui/options.cpp:1556 gui/options.cpp:1579 -#: gui/options.cpp:1608 gui/options.cpp:1614 gui/options.cpp:1621 -#: gui/options.cpp:1629 gui/options.cpp:1812 gui/options.cpp:1815 -#: gui/options.cpp:1822 gui/options.cpp:1832 +#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1417 +#: gui/options.cpp:1425 gui/options.cpp:1434 gui/options.cpp:1614 +#: gui/options.cpp:1620 gui/options.cpp:1628 gui/options.cpp:1651 +#: gui/options.cpp:1680 gui/options.cpp:1686 gui/options.cpp:1693 +#: gui/options.cpp:1701 gui/options.cpp:1884 gui/options.cpp:1887 +#: gui/options.cpp:1894 gui/options.cpp:1904 msgctxt "path" msgid "None" msgstr "Nenhum(a)" #: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404 -#: gui/editgamedialog.cpp:522 gui/options.cpp:1536 gui/options.cpp:1602 -#: gui/options.cpp:1818 backends/platform/wii/options.cpp:56 +#: gui/editgamedialog.cpp:522 gui/options.cpp:1608 gui/options.cpp:1674 +#: gui/options.cpp:1890 backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Padrуo" -#: gui/editgamedialog.cpp:450 gui/options.cpp:1826 +#: gui/editgamedialog.cpp:450 gui/options.cpp:1898 msgid "Select SoundFont" msgstr "Selecione o SoundFont" @@ -411,7 +411,7 @@ msgstr "Selecione o SoundFont" msgid "Select additional game directory" msgstr "Selecione a pasta adicional do jogo" -#: gui/editgamedialog.cpp:502 gui/options.cpp:1749 +#: gui/editgamedialog.cpp:502 gui/options.cpp:1821 msgid "Select directory for saved games" msgstr "Selecione a pasta para os jogos salvos" @@ -505,7 +505,7 @@ msgstr "" msgid "Triangle" msgstr "" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1370 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1442 msgid "Misc" msgstr "Outros" @@ -833,106 +833,119 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:289 gui/options.cpp:552 gui/options.cpp:690 -#: gui/options.cpp:759 gui/options.cpp:970 +#: gui/options.cpp:316 gui/options.cpp:598 gui/options.cpp:736 +#: gui/options.cpp:805 gui/options.cpp:1032 msgctxt "soundfont" msgid "None" msgstr "Nenhum(a)" -#: gui/options.cpp:456 +#: gui/options.cpp:502 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:468 +#: gui/options.cpp:514 msgid "the video mode could not be changed." msgstr "o modo de vэdeo nуo pєde ser alterado." -#: gui/options.cpp:474 +#: gui/options.cpp:520 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:480 +#: gui/options.cpp:526 msgid "the fullscreen setting could not be changed" msgstr "a configuraчуo de tela cheia nуo pєde ser mudada" -#: gui/options.cpp:486 +#: gui/options.cpp:532 #, 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:842 +#: gui/options.cpp:884 +msgid "Show On-screen control" +msgstr "" + +#: gui/options.cpp:888 +#, fuzzy +msgid "Touchpad mouse mode" +msgstr "Modo Touchpad desligado." + +#: gui/options.cpp:892 +msgid "Swap Menu and Back buttons" +msgstr "" + +#: gui/options.cpp:904 msgid "Graphics mode:" msgstr "Modo grсfico:" -#: gui/options.cpp:856 +#: gui/options.cpp:918 msgid "Render mode:" msgstr "Renderizaчуo:" -#: gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:918 gui/options.cpp:919 msgid "Special dithering modes supported by some games" msgstr "Modos especiais de dithering suportados por alguns jogos" -#: gui/options.cpp:868 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 +#: gui/options.cpp:930 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2460 msgid "Fullscreen mode" msgstr "Modo Tela Cheia" -#: gui/options.cpp:871 +#: gui/options.cpp:933 #, fuzzy msgid "Filter graphics" msgstr "Grсficos" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Use linear filtering when scaling graphics" msgstr "" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Aspect ratio correction" msgstr "Correчуo de proporчуo" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Correct aspect ratio for 320x200 games" msgstr "Correчуo de proporчуo para jogos 320x200" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Preferred Device:" msgstr "Dispositivo pref.:" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Music Device:" msgstr "Disp. de mњsica:" -#: gui/options.cpp:882 gui/options.cpp:884 +#: gui/options.cpp:944 gui/options.cpp:946 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:882 gui/options.cpp:884 gui/options.cpp:885 +#: gui/options.cpp:944 gui/options.cpp:946 gui/options.cpp:947 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:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Dispositivo pref.:" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Music Device:" msgstr "Dispositivo de mњsica:" -#: gui/options.cpp:911 +#: gui/options.cpp:973 msgid "AdLib emulator:" msgstr "Emulador AdLib:" -#: gui/options.cpp:911 gui/options.cpp:912 +#: gui/options.cpp:973 gui/options.cpp:974 msgid "AdLib is used for music in many games" msgstr "AdLib щ utilizado para mњsica em vсrios jogos" -#: gui/options.cpp:922 +#: gui/options.cpp:984 msgid "Output rate:" msgstr "Taxa de saэda:" -#: gui/options.cpp:922 gui/options.cpp:923 +#: gui/options.cpp:984 gui/options.cpp:985 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -940,62 +953,62 @@ msgstr "" "Maior valor especifica melhor qualidade de som, mas pode nуo ser suportado " "por sua placa de som" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "GM Device:" msgstr "Dispositivo GM:" -#: gui/options.cpp:933 +#: gui/options.cpp:995 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:944 +#: gui/options.cpp:1006 msgid "Don't use General MIDI music" msgstr "Nуo usar mњsica General MIDI" -#: gui/options.cpp:955 gui/options.cpp:1017 +#: gui/options.cpp:1017 gui/options.cpp:1079 msgid "Use first available device" msgstr "Usar o primeiro dispositivo disponэvel" -#: gui/options.cpp:967 +#: gui/options.cpp:1029 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:967 gui/options.cpp:969 gui/options.cpp:970 +#: gui/options.cpp:1029 gui/options.cpp:1031 gui/options.cpp:1032 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:969 +#: gui/options.cpp:1031 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Mixed AdLib/MIDI mode" msgstr "Mixar AdLib/MIDI" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Use both MIDI and AdLib sound generation" msgstr "Usar MIDI e AdLib juntos na geraчуo de som" -#: gui/options.cpp:978 +#: gui/options.cpp:1040 msgid "MIDI gain:" msgstr "Ganho MIDI:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "MT-32 Device:" msgstr "Dispositivo MT-32:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 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:993 +#: gui/options.cpp:1055 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Roland MT-32 real (desligar emulaчуo GM)" -#: gui/options.cpp:993 gui/options.cpp:995 +#: gui/options.cpp:1055 gui/options.cpp:1057 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -1003,306 +1016,311 @@ msgstr "" "Verifique se vocъ quer usar o seu dispositivo de hardware de som compatэvel " "com Roland" -#: gui/options.cpp:995 +#: gui/options.cpp:1057 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Roland MT-32 real (sem emulaчуo GM)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 #, fuzzy msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland MT-32 real (desligar emulaчуo GM)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" msgstr "" -#: gui/options.cpp:1007 +#: gui/options.cpp:1069 msgid "Don't use Roland MT-32 music" msgstr "Nуo usar mњsica Roland MT-32" -#: gui/options.cpp:1034 +#: gui/options.cpp:1096 msgid "Text and Speech:" msgstr "Texto e Voz:" -#: gui/options.cpp:1038 gui/options.cpp:1048 +#: gui/options.cpp:1100 gui/options.cpp:1110 msgid "Speech" msgstr "Voz" -#: gui/options.cpp:1039 gui/options.cpp:1049 +#: gui/options.cpp:1101 gui/options.cpp:1111 msgid "Subtitles" msgstr "Legendas" -#: gui/options.cpp:1040 +#: gui/options.cpp:1102 msgid "Both" msgstr "Ambos" -#: gui/options.cpp:1042 +#: gui/options.cpp:1104 msgid "Subtitle speed:" msgstr "Rapidez legendas:" -#: gui/options.cpp:1044 +#: gui/options.cpp:1106 msgctxt "lowres" msgid "Text and Speech:" msgstr "Texto e Voz:" -#: gui/options.cpp:1048 +#: gui/options.cpp:1110 msgid "Spch" msgstr "Voz" -#: gui/options.cpp:1049 +#: gui/options.cpp:1111 msgid "Subs" msgstr "Legs" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgctxt "lowres" msgid "Both" msgstr "Ambos" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgid "Show subtitles and play speech" msgstr "Mostrar legenda e vozes (dublagem)" -#: gui/options.cpp:1052 +#: gui/options.cpp:1114 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Velocidade das legendas:" -#: gui/options.cpp:1068 +#: gui/options.cpp:1130 msgid "Music volume:" msgstr "Volume da Mњsica:" -#: gui/options.cpp:1070 +#: gui/options.cpp:1132 msgctxt "lowres" msgid "Music volume:" msgstr "Volume da Mњsica:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1139 msgid "Mute All" msgstr "Mudo" -#: gui/options.cpp:1080 +#: gui/options.cpp:1142 msgid "SFX volume:" msgstr "Volume dos Sons:" -#: gui/options.cpp:1080 gui/options.cpp:1082 gui/options.cpp:1083 +#: gui/options.cpp:1142 gui/options.cpp:1144 gui/options.cpp:1145 msgid "Special sound effects volume" msgstr "Volume dos efeitos sonoros especiais" -#: gui/options.cpp:1082 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "SFX volume:" msgstr "Volume dos Sons:" -#: gui/options.cpp:1090 +#: gui/options.cpp:1152 msgid "Speech volume:" msgstr "Volume da Voz:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1154 msgctxt "lowres" msgid "Speech volume:" msgstr "Volume da Voz:" -#: gui/options.cpp:1311 +#: gui/options.cpp:1351 +#, fuzzy +msgid "Control" +msgstr "Controle do Mouse" + +#: gui/options.cpp:1383 msgid "FluidSynth Settings" msgstr "" -#: gui/options.cpp:1342 +#: gui/options.cpp:1414 msgid "Theme Path:" msgstr "Pasta do Tema:" -#: gui/options.cpp:1344 +#: gui/options.cpp:1416 msgctxt "lowres" msgid "Theme Path:" msgstr "Pasta do Tema:" -#: gui/options.cpp:1350 gui/options.cpp:1352 gui/options.cpp:1353 +#: gui/options.cpp:1422 gui/options.cpp:1424 gui/options.cpp:1425 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:1359 +#: gui/options.cpp:1431 msgid "Plugins Path:" msgstr "Pasta de Plugins:" -#: gui/options.cpp:1361 +#: gui/options.cpp:1433 msgctxt "lowres" msgid "Plugins Path:" msgstr "Pasta de Plugins:" -#: gui/options.cpp:1372 +#: gui/options.cpp:1444 msgctxt "lowres" msgid "Misc" msgstr "Outros" -#: gui/options.cpp:1374 +#: gui/options.cpp:1446 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1378 +#: gui/options.cpp:1450 msgid "GUI Renderer:" msgstr "Renderizador GUI:" -#: gui/options.cpp:1390 +#: gui/options.cpp:1462 msgid "Autosave:" msgstr "Auto-Salvar:" -#: gui/options.cpp:1392 +#: gui/options.cpp:1464 msgctxt "lowres" msgid "Autosave:" msgstr "Auto-Salvar:" -#: gui/options.cpp:1400 +#: gui/options.cpp:1472 msgid "Keys" msgstr "Teclas" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "GUI Language:" msgstr "Idioma do GUI:" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "Language of ScummVM GUI" msgstr "Linguagem do ScummVM GUI" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "Update check:" msgstr "" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "How often to check ScummVM updates" msgstr "" -#: gui/options.cpp:1447 +#: gui/options.cpp:1519 msgid "Check now" msgstr "" -#: gui/options.cpp:1455 +#: gui/options.cpp:1527 msgid "Cloud" msgstr "" -#: gui/options.cpp:1457 +#: gui/options.cpp:1529 msgctxt "lowres" msgid "Cloud" msgstr "" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Storage:" msgstr "" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Active cloud storage" msgstr "" -#: gui/options.cpp:1469 gui/options.cpp:2026 +#: gui/options.cpp:1541 gui/options.cpp:2098 msgid "<none>" msgstr "" -#: gui/options.cpp:1473 backends/platform/wii/options.cpp:114 +#: gui/options.cpp:1545 backends/platform/wii/options.cpp:114 msgid "Username:" msgstr "Nome de usuсrio:" -#: gui/options.cpp:1473 +#: gui/options.cpp:1545 msgid "Username used by this storage" msgstr "" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Used space:" msgstr "" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Space used by ScummVM's saved games on this storage" msgstr "" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "Last sync time:" msgstr "" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "When the last saved games sync for this storage occured" msgstr "" -#: gui/options.cpp:1482 gui/storagewizarddialog.cpp:71 +#: gui/options.cpp:1554 gui/storagewizarddialog.cpp:71 msgid "Connect" msgstr "" -#: gui/options.cpp:1482 +#: gui/options.cpp:1554 msgid "Open wizard dialog to connect your cloud storage account" msgstr "" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh" msgstr "" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh current cloud storage information (username and usage)" msgstr "" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 #, fuzzy msgid "Download" msgstr "Baixo" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Open downloads manager dialog" msgstr "" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run server" msgstr "" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run local webserver" msgstr "" -#: gui/options.cpp:1487 gui/options.cpp:2136 +#: gui/options.cpp:1559 gui/options.cpp:2208 #, fuzzy msgid "Not running" msgstr "Erro ao executar o jogo:" -#: gui/options.cpp:1491 +#: gui/options.cpp:1563 #, fuzzy msgid "/root/ Path:" msgstr "Pasta de Extras" -#: gui/options.cpp:1491 gui/options.cpp:1493 gui/options.cpp:1494 +#: gui/options.cpp:1563 gui/options.cpp:1565 gui/options.cpp:1566 #, fuzzy msgid "Specifies which directory the Files Manager can access" msgstr "Especifique onde guardar seus jogos salvos" -#: gui/options.cpp:1493 +#: gui/options.cpp:1565 #, fuzzy msgctxt "lowres" msgid "/root/ Path:" msgstr "Pasta de Extras" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 #, fuzzy msgid "Server's port:" msgstr "Servidor:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "" "Which port is used by the server\n" "Auth with server is not available with non-default port" msgstr "" -#: gui/options.cpp:1516 +#: gui/options.cpp:1588 msgid "Apply" msgstr "" -#: gui/options.cpp:1682 +#: gui/options.cpp:1754 #, fuzzy msgid "Failed to change cloud storage!" msgstr "Falha ao salvar o jogo" -#: gui/options.cpp:1685 +#: gui/options.cpp:1757 msgid "Another cloud storage is already active." msgstr "" -#: gui/options.cpp:1721 +#: gui/options.cpp:1793 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1310,51 +1328,51 @@ msgstr "" "O tema que vocъ selecionou nуo suporta seu idioma atual. Se vocъ quiser usar " "este tema vocъ precisa mudar para outro idioma." -#: gui/options.cpp:1756 +#: gui/options.cpp:1828 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:1765 +#: gui/options.cpp:1837 msgid "Select directory for GUI themes" msgstr "Selecione a pasta para os temas da Interface de Uso Grсfico" -#: gui/options.cpp:1775 +#: gui/options.cpp:1847 msgid "Select directory for extra files" msgstr "Selecione a pasta para os arquivos extras" -#: gui/options.cpp:1786 +#: gui/options.cpp:1858 msgid "Select directory for plugins" msgstr "Selecione a pasta para os plugins" -#: gui/options.cpp:1798 +#: gui/options.cpp:1870 #, fuzzy msgid "Select directory for Files Manager /root/" msgstr "Selecione a pasta para os arquivos extras" -#: gui/options.cpp:2033 +#: gui/options.cpp:2105 #, c-format msgid "%llu bytes" msgstr "" -#: gui/options.cpp:2041 +#: gui/options.cpp:2113 msgid "<right now>" msgstr "" -#: gui/options.cpp:2043 +#: gui/options.cpp:2115 #, fuzzy msgid "<never>" msgstr "Nunca" -#: gui/options.cpp:2127 +#: gui/options.cpp:2199 #, fuzzy msgid "Stop server" msgstr "Servidor:" -#: gui/options.cpp:2128 +#: gui/options.cpp:2200 msgid "Stop local webserver" msgstr "" -#: gui/options.cpp:2219 +#: gui/options.cpp:2291 msgid "" "Request failed.\n" "Check your Internet connection." diff --git a/po/pt_PT.po b/po/pt_PT.po index e43108fdcb..a220e16176 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-02-11 08:56+0100\n" +"POT-Creation-Date: 2017-02-21 23:29+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:1515 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69 +#: gui/options.cpp:1587 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:443 #: gui/saveload-dialog.cpp:717 gui/saveload-dialog.cpp:1111 @@ -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:522 -#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1517 +#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1589 #: gui/saveload-dialog.cpp:1112 engines/engine.cpp:477 engines/engine.cpp:488 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 @@ -241,7 +241,7 @@ msgstr "" "Inglъs" #: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:121 -#: gui/options.cpp:845 gui/options.cpp:858 gui/options.cpp:1410 +#: gui/options.cpp:907 gui/options.cpp:920 gui/options.cpp:1482 #: audio/null.cpp:41 msgid "<default>" msgstr "<padrуo>" @@ -264,11 +264,11 @@ msgstr "Plataforma:" msgid "Engine" msgstr "Recursos" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "Graphics" msgstr "Grсficos" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "GFX" msgstr "GFX" @@ -281,7 +281,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Substituir configuraчѕes gerais de grсficos" -#: gui/editgamedialog.cpp:196 gui/options.cpp:1292 +#: gui/editgamedialog.cpp:196 gui/options.cpp:1364 msgid "Audio" msgstr "Сudio" @@ -294,11 +294,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Substituir configuraчѕes gerais de сudio" -#: gui/editgamedialog.cpp:210 gui/options.cpp:1297 +#: gui/editgamedialog.cpp:210 gui/options.cpp:1369 msgid "Volume" msgstr "Volume" -#: gui/editgamedialog.cpp:212 gui/options.cpp:1299 +#: gui/editgamedialog.cpp:212 gui/options.cpp:1371 msgctxt "lowres" msgid "Volume" msgstr "Volume" @@ -312,7 +312,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Substituir configuraчѕes gerais de volume" -#: gui/editgamedialog.cpp:226 gui/options.cpp:1307 +#: gui/editgamedialog.cpp:226 gui/options.cpp:1379 msgid "MIDI" msgstr "MIDI" @@ -325,7 +325,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Substituir configuraчѕes gerais de MIDI" -#: gui/editgamedialog.cpp:241 gui/options.cpp:1317 +#: gui/editgamedialog.cpp:241 gui/options.cpp:1389 msgid "MT-32" msgstr "MT-32" @@ -338,11 +338,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Substituir configuraчѕes gerais de MT-32" -#: gui/editgamedialog.cpp:255 gui/options.cpp:1324 +#: gui/editgamedialog.cpp:255 gui/options.cpp:1396 msgid "Paths" msgstr "Caminhos" -#: gui/editgamedialog.cpp:257 gui/options.cpp:1326 +#: gui/editgamedialog.cpp:257 gui/options.cpp:1398 msgctxt "lowres" msgid "Paths" msgstr "Caminhos" @@ -356,7 +356,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Caminho do Jogo:" -#: gui/editgamedialog.cpp:271 gui/options.cpp:1350 +#: gui/editgamedialog.cpp:271 gui/options.cpp:1422 msgid "Extra Path:" msgstr "Caminho de Extras:" @@ -365,44 +365,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:1352 +#: gui/editgamedialog.cpp:273 gui/options.cpp:1424 msgctxt "lowres" msgid "Extra Path:" msgstr "Caminho de Extras:" -#: gui/editgamedialog.cpp:280 gui/options.cpp:1334 +#: gui/editgamedialog.cpp:280 gui/options.cpp:1406 msgid "Save Path:" msgstr "Caminho para Salvar:" #: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282 -#: gui/editgamedialog.cpp:283 gui/options.cpp:1334 gui/options.cpp:1336 -#: gui/options.cpp:1337 +#: gui/editgamedialog.cpp:283 gui/options.cpp:1406 gui/options.cpp:1408 +#: gui/options.cpp:1409 msgid "Specifies where your saved games are put" msgstr "Especifica onde os jogos salvos sуo colocados" -#: gui/editgamedialog.cpp:282 gui/options.cpp:1336 +#: gui/editgamedialog.cpp:282 gui/options.cpp:1408 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:1345 -#: gui/options.cpp:1353 gui/options.cpp:1362 gui/options.cpp:1542 -#: gui/options.cpp:1548 gui/options.cpp:1556 gui/options.cpp:1579 -#: gui/options.cpp:1608 gui/options.cpp:1614 gui/options.cpp:1621 -#: gui/options.cpp:1629 gui/options.cpp:1812 gui/options.cpp:1815 -#: gui/options.cpp:1822 gui/options.cpp:1832 +#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1417 +#: gui/options.cpp:1425 gui/options.cpp:1434 gui/options.cpp:1614 +#: gui/options.cpp:1620 gui/options.cpp:1628 gui/options.cpp:1651 +#: gui/options.cpp:1680 gui/options.cpp:1686 gui/options.cpp:1693 +#: gui/options.cpp:1701 gui/options.cpp:1884 gui/options.cpp:1887 +#: gui/options.cpp:1894 gui/options.cpp:1904 msgctxt "path" msgid "None" msgstr "Nenhum" #: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404 -#: gui/editgamedialog.cpp:522 gui/options.cpp:1536 gui/options.cpp:1602 -#: gui/options.cpp:1818 backends/platform/wii/options.cpp:56 +#: gui/editgamedialog.cpp:522 gui/options.cpp:1608 gui/options.cpp:1674 +#: gui/options.cpp:1890 backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Padrуo" -#: gui/editgamedialog.cpp:450 gui/options.cpp:1826 +#: gui/editgamedialog.cpp:450 gui/options.cpp:1898 msgid "Select SoundFont" msgstr "Seleccione o SoundFont" @@ -410,7 +410,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:1749 +#: gui/editgamedialog.cpp:502 gui/options.cpp:1821 msgid "Select directory for saved games" msgstr "Seleccione uma directoria para salvar o jogo" @@ -505,7 +505,7 @@ msgstr "Seno" msgid "Triangle" msgstr "Triтngulo" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1370 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1442 msgid "Misc" msgstr "Vсrios" @@ -833,505 +833,521 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:289 gui/options.cpp:552 gui/options.cpp:690 -#: gui/options.cpp:759 gui/options.cpp:970 +#: gui/options.cpp:316 gui/options.cpp:598 gui/options.cpp:736 +#: gui/options.cpp:805 gui/options.cpp:1032 msgctxt "soundfont" msgid "None" msgstr "Nenhuma" -#: gui/options.cpp:456 +#: gui/options.cpp:502 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:468 +#: gui/options.cpp:514 msgid "the video mode could not be changed." msgstr "o modo de vэdeo nуo pєde ser alterado." -#: gui/options.cpp:474 +#: gui/options.cpp:520 msgid "the aspect ratio setting could not be changed" msgstr "a taxa de proporчуo nуo pєde ser alterada" -#: gui/options.cpp:480 +#: gui/options.cpp:526 msgid "the fullscreen setting could not be changed" msgstr "a configuraчуo de ecrу inteiro nуo pєde ser alterada" -#: gui/options.cpp:486 +#: gui/options.cpp:532 msgid "the filtering setting could not be changed" msgstr "a configuraчуo de filtragem nуo pєde ser alterada" -#: gui/options.cpp:842 +#: gui/options.cpp:884 +msgid "Show On-screen control" +msgstr "" + +#: gui/options.cpp:888 +msgid "Touchpad mouse mode" +msgstr "" + +#: gui/options.cpp:892 +msgid "Swap Menu and Back buttons" +msgstr "" + +#: gui/options.cpp:904 msgid "Graphics mode:" msgstr "Modelo de grсficos:" -#: gui/options.cpp:856 +#: gui/options.cpp:918 msgid "Render mode:" msgstr "Renderizaчуo:" -#: gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:918 gui/options.cpp:919 msgid "Special dithering modes supported by some games" msgstr "Modos especiais de pontilhado suportados por alguns jogos" -#: gui/options.cpp:868 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 +#: gui/options.cpp:930 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2460 msgid "Fullscreen mode" msgstr "Modo de ecrу inteiro" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Filter graphics" msgstr "Filtros grсficos" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Use linear filtering when scaling graphics" msgstr "Usar filtragem linear quando dimensionar grсficos" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Aspect ratio correction" msgstr "Correчуo da taxa de proporчуo" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Correct aspect ratio for 320x200 games" msgstr "Corrigir taxa de proporчуo em jogos de 320x200" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Preferred Device:" msgstr "Dispositivo Preferido:" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Music Device:" msgstr "Dispositivo de Mњsica:" -#: gui/options.cpp:882 gui/options.cpp:884 +#: gui/options.cpp:944 gui/options.cpp:946 msgid "Specifies preferred sound device or sound card emulator" msgstr "Especifica dispositivo sonoro ou emulador de placa sonora preferida" -#: gui/options.cpp:882 gui/options.cpp:884 gui/options.cpp:885 +#: gui/options.cpp:944 gui/options.cpp:946 gui/options.cpp:947 msgid "Specifies output sound device or sound card emulator" msgstr "" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Music Device:" msgstr "" -#: gui/options.cpp:911 +#: gui/options.cpp:973 msgid "AdLib emulator:" msgstr "Emulador AdLib:" -#: gui/options.cpp:911 gui/options.cpp:912 +#: gui/options.cpp:973 gui/options.cpp:974 msgid "AdLib is used for music in many games" msgstr "AdLib щ usado para mњsica em vсrios jogos" -#: gui/options.cpp:922 +#: gui/options.cpp:984 msgid "Output rate:" msgstr "" -#: gui/options.cpp:922 gui/options.cpp:923 +#: gui/options.cpp:984 gui/options.cpp:985 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" msgstr "" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "GM Device:" msgstr "" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "Specifies default sound device for General MIDI output" msgstr "" -#: gui/options.cpp:944 +#: gui/options.cpp:1006 msgid "Don't use General MIDI music" msgstr "" -#: gui/options.cpp:955 gui/options.cpp:1017 +#: gui/options.cpp:1017 gui/options.cpp:1079 msgid "Use first available device" msgstr "" -#: gui/options.cpp:967 +#: gui/options.cpp:1029 msgid "SoundFont:" msgstr "" -#: gui/options.cpp:967 gui/options.cpp:969 gui/options.cpp:970 +#: gui/options.cpp:1029 gui/options.cpp:1031 gui/options.cpp:1032 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "" -#: gui/options.cpp:969 +#: gui/options.cpp:1031 msgctxt "lowres" msgid "SoundFont:" msgstr "" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Mixed AdLib/MIDI mode" msgstr "" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Use both MIDI and AdLib sound generation" msgstr "" -#: gui/options.cpp:978 +#: gui/options.cpp:1040 msgid "MIDI gain:" msgstr "" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "MT-32 Device:" msgstr "" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" -#: gui/options.cpp:993 +#: gui/options.cpp:1055 msgid "True Roland MT-32 (disable GM emulation)" msgstr "" -#: gui/options.cpp:993 gui/options.cpp:995 +#: gui/options.cpp:1055 gui/options.cpp:1057 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" msgstr "" -#: gui/options.cpp:995 +#: gui/options.cpp:1057 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" msgstr "" -#: gui/options.cpp:1007 +#: gui/options.cpp:1069 msgid "Don't use Roland MT-32 music" msgstr "" -#: gui/options.cpp:1034 +#: gui/options.cpp:1096 msgid "Text and Speech:" msgstr "" -#: gui/options.cpp:1038 gui/options.cpp:1048 +#: gui/options.cpp:1100 gui/options.cpp:1110 msgid "Speech" msgstr "" -#: gui/options.cpp:1039 gui/options.cpp:1049 +#: gui/options.cpp:1101 gui/options.cpp:1111 msgid "Subtitles" msgstr "" -#: gui/options.cpp:1040 +#: gui/options.cpp:1102 msgid "Both" msgstr "" -#: gui/options.cpp:1042 +#: gui/options.cpp:1104 msgid "Subtitle speed:" msgstr "" -#: gui/options.cpp:1044 +#: gui/options.cpp:1106 msgctxt "lowres" msgid "Text and Speech:" msgstr "" -#: gui/options.cpp:1048 +#: gui/options.cpp:1110 msgid "Spch" msgstr "" -#: gui/options.cpp:1049 +#: gui/options.cpp:1111 msgid "Subs" msgstr "" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgctxt "lowres" msgid "Both" msgstr "" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgid "Show subtitles and play speech" msgstr "" -#: gui/options.cpp:1052 +#: gui/options.cpp:1114 msgctxt "lowres" msgid "Subtitle speed:" msgstr "" -#: gui/options.cpp:1068 +#: gui/options.cpp:1130 msgid "Music volume:" msgstr "" -#: gui/options.cpp:1070 +#: gui/options.cpp:1132 msgctxt "lowres" msgid "Music volume:" msgstr "" -#: gui/options.cpp:1077 +#: gui/options.cpp:1139 msgid "Mute All" msgstr "" -#: gui/options.cpp:1080 +#: gui/options.cpp:1142 msgid "SFX volume:" msgstr "" -#: gui/options.cpp:1080 gui/options.cpp:1082 gui/options.cpp:1083 +#: gui/options.cpp:1142 gui/options.cpp:1144 gui/options.cpp:1145 msgid "Special sound effects volume" msgstr "" -#: gui/options.cpp:1082 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "SFX volume:" msgstr "" -#: gui/options.cpp:1090 +#: gui/options.cpp:1152 msgid "Speech volume:" msgstr "" -#: gui/options.cpp:1092 +#: gui/options.cpp:1154 msgctxt "lowres" msgid "Speech volume:" msgstr "" -#: gui/options.cpp:1311 +#: gui/options.cpp:1351 +msgid "Control" +msgstr "" + +#: gui/options.cpp:1383 msgid "FluidSynth Settings" msgstr "" -#: gui/options.cpp:1342 +#: gui/options.cpp:1414 msgid "Theme Path:" msgstr "" -#: gui/options.cpp:1344 +#: gui/options.cpp:1416 msgctxt "lowres" msgid "Theme Path:" msgstr "" -#: gui/options.cpp:1350 gui/options.cpp:1352 gui/options.cpp:1353 +#: gui/options.cpp:1422 gui/options.cpp:1424 gui/options.cpp:1425 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" -#: gui/options.cpp:1359 +#: gui/options.cpp:1431 msgid "Plugins Path:" msgstr "" -#: gui/options.cpp:1361 +#: gui/options.cpp:1433 msgctxt "lowres" msgid "Plugins Path:" msgstr "" -#: gui/options.cpp:1372 +#: gui/options.cpp:1444 msgctxt "lowres" msgid "Misc" msgstr "" -#: gui/options.cpp:1374 +#: gui/options.cpp:1446 msgid "Theme:" msgstr "" -#: gui/options.cpp:1378 +#: gui/options.cpp:1450 msgid "GUI Renderer:" msgstr "" -#: gui/options.cpp:1390 +#: gui/options.cpp:1462 msgid "Autosave:" msgstr "" -#: gui/options.cpp:1392 +#: gui/options.cpp:1464 msgctxt "lowres" msgid "Autosave:" msgstr "" -#: gui/options.cpp:1400 +#: gui/options.cpp:1472 msgid "Keys" msgstr "" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "GUI Language:" msgstr "" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "Language of ScummVM GUI" msgstr "" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "Update check:" msgstr "" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "How often to check ScummVM updates" msgstr "" -#: gui/options.cpp:1447 +#: gui/options.cpp:1519 msgid "Check now" msgstr "" -#: gui/options.cpp:1455 +#: gui/options.cpp:1527 msgid "Cloud" msgstr "" -#: gui/options.cpp:1457 +#: gui/options.cpp:1529 msgctxt "lowres" msgid "Cloud" msgstr "" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Storage:" msgstr "" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Active cloud storage" msgstr "" -#: gui/options.cpp:1469 gui/options.cpp:2026 +#: gui/options.cpp:1541 gui/options.cpp:2098 msgid "<none>" msgstr "" -#: gui/options.cpp:1473 backends/platform/wii/options.cpp:114 +#: gui/options.cpp:1545 backends/platform/wii/options.cpp:114 msgid "Username:" msgstr "" -#: gui/options.cpp:1473 +#: gui/options.cpp:1545 msgid "Username used by this storage" msgstr "" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Used space:" msgstr "" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Space used by ScummVM's saved games on this storage" msgstr "" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "Last sync time:" msgstr "" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "When the last saved games sync for this storage occured" msgstr "" -#: gui/options.cpp:1482 gui/storagewizarddialog.cpp:71 +#: gui/options.cpp:1554 gui/storagewizarddialog.cpp:71 msgid "Connect" msgstr "" -#: gui/options.cpp:1482 +#: gui/options.cpp:1554 msgid "Open wizard dialog to connect your cloud storage account" msgstr "" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh" msgstr "" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh current cloud storage information (username and usage)" msgstr "" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Download" msgstr "" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Open downloads manager dialog" msgstr "" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run server" msgstr "" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run local webserver" msgstr "" -#: gui/options.cpp:1487 gui/options.cpp:2136 +#: gui/options.cpp:1559 gui/options.cpp:2208 msgid "Not running" msgstr "" -#: gui/options.cpp:1491 +#: gui/options.cpp:1563 msgid "/root/ Path:" msgstr "" -#: gui/options.cpp:1491 gui/options.cpp:1493 gui/options.cpp:1494 +#: gui/options.cpp:1563 gui/options.cpp:1565 gui/options.cpp:1566 msgid "Specifies which directory the Files Manager can access" msgstr "" -#: gui/options.cpp:1493 +#: gui/options.cpp:1565 msgctxt "lowres" msgid "/root/ Path:" msgstr "" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "Server's port:" msgstr "" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "" "Which port is used by the server\n" "Auth with server is not available with non-default port" msgstr "" -#: gui/options.cpp:1516 +#: gui/options.cpp:1588 msgid "Apply" msgstr "" -#: gui/options.cpp:1682 +#: gui/options.cpp:1754 msgid "Failed to change cloud storage!" msgstr "" -#: gui/options.cpp:1685 +#: gui/options.cpp:1757 msgid "Another cloud storage is already active." msgstr "" -#: gui/options.cpp:1721 +#: gui/options.cpp:1793 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." msgstr "" -#: gui/options.cpp:1756 +#: gui/options.cpp:1828 msgid "The chosen directory cannot be written to. Please select another one." msgstr "" -#: gui/options.cpp:1765 +#: gui/options.cpp:1837 msgid "Select directory for GUI themes" msgstr "" -#: gui/options.cpp:1775 +#: gui/options.cpp:1847 msgid "Select directory for extra files" msgstr "" -#: gui/options.cpp:1786 +#: gui/options.cpp:1858 msgid "Select directory for plugins" msgstr "" -#: gui/options.cpp:1798 +#: gui/options.cpp:1870 msgid "Select directory for Files Manager /root/" msgstr "" -#: gui/options.cpp:2033 +#: gui/options.cpp:2105 #, c-format msgid "%llu bytes" msgstr "" -#: gui/options.cpp:2041 +#: gui/options.cpp:2113 msgid "<right now>" msgstr "" -#: gui/options.cpp:2043 +#: gui/options.cpp:2115 msgid "<never>" msgstr "" -#: gui/options.cpp:2127 +#: gui/options.cpp:2199 msgid "Stop server" msgstr "" -#: gui/options.cpp:2128 +#: gui/options.cpp:2200 msgid "Stop local webserver" msgstr "" -#: gui/options.cpp:2219 +#: gui/options.cpp:2291 msgid "" "Request failed.\n" "Check your Internet connection." diff --git a/po/ru_RU.po b/po/ru_RU.po index 3498507785..3b2672575b 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -7,7 +7,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-02-11 08:56+0100\n" +"POT-Creation-Date: 2017-02-21 23:29+0100\n" "PO-Revision-Date: 2016-12-31 21:04+0000\n" "Last-Translator: Ivan Lukyanov <lid-gr@tut.by>\n" "Language-Team: Russian <https://translations.scummvm.org/projects/scummvm/" @@ -59,7 +59,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:1515 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69 +#: gui/options.cpp:1587 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:443 #: gui/saveload-dialog.cpp:717 gui/saveload-dialog.cpp:1111 @@ -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:522 -#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1517 +#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1589 #: gui/saveload-dialog.cpp:1112 engines/engine.cpp:477 engines/engine.cpp:488 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 @@ -241,7 +241,7 @@ msgstr "" "Язык игры. Изменение этой настройки не превратит игру на английском в русскую" #: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:121 -#: gui/options.cpp:845 gui/options.cpp:858 gui/options.cpp:1410 +#: gui/options.cpp:907 gui/options.cpp:920 gui/options.cpp:1482 #: audio/null.cpp:41 msgid "<default>" msgstr "<по умолчанию>" @@ -264,11 +264,11 @@ msgstr "Платформа:" msgid "Engine" msgstr "Движок" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "Graphics" msgstr "Графика" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "GFX" msgstr "Грф" @@ -281,7 +281,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Перекрыть глобальные установки графики" -#: gui/editgamedialog.cpp:196 gui/options.cpp:1292 +#: gui/editgamedialog.cpp:196 gui/options.cpp:1364 msgid "Audio" msgstr "Аудио" @@ -294,11 +294,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Перекрыть глобальные установки аудио" -#: gui/editgamedialog.cpp:210 gui/options.cpp:1297 +#: gui/editgamedialog.cpp:210 gui/options.cpp:1369 msgid "Volume" msgstr "Громкость" -#: gui/editgamedialog.cpp:212 gui/options.cpp:1299 +#: gui/editgamedialog.cpp:212 gui/options.cpp:1371 msgctxt "lowres" msgid "Volume" msgstr "Громк" @@ -312,7 +312,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Перекрыть глобальные установки громкости" -#: gui/editgamedialog.cpp:226 gui/options.cpp:1307 +#: gui/editgamedialog.cpp:226 gui/options.cpp:1379 msgid "MIDI" msgstr "MIDI" @@ -325,7 +325,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Перекрыть глобальные установки MIDI" -#: gui/editgamedialog.cpp:241 gui/options.cpp:1317 +#: gui/editgamedialog.cpp:241 gui/options.cpp:1389 msgid "MT-32" msgstr "MT-32" @@ -338,11 +338,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Перекрыть глобальные установки MT-32" -#: gui/editgamedialog.cpp:255 gui/options.cpp:1324 +#: gui/editgamedialog.cpp:255 gui/options.cpp:1396 msgid "Paths" msgstr "Пути" -#: gui/editgamedialog.cpp:257 gui/options.cpp:1326 +#: gui/editgamedialog.cpp:257 gui/options.cpp:1398 msgctxt "lowres" msgid "Paths" msgstr "Пути" @@ -356,7 +356,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Где игра:" -#: gui/editgamedialog.cpp:271 gui/options.cpp:1350 +#: gui/editgamedialog.cpp:271 gui/options.cpp:1422 msgid "Extra Path:" msgstr "Доп. путь:" @@ -365,44 +365,44 @@ msgstr "Доп. путь:" msgid "Specifies path to additional data used by the game" msgstr "Указывает путь к дополнительным файлам данных для игры" -#: gui/editgamedialog.cpp:273 gui/options.cpp:1352 +#: gui/editgamedialog.cpp:273 gui/options.cpp:1424 msgctxt "lowres" msgid "Extra Path:" msgstr "Доп. путь:" -#: gui/editgamedialog.cpp:280 gui/options.cpp:1334 +#: gui/editgamedialog.cpp:280 gui/options.cpp:1406 msgid "Save Path:" msgstr "Сохранения игр:" #: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282 -#: gui/editgamedialog.cpp:283 gui/options.cpp:1334 gui/options.cpp:1336 -#: gui/options.cpp:1337 +#: gui/editgamedialog.cpp:283 gui/options.cpp:1406 gui/options.cpp:1408 +#: gui/options.cpp:1409 msgid "Specifies where your saved games are put" msgstr "Указывает путь к сохранениям игры" -#: gui/editgamedialog.cpp:282 gui/options.cpp:1336 +#: gui/editgamedialog.cpp:282 gui/options.cpp:1408 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:1345 -#: gui/options.cpp:1353 gui/options.cpp:1362 gui/options.cpp:1542 -#: gui/options.cpp:1548 gui/options.cpp:1556 gui/options.cpp:1579 -#: gui/options.cpp:1608 gui/options.cpp:1614 gui/options.cpp:1621 -#: gui/options.cpp:1629 gui/options.cpp:1812 gui/options.cpp:1815 -#: gui/options.cpp:1822 gui/options.cpp:1832 +#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1417 +#: gui/options.cpp:1425 gui/options.cpp:1434 gui/options.cpp:1614 +#: gui/options.cpp:1620 gui/options.cpp:1628 gui/options.cpp:1651 +#: gui/options.cpp:1680 gui/options.cpp:1686 gui/options.cpp:1693 +#: gui/options.cpp:1701 gui/options.cpp:1884 gui/options.cpp:1887 +#: gui/options.cpp:1894 gui/options.cpp:1904 msgctxt "path" msgid "None" msgstr "Не задан" #: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404 -#: gui/editgamedialog.cpp:522 gui/options.cpp:1536 gui/options.cpp:1602 -#: gui/options.cpp:1818 backends/platform/wii/options.cpp:56 +#: gui/editgamedialog.cpp:522 gui/options.cpp:1608 gui/options.cpp:1674 +#: gui/options.cpp:1890 backends/platform/wii/options.cpp:56 msgid "Default" msgstr "По умолчанию" -#: gui/editgamedialog.cpp:450 gui/options.cpp:1826 +#: gui/editgamedialog.cpp:450 gui/options.cpp:1898 msgid "Select SoundFont" msgstr "Выберите SoundFont" @@ -410,7 +410,7 @@ msgstr "Выберите SoundFont" msgid "Select additional game directory" msgstr "Выберите дополнительную директорию игры" -#: gui/editgamedialog.cpp:502 gui/options.cpp:1749 +#: gui/editgamedialog.cpp:502 gui/options.cpp:1821 msgid "Select directory for saved games" msgstr "Выберите директорию для сохранений" @@ -503,7 +503,7 @@ msgstr "Синусоида" msgid "Triangle" msgstr "Треугольная" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1370 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1442 msgid "Misc" msgstr "Разное" @@ -823,105 +823,118 @@ msgstr "44 кГц" msgid "48 kHz" msgstr "48 кГц" -#: gui/options.cpp:289 gui/options.cpp:552 gui/options.cpp:690 -#: gui/options.cpp:759 gui/options.cpp:970 +#: gui/options.cpp:316 gui/options.cpp:598 gui/options.cpp:736 +#: gui/options.cpp:805 gui/options.cpp:1032 msgctxt "soundfont" msgid "None" msgstr "Не задан" -#: gui/options.cpp:456 +#: gui/options.cpp:502 msgid "Failed to apply some of the graphic options changes:" msgstr "Не удалось применить изменения некоторых графических настроек:" -#: gui/options.cpp:468 +#: gui/options.cpp:514 msgid "the video mode could not be changed." msgstr "видеорежим не может быть изменён." -#: gui/options.cpp:474 +#: gui/options.cpp:520 msgid "the aspect ratio setting could not be changed" msgstr "режим корректировки соотношения сторон не может быть изменён" -#: gui/options.cpp:480 +#: gui/options.cpp:526 msgid "the fullscreen setting could not be changed" msgstr "полноэкранный режим не может быть изменён" -#: gui/options.cpp:486 +#: gui/options.cpp:532 msgid "the filtering setting could not be changed" msgstr "режим фильтрации не может быть изменён" -#: gui/options.cpp:842 +#: gui/options.cpp:884 +msgid "Show On-screen control" +msgstr "" + +#: gui/options.cpp:888 +#, fuzzy +msgid "Touchpad mouse mode" +msgstr "Режим тачпада выключен." + +#: gui/options.cpp:892 +msgid "Swap Menu and Back buttons" +msgstr "" + +#: gui/options.cpp:904 msgid "Graphics mode:" msgstr "Граф. режим:" -#: gui/options.cpp:856 +#: gui/options.cpp:918 msgid "Render mode:" msgstr "Режим растра:" -#: gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:918 gui/options.cpp:919 msgid "Special dithering modes supported by some games" msgstr "Специальные режимы рендеринга, поддерживаемые некоторыми играми" -#: gui/options.cpp:868 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 +#: gui/options.cpp:930 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2460 msgid "Fullscreen mode" msgstr "Полноэкранный режим" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Filter graphics" msgstr "Фильтрование графики" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Use linear filtering when scaling graphics" msgstr "Использовать линейную фильтрацию для увеличения разрешения" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Aspect ratio correction" msgstr "Коррекция соотношения сторон" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Correct aspect ratio for 320x200 games" msgstr "Корректировать соотношение сторон для игр с разрешением 320x200" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Preferred Device:" msgstr "Предпочитаемое:" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Music Device:" msgstr "Звуковое уст-во:" -#: gui/options.cpp:882 gui/options.cpp:884 +#: gui/options.cpp:944 gui/options.cpp:946 msgid "Specifies preferred sound device or sound card emulator" msgstr "" "Указывает предпочитаемое звуковое устройство или эмулятор звуковой карты" -#: gui/options.cpp:882 gui/options.cpp:884 gui/options.cpp:885 +#: gui/options.cpp:944 gui/options.cpp:946 gui/options.cpp:947 msgid "Specifies output sound device or sound card emulator" msgstr "Указывает выходное звуковое устройство или эмулятор звуковой карты" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Предпочитаемое:" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Music Device:" msgstr "Звуковое уст-во:" -#: gui/options.cpp:911 +#: gui/options.cpp:973 msgid "AdLib emulator:" msgstr "Эмулятор AdLib:" -#: gui/options.cpp:911 gui/options.cpp:912 +#: gui/options.cpp:973 gui/options.cpp:974 msgid "AdLib is used for music in many games" msgstr "Звуковая карта AdLib используется многими играми" -#: gui/options.cpp:922 +#: gui/options.cpp:984 msgid "Output rate:" msgstr "Частота звука:" -#: gui/options.cpp:922 gui/options.cpp:923 +#: gui/options.cpp:984 gui/options.cpp:985 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -929,64 +942,64 @@ msgstr "" "БОльшие значения задают лучшее качество звука, однако они могут не " "поддерживаться вашей звуковой картой" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "GM Device:" msgstr "Устройство GM:" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "Specifies default sound device for General MIDI output" msgstr "Указывает выходное звуковое устройство для MIDI" -#: gui/options.cpp:944 +#: gui/options.cpp:1006 msgid "Don't use General MIDI music" msgstr "Не использовать музыку для General MIDI" -#: gui/options.cpp:955 gui/options.cpp:1017 +#: gui/options.cpp:1017 gui/options.cpp:1079 msgid "Use first available device" msgstr "Использовать первое доступное устройство" -#: gui/options.cpp:967 +#: gui/options.cpp:1029 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:967 gui/options.cpp:969 gui/options.cpp:970 +#: gui/options.cpp:1029 gui/options.cpp:1031 gui/options.cpp:1032 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "" "SoundFont'ы поддерживаются некоторыми звуковыми картами, FluidSynth и " "Timidity" -#: gui/options.cpp:969 +#: gui/options.cpp:1031 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Mixed AdLib/MIDI mode" msgstr "Смешанный режим AdLib/MIDI" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Use both MIDI and AdLib sound generation" msgstr "Использовать и MIDI, и AdLib для генерации звука" -#: gui/options.cpp:978 +#: gui/options.cpp:1040 msgid "MIDI gain:" msgstr "Усиление MIDI:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "MT-32 Device:" msgstr "Устр. MT-32:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Указывает звуковое устройство по умолчанию для вывода на Roland MT-32/LAPC1/" "CM32l/CM64" -#: gui/options.cpp:993 +#: gui/options.cpp:1055 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Настоящий Roland MT-32 (запретить эмуляцию GM)" -#: gui/options.cpp:993 gui/options.cpp:995 +#: gui/options.cpp:1055 gui/options.cpp:1057 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -994,16 +1007,16 @@ msgstr "" "Отметьте, если у вас подключено Roland-совместимое звуковое устройство и вы " "хотите его использовать" -#: gui/options.cpp:995 +#: gui/options.cpp:1057 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Настоящий Roland MT-32 (без эмуляции GM)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Устройство Roland GS (разрешить маппинг MT-32)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -1011,265 +1024,270 @@ msgstr "" "Отметьте, если хотите разрешить маппинг для эмуляции MT-32 на устройстве " "Roland GS" -#: gui/options.cpp:1007 +#: gui/options.cpp:1069 msgid "Don't use Roland MT-32 music" msgstr "Не использовать музыку для MT-32" -#: gui/options.cpp:1034 +#: gui/options.cpp:1096 msgid "Text and Speech:" msgstr "Текст и озвучка:" -#: gui/options.cpp:1038 gui/options.cpp:1048 +#: gui/options.cpp:1100 gui/options.cpp:1110 msgid "Speech" msgstr "Озвучка" -#: gui/options.cpp:1039 gui/options.cpp:1049 +#: gui/options.cpp:1101 gui/options.cpp:1111 msgid "Subtitles" msgstr "Субтитры" -#: gui/options.cpp:1040 +#: gui/options.cpp:1102 msgid "Both" msgstr "Оба" -#: gui/options.cpp:1042 +#: gui/options.cpp:1104 msgid "Subtitle speed:" msgstr "Скорость титров:" -#: gui/options.cpp:1044 +#: gui/options.cpp:1106 msgctxt "lowres" msgid "Text and Speech:" msgstr "Текст и озвучка:" -#: gui/options.cpp:1048 +#: gui/options.cpp:1110 msgid "Spch" msgstr "Озв" -#: gui/options.cpp:1049 +#: gui/options.cpp:1111 msgid "Subs" msgstr "Суб" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgctxt "lowres" msgid "Both" msgstr "Оба" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgid "Show subtitles and play speech" msgstr "Показывать субтитры и воспроизводить речь" -#: gui/options.cpp:1052 +#: gui/options.cpp:1114 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Скорость титров:" -#: gui/options.cpp:1068 +#: gui/options.cpp:1130 msgid "Music volume:" msgstr "Громк. музыки:" -#: gui/options.cpp:1070 +#: gui/options.cpp:1132 msgctxt "lowres" msgid "Music volume:" msgstr "Громк. музыки:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1139 msgid "Mute All" msgstr "Выкл. всё" -#: gui/options.cpp:1080 +#: gui/options.cpp:1142 msgid "SFX volume:" msgstr "Громкость SFX:" -#: gui/options.cpp:1080 gui/options.cpp:1082 gui/options.cpp:1083 +#: gui/options.cpp:1142 gui/options.cpp:1144 gui/options.cpp:1145 msgid "Special sound effects volume" msgstr "Громкость специальных звуковых эффектов" -#: gui/options.cpp:1082 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "SFX volume:" msgstr "Громк. SFX:" -#: gui/options.cpp:1090 +#: gui/options.cpp:1152 msgid "Speech volume:" msgstr "Громк. озвучки:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1154 msgctxt "lowres" msgid "Speech volume:" msgstr "Громк. озвучки:" -#: gui/options.cpp:1311 +#: gui/options.cpp:1351 +#, fuzzy +msgid "Control" +msgstr "Управление мышью" + +#: gui/options.cpp:1383 msgid "FluidSynth Settings" msgstr "Настройки FluidSynth" -#: gui/options.cpp:1342 +#: gui/options.cpp:1414 msgid "Theme Path:" msgstr "Путь к темам:" -#: gui/options.cpp:1344 +#: gui/options.cpp:1416 msgctxt "lowres" msgid "Theme Path:" msgstr "Где темы:" -#: gui/options.cpp:1350 gui/options.cpp:1352 gui/options.cpp:1353 +#: gui/options.cpp:1422 gui/options.cpp:1424 gui/options.cpp:1425 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Указывает путь к дополнительным файлам данных, используемых всеми играми " "либо ScummVM" -#: gui/options.cpp:1359 +#: gui/options.cpp:1431 msgid "Plugins Path:" msgstr "Путь к плагинам:" -#: gui/options.cpp:1361 +#: gui/options.cpp:1433 msgctxt "lowres" msgid "Plugins Path:" msgstr "Путь к плагинам:" -#: gui/options.cpp:1372 +#: gui/options.cpp:1444 msgctxt "lowres" msgid "Misc" msgstr "Разное" -#: gui/options.cpp:1374 +#: gui/options.cpp:1446 msgid "Theme:" msgstr "Тема:" -#: gui/options.cpp:1378 +#: gui/options.cpp:1450 msgid "GUI Renderer:" msgstr "Рисовалка GUI:" -#: gui/options.cpp:1390 +#: gui/options.cpp:1462 msgid "Autosave:" msgstr "Автосохранение:" -#: gui/options.cpp:1392 +#: gui/options.cpp:1464 msgctxt "lowres" msgid "Autosave:" msgstr "Автосохр.:" -#: gui/options.cpp:1400 +#: gui/options.cpp:1472 msgid "Keys" msgstr "Клавиши" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "GUI Language:" msgstr "Язык GUI:" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "Language of ScummVM GUI" msgstr "Язык графического интерфейса ScummVM" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "Update check:" msgstr "Проверять обновления:" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "How often to check ScummVM updates" msgstr "Как часто проверять обновления ScummVM" -#: gui/options.cpp:1447 +#: gui/options.cpp:1519 msgid "Check now" msgstr "Проверить сейчас" -#: gui/options.cpp:1455 +#: gui/options.cpp:1527 msgid "Cloud" msgstr "Облако" -#: gui/options.cpp:1457 +#: gui/options.cpp:1529 msgctxt "lowres" msgid "Cloud" msgstr "Облако" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Storage:" msgstr "Облако:" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Active cloud storage" msgstr "Активное облачное хранилище" -#: gui/options.cpp:1469 gui/options.cpp:2026 +#: gui/options.cpp:1541 gui/options.cpp:2098 msgid "<none>" msgstr "<нет>" -#: gui/options.cpp:1473 backends/platform/wii/options.cpp:114 +#: gui/options.cpp:1545 backends/platform/wii/options.cpp:114 msgid "Username:" msgstr "Пользователь:" -#: gui/options.cpp:1473 +#: gui/options.cpp:1545 msgid "Username used by this storage" msgstr "Имя пользователя в этом облаке" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Used space:" msgstr "Используемый объём:" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Space used by ScummVM's saved games on this storage" msgstr "Объём, занимаемый сохранениями игр ScummVM на этом облаке" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "Last sync time:" msgstr "Последняя синхронизация:" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "When the last saved games sync for this storage occured" msgstr "Когда производилась последняя синхронизация с этим облаком" -#: gui/options.cpp:1482 gui/storagewizarddialog.cpp:71 +#: gui/options.cpp:1554 gui/storagewizarddialog.cpp:71 msgid "Connect" msgstr "Подключить" -#: gui/options.cpp:1482 +#: gui/options.cpp:1554 msgid "Open wizard dialog to connect your cloud storage account" msgstr "Открывает диалог для установки подключения к облаку" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh" msgstr "Обновить" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh current cloud storage information (username and usage)" msgstr "Обновляет текущую информацию об облаке (имя пользователя и объём)" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Download" msgstr "Загрузить" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Open downloads manager dialog" msgstr "Открывает менеджер загрузок" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run server" msgstr "Запустить сервер" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run local webserver" msgstr "Запускает локальный веб-сервер" -#: gui/options.cpp:1487 gui/options.cpp:2136 +#: gui/options.cpp:1559 gui/options.cpp:2208 msgid "Not running" msgstr "Не запущен" -#: gui/options.cpp:1491 +#: gui/options.cpp:1563 msgid "/root/ Path:" msgstr "Корневая директория:" -#: gui/options.cpp:1491 gui/options.cpp:1493 gui/options.cpp:1494 +#: gui/options.cpp:1563 gui/options.cpp:1565 gui/options.cpp:1566 msgid "Specifies which directory the Files Manager can access" msgstr "Указывает путь к директории, куда будет иметь доступ Менеджер файлов" -#: gui/options.cpp:1493 +#: gui/options.cpp:1565 msgctxt "lowres" msgid "/root/ Path:" msgstr "Корень:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "Server's port:" msgstr "Порт сервера:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "" "Which port is used by the server\n" "Auth with server is not available with non-default port" @@ -1277,19 +1295,19 @@ msgstr "" "Номер порта, используемый сервером\n" "Установление доступа работает только с портом по умолчанию" -#: gui/options.cpp:1516 +#: gui/options.cpp:1588 msgid "Apply" msgstr "Применить" -#: gui/options.cpp:1682 +#: gui/options.cpp:1754 msgid "Failed to change cloud storage!" msgstr "Не удалось сменить облако!" -#: gui/options.cpp:1685 +#: gui/options.cpp:1757 msgid "Another cloud storage is already active." msgstr "Уже активно другое облачное хранилище." -#: gui/options.cpp:1721 +#: gui/options.cpp:1793 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1297,48 +1315,48 @@ msgstr "" "Тема, выбранная вами, не поддерживает текущий язык. Если вы хотите " "использовать эту тему, вам необходимо сначала переключиться на другой язык." -#: gui/options.cpp:1756 +#: gui/options.cpp:1828 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Не могу писать в выбранную директорию. Пожалуйста, укажите другую." -#: gui/options.cpp:1765 +#: gui/options.cpp:1837 msgid "Select directory for GUI themes" msgstr "Выберите директорию для тем GUI" -#: gui/options.cpp:1775 +#: gui/options.cpp:1847 msgid "Select directory for extra files" msgstr "Выберите директорию с дополнительными файлами" -#: gui/options.cpp:1786 +#: gui/options.cpp:1858 msgid "Select directory for plugins" msgstr "Выберите директорию с плагинами" -#: gui/options.cpp:1798 +#: gui/options.cpp:1870 msgid "Select directory for Files Manager /root/" msgstr "Выберите директорию для корня в Менеджере файлов" -#: gui/options.cpp:2033 +#: gui/options.cpp:2105 #, c-format msgid "%llu bytes" msgstr "%llu байт" -#: gui/options.cpp:2041 +#: gui/options.cpp:2113 msgid "<right now>" msgstr "<сейчас>" -#: gui/options.cpp:2043 +#: gui/options.cpp:2115 msgid "<never>" msgstr "<никогда>" -#: gui/options.cpp:2127 +#: gui/options.cpp:2199 msgid "Stop server" msgstr "Остановить сервер" -#: gui/options.cpp:2128 +#: gui/options.cpp:2200 msgid "Stop local webserver" msgstr "Останавливает локальный веб-сервер" -#: gui/options.cpp:2219 +#: gui/options.cpp:2291 msgid "" "Request failed.\n" "Check your Internet connection." diff --git a/po/scummvm.pot b/po/scummvm.pot index 477b851fb5..a5a1f6cc5e 100644 --- a/po/scummvm.pot +++ b/po/scummvm.pot @@ -8,7 +8,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-02-11 08:56+0100\n" +"POT-Creation-Date: 2017-02-21 23:29+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:1515 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69 +#: gui/options.cpp:1587 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:443 #: gui/saveload-dialog.cpp:717 gui/saveload-dialog.cpp:1111 @@ -148,7 +148,7 @@ msgstr "" #: gui/downloaddialog.cpp:146 gui/editgamedialog.cpp:293 #: gui/fluidsynth-dialog.cpp:153 gui/KeysDialog.cpp:42 gui/launcher.cpp:522 -#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1517 +#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1589 #: gui/saveload-dialog.cpp:1112 engines/engine.cpp:477 engines/engine.cpp:488 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 @@ -228,7 +228,7 @@ msgid "" msgstr "" #: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:121 -#: gui/options.cpp:845 gui/options.cpp:858 gui/options.cpp:1410 +#: gui/options.cpp:907 gui/options.cpp:920 gui/options.cpp:1482 #: audio/null.cpp:41 msgid "<default>" msgstr "" @@ -251,11 +251,11 @@ msgstr "" msgid "Engine" msgstr "" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "Graphics" msgstr "" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "GFX" msgstr "" @@ -268,7 +268,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "" -#: gui/editgamedialog.cpp:196 gui/options.cpp:1292 +#: gui/editgamedialog.cpp:196 gui/options.cpp:1364 msgid "Audio" msgstr "" @@ -281,11 +281,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "" -#: gui/editgamedialog.cpp:210 gui/options.cpp:1297 +#: gui/editgamedialog.cpp:210 gui/options.cpp:1369 msgid "Volume" msgstr "" -#: gui/editgamedialog.cpp:212 gui/options.cpp:1299 +#: gui/editgamedialog.cpp:212 gui/options.cpp:1371 msgctxt "lowres" msgid "Volume" msgstr "" @@ -299,7 +299,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "" -#: gui/editgamedialog.cpp:226 gui/options.cpp:1307 +#: gui/editgamedialog.cpp:226 gui/options.cpp:1379 msgid "MIDI" msgstr "" @@ -312,7 +312,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "" -#: gui/editgamedialog.cpp:241 gui/options.cpp:1317 +#: gui/editgamedialog.cpp:241 gui/options.cpp:1389 msgid "MT-32" msgstr "" @@ -325,11 +325,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "" -#: gui/editgamedialog.cpp:255 gui/options.cpp:1324 +#: gui/editgamedialog.cpp:255 gui/options.cpp:1396 msgid "Paths" msgstr "" -#: gui/editgamedialog.cpp:257 gui/options.cpp:1326 +#: gui/editgamedialog.cpp:257 gui/options.cpp:1398 msgctxt "lowres" msgid "Paths" msgstr "" @@ -343,7 +343,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "" -#: gui/editgamedialog.cpp:271 gui/options.cpp:1350 +#: gui/editgamedialog.cpp:271 gui/options.cpp:1422 msgid "Extra Path:" msgstr "" @@ -352,44 +352,44 @@ msgstr "" msgid "Specifies path to additional data used by the game" msgstr "" -#: gui/editgamedialog.cpp:273 gui/options.cpp:1352 +#: gui/editgamedialog.cpp:273 gui/options.cpp:1424 msgctxt "lowres" msgid "Extra Path:" msgstr "" -#: gui/editgamedialog.cpp:280 gui/options.cpp:1334 +#: gui/editgamedialog.cpp:280 gui/options.cpp:1406 msgid "Save Path:" msgstr "" #: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282 -#: gui/editgamedialog.cpp:283 gui/options.cpp:1334 gui/options.cpp:1336 -#: gui/options.cpp:1337 +#: gui/editgamedialog.cpp:283 gui/options.cpp:1406 gui/options.cpp:1408 +#: gui/options.cpp:1409 msgid "Specifies where your saved games are put" msgstr "" -#: gui/editgamedialog.cpp:282 gui/options.cpp:1336 +#: gui/editgamedialog.cpp:282 gui/options.cpp:1408 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:1345 -#: gui/options.cpp:1353 gui/options.cpp:1362 gui/options.cpp:1542 -#: gui/options.cpp:1548 gui/options.cpp:1556 gui/options.cpp:1579 -#: gui/options.cpp:1608 gui/options.cpp:1614 gui/options.cpp:1621 -#: gui/options.cpp:1629 gui/options.cpp:1812 gui/options.cpp:1815 -#: gui/options.cpp:1822 gui/options.cpp:1832 +#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1417 +#: gui/options.cpp:1425 gui/options.cpp:1434 gui/options.cpp:1614 +#: gui/options.cpp:1620 gui/options.cpp:1628 gui/options.cpp:1651 +#: gui/options.cpp:1680 gui/options.cpp:1686 gui/options.cpp:1693 +#: gui/options.cpp:1701 gui/options.cpp:1884 gui/options.cpp:1887 +#: gui/options.cpp:1894 gui/options.cpp:1904 msgctxt "path" msgid "None" msgstr "" #: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404 -#: gui/editgamedialog.cpp:522 gui/options.cpp:1536 gui/options.cpp:1602 -#: gui/options.cpp:1818 backends/platform/wii/options.cpp:56 +#: gui/editgamedialog.cpp:522 gui/options.cpp:1608 gui/options.cpp:1674 +#: gui/options.cpp:1890 backends/platform/wii/options.cpp:56 msgid "Default" msgstr "" -#: gui/editgamedialog.cpp:450 gui/options.cpp:1826 +#: gui/editgamedialog.cpp:450 gui/options.cpp:1898 msgid "Select SoundFont" msgstr "" @@ -397,7 +397,7 @@ msgstr "" msgid "Select additional game directory" msgstr "" -#: gui/editgamedialog.cpp:502 gui/options.cpp:1749 +#: gui/editgamedialog.cpp:502 gui/options.cpp:1821 msgid "Select directory for saved games" msgstr "" @@ -487,7 +487,7 @@ msgstr "" msgid "Triangle" msgstr "" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1370 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1442 msgid "Misc" msgstr "" @@ -801,505 +801,521 @@ msgstr "" msgid "48 kHz" msgstr "" -#: gui/options.cpp:289 gui/options.cpp:552 gui/options.cpp:690 -#: gui/options.cpp:759 gui/options.cpp:970 +#: gui/options.cpp:316 gui/options.cpp:598 gui/options.cpp:736 +#: gui/options.cpp:805 gui/options.cpp:1032 msgctxt "soundfont" msgid "None" msgstr "" -#: gui/options.cpp:456 +#: gui/options.cpp:502 msgid "Failed to apply some of the graphic options changes:" msgstr "" -#: gui/options.cpp:468 +#: gui/options.cpp:514 msgid "the video mode could not be changed." msgstr "" -#: gui/options.cpp:474 +#: gui/options.cpp:520 msgid "the aspect ratio setting could not be changed" msgstr "" -#: gui/options.cpp:480 +#: gui/options.cpp:526 msgid "the fullscreen setting could not be changed" msgstr "" -#: gui/options.cpp:486 +#: gui/options.cpp:532 msgid "the filtering setting could not be changed" msgstr "" -#: gui/options.cpp:842 +#: gui/options.cpp:884 +msgid "Show On-screen control" +msgstr "" + +#: gui/options.cpp:888 +msgid "Touchpad mouse mode" +msgstr "" + +#: gui/options.cpp:892 +msgid "Swap Menu and Back buttons" +msgstr "" + +#: gui/options.cpp:904 msgid "Graphics mode:" msgstr "" -#: gui/options.cpp:856 +#: gui/options.cpp:918 msgid "Render mode:" msgstr "" -#: gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:918 gui/options.cpp:919 msgid "Special dithering modes supported by some games" msgstr "" -#: gui/options.cpp:868 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 +#: gui/options.cpp:930 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2460 msgid "Fullscreen mode" msgstr "" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Filter graphics" msgstr "" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Use linear filtering when scaling graphics" msgstr "" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Aspect ratio correction" msgstr "" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Correct aspect ratio for 320x200 games" msgstr "" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Preferred Device:" msgstr "" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Music Device:" msgstr "" -#: gui/options.cpp:882 gui/options.cpp:884 +#: gui/options.cpp:944 gui/options.cpp:946 msgid "Specifies preferred sound device or sound card emulator" msgstr "" -#: gui/options.cpp:882 gui/options.cpp:884 gui/options.cpp:885 +#: gui/options.cpp:944 gui/options.cpp:946 gui/options.cpp:947 msgid "Specifies output sound device or sound card emulator" msgstr "" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Music Device:" msgstr "" -#: gui/options.cpp:911 +#: gui/options.cpp:973 msgid "AdLib emulator:" msgstr "" -#: gui/options.cpp:911 gui/options.cpp:912 +#: gui/options.cpp:973 gui/options.cpp:974 msgid "AdLib is used for music in many games" msgstr "" -#: gui/options.cpp:922 +#: gui/options.cpp:984 msgid "Output rate:" msgstr "" -#: gui/options.cpp:922 gui/options.cpp:923 +#: gui/options.cpp:984 gui/options.cpp:985 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" msgstr "" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "GM Device:" msgstr "" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "Specifies default sound device for General MIDI output" msgstr "" -#: gui/options.cpp:944 +#: gui/options.cpp:1006 msgid "Don't use General MIDI music" msgstr "" -#: gui/options.cpp:955 gui/options.cpp:1017 +#: gui/options.cpp:1017 gui/options.cpp:1079 msgid "Use first available device" msgstr "" -#: gui/options.cpp:967 +#: gui/options.cpp:1029 msgid "SoundFont:" msgstr "" -#: gui/options.cpp:967 gui/options.cpp:969 gui/options.cpp:970 +#: gui/options.cpp:1029 gui/options.cpp:1031 gui/options.cpp:1032 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "" -#: gui/options.cpp:969 +#: gui/options.cpp:1031 msgctxt "lowres" msgid "SoundFont:" msgstr "" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Mixed AdLib/MIDI mode" msgstr "" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Use both MIDI and AdLib sound generation" msgstr "" -#: gui/options.cpp:978 +#: gui/options.cpp:1040 msgid "MIDI gain:" msgstr "" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "MT-32 Device:" msgstr "" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" -#: gui/options.cpp:993 +#: gui/options.cpp:1055 msgid "True Roland MT-32 (disable GM emulation)" msgstr "" -#: gui/options.cpp:993 gui/options.cpp:995 +#: gui/options.cpp:1055 gui/options.cpp:1057 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" msgstr "" -#: gui/options.cpp:995 +#: gui/options.cpp:1057 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" msgstr "" -#: gui/options.cpp:1007 +#: gui/options.cpp:1069 msgid "Don't use Roland MT-32 music" msgstr "" -#: gui/options.cpp:1034 +#: gui/options.cpp:1096 msgid "Text and Speech:" msgstr "" -#: gui/options.cpp:1038 gui/options.cpp:1048 +#: gui/options.cpp:1100 gui/options.cpp:1110 msgid "Speech" msgstr "" -#: gui/options.cpp:1039 gui/options.cpp:1049 +#: gui/options.cpp:1101 gui/options.cpp:1111 msgid "Subtitles" msgstr "" -#: gui/options.cpp:1040 +#: gui/options.cpp:1102 msgid "Both" msgstr "" -#: gui/options.cpp:1042 +#: gui/options.cpp:1104 msgid "Subtitle speed:" msgstr "" -#: gui/options.cpp:1044 +#: gui/options.cpp:1106 msgctxt "lowres" msgid "Text and Speech:" msgstr "" -#: gui/options.cpp:1048 +#: gui/options.cpp:1110 msgid "Spch" msgstr "" -#: gui/options.cpp:1049 +#: gui/options.cpp:1111 msgid "Subs" msgstr "" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgctxt "lowres" msgid "Both" msgstr "" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgid "Show subtitles and play speech" msgstr "" -#: gui/options.cpp:1052 +#: gui/options.cpp:1114 msgctxt "lowres" msgid "Subtitle speed:" msgstr "" -#: gui/options.cpp:1068 +#: gui/options.cpp:1130 msgid "Music volume:" msgstr "" -#: gui/options.cpp:1070 +#: gui/options.cpp:1132 msgctxt "lowres" msgid "Music volume:" msgstr "" -#: gui/options.cpp:1077 +#: gui/options.cpp:1139 msgid "Mute All" msgstr "" -#: gui/options.cpp:1080 +#: gui/options.cpp:1142 msgid "SFX volume:" msgstr "" -#: gui/options.cpp:1080 gui/options.cpp:1082 gui/options.cpp:1083 +#: gui/options.cpp:1142 gui/options.cpp:1144 gui/options.cpp:1145 msgid "Special sound effects volume" msgstr "" -#: gui/options.cpp:1082 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "SFX volume:" msgstr "" -#: gui/options.cpp:1090 +#: gui/options.cpp:1152 msgid "Speech volume:" msgstr "" -#: gui/options.cpp:1092 +#: gui/options.cpp:1154 msgctxt "lowres" msgid "Speech volume:" msgstr "" -#: gui/options.cpp:1311 +#: gui/options.cpp:1351 +msgid "Control" +msgstr "" + +#: gui/options.cpp:1383 msgid "FluidSynth Settings" msgstr "" -#: gui/options.cpp:1342 +#: gui/options.cpp:1414 msgid "Theme Path:" msgstr "" -#: gui/options.cpp:1344 +#: gui/options.cpp:1416 msgctxt "lowres" msgid "Theme Path:" msgstr "" -#: gui/options.cpp:1350 gui/options.cpp:1352 gui/options.cpp:1353 +#: gui/options.cpp:1422 gui/options.cpp:1424 gui/options.cpp:1425 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" -#: gui/options.cpp:1359 +#: gui/options.cpp:1431 msgid "Plugins Path:" msgstr "" -#: gui/options.cpp:1361 +#: gui/options.cpp:1433 msgctxt "lowres" msgid "Plugins Path:" msgstr "" -#: gui/options.cpp:1372 +#: gui/options.cpp:1444 msgctxt "lowres" msgid "Misc" msgstr "" -#: gui/options.cpp:1374 +#: gui/options.cpp:1446 msgid "Theme:" msgstr "" -#: gui/options.cpp:1378 +#: gui/options.cpp:1450 msgid "GUI Renderer:" msgstr "" -#: gui/options.cpp:1390 +#: gui/options.cpp:1462 msgid "Autosave:" msgstr "" -#: gui/options.cpp:1392 +#: gui/options.cpp:1464 msgctxt "lowres" msgid "Autosave:" msgstr "" -#: gui/options.cpp:1400 +#: gui/options.cpp:1472 msgid "Keys" msgstr "" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "GUI Language:" msgstr "" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "Language of ScummVM GUI" msgstr "" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "Update check:" msgstr "" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "How often to check ScummVM updates" msgstr "" -#: gui/options.cpp:1447 +#: gui/options.cpp:1519 msgid "Check now" msgstr "" -#: gui/options.cpp:1455 +#: gui/options.cpp:1527 msgid "Cloud" msgstr "" -#: gui/options.cpp:1457 +#: gui/options.cpp:1529 msgctxt "lowres" msgid "Cloud" msgstr "" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Storage:" msgstr "" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Active cloud storage" msgstr "" -#: gui/options.cpp:1469 gui/options.cpp:2026 +#: gui/options.cpp:1541 gui/options.cpp:2098 msgid "<none>" msgstr "" -#: gui/options.cpp:1473 backends/platform/wii/options.cpp:114 +#: gui/options.cpp:1545 backends/platform/wii/options.cpp:114 msgid "Username:" msgstr "" -#: gui/options.cpp:1473 +#: gui/options.cpp:1545 msgid "Username used by this storage" msgstr "" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Used space:" msgstr "" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Space used by ScummVM's saved games on this storage" msgstr "" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "Last sync time:" msgstr "" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "When the last saved games sync for this storage occured" msgstr "" -#: gui/options.cpp:1482 gui/storagewizarddialog.cpp:71 +#: gui/options.cpp:1554 gui/storagewizarddialog.cpp:71 msgid "Connect" msgstr "" -#: gui/options.cpp:1482 +#: gui/options.cpp:1554 msgid "Open wizard dialog to connect your cloud storage account" msgstr "" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh" msgstr "" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh current cloud storage information (username and usage)" msgstr "" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Download" msgstr "" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Open downloads manager dialog" msgstr "" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run server" msgstr "" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run local webserver" msgstr "" -#: gui/options.cpp:1487 gui/options.cpp:2136 +#: gui/options.cpp:1559 gui/options.cpp:2208 msgid "Not running" msgstr "" -#: gui/options.cpp:1491 +#: gui/options.cpp:1563 msgid "/root/ Path:" msgstr "" -#: gui/options.cpp:1491 gui/options.cpp:1493 gui/options.cpp:1494 +#: gui/options.cpp:1563 gui/options.cpp:1565 gui/options.cpp:1566 msgid "Specifies which directory the Files Manager can access" msgstr "" -#: gui/options.cpp:1493 +#: gui/options.cpp:1565 msgctxt "lowres" msgid "/root/ Path:" msgstr "" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "Server's port:" msgstr "" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "" "Which port is used by the server\n" "Auth with server is not available with non-default port" msgstr "" -#: gui/options.cpp:1516 +#: gui/options.cpp:1588 msgid "Apply" msgstr "" -#: gui/options.cpp:1682 +#: gui/options.cpp:1754 msgid "Failed to change cloud storage!" msgstr "" -#: gui/options.cpp:1685 +#: gui/options.cpp:1757 msgid "Another cloud storage is already active." msgstr "" -#: gui/options.cpp:1721 +#: gui/options.cpp:1793 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." msgstr "" -#: gui/options.cpp:1756 +#: gui/options.cpp:1828 msgid "The chosen directory cannot be written to. Please select another one." msgstr "" -#: gui/options.cpp:1765 +#: gui/options.cpp:1837 msgid "Select directory for GUI themes" msgstr "" -#: gui/options.cpp:1775 +#: gui/options.cpp:1847 msgid "Select directory for extra files" msgstr "" -#: gui/options.cpp:1786 +#: gui/options.cpp:1858 msgid "Select directory for plugins" msgstr "" -#: gui/options.cpp:1798 +#: gui/options.cpp:1870 msgid "Select directory for Files Manager /root/" msgstr "" -#: gui/options.cpp:2033 +#: gui/options.cpp:2105 #, c-format msgid "%llu bytes" msgstr "" -#: gui/options.cpp:2041 +#: gui/options.cpp:2113 msgid "<right now>" msgstr "" -#: gui/options.cpp:2043 +#: gui/options.cpp:2115 msgid "<never>" msgstr "" -#: gui/options.cpp:2127 +#: gui/options.cpp:2199 msgid "Stop server" msgstr "" -#: gui/options.cpp:2128 +#: gui/options.cpp:2200 msgid "Stop local webserver" msgstr "" -#: gui/options.cpp:2219 +#: gui/options.cpp:2291 msgid "" "Request failed.\n" "Check your Internet connection." diff --git a/po/sv_SE.po b/po/sv_SE.po index 3f9ce4a44c..cd83acb6bb 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-02-11 08:56+0100\n" +"POT-Creation-Date: 2017-02-21 23:29+0100\n" "PO-Revision-Date: 2017-01-06 09:18+0000\n" "Last-Translator: Petter Sjіlund <ignalina@mac.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:1515 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69 +#: gui/options.cpp:1587 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:443 #: gui/saveload-dialog.cpp:717 gui/saveload-dialog.cpp:1111 @@ -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:522 -#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1517 +#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1589 #: gui/saveload-dialog.cpp:1112 engines/engine.cpp:477 engines/engine.cpp:488 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 @@ -242,7 +242,7 @@ msgstr "" "till en engelsk" #: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:121 -#: gui/options.cpp:845 gui/options.cpp:858 gui/options.cpp:1410 +#: gui/options.cpp:907 gui/options.cpp:920 gui/options.cpp:1482 #: audio/null.cpp:41 msgid "<default>" msgstr "<standard>" @@ -265,11 +265,11 @@ msgstr "Plattform:" msgid "Engine" msgstr "Motor" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "Graphics" msgstr "Grafik" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "GFX" msgstr "GFX" @@ -282,7 +282,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "жverskrid globala grafikinstфllningar" -#: gui/editgamedialog.cpp:196 gui/options.cpp:1292 +#: gui/editgamedialog.cpp:196 gui/options.cpp:1364 msgid "Audio" msgstr "Ljud" @@ -295,11 +295,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "жverskrid globala ljudinstфllningar" -#: gui/editgamedialog.cpp:210 gui/options.cpp:1297 +#: gui/editgamedialog.cpp:210 gui/options.cpp:1369 msgid "Volume" msgstr "Volym" -#: gui/editgamedialog.cpp:212 gui/options.cpp:1299 +#: gui/editgamedialog.cpp:212 gui/options.cpp:1371 msgctxt "lowres" msgid "Volume" msgstr "Volym" @@ -313,7 +313,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "жverskrid globala volyminstфllningar" -#: gui/editgamedialog.cpp:226 gui/options.cpp:1307 +#: gui/editgamedialog.cpp:226 gui/options.cpp:1379 msgid "MIDI" msgstr "MIDI" @@ -326,7 +326,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "жverskrid globala MIDI-instфllningar" -#: gui/editgamedialog.cpp:241 gui/options.cpp:1317 +#: gui/editgamedialog.cpp:241 gui/options.cpp:1389 msgid "MT-32" msgstr "MT-32" @@ -339,11 +339,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "жverskrid globala MT-32 instфllningar" -#: gui/editgamedialog.cpp:255 gui/options.cpp:1324 +#: gui/editgamedialog.cpp:255 gui/options.cpp:1396 msgid "Paths" msgstr "Sіkvфgar" -#: gui/editgamedialog.cpp:257 gui/options.cpp:1326 +#: gui/editgamedialog.cpp:257 gui/options.cpp:1398 msgctxt "lowres" msgid "Paths" msgstr "Sіkvфgar" @@ -357,7 +357,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Sіkv. spel:" -#: gui/editgamedialog.cpp:271 gui/options.cpp:1350 +#: gui/editgamedialog.cpp:271 gui/options.cpp:1422 msgid "Extra Path:" msgstr "Sіkv. extra:" @@ -366,44 +366,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:1352 +#: gui/editgamedialog.cpp:273 gui/options.cpp:1424 msgctxt "lowres" msgid "Extra Path:" msgstr "Sіkv. extra:" -#: gui/editgamedialog.cpp:280 gui/options.cpp:1334 +#: gui/editgamedialog.cpp:280 gui/options.cpp:1406 msgid "Save Path:" msgstr "Sіkv. sparat:" #: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282 -#: gui/editgamedialog.cpp:283 gui/options.cpp:1334 gui/options.cpp:1336 -#: gui/options.cpp:1337 +#: gui/editgamedialog.cpp:283 gui/options.cpp:1406 gui/options.cpp:1408 +#: gui/options.cpp:1409 msgid "Specifies where your saved games are put" msgstr "Bestфmmer var dina spardata lagras" -#: gui/editgamedialog.cpp:282 gui/options.cpp:1336 +#: gui/editgamedialog.cpp:282 gui/options.cpp:1408 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:1345 -#: gui/options.cpp:1353 gui/options.cpp:1362 gui/options.cpp:1542 -#: gui/options.cpp:1548 gui/options.cpp:1556 gui/options.cpp:1579 -#: gui/options.cpp:1608 gui/options.cpp:1614 gui/options.cpp:1621 -#: gui/options.cpp:1629 gui/options.cpp:1812 gui/options.cpp:1815 -#: gui/options.cpp:1822 gui/options.cpp:1832 +#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1417 +#: gui/options.cpp:1425 gui/options.cpp:1434 gui/options.cpp:1614 +#: gui/options.cpp:1620 gui/options.cpp:1628 gui/options.cpp:1651 +#: gui/options.cpp:1680 gui/options.cpp:1686 gui/options.cpp:1693 +#: gui/options.cpp:1701 gui/options.cpp:1884 gui/options.cpp:1887 +#: gui/options.cpp:1894 gui/options.cpp:1904 msgctxt "path" msgid "None" msgstr "Ingen" #: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404 -#: gui/editgamedialog.cpp:522 gui/options.cpp:1536 gui/options.cpp:1602 -#: gui/options.cpp:1818 backends/platform/wii/options.cpp:56 +#: gui/editgamedialog.cpp:522 gui/options.cpp:1608 gui/options.cpp:1674 +#: gui/options.cpp:1890 backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/editgamedialog.cpp:450 gui/options.cpp:1826 +#: gui/editgamedialog.cpp:450 gui/options.cpp:1898 msgid "Select SoundFont" msgstr "Vфlj SoundFont" @@ -411,7 +411,7 @@ msgstr "Vфlj SoundFont" msgid "Select additional game directory" msgstr "Vфlj en ytterligare spelkatalog" -#: gui/editgamedialog.cpp:502 gui/options.cpp:1749 +#: gui/editgamedialog.cpp:502 gui/options.cpp:1821 msgid "Select directory for saved games" msgstr "Vфlj katalog fіr spardata" @@ -503,7 +503,7 @@ msgstr "Sinus" msgid "Triangle" msgstr "Triangel" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1370 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1442 msgid "Misc" msgstr "Diverse" @@ -824,104 +824,117 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:289 gui/options.cpp:552 gui/options.cpp:690 -#: gui/options.cpp:759 gui/options.cpp:970 +#: gui/options.cpp:316 gui/options.cpp:598 gui/options.cpp:736 +#: gui/options.cpp:805 gui/options.cpp:1032 msgctxt "soundfont" msgid "None" msgstr "Ingen" -#: gui/options.cpp:456 +#: gui/options.cpp:502 msgid "Failed to apply some of the graphic options changes:" msgstr "Kunde inte verkstфlla nхgra av grafikinstфllningarna:" -#: gui/options.cpp:468 +#: gui/options.cpp:514 msgid "the video mode could not be changed." msgstr "videolфget kunde inte фndras." -#: gui/options.cpp:474 +#: gui/options.cpp:520 msgid "the aspect ratio setting could not be changed" msgstr "instфllningen fіr bildfіrhхllandet kunde inte фndras" -#: gui/options.cpp:480 +#: gui/options.cpp:526 msgid "the fullscreen setting could not be changed" msgstr "fullskфrmsinstфllningen kunde inte фndras" -#: gui/options.cpp:486 +#: gui/options.cpp:532 msgid "the filtering setting could not be changed" msgstr "filterinstфllningen kunde inte фndras" -#: gui/options.cpp:842 +#: gui/options.cpp:884 +msgid "Show On-screen control" +msgstr "" + +#: gui/options.cpp:888 +#, fuzzy +msgid "Touchpad mouse mode" +msgstr "Touchpad-lфge inaktiverat." + +#: gui/options.cpp:892 +msgid "Swap Menu and Back buttons" +msgstr "" + +#: gui/options.cpp:904 msgid "Graphics mode:" msgstr "Grafiklфge:" -#: gui/options.cpp:856 +#: gui/options.cpp:918 msgid "Render mode:" msgstr "Renderingslфge:" -#: gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:918 gui/options.cpp:919 msgid "Special dithering modes supported by some games" msgstr "Speciella gitterlфgen stіdda av vissa spel" -#: gui/options.cpp:868 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 +#: gui/options.cpp:930 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2460 msgid "Fullscreen mode" msgstr "Fullskфrmslфge" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Filter graphics" msgstr "Filtrera grafik" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Use linear filtering when scaling graphics" msgstr "Anvфnd linjфrt filter fіr att fіrstora bilden" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Aspect ratio correction" msgstr "Korrektion av bildfіrhхllande" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Correct aspect ratio for 320x200 games" msgstr "Korrigera bildfіrhхllandet fіr 320 x 200-spel" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Preferred Device:" msgstr "Fіredragen enhet:" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Music Device:" msgstr "Musikenhet:" -#: gui/options.cpp:882 gui/options.cpp:884 +#: gui/options.cpp:944 gui/options.cpp:946 msgid "Specifies preferred sound device or sound card emulator" msgstr "Bestфmmer din fіredragna emulator fіr ljudenhet eller ljudkort" -#: gui/options.cpp:882 gui/options.cpp:884 gui/options.cpp:885 +#: gui/options.cpp:944 gui/options.cpp:946 gui/options.cpp:947 msgid "Specifies output sound device or sound card emulator" msgstr "Bestфmmer emulator fіr ljudenhet eller ljudkort" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Fіredr. enhet:" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Music Device:" msgstr "Musikenhet:" -#: gui/options.cpp:911 +#: gui/options.cpp:973 msgid "AdLib emulator:" msgstr "AdLib-emulator:" -#: gui/options.cpp:911 gui/options.cpp:912 +#: gui/options.cpp:973 gui/options.cpp:974 msgid "AdLib is used for music in many games" msgstr "AdLib anvфnds fіr musik i mхnga spel" -#: gui/options.cpp:922 +#: gui/options.cpp:984 msgid "Output rate:" msgstr "Ljudfrekvens:" -#: gui/options.cpp:922 gui/options.cpp:923 +#: gui/options.cpp:984 gui/options.cpp:985 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -929,61 +942,61 @@ msgstr "" "Ett hіgre vфrde betecknar bфttre ljudkvalitet men stіds kanske inte av ditt " "ljudkort" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "GM Device:" msgstr "GM-enhet:" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "Specifies default sound device for General MIDI output" msgstr "Bestфmmer standardenheten fіr General MIDI-uppspelning" -#: gui/options.cpp:944 +#: gui/options.cpp:1006 msgid "Don't use General MIDI music" msgstr "Anvфnd inte General MIDI-musik" -#: gui/options.cpp:955 gui/options.cpp:1017 +#: gui/options.cpp:1017 gui/options.cpp:1079 msgid "Use first available device" msgstr "Anvфnd fіrsta tillgфngliga enhet" -#: gui/options.cpp:967 +#: gui/options.cpp:1029 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:967 gui/options.cpp:969 gui/options.cpp:970 +#: gui/options.cpp:1029 gui/options.cpp:1031 gui/options.cpp:1032 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:969 +#: gui/options.cpp:1031 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Mixed AdLib/MIDI mode" msgstr "Blandat AdLib/MIDI-lфge" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Use both MIDI and AdLib sound generation" msgstr "Anvфnd bхde MIDI och AdLib fіr ljudgeneration" -#: gui/options.cpp:978 +#: gui/options.cpp:1040 msgid "MIDI gain:" msgstr "MIDI gain:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "MT-32 Device:" msgstr "MT-32 enhet:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 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:993 +#: gui/options.cpp:1055 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Фkta Roland MT-32 (inaktivera GM-emulation)" -#: gui/options.cpp:993 gui/options.cpp:995 +#: gui/options.cpp:1055 gui/options.cpp:1057 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -991,16 +1004,16 @@ msgstr "" "Aktivera om du vill anvфnda din verkliga Roland-kompatibla och dator-" "anslutna ljudenhet" -#: gui/options.cpp:995 +#: gui/options.cpp:1057 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Фkta Roland MT-32 (ingen GM-emulation)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland GS-enhet (aktivera MT-32 mappings)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -1008,265 +1021,270 @@ msgstr "" "Aktivera om du vill anvфnda patch mapping fіr att emulera en MT-32 pх en " "Roland GS-enhet" -#: gui/options.cpp:1007 +#: gui/options.cpp:1069 msgid "Don't use Roland MT-32 music" msgstr "Anvфnd inte Roland MT-32 musik" -#: gui/options.cpp:1034 +#: gui/options.cpp:1096 msgid "Text and Speech:" msgstr "Undertext och tal:" -#: gui/options.cpp:1038 gui/options.cpp:1048 +#: gui/options.cpp:1100 gui/options.cpp:1110 msgid "Speech" msgstr "Tal" -#: gui/options.cpp:1039 gui/options.cpp:1049 +#: gui/options.cpp:1101 gui/options.cpp:1111 msgid "Subtitles" msgstr "Undertexter" -#: gui/options.cpp:1040 +#: gui/options.cpp:1102 msgid "Both" msgstr "Bхda" -#: gui/options.cpp:1042 +#: gui/options.cpp:1104 msgid "Subtitle speed:" msgstr "Texthastighet:" -#: gui/options.cpp:1044 +#: gui/options.cpp:1106 msgctxt "lowres" msgid "Text and Speech:" msgstr "Text och tal:" -#: gui/options.cpp:1048 +#: gui/options.cpp:1110 msgid "Spch" msgstr "Tal" -#: gui/options.cpp:1049 +#: gui/options.cpp:1111 msgid "Subs" msgstr "Text" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgctxt "lowres" msgid "Both" msgstr "Bхda" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgid "Show subtitles and play speech" msgstr "Visa undertexter och spela upp tal" -#: gui/options.cpp:1052 +#: gui/options.cpp:1114 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Texthastighet:" -#: gui/options.cpp:1068 +#: gui/options.cpp:1130 msgid "Music volume:" msgstr "Musikvolym:" -#: gui/options.cpp:1070 +#: gui/options.cpp:1132 msgctxt "lowres" msgid "Music volume:" msgstr "Musikvolym:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1139 msgid "Mute All" msgstr "Ljud av" -#: gui/options.cpp:1080 +#: gui/options.cpp:1142 msgid "SFX volume:" msgstr "SFX-volym:" -#: gui/options.cpp:1080 gui/options.cpp:1082 gui/options.cpp:1083 +#: gui/options.cpp:1142 gui/options.cpp:1144 gui/options.cpp:1145 msgid "Special sound effects volume" msgstr "Volym fіr specialeffekter" -#: gui/options.cpp:1082 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "SFX volume:" msgstr "SFX-volym:" -#: gui/options.cpp:1090 +#: gui/options.cpp:1152 msgid "Speech volume:" msgstr "Talvolym:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1154 msgctxt "lowres" msgid "Speech volume:" msgstr "Talvolym:" -#: gui/options.cpp:1311 +#: gui/options.cpp:1351 +#, fuzzy +msgid "Control" +msgstr "Kontrollera musen" + +#: gui/options.cpp:1383 msgid "FluidSynth Settings" msgstr "FluidSynth instфllningar" -#: gui/options.cpp:1342 +#: gui/options.cpp:1414 msgid "Theme Path:" msgstr "Sіkv. tema:" -#: gui/options.cpp:1344 +#: gui/options.cpp:1416 msgctxt "lowres" msgid "Theme Path:" msgstr "Sіkv. tema:" -#: gui/options.cpp:1350 gui/options.cpp:1352 gui/options.cpp:1353 +#: gui/options.cpp:1422 gui/options.cpp:1424 gui/options.cpp:1425 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:1359 +#: gui/options.cpp:1431 msgid "Plugins Path:" msgstr "Sіkv. tillфgg:" -#: gui/options.cpp:1361 +#: gui/options.cpp:1433 msgctxt "lowres" msgid "Plugins Path:" msgstr "Sіkv. tillфgg:" -#: gui/options.cpp:1372 +#: gui/options.cpp:1444 msgctxt "lowres" msgid "Misc" msgstr "Diverse" -#: gui/options.cpp:1374 +#: gui/options.cpp:1446 msgid "Theme:" msgstr "Tema:" -#: gui/options.cpp:1378 +#: gui/options.cpp:1450 msgid "GUI Renderer:" msgstr "GUI-rendering:" -#: gui/options.cpp:1390 +#: gui/options.cpp:1462 msgid "Autosave:" msgstr "Autospara:" -#: gui/options.cpp:1392 +#: gui/options.cpp:1464 msgctxt "lowres" msgid "Autosave:" msgstr "Autospara:" -#: gui/options.cpp:1400 +#: gui/options.cpp:1472 msgid "Keys" msgstr "Tangenter" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "GUI Language:" msgstr "GUI-sprхk:" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "Language of ScummVM GUI" msgstr "Sprхk fіr ScummVM:s anvфndargrфnssnitt" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "Update check:" msgstr "Uppdateringskoll:" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "How often to check ScummVM updates" msgstr "Hur ofta ScummVM kollar efter uppdateringar" -#: gui/options.cpp:1447 +#: gui/options.cpp:1519 msgid "Check now" msgstr "Kolla nu" -#: gui/options.cpp:1455 +#: gui/options.cpp:1527 msgid "Cloud" msgstr "Moln" -#: gui/options.cpp:1457 +#: gui/options.cpp:1529 msgctxt "lowres" msgid "Cloud" msgstr "Moln" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Storage:" msgstr "Lager:" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Active cloud storage" msgstr "Aktivera molnlagring" -#: gui/options.cpp:1469 gui/options.cpp:2026 +#: gui/options.cpp:1541 gui/options.cpp:2098 msgid "<none>" msgstr "<ingen>" -#: gui/options.cpp:1473 backends/platform/wii/options.cpp:114 +#: gui/options.cpp:1545 backends/platform/wii/options.cpp:114 msgid "Username:" msgstr "Anv. namn:" -#: gui/options.cpp:1473 +#: gui/options.cpp:1545 msgid "Username used by this storage" msgstr "Anvфndarnamn som anvфnds av detta lager" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Used space:" msgstr "Utnyttjat utrymme:" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 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:1479 +#: gui/options.cpp:1551 msgid "Last sync time:" msgstr "Senast synkad:" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 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:1482 gui/storagewizarddialog.cpp:71 +#: gui/options.cpp:1554 gui/storagewizarddialog.cpp:71 msgid "Connect" msgstr "Anslut" -#: gui/options.cpp:1482 +#: gui/options.cpp:1554 msgid "Open wizard dialog to connect your cloud storage account" msgstr "жppna anslutningsguiden fіr att ansluta ditt molnlagerkonto" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh" msgstr "Uppdatera" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh current cloud storage information (username and usage)" msgstr "" "Uppdaterar informationen om aktuellt molnlager (anvфndarnamn och anvфndning)" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Download" msgstr "Nedladdning" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Open downloads manager dialog" msgstr "жppna fіnstret fіr nedladdningshantering" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run server" msgstr "Starta server" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run local webserver" msgstr "Starta lokal webbserver" -#: gui/options.cpp:1487 gui/options.cpp:2136 +#: gui/options.cpp:1559 gui/options.cpp:2208 msgid "Not running" msgstr "Ej aktiv" -#: gui/options.cpp:1491 +#: gui/options.cpp:1563 msgid "/root/ Path:" msgstr "/root/-sіkvфg:" -#: gui/options.cpp:1491 gui/options.cpp:1493 gui/options.cpp:1494 +#: gui/options.cpp:1563 gui/options.cpp:1565 gui/options.cpp:1566 msgid "Specifies which directory the Files Manager can access" msgstr "Bestфmmer vilken katalog filhanteraren har хtkomst till" -#: gui/options.cpp:1493 +#: gui/options.cpp:1565 msgctxt "lowres" msgid "/root/ Path:" msgstr "/root/-sіkvфg:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "Server's port:" msgstr "Serverport:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "" "Which port is used by the server\n" "Auth with server is not available with non-default port" @@ -1274,19 +1292,19 @@ msgstr "" "Vilken port anvфnds av servern\n" "Serverautorisering фr endast tillgфnglig med standardporten" -#: gui/options.cpp:1516 +#: gui/options.cpp:1588 msgid "Apply" msgstr "Verkstфll" -#: gui/options.cpp:1682 +#: gui/options.cpp:1754 msgid "Failed to change cloud storage!" msgstr "Kunde inte фndra molnlager!" -#: gui/options.cpp:1685 +#: gui/options.cpp:1757 msgid "Another cloud storage is already active." msgstr "Ett annat molnlager фr redan aktivt." -#: gui/options.cpp:1721 +#: gui/options.cpp:1793 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1294,49 +1312,49 @@ msgstr "" "Temat du valde stіder inte ditt sprхk. Om du vill anvфnda det hфr temat " "mхste fіrst byta till ett annat sprхk." -#: gui/options.cpp:1756 +#: gui/options.cpp:1828 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:1765 +#: gui/options.cpp:1837 msgid "Select directory for GUI themes" msgstr "Vфlj katalog fіr GUI-teman" -#: gui/options.cpp:1775 +#: gui/options.cpp:1847 msgid "Select directory for extra files" msgstr "Vфlj katalog fіr extra filer" -#: gui/options.cpp:1786 +#: gui/options.cpp:1858 msgid "Select directory for plugins" msgstr "Vфlj katalog fіr tillфgg" -#: gui/options.cpp:1798 +#: gui/options.cpp:1870 msgid "Select directory for Files Manager /root/" msgstr "Vфlj katalog fіr filhanterarens /root/" -#: gui/options.cpp:2033 +#: gui/options.cpp:2105 #, c-format msgid "%llu bytes" msgstr "%llu bytes" -#: gui/options.cpp:2041 +#: gui/options.cpp:2113 msgid "<right now>" msgstr "<nu direkt>" -#: gui/options.cpp:2043 +#: gui/options.cpp:2115 msgid "<never>" msgstr "<aldrig>" -#: gui/options.cpp:2127 +#: gui/options.cpp:2199 msgid "Stop server" msgstr "Stoppa server" -#: gui/options.cpp:2128 +#: gui/options.cpp:2200 msgid "Stop local webserver" msgstr "Stoppa lokal webbserver" -#: gui/options.cpp:2219 +#: gui/options.cpp:2291 msgid "" "Request failed.\n" "Check your Internet connection." diff --git a/po/uk_UA.po b/po/uk_UA.po index 91e5ba58c1..1d4774c020 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-02-11 08:56+0100\n" +"POT-Creation-Date: 2017-02-21 23:29+0100\n" "PO-Revision-Date: 2017-01-01 00:02+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:1515 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69 +#: gui/options.cpp:1587 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:443 #: gui/saveload-dialog.cpp:717 gui/saveload-dialog.cpp:1111 @@ -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:522 -#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1517 +#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1589 #: gui/saveload-dialog.cpp:1112 engines/engine.cpp:477 engines/engine.cpp:488 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 @@ -243,7 +243,7 @@ msgstr "" "українську" #: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:121 -#: gui/options.cpp:845 gui/options.cpp:858 gui/options.cpp:1410 +#: gui/options.cpp:907 gui/options.cpp:920 gui/options.cpp:1482 #: audio/null.cpp:41 msgid "<default>" msgstr "<за умовчанням>" @@ -266,11 +266,11 @@ msgstr "Платформа:" msgid "Engine" msgstr "Движок" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "Graphics" msgstr "Графіка" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "GFX" msgstr "Грф" @@ -283,7 +283,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Перекрити глобальні налаштування графіки" -#: gui/editgamedialog.cpp:196 gui/options.cpp:1292 +#: gui/editgamedialog.cpp:196 gui/options.cpp:1364 msgid "Audio" msgstr "Аудіо" @@ -296,11 +296,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Перекрити глобальні налаштування аудіо" -#: gui/editgamedialog.cpp:210 gui/options.cpp:1297 +#: gui/editgamedialog.cpp:210 gui/options.cpp:1369 msgid "Volume" msgstr "Гучність" -#: gui/editgamedialog.cpp:212 gui/options.cpp:1299 +#: gui/editgamedialog.cpp:212 gui/options.cpp:1371 msgctxt "lowres" msgid "Volume" msgstr "Гучн" @@ -314,7 +314,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Перекрити глобальні налаштування гучності" -#: gui/editgamedialog.cpp:226 gui/options.cpp:1307 +#: gui/editgamedialog.cpp:226 gui/options.cpp:1379 msgid "MIDI" msgstr "MIDI" @@ -327,7 +327,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Перекрити глобальні налаштування MIDI" -#: gui/editgamedialog.cpp:241 gui/options.cpp:1317 +#: gui/editgamedialog.cpp:241 gui/options.cpp:1389 msgid "MT-32" msgstr "MT-32" @@ -340,11 +340,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Перекрити глобальні налаштування MT-32" -#: gui/editgamedialog.cpp:255 gui/options.cpp:1324 +#: gui/editgamedialog.cpp:255 gui/options.cpp:1396 msgid "Paths" msgstr "Шляхи" -#: gui/editgamedialog.cpp:257 gui/options.cpp:1326 +#: gui/editgamedialog.cpp:257 gui/options.cpp:1398 msgctxt "lowres" msgid "Paths" msgstr "Шляхи" @@ -358,7 +358,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Шлях до гри:" -#: gui/editgamedialog.cpp:271 gui/options.cpp:1350 +#: gui/editgamedialog.cpp:271 gui/options.cpp:1422 msgid "Extra Path:" msgstr "Додатк. шлях:" @@ -367,44 +367,44 @@ msgstr "Додатк. шлях:" msgid "Specifies path to additional data used by the game" msgstr "Вказує шлях до додаткових файлів даних для гри" -#: gui/editgamedialog.cpp:273 gui/options.cpp:1352 +#: gui/editgamedialog.cpp:273 gui/options.cpp:1424 msgctxt "lowres" msgid "Extra Path:" msgstr "Дод. шлях:" -#: gui/editgamedialog.cpp:280 gui/options.cpp:1334 +#: gui/editgamedialog.cpp:280 gui/options.cpp:1406 msgid "Save Path:" msgstr "Шлях збер.:" #: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282 -#: gui/editgamedialog.cpp:283 gui/options.cpp:1334 gui/options.cpp:1336 -#: gui/options.cpp:1337 +#: gui/editgamedialog.cpp:283 gui/options.cpp:1406 gui/options.cpp:1408 +#: gui/options.cpp:1409 msgid "Specifies where your saved games are put" msgstr "Вказує шлях до збережених ігор" -#: gui/editgamedialog.cpp:282 gui/options.cpp:1336 +#: gui/editgamedialog.cpp:282 gui/options.cpp:1408 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:1345 -#: gui/options.cpp:1353 gui/options.cpp:1362 gui/options.cpp:1542 -#: gui/options.cpp:1548 gui/options.cpp:1556 gui/options.cpp:1579 -#: gui/options.cpp:1608 gui/options.cpp:1614 gui/options.cpp:1621 -#: gui/options.cpp:1629 gui/options.cpp:1812 gui/options.cpp:1815 -#: gui/options.cpp:1822 gui/options.cpp:1832 +#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1417 +#: gui/options.cpp:1425 gui/options.cpp:1434 gui/options.cpp:1614 +#: gui/options.cpp:1620 gui/options.cpp:1628 gui/options.cpp:1651 +#: gui/options.cpp:1680 gui/options.cpp:1686 gui/options.cpp:1693 +#: gui/options.cpp:1701 gui/options.cpp:1884 gui/options.cpp:1887 +#: gui/options.cpp:1894 gui/options.cpp:1904 msgctxt "path" msgid "None" msgstr "Не завдано" #: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404 -#: gui/editgamedialog.cpp:522 gui/options.cpp:1536 gui/options.cpp:1602 -#: gui/options.cpp:1818 backends/platform/wii/options.cpp:56 +#: gui/editgamedialog.cpp:522 gui/options.cpp:1608 gui/options.cpp:1674 +#: gui/options.cpp:1890 backends/platform/wii/options.cpp:56 msgid "Default" msgstr "За умовчанням" -#: gui/editgamedialog.cpp:450 gui/options.cpp:1826 +#: gui/editgamedialog.cpp:450 gui/options.cpp:1898 msgid "Select SoundFont" msgstr "Виберіть SoundFont" @@ -412,7 +412,7 @@ msgstr "Виберіть SoundFont" msgid "Select additional game directory" msgstr "Виберіть додаткову папку гри" -#: gui/editgamedialog.cpp:502 gui/options.cpp:1749 +#: gui/editgamedialog.cpp:502 gui/options.cpp:1821 msgid "Select directory for saved games" msgstr "Виберіть папку для збережених ігор" @@ -505,7 +505,7 @@ msgstr "Синусоїда" msgid "Triangle" msgstr "Трикутник" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1370 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1442 msgid "Misc" msgstr "Різне" @@ -823,104 +823,117 @@ msgstr "44 кГц" msgid "48 kHz" msgstr "48 кГц" -#: gui/options.cpp:289 gui/options.cpp:552 gui/options.cpp:690 -#: gui/options.cpp:759 gui/options.cpp:970 +#: gui/options.cpp:316 gui/options.cpp:598 gui/options.cpp:736 +#: gui/options.cpp:805 gui/options.cpp:1032 msgctxt "soundfont" msgid "None" msgstr "Не заданий" -#: gui/options.cpp:456 +#: gui/options.cpp:502 msgid "Failed to apply some of the graphic options changes:" msgstr "Не вдалося застосувати деякі зі змін графічних налаштувань:" -#: gui/options.cpp:468 +#: gui/options.cpp:514 msgid "the video mode could not be changed." msgstr "не вдалося змінити графічний режим." -#: gui/options.cpp:474 +#: gui/options.cpp:520 msgid "the aspect ratio setting could not be changed" msgstr "не вдалося змінити режим корекції співвідношення сторін" -#: gui/options.cpp:480 +#: gui/options.cpp:526 msgid "the fullscreen setting could not be changed" msgstr "не вдалося змінити режим повного екрану" -#: gui/options.cpp:486 +#: gui/options.cpp:532 msgid "the filtering setting could not be changed" msgstr "не вдалося змінити режим фільтрування" -#: gui/options.cpp:842 +#: gui/options.cpp:884 +msgid "Show On-screen control" +msgstr "" + +#: gui/options.cpp:888 +#, fuzzy +msgid "Touchpad mouse mode" +msgstr "Режим тачпаду вимкнено." + +#: gui/options.cpp:892 +msgid "Swap Menu and Back buttons" +msgstr "" + +#: gui/options.cpp:904 msgid "Graphics mode:" msgstr "Графічн. режим:" -#: gui/options.cpp:856 +#: gui/options.cpp:918 msgid "Render mode:" msgstr "Режим раструв.:" -#: gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:918 gui/options.cpp:919 msgid "Special dithering modes supported by some games" msgstr "Спеціальні режими растрування, які підтримують деякі ігри" -#: gui/options.cpp:868 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 +#: gui/options.cpp:930 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2460 msgid "Fullscreen mode" msgstr "Повноекранний режим" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Filter graphics" msgstr "Фільтрування графіки" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Use linear filtering when scaling graphics" msgstr "Використовувати лінійну фільтрацію для збільшення графіки" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Aspect ratio correction" msgstr "Корекція співвідношення сторін" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Correct aspect ratio for 320x200 games" msgstr "Коригувати співвідношення сторін для ігор з графікою 320x200" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Preferred Device:" msgstr "Уподобаний пристрій:" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Music Device:" msgstr "Музич. пристрій:" -#: gui/options.cpp:882 gui/options.cpp:884 +#: gui/options.cpp:944 gui/options.cpp:946 msgid "Specifies preferred sound device or sound card emulator" msgstr "Вказує уподобаний звуковий пристрій або емулятор звукової карти" -#: gui/options.cpp:882 gui/options.cpp:884 gui/options.cpp:885 +#: gui/options.cpp:944 gui/options.cpp:946 gui/options.cpp:947 msgid "Specifies output sound device or sound card emulator" msgstr "Вказує вихідний звуковий пристрій або емулятор звукової карти" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Уподоб. пристрій:" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Music Device:" msgstr "Музичний пристрій:" -#: gui/options.cpp:911 +#: gui/options.cpp:973 msgid "AdLib emulator:" msgstr "Емулятор AdLib:" -#: gui/options.cpp:911 gui/options.cpp:912 +#: gui/options.cpp:973 gui/options.cpp:974 msgid "AdLib is used for music in many games" msgstr "Звукова карта AdLib використовується багатьма іграми для музики" -#: gui/options.cpp:922 +#: gui/options.cpp:984 msgid "Output rate:" msgstr "Вихідна частота:" -#: gui/options.cpp:922 gui/options.cpp:923 +#: gui/options.cpp:984 gui/options.cpp:985 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -928,63 +941,63 @@ msgstr "" "Великі значення надають кращу якість звуку, проте вони можуть не " "підтримуватися вашою звуковою картою" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "GM Device:" msgstr "Пристрій GM:" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "Specifies default sound device for General MIDI output" msgstr "Вказує вихідний звуковий пристрій для General MIDI" -#: gui/options.cpp:944 +#: gui/options.cpp:1006 msgid "Don't use General MIDI music" msgstr "Не використовувати музику General MIDI" -#: gui/options.cpp:955 gui/options.cpp:1017 +#: gui/options.cpp:1017 gui/options.cpp:1079 msgid "Use first available device" msgstr "Використовувати перший наявний пристрій" -#: gui/options.cpp:967 +#: gui/options.cpp:1029 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:967 gui/options.cpp:969 gui/options.cpp:970 +#: gui/options.cpp:1029 gui/options.cpp:1031 gui/options.cpp:1032 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "" "SoundFont підтримується деякими звуковими картами, FluidSynth та Timidity" -#: gui/options.cpp:969 +#: gui/options.cpp:1031 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Mixed AdLib/MIDI mode" msgstr "Змішаний режим AdLib/MIDI" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Use both MIDI and AdLib sound generation" msgstr "Використовувати і MIDI і AdLib для генерації звуку" -#: gui/options.cpp:978 +#: gui/options.cpp:1040 msgid "MIDI gain:" msgstr "Посилення MIDI:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "MT-32 Device:" msgstr "Пристрій MT-32:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" "Вказує звуковий пристрій за замовченням для виводу на Roland MT-32/LAPC1/" "CM32l/CM64" -#: gui/options.cpp:993 +#: gui/options.cpp:1055 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Справжній Roland MT-32 (вимкнути емуляцию GM)" -#: gui/options.cpp:993 gui/options.cpp:995 +#: gui/options.cpp:1055 gui/options.cpp:1057 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -992,16 +1005,16 @@ msgstr "" "Відмітьте, якщо у вас підключено Roland-сумісний звуковий пристрій і ви " "хочете його використовувати" -#: gui/options.cpp:995 +#: gui/options.cpp:1057 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Справжній Roland MT-32 (вимкнути емуляцию GM)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Режим Roland GS (ввімкнути маплення MT-32)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -1009,268 +1022,273 @@ msgstr "" "Відмітьте, якщо хочете включити латки для інструментів для емуляції MT-32 на " "Roland" -#: gui/options.cpp:1007 +#: gui/options.cpp:1069 msgid "Don't use Roland MT-32 music" msgstr "Не використовувати музику для Roland MT-32" -#: gui/options.cpp:1034 +#: gui/options.cpp:1096 msgid "Text and Speech:" msgstr "Текст і озвучка:" -#: gui/options.cpp:1038 gui/options.cpp:1048 +#: gui/options.cpp:1100 gui/options.cpp:1110 msgid "Speech" msgstr "Озвучка" -#: gui/options.cpp:1039 gui/options.cpp:1049 +#: gui/options.cpp:1101 gui/options.cpp:1111 msgid "Subtitles" msgstr "Субтитри" -#: gui/options.cpp:1040 +#: gui/options.cpp:1102 msgid "Both" msgstr "Все" -#: gui/options.cpp:1042 +#: gui/options.cpp:1104 msgid "Subtitle speed:" msgstr "Швид. субтитрів:" -#: gui/options.cpp:1044 +#: gui/options.cpp:1106 msgctxt "lowres" msgid "Text and Speech:" msgstr "Текст і озвучка:" -#: gui/options.cpp:1048 +#: gui/options.cpp:1110 msgid "Spch" msgstr "Озв" -#: gui/options.cpp:1049 +#: gui/options.cpp:1111 msgid "Subs" msgstr "Суб" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgctxt "lowres" msgid "Both" msgstr "Все" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgid "Show subtitles and play speech" msgstr "Показувати субтитри і відтворювати мову" -#: gui/options.cpp:1052 +#: gui/options.cpp:1114 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Швид. субтитрів:" -#: gui/options.cpp:1068 +#: gui/options.cpp:1130 msgid "Music volume:" msgstr "Гучність музики:" -#: gui/options.cpp:1070 +#: gui/options.cpp:1132 msgctxt "lowres" msgid "Music volume:" msgstr "Гучність музики:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1139 msgid "Mute All" msgstr "Вимкнути все" -#: gui/options.cpp:1080 +#: gui/options.cpp:1142 msgid "SFX volume:" msgstr "Гучність ефектів:" -#: gui/options.cpp:1080 gui/options.cpp:1082 gui/options.cpp:1083 +#: gui/options.cpp:1142 gui/options.cpp:1144 gui/options.cpp:1145 msgid "Special sound effects volume" msgstr "Гучність спеціальних звукових ефектів" -#: gui/options.cpp:1082 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "SFX volume:" msgstr "Гучн. ефектів:" -#: gui/options.cpp:1090 +#: gui/options.cpp:1152 msgid "Speech volume:" msgstr "Гучність озвучки:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1154 msgctxt "lowres" msgid "Speech volume:" msgstr "Гучн. озвучки:" -#: gui/options.cpp:1311 +#: gui/options.cpp:1351 +#, fuzzy +msgid "Control" +msgstr "Управління мишею" + +#: gui/options.cpp:1383 msgid "FluidSynth Settings" msgstr "Налаштування FluidSynth" -#: gui/options.cpp:1342 +#: gui/options.cpp:1414 msgid "Theme Path:" msgstr "Шлях до тем:" -#: gui/options.cpp:1344 +#: gui/options.cpp:1416 msgctxt "lowres" msgid "Theme Path:" msgstr "Шлях до тем:" -#: gui/options.cpp:1350 gui/options.cpp:1352 gui/options.cpp:1353 +#: gui/options.cpp:1422 gui/options.cpp:1424 gui/options.cpp:1425 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "" "Вказує шлях до додаткових файлів даних, які використовуються усіма іграми " "або ScummVM" -#: gui/options.cpp:1359 +#: gui/options.cpp:1431 msgid "Plugins Path:" msgstr "Шлях до втулків:" -#: gui/options.cpp:1361 +#: gui/options.cpp:1433 msgctxt "lowres" msgid "Plugins Path:" msgstr "Шлях до втулків:" -#: gui/options.cpp:1372 +#: gui/options.cpp:1444 msgctxt "lowres" msgid "Misc" msgstr "Різне" -#: gui/options.cpp:1374 +#: gui/options.cpp:1446 msgid "Theme:" msgstr "Тема:" -#: gui/options.cpp:1378 +#: gui/options.cpp:1450 msgid "GUI Renderer:" msgstr "Растер. GUI:" -#: gui/options.cpp:1390 +#: gui/options.cpp:1462 msgid "Autosave:" msgstr "Автозбереження:" -#: gui/options.cpp:1392 +#: gui/options.cpp:1464 msgctxt "lowres" msgid "Autosave:" msgstr "Автозбереж.:" -#: gui/options.cpp:1400 +#: gui/options.cpp:1472 msgid "Keys" msgstr "Клавіші" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "GUI Language:" msgstr "Мова інтерф.:" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "Language of ScummVM GUI" msgstr "Мова графічного інтерфейсу ScummVM" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "Update check:" msgstr "Перевіряти оновлення:" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "How often to check ScummVM updates" msgstr "Як часто перевіряти оновлення ScummVM" -#: gui/options.cpp:1447 +#: gui/options.cpp:1519 msgid "Check now" msgstr "Перевірити зараз" -#: gui/options.cpp:1455 +#: gui/options.cpp:1527 msgid "Cloud" msgstr "Хмара" -#: gui/options.cpp:1457 +#: gui/options.cpp:1529 msgctxt "lowres" msgid "Cloud" msgstr "Хмара" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Storage:" msgstr "Середовище:" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Active cloud storage" msgstr "Активне хмарне середовище" -#: gui/options.cpp:1469 gui/options.cpp:2026 +#: gui/options.cpp:1541 gui/options.cpp:2098 msgid "<none>" msgstr "<немає>" -#: gui/options.cpp:1473 backends/platform/wii/options.cpp:114 +#: gui/options.cpp:1545 backends/platform/wii/options.cpp:114 msgid "Username:" msgstr "Користувач:" -#: gui/options.cpp:1473 +#: gui/options.cpp:1545 msgid "Username used by this storage" msgstr "Користувач для цього середовища" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Used space:" msgstr "Використаний об'єм:" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Space used by ScummVM's saved games on this storage" msgstr "" "Об'єм, використаний для збережених станів ігор ScummVM на цьому середовищі" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "Last sync time:" msgstr "Остання синхронизація:" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "When the last saved games sync for this storage occured" msgstr "Час, коли було зроблено останню синхронизацію з цим середовищем" -#: gui/options.cpp:1482 gui/storagewizarddialog.cpp:71 +#: gui/options.cpp:1554 gui/storagewizarddialog.cpp:71 msgid "Connect" msgstr "Залучитись" -#: gui/options.cpp:1482 +#: gui/options.cpp:1554 msgid "Open wizard dialog to connect your cloud storage account" msgstr "" "Розпочати кроки для залучення до вашого облікового засобу на хмарному " "середовищі" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh" msgstr "Поновити" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh current cloud storage information (username and usage)" msgstr "Поновити поточні дані хмарного середовища (ім'я користувача та об'єм)" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Download" msgstr "Завантажити" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Open downloads manager dialog" msgstr "Відкрити керування завантаженнями" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run server" msgstr "Запустити сервер" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run local webserver" msgstr "Запускає локальний веб-сервер" -#: gui/options.cpp:1487 gui/options.cpp:2136 +#: gui/options.cpp:1559 gui/options.cpp:2208 msgid "Not running" msgstr "Вимкнено" -#: gui/options.cpp:1491 +#: gui/options.cpp:1563 msgid "/root/ Path:" msgstr "Шлях /root/:" -#: gui/options.cpp:1491 gui/options.cpp:1493 gui/options.cpp:1494 +#: gui/options.cpp:1563 gui/options.cpp:1565 gui/options.cpp:1566 msgid "Specifies which directory the Files Manager can access" msgstr "Вказує шлях, до якого можна мати доступ через Керування файлами" -#: gui/options.cpp:1493 +#: gui/options.cpp:1565 msgctxt "lowres" msgid "/root/ Path:" msgstr "Корінний шлях:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "Server's port:" msgstr "Порт сервера:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "" "Which port is used by the server\n" "Auth with server is not available with non-default port" @@ -1278,19 +1296,19 @@ msgstr "" "Порт, який буде використано сервером\n" "Аутентифікация з сервером неможлива для портів, інших від замовчуваного" -#: gui/options.cpp:1516 +#: gui/options.cpp:1588 msgid "Apply" msgstr "Застосувати" -#: gui/options.cpp:1682 +#: gui/options.cpp:1754 msgid "Failed to change cloud storage!" msgstr "Не вдалося змінити хмарне середовище!" -#: gui/options.cpp:1685 +#: gui/options.cpp:1757 msgid "Another cloud storage is already active." msgstr "Інше хмарне середовище вже активне." -#: gui/options.cpp:1721 +#: gui/options.cpp:1793 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1298,48 +1316,48 @@ msgstr "" "Вибрана тема не підтримує поточну мову. Якщо ви хочете використовувати цю " "тему, потрібно в першу чергу змінити мову." -#: gui/options.cpp:1756 +#: gui/options.cpp:1828 msgid "The chosen directory cannot be written to. Please select another one." msgstr "Не можу писати у вибрану папку. Будь ласка, вкажіть іншу." -#: gui/options.cpp:1765 +#: gui/options.cpp:1837 msgid "Select directory for GUI themes" msgstr "Виберіть папку для тем GUI" -#: gui/options.cpp:1775 +#: gui/options.cpp:1847 msgid "Select directory for extra files" msgstr "Виберіть папку з додатковими файлами" -#: gui/options.cpp:1786 +#: gui/options.cpp:1858 msgid "Select directory for plugins" msgstr "Виберіть папку зі втулками" -#: gui/options.cpp:1798 +#: gui/options.cpp:1870 msgid "Select directory for Files Manager /root/" msgstr "Виберіть папку /root/ для Керування файлами" -#: gui/options.cpp:2033 +#: gui/options.cpp:2105 #, c-format msgid "%llu bytes" msgstr "%llu байт" -#: gui/options.cpp:2041 +#: gui/options.cpp:2113 msgid "<right now>" msgstr "<зараз>" -#: gui/options.cpp:2043 +#: gui/options.cpp:2115 msgid "<never>" msgstr "<ніколи>" -#: gui/options.cpp:2127 +#: gui/options.cpp:2199 msgid "Stop server" msgstr "Вимкнути сервер" -#: gui/options.cpp:2128 +#: gui/options.cpp:2200 msgid "Stop local webserver" msgstr "Вимкнути локальний веб-сервер" -#: gui/options.cpp:2219 +#: gui/options.cpp:2291 msgid "" "Request failed.\n" "Check your Internet connection." diff --git a/po/zh-Latn_CN.po b/po/zh-Latn_CN.po index c3d62d9b56..7b8e6389ca 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-02-11 08:56+0100\n" +"POT-Creation-Date: 2017-02-21 23:29+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:1515 gui/predictivedialog.cpp:73 gui/recorderdialog.cpp:69 +#: gui/options.cpp:1587 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:443 #: gui/saveload-dialog.cpp:717 gui/saveload-dialog.cpp:1111 @@ -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:522 -#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1517 +#: gui/launcher.cpp:526 gui/massadd.cpp:92 gui/options.cpp:1589 #: gui/saveload-dialog.cpp:1112 engines/engine.cpp:477 engines/engine.cpp:488 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 @@ -235,7 +235,7 @@ msgstr "" "Youxi de Yuyan. CiXiang buhui jiang Yige XibanyaYu Banben Zhuancheng Yingwen" #: gui/editgamedialog.cpp:151 gui/editgamedialog.cpp:165 gui/options.cpp:121 -#: gui/options.cpp:845 gui/options.cpp:858 gui/options.cpp:1410 +#: gui/options.cpp:907 gui/options.cpp:920 gui/options.cpp:1482 #: audio/null.cpp:41 msgid "<default>" msgstr "<Moren>" @@ -258,11 +258,11 @@ msgstr "Pingtai:" msgid "Engine" msgstr "Yinqing" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "Graphics" msgstr "Tuxiang" -#: gui/editgamedialog.cpp:184 gui/options.cpp:1201 gui/options.cpp:1286 +#: gui/editgamedialog.cpp:184 gui/options.cpp:1263 gui/options.cpp:1358 msgid "GFX" msgstr "GFX" @@ -275,7 +275,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Fugai Quanju Tuxiang Shezhi" -#: gui/editgamedialog.cpp:196 gui/options.cpp:1292 +#: gui/editgamedialog.cpp:196 gui/options.cpp:1364 msgid "Audio" msgstr "Yinpin" @@ -288,11 +288,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Fugai QUanju Yinpin Shezhi" -#: gui/editgamedialog.cpp:210 gui/options.cpp:1297 +#: gui/editgamedialog.cpp:210 gui/options.cpp:1369 msgid "Volume" msgstr "Yinliang" -#: gui/editgamedialog.cpp:212 gui/options.cpp:1299 +#: gui/editgamedialog.cpp:212 gui/options.cpp:1371 msgctxt "lowres" msgid "Volume" msgstr "YinLiang" @@ -306,7 +306,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Fugai Quanju YinLiang Shezhi" -#: gui/editgamedialog.cpp:226 gui/options.cpp:1307 +#: gui/editgamedialog.cpp:226 gui/options.cpp:1379 msgid "MIDI" msgstr "MIDI" @@ -319,7 +319,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Fugai Quanju MIDI Shezhi" -#: gui/editgamedialog.cpp:241 gui/options.cpp:1317 +#: gui/editgamedialog.cpp:241 gui/options.cpp:1389 msgid "MT-32" msgstr "MT-32" @@ -332,11 +332,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Fugai Quanju MT-32 Shezhi" -#: gui/editgamedialog.cpp:255 gui/options.cpp:1324 +#: gui/editgamedialog.cpp:255 gui/options.cpp:1396 msgid "Paths" msgstr "Lujing" -#: gui/editgamedialog.cpp:257 gui/options.cpp:1326 +#: gui/editgamedialog.cpp:257 gui/options.cpp:1398 msgctxt "lowres" msgid "Paths" msgstr "Lujing" @@ -350,7 +350,7 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Youxi Lujing:" -#: gui/editgamedialog.cpp:271 gui/options.cpp:1350 +#: gui/editgamedialog.cpp:271 gui/options.cpp:1422 msgid "Extra Path:" msgstr "Qita Lujing:" @@ -359,44 +359,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:1352 +#: gui/editgamedialog.cpp:273 gui/options.cpp:1424 msgctxt "lowres" msgid "Extra Path:" msgstr "Qita Lujing:" -#: gui/editgamedialog.cpp:280 gui/options.cpp:1334 +#: gui/editgamedialog.cpp:280 gui/options.cpp:1406 msgid "Save Path:" msgstr "Baocun Lujing:" #: gui/editgamedialog.cpp:280 gui/editgamedialog.cpp:282 -#: gui/editgamedialog.cpp:283 gui/options.cpp:1334 gui/options.cpp:1336 -#: gui/options.cpp:1337 +#: gui/editgamedialog.cpp:283 gui/options.cpp:1406 gui/options.cpp:1408 +#: gui/options.cpp:1409 msgid "Specifies where your saved games are put" msgstr "Zhiding Nin Jiang Youxi Baocun Zai le Nali" -#: gui/editgamedialog.cpp:282 gui/options.cpp:1336 +#: gui/editgamedialog.cpp:282 gui/options.cpp:1408 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:1345 -#: gui/options.cpp:1353 gui/options.cpp:1362 gui/options.cpp:1542 -#: gui/options.cpp:1548 gui/options.cpp:1556 gui/options.cpp:1579 -#: gui/options.cpp:1608 gui/options.cpp:1614 gui/options.cpp:1621 -#: gui/options.cpp:1629 gui/options.cpp:1812 gui/options.cpp:1815 -#: gui/options.cpp:1822 gui/options.cpp:1832 +#: gui/editgamedialog.cpp:457 gui/editgamedialog.cpp:518 gui/options.cpp:1417 +#: gui/options.cpp:1425 gui/options.cpp:1434 gui/options.cpp:1614 +#: gui/options.cpp:1620 gui/options.cpp:1628 gui/options.cpp:1651 +#: gui/options.cpp:1680 gui/options.cpp:1686 gui/options.cpp:1693 +#: gui/options.cpp:1701 gui/options.cpp:1884 gui/options.cpp:1887 +#: gui/options.cpp:1894 gui/options.cpp:1904 msgctxt "path" msgid "None" msgstr "Wu" #: gui/editgamedialog.cpp:306 gui/editgamedialog.cpp:404 -#: gui/editgamedialog.cpp:522 gui/options.cpp:1536 gui/options.cpp:1602 -#: gui/options.cpp:1818 backends/platform/wii/options.cpp:56 +#: gui/editgamedialog.cpp:522 gui/options.cpp:1608 gui/options.cpp:1674 +#: gui/options.cpp:1890 backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Moren" -#: gui/editgamedialog.cpp:450 gui/options.cpp:1826 +#: gui/editgamedialog.cpp:450 gui/options.cpp:1898 msgid "Select SoundFont" msgstr "Xuanze SoundFont" @@ -404,7 +404,7 @@ msgstr "Xuanze SoundFont" msgid "Select additional game directory" msgstr "Xuanze Qita Youxi Mulu" -#: gui/editgamedialog.cpp:502 gui/options.cpp:1749 +#: gui/editgamedialog.cpp:502 gui/options.cpp:1821 msgid "Select directory for saved games" msgstr "Xuanze Youxi Baocun Mulu" @@ -494,7 +494,7 @@ msgstr "Zhengxian" msgid "Triangle" msgstr "Sanjiaoxing" -#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1370 +#: gui/fluidsynth-dialog.cpp:138 gui/options.cpp:1442 msgid "Misc" msgstr "Zaxiang" @@ -810,106 +810,119 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:289 gui/options.cpp:552 gui/options.cpp:690 -#: gui/options.cpp:759 gui/options.cpp:970 +#: gui/options.cpp:316 gui/options.cpp:598 gui/options.cpp:736 +#: gui/options.cpp:805 gui/options.cpp:1032 msgctxt "soundfont" msgid "None" msgstr "Wu" -#: gui/options.cpp:456 +#: gui/options.cpp:502 msgid "Failed to apply some of the graphic options changes:" msgstr "Tuxing Xuanxiang Genggai Shibai:" -#: gui/options.cpp:468 +#: gui/options.cpp:514 msgid "the video mode could not be changed." msgstr "Shipin Moshi Wufa Genggai." -#: gui/options.cpp:474 +#: gui/options.cpp:520 msgid "the aspect ratio setting could not be changed" msgstr "Bili Xuanxiang Wufa Genggai" -#: gui/options.cpp:480 +#: gui/options.cpp:526 msgid "the fullscreen setting could not be changed" msgstr "Quanping Shezhi Wufa Genggai" -#: gui/options.cpp:486 +#: gui/options.cpp:532 #, fuzzy msgid "the filtering setting could not be changed" msgstr "Quanping Shezhi Wufa Genggai" -#: gui/options.cpp:842 +#: gui/options.cpp:884 +msgid "Show On-screen control" +msgstr "" + +#: gui/options.cpp:888 +#, fuzzy +msgid "Touchpad mouse mode" +msgstr "Jinyong Chumoban Moshi." + +#: gui/options.cpp:892 +msgid "Swap Menu and Back buttons" +msgstr "" + +#: gui/options.cpp:904 msgid "Graphics mode:" msgstr "Tuxing Moshi:" -#: gui/options.cpp:856 +#: gui/options.cpp:918 msgid "Render mode:" msgstr "Xuanran Moshi:" -#: gui/options.cpp:856 gui/options.cpp:857 +#: gui/options.cpp:918 gui/options.cpp:919 msgid "Special dithering modes supported by some games" msgstr "Youxi Zhichi Teshu de Doudong Moshi" -#: gui/options.cpp:868 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 +#: gui/options.cpp:930 backends/graphics/openglsdl/openglsdl-graphics.cpp:615 #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2460 msgid "Fullscreen mode" msgstr "Quanping Moshi" -#: gui/options.cpp:871 +#: gui/options.cpp:933 #, fuzzy msgid "Filter graphics" msgstr "Tuxiang" -#: gui/options.cpp:871 +#: gui/options.cpp:933 msgid "Use linear filtering when scaling graphics" msgstr "" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Aspect ratio correction" msgstr "Bili Jiaozheng" -#: gui/options.cpp:874 +#: gui/options.cpp:936 msgid "Correct aspect ratio for 320x200 games" msgstr "320x200 Youxi Bili Jiaozheng" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Preferred Device:" msgstr "Youxian Shebei:" -#: gui/options.cpp:882 +#: gui/options.cpp:944 msgid "Music Device:" msgstr "Yinyue Shebei:" -#: gui/options.cpp:882 gui/options.cpp:884 +#: gui/options.cpp:944 gui/options.cpp:946 msgid "Specifies preferred sound device or sound card emulator" msgstr "Zhiding Youxian Shengyin Shebei huo Shengka Moniqi" -#: gui/options.cpp:882 gui/options.cpp:884 gui/options.cpp:885 +#: gui/options.cpp:944 gui/options.cpp:946 gui/options.cpp:947 msgid "Specifies output sound device or sound card emulator" msgstr "Zhiding Shuchu Shengyin Shebei huo Shengka Moniqi" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Preferred Dev.:" msgstr "Youxian Shebei:" -#: gui/options.cpp:884 +#: gui/options.cpp:946 msgctxt "lowres" msgid "Music Device:" msgstr "Yinyue Shebei:" -#: gui/options.cpp:911 +#: gui/options.cpp:973 msgid "AdLib emulator:" msgstr "AdLib Moniqi:" -#: gui/options.cpp:911 gui/options.cpp:912 +#: gui/options.cpp:973 gui/options.cpp:974 msgid "AdLib is used for music in many games" msgstr "AdLib bei Henduo Youxi Yonglai Bofang Yinyue" -#: gui/options.cpp:922 +#: gui/options.cpp:984 msgid "Output rate:" msgstr "Shuchu Malv:" -#: gui/options.cpp:922 gui/options.cpp:923 +#: gui/options.cpp:984 gui/options.cpp:985 msgid "" "Higher value specifies better sound quality but may be not supported by your " "soundcard" @@ -917,62 +930,62 @@ msgstr "" "Genggao de Shuxing Hui Tisheng Yinyue Zhiliang dan Youkeneng Nin de Shengka " "Buzhichi" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "GM Device:" msgstr "GM Shebei:" -#: gui/options.cpp:933 +#: gui/options.cpp:995 msgid "Specifies default sound device for General MIDI output" msgstr "Zhiding Tongyong MIDI Shuchu Moren Shengyin Shebei" -#: gui/options.cpp:944 +#: gui/options.cpp:1006 msgid "Don't use General MIDI music" msgstr "Buyao Shiyong Tongyong MIDI Yinyue" -#: gui/options.cpp:955 gui/options.cpp:1017 +#: gui/options.cpp:1017 gui/options.cpp:1079 msgid "Use first available device" msgstr "Shiyong Diyige keyong de Shebei" -#: gui/options.cpp:967 +#: gui/options.cpp:1029 msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:967 gui/options.cpp:969 gui/options.cpp:970 +#: gui/options.cpp:1029 gui/options.cpp:1031 gui/options.cpp:1032 msgid "SoundFont is supported by some audio cards, FluidSynth and Timidity" msgstr "Yixie Shengka Zhichi SoundFont, Biru FluidSynth He Timidity" -#: gui/options.cpp:969 +#: gui/options.cpp:1031 msgctxt "lowres" msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Mixed AdLib/MIDI mode" msgstr "Hunhe AdLib/MIDI Moshi" -#: gui/options.cpp:975 +#: gui/options.cpp:1037 msgid "Use both MIDI and AdLib sound generation" msgstr "TongShi Shiyong MIDI He AdLib Shengyin Shengcheng" -#: gui/options.cpp:978 +#: gui/options.cpp:1040 msgid "MIDI gain:" msgstr "MIDI gain:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 msgid "MT-32 Device:" msgstr "MT-32 Shebei:" -#: gui/options.cpp:988 +#: gui/options.cpp:1050 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:993 +#: gui/options.cpp:1055 msgid "True Roland MT-32 (disable GM emulation)" msgstr "Zhen Roland MT-32 (Jinyong GM Moni)" -#: gui/options.cpp:993 gui/options.cpp:995 +#: gui/options.cpp:1055 gui/options.cpp:1057 msgid "" "Check if you want to use your real hardware Roland-compatible sound device " "connected to your computer" @@ -980,16 +993,16 @@ msgstr "" "Jiancha Shifou Nin Xiang Shiyong Lianjie Dao Jisuanji de Zhenshi de Yingjian " "Roland Jianrong Shengyin Shebei" -#: gui/options.cpp:995 +#: gui/options.cpp:1057 msgctxt "lowres" msgid "True Roland MT-32 (no GM emulation)" msgstr "Zhen Roland MT-32 Shebei (Wu GM Moni)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "Roland GS Device (enable MT-32 mappings)" msgstr "Roland GS Shebei (Qiyong MT-32 Yingshe)" -#: gui/options.cpp:998 +#: gui/options.cpp:1060 msgid "" "Check if you want to enable patch mappings to emulate an MT-32 on a Roland " "GS device" @@ -997,288 +1010,293 @@ msgstr "" "Jiancha Shifou Nin Xiang Qiyong patch Yingshe Lai Zai Roland GS Shebei " "Shangmian Moni MT-32" -#: gui/options.cpp:1007 +#: gui/options.cpp:1069 msgid "Don't use Roland MT-32 music" msgstr "Buyao Shiyong Roland MT-32 Yinyue" -#: gui/options.cpp:1034 +#: gui/options.cpp:1096 msgid "Text and Speech:" msgstr "Wenzi he Yuyin:" -#: gui/options.cpp:1038 gui/options.cpp:1048 +#: gui/options.cpp:1100 gui/options.cpp:1110 msgid "Speech" msgstr "Yuyin" -#: gui/options.cpp:1039 gui/options.cpp:1049 +#: gui/options.cpp:1101 gui/options.cpp:1111 msgid "Subtitles" msgstr "Zimu" -#: gui/options.cpp:1040 +#: gui/options.cpp:1102 msgid "Both" msgstr "Liangzhe" -#: gui/options.cpp:1042 +#: gui/options.cpp:1104 msgid "Subtitle speed:" msgstr "Zimu Sudu:" -#: gui/options.cpp:1044 +#: gui/options.cpp:1106 msgctxt "lowres" msgid "Text and Speech:" msgstr "Wenben he Yuyin:" -#: gui/options.cpp:1048 +#: gui/options.cpp:1110 msgid "Spch" msgstr "Zimu" -#: gui/options.cpp:1049 +#: gui/options.cpp:1111 msgid "Subs" msgstr "Yuyin" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgctxt "lowres" msgid "Both" msgstr "Dou" -#: gui/options.cpp:1050 +#: gui/options.cpp:1112 msgid "Show subtitles and play speech" msgstr "Xianshi Zimu Bing Bofang Yuyin" -#: gui/options.cpp:1052 +#: gui/options.cpp:1114 msgctxt "lowres" msgid "Subtitle speed:" msgstr "Zimu Sudu:" -#: gui/options.cpp:1068 +#: gui/options.cpp:1130 msgid "Music volume:" msgstr "Yinyue Yinliang:" -#: gui/options.cpp:1070 +#: gui/options.cpp:1132 msgctxt "lowres" msgid "Music volume:" msgstr "Yinyue Yinliang:" -#: gui/options.cpp:1077 +#: gui/options.cpp:1139 msgid "Mute All" msgstr "Quanbu Jinyin" -#: gui/options.cpp:1080 +#: gui/options.cpp:1142 msgid "SFX volume:" msgstr "Yinxiao Yinliang:" -#: gui/options.cpp:1080 gui/options.cpp:1082 gui/options.cpp:1083 +#: gui/options.cpp:1142 gui/options.cpp:1144 gui/options.cpp:1145 msgid "Special sound effects volume" msgstr "Texiao Yinliang" -#: gui/options.cpp:1082 +#: gui/options.cpp:1144 msgctxt "lowres" msgid "SFX volume:" msgstr "Yinxiao Yinliang:" -#: gui/options.cpp:1090 +#: gui/options.cpp:1152 msgid "Speech volume:" msgstr "Yuyin Yinliang:" -#: gui/options.cpp:1092 +#: gui/options.cpp:1154 msgctxt "lowres" msgid "Speech volume:" msgstr "Yuyin Yinliang:" -#: gui/options.cpp:1311 +#: gui/options.cpp:1351 +#, fuzzy +msgid "Control" +msgstr "Kongzhi Shubiao" + +#: gui/options.cpp:1383 msgid "FluidSynth Settings" msgstr "FluidSynth Xuanxiang" -#: gui/options.cpp:1342 +#: gui/options.cpp:1414 msgid "Theme Path:" msgstr "Zhuti Lujing:" -#: gui/options.cpp:1344 +#: gui/options.cpp:1416 msgctxt "lowres" msgid "Theme Path:" msgstr "Zhuti Lujing:" -#: gui/options.cpp:1350 gui/options.cpp:1352 gui/options.cpp:1353 +#: gui/options.cpp:1422 gui/options.cpp:1424 gui/options.cpp:1425 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "Zhiding Suoyou Youxi huo ScummVM de Shuju Lujing" -#: gui/options.cpp:1359 +#: gui/options.cpp:1431 msgid "Plugins Path:" msgstr "Chajian Lujing:" -#: gui/options.cpp:1361 +#: gui/options.cpp:1433 msgctxt "lowres" msgid "Plugins Path:" msgstr "Chajian Lujing:" -#: gui/options.cpp:1372 +#: gui/options.cpp:1444 msgctxt "lowres" msgid "Misc" msgstr "Zaxiang" -#: gui/options.cpp:1374 +#: gui/options.cpp:1446 msgid "Theme:" msgstr "Zhuti:" -#: gui/options.cpp:1378 +#: gui/options.cpp:1450 msgid "GUI Renderer:" msgstr "Jiemian Xuanran:" -#: gui/options.cpp:1390 +#: gui/options.cpp:1462 msgid "Autosave:" msgstr "Zidong Baocun:" -#: gui/options.cpp:1392 +#: gui/options.cpp:1464 msgctxt "lowres" msgid "Autosave:" msgstr "Zidong Baocun:" -#: gui/options.cpp:1400 +#: gui/options.cpp:1472 msgid "Keys" msgstr "Guanjianzi" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "GUI Language:" msgstr "Jiemian Yuyan:" -#: gui/options.cpp:1407 +#: gui/options.cpp:1479 msgid "Language of ScummVM GUI" msgstr "ScummVM Jiemian Yuyan" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "Update check:" msgstr "" -#: gui/options.cpp:1435 +#: gui/options.cpp:1507 msgid "How often to check ScummVM updates" msgstr "" -#: gui/options.cpp:1447 +#: gui/options.cpp:1519 msgid "Check now" msgstr "" -#: gui/options.cpp:1455 +#: gui/options.cpp:1527 msgid "Cloud" msgstr "" -#: gui/options.cpp:1457 +#: gui/options.cpp:1529 msgctxt "lowres" msgid "Cloud" msgstr "" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Storage:" msgstr "" -#: gui/options.cpp:1462 +#: gui/options.cpp:1534 msgid "Active cloud storage" msgstr "" -#: gui/options.cpp:1469 gui/options.cpp:2026 +#: gui/options.cpp:1541 gui/options.cpp:2098 msgid "<none>" msgstr "" -#: gui/options.cpp:1473 backends/platform/wii/options.cpp:114 +#: gui/options.cpp:1545 backends/platform/wii/options.cpp:114 msgid "Username:" msgstr "Yonghuming:" -#: gui/options.cpp:1473 +#: gui/options.cpp:1545 msgid "Username used by this storage" msgstr "" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Used space:" msgstr "" -#: gui/options.cpp:1476 +#: gui/options.cpp:1548 msgid "Space used by ScummVM's saved games on this storage" msgstr "" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "Last sync time:" msgstr "" -#: gui/options.cpp:1479 +#: gui/options.cpp:1551 msgid "When the last saved games sync for this storage occured" msgstr "" -#: gui/options.cpp:1482 gui/storagewizarddialog.cpp:71 +#: gui/options.cpp:1554 gui/storagewizarddialog.cpp:71 msgid "Connect" msgstr "" -#: gui/options.cpp:1482 +#: gui/options.cpp:1554 msgid "Open wizard dialog to connect your cloud storage account" msgstr "" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh" msgstr "" -#: gui/options.cpp:1483 +#: gui/options.cpp:1555 msgid "Refresh current cloud storage information (username and usage)" msgstr "" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 #, fuzzy msgid "Download" msgstr "Xia" -#: gui/options.cpp:1484 +#: gui/options.cpp:1556 msgid "Open downloads manager dialog" msgstr "" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run server" msgstr "" -#: gui/options.cpp:1486 +#: gui/options.cpp:1558 msgid "Run local webserver" msgstr "" -#: gui/options.cpp:1487 gui/options.cpp:2136 +#: gui/options.cpp:1559 gui/options.cpp:2208 #, fuzzy msgid "Not running" msgstr "Youxi Yunxing Cuowu:" -#: gui/options.cpp:1491 +#: gui/options.cpp:1563 #, fuzzy msgid "/root/ Path:" msgstr "Qita Lujing:" -#: gui/options.cpp:1491 gui/options.cpp:1493 gui/options.cpp:1494 +#: gui/options.cpp:1563 gui/options.cpp:1565 gui/options.cpp:1566 #, fuzzy msgid "Specifies which directory the Files Manager can access" msgstr "Zhiding Nin Jiang Youxi Baocun Zai le Nali" -#: gui/options.cpp:1493 +#: gui/options.cpp:1565 #, fuzzy msgctxt "lowres" msgid "/root/ Path:" msgstr "Qita Lujing:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 #, fuzzy msgid "Server's port:" msgstr "Fuwuqi:" -#: gui/options.cpp:1503 +#: gui/options.cpp:1575 msgid "" "Which port is used by the server\n" "Auth with server is not available with non-default port" msgstr "" -#: gui/options.cpp:1516 +#: gui/options.cpp:1588 msgid "Apply" msgstr "" -#: gui/options.cpp:1682 +#: gui/options.cpp:1754 #, fuzzy msgid "Failed to change cloud storage!" msgstr "Wufa baocun Youxi" -#: gui/options.cpp:1685 +#: gui/options.cpp:1757 msgid "Another cloud storage is already active." msgstr "" -#: gui/options.cpp:1721 +#: gui/options.cpp:1793 msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." @@ -1286,51 +1304,51 @@ msgstr "" "Nin Xuanze de Zhuti Bu Zhichi Xianzai de Yuyan. Qing Xian Qiehuan Dao Qita " "Yuyan." -#: gui/options.cpp:1756 +#: gui/options.cpp:1828 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:1765 +#: gui/options.cpp:1837 msgid "Select directory for GUI themes" msgstr "Xuanze Jiemian Zhuti de Mulu" -#: gui/options.cpp:1775 +#: gui/options.cpp:1847 msgid "Select directory for extra files" msgstr "Xuanze QIta Wenjian Mulu" -#: gui/options.cpp:1786 +#: gui/options.cpp:1858 msgid "Select directory for plugins" msgstr "Xuanze Chajian Mulu" -#: gui/options.cpp:1798 +#: gui/options.cpp:1870 #, fuzzy msgid "Select directory for Files Manager /root/" msgstr "Xuanze QIta Wenjian Mulu" -#: gui/options.cpp:2033 +#: gui/options.cpp:2105 #, c-format msgid "%llu bytes" msgstr "" -#: gui/options.cpp:2041 +#: gui/options.cpp:2113 msgid "<right now>" msgstr "" -#: gui/options.cpp:2043 +#: gui/options.cpp:2115 #, fuzzy msgid "<never>" msgstr "Yongbu" -#: gui/options.cpp:2127 +#: gui/options.cpp:2199 #, fuzzy msgid "Stop server" msgstr "Fuwuqi:" -#: gui/options.cpp:2128 +#: gui/options.cpp:2200 msgid "Stop local webserver" msgstr "" -#: gui/options.cpp:2219 +#: gui/options.cpp:2291 msgid "" "Request failed.\n" "Check your Internet connection." |