aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--backends/events/androidsdl/androidsdl-events.cpp3
-rw-r--r--backends/events/gph/gph-events.cpp6
-rw-r--r--backends/events/openpandora/op-events.cpp6
-rw-r--r--backends/events/sdl/sdl-events.cpp19
-rw-r--r--backends/events/symbiansdl/symbiansdl-events.cpp4
-rw-r--r--backends/events/webossdl/webossdl-events.cpp30
-rw-r--r--backends/events/wincesdl/wincesdl-events.cpp11
-rw-r--r--backends/networking/sdl_net/localwebserver.cpp118
-rw-r--r--engines/director/cast.cpp21
-rw-r--r--engines/director/director.cpp2
-rw-r--r--engines/director/frame.cpp4
-rw-r--r--engines/director/frame.h2
-rw-r--r--engines/director/graphics.cpp2
-rw-r--r--engines/director/movie.cpp16
-rw-r--r--engines/director/movie.h17
-rw-r--r--engines/director/resource.cpp6
-rw-r--r--engines/director/score.cpp13
-rw-r--r--engines/director/score.h2
-rw-r--r--engines/director/sprite.h2
-rw-r--r--engines/titanic/core/game_object.h2
-rw-r--r--engines/titanic/game/nav_helmet.cpp2
-rw-r--r--engines/titanic/star_control/base_star.cpp4
-rw-r--r--engines/titanic/star_control/base_star.h11
-rw-r--r--engines/titanic/star_control/fpoint.cpp3
-rw-r--r--engines/titanic/star_control/fpoint.h5
-rw-r--r--engines/titanic/star_control/star_control.cpp17
-rw-r--r--engines/titanic/star_control/star_control_sub12.cpp13
-rw-r--r--engines/titanic/star_control/star_control_sub12.h14
-rw-r--r--engines/titanic/star_control/star_control_sub13.cpp6
-rw-r--r--engines/titanic/star_control/star_control_sub13.h3
-rw-r--r--engines/titanic/star_control/star_control_sub2.cpp12
-rw-r--r--engines/titanic/star_control/star_control_sub2.h11
-rw-r--r--engines/titanic/star_control/star_control_sub6.cpp60
-rw-r--r--engines/titanic/star_control/star_control_sub6.h3
-rw-r--r--engines/titanic/star_control/star_control_sub8.cpp37
-rw-r--r--engines/titanic/star_control/star_control_sub8.h17
-rw-r--r--engines/titanic/star_control/star_field.cpp100
-rw-r--r--engines/titanic/star_control/star_field.h31
-rw-r--r--engines/titanic/star_control/star_points2.cpp5
-rw-r--r--engines/titanic/star_control/star_points2.h8
-rw-r--r--engines/titanic/star_control/star_view.cpp335
-rw-r--r--engines/titanic/star_control/star_view.h41
-rw-r--r--engines/titanic/titanic.h5
-rw-r--r--gui/options.cpp86
-rw-r--r--po/be_BY.po84
-rw-r--r--po/ca_ES.po84
-rw-r--r--po/cs_CZ.po84
-rw-r--r--po/da_DK.po84
-rw-r--r--po/de_DE.po122
-rw-r--r--po/el.po102
-rw-r--r--po/es_ES.po84
-rw-r--r--po/eu.po84
-rw-r--r--po/fi_FI.po108
-rw-r--r--po/fr_FR.po96
-rw-r--r--po/gl_ES.po84
-rw-r--r--po/hu_HU.po108
-rw-r--r--po/it_IT.po104
-rw-r--r--po/nb_NO.po84
-rw-r--r--po/nl_NL.po108
-rw-r--r--po/nn_NO.po84
-rw-r--r--po/pl_PL.po84
-rw-r--r--po/pt_BR.po99
-rw-r--r--po/pt_PT.po84
-rw-r--r--po/ru_RU.po100
-rw-r--r--po/scummvm.pot84
-rw-r--r--po/sv_SE.po84
-rw-r--r--po/uk_UA.po100
-rw-r--r--po/zh-Latn_CN.po84
68 files changed, 1594 insertions, 1744 deletions
diff --git a/backends/events/androidsdl/androidsdl-events.cpp b/backends/events/androidsdl/androidsdl-events.cpp
index 125f411289..0282b23a7a 100644
--- a/backends/events/androidsdl/androidsdl-events.cpp
+++ b/backends/events/androidsdl/androidsdl-events.cpp
@@ -50,6 +50,9 @@ bool AndroidSdlEventSource::handleMouseButtonDown(SDL_Event &ev, Common::Event &
return false;
processMouseEvent(event, ev.button.x, ev.button.y);
+ // update KbdMouse
+ _km.x = ev.button.x * MULTIPLIER;
+ _km.y = ev.button.y * MULTIPLIER;
return true;
}
diff --git a/backends/events/gph/gph-events.cpp b/backends/events/gph/gph-events.cpp
index d59d0bead5..a720ded0f2 100644
--- a/backends/events/gph/gph-events.cpp
+++ b/backends/events/gph/gph-events.cpp
@@ -191,6 +191,9 @@ bool GPHEventSource::handleMouseButtonDown(SDL_Event &ev, Common::Event &event)
return false;
processMouseEvent(event, ev.button.x, ev.button.y);
+ // update KbdMouse
+ _km.x = ev.button.x * MULTIPLIER;
+ _km.y = ev.button.y * MULTIPLIER;
return true;
}
@@ -217,6 +220,9 @@ bool GPHEventSource::handleMouseButtonUp(SDL_Event &ev, Common::Event &event) {
return false;
processMouseEvent(event, ev.button.x, ev.button.y);
+ // update KbdMouse
+ _km.x = ev.button.x * MULTIPLIER;
+ _km.y = ev.button.y * MULTIPLIER;
return true;
}
diff --git a/backends/events/openpandora/op-events.cpp b/backends/events/openpandora/op-events.cpp
index abb1458d66..80fff20bc2 100644
--- a/backends/events/openpandora/op-events.cpp
+++ b/backends/events/openpandora/op-events.cpp
@@ -84,6 +84,9 @@ bool OPEventSource::handleMouseButtonDown(SDL_Event &ev, Common::Event &event) {
return false;
processMouseEvent(event, ev.button.x, ev.button.y);
+ // update KbdMouse
+ _km.x = ev.button.x * MULTIPLIER;
+ _km.y = ev.button.y * MULTIPLIER;
return true;
}
@@ -112,6 +115,9 @@ bool OPEventSource::handleMouseButtonUp(SDL_Event &ev, Common::Event &event) {
return false;
processMouseEvent(event, ev.button.x, ev.button.y);
+ // update KbdMouse
+ _km.x = ev.button.x * MULTIPLIER;
+ _km.y = ev.button.y * MULTIPLIER;
return true;
}
diff --git a/backends/events/sdl/sdl-events.cpp b/backends/events/sdl/sdl-events.cpp
index 9a9d652dce..a1657468a8 100644
--- a/backends/events/sdl/sdl-events.cpp
+++ b/backends/events/sdl/sdl-events.cpp
@@ -177,10 +177,6 @@ void SdlEventSource::processMouseEvent(Common::Event &event, int x, int y) {
_graphicsManager->notifyMousePos(Common::Point(x, y));
_graphicsManager->transformMouseCoordinates(event.mouse);
}
-
- // Update the "keyboard mouse" coords
- _km.x = x * MULTIPLIER;
- _km.y = y * MULTIPLIER;
}
bool SdlEventSource::handleKbdMouse(Common::Event &event) {
@@ -311,14 +307,8 @@ bool SdlEventSource::handleKbdMouse(Common::Event &event) {
}
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;
}
}
@@ -745,6 +735,9 @@ bool SdlEventSource::handleKeyUp(SDL_Event &ev, Common::Event &event) {
bool SdlEventSource::handleMouseMotion(SDL_Event &ev, Common::Event &event) {
event.type = Common::EVENT_MOUSEMOVE;
processMouseEvent(event, ev.motion.x, ev.motion.y);
+ // update KbdMouse
+ _km.x = ev.motion.x * MULTIPLIER;
+ _km.y = ev.motion.y * MULTIPLIER;
return true;
}
@@ -768,6 +761,9 @@ bool SdlEventSource::handleMouseButtonDown(SDL_Event &ev, Common::Event &event)
return false;
processMouseEvent(event, ev.button.x, ev.button.y);
+ // update KbdMouse
+ _km.x = ev.button.x * MULTIPLIER;
+ _km.y = ev.button.y * MULTIPLIER;
return true;
}
@@ -784,6 +780,9 @@ bool SdlEventSource::handleMouseButtonUp(SDL_Event &ev, Common::Event &event) {
else
return false;
processMouseEvent(event, ev.button.x, ev.button.y);
+ // update KbdMouse
+ _km.x = ev.button.x * MULTIPLIER;
+ _km.y = ev.button.y * MULTIPLIER;
return true;
}
diff --git a/backends/events/symbiansdl/symbiansdl-events.cpp b/backends/events/symbiansdl/symbiansdl-events.cpp
index 9272cbaf9d..4649f9f90a 100644
--- a/backends/events/symbiansdl/symbiansdl-events.cpp
+++ b/backends/events/symbiansdl/symbiansdl-events.cpp
@@ -133,6 +133,10 @@ bool SymbianSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
_currentZone = 0;
event.type = Common::EVENT_MOUSEMOVE;
processMouseEvent(event, _mouseXZone[_currentZone], _mouseYZone[_currentZone]);
+ // update KbdMouse
+ _km.x = _mouseXZone[_currentZone] * MULTIPLIER;
+ _km.y = _mouseYZone[_currentZone] * MULTIPLIER;
+
if (_graphicsManager) {
_graphicsManager->getWindow()->warpMouseInWindow(event.mouse.x, event.mouse.y);
}
diff --git a/backends/events/webossdl/webossdl-events.cpp b/backends/events/webossdl/webossdl-events.cpp
index 72106789a5..8f124f2f2d 100644
--- a/backends/events/webossdl/webossdl-events.cpp
+++ b/backends/events/webossdl/webossdl-events.cpp
@@ -150,6 +150,9 @@ bool WebOSSdlEventSource::handleMouseButtonDown(SDL_Event &ev,
_dragging = true;
event.type = Common::EVENT_LBUTTONDOWN;
processMouseEvent(event, _curX, _curY);
+ // update KbdMouse
+ _km.x = _curX * MULTIPLIER;
+ _km.y = _curY * MULTIPLIER;
}
// If we're not in trackpad mode, move the cursor to the tap
if (!_trackpadMode) {
@@ -158,11 +161,17 @@ bool WebOSSdlEventSource::handleMouseButtonDown(SDL_Event &ev,
// If we're already clicking, hold it until after the move.
if (event.type == Common::EVENT_LBUTTONDOWN) {
processMouseEvent(event, _curX, _curY);
+ // update KbdMouse
+ _km.x = _curX * MULTIPLIER;
+ _km.y = _curY * MULTIPLIER;
g_system->getEventManager()->pushEvent(event);
}
// Move the mouse
event.type = Common::EVENT_MOUSEMOVE;
processMouseEvent(event, _curX, _curY);
+ // update KbdMouse
+ _km.x = _curX * MULTIPLIER;
+ _km.y = _curY * MULTIPLIER;
}
// Watch for a double-tap-triggered drag
_dragStartTime = g_system->getMillis();
@@ -191,6 +200,9 @@ bool WebOSSdlEventSource::handleMouseButtonUp(SDL_Event &ev,
if (ev.button.which == 0 && _dragging) {
event.type = Common::EVENT_LBUTTONUP;
processMouseEvent(event, _curX, _curY);
+ // update KbdMouse
+ _km.x = _curX * MULTIPLIER;
+ _km.y = _curY * MULTIPLIER;
_dragging = false;
} else {
// If it was the first finger and the click hasn't been
@@ -199,6 +211,9 @@ bool WebOSSdlEventSource::handleMouseButtonUp(SDL_Event &ev,
!_fingerDown[1] && !_fingerDown[2]) {
event.type = Common::EVENT_LBUTTONUP;
processMouseEvent(event, _curX, _curY);
+ // update KbdMouse
+ _km.x = _curX * MULTIPLIER;
+ _km.y = _curY * MULTIPLIER;
g_system->getEventManager()->pushEvent(event);
event.type = Common::EVENT_LBUTTONDOWN;
if (_queuedDragTime > 0)
@@ -209,6 +224,9 @@ bool WebOSSdlEventSource::handleMouseButtonUp(SDL_Event &ev,
// right mouse click.
event.type = Common::EVENT_RBUTTONDOWN;
processMouseEvent(event, _curX, _curY);
+ // update KbdMouse
+ _km.x = _curX * MULTIPLIER;
+ _km.y = _curY * MULTIPLIER;
_queuedRUpTime = g_system->getMillis() + QUEUED_RUP_DELAY;
} else if (ev.button.which == 2 &&
_fingerDown[0] && _fingerDown[1]) {
@@ -217,6 +235,9 @@ bool WebOSSdlEventSource::handleMouseButtonUp(SDL_Event &ev,
// as a right click.
event.type = Common::EVENT_MBUTTONUP;
processMouseEvent(event, _curX, _curY);
+ // update KbdMouse
+ _km.x = _curX * MULTIPLIER;
+ _km.y = _curY * MULTIPLIER;
g_system->getEventManager()->pushEvent(event);
event.type = Common::EVENT_MBUTTONDOWN;
_fingerDown[1] = false;
@@ -263,6 +284,9 @@ bool WebOSSdlEventSource::handleMouseMotion(SDL_Event &ev,
}
event.type = Common::EVENT_MOUSEMOVE;
processMouseEvent(event, _curX, _curY);
+ // update KbdMouse
+ _km.x = _curX * MULTIPLIER;
+ _km.y = _curY * MULTIPLIER;
}
break;
case 1:
@@ -407,12 +431,18 @@ bool WebOSSdlEventSource::pollEvent(Common::Event &event) {
} else if (_queuedRUpTime != 0 && curTime >= _queuedRUpTime) {
event.type = Common::EVENT_RBUTTONUP;
processMouseEvent(event, _curX, _curY);
+ // update KbdMouse
+ _km.x = _curX * MULTIPLIER;
+ _km.y = _curY * MULTIPLIER;
_queuedRUpTime = 0;
return true;
} else if (_queuedDragTime != 0 && curTime >= _queuedDragTime) {
event.type = Common::EVENT_LBUTTONDOWN;
_dragging = true;
processMouseEvent(event, _curX, _curY);
+ // update KbdMouse
+ _km.x = _curX * MULTIPLIER;
+ _km.y = _curY * MULTIPLIER;
_queuedDragTime = 0;
return true;
}
diff --git a/backends/events/wincesdl/wincesdl-events.cpp b/backends/events/wincesdl/wincesdl-events.cpp
index 7001d5fec6..c949d1c41c 100644
--- a/backends/events/wincesdl/wincesdl-events.cpp
+++ b/backends/events/wincesdl/wincesdl-events.cpp
@@ -156,6 +156,10 @@ bool WINCESdlEventSource::pollEvent(Common::Event &event) {
case SDL_MOUSEMOTION:
event.type = Common::EVENT_MOUSEMOVE;
processMouseEvent(event, ev.motion.x, ev.motion.y);
+ // update KbdMouse
+ _km.x = ev.motion.x * MULTIPLIER;
+ _km.y = ev.motion.y * MULTIPLIER;
+
_graphicsMan->setMousePos(event.mouse.x, event.mouse.y);
return true;
@@ -168,7 +172,9 @@ bool WINCESdlEventSource::pollEvent(Common::Event &event) {
else
break;
processMouseEvent(event, ev.button.x, ev.button.y);
-
+ // update KbdMouse
+ _km.x = ev.button.x * MULTIPLIER;
+ _km.y = ev.button.y * MULTIPLIER;
if (event.mouse.x > _tapX)
deltaX = event.mouse.x - _tapX;
@@ -244,6 +250,9 @@ bool WINCESdlEventSource::pollEvent(Common::Event &event) {
}
processMouseEvent(event, ev.button.x, ev.button.y);
+ // update KbdMouse
+ _km.x = ev.button.x * MULTIPLIER;
+ _km.y = ev.button.y * MULTIPLIER;
if (freeLookActive && !_closeClick) {
_tapX = event.mouse.x;
diff --git a/backends/networking/sdl_net/localwebserver.cpp b/backends/networking/sdl_net/localwebserver.cpp
index fdc89b51e4..836b90a244 100644
--- a/backends/networking/sdl_net/localwebserver.cpp
+++ b/backends/networking/sdl_net/localwebserver.cpp
@@ -33,10 +33,20 @@
#include <common/config-manager.h>
#ifdef POSIX
-#include <sys/types.h>
-#include <ifaddrs.h>
-#include <netinet/in.h>
+#include <errno.h>
+#include <unistd.h>
#include <arpa/inet.h>
+#include <net/if.h>
+#include <netinet/in.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+
+#ifndef _SIZEOF_ADDR_IFREQ
+#define _SIZEOF_ADDR_IFREQ sizeof
+#endif
+
+#define LSSDP_BUFFER_LEN 2048
#endif
namespace Common {
@@ -295,56 +305,70 @@ void LocalWebserver::resolveAddress(void *ipAddress) {
// if not - try platform-specific
#ifdef POSIX
- struct ifaddrs *ifAddrStruct = NULL;
void *tmpAddrPtr = NULL;
- getifaddrs(&ifAddrStruct);
-
- for (struct ifaddrs *i = ifAddrStruct; i != NULL; i = i->ifa_next) {
- if (!i->ifa_addr) {
- continue;
- }
-
- Common::String addr;
-
- // IPv4
- if (i->ifa_addr->sa_family == AF_INET) {
- tmpAddrPtr = &((struct sockaddr_in *)i->ifa_addr)->sin_addr;
- char addressBuffer[INET_ADDRSTRLEN];
- inet_ntop(AF_INET, tmpAddrPtr, addressBuffer, INET_ADDRSTRLEN);
- debug(9, "%s IP Address %s", i->ifa_name, addressBuffer);
- addr = addressBuffer;
+ int fd = socket(AF_INET, SOCK_DGRAM, 0);
+ if (fd < 0) {
+ warning("LocalWebserver: failed to create socket: %s (%d)", strerror(errno), errno);
+ } else {
+ // get ifconfig
+ char buffer[LSSDP_BUFFER_LEN] = {};
+ struct ifconf ifc;
+ ifc.ifc_len = sizeof(buffer);
+ ifc.ifc_buf = (caddr_t) buffer;
+
+ if (ioctl(fd, SIOCGIFCONF, &ifc) < 0) {
+ warning("LocalWebserver: ioctl SIOCGIFCONF failed: %s (%d)", strerror(errno), errno);
+ } else {
+ struct ifreq *i;
+ for (size_t index = 0; index < ifc.ifc_len; index += _SIZEOF_ADDR_IFREQ(*i)) {
+ i = (struct ifreq *)(buffer + index);
+
+ Common::String addr;
+
+ // IPv4
+ if (i->ifr_addr.sa_family == AF_INET) {
+ tmpAddrPtr = &((struct sockaddr_in *)&i->ifr_addr)->sin_addr;
+ char addressBuffer[INET_ADDRSTRLEN];
+ inet_ntop(AF_INET, tmpAddrPtr, addressBuffer, INET_ADDRSTRLEN);
+ debug(9, "%s IP Address %s", i->ifr_name, addressBuffer);
+ addr = addressBuffer;
+ }
+
+ // IPv6
+ /*
+ if (i->ifr_addr.sa_family == AF_INET6) {
+ tmpAddrPtr = &((struct sockaddr_in6 *)&i->ifr_addr)->sin6_addr;
+ char addressBuffer[INET6_ADDRSTRLEN];
+ inet_ntop(AF_INET6, tmpAddrPtr, addressBuffer, INET6_ADDRSTRLEN);
+ debug(9, "%s IP Address %s", i->ifr_name, addressBuffer);
+ addr = addressBuffer;
+ }
+ */
+
+ if (addr.empty())
+ continue;
+
+ // ignored IPv4 addresses
+ if (addr.equals("127.0.0.1") || addr.equals("0.0.0.0") || addr.equals("localhost"))
+ continue;
+
+ // ignored IPv6 addresses
+ /*
+ if (addr.equals("::1"))
+ continue;
+ */
+
+ // use the address found
+ _address = "http://" + addr + Common::String::format(":%u/", _serverPort);
+ }
}
- // IPv6
- /*
- if (i->ifa_addr->sa_family == AF_INET6) {
- tmpAddrPtr = &((struct sockaddr_in6 *)i->ifa_addr)->sin6_addr;
- char addressBuffer[INET6_ADDRSTRLEN];
- inet_ntop(AF_INET6, tmpAddrPtr, addressBuffer, INET6_ADDRSTRLEN);
- debug(9, "%s IP Address %s", i->ifa_name, addressBuffer);
- addr = addressBuffer;
+ // close socket
+ if (close(fd) != 0) {
+ warning("LocalWebserver: failed to close socket [fd %d]: %s (%d)", fd, strerror(errno), errno);
}
- */
-
- if (addr.empty())
- continue;
-
- // ignored IPv4 addresses
- if (addr.equals("127.0.0.1") || addr.equals("0.0.0.0") || addr.equals("localhost"))
- continue;
-
- // ignored IPv6 addresses
- /*
- if (addr.equals("::1"))
- continue;
- */
-
- // use the address found
- _address = "http://" + addr + Common::String::format(":%u/", _serverPort);
}
-
- if (ifAddrStruct != NULL) freeifaddrs(ifAddrStruct);
#endif
}
diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 4b391bd8cc..0f63a96435 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -94,12 +94,23 @@ TextCast::TextCast(Common::ReadStreamEndian &stream, uint16 version) {
palinfo2 = stream.readUint16();
palinfo3 = stream.readUint16();
- int t = stream.readUint32();
- if (t != 0) { // In D2 there are values
- warning("TextCast: t: %x", t);
+ if (version == 2) {
+ int t = stream.readUint16();
+ if (t != 0) { // In D2 there are values
+ warning("TextCast: t: %x", t);
+ }
+
+ initialRect = Score::readRect(stream);
+ stream.readUint16();
+ } else {
+ int t = stream.readUint32();
+ if (t != 0) { // In D2 there are values
+ warning("TextCast: t: %x", t);
+ }
+
+ initialRect = Score::readRect(stream);
}
- initialRect = Score::readRect(stream);
textShadow = static_cast<SizeType>(stream.readByte());
byte flags = stream.readByte();
if (flags & 0x1)
@@ -182,7 +193,7 @@ ButtonCast::ButtonCast(Common::ReadStreamEndian &stream, uint16 version) : TextC
stream.readByte();
stream.readByte();
- //This has already been populated in the super TextCast constructor
+ // This has already been populated in the super TextCast constructor
//initialRect = Score::readRect(stream);
//boundingRect = Score::readRect(stream);
diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 1f0c89780e..edea7ea591 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -137,7 +137,7 @@ Common::Error DirectorEngine::run() {
return Common::kNoError;
}
- //FIXME
+ // FIXME
//_mainArchive = new RIFFArchive();
//_mainArchive->openFile("bookshelf_example.mmm");
diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index df03f998cd..50627d6d16 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -906,8 +906,8 @@ void Frame::renderText(Graphics::ManagedSurface &surface, uint16 spriteId, Commo
int x = _sprites[spriteId]->_startPoint.x; // +rectLeft;
int y = _sprites[spriteId]->_startPoint.y; // +rectTop;
- int height = _sprites[spriteId]->_height;
- int width = _sprites[spriteId]->_width;
+ int height = _sprites[spriteId]->_cast->initialRect.height(); //_sprites[spriteId]->_height;
+ int width = _sprites[spriteId]->_cast->initialRect.width(); //_sprites[spriteId]->_width;
if (_vm->getVersion() >= 4 && textSize != NULL)
width = textCast->initialRect.right;
diff --git a/engines/director/frame.h b/engines/director/frame.h
index 3799c2043c..704319ba0d 100644
--- a/engines/director/frame.h
+++ b/engines/director/frame.h
@@ -143,7 +143,7 @@ public:
byte _channelData[kChannelDataSize];
uint8 _actionId;
uint8 _transDuration;
- uint8 _transArea; //1 - Whole Stage, 0 - Changing Area
+ uint8 _transArea; // 1 - Whole Stage, 0 - Changing Area
uint8 _transChunkSize;
TransitionType _transType;
PaletteInfo *_palette;
diff --git a/engines/director/graphics.cpp b/engines/director/graphics.cpp
index 76ff41788c..5322abcedf 100644
--- a/engines/director/graphics.cpp
+++ b/engines/director/graphics.cpp
@@ -210,7 +210,7 @@ void DirectorEngine::loadPatterns() {
}
Graphics::MacPatterns &DirectorEngine::getPatterns() {
- //TOOD: implement switch and other version patterns. (use getVersion());
+ // TOOD: implement switch and other version patterns. (use getVersion());
return _director3QuickDrawPatterns;
}
diff --git a/engines/director/movie.cpp b/engines/director/movie.cpp
index 9799510c6b..5d7b60efae 100644
--- a/engines/director/movie.cpp
+++ b/engines/director/movie.cpp
@@ -18,22 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- *
- * Additional copyright for this file:
- * Copyright (C) 1995-1997 Presto Studios, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
*/
#include "common/system.h"
diff --git a/engines/director/movie.h b/engines/director/movie.h
index e4729a62c3..8cccb99ad7 100644
--- a/engines/director/movie.h
+++ b/engines/director/movie.h
@@ -18,22 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- *
- * Additional copyright for this file:
- * Copyright (C) 1995-1997 Presto Studios, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
*/
#ifndef DIRECTOR_MOVIE_H
@@ -60,6 +44,7 @@ private:
Video::VideoDecoder *_currentVideo;
DirectorEngine *_vm;
};
+
} // End of namespace Director
#endif
diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index 3db6d66a13..6dace8bcb2 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -231,6 +231,12 @@ void DirectorEngine::loadSharedCastsFrom(Common::String filename) {
_sharedScore->loadCastData(*shardcst->getResource(MKTAG('C','A','S','t'), *iterator), *iterator, NULL);
}
+ Common::Array<uint16> vwci = shardcst->getResourceIDList(MKTAG('V', 'W', 'C', 'I'));
+ if (vwci.size() > 0) {
+ for (Common::Array<uint16>::iterator iterator = vwci.begin(); iterator != vwci.end(); ++iterator)
+ _sharedScore->loadCastInfo(*shardcst->getResource(MKTAG('V', 'W', 'C', 'I'), *iterator), *iterator);
+ }
+
_sharedScore->setSpriteCasts();
Common::Array<uint16> dib = shardcst->getResourceIDList(MKTAG('D','I','B',' '));
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index c72fc0cf8f..0f2f9ecb96 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -344,12 +344,12 @@ void Score::setSpriteCasts() {
}
void Score::loadCastData(Common::SeekableSubReadStreamEndian &stream, uint16 id, Resource *res) {
- // d4+ variant
+ // D4+ variant
if (stream.size() == 0)
return;
- //TODO: Determine if there really is a minimum size.
- //This value was too small for Shape Casts.
+ // TODO: Determine if there really is a minimum size.
+ // This value was too small for Shape Casts.
if (stream.size() < 10) {
warning("CAST data id %d is too small", id);
return;
@@ -717,14 +717,15 @@ int Score::getNextLabelNumber(int referenceFrame) {
for (i = _labels->begin(); i != _labels->end(); ++i) {
if ((*i)->number >= referenceFrame) {
+ int n = (*i)->number;
+ ++i;
if (i != _labels->end()) {
// return to the first marker to to the right
- ++i;
return (*i)->number;
} else {
// if no markers are to the right of the playback head,
// the playback head goes to the first marker to the left
- return (*i)->number;
+ return n;
}
}
}
@@ -909,7 +910,7 @@ void Score::update() {
if (_vm->getVersion() >= 6) {
for (uint16 i = 0; i < CHANNEL_COUNT; i++) {
if (_frames[_currentFrame]->_sprites[i]->_enabled) {
- //TODO: Check if this is also possibly a kSpriteScript?
+ // TODO: Check if this is also possibly a kSpriteScript?
_lingo->processEvent(kEventBeginSprite, kCastScript, _frames[_currentFrame]->_sprites[i]->_scriptId);
}
}
diff --git a/engines/director/score.h b/engines/director/score.h
index 9ffa0e4de2..0a51d65a9a 100644
--- a/engines/director/score.h
+++ b/engines/director/score.h
@@ -72,6 +72,7 @@ public:
void loadConfig(Common::SeekableSubReadStreamEndian &stream);
void loadCastDataVWCR(Common::SeekableSubReadStreamEndian &stream);
void loadCastData(Common::SeekableSubReadStreamEndian &stream, uint16 id, Resource *res);
+ void loadCastInfo(Common::SeekableSubReadStreamEndian &stream, uint16 id);
void setCurrentFrame(uint16 frameId) { _currentFrame = frameId; }
int getCurrentFrame() { return _currentFrame; }
Common::String getMacName() const { return _macName; }
@@ -90,7 +91,6 @@ private:
void loadFrames(Common::SeekableSubReadStreamEndian &stream);
void loadLabels(Common::SeekableSubReadStreamEndian &stream);
void loadActions(Common::SeekableSubReadStreamEndian &stream);
- void loadCastInfo(Common::SeekableSubReadStreamEndian &stream, uint16 id);
void loadScriptText(Common::SeekableSubReadStreamEndian &stream);
void loadFileInfo(Common::SeekableSubReadStreamEndian &stream);
void loadFontMap(Common::SeekableSubReadStreamEndian &stream);
diff --git a/engines/director/sprite.h b/engines/director/sprite.h
index d9b7729a87..c43418828c 100644
--- a/engines/director/sprite.h
+++ b/engines/director/sprite.h
@@ -49,7 +49,7 @@ enum InkType {
kInkTypeDark
};
-//Director v4
+// Director v4
enum SpriteType {
kInactiveSprite, // turns the sprite off
kBitmapSprite,
diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h
index a04860f7a4..3f42a872cb 100644
--- a/engines/titanic/core/game_object.h
+++ b/engines/titanic/core/game_object.h
@@ -44,7 +44,7 @@ enum Found { FOUND_NONE = 0, FOUND_GLOBAL = 1, FOUND_ROOM = 2, FOUND_PET = 3, FO
enum RoomFlagsComparison { RFC_LOCATION = 1, RFC_CLASS_ELEVATOR = 2, RFC_TITANIA = 3 };
enum StarControlAction {
STAR_SHOW = 0, STAR_HIDE, STAR_2, STAR_RESET_POS, STAR_4, STAR_5, STAR_6, STAR_7,
- STAR_8, STAR_9, STAR_10, STAR_11, STAR_12, STAR_13, STAR_SET_REFERENCE, STAR_FADE_IN,
+ STAR_8, STAR_TOGGLE_MODE, STAR_10, STAR_11, STAR_12, STAR_13, STAR_SET_REFERENCE, STAR_FADE_IN,
STAR_FADE_OUT, STAR_17, STAR_18, STAR_19
};
diff --git a/engines/titanic/game/nav_helmet.cpp b/engines/titanic/game/nav_helmet.cpp
index aaaa17defd..37d96a21fd 100644
--- a/engines/titanic/game/nav_helmet.cpp
+++ b/engines/titanic/game/nav_helmet.cpp
@@ -106,7 +106,7 @@ bool CNavHelmet::PETHelmetOnOffMsg(CPETHelmetOnOffMsg *msg) {
bool CNavHelmet::PETPhotoOnOffMsg(CPETPhotoOnOffMsg *msg) {
if (_flag)
- starFn(STAR_9);
+ starFn(STAR_TOGGLE_MODE);
return true;
}
diff --git a/engines/titanic/star_control/base_star.cpp b/engines/titanic/star_control/base_star.cpp
index 218176af9f..16e79fbe80 100644
--- a/engines/titanic/star_control/base_star.cpp
+++ b/engines/titanic/star_control/base_star.cpp
@@ -165,8 +165,8 @@ void CBaseStar::draw1(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStar
vector._x = entry._val._v1;
vector._y = entry._val._v2;
vector._z = entry._val._v3;
- v4 = vector._x * sub6._matrix._row1._z + vector._y * sub6._matrix._row2._z
- + vector._z * sub6._matrix._row3._z + sub6._field2C;
+ v4 = vector._x * sub6._row1._z + vector._y * sub6._row2._z
+ + vector._z * sub6._row3._z + sub6._field2C;
if (v4 <= minVal)
continue;
diff --git a/engines/titanic/star_control/base_star.h b/engines/titanic/star_control/base_star.h
index f3e16f154e..80f219c9ea 100644
--- a/engines/titanic/star_control/base_star.h
+++ b/engines/titanic/star_control/base_star.h
@@ -30,6 +30,8 @@
namespace Titanic {
+enum StarMode { MODE_STARFIELD = 0, MODE_PHOTO = 1 };
+
class CStarControlSub12;
struct CBaseStarEntry {
@@ -92,10 +94,15 @@ public:
virtual void draw(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStarControlSub5 *sub5);
virtual bool loadYale(int v1) { return true; }
- virtual bool proc4(int v1, int v2, int v3, int v4, int v5) { return false; }
+
+ /**
+ * Selects a star
+ */
+ virtual bool selectStar(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12,
+ int flags, const Common::Point &pt) { return false; }
+
virtual bool proc5(int v1) { return false; }
virtual bool loadStar() { return false; }
- virtual bool proc7(int v1, int v2) { return true; }
/**
* Load the item's data
diff --git a/engines/titanic/star_control/fpoint.cpp b/engines/titanic/star_control/fpoint.cpp
index a2829572f8..a7c764177a 100644
--- a/engines/titanic/star_control/fpoint.cpp
+++ b/engines/titanic/star_control/fpoint.cpp
@@ -25,13 +25,14 @@
namespace Titanic {
-void FPoint::normalize() {
+double FPoint::normalize() {
double hyp = sqrt(_x * _x + _y * _y);
assert(hyp != 0.0);
double fraction = 1.0 / hyp;
_x *= fraction;
_y *= fraction;
+ return hyp;
}
} // End of namespace Titanic
diff --git a/engines/titanic/star_control/fpoint.h b/engines/titanic/star_control/fpoint.h
index 9ce58c08af..d967351289 100644
--- a/engines/titanic/star_control/fpoint.h
+++ b/engines/titanic/star_control/fpoint.h
@@ -23,6 +23,8 @@
#ifndef TITANIC_FPOINT_H
#define TITANIC_FPOINT_H
+#include "common/rect.h"
+
namespace Titanic {
/**
@@ -34,6 +36,7 @@ public:
public:
FPoint() : _x(0), _y(0) {}
FPoint(double x, double y) : _x(x), _y(y) {}
+ FPoint(const Common::Point &pt) : _x(pt.x), _y(pt.y) {}
bool operator==(const FPoint &p) const { return _x == p._x && _y == p._y; }
bool operator!=(const FPoint &p) const { return _x != p._x || _y != p._y; }
@@ -54,7 +57,7 @@ public:
* Normalises the X and Y coordinates as fractions relative to the
* value of the hypotenuse formed by a triangle from the origin (0,0)
*/
- void normalize();
+ double normalize();
};
} // End of namespace Titanic
diff --git a/engines/titanic/star_control/star_control.cpp b/engines/titanic/star_control/star_control.cpp
index dcde81e253..6e27223f72 100644
--- a/engines/titanic/star_control/star_control.cpp
+++ b/engines/titanic/star_control/star_control.cpp
@@ -110,8 +110,11 @@ bool CStarControl::MouseMoveMsg(CMouseMoveMsg *msg) {
}
bool CStarControl::KeyCharMsg(CKeyCharMsg *msg) {
- if (_visible)
- _view.KeyCharMsg(msg->_key);
+ if (_visible) {
+ CErrorCode errorCode;
+ _view.KeyCharMsg(msg->_key, &errorCode);
+ return errorCode.get();
+ }
return false;
}
@@ -138,7 +141,7 @@ void CStarControl::newFrame() {
int val1 = _starField.get88();
int val2 = 0;
- if (!_starField.get3()) {
+ if (_starField.getMode() == MODE_STARFIELD) {
val2 = _starField.get5();
if ((val1 + 2) == _starField.get7Count())
val2 = 0;
@@ -205,8 +208,8 @@ void CStarControl::doAction(StarControlAction action) {
_view.fn9();
break;
- case STAR_9:
- _view.fn10();
+ case STAR_TOGGLE_MODE:
+ _view.toggleMode();
break;
case STAR_10:
@@ -226,7 +229,7 @@ void CStarControl::doAction(StarControlAction action) {
break;
case STAR_SET_REFERENCE: {
- _view.fn15();
+ _view.setHasReference();
CPetControl *pet = getPetControl();
if (pet)
pet->starsSetReference();
@@ -250,7 +253,7 @@ void CStarControl::doAction(StarControlAction action) {
break;
case STAR_19:
- _view.petDestinationSet();
+ _view.starDestinationSet();
break;
}
}
diff --git a/engines/titanic/star_control/star_control_sub12.cpp b/engines/titanic/star_control/star_control_sub12.cpp
index e8d49992bb..cd7400c577 100644
--- a/engines/titanic/star_control/star_control_sub12.cpp
+++ b/engines/titanic/star_control/star_control_sub12.cpp
@@ -105,9 +105,9 @@ void CStarControlSub12::proc11() {
_sub13.fn12();
}
-void CStarControlSub12::proc12(double v1, double v2) {
+void CStarControlSub12::proc12(StarMode mode, double v2) {
if (!isLocked())
- _sub13.fn13(v1, v2);
+ _sub13.fn13(mode, v2);
}
void CStarControlSub12::proc13(CStarControlSub13 *dest) {
@@ -122,7 +122,7 @@ void CStarControlSub12::proc14(int v) {
_handlerP->proc9(&vector, v, &matrix);
}
-void CStarControlSub12::proc15(int v) {
+void CStarControlSub12::proc15(CErrorCode *errorCode) {
if (!_matrix1)
_matrix1 = new FMatrix();
if (!_matrix2)
@@ -133,8 +133,7 @@ void CStarControlSub12::proc15(int v) {
FVector v1 = _sub13._position;
FVector v2 = _sub13._position;
- CErrorCode errorCode;
- _handlerP->proc11(errorCode, v2, _matrix2);
+ _handlerP->proc11(*errorCode, v2, _matrix2);
if (v1 != v2) {
_sub13.setPosition(v2);
@@ -216,8 +215,8 @@ FVector CStarControlSub12::proc31(int index, const FVector &v) {
return _sub13.fn18(index, v);
}
-void CStarControlSub12::proc32(double v1, double v2) {
- error("TODO: CStarControlSub12::proc32");
+void CStarControlSub12::setViewportPosition(const FPoint &pt) {
+ // TODO
}
bool CStarControlSub12::setArrayVector(const FVector &v) {
diff --git a/engines/titanic/star_control/star_control_sub12.h b/engines/titanic/star_control/star_control_sub12.h
index 8da45df5c0..2e53f10087 100644
--- a/engines/titanic/star_control/star_control_sub12.h
+++ b/engines/titanic/star_control/star_control_sub12.h
@@ -25,8 +25,11 @@
#include "titanic/support/simple_file.h"
#include "titanic/star_control/fmatrix.h"
+#include "titanic/star_control/fpoint.h"
+#include "titanic/star_control/base_star.h"
#include "titanic/star_control/star_control_sub13.h"
#include "titanic/star_control/star_control_sub20.h"
+#include "titanic/star_control/error_code.h"
namespace Titanic {
@@ -73,10 +76,10 @@ public:
virtual void proc9(int v);
virtual void proc10(int v);
virtual void proc11();
- virtual void proc12(double v1, double v2);
+ virtual void proc12(StarMode mode, double v2);
virtual void proc13(CStarControlSub13 *dest);
virtual void proc14(int v);
- virtual void proc15(int v);
+ virtual void proc15(CErrorCode *errorCode);
virtual void proc16();
virtual void proc17();
virtual void proc18();
@@ -93,7 +96,12 @@ public:
virtual FVector proc29(const FVector &v);
virtual FVector proc30(int index, const FVector &v);
virtual FVector proc31(int index, const FVector &v);
- virtual void proc32(double v1, double v2);
+
+ /**
+ * Sets the viewport position within the starfield
+ */
+ virtual void setViewportPosition(const FPoint &pt);
+
virtual int getCurrentIndex() const { return _currentIndex; }
virtual bool setArrayVector(const FVector &v);
virtual bool proc35();
diff --git a/engines/titanic/star_control/star_control_sub13.cpp b/engines/titanic/star_control/star_control_sub13.cpp
index 5da6118a74..298425ee55 100644
--- a/engines/titanic/star_control/star_control_sub13.cpp
+++ b/engines/titanic/star_control/star_control_sub13.cpp
@@ -129,7 +129,7 @@ void CStarControlSub13::setPosition(const FVector &v) {
void CStarControlSub13::setPosition(const CStarControlSub6 &sub6) {
FVector vector;
_position.fn5(&vector, &sub6);
- _position = sub6._matrix._row1;
+ _position = sub6._row1;
_fieldD4 = 0;
}
@@ -172,8 +172,8 @@ void CStarControlSub13::fn12() {
error("TODO: CStarControlSub13::fn12");
}
-void CStarControlSub13::fn13(double v1, double v2) {
- if (v1 == 0.0) {
+void CStarControlSub13::fn13(StarMode mode, double v2) {
+ if (mode == MODE_STARFIELD) {
_valArray[0] = v2;
_valArray[1] = -v2;
} else {
diff --git a/engines/titanic/star_control/star_control_sub13.h b/engines/titanic/star_control/star_control_sub13.h
index 2f0b479cec..75ae03b977 100644
--- a/engines/titanic/star_control/star_control_sub13.h
+++ b/engines/titanic/star_control/star_control_sub13.h
@@ -24,6 +24,7 @@
#define TITANIC_STAR_CONTROL_SUB13_H
#include "titanic/support/simple_file.h"
+#include "titanic/star_control/base_star.h"
#include "titanic/star_control/star_control_sub6.h"
#include "titanic/star_control/fmatrix.h"
@@ -88,7 +89,7 @@ public:
void fn11(const FVector &v);
void fn12();
- void fn13(double v1, double v2);
+ void fn13(StarMode mode, double v2);
void fn14(double v);
void fn15(FMatrix &matrix);
CStarControlSub6 getSub1();
diff --git a/engines/titanic/star_control/star_control_sub2.cpp b/engines/titanic/star_control/star_control_sub2.cpp
index fcbb70cbcb..cf7190fb34 100644
--- a/engines/titanic/star_control/star_control_sub2.cpp
+++ b/engines/titanic/star_control/star_control_sub2.cpp
@@ -24,13 +24,14 @@
namespace Titanic {
-bool CStarControlSub2::proc3(int v1) {
+bool CStarControlSub2::loadYale(int v1) {
clear();
- // TODO
+ error("Original loadYale not supported");
return true;
}
-bool CStarControlSub2::proc4(int v1, int v2, int v3, int v4, int v5) {
+bool CStarControlSub2::selectStar(CSurfaceArea *surfaceArea,
+ CStarControlSub12 *sub12, int flags, const Common::Point &pt) {
// TODO
return true;
}
@@ -40,11 +41,6 @@ bool CStarControlSub2::loadStar() {
return true;
}
-bool CStarControlSub2::proc7(int v1, int v2) {
- // TODO
- return true;
-}
-
bool CStarControlSub2::setup() {
// TODO
return true;
diff --git a/engines/titanic/star_control/star_control_sub2.h b/engines/titanic/star_control/star_control_sub2.h
index cd7781548f..9de2da4583 100644
--- a/engines/titanic/star_control/star_control_sub2.h
+++ b/engines/titanic/star_control/star_control_sub2.h
@@ -31,10 +31,15 @@ class CStarControlSub2: public CBaseStar {
public:
virtual ~CStarControlSub2() {}
- virtual bool proc3(int v1);
- virtual bool proc4(int v1, int v2, int v3, int v4, int v5);
+ virtual bool loadYale(int v1);
+
+ /**
+ * Selects a star
+ */
+ virtual bool selectStar(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12,
+ int flags, const Common::Point &pt);
+
virtual bool loadStar();
- virtual bool proc7(int v1, int v2);
/**
* Setup the control
diff --git a/engines/titanic/star_control/star_control_sub6.cpp b/engines/titanic/star_control/star_control_sub6.cpp
index a5a1d81aa8..97eb5971ef 100644
--- a/engines/titanic/star_control/star_control_sub6.cpp
+++ b/engines/titanic/star_control/star_control_sub6.cpp
@@ -48,7 +48,7 @@ void CStarControlSub6::deinit() {
}
void CStarControlSub6::clear() {
- _matrix.clear();
+ FMatrix::clear();
_field24 = 0;
_field28 = 0;
_field2C = 0;
@@ -61,39 +61,39 @@ void CStarControlSub6::set(int mode, double amount) {
switch (mode) {
case 0:
- _matrix._row1._x = 1.0;
- _matrix._row1._y = 0.0;
- _matrix._row1._z = 0.0;
- _matrix._row2._x = 0.0;
- _matrix._row2._y = cosVal;
- _matrix._row2._z = sinVal;
- _matrix._row3._x = 0.0;
- _matrix._row3._y = -sinVal;
- _matrix._row3._z = cosVal;
+ _row1._x = 1.0;
+ _row1._y = 0.0;
+ _row1._z = 0.0;
+ _row2._x = 0.0;
+ _row2._y = cosVal;
+ _row2._z = sinVal;
+ _row3._x = 0.0;
+ _row3._y = -sinVal;
+ _row3._z = cosVal;
break;
case 1:
- _matrix._row1._x = cosVal;
- _matrix._row1._y = 0.0;
- _matrix._row1._z = sinVal;
- _matrix._row2._x = 0.0;
- _matrix._row2._y = 1.0;
- _matrix._row2._z = 0.0;
- _matrix._row3._x = -sinVal;
- _matrix._row3._y = 0.0;
- _matrix._row3._z = sinVal;
+ _row1._x = cosVal;
+ _row1._y = 0.0;
+ _row1._z = sinVal;
+ _row2._x = 0.0;
+ _row2._y = 1.0;
+ _row2._z = 0.0;
+ _row3._x = -sinVal;
+ _row3._y = 0.0;
+ _row3._z = sinVal;
break;
case 2:
- _matrix._row1._x = cosVal;
- _matrix._row1._y = sinVal;
- _matrix._row1._z = 0.0;
- _matrix._row2._x = -sinVal;
- _matrix._row2._y = cosVal;
- _matrix._row2._z = 0.0;
- _matrix._row3._x = 0.0;
- _matrix._row3._y = 0.0;
- _matrix._row3._z = 1.0;
+ _row1._x = cosVal;
+ _row1._y = sinVal;
+ _row1._z = 0.0;
+ _row2._x = -sinVal;
+ _row2._y = cosVal;
+ _row2._z = 0.0;
+ _row3._x = 0.0;
+ _row3._y = 0.0;
+ _row3._z = 1.0;
break;
default:
@@ -106,7 +106,9 @@ void CStarControlSub6::set(int mode, double amount) {
}
void CStarControlSub6::copyFrom(const CStarControlSub6 *src) {
- _matrix = src->_matrix;
+ _row1 = src->_row1;
+ _row2 = src->_row2;
+ _row3 = src->_row3;
_field24 = src->_field24;
_field28 = src->_field28;
_field2C = src->_field2C;
diff --git a/engines/titanic/star_control/star_control_sub6.h b/engines/titanic/star_control/star_control_sub6.h
index 761cc1625f..645eb45c00 100644
--- a/engines/titanic/star_control/star_control_sub6.h
+++ b/engines/titanic/star_control/star_control_sub6.h
@@ -27,14 +27,13 @@
namespace Titanic {
-class CStarControlSub6 {
+class CStarControlSub6 : public FMatrix {
private:
static CStarControlSub6 *_static;
public:
static void init();
static void deinit();
public:
- FMatrix _matrix;
int _field24;
int _field28;
int _field2C;
diff --git a/engines/titanic/star_control/star_control_sub8.cpp b/engines/titanic/star_control/star_control_sub8.cpp
index 78fdfa7f84..f2b52a984f 100644
--- a/engines/titanic/star_control/star_control_sub8.cpp
+++ b/engines/titanic/star_control/star_control_sub8.cpp
@@ -21,13 +21,48 @@
*/
#include "titanic/star_control/star_control_sub8.h"
+#include "titanic/star_control/star_control_sub7.h"
+#include "titanic/star_control/star_control_sub12.h"
+#include "titanic/star_control/star_field.h"
namespace Titanic {
CStarControlSub8::CStarControlSub8() : _field8(-1) {
#if 0
- _field0(0), _field4(0), _field8(-1), _fieldC(-1)
+ _field4(0), _field8(-1), _fieldC(-1)
#endif
}
+bool MouseButtonDown(const Common::Point &pt) {
+ // TODO
+ return true;
+}
+
+int CStarControlSub8::findStar(const Common::Point &pt) {
+ // TODO
+ return -1;
+}
+
+void CStarControlSub8::selectStar(int index, CVideoSurface *surface,
+ CStarField *starField, CStarControlSub7 *sub7) {
+ // TODO
+}
+
+void CStarControlSub8::fn1(CStarField *starField, CSurfaceArea *surfaceArea, CStarControlSub12 *sub12) {
+ // TODO
+}
+
+void CStarControlSub8::fn2(CVideoSurface *surface, CStarField *starField, CStarControlSub7 *sub7) {
+ // TODO
+}
+
+void CStarControlSub8::fn3() {
+ if (_field8 < 3)
+ ++_field8;
+}
+
+void CStarControlSub8::draw(CSurfaceArea *surfaceArea) {
+ // TODO
+}
+
} // End of namespace Titanic
diff --git a/engines/titanic/star_control/star_control_sub8.h b/engines/titanic/star_control/star_control_sub8.h
index 71aa8fb472..37944a78ed 100644
--- a/engines/titanic/star_control/star_control_sub8.h
+++ b/engines/titanic/star_control/star_control_sub8.h
@@ -23,10 +23,16 @@
#ifndef TITANIC_STAR_CONTROL_SUB8_H
#define TITANIC_STAR_CONTROL_SUB8_H
+#include "titanic/star_control/surface_area.h"
#include "titanic/support/simple_file.h"
+#include "titanic/support/video_surface.h"
namespace Titanic {
+class CStarField;
+class CStarControlSub7;
+class CStarControlSub12;
+
class CStarControlSub8 {
struct StructEntry {
int _field0;
@@ -55,6 +61,17 @@ public:
* Save the data for the class to file
*/
void save(SimpleFile *file, int indent) {}
+
+ int findStar(const Common::Point &pt);
+
+ void selectStar(int starNum, CVideoSurface *surface, CStarField *starField,
+ CStarControlSub7 *sub7);
+
+ void draw(CSurfaceArea *surfaceArea);
+
+ void fn1(CStarField *starField, CSurfaceArea *surfaceArea, CStarControlSub12 *sub12);
+ void fn2(CVideoSurface *surface, CStarField *starField, CStarControlSub7 *sub7);
+ void fn3();
};
} // End of namespace Titanic
diff --git a/engines/titanic/star_control/star_field.cpp b/engines/titanic/star_control/star_field.cpp
index 31e75f3c13..43748ea0f8 100644
--- a/engines/titanic/star_control/star_field.cpp
+++ b/engines/titanic/star_control/star_field.cpp
@@ -25,16 +25,16 @@
namespace Titanic {
-CStarField::CStarField() : _val1(0), _val2(0), _val3(0), _val4(true),
- _val5(0), _isSolved(false) {
+CStarField::CStarField() : _points1On(false), _points2On(false), _mode(MODE_STARFIELD),
+ _val4(true), _val5(0), _isSolved(false) {
}
void CStarField::load(SimpleFile *file) {
_sub7.load(file);
_sub8.load(file);
- _val1 = file->readNumber();
- _val2 = file->readNumber();
- _val3 = file->readNumber();
+ _points1On = file->readNumber();
+ _points2On = file->readNumber();
+ _mode = (StarMode)file->readNumber();
_val4 = file->readNumber();
_isSolved = file->readNumber();
}
@@ -42,9 +42,9 @@ void CStarField::load(SimpleFile *file) {
void CStarField::save(SimpleFile *file, int indent) {
_sub7.save(file, indent);
_sub8.save(file, indent);
- file->writeNumberLine(_val1, indent);
- file->writeNumberLine(_val2, indent);
- file->writeNumberLine(_val3, indent);
+ file->writeNumberLine(_points1On, indent);
+ file->writeNumberLine(_points2On, indent);
+ file->writeNumberLine(_mode, indent);
file->writeNumberLine(_val4, indent);
file->writeNumberLine(_isSolved, indent);
}
@@ -64,25 +64,34 @@ bool CStarField::initDocument() {
void CStarField::render(CVideoSurface *surface, CStarControlSub12 *sub12) {
CSurfaceArea surfaceArea(surface);
draw(&surfaceArea, sub12, &_sub5);
+ if (_val4)
+ fn3(&surfaceArea);
+ _sub7.draw(&surfaceArea, sub12, nullptr);
+ _sub8.draw(&surfaceArea);
- // TODO
+ if (_points2On)
+ _points2.draw(&surfaceArea, sub12);
+ if (_points1On)
+ _points1.draw(&surfaceArea, sub12);
+
+ fn4(&surfaceArea, sub12);
}
int CStarField::get1() const {
- return _val1;
+ return _points1On;
}
void CStarField::set1(int val) {
- _val1 = val;
+ _points1On = val;
}
int CStarField::get2() const {
- return _val2;
+ return _points2On;
}
void CStarField::set2(int val) {
- _val2 = val;
+ _points2On = val;
}
int CStarField::get54() const {
@@ -93,12 +102,12 @@ void CStarField::set54(int val) {
_sub5.set4(val);
}
-int CStarField::get3() const {
- return _val3;
+StarMode CStarField::getMode() const {
+ return _mode;
}
-void CStarField::set3(int val) {
- _val3 = val;
+void CStarField::setMode(StarMode mode) {
+ _mode = mode;
}
void CStarField::toggle4() {
@@ -131,4 +140,61 @@ void CStarField::fn1(CErrorCode *errorCode) {
_sub5.proc3(errorCode);
}
+void CStarField::fn3(CSurfaceArea *surfaceArea) {
+ surfaceArea->_pixel = 0x323232;
+ surfaceArea->setColorFromPixel();
+
+ surfaceArea->fn1(FRect(202.60417, 63.75, 397.39584, 63.75));
+ surfaceArea->fn1(FRect(202.60417, 276.25, 397.39584, 276.25));
+ surfaceArea->fn1(FRect(193.75, 72.604164, 193.75, 267.39584));
+ surfaceArea->fn1(FRect(406.25, 72.604164, 406.25, 267.39584));
+ surfaceArea->fn1(FRect(202.60417, 63.75, 202.60417, 68.177086));
+ surfaceArea->fn1(FRect(397.39584, 63.75, 397.39584, 68.177086));
+ surfaceArea->fn1(FRect(202.60417, 276.25, 202.60417, 271.82291));
+ surfaceArea->fn1(FRect(397.39584, 276.25, 397.39584, 271.82291));
+ surfaceArea->fn1(FRect(193.75, 72.604164, 198.17708, 72.604164));
+ surfaceArea->fn1(FRect(193.75, 267.39584, 198.17708, 267.39584));
+ surfaceArea->fn1(FRect(406.25, 72.604164, 401.82291, 72.604164));
+ surfaceArea->fn1(FRect(406.25, 267.39584, 401.82291, 267.39584));
+ surfaceArea->fn1(FRect(300.0, 63.75, 300.0, 54.895832));
+ surfaceArea->fn1(FRect(300.0, 276.25, 300.0, 285.10416));
+ surfaceArea->fn1(FRect(193.75, 170.0, 184.89583, 170.0));
+ surfaceArea->fn1(FRect(406.25, 170.0, 415.10416, 170.0));
+}
+
+void CStarField::fn4(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12) {
+ // TODO
+}
+
+void CStarField::fn6(CVideoSurface *surface, CStarControlSub12 *sub12) {
+ CSurfaceArea surfaceArea(surface);
+
+}
+
+void CStarField::fn7() {
+ _sub8.fn3();
+ setSolved();
+}
+
+void CStarField::fn8(CVideoSurface *surface) {
+ _sub8.fn2(surface, this, &_sub7);
+ setSolved();
+}
+
+bool CStarField::mouseButtonDown(CVideoSurface *surface, CStarControlSub12 *sub12,
+ int flags, const Common::Point &pt) {
+ if (_mode == MODE_STARFIELD) {
+ CSurfaceArea surfaceArea(surface);
+ return selectStar(&surfaceArea, sub12, 0, pt);
+ } else {
+ int starNum = _sub8.findStar(pt);
+ if (starNum >= 0) {
+ _sub8.selectStar(starNum, surface, this, &_sub7);
+ return true;
+ }
+
+ return false;
+ }
+}
+
} // End of namespace Titanic
diff --git a/engines/titanic/star_control/star_field.h b/engines/titanic/star_control/star_field.h
index 9e8b732f45..6787e06613 100644
--- a/engines/titanic/star_control/star_field.h
+++ b/engines/titanic/star_control/star_field.h
@@ -39,12 +39,15 @@ private:
CStarPoints1 _points1;
CStarPoints2 _points2;
CStarControlSub5 _sub5;
- int _val1;
- int _val2;
- int _val3;
+ bool _points1On;
+ bool _points2On;
+ StarMode _mode;
bool _val4;
int _val5;
bool _isSolved;
+private:
+ void fn3(CSurfaceArea *surfaceArea);
+ void fn4(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12);
public:
CStarField();
@@ -71,8 +74,17 @@ public:
void set2(int val);
int get54() const;
void set54(int val);
- int get3() const;
- void set3(int val);
+
+ /**
+ * Gets the current display mode
+ */
+ StarMode getMode() const;
+
+ /**
+ * Sets the display mode
+ */
+ void setMode(StarMode mode);
+
void toggle4();
bool set4(bool val);
int get88() const;
@@ -93,6 +105,15 @@ public:
}
void fn1(CErrorCode *errorCode);
+ void fn6(CVideoSurface *surface, CStarControlSub12 *sub12);
+ void fn7();
+ void fn8(CVideoSurface *surface);
+
+ /**
+ * Called when the starfield is clicked
+ */
+ bool mouseButtonDown(CVideoSurface *surface, CStarControlSub12 *sub12,
+ int flags, const Common::Point &pt);
};
} // End of namespace Titanic
diff --git a/engines/titanic/star_control/star_points2.cpp b/engines/titanic/star_control/star_points2.cpp
index 287a46eaa7..9c4cfe8cf5 100644
--- a/engines/titanic/star_control/star_points2.cpp
+++ b/engines/titanic/star_control/star_points2.cpp
@@ -21,6 +21,7 @@
*/
#include "titanic/star_control/star_points2.h"
+#include "titanic/star_control/star_control_sub12.h"
#include "titanic/titanic.h"
namespace Titanic {
@@ -57,4 +58,8 @@ bool CStarPoints2::initialize() {
return true;
}
+void CStarPoints2::draw(CSurfaceArea *surface, CStarControlSub12 *sub12) {
+ // TODO
+}
+
} // End of namespace Titanic
diff --git a/engines/titanic/star_control/star_points2.h b/engines/titanic/star_control/star_points2.h
index df302f690b..d7192af2f0 100644
--- a/engines/titanic/star_control/star_points2.h
+++ b/engines/titanic/star_control/star_points2.h
@@ -25,9 +25,12 @@
#include "common/array.h"
#include "titanic/star_control/fvector.h"
+#include "titanic/star_control/surface_area.h"
namespace Titanic {
+class CStarControlSub12;
+
class CStarPoints2 {
class RootEntry : public Common::Array<FVector> {
public:
@@ -41,6 +44,11 @@ public:
* Initializes the data
*/
bool initialize();
+
+ /**
+ * Draw the starfield points
+ */
+ void draw(CSurfaceArea *surface, CStarControlSub12 *sub12);
};
} // End of namespace Titanic
diff --git a/engines/titanic/star_control/star_view.cpp b/engines/titanic/star_control/star_view.cpp
index d10e0ee094..e717206e55 100644
--- a/engines/titanic/star_control/star_view.cpp
+++ b/engines/titanic/star_control/star_view.cpp
@@ -25,15 +25,16 @@
#include "titanic/star_control/star_control.h"
#include "titanic/star_control/star_field.h"
#include "titanic/core/game_object.h"
+#include "titanic/messages/pet_messages.h"
+#include "titanic/titanic.h"
namespace Titanic {
CStarView::CStarView() : _sub12(nullptr, nullptr), _sub13((void *)nullptr),
_owner(nullptr), _starField(nullptr), _videoSurface(nullptr), _field118(0),
_videoSurface2(nullptr), _homePhotoMask(nullptr),
- _field218(0), _field21C(0) {
- CStar20Data data = { 0, 0, 0x47C35000, 0, 0x41A00000,
- 0x3F800000, 0x3F800000, 0x3F800000 };
+ _field218(false), _showingPhoto(false) {
+ CStar20Data data = { 0, 0, 100000.0, 0, 20.0, 1.0, 1.0, 1.0 };
_sub12.proc3(&data);
}
@@ -47,7 +48,7 @@ void CStarView::load(SimpleFile *file, int param) {
_sub13.load(file, 0);
_field218 = file->readNumber();
- _field21C = file->readNumber();
+ _showingPhoto = file->readNumber();
}
}
@@ -59,7 +60,7 @@ void CStarView::save(SimpleFile *file, int indent) {
_sub13.save(file, indent);
file->writeNumberLine(_field218, indent);
- file->writeNumberLine(_field21C, indent);
+ file->writeNumberLine(_showingPhoto, indent);
}
void CStarView::setup(CScreenManager *screenManager, CStarField *starField, CStarControl *starControl) {
@@ -68,7 +69,10 @@ void CStarView::setup(CScreenManager *screenManager, CStarField *starField, CSta
}
void CStarView::reset() {
- // TODO
+ if (!_field118) {
+ CStarControlSub12 sub12(&_sub13);
+ fn18(&sub12);
+ }
}
void CStarView::draw(CScreenManager *screenManager) {
@@ -76,13 +80,13 @@ void CStarView::draw(CScreenManager *screenManager) {
return;
if (_fader.isActive()) {
- CVideoSurface *surface = _field21C ? _videoSurface2 : _videoSurface;
+ CVideoSurface *surface = _showingPhoto ? _videoSurface2 : _videoSurface;
surface = _fader.fade(screenManager, surface);
screenManager->blitFrom(SURFACE_PRIMARY, surface);
} else {
Point destPos(20, 10);
- if (_field21C) {
+ if (_showingPhoto) {
screenManager->blitFrom(SURFACE_PRIMARY, _videoSurface2, &destPos);
if (!_homePhotoMask && _owner) {
@@ -106,58 +110,189 @@ void CStarView::draw(CScreenManager *screenManager) {
}
}
-void CStarView::MouseButtonDownMsg(int unused, const Point &pt) {
- // TODO
-}
+bool CStarView::MouseButtonDownMsg(int flags, const Point &pt) {
+ if (_starField) {
+ return _starField->mouseButtonDown(
+ _showingPhoto ? _videoSurface2 : _videoSurface,
+ &_sub12, flags, pt);
+ }
-void CStarView::MouseMoveMsg(int unused, const Point &pt) {
- // TODO
+ return false;
}
-CErrorCode CStarView::KeyCharMsg(int key) {
- // TODO
- return CErrorCode();
+bool CStarView::MouseMoveMsg(int unused, const Point &pt) {
+ if (!_showingPhoto && (_fader._index < 0 || _fader._count >= 0)) {
+ FPoint fpt = pt;
+ FPoint centerPt(300.0, 170.0);
+
+ if (fpt != centerPt) {
+ double threshold = MIN(centerPt._x, centerPt._y) * 0.5;
+ FPoint tempPt = fpt - centerPt;
+
+ double distance = tempPt.normalize();
+ if (distance >= threshold) {
+ distance -= threshold;
+
+ FPoint relPt(tempPt._x * -2.0 * distance / threshold,
+ tempPt._y * -2.0 * distance / threshold);
+ _sub12.setViewportPosition(relPt);
+ return true;
+ }
+ }
+ }
+
+ return false;
}
-bool CStarView::canSetStarDestination() const {
- // TODO
+bool CStarView::KeyCharMsg(int key, CErrorCode *errorCode) {
+ CStarControlSub6 sub6;
+ int v = _starField ? _starField->get88() : -1;
+
+ switch (key) {
+ case Common::KEYCODE_TAB:
+ if (_starField) {
+ toggleMode();
+ return true;
+ }
+ break;
+
+ case Common::KEYCODE_l: {
+ CPetControl *pet = _owner->getPetControl();
+ if (pet && pet->_remoteTarget) {
+ CPETStarFieldLockMsg lockMsg(1);
+ lockMsg.execute(pet->_remoteTarget);
+ }
+ return true;
+ }
+
+ case Common::KEYCODE_d: {
+ CPetControl *pet = _owner->getPetControl();
+ if (pet && pet->_remoteTarget) {
+ CPETStarFieldLockMsg lockMsg(0);
+ lockMsg.execute(pet->_remoteTarget);
+ }
+ return true;
+ }
+
+ case Common::KEYCODE_z:
+ case Common::KEYCODE_c:
+ if (v == -1) {
+ sub6.set(key == Common::KEYCODE_z ? MODE_PHOTO : MODE_STARFIELD, 1.0);
+ _sub12.proc22(sub6);
+ _sub12.proc15(errorCode);
+ return true;
+ }
+ break;
+
+ case Common::KEYCODE_SEMICOLON:
+ if (v == -1) {
+ _sub12.proc16();
+ errorCode->set();
+ return true;
+ }
+ break;
+
+ case Common::KEYCODE_PERIOD:
+ if (v == -1) {
+ _sub12.proc17();
+ errorCode->set();
+ return true;
+ }
+ break;
+
+ case Common::KEYCODE_SPACE:
+ if (v == -1) {
+ _sub12.proc19();
+ errorCode->set();
+ return true;
+ }
+ break;
+
+ case Common::KEYCODE_x:
+ if (v == -1) {
+ sub6.set(MODE_PHOTO, -1.0);
+ _sub12.proc22(sub6);
+ _sub12.proc15(errorCode);
+ return true;
+ }
+ break;
+
+ case Common::KEYCODE_QUOTE:
+ if (v == -1) {
+ sub6.set(MODE_STARFIELD, -1.0);
+ _sub12.proc22(sub6);
+ _sub12.proc15(errorCode);
+ return true;
+ }
+ break;
+
+ default:
+ break;
+ }
+
return false;
}
-void CStarView::starDestinationSet() {
- // TODO
+bool CStarView::canSetStarDestination() const {
+ return _sub12.is108();
}
-void CStarView::petDestinationSet() {
- // TODO
+void CStarView::starDestinationSet() {
+ _sub12.reset108();
}
void CStarView::resetPosition() {
- // TODO
+ _sub12.setPosition(FVector(0.0, 0.0, 0.0));
}
-void CStarView::fn1() {
- // TODO
+bool CStarView::fn1() {
+ if (_videoSurface) {
+ CErrorCode errorCode;
+ _sub12.proc15(&errorCode);
+
+ if (_fader._index < 0 || _fader._index >= _fader._count)
+ _starField->fn1(&errorCode);
+ else
+ errorCode.set();
+
+ return errorCode.get();
+ }
+
+ return false;
}
void CStarView::fn2() {
- // TODO
+ if (!_videoSurface) {
+ CScreenManager *scrManager = CScreenManager::setCurrent();
+ if (scrManager)
+ resizeSurface(scrManager, 600, 340, &_videoSurface);
+
+ if (_videoSurface) {
+ fn13();
+ fn19(200);
+ draw(scrManager);
+ }
+ }
}
void CStarView::fn3(bool fadeIn) {
- // TODO
+ _fader.reset();
+ _fader.setFadeIn(fadeIn);
}
void CStarView::fn4() {
- // TODO
+ FVector v1, v2;
+ randomizeVectors2(&v1, &v2);
+ _sub12.setPosition(v1);
+ _sub12.proc5(v2);
}
void CStarView::fn5() {
- // TODO
+ _starField->set1(!_starField->get1());
}
void CStarView::fn6() {
- // TODO
+ _starField->set2(!_starField->get2());
}
void CStarView::fn7() {
@@ -165,15 +300,24 @@ void CStarView::fn7() {
}
void CStarView::fn8() {
- // TODO
+ _sub12.proc18();
}
void CStarView::fn9() {
- // TODO
+ _field218 = !_field218;
+ if (_field218) {
+ _sub12.proc12(MODE_PHOTO, 30.0);
+ _sub12.proc12(MODE_STARFIELD, 28000.0);
+ } else {
+ _sub12.proc12(MODE_PHOTO, 0.0);
+ _sub12.proc12(MODE_STARFIELD, 0.0);
+ }
}
-void CStarView::fn10() {
- // TODO
+void CStarView::toggleMode() {
+ _showingPhoto = !_showingPhoto;
+ if (_starField)
+ _starField->setMode(_showingPhoto ? MODE_PHOTO : MODE_STARFIELD);
}
void CStarView::fn11() {
@@ -185,15 +329,29 @@ void CStarView::fn12() {
}
void CStarView::fn13() {
- // TODO
+ _field218 = true;
+ _sub12.proc12(MODE_PHOTO, 30.0);
+ _sub12.proc12(MODE_STARFIELD, 28000.0);
}
void CStarView::fn14() {
- // TODO
+ _field218 = false;
+ _sub12.proc12(MODE_PHOTO, 0.0);
+ _sub12.proc12(MODE_STARFIELD, 0.0);
}
-void CStarView::fn15() {
- // TODO
+void CStarView::setHasReference() {
+ FVector v1, v2;
+ randomizeVectors1(&v1, &v2);
+
+ _sub13.setPosition(v1);
+ _sub13.fn11(v2);
+ _field218 = false;
+ _sub13.fn13(MODE_PHOTO, 0.0);
+ _sub13.fn13(MODE_STARFIELD, 0.0);
+ _field118 = true;
+ reset();
+ _field218 = true;
}
void CStarView::fn16() {
@@ -201,8 +359,109 @@ void CStarView::fn16() {
}
void CStarView::fn17() {
+ if (_starField && !_showingPhoto) {
+ _sub12.proc35();
+ _starField->fn8(_videoSurface2);
+ }
+}
+
+void CStarView::fn18(CStarControlSub12 *sub12) {
+ if (_starField) {
+ if (!_videoSurface2) {
+ CScreenManager *scrManager = CScreenManager::setCurrent();
+ if (scrManager)
+ resizeSurface(scrManager, 600, 340, &_videoSurface2);
+ }
+
+ if (_videoSurface2) {
+ int oldVal = _starField->get54();
+ _starField->set4(false);
+
+ _videoSurface2->clear();
+ _videoSurface2->lock();
+ _starField->render(_videoSurface2, sub12);
+ _videoSurface2->unlock();
+
+ _starField->set54(oldVal);
+ _starField->fn6(_videoSurface2, sub12);
+ }
+ }
+}
+
+void CStarView::fn19(int v) {
// TODO
}
+void CStarView::randomizeVectors1(FVector *v1, FVector *v2) {
+ v1->_x = g_vm->getRandomFloat() * -4096.0 - 3072.0;
+ v1->_y = g_vm->getRandomFloat() * -4096.0 - 3072.0;
+ v1->_z = g_vm->getRandomFloat() * -4096.0 - 3072.0;
+
+ double vx = g_vm->getRandomFloat() * 8192.0;
+ double vy = g_vm->getRandomFloat() * 1024.0;
+ vx -= v1->_x;
+ vy -= v1->_y;
+
+ v2->_x = vx;
+ v2->_y = vy;
+ v2->_z = -v1->_z;
+ v2->fn3();
+}
+
+void CStarView::randomizeVectors2(FVector *v1, FVector *v2) {
+ v1->_x = 3072.0 - g_vm->getRandomFloat() * -4096.0;
+ v1->_y = 3072.0 - g_vm->getRandomFloat() * -4096.0;
+ v1->_z = 3072.0 - g_vm->getRandomFloat() * -4096.0;
+
+ // TODO: Doublecheck
+ v2->_x = -v1->_x;
+ v2->_y = -v1->_y;
+ v2->_z = -v1->_z;
+ v2->fn3();
+}
+
+void CStarView::randomizeVectors3(FVector *v1, FVector *v2) {
+ v1->_x = 3072.0 - g_vm->getRandomFloat() * -4096.0;
+ v1->_y = 3072.0 - g_vm->getRandomFloat() * -4096.0;
+ v1->_z = 3072.0 - g_vm->getRandomFloat() * -4096.0;
+
+ // TODO: Doublecheck
+ v2->_x = -v1->_x;
+ v2->_y = -v1->_y;
+ v2->_z = -v1->_z;
+ v2->fn3();
+}
+
+void CStarView::randomizeVectors4(FVector *v1, FVector *v2) {
+ v1->_x = 3072.0 - g_vm->getRandomFloat() * -4096.0;
+ v1->_y = 3072.0 - g_vm->getRandomFloat() * -4096.0;
+ v1->_z = 3072.0 - g_vm->getRandomFloat() * -4096.0;
+
+ // TODO: Doublecheck
+ v2->_x = -v1->_x;
+ v2->_y = -v1->_y;
+ v2->_z = -v1->_z;
+ v2->fn3();
+}
+void CStarView::resizeSurface(CScreenManager *scrManager, int width, int height,
+ CVideoSurface **surface) {
+ if (!surface)
+ // Surface pointer must be provided
+ return;
+ if (*surface) {
+ // If there's an existing surface of the correct size, re-use it
+ if ((*surface)->getWidth() == width && (*surface)->getHeight() == height)
+ return;
+
+ // Delete the old surface
+ delete *surface;
+ *surface = nullptr;
+ }
+
+ CVideoSurface *newSurface = scrManager->createSurface(width, height);
+ if (newSurface)
+ *surface = newSurface;
+}
+
} // End of namespace Titanic
diff --git a/engines/titanic/star_control/star_view.h b/engines/titanic/star_control/star_view.h
index 5e958c8053..e2978e6da0 100644
--- a/engines/titanic/star_control/star_view.h
+++ b/engines/titanic/star_control/star_view.h
@@ -29,6 +29,7 @@
#include "titanic/star_control/star_control_sub13.h"
#include "titanic/star_control/surface_fader.h"
#include "titanic/star_control/error_code.h"
+#include "titanic/star_control/fvector.h"
namespace Titanic {
@@ -46,13 +47,26 @@ private:
CSurfaceFader _fader;
CVideoSurface *_videoSurface2;
CGameObject *_homePhotoMask;
- int _field218;
- int _field21C;
+ bool _field218;
+ bool _showingPhoto;
#if 0
int _field210;
#endif
private:
- void fn1();
+ bool fn1();
+ void fn18(CStarControlSub12 *sub12);
+ void fn19(int v);
+
+ void randomizeVectors1(FVector *v1, FVector *v2);
+ void randomizeVectors2(FVector *v1, FVector *v2);
+ void randomizeVectors3(FVector *v1, FVector *v2);
+ void randomizeVectors4(FVector *v1, FVector *v2);
+
+ /**
+ * Handles resizing the surface
+ */
+ void resizeSurface(CScreenManager *scrManager, int width, int height,
+ CVideoSurface **surface);
public:
CStarView();
@@ -81,17 +95,17 @@ public:
/**
* Handles mouse down messages
*/
- void MouseButtonDownMsg(int unused, const Point &pt);
+ bool MouseButtonDownMsg(int unused, const Point &pt);
/**
* Handles mouse move messages
*/
- void MouseMoveMsg(int unused, const Point &pt);
+ bool MouseMoveMsg(int unused, const Point &pt);
/**
* Handles keyboard messages
*/
- CErrorCode KeyCharMsg(int key);
+ bool KeyCharMsg(int key, CErrorCode *errorCode);
/**
* Returns true if a star destination can be set
@@ -107,7 +121,6 @@ public:
* Resets back to the origin position
*/
void resetPosition();
- void petDestinationSet();
void fn2();
void fn3(bool fadeIn);
@@ -117,12 +130,22 @@ public:
void fn7();
void fn8();
void fn9();
- void fn10();
+
+ /**
+ * Toggles between starfield and photo modes
+ */
+ void toggleMode();
+
void fn11();
void fn12();
void fn13();
void fn14();
- void fn15();
+
+ /**
+ * Called when the photograph is used on the navigation computer
+ */
+ void setHasReference();
+
void fn16();
void fn17();
diff --git a/engines/titanic/titanic.h b/engines/titanic/titanic.h
index 43f3fa07f3..fdc9402d89 100644
--- a/engines/titanic/titanic.h
+++ b/engines/titanic/titanic.h
@@ -164,6 +164,11 @@ public:
uint getRandomNumber(uint max) { return _randomSource.getRandomNumber(max); }
/**
+ * Returns a random floating point number between 0.0 to 65535.0
+ */
+ double getRandomFloat() { return getRandomNumber(0xffffffff) * 0.000015259022; }
+
+ /**
* Support method that generates a savegame name
* @param slot Slot number
*/
diff --git a/gui/options.cpp b/gui/options.cpp
index 08b5538a1f..5b62d493c4 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -113,7 +113,7 @@ enum {
kRootPathClearCmd = 'clrp'
};
#endif
-
+
enum {
kApplyCmd = 'appl'
};
@@ -124,7 +124,7 @@ static const char *outputRateLabels[] = { _s("<default>"), _s("8 kHz"), _s("11 k
static const int outputRateValues[] = { 0, 8000, 11025, 22050, 44100, 48000, -1 };
// The keyboard mouse speed values range from 0 to 7 and correspond to speeds shown in the label
// "10" (value 3) is the default speed corresponding to the speed before introduction of this control
-static const char *kbdMouseSpeedLabels[] = { _s("3"), _s("5"), _s("8"), _s("10"), _s("13"), _s("15"), _s("18"), _s("20"), 0 };
+static const char *kbdMouseSpeedLabels[] = { "3", "5", "8", "10", "13", "15", "18", "20", 0 };
OptionsDialog::OptionsDialog(const Common::String &domain, int x, int y, int w, int h)
: Dialog(x, y, w, h), _domain(domain), _graphicsTabId(-1), _midiTabId(-1), _pathsTabId(-1), _tabWidget(0) {
@@ -212,7 +212,7 @@ void OptionsDialog::init() {
_guioptions = parseGameGUIOptions(_guioptionsString);
}
}
-
+
void OptionsDialog::build() {
// Retrieve game GUI options
_guioptions.clear();
@@ -220,7 +220,7 @@ 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)) {
@@ -417,7 +417,7 @@ void OptionsDialog::build() {
_subSpeedLabel->setValue(speed);
}
}
-
+
void OptionsDialog::clean() {
delete _subToggleGroup;
while (_firstWidget) {
@@ -427,7 +427,7 @@ void OptionsDialog::clean() {
}
init();
}
-
+
void OptionsDialog::rebuild() {
int currentTab = _tabWidget->getActiveTab();
clean();
@@ -458,16 +458,16 @@ void OptionsDialog::apply() {
graphicsModeChanged = true;
if (ConfMan.getBool("aspect_ratio", _domain) != _aspectCheckbox->getState())
graphicsModeChanged = true;
-
+
ConfMan.setBool("filtering", _filteringCheckbox->getState(), _domain);
ConfMan.setBool("fullscreen", _fullscreenCheckbox->getState(), _domain);
ConfMan.setBool("aspect_ratio", _aspectCheckbox->getState(), _domain);
-
+
bool isSet = false;
-
+
if ((int32)_gfxPopUp->getSelectedTag() >= 0) {
const OSystem::GraphicsMode *gm = g_system->getSupportedGraphicsModes();
-
+
while (gm->name) {
if (gm->id == (int)_gfxPopUp->getSelectedTag()) {
if (ConfMan.get("gfx_mode", _domain) != gm->name)
@@ -481,7 +481,7 @@ void OptionsDialog::apply() {
}
if (!isSet)
ConfMan.removeKey("gfx_mode", _domain);
-
+
if ((int32)_renderModePopUp->getSelectedTag() >= 0)
ConfMan.set("render_mode", Common::getRenderModeCode((Common::RenderMode)_renderModePopUp->getSelectedTag()), _domain);
} else {
@@ -492,21 +492,21 @@ void OptionsDialog::apply() {
ConfMan.removeKey("render_mode", _domain);
}
}
-
+
// Setup graphics again if needed
if (_domain == Common::ConfigManager::kApplicationDomain && graphicsModeChanged) {
g_system->beginGFXTransaction();
g_system->setGraphicsMode(ConfMan.get("gfx_mode", _domain).c_str());
-
+
if (ConfMan.hasKey("aspect_ratio"))
g_system->setFeatureState(OSystem::kFeatureAspectRatioCorrection, ConfMan.getBool("aspect_ratio", _domain));
if (ConfMan.hasKey("fullscreen"))
g_system->setFeatureState(OSystem::kFeatureFullscreenMode, ConfMan.getBool("fullscreen", _domain));
if (ConfMan.hasKey("filtering"))
g_system->setFeatureState(OSystem::kFeatureFilteringMode, ConfMan.getBool("filtering", _domain));
-
+
OSystem::TransactionError gfxError = g_system->endGFXTransaction();
-
+
// Since this might change the screen resolution we need to give
// the GUI a chance to update it's internal state. Otherwise we might
// get a crash when the GUI tries to grab the overlay.
@@ -518,11 +518,11 @@ void OptionsDialog::apply() {
// Dialog::close) is called, to prevent crashes caused by invalid
// widgets being referenced or similar errors.
g_gui.checkScreenChange();
-
+
if (gfxError != OSystem::kTransactionSuccess) {
// Revert ConfMan to what OSystem is using.
Common::String message = _("Failed to apply some of the graphic options changes:");
-
+
if (gfxError & OSystem::kTransactionModeSwitchFailed) {
const OSystem::GraphicsMode *gm = g_system->getSupportedGraphicsModes();
while (gm->name) {
@@ -535,25 +535,25 @@ void OptionsDialog::apply() {
message += "\n";
message += _("the video mode could not be changed.");
}
-
+
if (gfxError & OSystem::kTransactionAspectRatioFailed) {
ConfMan.setBool("aspect_ratio", g_system->getFeatureState(OSystem::kFeatureAspectRatioCorrection), _domain);
message += "\n";
message += _("the aspect ratio setting could not be changed");
}
-
+
if (gfxError & OSystem::kTransactionFullscreenFailed) {
ConfMan.setBool("fullscreen", g_system->getFeatureState(OSystem::kFeatureFullscreenMode), _domain);
message += "\n";
message += _("the fullscreen setting could not be changed");
}
-
+
if (gfxError & OSystem::kTransactionFilteringFailed) {
ConfMan.setBool("filtering", g_system->getFeatureState(OSystem::kFeatureFilteringMode), _domain);
message += "\n";
message += _("the filtering setting could not be changed");
}
-
+
// And display the error
GUI::MessageDialog dialog(message);
dialog.runModal();
@@ -615,7 +615,7 @@ void OptionsDialog::apply() {
ConfMan.removeKey("mute", _domain);
}
}
-
+
// Audio options
if (_midiPopUp) {
if (_enableAudioSettings) {
@@ -624,11 +624,11 @@ void OptionsDialog::apply() {
ConfMan.removeKey("music_driver", _domain);
}
}
-
+
if (_oplPopUp) {
if (_enableAudioSettings) {
const OPL::Config::EmulatorDescription *ed = OPL::Config::findDriver(_oplPopUp->getSelectedTag());
-
+
if (ed)
ConfMan.set("opl_driver", ed->name, _domain);
else
@@ -637,7 +637,7 @@ void OptionsDialog::apply() {
ConfMan.removeKey("opl_driver", _domain);
}
}
-
+
if (_outputRatePopUp) {
if (_enableAudioSettings) {
if (_outputRatePopUp->getSelectedTag() != 0)
@@ -648,15 +648,15 @@ void OptionsDialog::apply() {
ConfMan.removeKey("output_rate", _domain);
}
}
-
+
// MIDI options
if (_multiMidiCheckbox) {
if (_enableMIDISettings) {
saveMusicDeviceSetting(_gmDevicePopUp, "gm_device");
-
+
ConfMan.setBool("multi_midi", _multiMidiCheckbox->getState(), _domain);
ConfMan.setInt("midi_gain", _midiGainSlider->getValue(), _domain);
-
+
Common::String soundFont(_soundFont->getLabel());
if (!soundFont.empty() && (soundFont != _c("None", "soundfont")))
ConfMan.set("soundfont", soundFont, _domain);
@@ -669,7 +669,7 @@ void OptionsDialog::apply() {
ConfMan.removeKey("soundfont", _domain);
}
}
-
+
// MT-32 options
if (_mt32DevicePopUp) {
if (_enableMT32Settings) {
@@ -682,14 +682,14 @@ void OptionsDialog::apply() {
ConfMan.removeKey("enable_gs", _domain);
}
}
-
+
// Subtitle options
if (_subToggleGroup) {
if (_enableSubtitleSettings) {
bool subtitles, speech_mute;
int talkspeed;
int sliderMaxValue = _subSpeedSlider->getMaxValue();
-
+
switch (_subToggleGroup->getValue()) {
case kSubtitlesSpeech:
subtitles = speech_mute = false;
@@ -703,22 +703,22 @@ void OptionsDialog::apply() {
subtitles = speech_mute = true;
break;
}
-
+
ConfMan.setBool("subtitles", subtitles, _domain);
ConfMan.setBool("speech_mute", speech_mute, _domain);
-
+
// Engines that reuse the subtitle speed widget set their own max value.
// Scale the config value accordingly (see addSubtitleControls)
talkspeed = (_subSpeedSlider->getValue() * 255 + sliderMaxValue / 2) / sliderMaxValue;
ConfMan.setInt("talkspeed", talkspeed, _domain);
-
+
} else {
ConfMan.removeKey("subtitles", _domain);
ConfMan.removeKey("talkspeed", _domain);
ConfMan.removeKey("speech_mute", _domain);
}
}
-
+
// Save config file
ConfMan.flushToDisk();
}
@@ -801,7 +801,7 @@ void OptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data
draw();
break;
case kKbdMouseSpeedChanged:
- _kbdMouseSpeedLabel->setLabel(_(kbdMouseSpeedLabels[_kbdMouseSpeedSlider->getValue()]));
+ _kbdMouseSpeedLabel->setLabel(_(kbdMouseSpeedLabels[_kbdMouseSpeedSlider->getValue()]));
_kbdMouseSpeedLabel->draw();
break;
case kJoystickDeadzoneChanged:
@@ -822,7 +822,7 @@ void OptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data
Dialog::handleCommand(sender, cmd, data);
}
}
-
+
void OptionsDialog::setGraphicSettingsState(bool enabled) {
_enableGraphicSettings = enabled;
@@ -948,12 +948,12 @@ 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"));
@@ -1450,11 +1450,11 @@ GlobalOptionsDialog::~GlobalOptionsDialog() {
delete _fluidSynthSettingsDialog;
#endif
}
-
+
void GlobalOptionsDialog::build() {
// The tab widget
TabWidget *tab = new TabWidget(this, "GlobalOptions.TabWidget");
-
+
//
// 1) The graphics tab
//
@@ -1792,7 +1792,7 @@ void GlobalOptionsDialog::clean() {
OptionsDialog::clean();
}
-
+
void GlobalOptionsDialog::apply() {
Common::String savePath(_savePath->getLabel());
if (!savePath.empty() && (savePath != _("Default")))
@@ -1899,7 +1899,7 @@ void GlobalOptionsDialog::apply() {
#endif // NETWORKING_LOCALWEBSERVER_ENABLE_PORT_OVERRIDE
#endif // USE_SDL_NET
#endif // USE_CLOUD
-
+
if (!_newTheme.empty()) {
#ifdef USE_TRANSLATION
Common::String lang = TransMan.getCurrentLanguage();
diff --git a/po/be_BY.po b/po/be_BY.po
index 427931905a..581e0aa96e 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-03-01 08:17+0100\n"
+"POT-Creation-Date: 2017-03-04 11:50+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/"
@@ -119,7 +119,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -132,7 +132,7 @@ msgstr "Так"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -821,38 +821,6 @@ msgstr "44 кГц"
msgid "48 kHz"
msgstr "48 кГц"
-#: gui/options.cpp:127
-msgid "3"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "5"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "8"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "10"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "13"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "15"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "18"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "20"
-msgstr ""
-
#: gui/options.cpp:345 gui/options.cpp:638 gui/options.cpp:776
#: gui/options.cpp:853 gui/options.cpp:1105
msgctxt "soundfont"
@@ -2171,37 +2139,37 @@ msgstr "Вы сапраўды жадаеце выйсці?"
msgid "Quit"
msgstr "Выхад"
-#: backends/events/gph/gph-events.cpp:385
-#: backends/events/gph/gph-events.cpp:428
-#: backends/events/openpandora/op-events.cpp:168
+#: backends/events/gph/gph-events.cpp:391
+#: backends/events/gph/gph-events.cpp:434
+#: backends/events/openpandora/op-events.cpp:174
msgid "Touchscreen 'Tap Mode' - Left Click"
msgstr "Рэжым 'дотыкаў' тачскрына - Левы клік"
-#: backends/events/gph/gph-events.cpp:387
-#: backends/events/gph/gph-events.cpp:430
-#: backends/events/openpandora/op-events.cpp:170
+#: backends/events/gph/gph-events.cpp:393
+#: backends/events/gph/gph-events.cpp:436
+#: backends/events/openpandora/op-events.cpp:176
msgid "Touchscreen 'Tap Mode' - Right Click"
msgstr "Рэжым 'дотыкаў' тачскрына - Правы клік"
-#: backends/events/gph/gph-events.cpp:389
-#: backends/events/gph/gph-events.cpp:432
-#: backends/events/openpandora/op-events.cpp:172
+#: backends/events/gph/gph-events.cpp:395
+#: backends/events/gph/gph-events.cpp:438
+#: backends/events/openpandora/op-events.cpp:178
msgid "Touchscreen 'Tap Mode' - Hover (No Click)"
msgstr "Рэжым 'дотыкаў' тачскрына - Пралёт (без кліку)"
-#: backends/events/gph/gph-events.cpp:409
+#: backends/events/gph/gph-events.cpp:415
msgid "Maximum Volume"
msgstr "Максімальная гучнасць"
-#: backends/events/gph/gph-events.cpp:411
+#: backends/events/gph/gph-events.cpp:417
msgid "Increasing Volume"
msgstr "Павелічэнне гучнасці"
-#: backends/events/gph/gph-events.cpp:417
+#: backends/events/gph/gph-events.cpp:423
msgid "Minimal Volume"
msgstr "Мінімальная гучнасць"
-#: backends/events/gph/gph-events.cpp:419
+#: backends/events/gph/gph-events.cpp:425
msgid "Decreasing Volume"
msgstr "Памяншэнне гучнасці"
@@ -2213,41 +2181,41 @@ msgstr "Пстрычкі ўключаны"
msgid "Clicking Disabled"
msgstr "Пстрычкі выключаны"
-#: backends/events/openpandora/op-events.cpp:174
+#: backends/events/openpandora/op-events.cpp:180
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Рэжым 'дотыкаў' тачскрына - Пралёт (клікі па DPad)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
msgid "Do you want to quit ?"
msgstr "Вы сапраўды жадаеце выйсці?"
#. I18N: Trackpad mode toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:308
+#: backends/events/webossdl/webossdl-events.cpp:332
msgid "Trackpad mode is now"
msgstr "Рэжым трэкпада зараз"
#. I18N: Trackpad mode on or off.
#. I18N: Auto-drag on or off.
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "ON"
msgstr "УКЛ"
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "OFF"
msgstr "ВЫКЛ"
-#: backends/events/webossdl/webossdl-events.cpp:315
+#: backends/events/webossdl/webossdl-events.cpp:339
msgid "Swipe two fingers to the right to toggle."
msgstr "Правядзіце двума пальцамі направа для пераключэння."
#. I18N: Auto-drag toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:359
msgid "Auto-drag mode is now"
msgstr "Рэжым аўтадрэгу зараз"
-#: backends/events/webossdl/webossdl-events.cpp:342
+#: backends/events/webossdl/webossdl-events.cpp:366
msgid "Swipe three fingers to the right to toggle."
msgstr "Правядзіце трыма пальцамі направа для пераключэння."
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 7872cd357a..dbec32f89c 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.6.0git\n"
"Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2017-03-01 08:17+0100\n"
+"POT-Creation-Date: 2017-03-04 11:50+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/"
@@ -119,7 +119,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -132,7 +132,7 @@ msgstr "Sэ"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -823,38 +823,6 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:127
-msgid "3"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "5"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "8"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "10"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "13"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "15"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "18"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "20"
-msgstr ""
-
#: gui/options.cpp:345 gui/options.cpp:638 gui/options.cpp:776
#: gui/options.cpp:853 gui/options.cpp:1105
msgctxt "soundfont"
@@ -2154,37 +2122,37 @@ msgstr "Estрs segur de voler sortir?"
msgid "Quit"
msgstr "Surt"
-#: backends/events/gph/gph-events.cpp:385
-#: backends/events/gph/gph-events.cpp:428
-#: backends/events/openpandora/op-events.cpp:168
+#: backends/events/gph/gph-events.cpp:391
+#: backends/events/gph/gph-events.cpp:434
+#: backends/events/openpandora/op-events.cpp:174
msgid "Touchscreen 'Tap Mode' - Left Click"
msgstr "'Mode Toc' de pantalla tрctil - Clic esquerre"
-#: backends/events/gph/gph-events.cpp:387
-#: backends/events/gph/gph-events.cpp:430
-#: backends/events/openpandora/op-events.cpp:170
+#: backends/events/gph/gph-events.cpp:393
+#: backends/events/gph/gph-events.cpp:436
+#: backends/events/openpandora/op-events.cpp:176
msgid "Touchscreen 'Tap Mode' - Right Click"
msgstr "'Mode Toc' de pantalla tрctil - Clic dret"
-#: backends/events/gph/gph-events.cpp:389
-#: backends/events/gph/gph-events.cpp:432
-#: backends/events/openpandora/op-events.cpp:172
+#: backends/events/gph/gph-events.cpp:395
+#: backends/events/gph/gph-events.cpp:438
+#: backends/events/openpandora/op-events.cpp:178
msgid "Touchscreen 'Tap Mode' - Hover (No Click)"
msgstr "'Mode Toc' de pantalla tрctil - Flotant (sense clic)"
-#: backends/events/gph/gph-events.cpp:409
+#: backends/events/gph/gph-events.cpp:415
msgid "Maximum Volume"
msgstr "Volum mрxim"
-#: backends/events/gph/gph-events.cpp:411
+#: backends/events/gph/gph-events.cpp:417
msgid "Increasing Volume"
msgstr "Pujant el volum"
-#: backends/events/gph/gph-events.cpp:417
+#: backends/events/gph/gph-events.cpp:423
msgid "Minimal Volume"
msgstr "Volum mэnim"
-#: backends/events/gph/gph-events.cpp:419
+#: backends/events/gph/gph-events.cpp:425
msgid "Decreasing Volume"
msgstr "Baixant el volum"
@@ -2196,41 +2164,41 @@ msgstr "Clicat activat"
msgid "Clicking Disabled"
msgstr "Clicat desactivat"
-#: backends/events/openpandora/op-events.cpp:174
+#: backends/events/openpandora/op-events.cpp:180
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "'Mode Toc' de pantalla tрctil - Flotant (Clics de DPad)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
msgid "Do you want to quit ?"
msgstr "Vols sortir?"
#. I18N: Trackpad mode toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:308
+#: backends/events/webossdl/webossdl-events.cpp:332
msgid "Trackpad mode is now"
msgstr "El mode trackpad estр"
#. I18N: Trackpad mode on or off.
#. I18N: Auto-drag on or off.
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "ON"
msgstr ""
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "OFF"
msgstr ""
-#: backends/events/webossdl/webossdl-events.cpp:315
+#: backends/events/webossdl/webossdl-events.cpp:339
msgid "Swipe two fingers to the right to toggle."
msgstr ""
#. I18N: Auto-drag toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:359
msgid "Auto-drag mode is now"
msgstr ""
-#: backends/events/webossdl/webossdl-events.cpp:342
+#: backends/events/webossdl/webossdl-events.cpp:366
msgid "Swipe three fingers to the right to toggle."
msgstr ""
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 2e38b36034..ea82773811 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-03-01 08:17+0100\n"
+"POT-Creation-Date: 2017-03-04 11:50+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/"
@@ -121,7 +121,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -134,7 +134,7 @@ msgstr "Ano"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -820,38 +820,6 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:127
-msgid "3"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "5"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "8"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "10"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "13"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "15"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "18"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "20"
-msgstr ""
-
#: gui/options.cpp:345 gui/options.cpp:638 gui/options.cpp:776
#: gui/options.cpp:853 gui/options.cpp:1105
msgctxt "soundfont"
@@ -2170,37 +2138,37 @@ msgstr "Opravdu chcete skonшit?"
msgid "Quit"
msgstr "Ukonшit"
-#: backends/events/gph/gph-events.cpp:385
-#: backends/events/gph/gph-events.cpp:428
-#: backends/events/openpandora/op-events.cpp:168
+#: backends/events/gph/gph-events.cpp:391
+#: backends/events/gph/gph-events.cpp:434
+#: backends/events/openpandora/op-events.cpp:174
msgid "Touchscreen 'Tap Mode' - Left Click"
msgstr "'ReОim Ћuknutэ' Dotykovщ Obrazovky - Levщ Kliknutэ"
-#: backends/events/gph/gph-events.cpp:387
-#: backends/events/gph/gph-events.cpp:430
-#: backends/events/openpandora/op-events.cpp:170
+#: backends/events/gph/gph-events.cpp:393
+#: backends/events/gph/gph-events.cpp:436
+#: backends/events/openpandora/op-events.cpp:176
msgid "Touchscreen 'Tap Mode' - Right Click"
msgstr "'ReОim Ћuknutэ' Dotykovщ Obrazovky - Pravщ Kliknutэ"
-#: backends/events/gph/gph-events.cpp:389
-#: backends/events/gph/gph-events.cpp:432
-#: backends/events/openpandora/op-events.cpp:172
+#: backends/events/gph/gph-events.cpp:395
+#: backends/events/gph/gph-events.cpp:438
+#: backends/events/openpandora/op-events.cpp:178
msgid "Touchscreen 'Tap Mode' - Hover (No Click)"
msgstr "'ReОim Ћuknutэ' Dotykovщ Obrazovky - Najetэ (Bez Kliknutэ)"
-#: backends/events/gph/gph-events.cpp:409
+#: backends/events/gph/gph-events.cpp:415
msgid "Maximum Volume"
msgstr "Maximсlnэ Hlasitost"
-#: backends/events/gph/gph-events.cpp:411
+#: backends/events/gph/gph-events.cpp:417
msgid "Increasing Volume"
msgstr "ZvyЙuji Hlasitost"
-#: backends/events/gph/gph-events.cpp:417
+#: backends/events/gph/gph-events.cpp:423
msgid "Minimal Volume"
msgstr "Minimсlnэ Hlasitost"
-#: backends/events/gph/gph-events.cpp:419
+#: backends/events/gph/gph-events.cpp:425
msgid "Decreasing Volume"
msgstr "SniОuji Hlasitost"
@@ -2212,41 +2180,41 @@ msgstr "Kliknutэ Povoleno"
msgid "Clicking Disabled"
msgstr "Kliknutэ Zakсzсno"
-#: backends/events/openpandora/op-events.cpp:174
+#: backends/events/openpandora/op-events.cpp:180
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "'ReОim Ћuknutэ' Dotykovщ Obrazovky - Najetэ (Dpad klikс)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
msgid "Do you want to quit ?"
msgstr "Chcete ukonшit ?"
#. I18N: Trackpad mode toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:308
+#: backends/events/webossdl/webossdl-events.cpp:332
msgid "Trackpad mode is now"
msgstr "ReОim trackpadu je nynэ"
#. I18N: Trackpad mode on or off.
#. I18N: Auto-drag on or off.
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "ON"
msgstr "ZAPNUT"
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "OFF"
msgstr "VYPNUT"
-#: backends/events/webossdl/webossdl-events.cpp:315
+#: backends/events/webossdl/webossdl-events.cpp:339
msgid "Swipe two fingers to the right to toggle."
msgstr "Pro zapnutэ pјejeяte dvьma prsty doprava."
#. I18N: Auto-drag toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:359
msgid "Auto-drag mode is now"
msgstr "ReОim automatickщho taОenэ je nynэ"
-#: backends/events/webossdl/webossdl-events.cpp:342
+#: backends/events/webossdl/webossdl-events.cpp:366
msgid "Swipe three fingers to the right to toggle."
msgstr "Pro zapnutэ pјejeяte tјemi prsty doprava."
diff --git a/po/da_DK.po b/po/da_DK.po
index 665e98bc2f..309ad255d1 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-03-01 08:17+0100\n"
+"POT-Creation-Date: 2017-03-04 11:50+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/"
@@ -118,7 +118,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -131,7 +131,7 @@ msgstr "Ja"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -814,38 +814,6 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:127
-msgid "3"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "5"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "8"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "10"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "13"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "15"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "18"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "20"
-msgstr ""
-
#: gui/options.cpp:345 gui/options.cpp:638 gui/options.cpp:776
#: gui/options.cpp:853 gui/options.cpp:1105
msgctxt "soundfont"
@@ -2161,37 +2129,37 @@ msgstr "Vil du virkelig afslutte?"
msgid "Quit"
msgstr "Afslut"
-#: backends/events/gph/gph-events.cpp:385
-#: backends/events/gph/gph-events.cpp:428
-#: backends/events/openpandora/op-events.cpp:168
+#: backends/events/gph/gph-events.cpp:391
+#: backends/events/gph/gph-events.cpp:434
+#: backends/events/openpandora/op-events.cpp:174
msgid "Touchscreen 'Tap Mode' - Left Click"
msgstr "Touchscreen 'Tap Mode' - Venstre Klik"
-#: backends/events/gph/gph-events.cpp:387
-#: backends/events/gph/gph-events.cpp:430
-#: backends/events/openpandora/op-events.cpp:170
+#: backends/events/gph/gph-events.cpp:393
+#: backends/events/gph/gph-events.cpp:436
+#: backends/events/openpandora/op-events.cpp:176
msgid "Touchscreen 'Tap Mode' - Right Click"
msgstr "Touchscreen 'Tap Mode' - Hјjre Klik"
-#: backends/events/gph/gph-events.cpp:389
-#: backends/events/gph/gph-events.cpp:432
-#: backends/events/openpandora/op-events.cpp:172
+#: backends/events/gph/gph-events.cpp:395
+#: backends/events/gph/gph-events.cpp:438
+#: backends/events/openpandora/op-events.cpp:178
msgid "Touchscreen 'Tap Mode' - Hover (No Click)"
msgstr "Touchscreen 'Tap Mode' - Henover (Ingen Klik)"
-#: backends/events/gph/gph-events.cpp:409
+#: backends/events/gph/gph-events.cpp:415
msgid "Maximum Volume"
msgstr "Maximal lydstyrke"
-#: backends/events/gph/gph-events.cpp:411
+#: backends/events/gph/gph-events.cpp:417
msgid "Increasing Volume"
msgstr "Hцver lydstyrke"
-#: backends/events/gph/gph-events.cpp:417
+#: backends/events/gph/gph-events.cpp:423
msgid "Minimal Volume"
msgstr "Minimal lydstyrke"
-#: backends/events/gph/gph-events.cpp:419
+#: backends/events/gph/gph-events.cpp:425
msgid "Decreasing Volume"
msgstr "Sцnker lydstyrke"
@@ -2203,41 +2171,41 @@ msgstr "Klik aktiveret"
msgid "Clicking Disabled"
msgstr "Klik deaktiveret"
-#: backends/events/openpandora/op-events.cpp:174
+#: backends/events/openpandora/op-events.cpp:180
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Touchscreen 'Tap Mode' - Henover (DPad Klik)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
msgid "Do you want to quit ?"
msgstr "Vil du afslutte?"
#. I18N: Trackpad mode toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:308
+#: backends/events/webossdl/webossdl-events.cpp:332
msgid "Trackpad mode is now"
msgstr "Pegeplade-tilstand er nu"
#. I18N: Trackpad mode on or off.
#. I18N: Auto-drag on or off.
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "ON"
msgstr "TIL"
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "OFF"
msgstr "FRA"
-#: backends/events/webossdl/webossdl-events.cpp:315
+#: backends/events/webossdl/webossdl-events.cpp:339
msgid "Swipe two fingers to the right to toggle."
msgstr "Fјr to fingre til hјjre for at skifte."
#. I18N: Auto-drag toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:359
msgid "Auto-drag mode is now"
msgstr "Auto-trцk tilstand er nu"
-#: backends/events/webossdl/webossdl-events.cpp:342
+#: backends/events/webossdl/webossdl-events.cpp:366
msgid "Swipe three fingers to the right to toggle."
msgstr "Fјr tre fingre til hјjre for at skifte."
diff --git a/po/de_DE.po b/po/de_DE.po
index 0d35b78bd7..959a0b773e 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.10.0git\n"
"Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2017-03-01 08:17+0100\n"
-"PO-Revision-Date: 2017-02-26 11:10+0000\n"
+"POT-Creation-Date: 2017-03-04 11:50+0100\n"
+"PO-Revision-Date: 2017-03-04 10:43+0000\n"
"Last-Translator: Lothar Serra Mari <rootfather@scummvm.org>\n"
"Language-Team: German <https://translations.scummvm.org/projects/scummvm/"
"scummvm/de/>\n"
@@ -122,7 +122,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -135,7 +135,7 @@ msgstr "Ja"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -829,38 +829,6 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:127
-msgid "3"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "5"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "8"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "10"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "13"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "15"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "18"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "20"
-msgstr ""
-
#: gui/options.cpp:345 gui/options.cpp:638 gui/options.cpp:776
#: gui/options.cpp:853 gui/options.cpp:1105
msgctxt "soundfont"
@@ -897,35 +865,33 @@ msgstr "Touchpad-Mausmodus"
#: gui/options.cpp:940
msgid "Swap Menu and Back buttons"
-msgstr "Vertausche Menќ- und Zurќck-Buttons"
+msgstr "Menќ- und Zurќck-Tasten vertauschen"
#: gui/options.cpp:945
-#, fuzzy
msgid "Pointer Speed:"
msgstr "Maus-Geschwindigkeit:"
#: gui/options.cpp:945 gui/options.cpp:947 gui/options.cpp:948
msgid "Speed for keyboard/joystick mouse pointer control"
-msgstr ""
+msgstr "Zeiger-Geschwindigkeit der Tastatur-/Joystick-Maus"
#: gui/options.cpp:947
-#, fuzzy
msgctxt "lowres"
msgid "Pointer Speed:"
msgstr "Maus-Geschwindigkeit:"
#: gui/options.cpp:958
msgid "Joy Deadzone:"
-msgstr ""
+msgstr "Joystick-Totzone:"
#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
msgid "Analog joystick Deadzone"
-msgstr ""
+msgstr "Totzone des analogen Joysticks"
#: gui/options.cpp:960
msgctxt "lowres"
msgid "Joy Deadzone:"
-msgstr ""
+msgstr "Joystick-Totzone:"
#: gui/options.cpp:977
msgid "Graphics mode:"
@@ -2194,37 +2160,37 @@ msgstr "Mіchten Sie wirklich beenden?"
msgid "Quit"
msgstr "Beenden"
-#: backends/events/gph/gph-events.cpp:385
-#: backends/events/gph/gph-events.cpp:428
-#: backends/events/openpandora/op-events.cpp:168
+#: backends/events/gph/gph-events.cpp:391
+#: backends/events/gph/gph-events.cpp:434
+#: backends/events/openpandora/op-events.cpp:174
msgid "Touchscreen 'Tap Mode' - Left Click"
msgstr "Berќhrungsbildschirm-Tipp-Modus - Linksklick"
-#: backends/events/gph/gph-events.cpp:387
-#: backends/events/gph/gph-events.cpp:430
-#: backends/events/openpandora/op-events.cpp:170
+#: backends/events/gph/gph-events.cpp:393
+#: backends/events/gph/gph-events.cpp:436
+#: backends/events/openpandora/op-events.cpp:176
msgid "Touchscreen 'Tap Mode' - Right Click"
msgstr "Berќhrungsbildschirm-Tipp-Modus - Rechtsklick"
-#: backends/events/gph/gph-events.cpp:389
-#: backends/events/gph/gph-events.cpp:432
-#: backends/events/openpandora/op-events.cpp:172
+#: backends/events/gph/gph-events.cpp:395
+#: backends/events/gph/gph-events.cpp:438
+#: backends/events/openpandora/op-events.cpp:178
msgid "Touchscreen 'Tap Mode' - Hover (No Click)"
msgstr "Berќhrungsbildschirm-Tipp-Modus - schweben (kein Klick)"
-#: backends/events/gph/gph-events.cpp:409
+#: backends/events/gph/gph-events.cpp:415
msgid "Maximum Volume"
msgstr "Hіchste Lautstфrke"
-#: backends/events/gph/gph-events.cpp:411
+#: backends/events/gph/gph-events.cpp:417
msgid "Increasing Volume"
msgstr "Lautstфrke hіher"
-#: backends/events/gph/gph-events.cpp:417
+#: backends/events/gph/gph-events.cpp:423
msgid "Minimal Volume"
msgstr "Niedrigste Lautstфrke"
-#: backends/events/gph/gph-events.cpp:419
+#: backends/events/gph/gph-events.cpp:425
msgid "Decreasing Volume"
msgstr "Lautstфrke niedriger"
@@ -2236,41 +2202,41 @@ msgstr "Klicken aktiviert"
msgid "Clicking Disabled"
msgstr "Klicken deaktiviert"
-#: backends/events/openpandora/op-events.cpp:174
+#: backends/events/openpandora/op-events.cpp:180
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Berќhrungsbildschirm-Tipp-Modus - schweben (DPad-Klicks)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
msgid "Do you want to quit ?"
msgstr "Mіchten Sie beenden?"
#. I18N: Trackpad mode toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:308
+#: backends/events/webossdl/webossdl-events.cpp:332
msgid "Trackpad mode is now"
msgstr "Trackpad-Modus ist jetzt"
#. I18N: Trackpad mode on or off.
#. I18N: Auto-drag on or off.
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "ON"
msgstr "AN"
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "OFF"
msgstr "AUS"
-#: backends/events/webossdl/webossdl-events.cpp:315
+#: backends/events/webossdl/webossdl-events.cpp:339
msgid "Swipe two fingers to the right to toggle."
msgstr "Zum Umschalten mit zwei Fingern nach rechts wischen."
#. I18N: Auto-drag toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:359
msgid "Auto-drag mode is now"
msgstr "Automatisches Ziehen ist jetzt"
-#: backends/events/webossdl/webossdl-events.cpp:342
+#: backends/events/webossdl/webossdl-events.cpp:366
msgid "Swipe three fingers to the right to toggle."
msgstr "Zum Umschalten mit drei Fingern nach rechts wischen."
@@ -4581,6 +4547,30 @@ msgstr ""
"Spielstфnde bis zu Version %d. Sie benіtigen eine aktualisierte Version der "
"Engine, um diesen Spielstand zu verwenden."
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "10"
+#~ msgstr "10"
+
+#~ msgid "13"
+#~ msgstr "13"
+
+#~ msgid "15"
+#~ msgstr "15"
+
+#~ msgid "18"
+#~ msgstr "18"
+
+#~ msgid "20"
+#~ msgstr "20"
+
#, fuzzy
#~ msgid "Speed multiplier for mouse emulation"
#~ msgstr "Geschwindigkeitsfaktor fќr Maus-Emulation"
diff --git a/po/el.po b/po/el.po
index 6c6e437004..3c1f0ee076 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,11 +6,11 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.10.0git\n"
"Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2017-03-01 08:17+0100\n"
-"PO-Revision-Date: 2017-02-22 19:57+0000\n"
-"Last-Translator: Arius <alidop@pathfinder.gr>\n"
-"Language-Team: Greek <https://translations.scummvm.org/projects/scummvm/"
-"scummvm/el/>\n"
+"POT-Creation-Date: 2017-03-04 11:50+0100\n"
+"PO-Revision-Date: 2017-03-04 10:56+0000\n"
+"Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n"
+"Language-Team: Greek "
+"<https://translations.scummvm.org/projects/scummvm/scummvm/el/>\n"
"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-7\n"
@@ -118,7 +118,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -131,7 +131,7 @@ msgstr "Эсщ"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -836,38 +836,6 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:127
-msgid "3"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "5"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "8"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "10"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "13"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "15"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "18"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "20"
-msgstr ""
-
#: gui/options.cpp:345 gui/options.cpp:638 gui/options.cpp:776
#: gui/options.cpp:853 gui/options.cpp:1105
msgctxt "soundfont"
@@ -896,7 +864,7 @@ msgstr "фхэ оєсэ фѕэсєо ч сыысуо єчђ ё§шьщѓчђ іщыєёсёпѓьсєяђ"
#: gui/options.cpp:932
msgid "Show On-screen control"
-msgstr ""
+msgstr "Хьімэщѓч єљэ ѓєящїхпљэ їхщёщѓья§ ѓєчэ яшќэч"
#: gui/options.cpp:936
#, fuzzy
@@ -914,7 +882,7 @@ msgstr "дсї§єчєс:"
#: gui/options.cpp:945 gui/options.cpp:947 gui/options.cpp:948
msgid "Speed for keyboard/joystick mouse pointer control"
-msgstr ""
+msgstr "дсї§єчєс їхщёщѓья§ єяѕ фхпъєч №яэєщъщя§ ьх №ычъєёяыќущя/їхщёщѓєоёщя"
#: gui/options.cpp:947
#, fuzzy
@@ -924,16 +892,16 @@ msgstr "дсї§єчєс:"
#: gui/options.cpp:958
msgid "Joy Deadzone:"
-msgstr ""
+msgstr "ахёщяїо сфёмэхщсђ їхщёщѓєоёщяѕ:"
#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
msgid "Analog joystick Deadzone"
-msgstr ""
+msgstr "ахёщяїо сфёмэхщсђ сэсыяущъя§ їхщёщѓєоёщяѕ"
#: gui/options.cpp:960
msgctxt "lowres"
msgid "Joy Deadzone:"
-msgstr ""
+msgstr "ахёщяїо сфёмэхщсђ їхщёщѓєоёщяѕ:"
#: gui/options.cpp:977
msgid "Graphics mode:"
@@ -2204,37 +2172,37 @@ msgstr "Хпѓєх ѓпуяѕёящ ќєщ шныхєх эс тухпєх с№ќ єя №ёќуёсььс;"
msgid "Quit"
msgstr "Июяфяђ"
-#: backends/events/gph/gph-events.cpp:385
-#: backends/events/gph/gph-events.cpp:428
-#: backends/events/openpandora/op-events.cpp:168
+#: backends/events/gph/gph-events.cpp:391
+#: backends/events/gph/gph-events.cpp:434
+#: backends/events/openpandora/op-events.cpp:174
msgid "Touchscreen 'Tap Mode' - Left Click"
msgstr "'Ыхщєяѕёупс Tap' яшќэчђ сіођ - Сёщѓєхёќ Click"
-#: backends/events/gph/gph-events.cpp:387
-#: backends/events/gph/gph-events.cpp:430
-#: backends/events/openpandora/op-events.cpp:170
+#: backends/events/gph/gph-events.cpp:393
+#: backends/events/gph/gph-events.cpp:436
+#: backends/events/openpandora/op-events.cpp:176
msgid "Touchscreen 'Tap Mode' - Right Click"
msgstr "'Ыхщєяѕёупс Tap' яшќэчђ сіођ - Фхюп Click"
-#: backends/events/gph/gph-events.cpp:389
-#: backends/events/gph/gph-events.cpp:432
-#: backends/events/openpandora/op-events.cpp:172
+#: backends/events/gph/gph-events.cpp:395
+#: backends/events/gph/gph-events.cpp:438
+#: backends/events/openpandora/op-events.cpp:178
msgid "Touchscreen 'Tap Mode' - Hover (No Click)"
msgstr "'Ыхщєяѕёупс Tap' яшќэчђ сіођ - Сщўёчѓч (Мїщ Click)"
-#: backends/events/gph/gph-events.cpp:409
+#: backends/events/gph/gph-events.cpp:415
msgid "Maximum Volume"
msgstr "Ьнущѓєч Иэєсѓч"
-#: backends/events/gph/gph-events.cpp:411
+#: backends/events/gph/gph-events.cpp:417
msgid "Increasing Volume"
msgstr "С§ючѓч Иэєсѓчђ"
-#: backends/events/gph/gph-events.cpp:417
+#: backends/events/gph/gph-events.cpp:423
msgid "Minimal Volume"
msgstr "Хымїщѓєч Иэєсѓч"
-#: backends/events/gph/gph-events.cpp:419
+#: backends/events/gph/gph-events.cpp:425
msgid "Decreasing Volume"
msgstr "Ьхпљѓч Иэєсѓчђ"
@@ -2246,41 +2214,41 @@ msgstr "Хэхёуя№ящчьнэя Clicking"
msgid "Clicking Disabled"
msgstr "С№хэхёуя№ящчьнэя Clicking"
-#: backends/events/openpandora/op-events.cpp:174
+#: backends/events/openpandora/op-events.cpp:180
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "'Ыхщєяѕёупс Tap' яшќэчђ сіођ - Сщўёчѓч (DPad Clicks)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
msgid "Do you want to quit ?"
msgstr "Шныхєх эс тухпєх с№ќ єя №ёќуёсььс;"
#. I18N: Trackpad mode toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:308
+#: backends/events/webossdl/webossdl-events.cpp:332
msgid "Trackpad mode is now"
msgstr "Ч ыхщєяѕёупс trackpad хпэсщ єўёс"
#. I18N: Trackpad mode on or off.
#. I18N: Auto-drag on or off.
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "ON"
msgstr "Хэхёуя№ящчьнэч"
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "OFF"
msgstr "С№хэхёуя№ящчьнэч"
-#: backends/events/webossdl/webossdl-events.cpp:315
+#: backends/events/webossdl/webossdl-events.cpp:339
msgid "Swipe two fingers to the right to toggle."
msgstr "ахёмѓєх ф§я фмїєѕыс №ёяђ єс фхющм ущс хэсыысуо."
#. I18N: Auto-drag toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:359
msgid "Auto-drag mode is now"
msgstr "Ч ыхщєяѕёупс auto-drag хпэсщ єўёс"
-#: backends/events/webossdl/webossdl-events.cpp:342
+#: backends/events/webossdl/webossdl-events.cpp:366
msgid "Swipe three fingers to the right to toggle."
msgstr "ахёмѓєх єёпс фмїєѕыс №ёяђ єс фхющм ущс хэсыысуо."
diff --git a/po/es_ES.po b/po/es_ES.po
index bea84c0f2f..a4d6213337 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-03-01 08:17+0100\n"
+"POT-Creation-Date: 2017-03-04 11:50+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/"
@@ -119,7 +119,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -132,7 +132,7 @@ msgstr "Sэ"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -825,38 +825,6 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:127
-msgid "3"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "5"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "8"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "10"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "13"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "15"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "18"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "20"
-msgstr ""
-
#: gui/options.cpp:345 gui/options.cpp:638 gui/options.cpp:776
#: gui/options.cpp:853 gui/options.cpp:1105
msgctxt "soundfont"
@@ -2178,37 +2146,37 @@ msgstr "ПSeguro que quieres salir?"
msgid "Quit"
msgstr "Salir"
-#: backends/events/gph/gph-events.cpp:385
-#: backends/events/gph/gph-events.cpp:428
-#: backends/events/openpandora/op-events.cpp:168
+#: backends/events/gph/gph-events.cpp:391
+#: backends/events/gph/gph-events.cpp:434
+#: backends/events/openpandora/op-events.cpp:174
msgid "Touchscreen 'Tap Mode' - Left Click"
msgstr "'Modo toque' de pantalla tсctil - Clic izquierdo"
-#: backends/events/gph/gph-events.cpp:387
-#: backends/events/gph/gph-events.cpp:430
-#: backends/events/openpandora/op-events.cpp:170
+#: backends/events/gph/gph-events.cpp:393
+#: backends/events/gph/gph-events.cpp:436
+#: backends/events/openpandora/op-events.cpp:176
msgid "Touchscreen 'Tap Mode' - Right Click"
msgstr "'Modo toque' de pantalla tсctil - Clic derecho"
-#: backends/events/gph/gph-events.cpp:389
-#: backends/events/gph/gph-events.cpp:432
-#: backends/events/openpandora/op-events.cpp:172
+#: backends/events/gph/gph-events.cpp:395
+#: backends/events/gph/gph-events.cpp:438
+#: backends/events/openpandora/op-events.cpp:178
msgid "Touchscreen 'Tap Mode' - Hover (No Click)"
msgstr "'Modo toque' de pantalla tсctil - Flotante (sin clic)"
-#: backends/events/gph/gph-events.cpp:409
+#: backends/events/gph/gph-events.cpp:415
msgid "Maximum Volume"
msgstr "Volumen mсximo"
-#: backends/events/gph/gph-events.cpp:411
+#: backends/events/gph/gph-events.cpp:417
msgid "Increasing Volume"
msgstr "Aumentando el volumen"
-#: backends/events/gph/gph-events.cpp:417
+#: backends/events/gph/gph-events.cpp:423
msgid "Minimal Volume"
msgstr "Volumen mэnimo"
-#: backends/events/gph/gph-events.cpp:419
+#: backends/events/gph/gph-events.cpp:425
msgid "Decreasing Volume"
msgstr "Bajando el volumen"
@@ -2220,41 +2188,41 @@ msgstr "Clic activado"
msgid "Clicking Disabled"
msgstr "Clic desactivado"
-#: backends/events/openpandora/op-events.cpp:174
+#: backends/events/openpandora/op-events.cpp:180
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "'Modo toque' de pantalla tсctil - Flotante (clic de cruceta)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
msgid "Do you want to quit ?"
msgstr "ПQuieres salir?"
#. I18N: Trackpad mode toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:308
+#: backends/events/webossdl/webossdl-events.cpp:332
msgid "Trackpad mode is now"
msgstr "El modo trackpad estс"
#. I18N: Trackpad mode on or off.
#. I18N: Auto-drag on or off.
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "ON"
msgstr "activado"
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "OFF"
msgstr "desactivado"
-#: backends/events/webossdl/webossdl-events.cpp:315
+#: backends/events/webossdl/webossdl-events.cpp:339
msgid "Swipe two fingers to the right to toggle."
msgstr "Desliza dos dedos hacia la derecha para cambiar de modo."
#. I18N: Auto-drag toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:359
msgid "Auto-drag mode is now"
msgstr "El modo de arrastre automсtico estс"
-#: backends/events/webossdl/webossdl-events.cpp:342
+#: backends/events/webossdl/webossdl-events.cpp:366
msgid "Swipe three fingers to the right to toggle."
msgstr "Desliza tres dedos hacia la derecha para cambiar de modo."
diff --git a/po/eu.po b/po/eu.po
index be12e0e362..2fbac2dcfc 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.5.0git\n"
"Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2017-03-01 08:17+0100\n"
+"POT-Creation-Date: 2017-03-04 11:50+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/"
@@ -118,7 +118,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -131,7 +131,7 @@ msgstr "Bai"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -814,38 +814,6 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:127
-msgid "3"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "5"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "8"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "10"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "13"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "15"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "18"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "20"
-msgstr ""
-
#: gui/options.cpp:345 gui/options.cpp:638 gui/options.cpp:776
#: gui/options.cpp:853 gui/options.cpp:1105
msgctxt "soundfont"
@@ -2164,37 +2132,37 @@ msgstr "Benetan irten?"
msgid "Quit"
msgstr "Irten"
-#: backends/events/gph/gph-events.cpp:385
-#: backends/events/gph/gph-events.cpp:428
-#: backends/events/openpandora/op-events.cpp:168
+#: backends/events/gph/gph-events.cpp:391
+#: backends/events/gph/gph-events.cpp:434
+#: backends/events/openpandora/op-events.cpp:174
msgid "Touchscreen 'Tap Mode' - Left Click"
msgstr "Ukimen-pantailako 'kolpetxo modua' - Ezker klika"
-#: backends/events/gph/gph-events.cpp:387
-#: backends/events/gph/gph-events.cpp:430
-#: backends/events/openpandora/op-events.cpp:170
+#: backends/events/gph/gph-events.cpp:393
+#: backends/events/gph/gph-events.cpp:436
+#: backends/events/openpandora/op-events.cpp:176
msgid "Touchscreen 'Tap Mode' - Right Click"
msgstr "Ukimen-pantailako 'kolpetxo modua' - Eskuin klika"
-#: backends/events/gph/gph-events.cpp:389
-#: backends/events/gph/gph-events.cpp:432
-#: backends/events/openpandora/op-events.cpp:172
+#: backends/events/gph/gph-events.cpp:395
+#: backends/events/gph/gph-events.cpp:438
+#: backends/events/openpandora/op-events.cpp:178
msgid "Touchscreen 'Tap Mode' - Hover (No Click)"
msgstr "Ukimen-pantailako 'kolpetxo modua' - Flotatu (klikik ez)"
-#: backends/events/gph/gph-events.cpp:409
+#: backends/events/gph/gph-events.cpp:415
msgid "Maximum Volume"
msgstr "Bolumen maximoa"
-#: backends/events/gph/gph-events.cpp:411
+#: backends/events/gph/gph-events.cpp:417
msgid "Increasing Volume"
msgstr "Bolumena igotzen"
-#: backends/events/gph/gph-events.cpp:417
+#: backends/events/gph/gph-events.cpp:423
msgid "Minimal Volume"
msgstr "Bolumen minimoa"
-#: backends/events/gph/gph-events.cpp:419
+#: backends/events/gph/gph-events.cpp:425
msgid "Decreasing Volume"
msgstr "Bolumena jaisten"
@@ -2206,41 +2174,41 @@ msgstr "Klikatzea gaituta"
msgid "Clicking Disabled"
msgstr "Klikatzea desgaituta"
-#: backends/events/openpandora/op-events.cpp:174
+#: backends/events/openpandora/op-events.cpp:180
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Ukimen-pantailako 'kolpetxo modua' - Flotatu (DPad klikak)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
msgid "Do you want to quit ?"
msgstr "Benetan irten?"
#. I18N: Trackpad mode toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:308
+#: backends/events/webossdl/webossdl-events.cpp:332
msgid "Trackpad mode is now"
msgstr "Trackpad modua orain"
#. I18N: Trackpad mode on or off.
#. I18N: Auto-drag on or off.
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "ON"
msgstr "ON"
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "OFF"
msgstr "OFF"
-#: backends/events/webossdl/webossdl-events.cpp:315
+#: backends/events/webossdl/webossdl-events.cpp:339
msgid "Swipe two fingers to the right to toggle."
msgstr "Pasatu bi atzamara eskuinean gaitu/desgaitzeko."
#. I18N: Auto-drag toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:359
msgid "Auto-drag mode is now"
msgstr "Auto-arrastatzea orain"
-#: backends/events/webossdl/webossdl-events.cpp:342
+#: backends/events/webossdl/webossdl-events.cpp:366
msgid "Swipe three fingers to the right to toggle."
msgstr "Pasatu hiru atzamar eskuinean gaitu/desgaitzeko."
diff --git a/po/fi_FI.po b/po/fi_FI.po
index f1a9870e86..dc538a9830 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-03-01 08:17+0100\n"
+"POT-Creation-Date: 2017-03-04 11:50+0100\n"
"PO-Revision-Date: 2017-02-28 15:48+0000\n"
"Last-Translator: Timo Mikkolainen <tmikkola@gmail.com>\n"
"Language-Team: Finnish <https://translations.scummvm.org/projects/scummvm/"
@@ -118,7 +118,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -131,7 +131,7 @@ msgstr "Kyllф"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -821,38 +821,6 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:127
-msgid "3"
-msgstr "3"
-
-#: gui/options.cpp:127
-msgid "5"
-msgstr "5"
-
-#: gui/options.cpp:127
-msgid "8"
-msgstr "8"
-
-#: gui/options.cpp:127
-msgid "10"
-msgstr "10"
-
-#: gui/options.cpp:127
-msgid "13"
-msgstr "13"
-
-#: gui/options.cpp:127
-msgid "15"
-msgstr "15"
-
-#: gui/options.cpp:127
-msgid "18"
-msgstr "18"
-
-#: gui/options.cpp:127
-msgid "20"
-msgstr "20"
-
#: gui/options.cpp:345 gui/options.cpp:638 gui/options.cpp:776
#: gui/options.cpp:853 gui/options.cpp:1105
msgctxt "soundfont"
@@ -2160,37 +2128,37 @@ msgstr "Haluatko varmasti lopettaa?"
msgid "Quit"
msgstr "Lopeta"
-#: backends/events/gph/gph-events.cpp:385
-#: backends/events/gph/gph-events.cpp:428
-#: backends/events/openpandora/op-events.cpp:168
+#: backends/events/gph/gph-events.cpp:391
+#: backends/events/gph/gph-events.cpp:434
+#: backends/events/openpandora/op-events.cpp:174
msgid "Touchscreen 'Tap Mode' - Left Click"
msgstr "Kosketusnфytіn 'Tap moodi' - vasen klikkaus"
-#: backends/events/gph/gph-events.cpp:387
-#: backends/events/gph/gph-events.cpp:430
-#: backends/events/openpandora/op-events.cpp:170
+#: backends/events/gph/gph-events.cpp:393
+#: backends/events/gph/gph-events.cpp:436
+#: backends/events/openpandora/op-events.cpp:176
msgid "Touchscreen 'Tap Mode' - Right Click"
msgstr "Kosketusnфytіn 'Tap moodi' - oikea klikkaus"
-#: backends/events/gph/gph-events.cpp:389
-#: backends/events/gph/gph-events.cpp:432
-#: backends/events/openpandora/op-events.cpp:172
+#: backends/events/gph/gph-events.cpp:395
+#: backends/events/gph/gph-events.cpp:438
+#: backends/events/openpandora/op-events.cpp:178
msgid "Touchscreen 'Tap Mode' - Hover (No Click)"
msgstr "Kosketusnфytіn 'Tap moodi' - ei klikkausta"
-#: backends/events/gph/gph-events.cpp:409
+#: backends/events/gph/gph-events.cpp:415
msgid "Maximum Volume"
msgstr "Maksimi ффnenvoimakkuus"
-#: backends/events/gph/gph-events.cpp:411
+#: backends/events/gph/gph-events.cpp:417
msgid "Increasing Volume"
msgstr "Nostetaan ффnenvoimakkuutta"
-#: backends/events/gph/gph-events.cpp:417
+#: backends/events/gph/gph-events.cpp:423
msgid "Minimal Volume"
msgstr "Pienin ффnenvoimakkuus"
-#: backends/events/gph/gph-events.cpp:419
+#: backends/events/gph/gph-events.cpp:425
msgid "Decreasing Volume"
msgstr "Lasketaan ффnenvoimakkuutta"
@@ -2202,41 +2170,41 @@ msgstr "Klikkaus pффllф"
msgid "Clicking Disabled"
msgstr "Klikkaus pois pффltф"
-#: backends/events/openpandora/op-events.cpp:174
+#: backends/events/openpandora/op-events.cpp:180
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Kosketusnфytіn 'Tap moodi' - Hover (DPad klikkaus)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
msgid "Do you want to quit ?"
msgstr "Haluatko lopettaa?"
#. I18N: Trackpad mode toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:308
+#: backends/events/webossdl/webossdl-events.cpp:332
msgid "Trackpad mode is now"
msgstr "Trackpad tila on nyt"
#. I18N: Trackpad mode on or off.
#. I18N: Auto-drag on or off.
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "ON"
msgstr "PФФLLФ"
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "OFF"
msgstr "POIS"
-#: backends/events/webossdl/webossdl-events.cpp:315
+#: backends/events/webossdl/webossdl-events.cpp:339
msgid "Swipe two fingers to the right to toggle."
msgstr "Muuta tilaa pyyhkфisemфllф kahdella sormella oikealle."
#. I18N: Auto-drag toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:359
msgid "Auto-drag mode is now"
msgstr "Automaattiraahaustila on nyt"
-#: backends/events/webossdl/webossdl-events.cpp:342
+#: backends/events/webossdl/webossdl-events.cpp:366
msgid "Swipe three fingers to the right to toggle."
msgstr "Muuta tilaa pyyhkфisemфllф kolmella sormella oikealle."
@@ -4519,6 +4487,30 @@ msgstr ""
"vain versioon %d asti. Tarvitset pфivitetyn version tфstф pelimoottorista "
"kфyttффksesi tфtф pelitallennusta."
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "10"
+#~ msgstr "10"
+
+#~ msgid "13"
+#~ msgstr "13"
+
+#~ msgid "15"
+#~ msgstr "15"
+
+#~ msgid "18"
+#~ msgstr "18"
+
+#~ msgid "20"
+#~ msgstr "20"
+
#~ msgid "Speed multiplier for mouse emulation"
#~ msgstr "Hiiriemulaation nopeuskerroin"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 7fc9f47790..c33f328439 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -7,11 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.8.0git\n"
"Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2017-03-01 08:17+0100\n"
-"PO-Revision-Date: 2017-02-23 11:45+0000\n"
-"Last-Translator: Purple T <zeonk@hotmail.com>\n"
-"Language-Team: French <https://translations.scummvm.org/projects/scummvm/"
-"scummvm/fr/>\n"
+"POT-Creation-Date: 2017-03-04 11:50+0100\n"
+"PO-Revision-Date: 2017-03-04 10:55+0000\n"
+"Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n"
+"Language-Team: French "
+"<https://translations.scummvm.org/projects/scummvm/scummvm/fr/>\n"
"Language: fr_FR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
@@ -119,7 +119,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -132,7 +132,7 @@ msgstr "Oui"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -826,38 +826,6 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:127
-msgid "3"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "5"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "8"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "10"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "13"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "15"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "18"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "20"
-msgstr ""
-
#: gui/options.cpp:345 gui/options.cpp:638 gui/options.cpp:776
#: gui/options.cpp:853 gui/options.cpp:1105
msgctxt "soundfont"
@@ -913,7 +881,7 @@ msgstr "Vitesse :"
#: gui/options.cpp:958
msgid "Joy Deadzone:"
-msgstr ""
+msgstr "Zone inactive du joystick :"
#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
msgid "Analog joystick Deadzone"
@@ -922,7 +890,7 @@ msgstr ""
#: gui/options.cpp:960
msgctxt "lowres"
msgid "Joy Deadzone:"
-msgstr ""
+msgstr "Zone inactive du joystick :"
#: gui/options.cpp:977
msgid "Graphics mode:"
@@ -2183,37 +2151,37 @@ msgstr "Voulez-vous vraiment quitter ?"
msgid "Quit"
msgstr "Quitter"
-#: backends/events/gph/gph-events.cpp:385
-#: backends/events/gph/gph-events.cpp:428
-#: backends/events/openpandora/op-events.cpp:168
+#: backends/events/gph/gph-events.cpp:391
+#: backends/events/gph/gph-events.cpp:434
+#: backends/events/openpandora/op-events.cpp:174
msgid "Touchscreen 'Tap Mode' - Left Click"
msgstr "Touchscreen 'Tap Mode' - Clic Gauche"
-#: backends/events/gph/gph-events.cpp:387
-#: backends/events/gph/gph-events.cpp:430
-#: backends/events/openpandora/op-events.cpp:170
+#: backends/events/gph/gph-events.cpp:393
+#: backends/events/gph/gph-events.cpp:436
+#: backends/events/openpandora/op-events.cpp:176
msgid "Touchscreen 'Tap Mode' - Right Click"
msgstr "Touchscreen 'Tap Mode' - Clic Droit"
-#: backends/events/gph/gph-events.cpp:389
-#: backends/events/gph/gph-events.cpp:432
-#: backends/events/openpandora/op-events.cpp:172
+#: backends/events/gph/gph-events.cpp:395
+#: backends/events/gph/gph-events.cpp:438
+#: backends/events/openpandora/op-events.cpp:178
msgid "Touchscreen 'Tap Mode' - Hover (No Click)"
msgstr "Touchscreen 'Tap Mode' - Dщplacer sans cliquer"
-#: backends/events/gph/gph-events.cpp:409
+#: backends/events/gph/gph-events.cpp:415
msgid "Maximum Volume"
msgstr "Volume Maximum"
-#: backends/events/gph/gph-events.cpp:411
+#: backends/events/gph/gph-events.cpp:417
msgid "Increasing Volume"
msgstr "Augmentation Volume"
-#: backends/events/gph/gph-events.cpp:417
+#: backends/events/gph/gph-events.cpp:423
msgid "Minimal Volume"
msgstr "Volume Minimum"
-#: backends/events/gph/gph-events.cpp:419
+#: backends/events/gph/gph-events.cpp:425
msgid "Decreasing Volume"
msgstr "Diminution Volume"
@@ -2225,41 +2193,41 @@ msgstr "Clic Activщ"
msgid "Clicking Disabled"
msgstr "Clic Dщsactivщ"
-#: backends/events/openpandora/op-events.cpp:174
+#: backends/events/openpandora/op-events.cpp:180
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Touchscreen 'Tap Mode' - Dщplacer sans cliquer"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
msgid "Do you want to quit ?"
msgstr "Voulez-vous quitter ?"
#. I18N: Trackpad mode toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:308
+#: backends/events/webossdl/webossdl-events.cpp:332
msgid "Trackpad mode is now"
msgstr "Le mode touchpad est maintenant"
#. I18N: Trackpad mode on or off.
#. I18N: Auto-drag on or off.
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "ON"
msgstr "activщ"
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "OFF"
msgstr "dщsactivщ"
-#: backends/events/webossdl/webossdl-events.cpp:315
+#: backends/events/webossdl/webossdl-events.cpp:339
msgid "Swipe two fingers to the right to toggle."
msgstr "Glissez deux doigts vers la droite pour changer de mode."
#. I18N: Auto-drag toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:359
msgid "Auto-drag mode is now"
msgstr "Le mode glisser-auto est maintenant"
-#: backends/events/webossdl/webossdl-events.cpp:342
+#: backends/events/webossdl/webossdl-events.cpp:366
msgid "Swipe three fingers to the right to toggle."
msgstr "Glissez trois doigts vers la droite pour changer de mode."
diff --git a/po/gl_ES.po b/po/gl_ES.po
index 2ffa2f9619..52a02814f6 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-03-01 08:17+0100\n"
+"POT-Creation-Date: 2017-03-04 11:50+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/"
@@ -119,7 +119,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -132,7 +132,7 @@ msgstr "Si"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -820,38 +820,6 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:127
-msgid "3"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "5"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "8"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "10"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "13"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "15"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "18"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "20"
-msgstr ""
-
#: gui/options.cpp:345 gui/options.cpp:638 gui/options.cpp:776
#: gui/options.cpp:853 gui/options.cpp:1105
msgctxt "soundfont"
@@ -2173,37 +2141,37 @@ msgstr "Seguro que queres saэr?"
msgid "Quit"
msgstr "Saэr"
-#: backends/events/gph/gph-events.cpp:385
-#: backends/events/gph/gph-events.cpp:428
-#: backends/events/openpandora/op-events.cpp:168
+#: backends/events/gph/gph-events.cpp:391
+#: backends/events/gph/gph-events.cpp:434
+#: backends/events/openpandora/op-events.cpp:174
msgid "Touchscreen 'Tap Mode' - Left Click"
msgstr "Modo Pantalla tсctil: premer botѓn primario"
-#: backends/events/gph/gph-events.cpp:387
-#: backends/events/gph/gph-events.cpp:430
-#: backends/events/openpandora/op-events.cpp:170
+#: backends/events/gph/gph-events.cpp:393
+#: backends/events/gph/gph-events.cpp:436
+#: backends/events/openpandora/op-events.cpp:176
msgid "Touchscreen 'Tap Mode' - Right Click"
msgstr "Modo Pantalla tсctil: premer botѓn secundario"
-#: backends/events/gph/gph-events.cpp:389
-#: backends/events/gph/gph-events.cpp:432
-#: backends/events/openpandora/op-events.cpp:172
+#: backends/events/gph/gph-events.cpp:395
+#: backends/events/gph/gph-events.cpp:438
+#: backends/events/openpandora/op-events.cpp:178
msgid "Touchscreen 'Tap Mode' - Hover (No Click)"
msgstr "Modo Pantalla tсctil: apuntar co rato (sen premer)"
-#: backends/events/gph/gph-events.cpp:409
+#: backends/events/gph/gph-events.cpp:415
msgid "Maximum Volume"
msgstr "Volume mсximo"
-#: backends/events/gph/gph-events.cpp:411
+#: backends/events/gph/gph-events.cpp:417
msgid "Increasing Volume"
msgstr "Subindo volume"
-#: backends/events/gph/gph-events.cpp:417
+#: backends/events/gph/gph-events.cpp:423
msgid "Minimal Volume"
msgstr "Volume mэnimo"
-#: backends/events/gph/gph-events.cpp:419
+#: backends/events/gph/gph-events.cpp:425
msgid "Decreasing Volume"
msgstr "Baixando volume"
@@ -2215,41 +2183,41 @@ msgstr "Premer activado"
msgid "Clicking Disabled"
msgstr "Premer desactivado"
-#: backends/events/openpandora/op-events.cpp:174
+#: backends/events/openpandora/op-events.cpp:180
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Modo Pantalla tсctil: apuntar co rato (premer na cruceta)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
msgid "Do you want to quit ?"
msgstr "Queres saэr?"
#. I18N: Trackpad mode toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:308
+#: backends/events/webossdl/webossdl-events.cpp:332
msgid "Trackpad mode is now"
msgstr "O modo Panel tсctil estс"
#. I18N: Trackpad mode on or off.
#. I18N: Auto-drag on or off.
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "ON"
msgstr "ACTIVADO"
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "OFF"
msgstr "DESACTIVADO"
-#: backends/events/webossdl/webossdl-events.cpp:315
+#: backends/events/webossdl/webossdl-events.cpp:339
msgid "Swipe two fingers to the right to toggle."
msgstr "Arrastra dous dedos с dereita para cambiar o estado."
#. I18N: Auto-drag toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:359
msgid "Auto-drag mode is now"
msgstr "O modo Autoarrastrar estс"
-#: backends/events/webossdl/webossdl-events.cpp:342
+#: backends/events/webossdl/webossdl-events.cpp:366
msgid "Swipe three fingers to the right to toggle."
msgstr "Arrastra tres dedos с dereita para cambiar o estado."
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 7c259a0752..040b1c6409 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-03-01 08:17+0100\n"
+"POT-Creation-Date: 2017-03-04 11:50+0100\n"
"PO-Revision-Date: 2017-03-01 04:36+0000\n"
"Last-Translator: George Kormendi <grubycza@hotmail.com>\n"
"Language-Team: Hungarian <https://translations.scummvm.org/projects/scummvm/"
@@ -119,7 +119,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -132,7 +132,7 @@ msgstr "Igen"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -818,38 +818,6 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:127
-msgid "3"
-msgstr "3"
-
-#: gui/options.cpp:127
-msgid "5"
-msgstr "5"
-
-#: gui/options.cpp:127
-msgid "8"
-msgstr "8"
-
-#: gui/options.cpp:127
-msgid "10"
-msgstr "10"
-
-#: gui/options.cpp:127
-msgid "13"
-msgstr "13"
-
-#: gui/options.cpp:127
-msgid "15"
-msgstr "15"
-
-#: gui/options.cpp:127
-msgid "18"
-msgstr "18"
-
-#: gui/options.cpp:127
-msgid "20"
-msgstr "20"
-
#: gui/options.cpp:345 gui/options.cpp:638 gui/options.cpp:776
#: gui/options.cpp:853 gui/options.cpp:1105
msgctxt "soundfont"
@@ -2154,37 +2122,37 @@ msgstr "Biztos hogy ki akarsz lщpni ?"
msgid "Quit"
msgstr "Kilщpщs"
-#: backends/events/gph/gph-events.cpp:385
-#: backends/events/gph/gph-events.cpp:428
-#: backends/events/openpandora/op-events.cpp:168
+#: backends/events/gph/gph-events.cpp:391
+#: backends/events/gph/gph-events.cpp:434
+#: backends/events/openpandora/op-events.cpp:174
msgid "Touchscreen 'Tap Mode' - Left Click"
msgstr "Щrintѕkщpernyѕ 'Tap Mѓd' - Bal katt"
-#: backends/events/gph/gph-events.cpp:387
-#: backends/events/gph/gph-events.cpp:430
-#: backends/events/openpandora/op-events.cpp:170
+#: backends/events/gph/gph-events.cpp:393
+#: backends/events/gph/gph-events.cpp:436
+#: backends/events/openpandora/op-events.cpp:176
msgid "Touchscreen 'Tap Mode' - Right Click"
msgstr "Щrintѕkщpernyѕ 'Tap Mѓd' - Jobb katt"
-#: backends/events/gph/gph-events.cpp:389
-#: backends/events/gph/gph-events.cpp:432
-#: backends/events/openpandora/op-events.cpp:172
+#: backends/events/gph/gph-events.cpp:395
+#: backends/events/gph/gph-events.cpp:438
+#: backends/events/openpandora/op-events.cpp:178
msgid "Touchscreen 'Tap Mode' - Hover (No Click)"
msgstr "Щrintѕkщpernyѕ 'Tap Mѓd' - Lebegѕ (Nincs katt)"
-#: backends/events/gph/gph-events.cpp:409
+#: backends/events/gph/gph-events.cpp:415
msgid "Maximum Volume"
msgstr "Maximum Hangerѕ"
-#: backends/events/gph/gph-events.cpp:411
+#: backends/events/gph/gph-events.cpp:417
msgid "Increasing Volume"
msgstr "Hangerѕ nіvelщse"
-#: backends/events/gph/gph-events.cpp:417
+#: backends/events/gph/gph-events.cpp:423
msgid "Minimal Volume"
msgstr "Minimum Hangerѕ"
-#: backends/events/gph/gph-events.cpp:419
+#: backends/events/gph/gph-events.cpp:425
msgid "Decreasing Volume"
msgstr "Hangerѕ csіkkentщse"
@@ -2196,41 +2164,41 @@ msgstr "Kattintсs engedve"
msgid "Clicking Disabled"
msgstr "Kattintсs tiltva"
-#: backends/events/openpandora/op-events.cpp:174
+#: backends/events/openpandora/op-events.cpp:180
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Щrintѕkщpernyѕ 'Щrintщsmѓd' - Lebegѕ (DPad katt)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
msgid "Do you want to quit ?"
msgstr "Ki akarsz lщpni ?"
#. I18N: Trackpad mode toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:308
+#: backends/events/webossdl/webossdl-events.cpp:332
msgid "Trackpad mode is now"
msgstr "Trackpad mѓd most"
#. I18N: Trackpad mode on or off.
#. I18N: Auto-drag on or off.
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "ON"
msgstr "BE"
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "OFF"
msgstr "KI"
-#: backends/events/webossdl/webossdl-events.cpp:315
+#: backends/events/webossdl/webossdl-events.cpp:339
msgid "Swipe two fingers to the right to toggle."
msgstr "мsd kщt њjjal hogy biztosan vсltson."
#. I18N: Auto-drag toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:359
msgid "Auto-drag mode is now"
msgstr "Auto-hњz mѓdban van"
-#: backends/events/webossdl/webossdl-events.cpp:342
+#: backends/events/webossdl/webossdl-events.cpp:366
msgid "Swipe three fingers to the right to toggle."
msgstr "мsd hсrom њjjal hogy biztosan vсltson."
@@ -4502,6 +4470,30 @@ msgstr ""
"tсmogat. Szќksщged van a motor frissэtett verziѓjсra, hogy hasznсld a "
"mentett jсtщkсllсst."
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "10"
+#~ msgstr "10"
+
+#~ msgid "13"
+#~ msgstr "13"
+
+#~ msgid "15"
+#~ msgstr "15"
+
+#~ msgid "18"
+#~ msgstr "18"
+
+#~ msgid "20"
+#~ msgstr "20"
+
#, fuzzy
#~ msgid "Speed multiplier for mouse emulation"
#~ msgstr "Bal egщrgomb szimulсciѓ"
diff --git a/po/it_IT.po b/po/it_IT.po
index edbcb71618..26c5c8cb93 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.3.0svn\n"
"Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2017-03-01 08:17+0100\n"
-"PO-Revision-Date: 2017-01-06 21:05+0000\n"
+"POT-Creation-Date: 2017-03-04 11:50+0100\n"
+"PO-Revision-Date: 2017-03-03 22:25+0000\n"
"Last-Translator: Walter Agazzi <tag2015@gmail.com>\n"
"Language-Team: Italian <https://translations.scummvm.org/projects/scummvm/"
"scummvm/it/>\n"
@@ -119,7 +119,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -132,7 +132,7 @@ msgstr "Sь"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -826,38 +826,6 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:127
-msgid "3"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "5"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "8"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "10"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "13"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "15"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "18"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "20"
-msgstr ""
-
#: gui/options.cpp:345 gui/options.cpp:638 gui/options.cpp:776
#: gui/options.cpp:853 gui/options.cpp:1105
msgctxt "soundfont"
@@ -886,25 +854,23 @@ msgstr "Impossibile modificare le impostazioni del filtro video"
#: gui/options.cpp:932
msgid "Show On-screen control"
-msgstr ""
+msgstr "Controlli in sovraimpressione"
#: gui/options.cpp:936
-#, fuzzy
msgid "Touchpad mouse mode"
-msgstr "Modalitр touchpad disattivata."
+msgstr "Mouse in modalitр Touchpad"
#: gui/options.cpp:940
msgid "Swap Menu and Back buttons"
-msgstr ""
+msgstr "Inverti i tasti Menu e Indietro"
#: gui/options.cpp:945
-#, fuzzy
msgid "Pointer Speed:"
-msgstr "Velocitр:"
+msgstr "Velocitр Puntatore:"
#: gui/options.cpp:945 gui/options.cpp:947 gui/options.cpp:948
msgid "Speed for keyboard/joystick mouse pointer control"
-msgstr ""
+msgstr "Velocitр puntatore (se controllato con joystick o tastiera)"
#: gui/options.cpp:947
#, fuzzy
@@ -914,16 +880,16 @@ msgstr "Velocitр:"
#: gui/options.cpp:958
msgid "Joy Deadzone:"
-msgstr ""
+msgstr "Deadzone Joystick:"
#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
msgid "Analog joystick Deadzone"
-msgstr ""
+msgstr "Deadzone (zona inerte) per joystick analogici"
#: gui/options.cpp:960
msgctxt "lowres"
msgid "Joy Deadzone:"
-msgstr ""
+msgstr "Deadzone Joy:"
#: gui/options.cpp:977
msgid "Graphics mode:"
@@ -2181,37 +2147,37 @@ msgstr "Sei sicuro di voler uscire?"
msgid "Quit"
msgstr "Esci"
-#: backends/events/gph/gph-events.cpp:385
-#: backends/events/gph/gph-events.cpp:428
-#: backends/events/openpandora/op-events.cpp:168
+#: backends/events/gph/gph-events.cpp:391
+#: backends/events/gph/gph-events.cpp:434
+#: backends/events/openpandora/op-events.cpp:174
msgid "Touchscreen 'Tap Mode' - Left Click"
msgstr "Touchscreen 'Tap Mode' - Clic sinistro"
-#: backends/events/gph/gph-events.cpp:387
-#: backends/events/gph/gph-events.cpp:430
-#: backends/events/openpandora/op-events.cpp:170
+#: backends/events/gph/gph-events.cpp:393
+#: backends/events/gph/gph-events.cpp:436
+#: backends/events/openpandora/op-events.cpp:176
msgid "Touchscreen 'Tap Mode' - Right Click"
msgstr "Touchscreen 'Tap Mode' - Clic destro"
-#: backends/events/gph/gph-events.cpp:389
-#: backends/events/gph/gph-events.cpp:432
-#: backends/events/openpandora/op-events.cpp:172
+#: backends/events/gph/gph-events.cpp:395
+#: backends/events/gph/gph-events.cpp:438
+#: backends/events/openpandora/op-events.cpp:178
msgid "Touchscreen 'Tap Mode' - Hover (No Click)"
msgstr "Touchscreen 'Tap Mode' - Passaggio del cursore (nessun clic)"
-#: backends/events/gph/gph-events.cpp:409
+#: backends/events/gph/gph-events.cpp:415
msgid "Maximum Volume"
msgstr "Volume massimo"
-#: backends/events/gph/gph-events.cpp:411
+#: backends/events/gph/gph-events.cpp:417
msgid "Increasing Volume"
msgstr "Aumento volume"
-#: backends/events/gph/gph-events.cpp:417
+#: backends/events/gph/gph-events.cpp:423
msgid "Minimal Volume"
msgstr "Volume minimo"
-#: backends/events/gph/gph-events.cpp:419
+#: backends/events/gph/gph-events.cpp:425
msgid "Decreasing Volume"
msgstr "Diminuzione volume"
@@ -2223,41 +2189,41 @@ msgstr "Clic attivato"
msgid "Clicking Disabled"
msgstr "Clic disattivato"
-#: backends/events/openpandora/op-events.cpp:174
+#: backends/events/openpandora/op-events.cpp:180
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Touchscreen 'Tap Mode' - Passaggio del cursore (clic DPad)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
msgid "Do you want to quit ?"
msgstr "Sei sicuro di voler uscire?"
#. I18N: Trackpad mode toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:308
+#: backends/events/webossdl/webossdl-events.cpp:332
msgid "Trackpad mode is now"
msgstr "La modalitр touchpad ш ora"
#. I18N: Trackpad mode on or off.
#. I18N: Auto-drag on or off.
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "ON"
msgstr "attiva"
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "OFF"
msgstr "disattivata"
-#: backends/events/webossdl/webossdl-events.cpp:315
+#: backends/events/webossdl/webossdl-events.cpp:339
msgid "Swipe two fingers to the right to toggle."
msgstr "Fai scivolare due dita verso destra per cambiare."
#. I18N: Auto-drag toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:359
msgid "Auto-drag mode is now"
msgstr "La modalitр di autotrascimento ш ora"
-#: backends/events/webossdl/webossdl-events.cpp:342
+#: backends/events/webossdl/webossdl-events.cpp:366
msgid "Swipe three fingers to the right to toggle."
msgstr "Fai scivolare tre dita verso destra per cambiare."
diff --git a/po/nb_NO.po b/po/nb_NO.po
index ee5aca0eb3..fab3891fc8 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-03-01 08:17+0100\n"
+"POT-Creation-Date: 2017-03-04 11:50+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/"
@@ -120,7 +120,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -133,7 +133,7 @@ msgstr "Ja"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -823,38 +823,6 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:127
-msgid "3"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "5"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "8"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "10"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "13"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "15"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "18"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "20"
-msgstr ""
-
#: gui/options.cpp:345 gui/options.cpp:638 gui/options.cpp:776
#: gui/options.cpp:853 gui/options.cpp:1105
msgctxt "soundfont"
@@ -2162,37 +2130,37 @@ msgstr "Vil du virkelig avslutte?"
msgid "Quit"
msgstr "Avslutt"
-#: backends/events/gph/gph-events.cpp:385
-#: backends/events/gph/gph-events.cpp:428
-#: backends/events/openpandora/op-events.cpp:168
+#: backends/events/gph/gph-events.cpp:391
+#: backends/events/gph/gph-events.cpp:434
+#: backends/events/openpandora/op-events.cpp:174
msgid "Touchscreen 'Tap Mode' - Left Click"
msgstr "Touchskjerm 'Tapmodus' - Venstreklikk"
-#: backends/events/gph/gph-events.cpp:387
-#: backends/events/gph/gph-events.cpp:430
-#: backends/events/openpandora/op-events.cpp:170
+#: backends/events/gph/gph-events.cpp:393
+#: backends/events/gph/gph-events.cpp:436
+#: backends/events/openpandora/op-events.cpp:176
msgid "Touchscreen 'Tap Mode' - Right Click"
msgstr "Touchskjerm 'Tapmodus' - Hјyreklikk"
-#: backends/events/gph/gph-events.cpp:389
-#: backends/events/gph/gph-events.cpp:432
-#: backends/events/openpandora/op-events.cpp:172
+#: backends/events/gph/gph-events.cpp:395
+#: backends/events/gph/gph-events.cpp:438
+#: backends/events/openpandora/op-events.cpp:178
msgid "Touchscreen 'Tap Mode' - Hover (No Click)"
msgstr "Touchskjerm 'Tapmodus' - Sveve (Ingen Klikk)"
-#: backends/events/gph/gph-events.cpp:409
+#: backends/events/gph/gph-events.cpp:415
msgid "Maximum Volume"
msgstr "Maksimalt Volum"
-#: backends/events/gph/gph-events.cpp:411
+#: backends/events/gph/gph-events.cpp:417
msgid "Increasing Volume"
msgstr "иker volum"
-#: backends/events/gph/gph-events.cpp:417
+#: backends/events/gph/gph-events.cpp:423
msgid "Minimal Volume"
msgstr "Minimalt Volum"
-#: backends/events/gph/gph-events.cpp:419
+#: backends/events/gph/gph-events.cpp:425
msgid "Decreasing Volume"
msgstr "Senker volum"
@@ -2204,41 +2172,41 @@ msgstr "Klikking aktivert"
msgid "Clicking Disabled"
msgstr "Klikking deaktivert"
-#: backends/events/openpandora/op-events.cpp:174
+#: backends/events/openpandora/op-events.cpp:180
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Touchskjerm 'Tapmodus' - Sveve (DPad Klikk)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
msgid "Do you want to quit ?"
msgstr "Vil du avslutte?"
#. I18N: Trackpad mode toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:308
+#: backends/events/webossdl/webossdl-events.cpp:332
msgid "Trackpad mode is now"
msgstr "Trackpadmodus er nх"
#. I18N: Trackpad mode on or off.
#. I18N: Auto-drag on or off.
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "ON"
msgstr "PХ"
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "OFF"
msgstr "AV"
-#: backends/events/webossdl/webossdl-events.cpp:315
+#: backends/events/webossdl/webossdl-events.cpp:339
msgid "Swipe two fingers to the right to toggle."
msgstr "Sveip to fingre til hјyre for х slх av/pх."
#. I18N: Auto-drag toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:359
msgid "Auto-drag mode is now"
msgstr "Auto-dramodus er nх"
-#: backends/events/webossdl/webossdl-events.cpp:342
+#: backends/events/webossdl/webossdl-events.cpp:366
msgid "Swipe three fingers to the right to toggle."
msgstr "Sveip tre fingre til hјyre for х veksle."
diff --git a/po/nl_NL.po b/po/nl_NL.po
index fe0015b6fd..4d61b002a2 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-03-01 08:17+0100\n"
+"POT-Creation-Date: 2017-03-04 11:50+0100\n"
"PO-Revision-Date: 2017-02-28 19:10+0000\n"
"Last-Translator: Ben Castricum <github@bencastricum.nl>\n"
"Language-Team: Dutch <https://translations.scummvm.org/projects/scummvm/"
@@ -118,7 +118,7 @@ msgstr "Uw verbinding lijkt beperkt. Wilt u echt bestanden ermee downloaden?"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -131,7 +131,7 @@ msgstr "Ja"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -825,38 +825,6 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:127
-msgid "3"
-msgstr "3"
-
-#: gui/options.cpp:127
-msgid "5"
-msgstr "5"
-
-#: gui/options.cpp:127
-msgid "8"
-msgstr "8"
-
-#: gui/options.cpp:127
-msgid "10"
-msgstr "10"
-
-#: gui/options.cpp:127
-msgid "13"
-msgstr "13"
-
-#: gui/options.cpp:127
-msgid "15"
-msgstr "15"
-
-#: gui/options.cpp:127
-msgid "18"
-msgstr "18"
-
-#: gui/options.cpp:127
-msgid "20"
-msgstr "20"
-
#: gui/options.cpp:345 gui/options.cpp:638 gui/options.cpp:776
#: gui/options.cpp:853 gui/options.cpp:1105
msgctxt "soundfont"
@@ -2169,37 +2137,37 @@ msgstr "Wilt u echt stoppen?"
msgid "Quit"
msgstr "Stoppen"
-#: backends/events/gph/gph-events.cpp:385
-#: backends/events/gph/gph-events.cpp:428
-#: backends/events/openpandora/op-events.cpp:168
+#: backends/events/gph/gph-events.cpp:391
+#: backends/events/gph/gph-events.cpp:434
+#: backends/events/openpandora/op-events.cpp:174
msgid "Touchscreen 'Tap Mode' - Left Click"
msgstr "Touchscreen 'Tap Modus' - Linker klik"
-#: backends/events/gph/gph-events.cpp:387
-#: backends/events/gph/gph-events.cpp:430
-#: backends/events/openpandora/op-events.cpp:170
+#: backends/events/gph/gph-events.cpp:393
+#: backends/events/gph/gph-events.cpp:436
+#: backends/events/openpandora/op-events.cpp:176
msgid "Touchscreen 'Tap Mode' - Right Click"
msgstr "Touchscreen 'Tap Modus' - Rechter Klik"
-#: backends/events/gph/gph-events.cpp:389
-#: backends/events/gph/gph-events.cpp:432
-#: backends/events/openpandora/op-events.cpp:172
+#: backends/events/gph/gph-events.cpp:395
+#: backends/events/gph/gph-events.cpp:438
+#: backends/events/openpandora/op-events.cpp:178
msgid "Touchscreen 'Tap Mode' - Hover (No Click)"
msgstr "Touchscreen 'Tap Modus' - Zweven (Geen Klik)"
-#: backends/events/gph/gph-events.cpp:409
+#: backends/events/gph/gph-events.cpp:415
msgid "Maximum Volume"
msgstr "Maximale Volume"
-#: backends/events/gph/gph-events.cpp:411
+#: backends/events/gph/gph-events.cpp:417
msgid "Increasing Volume"
msgstr "Volume omhoog"
-#: backends/events/gph/gph-events.cpp:417
+#: backends/events/gph/gph-events.cpp:423
msgid "Minimal Volume"
msgstr "Minimale Volume"
-#: backends/events/gph/gph-events.cpp:419
+#: backends/events/gph/gph-events.cpp:425
msgid "Decreasing Volume"
msgstr "Volume omlaag"
@@ -2211,41 +2179,41 @@ msgstr "Klikken Aangezet"
msgid "Clicking Disabled"
msgstr "Klikken Uitgeschakeld"
-#: backends/events/openpandora/op-events.cpp:174
+#: backends/events/openpandora/op-events.cpp:180
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Touchscreen 'Tap Modus' - Zweven (DPad Klik)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
msgid "Do you want to quit ?"
msgstr "Wilt u stoppen?"
#. I18N: Trackpad mode toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:308
+#: backends/events/webossdl/webossdl-events.cpp:332
msgid "Trackpad mode is now"
msgstr "Trackpadmodus is nu"
#. I18N: Trackpad mode on or off.
#. I18N: Auto-drag on or off.
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "ON"
msgstr "AAN"
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "OFF"
msgstr "UIT"
-#: backends/events/webossdl/webossdl-events.cpp:315
+#: backends/events/webossdl/webossdl-events.cpp:339
msgid "Swipe two fingers to the right to toggle."
msgstr "Swipe twee vingers naar rechts om te schakelen."
#. I18N: Auto-drag toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:359
msgid "Auto-drag mode is now"
msgstr "Auto-sleep modus is nu"
-#: backends/events/webossdl/webossdl-events.cpp:342
+#: backends/events/webossdl/webossdl-events.cpp:366
msgid "Swipe three fingers to the right to toggle."
msgstr "Swipe drie vingers naar rechts om te schakelen."
@@ -4540,6 +4508,30 @@ msgstr ""
"tot versie %d. U heeft een nieuwere versie van deze engine nodig om dit "
"opgeslagen te gebruiken."
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "10"
+#~ msgstr "10"
+
+#~ msgid "13"
+#~ msgstr "13"
+
+#~ msgid "15"
+#~ msgstr "15"
+
+#~ msgid "18"
+#~ msgstr "18"
+
+#~ msgid "20"
+#~ msgstr "20"
+
#~ msgid "Speed multiplier for mouse emulation"
#~ msgstr "Snelheidsfactor voor muis emulatie"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index fa1e752c6a..e0820aca6e 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-03-01 08:17+0100\n"
+"POT-Creation-Date: 2017-03-04 11:50+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/"
@@ -119,7 +119,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -132,7 +132,7 @@ msgstr "Ja"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -814,38 +814,6 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:127
-msgid "3"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "5"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "8"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "10"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "13"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "15"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "18"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "20"
-msgstr ""
-
#: gui/options.cpp:345 gui/options.cpp:638 gui/options.cpp:776
#: gui/options.cpp:853 gui/options.cpp:1105
msgctxt "soundfont"
@@ -2155,37 +2123,37 @@ msgstr "Vil du verkeleg avslutte?"
msgid "Quit"
msgstr "Avslutt"
-#: backends/events/gph/gph-events.cpp:385
-#: backends/events/gph/gph-events.cpp:428
-#: backends/events/openpandora/op-events.cpp:168
+#: backends/events/gph/gph-events.cpp:391
+#: backends/events/gph/gph-events.cpp:434
+#: backends/events/openpandora/op-events.cpp:174
msgid "Touchscreen 'Tap Mode' - Left Click"
msgstr "Touchscreen 'Tap Mode' - Venstreklikk"
-#: backends/events/gph/gph-events.cpp:387
-#: backends/events/gph/gph-events.cpp:430
-#: backends/events/openpandora/op-events.cpp:170
+#: backends/events/gph/gph-events.cpp:393
+#: backends/events/gph/gph-events.cpp:436
+#: backends/events/openpandora/op-events.cpp:176
msgid "Touchscreen 'Tap Mode' - Right Click"
msgstr "Touchscreen 'Tap Mode' - Hјgreklikk"
-#: backends/events/gph/gph-events.cpp:389
-#: backends/events/gph/gph-events.cpp:432
-#: backends/events/openpandora/op-events.cpp:172
+#: backends/events/gph/gph-events.cpp:395
+#: backends/events/gph/gph-events.cpp:438
+#: backends/events/openpandora/op-events.cpp:178
msgid "Touchscreen 'Tap Mode' - Hover (No Click)"
msgstr ""
-#: backends/events/gph/gph-events.cpp:409
+#: backends/events/gph/gph-events.cpp:415
msgid "Maximum Volume"
msgstr "Maks Volum"
-#: backends/events/gph/gph-events.cpp:411
+#: backends/events/gph/gph-events.cpp:417
msgid "Increasing Volume"
msgstr "Auker Volum"
-#: backends/events/gph/gph-events.cpp:417
+#: backends/events/gph/gph-events.cpp:423
msgid "Minimal Volume"
msgstr "Minste Volum"
-#: backends/events/gph/gph-events.cpp:419
+#: backends/events/gph/gph-events.cpp:425
msgid "Decreasing Volume"
msgstr "Senkar Volum"
@@ -2197,41 +2165,41 @@ msgstr "Klikking aktivert"
msgid "Clicking Disabled"
msgstr "Klikking Deaktivert"
-#: backends/events/openpandora/op-events.cpp:174
+#: backends/events/openpandora/op-events.cpp:180
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr ""
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
msgid "Do you want to quit ?"
msgstr "Vil du avslutte?"
#. I18N: Trackpad mode toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:308
+#: backends/events/webossdl/webossdl-events.cpp:332
msgid "Trackpad mode is now"
msgstr "Trackpadmodus er no"
#. I18N: Trackpad mode on or off.
#. I18N: Auto-drag on or off.
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "ON"
msgstr "PХ"
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "OFF"
msgstr "AV"
-#: backends/events/webossdl/webossdl-events.cpp:315
+#: backends/events/webossdl/webossdl-events.cpp:339
msgid "Swipe two fingers to the right to toggle."
msgstr ""
#. I18N: Auto-drag toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:359
msgid "Auto-drag mode is now"
msgstr ""
-#: backends/events/webossdl/webossdl-events.cpp:342
+#: backends/events/webossdl/webossdl-events.cpp:366
msgid "Swipe three fingers to the right to toggle."
msgstr "Sveip tre fingre til hјgre for х veksle."
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 7648d95038..c61ec68070 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-03-01 08:17+0100\n"
+"POT-Creation-Date: 2017-03-04 11:50+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/"
@@ -124,7 +124,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -137,7 +137,7 @@ msgstr "Tak"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -821,38 +821,6 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:127
-msgid "3"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "5"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "8"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "10"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "13"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "15"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "18"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "20"
-msgstr ""
-
#: gui/options.cpp:345 gui/options.cpp:638 gui/options.cpp:776
#: gui/options.cpp:853 gui/options.cpp:1105
msgctxt "soundfont"
@@ -2164,37 +2132,37 @@ msgstr "Na pewno chcesz wyjЖц?"
msgid "Quit"
msgstr "Zakoёcz"
-#: backends/events/gph/gph-events.cpp:385
-#: backends/events/gph/gph-events.cpp:428
-#: backends/events/openpandora/op-events.cpp:168
+#: backends/events/gph/gph-events.cpp:391
+#: backends/events/gph/gph-events.cpp:434
+#: backends/events/openpandora/op-events.cpp:174
msgid "Touchscreen 'Tap Mode' - Left Click"
msgstr "Dotkniъcie ekranu - klikniъcie LPM"
-#: backends/events/gph/gph-events.cpp:387
-#: backends/events/gph/gph-events.cpp:430
-#: backends/events/openpandora/op-events.cpp:170
+#: backends/events/gph/gph-events.cpp:393
+#: backends/events/gph/gph-events.cpp:436
+#: backends/events/openpandora/op-events.cpp:176
msgid "Touchscreen 'Tap Mode' - Right Click"
msgstr "Dotkniъcie ekranu - klikniъcie PPM"
-#: backends/events/gph/gph-events.cpp:389
-#: backends/events/gph/gph-events.cpp:432
-#: backends/events/openpandora/op-events.cpp:172
+#: backends/events/gph/gph-events.cpp:395
+#: backends/events/gph/gph-events.cpp:438
+#: backends/events/openpandora/op-events.cpp:178
msgid "Touchscreen 'Tap Mode' - Hover (No Click)"
msgstr "Dotkniъcie ekranu - przytrzymanie (brak klikniъcia)"
-#: backends/events/gph/gph-events.cpp:409
+#: backends/events/gph/gph-events.cpp:415
msgid "Maximum Volume"
msgstr "Maksymalna gГoЖnoЖц"
-#: backends/events/gph/gph-events.cpp:411
+#: backends/events/gph/gph-events.cpp:417
msgid "Increasing Volume"
msgstr "Zwiъkszenie gГoЖnoЖci"
-#: backends/events/gph/gph-events.cpp:417
+#: backends/events/gph/gph-events.cpp:423
msgid "Minimal Volume"
msgstr "Minimalna gГoЖnoЖц"
-#: backends/events/gph/gph-events.cpp:419
+#: backends/events/gph/gph-events.cpp:425
msgid "Decreasing Volume"
msgstr "Zmniejszenie gГoЖnoЖci"
@@ -2206,41 +2174,41 @@ msgstr "Klikanie wГБczone"
msgid "Clicking Disabled"
msgstr "Klikanie wyГБczone"
-#: backends/events/openpandora/op-events.cpp:174
+#: backends/events/openpandora/op-events.cpp:180
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Dotkniъcie ekranu - przytrzymanie (krzyПak klika)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
msgid "Do you want to quit ?"
msgstr "Chcesz wyjЖц?"
#. I18N: Trackpad mode toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:308
+#: backends/events/webossdl/webossdl-events.cpp:332
msgid "Trackpad mode is now"
msgstr "Tryb gГadzika jest"
#. I18N: Trackpad mode on or off.
#. I18N: Auto-drag on or off.
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "ON"
msgstr "wГБczony"
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "OFF"
msgstr "wyГБczony"
-#: backends/events/webossdl/webossdl-events.cpp:315
+#: backends/events/webossdl/webossdl-events.cpp:339
msgid "Swipe two fingers to the right to toggle."
msgstr "Przesuё dwoma palcami, Пeby zmieniц."
#. I18N: Auto-drag toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:359
msgid "Auto-drag mode is now"
msgstr "Tryb automatycznego przeciБgania jest"
-#: backends/events/webossdl/webossdl-events.cpp:342
+#: backends/events/webossdl/webossdl-events.cpp:366
msgid "Swipe three fingers to the right to toggle."
msgstr "Przesuё trzema palcami, Пeby zmieniц."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 668d524b63..d39ed89557 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.3.0svn\n"
"Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2017-03-01 08:17+0100\n"
-"PO-Revision-Date: 2016-12-22 21:50+0000\n"
-"Last-Translator: Alexandre Folle de Menezes <afmenez@terra.com.br>\n"
+"POT-Creation-Date: 2017-03-04 11:50+0100\n"
+"PO-Revision-Date: 2017-03-03 22:26+0000\n"
+"Last-Translator: rafaelmessias <rmmartins@gmail.com>\n"
"Language-Team: Portuguese (Brazil) <https://translations.scummvm.org/"
"projects/scummvm/scummvm/pt_BR/>\n"
"Language: pt_BR\n"
@@ -99,12 +99,12 @@ msgstr "Para: "
#: gui/downloaddialog.cpp:63
msgid "Cancel download"
-msgstr ""
+msgstr "Cancelar download"
#: gui/downloaddialog.cpp:65
msgctxt "lowres"
msgid "Cancel download"
-msgstr ""
+msgstr "Cancelar download"
#: gui/downloaddialog.cpp:67
msgid "Hide"
@@ -121,7 +121,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -134,7 +134,7 @@ msgstr "Sim"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -190,9 +190,9 @@ msgid "Downloaded %s %s / %s %s"
msgstr "Baixado %s %s / %s %s"
#: gui/downloaddialog.cpp:258
-#, fuzzy, c-format
+#, c-format
msgid "Download speed: %s %s"
-msgstr "Busca completa!"
+msgstr "Velocidade de download: %s %s"
#: gui/editgamedialog.cpp:132
msgid "Game"
@@ -261,9 +261,8 @@ msgid "Platform:"
msgstr "Sistema:"
#: gui/editgamedialog.cpp:176
-#, fuzzy
msgid "Engine"
-msgstr "Examinar"
+msgstr "Engine"
#: gui/editgamedialog.cpp:184 gui/options.cpp:1336 gui/options.cpp:1421
msgid "Graphics"
@@ -833,38 +832,6 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:127
-msgid "3"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "5"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "8"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "10"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "13"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "15"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "18"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "20"
-msgstr ""
-
#: gui/options.cpp:345 gui/options.cpp:638 gui/options.cpp:776
#: gui/options.cpp:853 gui/options.cpp:1105
msgctxt "soundfont"
@@ -2200,37 +2167,37 @@ msgstr "Vocъ realmente deseja sair?"
msgid "Quit"
msgstr "Sair"
-#: backends/events/gph/gph-events.cpp:385
-#: backends/events/gph/gph-events.cpp:428
-#: backends/events/openpandora/op-events.cpp:168
+#: backends/events/gph/gph-events.cpp:391
+#: backends/events/gph/gph-events.cpp:434
+#: backends/events/openpandora/op-events.cpp:174
msgid "Touchscreen 'Tap Mode' - Left Click"
msgstr "Touchscreen 'Modo Toque' - Clique Esquerdo"
-#: backends/events/gph/gph-events.cpp:387
-#: backends/events/gph/gph-events.cpp:430
-#: backends/events/openpandora/op-events.cpp:170
+#: backends/events/gph/gph-events.cpp:393
+#: backends/events/gph/gph-events.cpp:436
+#: backends/events/openpandora/op-events.cpp:176
msgid "Touchscreen 'Tap Mode' - Right Click"
msgstr "Touchscreen 'Modo Toque' - Clique Direito"
-#: backends/events/gph/gph-events.cpp:389
-#: backends/events/gph/gph-events.cpp:432
-#: backends/events/openpandora/op-events.cpp:172
+#: backends/events/gph/gph-events.cpp:395
+#: backends/events/gph/gph-events.cpp:438
+#: backends/events/openpandora/op-events.cpp:178
msgid "Touchscreen 'Tap Mode' - Hover (No Click)"
msgstr "Touchscreen 'Modo Toque' - Acima (Sem Clicar)"
-#: backends/events/gph/gph-events.cpp:409
+#: backends/events/gph/gph-events.cpp:415
msgid "Maximum Volume"
msgstr "Volume mсximo"
-#: backends/events/gph/gph-events.cpp:411
+#: backends/events/gph/gph-events.cpp:417
msgid "Increasing Volume"
msgstr "Aumentando Volume"
-#: backends/events/gph/gph-events.cpp:417
+#: backends/events/gph/gph-events.cpp:423
msgid "Minimal Volume"
msgstr "Volume mэnimo"
-#: backends/events/gph/gph-events.cpp:419
+#: backends/events/gph/gph-events.cpp:425
msgid "Decreasing Volume"
msgstr "Diminuindo Volume"
@@ -2242,43 +2209,43 @@ msgstr "Clicando Habilitado"
msgid "Clicking Disabled"
msgstr "Clicando Desabilitado"
-#: backends/events/openpandora/op-events.cpp:174
+#: backends/events/openpandora/op-events.cpp:180
#, fuzzy
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Touchscreen 'Modo Toque' - Acima (Sem Clicar)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
msgid "Do you want to quit ?"
msgstr "Vocъ deseja sair ?"
#. I18N: Trackpad mode toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:308
+#: backends/events/webossdl/webossdl-events.cpp:332
#, fuzzy
msgid "Trackpad mode is now"
msgstr "Modo Touchpad desligado."
#. I18N: Trackpad mode on or off.
#. I18N: Auto-drag on or off.
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "ON"
msgstr ""
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "OFF"
msgstr ""
-#: backends/events/webossdl/webossdl-events.cpp:315
+#: backends/events/webossdl/webossdl-events.cpp:339
msgid "Swipe two fingers to the right to toggle."
msgstr ""
#. I18N: Auto-drag toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:359
msgid "Auto-drag mode is now"
msgstr ""
-#: backends/events/webossdl/webossdl-events.cpp:342
+#: backends/events/webossdl/webossdl-events.cpp:366
msgid "Swipe three fingers to the right to toggle."
msgstr ""
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 3a8d84fa8f..e19be9be79 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-03-01 08:17+0100\n"
+"POT-Creation-Date: 2017-03-04 11:50+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/"
@@ -119,7 +119,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -132,7 +132,7 @@ msgstr "Sim"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -833,38 +833,6 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:127
-msgid "3"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "5"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "8"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "10"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "13"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "15"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "18"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "20"
-msgstr ""
-
#: gui/options.cpp:345 gui/options.cpp:638 gui/options.cpp:776
#: gui/options.cpp:853 gui/options.cpp:1105
msgctxt "soundfont"
@@ -2119,37 +2087,37 @@ msgstr ""
msgid "Quit"
msgstr ""
-#: backends/events/gph/gph-events.cpp:385
-#: backends/events/gph/gph-events.cpp:428
-#: backends/events/openpandora/op-events.cpp:168
+#: backends/events/gph/gph-events.cpp:391
+#: backends/events/gph/gph-events.cpp:434
+#: backends/events/openpandora/op-events.cpp:174
msgid "Touchscreen 'Tap Mode' - Left Click"
msgstr ""
-#: backends/events/gph/gph-events.cpp:387
-#: backends/events/gph/gph-events.cpp:430
-#: backends/events/openpandora/op-events.cpp:170
+#: backends/events/gph/gph-events.cpp:393
+#: backends/events/gph/gph-events.cpp:436
+#: backends/events/openpandora/op-events.cpp:176
msgid "Touchscreen 'Tap Mode' - Right Click"
msgstr ""
-#: backends/events/gph/gph-events.cpp:389
-#: backends/events/gph/gph-events.cpp:432
-#: backends/events/openpandora/op-events.cpp:172
+#: backends/events/gph/gph-events.cpp:395
+#: backends/events/gph/gph-events.cpp:438
+#: backends/events/openpandora/op-events.cpp:178
msgid "Touchscreen 'Tap Mode' - Hover (No Click)"
msgstr ""
-#: backends/events/gph/gph-events.cpp:409
+#: backends/events/gph/gph-events.cpp:415
msgid "Maximum Volume"
msgstr ""
-#: backends/events/gph/gph-events.cpp:411
+#: backends/events/gph/gph-events.cpp:417
msgid "Increasing Volume"
msgstr ""
-#: backends/events/gph/gph-events.cpp:417
+#: backends/events/gph/gph-events.cpp:423
msgid "Minimal Volume"
msgstr ""
-#: backends/events/gph/gph-events.cpp:419
+#: backends/events/gph/gph-events.cpp:425
msgid "Decreasing Volume"
msgstr ""
@@ -2161,41 +2129,41 @@ msgstr ""
msgid "Clicking Disabled"
msgstr ""
-#: backends/events/openpandora/op-events.cpp:174
+#: backends/events/openpandora/op-events.cpp:180
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr ""
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
msgid "Do you want to quit ?"
msgstr ""
#. I18N: Trackpad mode toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:308
+#: backends/events/webossdl/webossdl-events.cpp:332
msgid "Trackpad mode is now"
msgstr ""
#. I18N: Trackpad mode on or off.
#. I18N: Auto-drag on or off.
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "ON"
msgstr ""
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "OFF"
msgstr ""
-#: backends/events/webossdl/webossdl-events.cpp:315
+#: backends/events/webossdl/webossdl-events.cpp:339
msgid "Swipe two fingers to the right to toggle."
msgstr ""
#. I18N: Auto-drag toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:359
msgid "Auto-drag mode is now"
msgstr ""
-#: backends/events/webossdl/webossdl-events.cpp:342
+#: backends/events/webossdl/webossdl-events.cpp:366
msgid "Swipe three fingers to the right to toggle."
msgstr ""
diff --git a/po/ru_RU.po b/po/ru_RU.po
index e8c76b4adc..ca8048ce29 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.8.0svn\n"
"Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2017-03-01 08:17+0100\n"
-"PO-Revision-Date: 2017-02-22 19:56+0000\n"
+"POT-Creation-Date: 2017-03-04 11:50+0100\n"
+"PO-Revision-Date: 2017-03-04 10:33+0000\n"
"Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n"
"Language-Team: Russian <https://translations.scummvm.org/projects/scummvm/"
"scummvm/ru/>\n"
@@ -120,7 +120,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -133,7 +133,7 @@ msgstr "Да"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -823,38 +823,6 @@ msgstr "44 кГц"
msgid "48 kHz"
msgstr "48 кГц"
-#: gui/options.cpp:127
-msgid "3"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "5"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "8"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "10"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "13"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "15"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "18"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "20"
-msgstr ""
-
#: gui/options.cpp:345 gui/options.cpp:638 gui/options.cpp:776
#: gui/options.cpp:853 gui/options.cpp:1105
msgctxt "soundfont"
@@ -894,32 +862,30 @@ msgid "Swap Menu and Back buttons"
msgstr "Поменять местами кнопки Меню и Назад"
#: gui/options.cpp:945
-#, fuzzy
msgid "Pointer Speed:"
-msgstr "Скорость:"
+msgstr "Скорость указателя:"
#: gui/options.cpp:945 gui/options.cpp:947 gui/options.cpp:948
msgid "Speed for keyboard/joystick mouse pointer control"
-msgstr ""
+msgstr "Скорость для клавиш эмуляции мыши на клавиатуре/джойстике"
#: gui/options.cpp:947
-#, fuzzy
msgctxt "lowres"
msgid "Pointer Speed:"
-msgstr "Скорость:"
+msgstr "Скорость указателя:"
#: gui/options.cpp:958
msgid "Joy Deadzone:"
-msgstr ""
+msgstr "Мёртвая зона джойстика:"
#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
msgid "Analog joystick Deadzone"
-msgstr ""
+msgstr "Мёртвая зона аналогового джойстика"
#: gui/options.cpp:960
msgctxt "lowres"
msgid "Joy Deadzone:"
-msgstr ""
+msgstr "Мёртвая зона джойстика:"
#: gui/options.cpp:977
msgid "Graphics mode:"
@@ -2172,37 +2138,37 @@ msgstr "Вы действительно хотите выйти?"
msgid "Quit"
msgstr "Выход"
-#: backends/events/gph/gph-events.cpp:385
-#: backends/events/gph/gph-events.cpp:428
-#: backends/events/openpandora/op-events.cpp:168
+#: backends/events/gph/gph-events.cpp:391
+#: backends/events/gph/gph-events.cpp:434
+#: backends/events/openpandora/op-events.cpp:174
msgid "Touchscreen 'Tap Mode' - Left Click"
msgstr "Режим 'касаний' тачскрина - Левый клик"
-#: backends/events/gph/gph-events.cpp:387
-#: backends/events/gph/gph-events.cpp:430
-#: backends/events/openpandora/op-events.cpp:170
+#: backends/events/gph/gph-events.cpp:393
+#: backends/events/gph/gph-events.cpp:436
+#: backends/events/openpandora/op-events.cpp:176
msgid "Touchscreen 'Tap Mode' - Right Click"
msgstr "Режим 'касаний' тачскрина - Правый клик"
-#: backends/events/gph/gph-events.cpp:389
-#: backends/events/gph/gph-events.cpp:432
-#: backends/events/openpandora/op-events.cpp:172
+#: backends/events/gph/gph-events.cpp:395
+#: backends/events/gph/gph-events.cpp:438
+#: backends/events/openpandora/op-events.cpp:178
msgid "Touchscreen 'Tap Mode' - Hover (No Click)"
msgstr "Режим 'касаний' тачскрина - Пролёт (без клика)"
-#: backends/events/gph/gph-events.cpp:409
+#: backends/events/gph/gph-events.cpp:415
msgid "Maximum Volume"
msgstr "Максимальная громкость"
-#: backends/events/gph/gph-events.cpp:411
+#: backends/events/gph/gph-events.cpp:417
msgid "Increasing Volume"
msgstr "Увеличение громкости"
-#: backends/events/gph/gph-events.cpp:417
+#: backends/events/gph/gph-events.cpp:423
msgid "Minimal Volume"
msgstr "Минимальная громкость"
-#: backends/events/gph/gph-events.cpp:419
+#: backends/events/gph/gph-events.cpp:425
msgid "Decreasing Volume"
msgstr "Уменьшение громкости"
@@ -2214,41 +2180,41 @@ msgstr "Щелчки включены"
msgid "Clicking Disabled"
msgstr "Щелчки выключены"
-#: backends/events/openpandora/op-events.cpp:174
+#: backends/events/openpandora/op-events.cpp:180
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Режим 'касаний' тачскрина - Пролёт (клики DPad)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
msgid "Do you want to quit ?"
msgstr "Вы действительно хотите выйти?"
#. I18N: Trackpad mode toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:308
+#: backends/events/webossdl/webossdl-events.cpp:332
msgid "Trackpad mode is now"
msgstr "Режим трекпада сейчас"
#. I18N: Trackpad mode on or off.
#. I18N: Auto-drag on or off.
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "ON"
msgstr "ВКЛ"
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "OFF"
msgstr "ВЫКЛ"
-#: backends/events/webossdl/webossdl-events.cpp:315
+#: backends/events/webossdl/webossdl-events.cpp:339
msgid "Swipe two fingers to the right to toggle."
msgstr "Проведите двумя пальцами направо для переключения."
#. I18N: Auto-drag toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:359
msgid "Auto-drag mode is now"
msgstr "Режим автодрэга сейчас"
-#: backends/events/webossdl/webossdl-events.cpp:342
+#: backends/events/webossdl/webossdl-events.cpp:366
msgid "Swipe three fingers to the right to toggle."
msgstr "Проведите тремя пальцами направо для переключения."
diff --git a/po/scummvm.pot b/po/scummvm.pot
index 9da2e9ff71..5235b9f9a6 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-03-01 08:17+0100\n"
+"POT-Creation-Date: 2017-03-04 11:50+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"
@@ -114,7 +114,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -127,7 +127,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -801,38 +801,6 @@ msgstr ""
msgid "48 kHz"
msgstr ""
-#: gui/options.cpp:127
-msgid "3"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "5"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "8"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "10"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "13"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "15"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "18"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "20"
-msgstr ""
-
#: gui/options.cpp:345 gui/options.cpp:638 gui/options.cpp:776
#: gui/options.cpp:853 gui/options.cpp:1105
msgctxt "soundfont"
@@ -2085,37 +2053,37 @@ msgstr ""
msgid "Quit"
msgstr ""
-#: backends/events/gph/gph-events.cpp:385
-#: backends/events/gph/gph-events.cpp:428
-#: backends/events/openpandora/op-events.cpp:168
+#: backends/events/gph/gph-events.cpp:391
+#: backends/events/gph/gph-events.cpp:434
+#: backends/events/openpandora/op-events.cpp:174
msgid "Touchscreen 'Tap Mode' - Left Click"
msgstr ""
-#: backends/events/gph/gph-events.cpp:387
-#: backends/events/gph/gph-events.cpp:430
-#: backends/events/openpandora/op-events.cpp:170
+#: backends/events/gph/gph-events.cpp:393
+#: backends/events/gph/gph-events.cpp:436
+#: backends/events/openpandora/op-events.cpp:176
msgid "Touchscreen 'Tap Mode' - Right Click"
msgstr ""
-#: backends/events/gph/gph-events.cpp:389
-#: backends/events/gph/gph-events.cpp:432
-#: backends/events/openpandora/op-events.cpp:172
+#: backends/events/gph/gph-events.cpp:395
+#: backends/events/gph/gph-events.cpp:438
+#: backends/events/openpandora/op-events.cpp:178
msgid "Touchscreen 'Tap Mode' - Hover (No Click)"
msgstr ""
-#: backends/events/gph/gph-events.cpp:409
+#: backends/events/gph/gph-events.cpp:415
msgid "Maximum Volume"
msgstr ""
-#: backends/events/gph/gph-events.cpp:411
+#: backends/events/gph/gph-events.cpp:417
msgid "Increasing Volume"
msgstr ""
-#: backends/events/gph/gph-events.cpp:417
+#: backends/events/gph/gph-events.cpp:423
msgid "Minimal Volume"
msgstr ""
-#: backends/events/gph/gph-events.cpp:419
+#: backends/events/gph/gph-events.cpp:425
msgid "Decreasing Volume"
msgstr ""
@@ -2127,41 +2095,41 @@ msgstr ""
msgid "Clicking Disabled"
msgstr ""
-#: backends/events/openpandora/op-events.cpp:174
+#: backends/events/openpandora/op-events.cpp:180
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr ""
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
msgid "Do you want to quit ?"
msgstr ""
#. I18N: Trackpad mode toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:308
+#: backends/events/webossdl/webossdl-events.cpp:332
msgid "Trackpad mode is now"
msgstr ""
#. I18N: Trackpad mode on or off.
#. I18N: Auto-drag on or off.
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "ON"
msgstr ""
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "OFF"
msgstr ""
-#: backends/events/webossdl/webossdl-events.cpp:315
+#: backends/events/webossdl/webossdl-events.cpp:339
msgid "Swipe two fingers to the right to toggle."
msgstr ""
#. I18N: Auto-drag toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:359
msgid "Auto-drag mode is now"
msgstr ""
-#: backends/events/webossdl/webossdl-events.cpp:342
+#: backends/events/webossdl/webossdl-events.cpp:366
msgid "Swipe three fingers to the right to toggle."
msgstr ""
diff --git a/po/sv_SE.po b/po/sv_SE.po
index a76bab222e..8de42b54e9 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-03-01 08:17+0100\n"
+"POT-Creation-Date: 2017-03-04 11:50+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/"
@@ -120,7 +120,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -133,7 +133,7 @@ msgstr "Ja"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -824,38 +824,6 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:127
-msgid "3"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "5"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "8"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "10"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "13"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "15"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "18"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "20"
-msgstr ""
-
#: gui/options.cpp:345 gui/options.cpp:638 gui/options.cpp:776
#: gui/options.cpp:853 gui/options.cpp:1105
msgctxt "soundfont"
@@ -2169,37 +2137,37 @@ msgstr "Vill du verkligen avsluta?"
msgid "Quit"
msgstr "Avsluta"
-#: backends/events/gph/gph-events.cpp:385
-#: backends/events/gph/gph-events.cpp:428
-#: backends/events/openpandora/op-events.cpp:168
+#: backends/events/gph/gph-events.cpp:391
+#: backends/events/gph/gph-events.cpp:434
+#: backends/events/openpandora/op-events.cpp:174
msgid "Touchscreen 'Tap Mode' - Left Click"
msgstr "Touchscreen \"Tap-lфge\" - Vфnsterklick"
-#: backends/events/gph/gph-events.cpp:387
-#: backends/events/gph/gph-events.cpp:430
-#: backends/events/openpandora/op-events.cpp:170
+#: backends/events/gph/gph-events.cpp:393
+#: backends/events/gph/gph-events.cpp:436
+#: backends/events/openpandora/op-events.cpp:176
msgid "Touchscreen 'Tap Mode' - Right Click"
msgstr "Touchscren \"Tap-lфge\" - Hіgerklick"
-#: backends/events/gph/gph-events.cpp:389
-#: backends/events/gph/gph-events.cpp:432
-#: backends/events/openpandora/op-events.cpp:172
+#: backends/events/gph/gph-events.cpp:395
+#: backends/events/gph/gph-events.cpp:438
+#: backends/events/openpandora/op-events.cpp:178
msgid "Touchscreen 'Tap Mode' - Hover (No Click)"
msgstr "Touchscreen \"Tap-lфge\" - Hover (utan klick)"
-#: backends/events/gph/gph-events.cpp:409
+#: backends/events/gph/gph-events.cpp:415
msgid "Maximum Volume"
msgstr "Max. volym"
-#: backends/events/gph/gph-events.cpp:411
+#: backends/events/gph/gph-events.cpp:417
msgid "Increasing Volume"
msgstr "Hіja volymen"
-#: backends/events/gph/gph-events.cpp:417
+#: backends/events/gph/gph-events.cpp:423
msgid "Minimal Volume"
msgstr "Min. volym"
-#: backends/events/gph/gph-events.cpp:419
+#: backends/events/gph/gph-events.cpp:425
msgid "Decreasing Volume"
msgstr "Sфnka volymen"
@@ -2211,41 +2179,41 @@ msgstr "Klickning aktiverad"
msgid "Clicking Disabled"
msgstr "Klickning deaktiverad"
-#: backends/events/openpandora/op-events.cpp:174
+#: backends/events/openpandora/op-events.cpp:180
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Touchscreen 'Tap-lфge' - Hover (DPad klick)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
msgid "Do you want to quit ?"
msgstr "Vill du avsluta?"
#. I18N: Trackpad mode toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:308
+#: backends/events/webossdl/webossdl-events.cpp:332
msgid "Trackpad mode is now"
msgstr "Trackpad-lфge"
#. I18N: Trackpad mode on or off.
#. I18N: Auto-drag on or off.
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "ON"
msgstr "PХ"
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "OFF"
msgstr "AV"
-#: backends/events/webossdl/webossdl-events.cpp:315
+#: backends/events/webossdl/webossdl-events.cpp:339
msgid "Swipe two fingers to the right to toggle."
msgstr "Svep хt hіger med tvх fingrar fіr att byta lфge."
#. I18N: Auto-drag toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:359
msgid "Auto-drag mode is now"
msgstr "Automatiskt draglфge"
-#: backends/events/webossdl/webossdl-events.cpp:342
+#: backends/events/webossdl/webossdl-events.cpp:366
msgid "Swipe three fingers to the right to toggle."
msgstr "Svep хt hіger med tre fingrar fіr att byta lфge."
diff --git a/po/uk_UA.po b/po/uk_UA.po
index cdbe8bbc98..38aaa696bd 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.9.0git\n"
"Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
-"POT-Creation-Date: 2017-03-01 08:17+0100\n"
-"PO-Revision-Date: 2017-02-22 19:54+0000\n"
+"POT-Creation-Date: 2017-03-04 11:50+0100\n"
+"PO-Revision-Date: 2017-03-04 10:29+0000\n"
"Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n"
"Language-Team: Ukrainian <https://translations.scummvm.org/projects/scummvm/"
"scummvm/uk/>\n"
@@ -121,7 +121,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -134,7 +134,7 @@ msgstr "Так"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -823,38 +823,6 @@ msgstr "44 кГц"
msgid "48 kHz"
msgstr "48 кГц"
-#: gui/options.cpp:127
-msgid "3"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "5"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "8"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "10"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "13"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "15"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "18"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "20"
-msgstr ""
-
#: gui/options.cpp:345 gui/options.cpp:638 gui/options.cpp:776
#: gui/options.cpp:853 gui/options.cpp:1105
msgctxt "soundfont"
@@ -894,32 +862,30 @@ msgid "Swap Menu and Back buttons"
msgstr "Поміняти місцями кнопки Меню і Назад"
#: gui/options.cpp:945
-#, fuzzy
msgid "Pointer Speed:"
-msgstr "Швидкість:"
+msgstr "Швидкість вказівника:"
#: gui/options.cpp:945 gui/options.cpp:947 gui/options.cpp:948
msgid "Speed for keyboard/joystick mouse pointer control"
-msgstr ""
+msgstr "Управління швидкістю вказівника миші/джойстика"
#: gui/options.cpp:947
-#, fuzzy
msgctxt "lowres"
msgid "Pointer Speed:"
-msgstr "Швидкість:"
+msgstr "Швидкість вказівника:"
#: gui/options.cpp:958
msgid "Joy Deadzone:"
-msgstr ""
+msgstr "Мертва зона джойстика:"
#: gui/options.cpp:958 gui/options.cpp:960 gui/options.cpp:961
msgid "Analog joystick Deadzone"
-msgstr ""
+msgstr "Мертва зона аналогового джойстика"
#: gui/options.cpp:960
msgctxt "lowres"
msgid "Joy Deadzone:"
-msgstr ""
+msgstr "Мертва зона джойстика:"
#: gui/options.cpp:977
msgid "Graphics mode:"
@@ -2170,37 +2136,37 @@ msgstr "Ви дійсно хочете вийти?"
msgid "Quit"
msgstr "Вихід"
-#: backends/events/gph/gph-events.cpp:385
-#: backends/events/gph/gph-events.cpp:428
-#: backends/events/openpandora/op-events.cpp:168
+#: backends/events/gph/gph-events.cpp:391
+#: backends/events/gph/gph-events.cpp:434
+#: backends/events/openpandora/op-events.cpp:174
msgid "Touchscreen 'Tap Mode' - Left Click"
msgstr "Режим дотику у тачскріні - Лівий клік"
-#: backends/events/gph/gph-events.cpp:387
-#: backends/events/gph/gph-events.cpp:430
-#: backends/events/openpandora/op-events.cpp:170
+#: backends/events/gph/gph-events.cpp:393
+#: backends/events/gph/gph-events.cpp:436
+#: backends/events/openpandora/op-events.cpp:176
msgid "Touchscreen 'Tap Mode' - Right Click"
msgstr "Режим дотику у тачскріні - Правий клік"
-#: backends/events/gph/gph-events.cpp:389
-#: backends/events/gph/gph-events.cpp:432
-#: backends/events/openpandora/op-events.cpp:172
+#: backends/events/gph/gph-events.cpp:395
+#: backends/events/gph/gph-events.cpp:438
+#: backends/events/openpandora/op-events.cpp:178
msgid "Touchscreen 'Tap Mode' - Hover (No Click)"
msgstr "Режим дотику у тачскріні - Проліт (без кліку)"
-#: backends/events/gph/gph-events.cpp:409
+#: backends/events/gph/gph-events.cpp:415
msgid "Maximum Volume"
msgstr "Максимальна Гучність"
-#: backends/events/gph/gph-events.cpp:411
+#: backends/events/gph/gph-events.cpp:417
msgid "Increasing Volume"
msgstr "Підвищення гучності"
-#: backends/events/gph/gph-events.cpp:417
+#: backends/events/gph/gph-events.cpp:423
msgid "Minimal Volume"
msgstr "Мінімальна Гучність"
-#: backends/events/gph/gph-events.cpp:419
+#: backends/events/gph/gph-events.cpp:425
msgid "Decreasing Volume"
msgstr "Пониження гучності"
@@ -2212,41 +2178,41 @@ msgstr "Кліки увімкнено"
msgid "Clicking Disabled"
msgstr "Кліки вимкнено"
-#: backends/events/openpandora/op-events.cpp:174
+#: backends/events/openpandora/op-events.cpp:180
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Режим дотику у тачскріні - Проліт (клік DPad)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
msgid "Do you want to quit ?"
msgstr "Ви дійсно хочете вийти?"
#. I18N: Trackpad mode toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:308
+#: backends/events/webossdl/webossdl-events.cpp:332
msgid "Trackpad mode is now"
msgstr "Режим трекпаду"
#. I18N: Trackpad mode on or off.
#. I18N: Auto-drag on or off.
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "ON"
msgstr "ВКЛ"
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "OFF"
msgstr "ВИМК"
-#: backends/events/webossdl/webossdl-events.cpp:315
+#: backends/events/webossdl/webossdl-events.cpp:339
msgid "Swipe two fingers to the right to toggle."
msgstr "Проведіть двома пальцями направо для переключення."
#. I18N: Auto-drag toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:359
msgid "Auto-drag mode is now"
msgstr "Режим самотягнення включено"
-#: backends/events/webossdl/webossdl-events.cpp:342
+#: backends/events/webossdl/webossdl-events.cpp:366
msgid "Swipe three fingers to the right to toggle."
msgstr "Проведіть трьома пальцямі направо для переключення."
diff --git a/po/zh-Latn_CN.po b/po/zh-Latn_CN.po
index 8306ec7876..072a074c47 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-03-01 08:17+0100\n"
+"POT-Creation-Date: 2017-03-04 11:50+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/"
@@ -118,7 +118,7 @@ msgstr ""
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -131,7 +131,7 @@ msgstr "Shi"
#: gui/filebrowser-dialog.cpp:132 gui/fluidsynth-dialog.cpp:217
#: gui/launcher.cpp:307 gui/launcher.cpp:415 gui/launcher.cpp:474
#: gui/storagewizarddialog.cpp:112
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
#: backends/platform/wince/CELauncherDialog.cpp:83
@@ -810,38 +810,6 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:127
-msgid "3"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "5"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "8"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "10"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "13"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "15"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "18"
-msgstr ""
-
-#: gui/options.cpp:127
-msgid "20"
-msgstr ""
-
#: gui/options.cpp:345 gui/options.cpp:638 gui/options.cpp:776
#: gui/options.cpp:853 gui/options.cpp:1105
msgctxt "soundfont"
@@ -2157,37 +2125,37 @@ msgstr "Nin Zhende Yao Tuichu Ma?"
msgid "Quit"
msgstr "Tuichu"
-#: backends/events/gph/gph-events.cpp:385
-#: backends/events/gph/gph-events.cpp:428
-#: backends/events/openpandora/op-events.cpp:168
+#: backends/events/gph/gph-events.cpp:391
+#: backends/events/gph/gph-events.cpp:434
+#: backends/events/openpandora/op-events.cpp:174
msgid "Touchscreen 'Tap Mode' - Left Click"
msgstr "Chuping 'Chumo Moshi' - Zuojian Danji"
-#: backends/events/gph/gph-events.cpp:387
-#: backends/events/gph/gph-events.cpp:430
-#: backends/events/openpandora/op-events.cpp:170
+#: backends/events/gph/gph-events.cpp:393
+#: backends/events/gph/gph-events.cpp:436
+#: backends/events/openpandora/op-events.cpp:176
msgid "Touchscreen 'Tap Mode' - Right Click"
msgstr "Chuping 'Chumo Moshi' - Youjian Danji"
-#: backends/events/gph/gph-events.cpp:389
-#: backends/events/gph/gph-events.cpp:432
-#: backends/events/openpandora/op-events.cpp:172
+#: backends/events/gph/gph-events.cpp:395
+#: backends/events/gph/gph-events.cpp:438
+#: backends/events/openpandora/op-events.cpp:178
msgid "Touchscreen 'Tap Mode' - Hover (No Click)"
msgstr "Chuping 'Chumo Moshi' - Xuanting (Bu Danji)"
-#: backends/events/gph/gph-events.cpp:409
+#: backends/events/gph/gph-events.cpp:415
msgid "Maximum Volume"
msgstr "Zuida YInliang"
-#: backends/events/gph/gph-events.cpp:411
+#: backends/events/gph/gph-events.cpp:417
msgid "Increasing Volume"
msgstr "Zengda Yinliang"
-#: backends/events/gph/gph-events.cpp:417
+#: backends/events/gph/gph-events.cpp:423
msgid "Minimal Volume"
msgstr "Zuixiao Yinliang"
-#: backends/events/gph/gph-events.cpp:419
+#: backends/events/gph/gph-events.cpp:425
msgid "Decreasing Volume"
msgstr "Jianshao Yinliang"
@@ -2199,41 +2167,41 @@ msgstr "Qidong Dianji"
msgid "Clicking Disabled"
msgstr "Jinyong Dianji"
-#: backends/events/openpandora/op-events.cpp:174
+#: backends/events/openpandora/op-events.cpp:180
msgid "Touchscreen 'Tap Mode' - Hover (DPad Clicks)"
msgstr "Chuping 'Chumo Moshi' - Xuanting (Shoubing Dianji)"
-#: backends/events/symbiansdl/symbiansdl-events.cpp:186
+#: backends/events/symbiansdl/symbiansdl-events.cpp:190
msgid "Do you want to quit ?"
msgstr "Nin Zhende Yao Tuichu Ma?"
#. I18N: Trackpad mode toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:308
+#: backends/events/webossdl/webossdl-events.cpp:332
msgid "Trackpad mode is now"
msgstr "Muqian Wei Chumoban Moshi"
#. I18N: Trackpad mode on or off.
#. I18N: Auto-drag on or off.
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "ON"
msgstr "Kai"
-#: backends/events/webossdl/webossdl-events.cpp:311
-#: backends/events/webossdl/webossdl-events.cpp:338
+#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:362
msgid "OFF"
msgstr "Guan"
-#: backends/events/webossdl/webossdl-events.cpp:315
+#: backends/events/webossdl/webossdl-events.cpp:339
msgid "Swipe two fingers to the right to toggle."
msgstr "XiangYou Shiyong Liang Gen Shouzhi Huadong Qiehuan."
#. I18N: Auto-drag toggle status.
-#: backends/events/webossdl/webossdl-events.cpp:335
+#: backends/events/webossdl/webossdl-events.cpp:359
msgid "Auto-drag mode is now"
msgstr "Muqian Wei Zidong Tuozhuai Moshi"
-#: backends/events/webossdl/webossdl-events.cpp:342
+#: backends/events/webossdl/webossdl-events.cpp:366
msgid "Swipe three fingers to the right to toggle."
msgstr "Xiangyou Huadong San Gen Shouzhi Qiehuan."