3 files changed, 29 insertions, 12 deletions
diff --git a/devtools/create_supernova/po_parser.cpp b/devtools/create_supernova/po_parser.cpp
index f4a9b96388..05a8ac14a7 100644
--- a/devtools/create_supernova/po_parser.cpp
+++ b/devtools/create_supernova/po_parser.cpp
@@ -69,7 +69,7 @@ void PoMessageList::insert(const char *translation, const char *msg, const char
 
 const char *PoMessageList::findTranslation(const char *msg, const char *context) {
 	if (msg == NULL || *msg == '\0')
-		NULL;
+		return NULL;
 
 	// binary-search for the message
 	int leftIndex = 0;
diff --git a/devtools/create_supernova/strings-en.po b/devtools/create_supernova/strings-en.po
index f1c9d2fae2..1d0328982a 100644
--- a/devtools/create_supernova/strings-en.po
+++ b/devtools/create_supernova/strings-en.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Mission Supernova 1.0\n"
 "Report-Msgid-Bugs-To: scummvm-devel@lists.scummvm.org\n"
 "POT-Creation-Date: 2017-07-22 19:53+0100\n"
-"PO-Revision-Date: 2018-01-07 18:01+0000\n"
-"Last-Translator: Joseph-Eugene Winzer <Joe.Winzer@gmx.de>\n"
+"PO-Revision-Date: 2018-04-13 21:29+0000\n"
+"Last-Translator: Adrian Frhwirth <bonki@scummvm.org>\n"
 "Language-Team: none\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
@@ -1629,7 +1629,7 @@ msgstr "Pssst, not so loud, otherwise everyone|will want an autograph from me."
 #: ../../msn/msn_r2.c:730
 msgid ""
 "Ich habe extra eine Maske auf, damit|ich nicht von jedem angelabert werde."
-msgstr "I have an extra mask on so I don't|get yakked on by everyone."
+msgstr "I'm deliberately wearing a mask so I don't|get yakked on by everyone."
 
 #: ../../msn/msn_r2.c:731
 msgid "Žh ... ach so."
@@ -1698,7 +1698,7 @@ msgstr "What? Ridiculous!"
 
 #: ../../msn/msn_r2.c:745
 msgid "Wie erkl„ren Sie sich dann,|daá ich ihnen gegenbersitze?"
-msgstr "How do you explain then that|I am seated opposite you?"
+msgstr "Then how do you explain the fact that|I am seated opposite you?"
 
 #: ../../msn/msn_r2.c:746
 msgid "Ja, das ist in der Tat seltsam."
@@ -1721,7 +1721,8 @@ msgid ""
 "Na gut, ich glaube Ihnen. Lassen wir jetzt|dieses Thema, langsam wird es mir "
 "zu bunt!"
 msgstr ""
-"OK. I believe you. Let's move away from|this topic before it goes too far!"
+"Fair enough, I believe you. Let's move away from|this topic before it goes "
+"too far!"
 
 #: ../../msn/msn_r2.c:761
 msgid "Eine Partie Schach! Das ist eine gute Idee."
diff --git a/devtools/create_xeen/constants.cpp b/devtools/create_xeen/constants.cpp
index 8bea0fd22c..65903f58e0 100644
--- a/devtools/create_xeen/constants.cpp
+++ b/devtools/create_xeen/constants.cpp
@@ -968,7 +968,7 @@ const char *const GOLD_GEMS =
 	"Gems\x3r\t000%s\x2\x3""c\v096\t013G\f37o\fdld\t040G\f37e\fdms\t067ESC\x1";
 
 const char *const GOLD_GEMS_2 =
-	"\t000\v000\x3""c%s\x3l\n"
+	"\x3""c\v000\t000%s\x3l\n"
 	"\n"
 	"\x4""077Gold\x3r\t000%s\x3l\n"
 	"\x4""077Gems\x3r\t000%s\x3l\t000\v051\x4""077\n"
@@ -1598,6 +1598,7 @@ const char *const QUESTS_DIALOG_TEXT =
 	"\t289Exit";
 const char *const CLOUDS_OF_XEEN_LINE = "\b \b*-- \f04Clouds of Xeen\fd --";
 const char *const DARKSIDE_OF_XEEN_LINE = "\b \b*-- \f04Darkside of Xeen\fd --";
+const char *const SWORDS_OF_XEEN_LINE = "\b \b*-- \f04Swords of Xeen\fd --";
 
 const char *const NO_QUEST_ITEMS =
 	"\r\x3""c\v000	000Quest Items\x3l\x2\n"
@@ -1755,7 +1756,7 @@ const char *const WHICH_ELEMENT1 =
 	"\f15E\fdlec\t074\f15C\fdold\t104\f15A\fdcid\x1";
 
 const char *const WHICH_ELEMENT2 =
-	"\r\x3""cWhich Element?', 2, 0Bh, '034\t014\f15F\fdire\t044"
+	"\r\x3""cWhich Element?\x2\v034\t014\f15F\fdire\t044"
 	"\f15E\fdlec\t074\f15C\fdold\t104\f15A\fdcid\x1";
 
 const char *const DETECT_MONSTERS = "\x3""cDetect Monsters";
@@ -1768,7 +1769,7 @@ const char *const LLOYDS_BEACON =
 	"%s\x3l\n"
 	"x = %d\x3r\t000y = %d\x3""c\x2\v122\t021\f15S\fdet\t060\f15R\fdeturn\x1";
 
-const char *const HOW_MANY_SQUARES = "\x3""cTeleport\nHow many squares %s (1-9)";
+const char *const HOW_MANY_SQUARES = "\x3""cTeleport\nHow many squares %s (1-9)\n";
 
 const char *const TOWN_PORTAL =
 	"\x3""cTown Portal\x3l\n"
@@ -1782,8 +1783,18 @@ const char *const TOWN_PORTAL =
 	"To which Town (1-5)\n"
 	"\n";
 
-const int TOWN_MAP_NUMBERS[2][5] = {
-	{ 28, 29, 30, 31, 32 }, { 29, 31, 33, 35, 37 }
+const char *const TOWN_PORTAL_SWORDS =
+	"\x3""cTown Portal\x3l\n"
+	"\n"
+	"\t0101. %s\n"
+	"\t0102. %s\n"
+	"\t0103. %s\x3""c\n"
+	"\n"
+	"To which Town (1-3)\n"
+	"\n";
+
+const int TOWN_MAP_NUMBERS[3][5] = {
+	{ 28, 29, 30, 31, 32 }, { 29, 31, 33, 35, 37 }, { 53, 92, 63, 0, 0 }
 };
 
 const char *const MONSTER_DETAILS =
@@ -1922,6 +1933,8 @@ const char *const MUSIC_FILES2[6][7] = {
 };
 
 const char *const DIFFICULTY_TEXT = "\v000\t000\x3""cSelect Game Preference";
+const char *const SAVE_OFF_LIMITS = "\x3""c\v002\t000The Gods of Game Restoration deem this area off limits!\n"
+	"Sorry, no saving in this maze.";
 
 void writeConstants(CCArchive &cc) {
 	Common::MemFile file;
@@ -2178,6 +2191,7 @@ void writeConstants(CCArchive &cc) {
 	file.syncString(QUESTS_DIALOG_TEXT);
 	file.syncString(CLOUDS_OF_XEEN_LINE);
 	file.syncString(DARKSIDE_OF_XEEN_LINE);
+	file.syncString(SWORDS_OF_XEEN_LINE);
 	file.syncString(NO_QUEST_ITEMS);
 	file.syncString(NO_CURRENT_QUESTS);
 	file.syncString(NO_AUTO_NOTES);
@@ -2227,7 +2241,8 @@ void writeConstants(CCArchive &cc) {
 	file.syncString(LLOYDS_BEACON);
 	file.syncString(HOW_MANY_SQUARES);
 	file.syncString(TOWN_PORTAL);
-	file.syncNumbers2D((const int *)TOWN_MAP_NUMBERS, 2, 5);
+	file.syncString(TOWN_PORTAL_SWORDS);
+	file.syncNumbers2D((const int *)TOWN_MAP_NUMBERS, 3, 5);
 	file.syncString(MONSTER_DETAILS);
 	file.syncStrings(MONSTER_SPECIAL_ATTACKS, 23);
 	file.syncString(IDENTIFY_MONSTERS);
@@ -2261,6 +2276,7 @@ void writeConstants(CCArchive &cc) {
 	file.syncStrings(MUSIC_FILES1, 5);
 	file.syncStrings2D((const char *const *)MUSIC_FILES2, 6, 7);
 	file.syncString(DIFFICULTY_TEXT);
+	file.syncString(SAVE_OFF_LIMITS);
 
 	cc.add("CONSTANTS", file);
 }