[Scummvm-cvs-logs] scummvm master -> 8f368145baaf1a09efafcc847647e192b4031a96

[bluegr]

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

Summary:
df12402a58 SCUMM: Fix bug 6739 - Untranslated dialogs
8f368145ba Merge pull request #523 from BenCastricum/fixforbug6739


Commit: df12402a58680a1215532ae6bd8e23d8b8256cc6
    https://github.com/scummvm/scummvm/commit/df12402a58680a1215532ae6bd8e23d8b8256cc6
Author: Ben Castricum (github at bencastricum.nl)
Date: 2014-10-27T16:33:09+01:00

Commit Message:
SCUMM: Fix bug 6739 - Untranslated dialogs

Changed paths:
    engines/scumm/dialogs.cpp



diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 5212094..c22525b 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -180,9 +180,9 @@ static const ResString string_map_table_v345[] = {
 	// I18N: You may specify 'Yes' symbol at the end of the line, like this:
 	// "Moechten Sie wirklich neu starten?  (J/N)J"
 	// Will react to J as 'Yes'
-	{5, _s("Are you sure you want to restart?  (Y/N)")},
+	{5, _s("Are you sure you want to restart?  (Y/N)Y")},
 	// I18N: you may specify 'Yes' symbol at the end of the line. See previous comment
-	{6, _s("Are you sure you want to quit?  (Y/N)")},
+	{6, _s("Are you sure you want to quit?  (Y/N)Y")},
 
 	// Added in SCUMM4
 	{7, _s("Save")},
@@ -460,7 +460,7 @@ const Common::String InfoDialog::queryResString(int stringno) {
 			tmp += chr;
 		}
 	}
-	return tmp;
+	return _(tmp);
 }
 
 #pragma mark -


Commit: 8f368145baaf1a09efafcc847647e192b4031a96
    https://github.com/scummvm/scummvm/commit/8f368145baaf1a09efafcc847647e192b4031a96
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-10-29T11:37:34+02:00

Commit Message:
Merge pull request #523 from BenCastricum/fixforbug6739

SCUMM: Fix bug 6739 - Untranslated dialogs

Changed paths:
    engines/scumm/dialogs.cpp