[Scummvm-cvs-logs] scummvm master -> 54e136d27e7ca3f22e8eac211f29ae2e146daf76

sev- sev at scummvm.org
Sat Nov 7 13:27:55 CET 2015


This automated email contains information about 9 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6f44d4f7e1 GUI: Make disabled EditTextWidget not allowing to edit the string
81a4359eee BBVS: Implement file chooser for Air Guitar minigame
d39d356c91 I18N: Add filebrowser-dialog.cpp to POTFILES
f04742725d I18N: Update Russian translations
9ab8d4a554 I18N: Update Ukrainian translations
ac29f2f7fc NEWS: Update SCUMM section
51750206aa NEWS: Announce BBVS support
7d58a50c46 GUI: Removed 64k limit on built-in theme XML size
54e136d27e TESTBED: Added detection file to repository


Commit: 6f44d4f7e199813e7cfc68c7be246a08afe6df40
    https://github.com/scummvm/scummvm/commit/6f44d4f7e199813e7cfc68c7be246a08afe6df40
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2015-11-07T13:26:55+01:00

Commit Message:
GUI: Make disabled EditTextWidget not allowing to edit the string

Changed paths:
    gui/widgets/editable.cpp
    gui/widgets/edittext.cpp



diff --git a/gui/widgets/editable.cpp b/gui/widgets/editable.cpp
index af3e5e9..2d92911 100644
--- a/gui/widgets/editable.cpp
+++ b/gui/widgets/editable.cpp
@@ -79,7 +79,7 @@ bool EditableWidget::tryInsertChar(byte c, int pos) {
 
 void EditableWidget::handleTickle() {
 	uint32 time = g_system->getMillis();
-	if (_caretTime < time) {
+	if (_caretTime < time && isEnabled()) {
 		_caretTime = time + kCaretBlinkTime;
 		drawCaret(_caretVisible);
 	}
@@ -90,6 +90,9 @@ bool EditableWidget::handleKeyDown(Common::KeyState state) {
 	bool dirty = false;
 	bool forcecaret = false;
 
+	if (!isEnabled())
+		return false;
+
 	// First remove caret
 	if (_caretVisible)
 		drawCaret(true);
diff --git a/gui/widgets/edittext.cpp b/gui/widgets/edittext.cpp
index 550b1bd..1481beb 100644
--- a/gui/widgets/edittext.cpp
+++ b/gui/widgets/edittext.cpp
@@ -62,6 +62,9 @@ void EditTextWidget::reflowLayout() {
 
 
 void EditTextWidget::handleMouseDown(int x, int y, int button, int clickCount) {
+	if (!isEnabled())
+		return;
+
 	// First remove caret
 	if (_caretVisible)
 		drawCaret(true);


Commit: 81a4359eeed8305ab10f8d66236c0888ad3364d4
    https://github.com/scummvm/scummvm/commit/81a4359eeed8305ab10f8d66236c0888ad3364d4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2015-11-07T13:26:55+01:00

Commit Message:
BBVS: Implement file chooser for Air Guitar minigame

Changed paths:
  A gui/filebrowser-dialog.cpp
  A gui/filebrowser-dialog.h
    engines/bbvs/minigames/bbairguitar.cpp
    gui/module.mk
    gui/themes/default.inc
    gui/themes/scummclassic.zip
    gui/themes/scummclassic/classic_layout.stx
    gui/themes/scummclassic/classic_layout_lowres.stx
    gui/themes/scummmodern.zip
    gui/themes/scummmodern/scummmodern_layout.stx
    gui/themes/scummmodern/scummmodern_layout_lowres.stx



diff --git a/engines/bbvs/minigames/bbairguitar.cpp b/engines/bbvs/minigames/bbairguitar.cpp
index 26e27a9..04175f7 100644
--- a/engines/bbvs/minigames/bbairguitar.cpp
+++ b/engines/bbvs/minigames/bbairguitar.cpp
@@ -27,6 +27,7 @@
 
 #include "gui/dialog.h"
 #include "gui/message.h"
+#include "gui/filebrowser-dialog.h"
 
 namespace Bbvs {
 
@@ -1204,15 +1205,25 @@ void MinigameBbAirGuitar::stopNote(int noteNum) {
 }
 
 bool MinigameBbAirGuitar::getLoadFilename(Common::String &filename) {
-	// TODO Run dialog and return actual filename
-	filename = "test.air";
-	return true;
+	GUI::FileBrowserDialog browser(0, "air", GUI::kFBModeLoad);
+
+	if (browser.runModal() > 0) {
+		filename = browser.getResult();
+		return true;
+	}
+
+	return false;
 }
 
 bool MinigameBbAirGuitar::getSaveFilename(Common::String &filename) {
-	// TODO Run dialog and return actual filename
-	filename = "test.air";
-	return true;
+	GUI::FileBrowserDialog browser(0, "air", GUI::kFBModeSave);
+
+	if (browser.runModal() > 0) {
+		filename = browser.getResult();
+		return true;
+	}
+
+	return false;
 }
 
 bool MinigameBbAirGuitar::querySaveModifiedDialog() {
@@ -1240,7 +1251,7 @@ bool MinigameBbAirGuitar::loadTracks() {
 
 	if (!querySaveModifiedTracks())
 		return false;
-	
+
 	Common::String filename;
 	if (!getLoadFilename(filename))
 		return false;
diff --git a/gui/filebrowser-dialog.cpp b/gui/filebrowser-dialog.cpp
new file mode 100644
index 0000000..93395ba
--- /dev/null
+++ b/gui/filebrowser-dialog.cpp
@@ -0,0 +1,160 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "gui/filebrowser-dialog.h"
+
+#include "common/system.h"
+#include "common/algorithm.h"
+#include "common/savefile.h"
+#include "common/str-array.h"
+
+#include "common/translation.h"
+
+#include "gui/widgets/list.h"
+#include "gui/message.h"
+
+namespace GUI {
+
+enum {
+	kChooseCmd = 'Chos'
+};
+
+FileBrowserDialog::FileBrowserDialog(const char *title, const char *fileExtension, int mode)
+	: Dialog("FileBrowser"), _mode(mode), _fileExt(fileExtension) {
+
+	_fileMask = "*.";
+	_fileMask += fileExtension;
+	_fileList = NULL;
+
+	new StaticTextWidget(this, "FileBrowser.Headline", title ? title :
+					mode == kFBModeLoad ? _("Choose file for loading") : _("Enter filename for saving"));
+
+	_fileName = new EditTextWidget(this, "FileBrowser.Filename", "");
+
+	if (mode == kFBModeLoad)
+		_fileName->setEnabled(false);
+
+	// Add file list
+	_fileList = new ListWidget(this, "FileBrowser.List");
+	_fileList->setNumberingMode(kListNumberingOff);
+	_fileList->setEditable(false);
+
+	_backgroundType = GUI::ThemeEngine::kDialogBackgroundPlain;
+
+	// Buttons
+	new ButtonWidget(this, "FileBrowser.Cancel", _("Cancel"), 0, kCloseCmd);
+	new ButtonWidget(this, "FileBrowser.Choose", _("Choose"), 0, kChooseCmd);
+}
+
+void FileBrowserDialog::open() {
+	// Call super implementation
+	Dialog::open();
+
+	updateListing();
+}
+
+void FileBrowserDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
+	switch (cmd) {
+	case kChooseCmd:
+		if (_fileName->getEditString().empty())
+			break;
+
+		normalieFileName();
+
+		if (!isProceedSave())
+			break;
+
+		setResult(1);
+		close();
+		break;
+	case kListSelectionChangedCmd:
+		_fileName->setEditString(_fileList->getList().operator[](_fileList->getSelected()).c_str());
+		_fileName->draw();
+		break;
+	case kListItemActivatedCmd:
+	case kListItemDoubleClickedCmd:
+		normalieFileName();
+
+		if (!isProceedSave())
+			break;
+
+		setResult(1);
+		close();
+		break;
+	default:
+		Dialog::handleCommand(sender, cmd, data);
+	}
+}
+
+void FileBrowserDialog::normalieFileName() {
+	Common::String filename = _fileName->getEditString();
+
+	if (filename.matchString(_fileMask))
+		return;
+
+	_fileName->setEditString(filename + "." + _fileExt);
+}
+
+
+bool FileBrowserDialog::isProceedSave() {
+	bool matched = false;
+
+	if (_mode == kFBModeLoad)
+		return true;
+
+	for (ListWidget::StringArray::const_iterator file = _fileList->getList().begin(); file != _fileList->getList().end(); ++file) {
+		if (*file == _fileName->getEditString()) {
+			matched = true;
+			break;
+		}
+	}
+
+	if (matched) {
+		GUI::MessageDialog alert(_("Do you really want to overwrite the file?"), _("Yes"), _("No"));
+
+		if (alert.runModal() != GUI::kMessageOK)
+			return false;
+	}
+
+	return true;
+}
+
+void FileBrowserDialog::updateListing() {
+	Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
+
+	ListWidget::StringArray list;
+
+	Common::StringArray filenames = saveFileMan->listSavefiles(_fileMask);
+	Common::sort(filenames.begin(), filenames.end());
+
+	for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
+		list.push_back(file->c_str());
+	}
+
+	_fileList->setList(list);
+	_fileList->scrollTo(0);
+
+	// Finally, redraw
+	draw();
+}
+
+} // End of namespace GUI
diff --git a/gui/filebrowser-dialog.h b/gui/filebrowser-dialog.h
new file mode 100644
index 0000000..5916d76
--- /dev/null
+++ b/gui/filebrowser-dialog.h
@@ -0,0 +1,64 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef FILEBROWSER_DIALOG_H
+#define FILEBROWSER_DIALOG_H
+
+#include "gui/dialog.h"
+#include "gui/widgets/edittext.h"
+
+namespace GUI {
+
+class ListWidget;
+class EditTextWidget;
+class CommandSender;
+
+enum {
+	kFBModeLoad = 0,
+	kFBModeSave
+};
+
+class FileBrowserDialog : public Dialog {
+public:
+	FileBrowserDialog(const char *title, const char *fileExtension, int mode);
+
+	virtual void open();
+
+	virtual void handleCommand(CommandSender *sender, uint32 cmd, uint32 data);
+
+	const char *getResult() { return Dialog::getResult() ? _fileName->getEditString().c_str() : NULL; }
+
+protected:
+	EditTextWidget *_fileName;
+	ListWidget	   *_fileList;
+	Common::String _fileMask;
+	Common::String _fileExt;
+	int            _mode;
+
+	void updateListing();
+	void normalieFileName();
+	bool isProceedSave();
+};
+
+} // End of namespace GUI
+
+#endif
diff --git a/gui/module.mk b/gui/module.mk
index 338e43c..e355212 100644
--- a/gui/module.mk
+++ b/gui/module.mk
@@ -8,6 +8,7 @@ MODULE_OBJS := \
 	dialog.o \
 	error.o \
 	EventRecorder.o \
+	filebrowser-dialog.o \
 	gui-manager.o \
 	launcher.o \
 	massadd.o \
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index aa2a24b..33aac29 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -771,6 +771,28 @@
 "</layout>"
 "</layout>"
 "</dialog>"
+"<dialog name='FileBrowser' overlays='screen' inset='32' shading='dim'>"
+"<layout type='vertical' padding='16,16,16,16'>"
+"<widget name='Headline' "
+"height='Globals.Line.Height' "
+"/>"
+"<widget name='Filename' "
+"height='Globals.Line.Height' "
+"/>"
+"<space size='10' />"
+"<widget name='List'/>"
+"<layout type='vertical' padding='0,0,16,0'>"
+"<layout type='horizontal' padding='0,0,0,0'>"
+"<widget name='Cancel' "
+"type='Button' "
+"/>"
+"<widget name='Choose' "
+"type='Button' "
+"/>"
+"</layout>"
+"</layout>"
+"</layout>"
+"</dialog>"
 "<dialog name='GlobalOptions' overlays='Dialog.Launcher.GameList' shading='dim'>"
 "<layout type='vertical' padding='0,0,0,0'>"
 "<widget name='TabWidget'/>"
@@ -2031,6 +2053,28 @@
 "</layout>"
 "</layout>"
 "</dialog>"
+"<dialog name='FileBrowser' overlays='screen' inset='16' shading='dim'>"
+"<layout type='vertical' padding='16,16,16,16'>"
+"<widget name='Headline' "
+"height='Globals.Line.Height' "
+"/>"
+"<widget name='Filename' "
+"height='Globals.Line.Height' "
+"/>"
+"<space size='5' />"
+"<widget name='List'/>"
+"<layout type='vertical' padding='0,0,16,0'>"
+"<layout type='horizontal' padding='0,0,0,0'>"
+"<widget name='Cancel' "
+"type='Button' "
+"/>"
+"<widget name='Choose' "
+"type='Button' "
+"/>"
+"</layout>"
+"</layout>"
+"</layout>"
+"</dialog>"
 "<dialog name='GlobalOptions' overlays='screen' inset='16' shading='dim'>"
 "<layout type='vertical' padding='0,0,0,0'>"
 "<widget name='TabWidget'/>"
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 1b555a6..d7016ca 100644
Binary files a/gui/themes/scummclassic.zip and b/gui/themes/scummclassic.zip differ
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index cf82686..26656de 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -196,6 +196,29 @@
 		</layout>
 	</dialog>
 
+	<dialog name = 'FileBrowser' overlays = 'screen' inset = '32' shading = 'dim'>
+		<layout type = 'vertical' padding = '16, 16, 16, 16'>
+			<widget name = 'Headline'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'Filename'
+					height = 'Globals.Line.Height'
+			/>
+			<space size = '10' />
+			<widget name = 'List'/>
+			<layout type = 'vertical' padding = '0, 0, 16, 0'>
+				<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+					<widget name = 'Cancel'
+							type = 'Button'
+					/>
+					<widget name = 'Choose'
+							type = 'Button'
+					/>
+				</layout>
+			</layout>
+		</layout>
+	</dialog>
+
 	<dialog name = 'GlobalOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'>
 		<layout type = 'vertical' padding = '0, 0, 0, 0'>
 			<widget name = 'TabWidget'/>
@@ -673,7 +696,7 @@
 			/>
 		</layout>
 	</dialog>
-	
+
 	<dialog name = 'GlobalMenu' overlays = 'screen_center'>
 		<layout type = 'vertical' padding = '16, 16, 16, 16' center = 'true'>
 			<widget name = 'Title'
@@ -1040,7 +1063,7 @@
 							width = '180'
 							height = '170'
 					/>
-					<layout type = 'horizontal' padding = '0, 0, 0, 0'>	
+					<layout type = 'horizontal' padding = '0, 0, 0, 0'>
 						<widget name = 'NextScreenShotButton'
 								width = '25'
 								height = '25'
@@ -1115,15 +1138,15 @@
 			<layout type = 'horizontal'  spacing = '5' padding = '0, 0, 0, 10'>
 				<widget name = 'AuthorLabel'
 						type = 'EditRecordLabel'
-				/>		
+				/>
 				<widget name = 'AuthorEdit'
 						type = 'EditRecord'
-				/>		
+				/>
 			</layout>
 			<layout type = 'horizontal'  spacing = '5' padding = '0, 0, 0, 10'>
 				<widget name = 'NameLabel'
 						type = 'EditRecordLabel'
-				/>		
+				/>
 				<widget name = 'NameEdit'
 						type = 'EditRecord'
 				/>
@@ -1142,11 +1165,11 @@
 				/>
 				<widget name = 'OK'
 						type = 'Button'
-				/>			
+				/>
 			</layout>
 		</layout>
 	</dialog>
-	
+
 	<dialog name = 'ScummHelp' overlays = 'screen_center'>
 		<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'>
 			<widget name = 'Title'
@@ -1250,7 +1273,7 @@
 			<layout type = 'horizontal' padding = '5, 5, 5, 5'>
 				<widget name = 'Word'
 					width  = '190'
-					height = 'Globals.Button.Height' 
+					height = 'Globals.Button.Height'
 				/>
 				<widget name = 'Delete'
 					width  = '20'
@@ -1315,7 +1338,7 @@
 				/>
 			</layout>
 			<space size = '5' />
-			<layout type = 'horizontal' padding = '3, 3, 3, 3'>	
+			<layout type = 'horizontal' padding = '3, 3, 3, 3'>
 				<widget name = 'Add'
 					width  = 'Globals.Predictive.Button.Width'
 					height = 'Globals.Button.Height'
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 506657e..60057fa 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -193,6 +193,29 @@
 		</layout>
 	</dialog>
 
+	<dialog name = 'FileBrowser' overlays = 'screen' inset = '16' shading = 'dim'>
+		<layout type = 'vertical' padding = '16, 16, 16, 16'>
+			<widget name = 'Headline'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'Filename'
+					height = 'Globals.Line.Height'
+			/>
+			<space size = '5' />
+			<widget name = 'List'/>
+			<layout type = 'vertical' padding = '0, 0, 16, 0'>
+				<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+					<widget name = 'Cancel'
+							type = 'Button'
+					/>
+					<widget name = 'Choose'
+							type = 'Button'
+					/>
+				</layout>
+			</layout>
+		</layout>
+	</dialog>
+
 	<dialog name = 'GlobalOptions' overlays = 'screen' inset = '16' shading = 'dim'>
 		<layout type = 'vertical' padding = '0, 0, 0, 0'>
 			<widget name = 'TabWidget'/>
@@ -685,7 +708,7 @@
 			/>
 		</layout>
 	</dialog>
-	
+
 	<dialog name = 'GlobalMenu' overlays = 'screen_center'>
 		<layout type = 'vertical' padding = '2, 2, 2, 6' center = 'true' spacing='0'>
 			<widget name = 'Title'
@@ -1086,15 +1109,15 @@
 			<layout type = 'horizontal'  spacing = '5' padding = '0, 0, 0, 10'>
 				<widget name = 'AuthorLabel'
 						type = 'EditRecordLabel'
-				/>		
+				/>
 				<widget name = 'AuthorEdit'
 						type = 'EditRecord'
-				/>		
+				/>
 			</layout>
 			<layout type = 'horizontal'  spacing = '5' padding = '0, 0, 0, 10'>
 				<widget name = 'NameLabel'
 						type = 'EditRecordLabel'
-				/>		
+				/>
 				<widget name = 'NameEdit'
 							type = 'EditRecord'
 				/>
@@ -1113,7 +1136,7 @@
 				/>
 				<widget name = 'OK'
 						type = 'Button'
-				/>			
+				/>
 			</layout>
 		</layout>
 	</dialog>
@@ -1220,7 +1243,7 @@
 			<layout type = 'horizontal' padding = '3, 3, 3, 3'>
 				<widget name = 'Word'
 					width  = '120'
-					height = 'Globals.Button.Height' 
+					height = 'Globals.Button.Height'
 				/>
 				<widget name = 'Delete'
 					width  = '20'
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index c7c5856..5bf1b8e 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index 7e61d68..3254049 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -67,7 +67,7 @@
 
 		<widget name = 'Button'
 				size = '108, 24'
-		/>		
+		/>
 
 		<widget name = 'Slider'
 				size = '128, 18'
@@ -210,6 +210,29 @@
 		</layout>
 	</dialog>
 
+	<dialog name = 'FileBrowser' overlays = 'screen' inset = '32' shading = 'dim'>
+		<layout type = 'vertical' padding = '16, 16, 16, 16'>
+			<widget name = 'Headline'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'Filename'
+					height = 'Globals.Line.Height'
+			/>
+			<space size = '10' />
+			<widget name = 'List'/>
+			<layout type = 'vertical' padding = '0, 0, 16, 0'>
+				<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+					<widget name = 'Cancel'
+							type = 'Button'
+					/>
+					<widget name = 'Choose'
+							type = 'Button'
+					/>
+				</layout>
+			</layout>
+		</layout>
+	</dialog>
+
 	<dialog name = 'GlobalOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'>
 		<layout type = 'vertical' padding = '0, 0, 0, 0'>
 			<widget name = 'TabWidget'/>
@@ -687,7 +710,7 @@
 			/>
 		</layout>
 	</dialog>
-	
+
 	<dialog name = 'GlobalMenu' overlays = 'screen_center'>
 		<layout type = 'vertical' padding = '16, 16, 16, 16' center = 'true'>
 			<widget name = 'Logo'
@@ -1054,7 +1077,7 @@
 							width = '180'
 							height = '170'
 					/>
-					<layout type = 'horizontal' padding = '0, 0, 0, 0'>	
+					<layout type = 'horizontal' padding = '0, 0, 0, 0'>
 						<widget name = 'NextScreenShotButton'
 								width = '25'
 								height = '25'
@@ -1130,15 +1153,15 @@
 			<layout type = 'horizontal'  spacing = '5' padding = '0, 0, 0, 10'>
 				<widget name = 'AuthorLabel'
 						type = 'EditRecordLabel'
-				/>		
+				/>
 				<widget name = 'AuthorEdit'
 						type = 'EditRecord'
-				/>		
+				/>
 			</layout>
 			<layout type = 'horizontal'  spacing = '5' padding = '0, 0, 0, 10'>
 				<widget name = 'NameLabel'
 						type = 'EditRecordLabel'
-				/>		
+				/>
 				<widget name = 'NameEdit'
 						type = 'EditRecord'
 				/>
@@ -1157,11 +1180,11 @@
 				/>
 				<widget name = 'OK'
 						type = 'Button'
-				/>			
+				/>
 			</layout>
 		</layout>
 	</dialog>
-	
+
 	<dialog name = 'ScummHelp' overlays = 'screen_center'>
 		<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'>
 			<widget name = 'Title'
@@ -1252,7 +1275,7 @@
 					type = 'Button'
 			/>
 		</layout>
-	</dialog>	
+	</dialog>
 	<dialog name = 'Predictive' overlays = 'screen_center'>
 		<layout type = 'vertical' padding = '5, 5, 5, 5' center = 'true'>
 			<widget name = 'Headline'
@@ -1264,7 +1287,7 @@
 			<layout type = 'horizontal' padding = '5, 5, 5, 5'>
 				<widget name = 'Word'
 					width  = '190'
-					height = 'Globals.Button.Height' 
+					height = 'Globals.Button.Height'
 				/>
 				<widget name = 'Delete'
 					width  = '20'
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index cee1e4a..2b4dc09 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -191,6 +191,29 @@
 		</layout>
 	</dialog>
 
+	<dialog name = 'FileBrowser' overlays = 'screen' inset = '16' shading = 'dim'>
+		<layout type = 'vertical' padding = '16, 16, 16, 16'>
+			<widget name = 'Headline'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'Filename'
+					height = 'Globals.Line.Height'
+			/>
+			<space size = '5' />
+			<widget name = 'List'/>
+			<layout type = 'vertical' padding = '0, 0, 16, 0'>
+				<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+					<widget name = 'Cancel'
+							type = 'Button'
+					/>
+					<widget name = 'Choose'
+							type = 'Button'
+					/>
+				</layout>
+			</layout>
+		</layout>
+	</dialog>
+
 	<dialog name = 'GlobalOptions' overlays = 'screen' inset = '16' shading = 'dim'>
 		<layout type = 'vertical' padding = '0, 0, 0, 0'>
 			<widget name = 'TabWidget'/>
@@ -683,7 +706,7 @@
 			/>
 		</layout>
 	</dialog>
-	
+
 	<dialog name = 'GlobalMenu' overlays = 'screen_center'>
 		<layout type = 'vertical' padding = '4, 4, 4, 4' center = 'true' spacing='2'>
 			<widget name = 'Title'
@@ -1105,15 +1128,15 @@
 			<layout type = 'horizontal'  spacing = '5' padding = '0, 0, 0, 10'>
 				<widget name = 'AuthorLabel'
 						type = 'EditRecordLabel'
-				/>		
+				/>
 				<widget name = 'AuthorEdit'
 						type = 'EditRecord'
-				/>		
+				/>
 			</layout>
 			<layout type = 'horizontal'  spacing = '5' padding = '0, 0, 0, 10'>
 				<widget name = 'NameLabel'
 						type = 'EditRecordLabel'
-				/>		
+				/>
 				<widget name = 'NameEdit'
 							type = 'EditRecord'
 				/>
@@ -1132,11 +1155,11 @@
 				/>
 				<widget name = 'OK'
 						type = 'Button'
-				/>			
+				/>
 			</layout>
 		</layout>
 	</dialog>
-	
+
 	<dialog name = 'ScummHelp' overlays = 'screen' inset = '8'>
 		<layout type = 'vertical' padding = '8, 8, 8, 8'>
 			<widget name = 'Title'
@@ -1237,7 +1260,7 @@
 			<layout type = 'horizontal' padding = '0, 0, 2, 2'>
 				<widget name = 'Word'
 					width  = '120'
-					height = 'Globals.Button.Height' 
+					height = 'Globals.Button.Height'
 				/>
 				<widget name = 'Delete'
 					width  = '20'


Commit: d39d356c91936e702db16a50752b993de0f0f074
    https://github.com/scummvm/scummvm/commit/d39d356c91936e702db16a50752b993de0f0f074
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2015-11-07T13:26:55+01:00

Commit Message:
I18N: Add filebrowser-dialog.cpp to POTFILES

Changed paths:
    po/POTFILES



diff --git a/po/POTFILES b/po/POTFILES
index 0eef66b..e6afba7 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -6,6 +6,7 @@ gui/browser_osx.mm
 gui/chooser.cpp
 gui/editrecorddialog.cpp
 gui/error.cpp
+gui/filebrowser-dialog.cpp
 gui/gui-manager.cpp
 gui/KeysDialog.h
 gui/KeysDialog.cpp


Commit: f04742725dce28345d587301fc0820a3f9e99553
    https://github.com/scummvm/scummvm/commit/f04742725dce28345d587301fc0820a3f9e99553
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2015-11-07T13:26:55+01:00

Commit Message:
I18N: Update Russian translations

Changed paths:
    po/ru_RU.po



diff --git a/po/ru_RU.po b/po/ru_RU.po
index 871f7cd..5fbb8dc 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -1,22 +1,21 @@
 # Russian translation for ScummVM.
 # Copyright (C) 2010-2015 The ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
-# Eugene Sandulenko <sev at scummvm.org>, 2010-2014
+# Eugene Sandulenko <sev at scummvm.org>, 2010-2015
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ScummVM 1.3.0svn\n"
+"Project-Id-Version: ScummVM 1.8.0svn\n"
 "Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
 "POT-Creation-Date: 2015-10-11 18:59+0100\n"
-"PO-Revision-Date: 2014-07-02 17:20+0300\n"
+"PO-Revision-Date: 2015-11-06 09:23+0300\n"
 "Last-Translator: Eugene Sandulenko <sev at scummvm.org>\n"
 "Language-Team: Russian\n"
 "Language: Russian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3;     plural=n%10==1 && n%100!=11 ? 0 :            n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Poedit 1.5.5\n"
 
 #: gui/about.cpp:94
@@ -75,7 +74,7 @@ msgstr "
 
 #: gui/editrecorddialog.cpp:58
 msgid "Author:"
-msgstr ""
+msgstr "°ÒâÞà:"
 
 #: gui/editrecorddialog.cpp:59 gui/launcher.cpp:204
 msgid "Name:"
@@ -83,11 +82,11 @@ msgstr "
 
 #: gui/editrecorddialog.cpp:60
 msgid "Notes:"
-msgstr ""
+msgstr "·ÐÜÕâÚØ:"
 
 #: gui/editrecorddialog.cpp:68 gui/predictivedialog.cpp:75
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: gui/gui-manager.cpp:117 backends/keymapper/remap-dialog.cpp:53
 #: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141
@@ -545,7 +544,7 @@ msgstr "
 
 #: gui/launcher.cpp:1161
 msgid "Record..."
-msgstr ""
+msgstr "·ÐßØáì..."
 
 #: gui/massadd.cpp:79 gui/massadd.cpp:82
 msgid "... progress ..."
@@ -572,21 +571,19 @@ msgstr "
 
 #: gui/onscreendialog.cpp:101 gui/onscreendialog.cpp:103
 msgid "Stop"
-msgstr ""
+msgstr "ÁâÞß"
 
 #: gui/onscreendialog.cpp:106
 msgid "Edit record description"
-msgstr ""
+msgstr "ÀÕÔÐÚâØàÞÒÐâì ÞßØáÐÝØÕ ×ÐßØáØ"
 
 #: gui/onscreendialog.cpp:108
-#, fuzzy
 msgid "Switch to Game"
-msgstr "¿ÕàÕÚÛîçØâì"
+msgstr "¿ÕàÕÚÛîçØâìáï Ò ØÓàã"
 
 #: gui/onscreendialog.cpp:110
-#, fuzzy
 msgid "Fast replay"
-msgstr "±ëáâàëÙ àÕÖØÜ"
+msgstr "±ëáâàÞÕ ÒÞáßàÞØ×ÒÕÔÕÝØÕ"
 
 #: gui/options.cpp:85
 msgid "Never"
@@ -987,29 +984,28 @@ msgstr ""
 #. I18N: You must leave "#" as is, only word 'next' is translatable
 #: gui/predictivedialog.cpp:87
 msgid "#  next"
-msgstr ""
+msgstr "#  áÛÕÔ"
 
 #: gui/predictivedialog.cpp:88
 msgid "add"
-msgstr ""
+msgstr "ÔÞÑ"
 
 #: gui/predictivedialog.cpp:92
-#, fuzzy
 msgid "Delete char"
-msgstr "ÃÔÐÛØâì"
+msgstr "ÃÔÐÛØâì áØÜÒÞÛ"
 
 #: gui/predictivedialog.cpp:96
 msgid "<"
-msgstr ""
+msgstr "<"
 
 #. I18N: Pre means 'Predictive', leave '*' as is
 #: gui/predictivedialog.cpp:98
 msgid "*  Pre"
-msgstr ""
+msgstr "*  Pre"
 
 #: gui/recorderdialog.cpp:64
 msgid "Recorder or Playback Gameplay"
-msgstr ""
+msgstr "²ÞáßàÞØ×ÒÕáâØ ØÛØ ×ÐßØáÐâì ØÓàÞÒÞÙ ßàÞæÕáá"
 
 #: gui/recorderdialog.cpp:69 gui/recorderdialog.cpp:156
 #: gui/saveload-dialog.cpp:220 gui/saveload-dialog.cpp:276
@@ -1018,36 +1014,33 @@ msgstr "
 
 #: gui/recorderdialog.cpp:71
 msgid "Record"
-msgstr ""
+msgstr "·ÐßØáÐâì"
 
 #: gui/recorderdialog.cpp:72
-#, fuzzy
 msgid "Playback"
-msgstr "¸ÓàÐâì"
+msgstr "²ÞáßàÞØ×ÒÕáâØ"
 
 #: gui/recorderdialog.cpp:74
 msgid "Edit"
-msgstr ""
+msgstr "ÀÕÔÐÚâØàÞÒÐâì"
 
 #: gui/recorderdialog.cpp:86 gui/recorderdialog.cpp:243
 #: gui/recorderdialog.cpp:253
 msgid "Author: "
-msgstr ""
+msgstr "°ÒâÞà: "
 
 #: gui/recorderdialog.cpp:87 gui/recorderdialog.cpp:244
 #: gui/recorderdialog.cpp:254
 msgid "Notes: "
-msgstr ""
+msgstr "·ÐÜÕâÚØ: "
 
 #: gui/recorderdialog.cpp:155
-#, fuzzy
 msgid "Do you really want to delete this record?"
-msgstr "²ë ÔÕÙáâÒØâÕÛìÝÞ åÞâØâÕ ãÔÐÛØâì íâÞ áÞåàÐÝÕÝØÕ?"
+msgstr "²ë ÔÕÙáâÒØâÕÛìÝÞ åÞâØâÕ ãÔÐÛØâì íâã ×ÐßØáì?"
 
 #: gui/recorderdialog.cpp:174
-#, fuzzy
 msgid "Unknown Author"
-msgstr "½ÕØ×ÒÕáâÝÐï ÞèØÑÚÐ"
+msgstr "½ÕØ×ÒÕáâÝëÙ ÐÒâÞà"
 
 #: gui/saveload-dialog.cpp:167
 msgid "List view"
@@ -1511,7 +1504,7 @@ msgstr "
 
 #: audio/fmopl.cpp:67
 msgid "ALSA Direct FM"
-msgstr ""
+msgstr "¿àïÜÞÙ FM ALSA"
 
 #: audio/mididrv.cpp:209
 #, c-format
@@ -2205,25 +2198,25 @@ msgstr ""
 "ScummVM"
 
 #: engines/agi/detection.cpp:157
-#, fuzzy
 msgid "Use an alternative palette"
-msgstr "¸áßÞÛì×ÞÒÐâì ÐÛìâÕàÝÐâØÒÝÞÕ ÒáâãßÛÕÝØÕ (âÞÛìÚÞ ÔÛï CD ÒÕàáØØ ØÓàë)"
+msgstr "¸áßÞÛì×ÞÒÐâì ÐÛìâÕàÝÐâØÒÝãî ßÐÛØâàã"
 
 #: engines/agi/detection.cpp:158
 msgid ""
 "Use an alternative palette, common for all Amiga games. This was the old "
 "behavior"
 msgstr ""
+"¸áßÞÛì×ÞÒÐâì ÐÛìâÕàÝÐâØÒÝãî ßÐÛØâàã ÔÛï ÒáÕå ØÓà Amiga. ÍâÞ ÑëÛÞ áâÐàÞÕ ßÞÒÕÔÕÝØÕ"
 
 #: engines/agi/detection.cpp:167
-#, fuzzy
 msgid "Mouse support"
-msgstr "¿ÞÔÔÕàÖÚÐ ßàÞßãáÚÞÒ"
+msgstr "¿ÞÔÔÕàÖÚÐ ÜëèØ"
 
 #: engines/agi/detection.cpp:168
 msgid ""
 "Enables mouse support. Allows to use mouse for movement and in game menus."
 msgstr ""
+"²ÚÛîçÐÕâ ßÞÔÔÕàÖÚã ÜëèØ. ¿Þ×ÒÞÛïÕâ ØáßÞÛì×ÞÒÐâì Üëèì ÔÛï ßÕàÕÜÕéÕÝØï Ø Ò ÜÕÝî ØÓàë."
 
 #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349
 #: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886
@@ -2276,13 +2269,12 @@ msgid "Cutscene file '%s' not found!"
 msgstr "ÄÐÙÛ ×ÐáâÐÒÚØ '%s' ÝÕ ÝÐÙÔÕÝ!"
 
 #: engines/cge/detection.cpp:105 engines/cge2/detection.cpp:101
-#, fuzzy
 msgid "Color Blind Mode"
-msgstr "ÀÕÖØÜ éÕÛçÚÐ"
+msgstr "ÀÕÖØÜ ÑÕ× æÒÕâÐ"
 
 #: engines/cge/detection.cpp:106 engines/cge2/detection.cpp:102
 msgid "Enable Color Blind Mode by default"
-msgstr ""
+msgstr "²ÚÛîçØâì àÕÖØÜ ÔÛï ÛîÔÕÙ áÞ áÛÐÑëÜ ÒÞáßàØïâØÕÜ æÒÕâÐ"
 
 #: engines/drascula/saveload.cpp:47
 msgid ""
@@ -2338,11 +2330,11 @@ msgstr "
 
 #: engines/hopkins/detection.cpp:76 engines/hopkins/detection.cpp:86
 msgid "Gore Mode"
-msgstr ""
+msgstr "ÀÕÖØÜ á ÚàÞÒìî"
 
 #: engines/hopkins/detection.cpp:77 engines/hopkins/detection.cpp:87
 msgid "Enable Gore Mode when available"
-msgstr ""
+msgstr "²ÚÛîçÐÕâ àÕÖØÜ á Ø×ÞÑàÐÖÕÝØÕÜ ÚàÞÒØ, ÕáÛØ ÔÞáâãßÝÞ"
 
 #. I18N: Studio audience adds an applause and cheering sounds whenever
 #. Malcolm makes a joke.
@@ -2475,6 +2467,12 @@ msgid ""
 "Do you wish to use this save game file with ScummVM?\n"
 "\n"
 msgstr ""
+"½ØÖÕáÛÕÔãîéØÙ äÐÙÛ áÞåàÐÝÕÝØï Ø× ÞàØÓØÝÐÛìÝÞÙ ØÓàë ÑëÛ ÝÐÙÔÕÝ Ò ÒÐèÕÙ ØÓàÞÒÞÙ ÔØàÕÚâÞàØØ:\n"
+"\n"
+"%s %s\n"
+"\n"
+"½Õ ÖÕÛÐÕâÕ ÛØ ØáßÞÛì×ÞÒÐâì íâÞ áÞåàÐÝÕÝØÕ Ò ScummVM?\n"
+"\n"
 
 #: engines/kyra/saveload_eob.cpp:590
 #, c-format
@@ -2482,6 +2480,8 @@ msgid ""
 "A save game file was found in the specified slot %d. Overwrite?\n"
 "\n"
 msgstr ""
+"² ãÚÐ×ÐÝÝÞÜ áÛÞâÕ %d ãÖÕ Õáâì áÞåàÐÝÕÝØÕ ØÓàë. ¿ÕàÕ×ÐßØáÐâì?\n"
+"\n"
 
 #: engines/kyra/saveload_eob.cpp:623
 #, c-format
@@ -2493,6 +2493,10 @@ msgid ""
 "'import_savefile'.\n"
 "\n"
 msgstr ""
+"%d ÞàØÓØÝÐÛìÝëå äÐÙÛÞÒ áÞåàÐÝÕÝØï ÑëÛØ ãáßÕèÝÞ ØÜßÞàâØàÞÒÐÝë Ò ScummVM.\n"
+"µáÛØ Òë ×ÐåÞâØâÕ ØÜßÞàâØàÞÒÐâì ÞàØÓØÝßÛìÝëÕ áÞåàÐÝÕÝØï, ÒÐÜ ÝãÖÝÞ ÑãÔÕâ\n"
+"ÞâÚàëâì ÞâÛÐÔÞçÝãî ÚÞÝáÞÛì ScummVM Ø ÒÒÕáâØ ÚÞÜÐÝÔã 'import_savefile'.\n"
+"\n"
 
 #. I18N: Option for fast scene switching
 #: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167
@@ -2631,11 +2635,11 @@ msgstr "
 
 #: engines/sci/detection.cpp:374
 msgid "Skip EGA dithering pass (full color backgrounds)"
-msgstr ""
+msgstr "½Õ ÔÕÛÐâì ÐßßàÞÚáØÜÐæØî æÒÕâÞÒ EGA (ßÞÛÝÞæÒÕâÝëÕ äÞÝë)"
 
 #: engines/sci/detection.cpp:375
 msgid "Skip dithering pass in EGA games, graphics are shown with full colors"
-msgstr ""
+msgstr "¿àÞßãáÚÐÕâ ßàÞåÞÔ ÐßßàÞÚáØÜÐæØØ æÒÕâÞÒ EGA, ÓàÐäØÚÐ ÑãÔÕâ ßÞÚÐ×ÐÝÐ áÞ ÒáÕÜØ æÒÕâÐÜØ"
 
 #: engines/sci/detection.cpp:384
 msgid "Prefer digital sound effects"
@@ -2712,15 +2716,13 @@ msgstr "
 #. "Moechten Sie wirklich neu starten?  (J/N)J"
 #. Will react to J as 'Yes'
 #: engines/scumm/dialogs.cpp:183
-#, fuzzy
 msgid "Are you sure you want to restart?  (Y/N)Y"
-msgstr "²ë ãÒÕàÕÝë, çâÞ åÞâØâÕ ÝÐçÐâì áÝÞÒÐ?  (Y/N)"
+msgstr "²ë ãÒÕàÕÝë, çâÞ åÞâØâÕ ÝÐçÐâì áÝÞÒÐ?  (Y/N)Y"
 
 #. I18N: you may specify 'Yes' symbol at the end of the line. See previous comment
 #: engines/scumm/dialogs.cpp:185
-#, fuzzy
 msgid "Are you sure you want to quit?  (Y/N)Y"
-msgstr "²ë ãÒÕàÕÝë, çâÞ åÞâØâÕ ÒëÙâØ?  (Y/N)"
+msgstr "²ë ãÒÕàÕÝë, çâÞ åÞâØâÕ ÒëÙâØ?  (Y/N)Y"
 
 #: engines/scumm/dialogs.cpp:190
 msgid "Play"
@@ -3228,25 +3230,24 @@ msgid "Third kid"
 msgstr "ÂàÕâØÙ ÓÕàÞÙ"
 
 #: engines/scumm/help.cpp:292
-#, fuzzy
 msgid "Toggle Inventory/IQ Points display"
-msgstr "²ÚÛîçØâì ßÞÚÐ× ÔÐÝÝëå Ò æÕÝâàÕ íÚàÐÝÐ"
+msgstr "¿ÕàÕÚÛîçØâì ßÞÚÐ× ØÝÒÕÝâÐàï/ÞçÚÞÒ IQ"
 
 #: engines/scumm/help.cpp:293
 msgid "Toggle Keyboard/Mouse Fighting (*)"
-msgstr ""
+msgstr "¿ÕàÕÚÛîçØâì ãßàÐÒÛÕÝØÕ ÑÞïÜØ ºÛÒÒØÐâãàÞÙ/¼ëèìî (*)"
 
 #: engines/scumm/help.cpp:295
 msgid "* Keyboard Fighting is always on,"
-msgstr ""
+msgstr "* ÃßàÐÒÛÕÝØÕ ÚÛÐÒØÐâãàÞÙ ÒáÕÓÔÐ ÒÚÛîçÕÝÞ,"
 
 #: engines/scumm/help.cpp:296
 msgid "  so despite the in-game message this"
-msgstr ""
+msgstr "  âÒÚ çâÞ ÝÕáÜÞâàï ÝÐ áÞÞÑéÕÝØÕ ØÓàë,"
 
 #: engines/scumm/help.cpp:297
 msgid "  actually toggles Mouse Fighting Off/On"
-msgstr ""
+msgstr "  ÝÐ áÐÜÞÜ ÔÕÛÕ íâÞ ÒÚÛ/ÒëÚÛ ãßàÐÒÛÕÝØÕ Üëèìî"
 
 #: engines/scumm/help.cpp:304
 msgid "Fighting controls (numpad):"
@@ -3283,7 +3284,7 @@ msgstr "
 
 #: engines/scumm/help.cpp:315
 msgid "Sucker punch"
-msgstr ""
+msgstr "ÃÔÐà á×ÐÔØ"
 
 #: engines/scumm/help.cpp:318
 msgid "These are for Indy on left."
@@ -3342,23 +3343,20 @@ msgid "Fly to lower right"
 msgstr "»ÕâÕâì ÒßàÐÒÞ-ÒÝØ×"
 
 #: engines/scumm/input.cpp:572
-#, fuzzy
 msgid "Snap scroll on"
-msgstr "¿ÛÐÒÝÐï ßàÞÚàãâÚÐ"
+msgstr "¿àÞÚàãâÚÐ áÚÐçÚÐÜØ ÒÚÛîçÕÝÐ"
 
 #: engines/scumm/input.cpp:574
 msgid "Snap scroll off"
-msgstr ""
+msgstr "¿àÞÚàãâÚÐ áÚÐçÚÐÜØ ÒëÚÛ"
 
 #: engines/scumm/input.cpp:587
-#, fuzzy
 msgid "Music volume: "
-msgstr "³àÞÜÚ. Üã×ëÚØ:"
+msgstr "³àÞÜÚ. Üã×ëÚØ: "
 
 #: engines/scumm/input.cpp:604
-#, fuzzy
 msgid "Subtitle speed: "
-msgstr "ÁÚÞàÞáâì âØâàÞÒ:"
+msgstr "ÁÚÞàÞáâì âØâàÞÒ: "
 
 #: engines/scumm/scumm.cpp:1832
 #, c-format
@@ -3370,27 +3368,30 @@ msgstr ""
 "LucasArts, ÝÞ ÝÕ åÒÐâÐÕâ %s. ¿ÕàÕÚÛîçÐîáì ÝÐ AdLib."
 
 #: engines/scumm/scumm.cpp:2644
-#, fuzzy
 msgid ""
 "Usually, Maniac Mansion would start now. But for that to work, the game "
 "files for Maniac Mansion have to be in the 'Maniac' directory inside the "
 "Tentacle game directory, and the game has to be added to ScummVM."
 msgstr ""
-"ÁÕÙçÐá ÔÞÛÖÝÐ ×ÐßãáâØâìáï ØÓàÐ Maniac Mansion. ½Þ ScummVM ßÞÚÐ íâÞÓÞ ÝÕ "
-"ãÜÕÕâ. ÇâÞÑë áëÓàÐâì, ÝÐÖÜØâÕ '½ÞÒÐï ØÓàÐ' Ò áâÐàâÞÒÞÜ ÜÕÝî ScummVM, Ð ×ÐâÕÜ "
-"ÒëÑÕàØâÕ ÔØàÕÚâÞàØî Maniac ÒÝãâàØ ÔØàÕÚâÞàØØ á ØÓàÞÙ Tentacle."
+"ÁÕÙçÐá ÔÞÛÖÝÐ ×ÐßãáâØâìáï ØÓàÐ Maniac Mansion. ½Þ çâÞÑë íâÞ àÐÑÞâÐÛÞ, äÐÙÛë "
+"ØÓàë Maniac Mansion ÔÞÛÖÝë Ñëâì áÚÞßØàÞÒÐÝë Ò ÔØàÕÚâÞàØî 'Maniac' ÒÝãâàØ "
+"ÔØàÕÚâÞàØØ ØÓàë Tentacle, Ø áÐÜÐ ØÓàÐ ÔÞÛÖÝÐ Ñëâì ÔÞÑÐÒÛÕÝÐ Ò ScummVM."
 
 #: engines/scumm/players/player_v3m.cpp:129
 msgid ""
 "Could not find the 'Loom' Macintosh executable to read the\n"
 "instruments from. Music will be disabled."
 msgstr ""
+"½Õ ãÔÐÛÞáì ÝÐÙâØ ØáßÞÛÝØÜëÙ äÐÙÛ 'Loom' Macintosh, çâÞÑë ßàÞçØâÐâì\n"
+"ÔÐÝÝëÕ ÞÑ ØÝáâàãÜÕÝâÐå. ¼ã×ëÚÐ ÑãÔÕâ ÒëÚÛîçÕÝÐ."
 
 #: engines/scumm/players/player_v5m.cpp:107
 msgid ""
 "Could not find the 'Monkey Island' Macintosh executable to read the\n"
 "instruments from. Music will be disabled."
 msgstr ""
+"½Õ ãÔÐÛÞáì ÝÐÙâØ ØáßÞÛÝØÜëÙ äÐÙÛ 'Monkey Island' Macintosh, çâÞÑë ßàÞçØâÐâì\n"
+"ÔÐÝÝëÕ ÞÑ ØÝáâàãÜÕÝâÐå. ¼ã×ëÚÐ ÑãÔÕâ ÒëÚÛîçÕÝÐ."
 
 #: engines/sky/compact.cpp:130
 msgid ""
@@ -3506,14 +3507,13 @@ msgstr ""
 
 #: engines/wintermute/detection.cpp:58
 msgid "Show FPS-counter"
-msgstr ""
+msgstr "¿ÞÚÐ×Ðâì áçñâçØÚ ÚÐÔàÞÒ Ò áÕÚãÝÔã"
 
 #: engines/wintermute/detection.cpp:59
 msgid "Show the current number of frames per second in the upper left corner"
-msgstr ""
+msgstr "¿ÞÚÐ×Ðâì Ò ÒÕàåÝÕÜ ÛÕÒÞÜ ãÓÛã âÕÚãéÕÕ ÚÞÛØçÕáâÒÞ ÚÐÔàÞÒ Ò áÕÚãÝÔã"
 
 #: engines/zvision/detection_tables.h:52
-#, fuzzy
 msgid "Use the original save/load screens instead of the ScummVM interface"
 msgstr ""
 "¸áßÞÛì×ÞÒÐâì ÞàØÓØÝÐÛìÝëÕ íÚàÐÝë ×ÐßØáØ Ø áÞåàÐÝÕÝØï ØÓàë ÒÜÕáâÞ áÔÕÛÐÝÝëå Ò "
@@ -3521,39 +3521,36 @@ msgstr ""
 
 #: engines/zvision/detection_tables.h:61
 msgid "Double FPS"
-msgstr ""
+msgstr "´ÒÞÙÝÞq FPS"
 
 #: engines/zvision/detection_tables.h:62
 msgid "Increase framerate from 30 to 60 FPS"
-msgstr ""
+msgstr "ÃÒÕÛØçØâì çÐáâÞâã ÚÐÔàÞÒ á 30 ÔÞ 60 ³æ"
 
 #: engines/zvision/detection_tables.h:71
-#, fuzzy
 msgid "Enable Venus"
-msgstr "²ÚÛîçØâì àÕÖØÜ ÓÕÛØï"
+msgstr "²ÚÛîçØâì Venus"
 
 #: engines/zvision/detection_tables.h:72
-#, fuzzy
 msgid "Enable the Venus help system"
-msgstr "²ÚÛîçØâì àÕÖØÜ ÓÕÛØï"
+msgstr "²ÚÛîçØâì áØáâÕÜã ßÞÜÞéØ Venus"
 
 #: engines/zvision/detection_tables.h:81
 msgid "Disable animation while turning"
-msgstr ""
+msgstr "²ëÚÛîçØâì ÐÝØÜÐæØî ÒÞ ÒàÕÜï ßÞÒÞàÞâÞÒ"
 
 #: engines/zvision/detection_tables.h:82
 msgid "Disable animation while turning in panorama mode"
-msgstr ""
+msgstr "²ëÚÛîçØâì ÐÝØÜÐæØî ÒÞ ÒàÕÜï ßÞÒÞàÞâÞÒ Ò àÕÖØÜÕ ßÐÝÞàÜÐë"
 
 #: engines/zvision/detection_tables.h:91
 msgid "Use high resolution MPEG video"
-msgstr ""
+msgstr "¸áßÞÛì×ÞÒÐâì ÒØÔÕÞ MPEG ÒëáÞÚÞÓÞ àÐ×àÕèÕÝØï"
 
 #: engines/zvision/detection_tables.h:92
-#, fuzzy
 msgid "Use MPEG video from the DVD version, instead of lower resolution AVI"
 msgstr ""
-"¸áßÞÛì×ÞÒÐâì ÐÛìâÕàÝÐâØÒÝëÙ ÝÐÑÞà áÕàÕÑàïÝëå ÚãàáÞàÞÒ ÒÜÕáâÞ ÞÑëçÝëå ×ÞÛÞâëå"
+"¸áßÞÛì×ÞÒÐâì MPEG ÒØÔÕÞ Ø× DVD ÒÕàáØØ, ÒÜÕáâÞ ÒØÔÕÞ ÝØ×ÚÞÓÞ àÐ×àÕèÕÝØï Ò äÞàÜÐâÕ AVI"
 
 #~ msgid "EGA undithering"
 #~ msgstr "EGA ÑÕ× àÐáâàÐ"


Commit: 9ab8d4a5544340f955ee2fc5e71f01f77b79fa7d
    https://github.com/scummvm/scummvm/commit/9ab8d4a5544340f955ee2fc5e71f01f77b79fa7d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2015-11-07T13:26:55+01:00

Commit Message:
I18N: Update Ukrainian translations

Changed paths:
    po/uk_UA.po



diff --git a/po/uk_UA.po b/po/uk_UA.po
index 12e601b..c4264f8 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -2,22 +2,21 @@
 # Copyright (C) 2010-2015 The ScummVM Team
 # This file is distributed under the same license as the ScummVM package.
 # Lubomyr Lisen, 2010.
-# Eugene Sandulenko <sev at scummvm.org>, 2010-2014
+# Eugene Sandulenko <sev at scummvm.org>, 2010-2015
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: ScummVM 1.3.0svn\n"
 "Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
 "POT-Creation-Date: 2015-10-11 18:59+0100\n"
-"PO-Revision-Date: 2014-07-01 02:34+0300\n"
+"PO-Revision-Date: 2015-11-06 10:07+0300\n"
 "Last-Translator: Eugene Sandulenko <sev at scummvm.org>\n"
 "Language-Team: Ukrainian\n"
 "Language: Ukrainian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3;     plural=n%10==1 && n%100!=11 ? 0 :            n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #: gui/about.cpp:94
 #, c-format
@@ -75,7 +74,7 @@ msgstr "
 
 #: gui/editrecorddialog.cpp:58
 msgid "Author:"
-msgstr ""
+msgstr "°ÒâÞà:"
 
 #: gui/editrecorddialog.cpp:59 gui/launcher.cpp:204
 msgid "Name:"
@@ -83,11 +82,11 @@ msgstr "
 
 #: gui/editrecorddialog.cpp:60
 msgid "Notes:"
-msgstr ""
+msgstr "¿àØÜöâÚØ:"
 
 #: gui/editrecorddialog.cpp:68 gui/predictivedialog.cpp:75
 msgid "Ok"
-msgstr ""
+msgstr "³ÐàÐ×Ô"
 
 #: gui/gui-manager.cpp:117 backends/keymapper/remap-dialog.cpp:53
 #: engines/scumm/help.cpp:126 engines/scumm/help.cpp:141
@@ -529,9 +528,8 @@ msgid "Do you really want to remove this game configuration?"
 msgstr "²Ø ÔöÙáÝÞ åÞçÕâÕ ÒØÔÐÛØâØ ãáâÐÝÞÒÚØ ÔÛï æöô÷ ÓàØ?"
 
 #: gui/launcher.cpp:999
-#, fuzzy
 msgid "Do you want to load saved game?"
-msgstr "²Ø åÞçÕâÕ ×ÐÒÐÝâÐÖØâØ Óàã?"
+msgstr "²Ø åÞçÕâÕ ×ÐÒÐÝâÐÖØâØ ×ÑÕàÕÖÕÝã Óàã?"
 
 #: gui/launcher.cpp:1048
 msgid "This game does not support loading games from the launcher."
@@ -547,7 +545,7 @@ msgstr "
 
 #: gui/launcher.cpp:1161
 msgid "Record..."
-msgstr ""
+msgstr "·ÐßØá..."
 
 #: gui/massadd.cpp:79 gui/massadd.cpp:82
 msgid "... progress ..."
@@ -574,21 +572,19 @@ msgstr "
 
 #: gui/onscreendialog.cpp:101 gui/onscreendialog.cpp:103
 msgid "Stop"
-msgstr ""
+msgstr "ÁâÞß"
 
 #: gui/onscreendialog.cpp:106
 msgid "Edit record description"
-msgstr ""
+msgstr "ÀÕÔÐÓÒÐâØ ÞßØá ×ÐßØáã"
 
 #: gui/onscreendialog.cpp:108
-#, fuzzy
 msgid "Switch to Game"
-msgstr "¿ÕàÕÜÚÝãâØ"
+msgstr "¿ÕàÕÚÛîçØâØáï ÝÐ Óàã"
 
 #: gui/onscreendialog.cpp:110
-#, fuzzy
 msgid "Fast replay"
-msgstr "ÈÒØÔÚØÙ àÕÖØÜ"
+msgstr "ÈÒØÔÚÕ ÒöÔâÒÞàÕÝÝï"
 
 #: gui/options.cpp:85
 msgid "Never"
@@ -987,29 +983,28 @@ msgstr ""
 #. I18N: You must leave "#" as is, only word 'next' is translatable
 #: gui/predictivedialog.cpp:87
 msgid "#  next"
-msgstr ""
+msgstr "#  ÝÐáâ"
 
 #: gui/predictivedialog.cpp:88
 msgid "add"
-msgstr ""
+msgstr "ÔÞÔ"
 
 #: gui/predictivedialog.cpp:92
-#, fuzzy
 msgid "Delete char"
-msgstr "²ØÔÐÛØâØ"
+msgstr "²ØÔÐÛØâØ áÜÜÒÞÛ"
 
 #: gui/predictivedialog.cpp:96
 msgid "<"
-msgstr ""
+msgstr "<"
 
 #. I18N: Pre means 'Predictive', leave '*' as is
 #: gui/predictivedialog.cpp:98
 msgid "*  Pre"
-msgstr ""
+msgstr "*  Pre"
 
 #: gui/recorderdialog.cpp:64
 msgid "Recorder or Playback Gameplay"
-msgstr ""
+msgstr "·ÐßØáãÒÐâØ ÐÑÞ ÒöÔâÒÞàØâØ ßàÞæÕá ÓàØ"
 
 #: gui/recorderdialog.cpp:69 gui/recorderdialog.cpp:156
 #: gui/saveload-dialog.cpp:220 gui/saveload-dialog.cpp:276
@@ -1018,36 +1013,33 @@ msgstr "
 
 #: gui/recorderdialog.cpp:71
 msgid "Record"
-msgstr ""
+msgstr "·ÐßØáÐâØ"
 
 #: gui/recorderdialog.cpp:72
-#, fuzzy
 msgid "Playback"
-msgstr "³àÐâØ"
+msgstr "²öÔâÒÞàØâØ"
 
 #: gui/recorderdialog.cpp:74
 msgid "Edit"
-msgstr ""
+msgstr "ÀÕÔÐÓãÒÐâØ"
 
 #: gui/recorderdialog.cpp:86 gui/recorderdialog.cpp:243
 #: gui/recorderdialog.cpp:253
 msgid "Author: "
-msgstr ""
+msgstr "°ÒâÞà: "
 
 #: gui/recorderdialog.cpp:87 gui/recorderdialog.cpp:244
 #: gui/recorderdialog.cpp:254
 msgid "Notes: "
-msgstr ""
+msgstr "¿àØÜöâÚØ: "
 
 #: gui/recorderdialog.cpp:155
-#, fuzzy
 msgid "Do you really want to delete this record?"
-msgstr "²Ø ÔöÙáÝÞ åÞçÕâÕ ÒØÔÐÛØâØ æÕ ×ÑÕàÕÖÕÝÝï?"
+msgstr "²Ø ÔöÙáÝÞ åÞçÕâÕ ÒØÔÐÛØâØ æÕÙ ×ÐßØá?"
 
 #: gui/recorderdialog.cpp:174
-#, fuzzy
 msgid "Unknown Author"
-msgstr "½ÕÒöÔÞÜÐ ßÞÜØÛÚÐ"
+msgstr "½ÕÒöÔÞÜØÙ ÐÒâÞà"
 
 #: gui/saveload-dialog.cpp:167
 msgid "List view"
@@ -1507,7 +1499,7 @@ msgstr "
 
 #: audio/fmopl.cpp:67
 msgid "ALSA Direct FM"
-msgstr ""
+msgstr "±ÕáßÞáÕàÕÔÝöÙ ALSA FM"
 
 #: audio/mididrv.cpp:209
 #, c-format
@@ -2202,25 +2194,25 @@ msgstr ""
 "²ØÚÞàØáâÞÒãÒÐâØ ÞàØÓöÝÐÛìÝö ×ÑÕàÕÖÕÝÝï/×ÐÒÐÝâÐÖÕÝÝï ÕÚàÐÝØ, ×ÐÜöáâì ScummVM"
 
 #: engines/agi/detection.cpp:157
-#, fuzzy
 msgid "Use an alternative palette"
-msgstr "²ØÚÞàØáâÞÒãÒÐâØ ÐÛìâÕàÝÐâØÒÝØÙ Òáâãß ÓàØ (âöÛìÚØ CD ÒÕàáöï)"
+msgstr "²ØÚÞàØáâÞÒãÒÐâØ ÐÛìâÕàÝÐâØÒÝã ßÐÛöâàã"
 
 #: engines/agi/detection.cpp:158
 msgid ""
 "Use an alternative palette, common for all Amiga games. This was the old "
 "behavior"
 msgstr ""
+"²ØÚÞàØáâÞÒãÒÐâØ ÐÛìâÕàÝÐâØÒÝã ßÐÛöâàã, ×ÒØçÐÙÝã ÔÛï öÓÞà × Amiga. ÆÕ ÑãÛÐ áâÐàÐ ßÞÒÕÔöÝÚÐ."
 
 #: engines/agi/detection.cpp:167
-#, fuzzy
 msgid "Mouse support"
-msgstr "¿öÔâàØÜãÒÐâØ ¿àÞßãáâØâØ"
+msgstr "¿öÔâàØÜÚÐ ÜØèö"
 
 #: engines/agi/detection.cpp:168
 msgid ""
 "Enables mouse support. Allows to use mouse for movement and in game menus."
 msgstr ""
+"²ÚÛîçÐô ßöÔâàØÜÚã ÜØèö. ´Þ×ÒÞÛïô ÒØÚÞàØáâÞÒãÒÐâØ ÜØèã ÔÛï ßÕàÕáãÒÐÝÝï âÐ ãßàÐÒÛöÝÝï ÜÕÝî."
 
 #: engines/agi/saveload.cpp:816 engines/drascula/saveload.cpp:349
 #: engines/dreamweb/saveload.cpp:169 engines/neverhood/menumodule.cpp:886
@@ -2273,13 +2265,12 @@ msgid "Cutscene file '%s' not found!"
 msgstr "ÄÐÙÛ àÞÛØÚã '%s' ÝÕ ×ÝÐÙÔÕÝÞ!"
 
 #: engines/cge/detection.cpp:105 engines/cge2/detection.cpp:101
-#, fuzzy
 msgid "Color Blind Mode"
-msgstr "ÀÕÖØÜ ÚÛöÚöÒ"
+msgstr "ÀÕÖØÜ ÑÕ× ÚÞÛìÞàã"
 
 #: engines/cge/detection.cpp:106 engines/cge2/detection.cpp:102
 msgid "Enable Color Blind Mode by default"
-msgstr ""
+msgstr "²ÚÛîçÐô àÕÖØÜ ÔÛï ÛîÔÕÙ × ßÞÓöàèÕÝÝØÜ áßàØïââïÜ ÚÞÛìÞàã"
 
 #: engines/drascula/saveload.cpp:47
 msgid ""
@@ -2334,11 +2325,11 @@ msgstr "
 
 #: engines/hopkins/detection.cpp:76 engines/hopkins/detection.cpp:86
 msgid "Gore Mode"
-msgstr ""
+msgstr "ÀÕÖØÜ × ÚàÞÒ'î"
 
 #: engines/hopkins/detection.cpp:77 engines/hopkins/detection.cpp:87
 msgid "Enable Gore Mode when available"
-msgstr ""
+msgstr "ÃÒöÜÚÝãâØ àÕÖØÜ × ÚàÞÒ'î, ïÚéÞ ô ÔÞáâãßÝØÙ"
 
 #. I18N: Studio audience adds an applause and cheering sounds whenever
 #. Malcolm makes a joke.
@@ -2470,6 +2461,12 @@ msgid ""
 "Do you wish to use this save game file with ScummVM?\n"
 "\n"
 msgstr ""
+"½ÐáâãßÝØÙ ÞàØÓöÝÐÛìÝØÙ äÐÙÛ áâÐÝã ÓàØ ÑãÛÞ ×ÝÐÙÔÕÝÞ ã ÒÐèöÙ ßÐßæö × ÓàÞî:\n"
+"\n"
+"%s %s\n"
+"\n"
+"ÇØ ÒØ ÑÐÖÐôâÕ ÒØÚÞàØáâÞÒãÒÐâØ æÕÙ áâÐÝ ÓàØ ×ö ScummVM?\n"
+"\n"
 
 #: engines/kyra/saveload_eob.cpp:590
 #, c-format
@@ -2477,6 +2474,8 @@ msgid ""
 "A save game file was found in the specified slot %d. Overwrite?\n"
 "\n"
 msgstr ""
+"ÄÐÙÛ áâÐÝã ÓàØ ÑãÛÞ ×ÝÐÙÔÕÝÞ ã ÒÚÐ×ÐÝöÙ ßÞ×Øæö÷ %d. ¿ÕàÕâÕàâØ?\n"
+"\n"
 
 #: engines/kyra/saveload_eob.cpp:623
 #, c-format
@@ -2488,6 +2487,10 @@ msgid ""
 "'import_savefile'.\n"
 "\n"
 msgstr ""
+"%d ÞàØÓöÝÐÛìÝØå äÐÙÛöÒ ×ö áâÐÝÞÜ ÓàØ ÑãÛÞ ãáßöèÝÞ öÜßÞàâÞÒÐÝÞ ã\n"
+"ScummVM. ÏÚéÞ ÒØ ×ÐåÞçÕâÕ ßö×ÝöèÕ öÜßÞàâãÒÐâØ ÞàØÓöÝÐÛìÝö äÐÙÛØ ×ö áâÐÝÞÜ ÓàØ, ÒÐÜ ßÞâàöÑÝÞ\n"
+"ÒöÔÚàØâØ ÚÞÝáÞÛì ÒöÔÛÐÔçØÚÐ ö ÒÒÕáâØ ÚÞÜÐÝÔã 'import_savefile'.\n"
+"\n"
 
 #. I18N: Option for fast scene switching
 #: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:167
@@ -2703,15 +2706,13 @@ msgstr "
 #. "Moechten Sie wirklich neu starten?  (J/N)J"
 #. Will react to J as 'Yes'
 #: engines/scumm/dialogs.cpp:183
-#, fuzzy
 msgid "Are you sure you want to restart?  (Y/N)Y"
-msgstr "²Ø ãßÕÒÝÕÝö, éÞ åÞçÕâÕ àÞ×ßÞçÐâØ áßÞçÐâÚã?  (Y/N)"
+msgstr "²Ø ãßÕÒÝÕÝö, éÞ åÞçÕâÕ àÞ×ßÞçÐâØ áßÞçÐâÚã?  (Y/N)Y"
 
 #. I18N: you may specify 'Yes' symbol at the end of the line. See previous comment
 #: engines/scumm/dialogs.cpp:185
-#, fuzzy
 msgid "Are you sure you want to quit?  (Y/N)Y"
-msgstr "²Ø ãßÕÒÝÕÝö, éÞ åÞçÕâÕ ÒØÙâØ?  (Y/N)"
+msgstr "²Ø ãßÕÒÝÕÝö, éÞ åÞçÕâÕ ÒØÙâØ?  (Y/N)Y"
 
 #: engines/scumm/dialogs.cpp:190
 msgid "Play"
@@ -3219,25 +3220,24 @@ msgid "Third kid"
 msgstr "ÂàÕâï ÔØâØÝÐ"
 
 #: engines/scumm/help.cpp:292
-#, fuzzy
 msgid "Toggle Inventory/IQ Points display"
-msgstr "¿ÕàÕÜÚÝãâØ ßÞÚÐ×ãÒÐÝÝï Ò æÕÝâàö ÕÚàÐÝã"
+msgstr "¿ÕàÕÜÚÝãâØ ßÞÚÐ×ãÒÐÝÝï öÝÒÕÝâÐàî ÐÑÞ ×ÝÐçÕÝÝï IQ"
 
 #: engines/scumm/help.cpp:293
 msgid "Toggle Keyboard/Mouse Fighting (*)"
-msgstr ""
+msgstr "¿ÕàÕÜÚÝãâØ ÚÕàãÒÐÝÝï ÑöÙÚÞî ºÛÐÒöÐâãàÐ/¼ØèÐ (*)"
 
 #: engines/scumm/help.cpp:295
 msgid "* Keyboard Fighting is always on,"
-msgstr ""
+msgstr "* ÃßàÐÒÛöÝÝï ÚÛÐÒöÐâãàÞî ×ÐÒÖÔØ ÒÛîçÕÝÕ, âÞÜã, "
 
 #: engines/scumm/help.cpp:296
 msgid "  so despite the in-game message this"
-msgstr ""
+msgstr "  ÝÕ×ÒÐÖÐîçØ ÝÐ ßÞÒöÔÞÜÛÕÝÝï ÓàØ, æÕ ÝÐÛÐèâãÒÐÝÝï"
 
 #: engines/scumm/help.cpp:297
 msgid "  actually toggles Mouse Fighting Off/On"
-msgstr ""
+msgstr "  ÝÐáßàÐÒÔö ÒÚÛîçÐô âÐ ÒØÚÛîçÐô ãßàÐÒÛöÝÝï ÜØèÕî."
 
 #: engines/scumm/help.cpp:304
 msgid "Fighting controls (numpad):"
@@ -3274,7 +3274,7 @@ msgstr "
 
 #: engines/scumm/help.cpp:315
 msgid "Sucker punch"
-msgstr ""
+msgstr "±ØâØ ××ÐÔã"
 
 #: engines/scumm/help.cpp:318
 msgid "These are for Indy on left."
@@ -3333,23 +3333,20 @@ msgid "Fly to lower right"
 msgstr "»ÕâöâØ ÔÞÝØ×ã ÝÐßàÐÒÞ"
 
 #: engines/scumm/input.cpp:572
-#, fuzzy
 msgid "Snap scroll on"
-msgstr "¿ÛÐÒÝÐ ßàÞÚàãâÚÐ"
+msgstr "¿àÞÚàãâÚÐ áâàØÑÚÐÜØ"
 
 #: engines/scumm/input.cpp:574
 msgid "Snap scroll off"
-msgstr ""
+msgstr "²ÜØÚÐô ßàÞÚàãâÚã áâàØÑÚÐÜØ"
 
 #: engines/scumm/input.cpp:587
-#, fuzzy
 msgid "Music volume: "
-msgstr "³ãçÝöáâì Üã×ØÚØ:"
+msgstr "³ãçÝöáâì Üã×ØÚØ: "
 
 #: engines/scumm/input.cpp:604
-#, fuzzy
 msgid "Subtitle speed: "
-msgstr "ÈÒØÔ. áãÑâØâàöÒ:"
+msgstr "ÈÒØÔ. áãÑâØâàöÒ: "
 
 #: engines/scumm/scumm.cpp:1832
 #, c-format
@@ -3361,27 +3358,30 @@ msgstr ""
 "LucasArts, ßàÞâÕ %s ÒöÔáãâÝöÙ. ¿ÕàÕÜØÚÐîáì ÝÐ AdLib."
 
 #: engines/scumm/scumm.cpp:2644
-#, fuzzy
 msgid ""
 "Usually, Maniac Mansion would start now. But for that to work, the game "
 "files for Maniac Mansion have to be in the 'Maniac' directory inside the "
 "Tentacle game directory, and the game has to be added to ScummVM."
 msgstr ""
-"·Ð×ÒØçÐÙ, ×ÐàÐ× ÑØ ×ÐßãáâØÒáï Maniac Mansion. ¿àÞâÕ ScummVM éÕ æìÞÓÞ ÝÕ "
-"ÒÜöô. ÉÞÑ ÓàÐâØ ã ÝìÞÓÞ, ÞÑÕàöâì '´ÞÔÐâØ Óàã' ã ßÞçÐâÚÞÒÞÜã ÜÕÝî ScummVM, ö "
-"ÒØÑÕàöâì ßÐßÚã Maniac ÒáÕàÕÔÕÝö ßÒßÚØ × ÓàÞî Tentacle."
+"·Ð×ÒØçÐÙ, ×ÐàÐ× ÑØ ×ÐßãáâØÒáï Maniac Mansion. °ÛÕ, éÞÑ æÕ ÜÞÓÛÞ ßàÐæîÒÐâØ, "
+"ÒÐÜ ßÞâàöÑÝÞ ßÕàÕßØáÐâØ äÐÙÛØ ÓàØ Maniac Manssion ã ßÐßÚã Maniac ÒáÕàÕÔØÝö "
+"ßÒßÚØ × ÓàÞî Tentacle, Ð âÐÚÞÖ ÔÞÔÐâØ áÐÜã Óàã ã ScummVM."
 
 #: engines/scumm/players/player_v3m.cpp:129
 msgid ""
 "Could not find the 'Loom' Macintosh executable to read the\n"
 "instruments from. Music will be disabled."
 msgstr ""
+"½Õ ÒÐÔÛÞáï ×ÝÐÙâØ äÐÙÛ ßàÞÓàÐÜØ 'Loom' Macintosh ÐÑØ ßàÞçØâÐâØ\n"
+"× ÝìÞÓÞ öÝáâàãÜÕÝâØ. ¼ã×ØÚã ÑãÛÞ ÒØÜÚÝÕÝÞ."
 
 #: engines/scumm/players/player_v5m.cpp:107
 msgid ""
 "Could not find the 'Monkey Island' Macintosh executable to read the\n"
 "instruments from. Music will be disabled."
 msgstr ""
+"½Õ ÒÐÔÛÞáï ×ÝÐÙâØ äÐÙÛ ßàÞÓàÐÜØ 'Monkey Island' Macintosh ÐÑØ ßàÞçØâÐâØ\n"
+"× ÝìÞÓÞ öÝáâàãÜÕÝâØ. ¼ã×ØÚã ÑãÛÞ ÒØÜÚÝÕÝÞ."
 
 #: engines/sky/compact.cpp:130
 msgid ""
@@ -3495,136 +3495,46 @@ msgstr ""
 
 #: engines/wintermute/detection.cpp:58
 msgid "Show FPS-counter"
-msgstr ""
+msgstr "¿ÞÚÐ×ÐâØ ÛöçØÛìÝØÚ ÚÐÔàöØ"
 
 #: engines/wintermute/detection.cpp:59
 msgid "Show the current number of frames per second in the upper left corner"
-msgstr ""
+msgstr "¿ÞÚÐ×ãô ã ÒÕàÝìÞÜã ÛöÒÞÜã Úãâö ßÞâÞçÝã ÚöÛìÚöáâì ÚÐÔàöÒ ÝÐ áÕÚãÝÔã"
 
 #: engines/zvision/detection_tables.h:52
-#, fuzzy
 msgid "Use the original save/load screens instead of the ScummVM interface"
 msgstr ""
-"²ØÚÞàØáâÞÒãÒÐâØ ÞàØÓöÝÐÛìÝö ×ÑÕàÕÖÕÝÝï/×ÐÒÐÝâÐÖÕÝÝï ÕÚàÐÝØ, ×ÐÜöáâì ScummVM"
+"²ØÚÞàØáâÞÒãÒÐâØ ÞàØÓöÝÐÛìÝö ÕÚàÐÝØ ×ÑÕàÕÖÕÝÝï/×ÐÒÐÝâÐÖÕÝÝï ×ÐÜöáâì ScummVM"
 
 #: engines/zvision/detection_tables.h:61
 msgid "Double FPS"
-msgstr ""
+msgstr "¿ÞÔÒöÙÝÐ FPS"
 
 #: engines/zvision/detection_tables.h:62
 msgid "Increase framerate from 30 to 60 FPS"
-msgstr ""
+msgstr "¿öÔÒØéØâØ ÚöÛìÚöáâì ÚÐÔàöÒ ÝÐ áÕÚãÝÔã × 30 ÔÞ 60"
 
 #: engines/zvision/detection_tables.h:71
-#, fuzzy
 msgid "Enable Venus"
-msgstr "ÃÒöÜÚÝãâØ àÕÖØÜ ³ÕÛöãÜ"
+msgstr "ÃÒöÜÚÝãâØ Venus"
 
 #: engines/zvision/detection_tables.h:72
-#, fuzzy
 msgid "Enable the Venus help system"
-msgstr "ÃÒöÜÚÝãâØ àÕÖØÜ ³ÕÛöãÜ"
+msgstr "ÃÒöÜÚÝãâØ ÔÞßÞÜöÖÝã áØáâÕÜã Venus"
 
 #: engines/zvision/detection_tables.h:81
 msgid "Disable animation while turning"
-msgstr ""
+msgstr "²ØÚÛîçØâØ ÐÝöÜÐæöî ßöÔ çÐá ßÞÒÞàÞâöÒ"
 
 #: engines/zvision/detection_tables.h:82
 msgid "Disable animation while turning in panorama mode"
-msgstr ""
+msgstr "²ØÚÛîçÐô ÐÝöÜÐæöî ßöÔ çÐ ßÞÒÞàÞâöÒ ã àÕÖØÜö ßÐÝÞàÐÜØ"
 
 #: engines/zvision/detection_tables.h:91
 msgid "Use high resolution MPEG video"
-msgstr ""
+msgstr "²ØÚÞàØáâÞÒãÒÐâØ ÒöÔÕÞ MPEG × ßöÔÒØéÕÝÞî àÞ×ÔöÛìÝöáâî"
 
 #: engines/zvision/detection_tables.h:92
-#, fuzzy
 msgid "Use MPEG video from the DVD version, instead of lower resolution AVI"
 msgstr ""
-"²ØÚÞàØáâÞÒãÒÐâØ ÐÛìâÕàÝÐâØÒÝØÙ ÝÐÑöà áàöÑÝØå ÚãàáÞàöÒ, ×ÐÜöáâì ×ÒØçÐÙÝØå "
-"×ÞÛÞâØå"
-
-#~ msgid "EGA undithering"
-#~ msgstr "EGA ÑÕ× àÐáâàãÒÐÝÝï"
-
-#~ msgid "Enable undithering in EGA games"
-#~ msgstr "ÃÒöÜÚÝãâØ ÐÝâØ-×ÓÛÐÔÖãÒÐÝÝï Ò EGA öÓàÐå"
-
-#~ msgid "MPEG-2 cutscenes found but ScummVM has been built without MPEG-2"
-#~ msgstr ""
-#~ "·ÝÐÙÔÕÝö àÞÛØÚØ MPEG-2, ÐÛÕ ScummVM ÑãÒ ×öÑàÐÝØÙ ÑÕ× ßöÔâàØÜÚØ MPEG-2"
-
-#~ msgctxt "lowres"
-#~ msgid "Mass Add..."
-#~ msgstr "´ÞÔ. ÑÐÓÐâÞ..."
-
-#~ msgid ""
-#~ "Turns off General MIDI mapping for games with Roland MT-32 soundtrack"
-#~ msgstr ""
-#~ "²ØÜØÚÐô ÜÐßöÝÓ General MIDI ÔÛï öÓÞà ×ö ×ÒãÚÞÒÞî ÔÞàöÖÚÞî ÔÛï Roland MT-32"
-
-#~ msgid "Standard (16bpp)"
-#~ msgstr "ÁâÐÝÔÐàâÝØÙ àÐáâÕàØ×ÐâÞà (16bpp)"
-
-#~ msgid "MPEG2 cutscenes are no longer supported"
-#~ msgstr "ÀÞÛØÚØ MPEG2 ÑöÛìèÕ ÝÕ ßöÔâàØÜãîâìáï"
-
-#~ msgid "OpenGL Normal"
-#~ msgstr "OpenGL ÝÞàÜÐÛìÝØÙ"
-
-#~ msgid "OpenGL Conserve"
-#~ msgstr "OpenGL ·ÑÕàÕÖÕÝØÙ"
-
-#~ msgid "OpenGL Original"
-#~ msgstr "OpenGL ¾àØÓöÝÐÛìÝØÙ"
-
-#~ msgid "Current display mode"
-#~ msgstr "¿ÞâÞçÝØÙ ÒöÔÕÞàÕÖØÜ"
-
-#~ msgid "Current scale"
-#~ msgstr "¿ÞâÞçÝØÙ ÜÐáèâÐÑ"
-
-#~ msgid "Active filter mode: Linear"
-#~ msgstr "°ÚâØÒÝØÙ àÕÖØÜ äöÛìâàÐæö÷: »öÝöÙÝØÙ"
-
-#~ msgid "Active filter mode: Nearest"
-#~ msgstr "°ÚâØÒÝØÙ àÕÖØÜ äöÛìâàÐæö÷: ½ÐÙÑÛØÖçÕ"
-
-#~ msgid "Enable Roland GS Mode"
-#~ msgstr "ÃÒöÜÚÝãâØ àÕÖØÜ Roland GS"
-
-#~ msgid "Hercules Green"
-#~ msgstr "Hercules ·ÕÛÕÝØÙ"
-
-#~ msgid "Hercules Amber"
-#~ msgstr "Hercules ±ãàèâØÝÝØÙ"
-
-#~ msgctxt "lowres"
-#~ msgid "Hercules Green"
-#~ msgstr "Hercules ·ÕÛÕÝØÙ"
-
-#~ msgctxt "lowres"
-#~ msgid "Hercules Amber"
-#~ msgstr "Hercules ±ãàèâØÝÝØÙ"
-
-#~ msgid "Save game failed!"
-#~ msgstr "½Õ ÒÔÐÛÞáï ×ÑÕàÕÓâØ Óàã!"
-
-#~ msgctxt "lowres"
-#~ msgid "Add Game..."
-#~ msgstr "´ÞÔÐâØ Óàã..."
-
-#~ msgid "Add Game..."
-#~ msgstr "´ÞÔÐâØ Óàã..."
-
-#~ msgid "Discovered %d new games."
-#~ msgstr "·ÝÐÙÔÕÝÞ %d ÝÞÒØå öÓÞà."
-
-#~ msgid "Command line argument not processed"
-#~ msgstr "°àÓãÜÕÝâØ ÚÞÜÐÝÔÝÞÓÞ àïÔÚã ÝÕ ÞÑàÞÑÛÕÝö"
-
-#~ msgid "FM Towns Emulator"
-#~ msgstr "µÜãÛïâÞà FM Towns"
-
-#~ msgid "Invalid Path"
-#~ msgstr "½ÕßàÐÒØÛìÝØÙ èÛïå"
+"²ØÚÞàØáâÞÒãÒÐâØ ÒöÔÕÞ MPEG × DVD-ÒÕàáö÷, ×ÐÜöáâì äÐÙÛöÒ AVI × ÝöÖçÞî àÞ×ÔöÛìÝÞî ×ÔÐâÝöáâî"


Commit: ac29f2f7fca13f4c444e4b130f86992c2419acb8
    https://github.com/scummvm/scummvm/commit/ac29f2f7fca13f4c444e4b130f86992c2419acb8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2015-11-07T13:26:55+01:00

Commit Message:
NEWS: Update SCUMM section

Changed paths:
    NEWS



diff --git a/NEWS b/NEWS
index bee4a04..9db95f4 100644
--- a/NEWS
+++ b/NEWS
@@ -53,6 +53,8 @@ For a more comprehensive changelog of the latest experimental code, see:
    - Improve support for Japanese PC-9801 games.
 
  SCUMM:
+   - Major improvements to Korean versions text rendering.
+   - Implemented original Maniac Mansion v0-v1 walking code.
    - It is now possible to play Maniac Mansion from within Day of the
      Tentacle, with a few caveats. See README for details.
 


Commit: 51750206aaffdfd77a94a31af1a9490fa8f84d82
    https://github.com/scummvm/scummvm/commit/51750206aaffdfd77a94a31af1a9490fa8f84d82
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2015-11-07T13:26:56+01:00

Commit Message:
NEWS: Announce BBVS support

Changed paths:
    NEWS



diff --git a/NEWS b/NEWS
index 9db95f4..765329a 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ For a more comprehensive changelog of the latest experimental code, see:
    - Added support for Sfinx.
    - Added support for Zork Nemesis: The Forbidden Lands.
    - Added support for Zork: Grand Inquisitor.
+   - Added support for Beavis and Butthead in Virtual Stupidity.
 
  General:
    - Updated Munt MT-32 emulation code to version 1.5.0.


Commit: 7d58a50c46ecb7001702a696a3c92eb5ab3d0a36
    https://github.com/scummvm/scummvm/commit/7d58a50c46ecb7001702a696a3c92eb5ab3d0a36
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2015-11-07T13:26:56+01:00

Commit Message:
GUI: Removed 64k limit on built-in theme XML size

Changed paths:
    gui/ThemeEngine.cpp
    gui/themes/default.inc
    gui/themes/scummtheme.py



diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index ed01204..016cfc1 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -739,12 +739,24 @@ bool ThemeEngine::loadDefaultXML() {
 	// Use the Python script "makedeftheme.py" to convert a normal XML theme
 	// into the "default.inc" file, which is ready to be included in the code.
 #ifndef DISABLE_GUI_BUILTIN_THEME
-	const char *defaultXML =
 #include "themes/default.inc"
-	    ;
+	int xmllen = 0;
+
+	for (int i = 0; i < ARRAYSIZE(defaultXML); i++)
+		xmllen += strlen(defaultXML[i]);
+
+	byte *tmpXML = (byte *)malloc(xmllen + 1);
+
+	for (int i = 0; i < ARRAYSIZE(defaultXML); i++)
+		strncat((char *)tmpXML, defaultXML[i], xmllen);
+
+	if (!_parser->loadBuffer(tmpXML, xmllen)) {
+		free(tmpXML);
 
-	if (!_parser->loadBuffer((const byte *)defaultXML, strlen(defaultXML)))
 		return false;
+	}
+
+	free(tmpXML);
 
 	_themeName = "ScummVM Classic Theme (Builtin Version)";
 	_themeId = "builtin";
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 33aac29..90d7967 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1,5 +1,6 @@
- "<?xml version = '1.0'?>"
-"<render_info>"
+const char *defaultXML1 = "<?xml version = '1.0'?>"
+;
+ const char *defaultXML2 = "<render_info>"
 "<palette>"
 "<color name='black' "
 "rgb='0,0,0' "
@@ -610,7 +611,8 @@
 "/>"
 "</drawdata>"
 "</render_info>"
-"<layout_info resolution='y>399'>"
+;
+ const char *defaultXML3 = "<layout_info resolution='y>399'>"
 "<globals>"
 "<def var='Line.Height' value='16' />"
 "<def var='Font.Height' value='16' />"
@@ -1895,7 +1897,8 @@
 "</layout>"
 "</dialog>"
 "</layout_info>"
-"<layout_info resolution='y<400'>"
+;
+ const char *defaultXML4 = "<layout_info resolution='y<400'>"
 "<globals>"
 "<def var='Line.Height' value='12' />"
 "<def var='Font.Height' value='10' />"
@@ -3149,3 +3152,5 @@
 "</layout>"
 "</dialog>"
 "</layout_info>"
+;
+const char *defaultXML[] = { defaultXML1, defaultXML2, defaultXML3, defaultXML4 };
diff --git a/gui/themes/scummtheme.py b/gui/themes/scummtheme.py
index 94dc08f..d5fa4df 100755
--- a/gui/themes/scummtheme.py
+++ b/gui/themes/scummtheme.py
@@ -35,11 +35,15 @@ def buildAllThemes():
 		if os.path.isdir(os.path.join('.', f)) and not f[0] == '.':
 			buildTheme(f)
 
-def parseSTX(theme_file, def_file):
+def parseSTX(theme_file, def_file, subcount):
 	comm = re.compile("<!--(.*?)-->", re.DOTALL)
 	head = re.compile("<\?(.*?)\?>")
 
 	strlitcount = 0
+	subcount += 1
+
+	def_file.write(";\n const char *defaultXML" + str(subcount) + " = ")
+
 	output = ""
 	for line in theme_file:
 		output +=  line.rstrip("\r\n\t ").lstrip()
@@ -55,8 +59,12 @@ def parseSTX(theme_file, def_file):
 	for line in output.splitlines():
 		if line and not line.isspace():
 			strlitcount += len(line)
+			if strlitcount > 65535:
+				subcount += 1
+				def_file.write(";\n const char *defaultXML" + str(subcount) + " = ")
+				strlitcount = len(line)
 			def_file.write("\"" + line + "\"\n")
-	return strlitcount
+	return subcount
 
 def buildDefTheme(themeName):
 	def_file = open("default.inc", "w")
@@ -64,8 +72,8 @@ def buildDefTheme(themeName):
 	if not os.path.isdir(themeName):
 		print ("Cannot open default theme dir.")
 
-	def_file.write(""" "<?xml version = '1.0'?>"\n""")
-	strlitcount = 24
+	def_file.write("""const char *defaultXML1 = "<?xml version = '1.0'?>"\n""")
+	subcount = 1
 
 	filenames = os.listdir(themeName)
 	filenames.sort()
@@ -73,16 +81,16 @@ def buildDefTheme(themeName):
 		filename = os.path.join(themeName, filename)
 		if os.path.isfile(filename) and filename.endswith(".stx"):
 			theme_file = open(filename, "r")
-			strlitcount += parseSTX(theme_file, def_file)
+			subcount = parseSTX(theme_file, def_file, subcount)
 			theme_file.close()
 
-	def_file.close()
+	def_file.write(";\nconst char *defaultXML[] = { defaultXML1")
+	for sub in range(2, subcount + 1):
+		def_file.write(", defaultXML" + str(sub))
 
-	if strlitcount > 65535:
-		print("WARNING: default.inc string literal is of length %d which exceeds the" % strlitcount)
-		print("         maximum length of 65536 that C++ compilers are required to support.")
-		print("         It is likely that bugs will occur dependent on compiler behaviour.")
-		print("         To avoid this, reduce the size of the theme.")
+	def_file.write(" };\n")
+
+	def_file.close()
 
 def printUsage():
 	print ("===============================")


Commit: 54e136d27e7ca3f22e8eac211f29ae2e146daf76
    https://github.com/scummvm/scummvm/commit/54e136d27e7ca3f22e8eac211f29ae2e146daf76
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2015-11-07T13:26:56+01:00

Commit Message:
TESTBED: Added detection file to repository

Changed paths:
  A dists/engine-data/testbed-audiocd-files/TESTBED



diff --git a/dists/engine-data/testbed-audiocd-files/TESTBED b/dists/engine-data/testbed-audiocd-files/TESTBED
new file mode 100644
index 0000000..e69de29






More information about the Scummvm-git-logs mailing list