Mark store owner names for translation

Source/stores.cpp

@@ -88,15 +88,15 @@ _speech_id gossipend;
 
 /** Maps from towner IDs to NPC names. */
 const char *const TownerNames[] = {
-	"Griswold",
+	N_("Griswold"),
-	"Pepin",
+	N_("Pepin"),
 	"",
-	"Ogden",
+	N_("Ogden"),
-	"Cain",
+	N_("Cain"),
-	"Farnham",
+	N_("Farnham"),
-	"Adria",
+	N_("Adria"),
-	"Gillian",
+	N_("Gillian"),
-	"Wirt"
+	N_("Wirt"),
 };
 
 void DrawSTextBack(const Surface &out)
@@ -1193,11 +1193,11 @@ void StartTalk()
 
 	stextsize = false;
 	stextscrl = false;
-	strcpy(tempstr, fmt::format(_("Talk to {:s}"), TownerNames[talker]).c_str());
+	strcpy(tempstr, fmt::format(_("Talk to {:s}"), _(TownerNames[talker])).c_str());
 	AddSText(0, 2, tempstr, UiFlags::ColorWhitegold | UiFlags::AlignCenter, false);
 	AddSLine(5);
 	if (gbIsSpawn) {
-		strcpy(tempstr, fmt::format(_("Talking to {:s}"), TownerNames[talker]).c_str());
+		strcpy(tempstr, fmt::format(_("Talking to {:s}"), _(TownerNames[talker])).c_str());
 		AddSText(0, 10, tempstr, UiFlags::ColorWhite | UiFlags::AlignCenter, false);
 		AddSText(0, 12, _("is not available"), UiFlags::ColorWhite | UiFlags::AlignCenter, false);
 		AddSText(0, 14, _("in the shareware"), UiFlags::ColorWhite | UiFlags::AlignCenter, false);
@@ -1249,7 +1249,7 @@ void StartBarmaid()
 {
 	stextsize = false;
 	stextscrl = false;
-	AddSText(0, 2, "Gillian", UiFlags::ColorWhitegold | UiFlags::AlignCenter, false);
+	AddSText(0, 2, _("Gillian"), UiFlags::ColorWhitegold | UiFlags::AlignCenter, false);
 	AddSText(0, 9, _("Would you like to:"), UiFlags::ColorWhitegold | UiFlags::AlignCenter, false);
 	AddSText(0, 12, _("Talk to Gillian"), UiFlags::ColorBlue | UiFlags::AlignCenter, true);
 	AddSText(0, 18, _("Say goodbye"), UiFlags::ColorWhite | UiFlags::AlignCenter, true);

Translations/devilutionx.pot

@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DevilutionX\n"
-"POT-Creation-Date: 2021-10-28 02:14+0200\n"
+"POT-Creation-Date: 2021-10-31 23:17+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1915,7 +1915,7 @@ msgid "Quilted Armor"
 msgstr ""
 
 #: Source/itemdat.cpp:74 Source/itemdat.cpp:75 Source/itemdat.cpp:76
-#: Source/itemdat.cpp:77 Source/objects.cpp:5467
+#: Source/itemdat.cpp:77 Source/objects.cpp:5478
 msgid "Armor"
 msgstr ""
 
@@ -4093,19 +4093,19 @@ msgstr ""
 msgid "Not Identified"
 msgstr ""
 
-#: Source/loadsave.cpp:1679 Source/loadsave.cpp:2145
+#: Source/loadsave.cpp:1683 Source/loadsave.cpp:2149
 msgid "Unable to open save file archive"
 msgstr ""
 
-#: Source/loadsave.cpp:1682
+#: Source/loadsave.cpp:1686
 msgid "Invalid save file"
 msgstr ""
 
-#: Source/loadsave.cpp:1713
+#: Source/loadsave.cpp:1717
 msgid "Player is on a Hellfire only level"
 msgstr ""
 
-#: Source/loadsave.cpp:1908
+#: Source/loadsave.cpp:1912
 msgid "Invalid game state"
 msgstr ""
 
@@ -5555,158 +5555,158 @@ msgstr ""
 msgid "A Spellbook"
 msgstr ""
 
-#: Source/objects.cpp:5373
+#: Source/objects.cpp:5384
 msgid "Crucified Skeleton"
 msgstr ""
 
-#: Source/objects.cpp:5377
+#: Source/objects.cpp:5388
 msgid "Lever"
 msgstr ""
 
-#: Source/objects.cpp:5386
+#: Source/objects.cpp:5397
 msgid "Open Door"
 msgstr ""
 
-#: Source/objects.cpp:5388
+#: Source/objects.cpp:5399
 msgid "Closed Door"
 msgstr ""
 
-#: Source/objects.cpp:5390
+#: Source/objects.cpp:5401
 msgid "Blocked Door"
 msgstr ""
 
-#: Source/objects.cpp:5395
+#: Source/objects.cpp:5406
 msgid "Ancient Tome"
 msgstr ""
 
-#: Source/objects.cpp:5397
+#: Source/objects.cpp:5408
 msgid "Book of Vileness"
 msgstr ""
 
-#: Source/objects.cpp:5402
+#: Source/objects.cpp:5413
 msgid "Skull Lever"
 msgstr ""
 
-#: Source/objects.cpp:5405
+#: Source/objects.cpp:5416
 msgid "Mythical Book"
 msgstr ""
 
-#: Source/objects.cpp:5409
+#: Source/objects.cpp:5420
 msgid "Small Chest"
 msgstr ""
 
-#: Source/objects.cpp:5413
+#: Source/objects.cpp:5424
 msgid "Chest"
 msgstr ""
 
-#: Source/objects.cpp:5418
+#: Source/objects.cpp:5429
 msgid "Large Chest"
 msgstr ""
 
-#: Source/objects.cpp:5421
+#: Source/objects.cpp:5432
 msgid "Sarcophagus"
 msgstr ""
 
-#: Source/objects.cpp:5424
+#: Source/objects.cpp:5435
 msgid "Bookshelf"
 msgstr ""
 
-#: Source/objects.cpp:5428
+#: Source/objects.cpp:5439
 msgid "Bookcase"
 msgstr ""
 
-#: Source/objects.cpp:5433
+#: Source/objects.cpp:5444
 msgid "Pod"
 msgstr ""
 
-#: Source/objects.cpp:5435
+#: Source/objects.cpp:5446
 msgid "Urn"
 msgstr ""
 
-#: Source/objects.cpp:5437
+#: Source/objects.cpp:5448
 msgid "Barrel"
 msgstr ""
 
 #. TRANSLATORS: {:s} will be a name from the Shrine block above
-#: Source/objects.cpp:5441
+#: Source/objects.cpp:5452
 msgid "{:s} Shrine"
 msgstr ""
 
-#: Source/objects.cpp:5445
+#: Source/objects.cpp:5456
 msgid "Skeleton Tome"
 msgstr ""
 
-#: Source/objects.cpp:5448
+#: Source/objects.cpp:5459
 msgid "Library Book"
 msgstr ""
 
-#: Source/objects.cpp:5451
+#: Source/objects.cpp:5462
 msgid "Blood Fountain"
 msgstr ""
 
-#: Source/objects.cpp:5454
+#: Source/objects.cpp:5465
 msgid "Decapitated Body"
 msgstr ""
 
-#: Source/objects.cpp:5457
+#: Source/objects.cpp:5468
 msgid "Book of the Blind"
 msgstr ""
 
-#: Source/objects.cpp:5460
+#: Source/objects.cpp:5471
 msgid "Book of Blood"
 msgstr ""
 
-#: Source/objects.cpp:5463
+#: Source/objects.cpp:5474
 msgid "Purifying Spring"
 msgstr ""
 
-#: Source/objects.cpp:5470 Source/objects.cpp:5494
+#: Source/objects.cpp:5481 Source/objects.cpp:5505
 msgid "Weapon Rack"
 msgstr ""
 
-#: Source/objects.cpp:5473
+#: Source/objects.cpp:5484
 msgid "Goat Shrine"
 msgstr ""
 
-#: Source/objects.cpp:5476
+#: Source/objects.cpp:5487
 msgid "Cauldron"
 msgstr ""
 
-#: Source/objects.cpp:5479
+#: Source/objects.cpp:5490
 msgid "Murky Pool"
 msgstr ""
 
-#: Source/objects.cpp:5482
+#: Source/objects.cpp:5493
 msgid "Fountain of Tears"
 msgstr ""
 
-#: Source/objects.cpp:5485
+#: Source/objects.cpp:5496
 msgid "Steel Tome"
 msgstr ""
 
-#: Source/objects.cpp:5488
+#: Source/objects.cpp:5499
 msgid "Pedestal of Blood"
 msgstr ""
 
-#: Source/objects.cpp:5497
+#: Source/objects.cpp:5508
 msgid "Mushroom Patch"
 msgstr ""
 
-#: Source/objects.cpp:5500
+#: Source/objects.cpp:5511
 msgid "Vile Stand"
 msgstr ""
 
-#: Source/objects.cpp:5503
+#: Source/objects.cpp:5514
 msgid "Slain Hero"
 msgstr ""
 
 #. TRANSLATORS: {:s} will either be a chest or a door
-#: Source/objects.cpp:5510
+#: Source/objects.cpp:5521
 msgid "Trapped {:s}"
 msgstr ""
 
 #. TRANSLATORS: If user enabled diablo.ini setting "Disable Crippling Shrines" is set to 1; also used for Na-Kruls leaver
-#: Source/objects.cpp:5516
+#: Source/objects.cpp:5527
 msgid "{:s} (disabled)"
 msgstr ""
 
@@ -6269,6 +6269,38 @@ msgctxt "spell"
 msgid "Rune of Stone"
 msgstr ""
 
+#: Source/stores.cpp:91
+msgid "Griswold"
+msgstr ""
+
+#: Source/stores.cpp:92
+msgid "Pepin"
+msgstr ""
+
+#: Source/stores.cpp:94
+msgid "Ogden"
+msgstr ""
+
+#: Source/stores.cpp:95
+msgid "Cain"
+msgstr ""
+
+#: Source/stores.cpp:96
+msgid "Farnham"
+msgstr ""
+
+#: Source/stores.cpp:97
+msgid "Adria"
+msgstr ""
+
+#: Source/stores.cpp:98 Source/stores.cpp:1252
+msgid "Gillian"
+msgstr ""
+
+#: Source/stores.cpp:99
+msgid "Wirt"
+msgstr ""
+
 #: Source/stores.cpp:179 Source/stores.cpp:186
 msgid ",  "
 msgstr ""