[Scummvm-git-logs] scummvm master -> 5bed4bf794cdd52dca843aa548d4fcf16fd48d50

Tue Nov 29 23:17:54 CET 2016

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

Summary:
d3cd42e1d4 ALL: Fix usage of 'etc.'
38eb27212d ALL: savegame => saved game
6f38c1e55d ALL: game state => saved game
b041618a42 ALL: Remove comma before the word 'instead'
e95c2cc3ff ALL: save file => saved game
5bed4bf794 Merge pull request #864 from BenCastricum/editing


Commit: d3cd42e1d4bf4d7b341a51b3412501207d934733
    https://github.com/scummvm/scummvm/commit/d3cd42e1d4bf4d7b341a51b3412501207d934733
Author: Ben Castricum (github at bencastricum.nl)
Date: 2016-11-29T20:14:41+01:00

Commit Message:
ALL: Fix usage of 'etc.'

Changed paths:
    engines/advancedDetector.cpp
    engines/scumm/detection.cpp

diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index fd3e43c..3b130de 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -334,7 +334,7 @@ void AdvancedMetaEngine::reportUnknown(const Common::FSNode &path, const ADFileP
 	Common::String report = Common::String::format(
 			_("The game in '%s' seems to be unknown.\n"
 			  "Please, report the following data to the ScummVM team along with name\n"
-			  "of the game you tried to add and its version/language/etc.:"), path.getPath().c_str()) + "\n";
+			  "of the game you tried to add and its version, language, etc.:"), path.getPath().c_str()) + "\n";
 	report += "\n";
 
 	for (ADFilePropertiesMap::const_iterator file = filesProps.begin(); file != filesProps.end(); ++file)
diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index 88615e3..cd2055e 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -1119,8 +1119,8 @@ Common::Error ScummMetaEngine::createInstance(OSystem *syst, Engine **engine) co
 
 		md5Warning = _("Your game version appears to be unknown. If this is *NOT* a fan-modified\n"
 		               "version (in particular, not a fan-made translation), please, report the\n"
-		               "following data to the ScummVM team along with name of the game you tried\n"
-		               "to add and its version/language/etc.:\n");
+		               "following data to the ScummVM team along with the name of the game you tried\n"
+		               "to add and its version, language, etc.:\n");
 
 		md5Warning += Common::String::format("  SCUMM gameid '%s', file '%s', MD5 '%s'\n\n",
 				res.game.gameid,


Commit: 38eb27212d32351e885806f96555e58f081c6844
    https://github.com/scummvm/scummvm/commit/38eb27212d32351e885806f96555e58f081c6844
Author: Ben Castricum (github at bencastricum.nl)
Date: 2016-11-29T20:15:13+01:00

Commit Message:
ALL: savegame => saved game

Changed paths:
    engines/sherlock/detection.cpp
    engines/toon/toon.cpp


diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
index c6e632f..40ff081 100644
--- a/engines/sherlock/detection.cpp
+++ b/engines/sherlock/detection.cpp
@@ -68,8 +68,8 @@ static const ADExtraGuiOptionsMap optionsList[] = {
 	{
 		GAMEOPTION_ORIGINAL_SAVES,
 		{
-			_s("Use original savegame dialog"),
-			_s("Files button in-game shows original savegame dialog rather than the ScummVM menu"),
+			_s("Use original save/load screens"),
+			_s("Use the original save/load screens, instead of the ScummVM ones"),
 			"originalsaveload",
 			false
 		}
diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index 0dddc22..43fb3a1 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -236,11 +236,11 @@ void ToonEngine::parseInput() {
 				if (slotNum >= 0 && slotNum <= 9 && canLoadGameStateCurrently()) {
 					if (loadGame(slotNum)) {
 						// ok
-						Common::String buf = Common::String::format(_("Savegame #%d quick loaded"), slotNum);
+						Common::String buf = Common::String::format(_("Saved game #%d quick loaded"), slotNum);
 						GUI::TimedMessageDialog dialog(buf, 1000);
 						dialog.runModal();
 					} else {
-						Common::String buf = Common::String::format(_("Could not quick load the savegame #%d"), slotNum);
+						Common::String buf = Common::String::format(_("Could not quick load the saved game #%d"), slotNum);
 						GUI::MessageDialog dialog(buf, "OK", 0);
 						warning("%s", buf.c_str());
 						dialog.runModal();
@@ -3362,7 +3362,7 @@ bool ToonEngine::saveGame(int32 slot, const Common::String &saveGameDesc) {
 	saveFile->writeSint32BE(TOON_SAVEGAME_VERSION);
 
 	if (savegameDescription == "") {
-		savegameDescription = "Untitled savegame";
+		savegameDescription = "Untitled saved game";
 	}
 
 	saveFile->writeSint16BE(savegameDescription.size() + 1);


Commit: 6f38c1e55dd9d9ad764faf123c3ee01ae23d7ffc
    https://github.com/scummvm/scummvm/commit/6f38c1e55dd9d9ad764faf123c3ee01ae23d7ffc
Author: Ben Castricum (github at bencastricum.nl)
Date: 2016-11-29T20:15:20+01:00

Commit Message:
ALL: game state => saved game

Changed paths:
    common/error.cpp
    engines/agos/saveload.cpp
    engines/dialogs.cpp
    engines/engine.cpp
    engines/gob/inter_geisha.cpp
    engines/gob/inter_playtoons.cpp
    engines/gob/inter_v2.cpp
    engines/kyra/saveload.cpp
    engines/pegasus/pegasus.cpp
    engines/scumm/help.cpp
    engines/scumm/scumm.cpp
    engines/tinsel/saveload.cpp
    gui/saveload-dialog.cpp


diff --git a/common/error.cpp b/common/error.cpp
index 53cd8ce..bbbcb7c 100644
--- a/common/error.cpp
+++ b/common/error.cpp
@@ -65,7 +65,7 @@ static String errorToString(ErrorCode errorCode) {
 	case kEnginePluginNotFound:
 		return _s("Could not find suitable engine plugin");
 	case kEnginePluginNotSupportSaves:
-		return _s("Engine plugin does not support save states");
+		return _s("Engine plugin does not support saved games");
 
 	case kUserCanceled:
 		return _s("User canceled");
diff --git a/engines/agos/saveload.cpp b/engines/agos/saveload.cpp
index 6ec8931..3dce7bf 100644
--- a/engines/agos/saveload.cpp
+++ b/engines/agos/saveload.cpp
@@ -156,7 +156,7 @@ void AGOSEngine::quickLoadOrSave() {
 		Subroutine *sub;
 		success = loadGame(genSaveName(_saveLoadSlot));
 		if (!success) {
-			buf = Common::String::format(_("Failed to load game state from file:\n\n%s"), filename.c_str());
+			buf = Common::String::format(_("Failed to load saved game from file:\n\n%s"), filename.c_str());
 		} else if (getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) {
 			drawIconArray(2, me(), 0, 0);
 			setBitFlag(97, true);
@@ -191,7 +191,7 @@ void AGOSEngine::quickLoadOrSave() {
 	} else {
 		success = saveGame(_saveLoadSlot, _saveLoadName);
 		if (!success)
-			buf = Common::String::format(_("Failed to save game state to file:\n\n%s"), filename.c_str());
+			buf = Common::String::format(_("Failed to save game to file:\n\n%s"), filename.c_str());
 	}
 
 	if (!success) {
@@ -199,7 +199,7 @@ void AGOSEngine::quickLoadOrSave() {
 		dialog.runModal();
 
 	} else if (_saveLoadType == 1) {
-		buf = Common::String::format(_("Successfully saved game state in file:\n\n%s"), filename.c_str());
+		buf = Common::String::format(_("Successfully saved game in file:\n\n%s"), filename.c_str());
 		GUI::TimedMessageDialog dialog(buf, 1500);
 		dialog.runModal();
 
diff --git a/engines/dialogs.cpp b/engines/dialogs.cpp
index a21a4a8..0867a10 100644
--- a/engines/dialogs.cpp
+++ b/engines/dialogs.cpp
@@ -231,7 +231,7 @@ void MainMenuDialog::save() {
 
 		Common::Error status = _engine->saveGameState(slot, result);
 		if (status.getCode() != Common::kNoError) {
-			Common::String failMessage = Common::String::format(_("Gamestate save failed (%s)! "
+			Common::String failMessage = Common::String::format(_("Failed to save game (%s)! "
 				  "Please consult the README for basic information, and for "
 				  "instructions on how to obtain further assistance."), status.getDesc().c_str());
 			GUI::MessageDialog dialog(failMessage);
diff --git a/engines/engine.cpp b/engines/engine.cpp
index aac9c8c..bb51e77 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -539,7 +539,7 @@ void Engine::openMainMenuDialog() {
 	if (_saveSlotToLoad >= 0) {
 		Common::Error status = loadGameState(_saveSlotToLoad);
 		if (status.getCode() != Common::kNoError) {
-			Common::String failMessage = Common::String::format(_("Gamestate load failed (%s)! "
+			Common::String failMessage = Common::String::format(_("Failed to load saved game (%s)! "
 				  "Please consult the README for basic information, and for "
 				  "instructions on how to obtain further assistance."), status.getDesc().c_str());
 			GUI::MessageDialog dialog(failMessage);
diff --git a/engines/gob/inter_geisha.cpp b/engines/gob/inter_geisha.cpp
index 8102dbf..34d0ebc 100644
--- a/engines/gob/inter_geisha.cpp
+++ b/engines/gob/inter_geisha.cpp
@@ -229,7 +229,7 @@ void Inter_Geisha::oGeisha_readData(OpFuncParams &params) {
 
 		if (!_vm->_saveLoad->load(file, dataVar, 0, 0)) {
 
-			GUI::MessageDialog dialog(_("Failed to load game state from file."));
+			GUI::MessageDialog dialog(_("Failed to load saved game from file."));
 			dialog.runModal();
 
 		} else
@@ -260,7 +260,7 @@ void Inter_Geisha::oGeisha_writeData(OpFuncParams &params) {
 
 		if (!_vm->_saveLoad->save(file, dataVar, size, 0)) {
 
-			GUI::MessageDialog dialog(_("Failed to save game state to file."));
+			GUI::MessageDialog dialog(_("Failed to save game to file."));
 			dialog.runModal();
 
 		} else
diff --git a/engines/gob/inter_playtoons.cpp b/engines/gob/inter_playtoons.cpp
index 13d24dc..58c671e 100644
--- a/engines/gob/inter_playtoons.cpp
+++ b/engines/gob/inter_playtoons.cpp
@@ -252,7 +252,7 @@ void Inter_Playtoons::oPlaytoons_readData(OpFuncParams &params) {
 		WRITE_VAR(1, 1);
 
 		if (!_vm->_saveLoad->load(file.c_str(), dataVar, size, offset)) {
-			GUI::MessageDialog dialog(_("Failed to load game state from file."));
+			GUI::MessageDialog dialog(_("Failed to load saved game from file."));
 			dialog.runModal();
 		} else
 			WRITE_VAR(1, 0);
diff --git a/engines/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp
index 4b58819..3928985 100644
--- a/engines/gob/inter_v2.cpp
+++ b/engines/gob/inter_v2.cpp
@@ -1464,7 +1464,7 @@ void Inter_v2::o2_readData(OpFuncParams &params) {
 
 		if (!_vm->_saveLoad->load(file, dataVar, size, offset)) {
 
-			GUI::MessageDialog dialog(_("Failed to load game state from file."));
+			GUI::MessageDialog dialog(_("Failed to load saved game from file."));
 			dialog.runModal();
 
 		} else
@@ -1534,7 +1534,7 @@ void Inter_v2::o2_writeData(OpFuncParams &params) {
 
 		if (!_vm->_saveLoad->save(file, dataVar, size, offset)) {
 
-			GUI::MessageDialog dialog(_("Failed to save game state to file."));
+			GUI::MessageDialog dialog(_("Failed to save game to file."));
 			dialog.runModal();
 
 		} else
diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp
index 81ea796..b44850f 100644
--- a/engines/kyra/saveload.cpp
+++ b/engines/kyra/saveload.cpp
@@ -156,7 +156,7 @@ Common::SeekableReadStream *KyraEngine_v1::openSaveForReading(const char *filena
 	if (!header.originalSave) {
 		if (!header.oldHeader) {
 			if (header.gameID != _flags.gameID && checkID) {
-				warning("Trying to load game state from other game (save game: %u, running game: %u)", header.gameID, _flags.gameID);
+				warning("Trying to load saved game from other game (saved game: %u, running game: %u)", header.gameID, _flags.gameID);
 				delete in;
 				return 0;
 			}
diff --git a/engines/pegasus/pegasus.cpp b/engines/pegasus/pegasus.cpp
index e34fb7b..57c7fdb 100644
--- a/engines/pegasus/pegasus.cpp
+++ b/engines/pegasus/pegasus.cpp
@@ -390,7 +390,7 @@ Common::Error PegasusEngine::showSaveDialog() {
 }
 
 void PegasusEngine::showSaveFailedDialog(const Common::Error &status) {
-	Common::String failMessage = Common::String::format(_("Gamestate save failed (%s)! "
+	Common::String failMessage = Common::String::format(_("Failed to save game (%s)! "
 			"Please consult the README for basic information, and for "
 			"instructions on how to obtain further assistance."), status.getDesc().c_str());
 	GUI::MessageDialog dialog(failMessage);
diff --git a/engines/scumm/help.cpp b/engines/scumm/help.cpp
index 2281e95..ce0d13b 100644
--- a/engines/scumm/help.cpp
+++ b/engines/scumm/help.cpp
@@ -77,8 +77,8 @@ void ScummHelp::updateStrings(byte gameId, byte version, Common::Platform platfo
 			ADD_BIND(".", _("Skip line of text"));
 		ADD_BIND(_("Esc"), _("Skip cutscene"));
 		ADD_BIND(_("Space"), _("Pause game"));
-		ADD_BIND(String(_("Ctrl")) + " 0-9", _("Load game state 1-10"));
-		ADD_BIND(String(_("Alt")) + " 0-9", _("Save game state 1-10"));
+		ADD_BIND(String(_("Ctrl")) + " 0-9", _("Load saved game 1-10"));
+		ADD_BIND(String(_("Alt")) + " 0-9", _("Save game 1-10"));
 #ifdef MACOSX
 		ADD_BIND("Cmd q", _("Quit"));
 #else
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index b13858c..aec5773 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -2426,14 +2426,14 @@ void ScummEngine::scummLoop_handleSaveLoad() {
 		if (_saveLoadFlag == 1) {
 			success = saveState(_saveLoadSlot, _saveTemporaryState, filename);
 			if (!success)
-				errMsg = _("Failed to save game state to file:\n\n%s");
+				errMsg = _("Failed to save game to file:\n\n%s");
 
 			if (success && _saveTemporaryState && VAR_GAME_LOADED != 0xFF && _game.version <= 7)
 				VAR(VAR_GAME_LOADED) = 201;
 		} else {
 			success = loadState(_saveLoadSlot, _saveTemporaryState, filename);
 			if (!success)
-				errMsg = _("Failed to load game state from file:\n\n%s");
+				errMsg = _("Failed to load saved game from file:\n\n%s");
 
 			if (success && _saveTemporaryState && VAR_GAME_LOADED != 0xFF)
 				VAR(VAR_GAME_LOADED) = (_game.version == 8) ? 1 : 203;
@@ -2444,7 +2444,7 @@ void ScummEngine::scummLoop_handleSaveLoad() {
 		} else if (_saveLoadFlag == 1 && _saveLoadSlot != 0 && !_saveTemporaryState) {
 			// Display "Save successful" message, except for auto saves
 			char buf[256];
-			snprintf(buf, sizeof(buf), _("Successfully saved game state in file:\n\n%s"), filename.c_str());
+			snprintf(buf, sizeof(buf), _("Successfully saved game in file:\n\n%s"), filename.c_str());
 
 			GUI::TimedMessageDialog dialog(buf, 1500);
 			runDialog(dialog);
diff --git a/engines/tinsel/saveload.cpp b/engines/tinsel/saveload.cpp
index c8fe5f8..95364fa 100644
--- a/engines/tinsel/saveload.cpp
+++ b/engines/tinsel/saveload.cpp
@@ -529,7 +529,7 @@ static bool DoRestore() {
 	delete f;
 
 	if (failed) {
-		GUI::MessageDialog dialog(_("Failed to load game state from file."));
+		GUI::MessageDialog dialog(_("Failed to load saved game from file."));
 		dialog.runModal();
 	}
 
@@ -542,7 +542,7 @@ static void SaveFailure(Common::OutSaveFile *f) {
 		_vm->getSaveFileMan()->removeSavefile(g_SaveSceneName);
 	}
 	g_SaveSceneName = NULL;	// Invalidate save name
-	GUI::MessageDialog dialog(_("Failed to save game state to file."));
+	GUI::MessageDialog dialog(_("Failed to save game to file."));
 	dialog.runModal();
 }
 
diff --git a/gui/saveload-dialog.cpp b/gui/saveload-dialog.cpp
index af02e36..4bd71d3 100644
--- a/gui/saveload-dialog.cpp
+++ b/gui/saveload-dialog.cpp
@@ -574,7 +574,7 @@ void SaveLoadChooserSimple::updateSelection(bool redraw) {
 		if (startEditMode) {
 			_list->startEditMode();
 
-			if (_chooseButton->isEnabled() && _list->getSelectedString() == _("Untitled savestate") &&
+			if (_chooseButton->isEnabled() && _list->getSelectedString() == _("Untitled saved game") &&
 					_list->getSelectionColor() == ThemeEngine::kFontColorAlternate) {
 				_list->setEditString("");
 				_list->setEditColor(ThemeEngine::kFontColorNormal);
@@ -657,12 +657,12 @@ void SaveLoadChooserSimple::updateSaveList() {
 			}
 		}
 
-		// Show "Untitled savestate" for empty/whitespace saved game descriptions
+		// Show "Untitled saved game" for empty/whitespace saved game descriptions
 		Common::String description = x->getDescription();
 		Common::String trimmedDescription = description;
 		trimmedDescription.trim();
 		if (trimmedDescription.empty()) {
-			description = _("Untitled savestate");
+			description = _("Untitled saved game");
 			colors.push_back(ThemeEngine::kFontColorAlternate);
 		} else {
 			colors.push_back((x->getLocked() ? ThemeEngine::kFontColorAlternate : ThemeEngine::kFontColorNormal));


Commit: b041618a42ebf19494b1e0b8fdc659e09019ae42
    https://github.com/scummvm/scummvm/commit/b041618a42ebf19494b1e0b8fdc659e09019ae42
Author: Ben Castricum (github at bencastricum.nl)
Date: 2016-11-29T20:22:19+01:00

Commit Message:
ALL: Remove comma before the word 'instead'

Changed paths:
    engines/agi/detection.cpp
    engines/cine/detection.cpp
    engines/drascula/detection.cpp
    engines/dreamweb/detection.cpp
    engines/neverhood/detection.cpp
    engines/sci/detection.cpp
    engines/sherlock/detection.cpp
    engines/toltecs/detection.cpp
    engines/zvision/detection_tables.h


diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index 5cb239f..e26f5c8 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -145,7 +145,7 @@ static const ADExtraGuiOptionsMap optionsList[] = {
 		GAMEOPTION_ORIGINAL_SAVELOAD,
 		{
 			_s("Use original save/load screens"),
-			_s("Use the original save/load screens, instead of the ScummVM ones"),
+			_s("Use the original save/load screens instead of the ScummVM ones"),
 			"originalsaveload",
 			false
 		}
diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp
index ec01e87..6c8b4a6 100644
--- a/engines/cine/detection.cpp
+++ b/engines/cine/detection.cpp
@@ -68,7 +68,7 @@ static const ADExtraGuiOptionsMap optionsList[] = {
 		GAMEOPTION_ORIGINAL_SAVELOAD,
 		{
 			_s("Use original save/load screens"),
-			_s("Use the original save/load screens, instead of the ScummVM ones"),
+			_s("Use the original save/load screens instead of the ScummVM ones"),
 			"originalsaveload",
 			false
 		}
diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp
index 3bc8069..ceaadd5 100644
--- a/engines/drascula/detection.cpp
+++ b/engines/drascula/detection.cpp
@@ -300,7 +300,7 @@ static const DrasculaGameDescription gameDescriptions[] = {
 
 static const ExtraGuiOption drasculaExtraGuiOption = {
 	_s("Use original save/load screens"),
-	_s("Use the original save/load screens, instead of the ScummVM ones"),
+	_s("Use the original save/load screens instead of the ScummVM ones"),
 	"originalsaveload",
 	false
 };
diff --git a/engines/dreamweb/detection.cpp b/engines/dreamweb/detection.cpp
index 8e24c44..1196604 100644
--- a/engines/dreamweb/detection.cpp
+++ b/engines/dreamweb/detection.cpp
@@ -46,7 +46,7 @@ static const ADExtraGuiOptionsMap gameGuiOptions[] = {
 		GAMEOPTION_ORIGINAL_SAVELOAD,
 		{
 			_s("Use original save/load screens"),
-			_s("Use the original save/load screens, instead of the ScummVM ones"),
+			_s("Use the original save/load screens instead of the ScummVM ones"),
 			"originalsaveload",
 			false
 		}
diff --git a/engines/neverhood/detection.cpp b/engines/neverhood/detection.cpp
index 0c0347e..46605bb 100644
--- a/engines/neverhood/detection.cpp
+++ b/engines/neverhood/detection.cpp
@@ -175,7 +175,7 @@ static const NeverhoodGameDescription gameDescriptions[] = {
 
 static const ExtraGuiOption neverhoodExtraGuiOption1 = {
 	_s("Use original save/load screens"),
-	_s("Use the original save/load screens, instead of the ScummVM ones"),
+	_s("Use the original save/load screens instead of the ScummVM ones"),
 	"originalsaveload",
 	false
 };
diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index a00da7c..e316750 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -428,7 +428,7 @@ static const ADExtraGuiOptionsMap optionsList[] = {
 		GAMEOPTION_ORIGINAL_SAVELOAD,
 		{
 			_s("Use original save/load screens"),
-			_s("Use the original save/load screens, instead of the ScummVM ones"),
+			_s("Use the original save/load screens instead of the ScummVM ones"),
 			"originalsaveload",
 			false
 		}
@@ -471,7 +471,7 @@ static const ADExtraGuiOptionsMap optionsList[] = {
 		GAMEOPTION_SQ4_SILVER_CURSORS,
 		{
 			_s("Use silver cursors"),
-			_s("Use the alternate set of silver cursors, instead of the normal golden ones"),
+			_s("Use the alternate set of silver cursors instead of the normal golden ones"),
 			"silver_cursors",
 			false
 		}
diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
index 40ff081..9184fd8 100644
--- a/engines/sherlock/detection.cpp
+++ b/engines/sherlock/detection.cpp
@@ -69,7 +69,7 @@ static const ADExtraGuiOptionsMap optionsList[] = {
 		GAMEOPTION_ORIGINAL_SAVES,
 		{
 			_s("Use original save/load screens"),
-			_s("Use the original save/load screens, instead of the ScummVM ones"),
+			_s("Use the original save/load screens instead of the ScummVM ones"),
 			"originalsaveload",
 			false
 		}
diff --git a/engines/toltecs/detection.cpp b/engines/toltecs/detection.cpp
index cc27341..9303760 100644
--- a/engines/toltecs/detection.cpp
+++ b/engines/toltecs/detection.cpp
@@ -198,7 +198,7 @@ static const ToltecsGameDescription gameDescriptions[] = {
 
 static const ExtraGuiOption toltecsExtraGuiOption = {
 	_s("Use original save/load screens"),
-	_s("Use the original save/load screens, instead of the ScummVM ones"),
+	_s("Use the original save/load screens instead of the ScummVM ones"),
 	"originalsaveload",
 	false
 };
diff --git a/engines/zvision/detection_tables.h b/engines/zvision/detection_tables.h
index 06bc58e..3df8f28 100644
--- a/engines/zvision/detection_tables.h
+++ b/engines/zvision/detection_tables.h
@@ -89,7 +89,7 @@ static const ADExtraGuiOptionsMap optionsList[] = {
 		GAMEOPTION_USE_HIRES_MPEG_MOVIES,
 		{
 			_s("Use high resolution MPEG video"),
-			_s("Use MPEG video from the DVD version, instead of lower resolution AVI"),
+			_s("Use MPEG video from the DVD version instead of lower resolution AVI"),
 			"mpegmovies",
 			true
 		}


Commit: e95c2cc3ff1dc696fb2c3d952931a3af314c2e5b
    https://github.com/scummvm/scummvm/commit/e95c2cc3ff1dc696fb2c3d952931a3af314c2e5b
Author: Ben Castricum (github at bencastricum.nl)
Date: 2016-11-29T21:10:59+01:00

Commit Message:
ALL: save file => saved game

Changed paths:
    engines/drascula/saveload.cpp
    engines/kyra/saveload_eob.cpp
    engines/parallaction/saveload.cpp
    engines/pegasus/pegasus.cpp
    engines/sword1/control.cpp
    engines/zvision/file/save_manager.cpp


diff --git a/engines/drascula/saveload.cpp b/engines/drascula/saveload.cpp
index a1d7d61..eb65486 100644
--- a/engines/drascula/saveload.cpp
+++ b/engines/drascula/saveload.cpp
@@ -44,7 +44,7 @@ void DrasculaEngine::checkForOldSaveGames() {
 		return;
 
 	GUI::MessageDialog dialog0(
-	    _("ScummVM found that you have old savefiles for Drascula that should be converted.\n"
+	    _("ScummVM found that you have old saved games for Drascula that should be converted.\n"
 	      "The old saved game format is no longer supported, so you will not be able to load your games if you don't convert them.\n\n"
 	      "Press OK to convert them now, otherwise you will be asked again the next time you start the game.\n"), _("OK"), _("Cancel"));
 
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index 7823064..dca4aaa 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -620,7 +620,7 @@ bool EoBCoreEngine::importOriginalSaveFile(int destSlot, const char *sourceFile)
 	_inf->reset();
 
 	if (destSlot == -1 && importedCount) {
-		::GUI::MessageDialog dialog(Common::String::format(_("%d original saved game files have been successfully imported into\nScummVM. If you want to manually import original saved game files later you will\nneed to open the ScummVM debug console and use the command 'import_savefile'.\n\n"), importedCount));
+		::GUI::MessageDialog dialog(Common::String::format(_("%d original saved games have been successfully imported into\nScummVM. If you want to manually import original saved game later you will\nneed to open the ScummVM debug console and use the command 'import_savefile'.\n\n"), importedCount));
 		dialog.runModal();
 	}
 
diff --git a/engines/parallaction/saveload.cpp b/engines/parallaction/saveload.cpp
index 0f4ceae..56cb363 100644
--- a/engines/parallaction/saveload.cpp
+++ b/engines/parallaction/saveload.cpp
@@ -266,7 +266,7 @@ void SaveLoad_ns::getGamePartProgress(bool *complete, int size) {
 
 static bool askRenameOldSavefiles() {
 	GUI::MessageDialog dialog0(
-		_("ScummVM found that you have old savefiles for Nippon Safes that should be renamed.\n"
+		_("ScummVM found that you have old saved games for Nippon Safes that should be renamed.\n"
 		"The old names are no longer supported, so you will not be able to load your games if you don't convert them.\n\n"
 		"Press OK to convert them now, otherwise you will be asked next time.\n"), _("OK"), _("Cancel"));
 
@@ -313,7 +313,7 @@ void SaveLoad_ns::renameOldSavefiles() {
 
 	Common::String msg;
 	if (success == numOldSaves) {
-		msg = _("ScummVM successfully converted all your savefiles.");
+		msg = _("ScummVM successfully converted all your saved games.");
 	} else {
 		msg = _("ScummVM printed some warnings in your console window and can't guarantee all your files have been converted.\n\n"
 			"Please report to the team.");
diff --git a/engines/pegasus/pegasus.cpp b/engines/pegasus/pegasus.cpp
index 57c7fdb..1f77caa 100644
--- a/engines/pegasus/pegasus.cpp
+++ b/engines/pegasus/pegasus.cpp
@@ -711,7 +711,7 @@ static bool isValidSaveFileName(const Common::String &desc) {
 
 Common::Error PegasusEngine::saveGameState(int slot, const Common::String &desc) {
 	if (!isValidSaveFileName(desc))
-		return Common::Error(Common::kCreatingFileFailed, _("Invalid save file name"));
+		return Common::Error(Common::kCreatingFileFailed, _("Invalid file name for saving"));
 
 	Common::String output = Common::String::format("pegasus-%s.sav", desc.c_str());
 	Common::OutSaveFile *saveFile = _saveFileMan->openForSaving(output, false);
diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp
index be5f336..a790356 100644
--- a/engines/sword1/control.cpp
+++ b/engines/sword1/control.cpp
@@ -860,7 +860,7 @@ void Control::checkForOldSaveGames() {
 		return;
 
 	GUI::MessageDialog dialog0(
-	    _("ScummVM found that you have old savefiles for Broken Sword 1 that should be converted.\n"
+	    _("ScummVM found that you have old saved games for Broken Sword 1 that should be converted.\n"
 	      "The old saved game format is no longer supported, so you will not be able to load your games if you don't convert them.\n\n"
 	      "Press OK to convert them now, otherwise you will be asked again the next time you start the game.\n"), _("OK"), _("Cancel"));
 
diff --git a/engines/zvision/file/save_manager.cpp b/engines/zvision/file/save_manager.cpp
index 89c595c..8a78e98 100644
--- a/engines/zvision/file/save_manager.cpp
+++ b/engines/zvision/file/save_manager.cpp
@@ -205,7 +205,7 @@ bool SaveManager::readSaveGameHeader(Common::InSaveFile *in, SaveGameHeader &hea
 		return true;
 	}
 	if (tag != SAVEGAME_ID) {
-		warning("File is not a Z-Vision save file. Aborting load");
+		warning("File is not a Z-Vision saved game. Aborting load");
 		return false;
 	}
 
@@ -217,9 +217,9 @@ bool SaveManager::readSaveGameHeader(Common::InSaveFile *in, SaveGameHeader &hea
 		uint tempVersion = header.version;
 		GUI::MessageDialog dialog(
 			Common::String::format(
-				_("This save file uses version %u, but this engine only "
+				_("This saved game uses version %u, but this engine only "
 				  "supports up to version %d. You will need an updated version "
-				  "of the engine to use this save file."), tempVersion, SAVE_VERSION
+				  "of the engine to use this saved game."), tempVersion, SAVE_VERSION
 			),
 		_("OK"));
 		dialog.runModal();


Commit: 5bed4bf794cdd52dca843aa548d4fcf16fd48d50
    https://github.com/scummvm/scummvm/commit/5bed4bf794cdd52dca843aa548d4fcf16fd48d50
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-11-29T23:17:49+01:00

Commit Message:
Merge pull request #864 from BenCastricum/editing

ALL: Unify messages wording

Changed paths:
    common/error.cpp
    engines/advancedDetector.cpp
    engines/agi/detection.cpp
    engines/agos/saveload.cpp
    engines/cine/detection.cpp
    engines/dialogs.cpp
    engines/drascula/detection.cpp
    engines/drascula/saveload.cpp
    engines/dreamweb/detection.cpp
    engines/engine.cpp
    engines/gob/inter_geisha.cpp
    engines/gob/inter_playtoons.cpp
    engines/gob/inter_v2.cpp
    engines/kyra/saveload.cpp
    engines/kyra/saveload_eob.cpp
    engines/neverhood/detection.cpp
    engines/parallaction/saveload.cpp
    engines/pegasus/pegasus.cpp
    engines/sci/detection.cpp
    engines/scumm/detection.cpp
    engines/scumm/help.cpp
    engines/scumm/scumm.cpp
    engines/sherlock/detection.cpp
    engines/sword1/control.cpp
    engines/tinsel/saveload.cpp
    engines/toltecs/detection.cpp
    engines/toon/toon.cpp
    engines/zvision/detection_tables.h
    engines/zvision/file/save_manager.cpp
    gui/saveload-dialog.cpp





