Merge remote-tracking branch 'own/prince' into prince-malik

Conflicts:
	engines/prince/debugger.cpp
	engines/prince/debugger.h
	engines/prince/detection.cpp
	engines/prince/font.cpp
	engines/prince/graphics.cpp
	engines/prince/prince.cpp
	engines/prince/prince.h
	engines/prince/script.cpp
	engines/prince/script.h

1 files changed, 27 insertions, 2 deletions

diff --git a/devtools/credits.pl b/devtools/credits.pl
index fda6f4782e..03e086ce99 100755
--- a/devtools/credits.pl
+++ b/devtools/credits.pl
@@ -48,7 +48,7 @@ if ($mode eq "") {
 $Text::Wrap::unexpand = 0;
 if ($mode eq "TEXT") {
 	$Text::Wrap::columns = 78;
-	$max_name_width = 23; # The maximal width of a name.
+	$max_name_width = 28; # The maximal width of a name.
 } elsif ($mode eq "CPP") {
 	$Text::Wrap::columns = 48;	# Approx.
 }
@@ -60,6 +60,7 @@ sub html_entities_to_ascii {
 	# For now we hardcode these mappings
 	# á  -> a
 	# é  -> e
+	# í  -> i
 	# ì  -> i
 	# ó  -> o
 	# ø  -> o
@@ -72,8 +73,10 @@ sub html_entities_to_ascii {
 	# ł    -> l
 	# ś    -> s
 	# Š  -> S
+	# ñ  -> n
 	$text =~ s/á/a/g;
 	$text =~ s/é/e/g;
+	$text =~ s/í/i/g;
 	$text =~ s/ì/i/g;
 	$text =~ s/ó/o/g;
 	$text =~ s/ø/o/g;
@@ -81,6 +84,7 @@ sub html_entities_to_ascii {
 	$text =~ s/ś/s/g;
 	$text =~ s/Š/S/g;
 	$text =~ s/å/aa/g;
+	$text =~ s/ñ/n/g;
 
 	$text =~ s/ä/a/g;
 	$text =~ s/ë/e/g;
@@ -101,6 +105,7 @@ sub html_entities_to_cpp {
 	# The numerical values are octal!
 	$text =~ s/á/\\341/g;
 	$text =~ s/é/\\351/g;
+	$text =~ s/í/\\355/g;
 	$text =~ s/ì/\\354/g;
 	$text =~ s/ó/\\363/g;
 	$text =~ s/ø/\\370/g;
@@ -108,6 +113,7 @@ sub html_entities_to_cpp {
 	$text =~ s/ś/s/g;
 	$text =~ s/Š/S/g;
 	$text =~ s/å/\\345/g;
+	$text =~ s/ñ/\\361/g;
 
 	$text =~ s/ä/\\344/g;
 	$text =~ s/ë/\\353/g;
@@ -126,6 +132,7 @@ sub html_entities_to_rtf {
 
 	$text =~ s/á/\\'87/g;
 	$text =~ s/é/\\'8e/g;
+	$text =~ s/í/\\'92/g;
 	$text =~ s/ì/\\'93/g;
 	$text =~ s/ó/\\'97/g;
 	$text =~ s/ø/\\'bf/g;
@@ -135,6 +142,8 @@ sub html_entities_to_rtf {
 	$text =~ s/Š/\\uc0\\u540 /g;
 
 	# Back to hex numbers
+	$text =~ s/ñ/\\'96/g;
+
 	$text =~ s/ä/\\'8a/g;
 	$text =~ s/ë/\\'eb/g;
 	$text =~ s/ö/\\'9a/g;
@@ -151,12 +160,14 @@ sub html_entities_to_tex {
 
 	$text =~ s/á/\\'a/g;
 	$text =~ s/é/\\'e/g;
+	$text =~ s/í/\\'i/g;
 	$text =~ s/ì/\\`\\i/g;
 	$text =~ s/ó/\\'o/g;
 	$text =~ s/ø/{\\o}/g;
 	$text =~ s/å/\\aa /g;
 	$text =~ s/ł/{\\l}/g;
 	$text =~ s/Š/{\\v S}/g;
+	$text =~ s/ñ/\\˜n/g;
 
 	$text =~ s/ä/\\"a/g;
 	$text =~ s/ö/\\"o/g;
@@ -984,7 +995,7 @@ begin_credits("Credits");
 			end_section();
 		end_section();
 
-		begin_section("Translations");
+		begin_section("GUI Translations");
 				begin_persons();
 					add_person("Thierry Crozat", "criezy", "Translation Lead");
 				end_persons();
@@ -1049,6 +1060,20 @@ begin_credits("Credits");
 					add_person("Lubomyr Lisen", "", "");
 				end_section();
 		end_section();
+		begin_section("Game Translations");
+				begin_section("CGE");
+					add_person("Dan Serban", "nutron", "Soltys English translation");
+					add_person("Víctor González", "IlDucci", "Soltys Spanish translation");
+					add_person("Alejandro Gómez de la Muñoza", "TheFireRed", "Soltys Spanish translation");
+				end_section();
+				begin_section("Drascula");
+					add_person("Thierry Crozat", "criezy", "Improve French translation");
+				end_section();
+				begin_section("Mortevielle");
+					add_person("Hugo Labrande", "", "Improve English translation");
+					add_person("Thierry Crozat", "criezy", "Improve English translation");
+				end_section();
+		end_section();
 
 		begin_section("Websites (design)");
 			begin_persons();