diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg
index a455056d5b5..ce5594f0170 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg
@@ -381,7 +381,7 @@
         [/message]
         [message]
             speaker=Delfador
-            message= _ "... and personal counselor to my King and my <i>friend</i>, Garard the Second, who you most <i>foully</i> betrayed..."
+            message= _ "... and personal counselor to my King and my <i>friend</i>, Garard the Second, whom you most <i>foully</i> betrayed..."
         [/message]
         [message]
             speaker=Delfador
diff --git a/po/wesnoth-httt/af.po b/po/wesnoth-httt/af.po
index 6a8037c6f68..26c29c1596f 100644
--- a/po/wesnoth-httt/af.po
+++ b/po/wesnoth-httt/af.po
@@ -7748,7 +7748,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 
 #. [message]: speaker=Delfador
diff --git a/po/wesnoth-httt/ang.po b/po/wesnoth-httt/ang.po
index d156c523864..9a11b9d386b 100644
--- a/po/wesnoth-httt/ang.po
+++ b/po/wesnoth-httt/ang.po
@@ -6782,7 +6782,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 
 #. [message]: speaker=Delfador
diff --git a/po/wesnoth-httt/ang@latin.po b/po/wesnoth-httt/ang@latin.po
index ff33419ca8f..b30a7e6735b 100644
--- a/po/wesnoth-httt/ang@latin.po
+++ b/po/wesnoth-httt/ang@latin.po
@@ -6782,7 +6782,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 
 #. [message]: speaker=Delfador
diff --git a/po/wesnoth-httt/ar.po b/po/wesnoth-httt/ar.po
index 21e6490c0f9..7bb4e3e7254 100644
--- a/po/wesnoth-httt/ar.po
+++ b/po/wesnoth-httt/ar.po
@@ -6776,7 +6776,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 
 #. [message]: speaker=Delfador
diff --git a/po/wesnoth-httt/bg.po b/po/wesnoth-httt/bg.po
index 0e6f84ecf23..7afc5fd8d3a 100644
--- a/po/wesnoth-httt/bg.po
+++ b/po/wesnoth-httt/bg.po
@@ -7960,7 +7960,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 
 #. [message]: speaker=Delfador
diff --git a/po/wesnoth-httt/ca.po b/po/wesnoth-httt/ca.po
index a43a108df52..c1aab3f17f7 100644
--- a/po/wesnoth-httt/ca.po
+++ b/po/wesnoth-httt/ca.po
@@ -7957,7 +7957,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 
 #. [message]: speaker=Delfador
diff --git a/po/wesnoth-httt/ca_ES@valencia.po b/po/wesnoth-httt/ca_ES@valencia.po
index ca7cc08a399..f6e0263880b 100644
--- a/po/wesnoth-httt/ca_ES@valencia.po
+++ b/po/wesnoth-httt/ca_ES@valencia.po
@@ -6776,7 +6776,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 
 #. [message]: speaker=Delfador
diff --git a/po/wesnoth-httt/cs.po b/po/wesnoth-httt/cs.po
index 14ba695a21c..67ba477c8c5 100644
--- a/po/wesnoth-httt/cs.po
+++ b/po/wesnoth-httt/cs.po
@@ -7901,7 +7901,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 "...a osobní rádce mého krále a <i>přítele</i>, Gararda druhého, kterého jsi "
 "<i>velmi odporně</i> zradila..."
diff --git a/po/wesnoth-httt/da.po b/po/wesnoth-httt/da.po
index 3b49957fb00..9108fd8d6cb 100644
--- a/po/wesnoth-httt/da.po
+++ b/po/wesnoth-httt/da.po
@@ -8046,7 +8046,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 
 #. [message]: speaker=Delfador
diff --git a/po/wesnoth-httt/de.po b/po/wesnoth-httt/de.po
index ab4d918a8b4..54d514f508e 100644
--- a/po/wesnoth-httt/de.po
+++ b/po/wesnoth-httt/de.po
@@ -8235,7 +8235,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 "... und persönlicher Ratgeber meines Königs und Freundes, Garard II., den "
 "ihr <i>feige</i> hintergangen habt..."
diff --git a/po/wesnoth-httt/el.po b/po/wesnoth-httt/el.po
index 528c88e7d1a..fe0c0430558 100644
--- a/po/wesnoth-httt/el.po
+++ b/po/wesnoth-httt/el.po
@@ -7987,7 +7987,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 
 #. [message]: speaker=Delfador
diff --git a/po/wesnoth-httt/en@shaw.po b/po/wesnoth-httt/en@shaw.po
index f62ab277757..2b70801d5c3 100644
--- a/po/wesnoth-httt/en@shaw.po
+++ b/po/wesnoth-httt/en@shaw.po
@@ -7869,7 +7869,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 "... 𐑯 𐑐𐑻𐑕𐑩𐑯𐑩𐑤 𐑒𐑬𐑯𐑕𐑩𐑤𐑼 𐑑 𐑥𐑲 𐑒𐑦𐑙 𐑯 𐑥𐑲 <i>friend</i>, 𐑜𐑻𐑸𐑛 𐑞 𐑕𐑧𐑒𐑩𐑯𐑛, 𐑣𐑵 𐑿 𐑥𐑴𐑕𐑑 "
 "<i>foully</i> 𐑚𐑦𐑑𐑮𐑱𐑛..."
diff --git a/po/wesnoth-httt/en_GB.po b/po/wesnoth-httt/en_GB.po
index 2a6e86141f7..55de3c062c5 100644
--- a/po/wesnoth-httt/en_GB.po
+++ b/po/wesnoth-httt/en_GB.po
@@ -7961,10 +7961,10 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 "... and personal counsellor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 
 #. [message]: speaker=Delfador
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:388
diff --git a/po/wesnoth-httt/eo.po b/po/wesnoth-httt/eo.po
index 0c55e9cbff5..7cb2a5e2073 100644
--- a/po/wesnoth-httt/eo.po
+++ b/po/wesnoth-httt/eo.po
@@ -7948,7 +7948,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 
 #. [message]: speaker=Delfador
diff --git a/po/wesnoth-httt/es.po b/po/wesnoth-httt/es.po
index f623c69f910..a7ccfa9a5b2 100644
--- a/po/wesnoth-httt/es.po
+++ b/po/wesnoth-httt/es.po
@@ -8232,7 +8232,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 "... y consejero personal de mi Rey y mi <i>amigo</i>, Garard el Segundo, a "
 "quien tú más <i>repugnantemente</i> traicionaste..."
diff --git a/po/wesnoth-httt/et.po b/po/wesnoth-httt/et.po
index 959dea45e91..9288fab9b87 100644
--- a/po/wesnoth-httt/et.po
+++ b/po/wesnoth-httt/et.po
@@ -7845,7 +7845,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 "... ja mu Kuninga ja <i>sõbra</i>, Garard Teise - kelle sa <i>kõige jälgimal "
 "kombel</em> reetsid -  isiklik nõuandja..."
diff --git a/po/wesnoth-httt/eu.po b/po/wesnoth-httt/eu.po
index e10bee370e3..4b09c2899e8 100644
--- a/po/wesnoth-httt/eu.po
+++ b/po/wesnoth-httt/eu.po
@@ -7477,7 +7477,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 
 #. [message]: speaker=Delfador
diff --git a/po/wesnoth-httt/fi.po b/po/wesnoth-httt/fi.po
index 14060a553ff..a84fb99e723 100644
--- a/po/wesnoth-httt/fi.po
+++ b/po/wesnoth-httt/fi.po
@@ -8047,7 +8047,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 "... ja kuninkaan henkilökohtainen neuvonantaja. Kuninkaani ja <ystäväni>, "
 "Garand toisen, jonka mitä <i>katalimmin</i> petit..."
diff --git a/po/wesnoth-httt/fr.po b/po/wesnoth-httt/fr.po
index 777ce72b169..341ca072014 100644
--- a/po/wesnoth-httt/fr.po
+++ b/po/wesnoth-httt/fr.po
@@ -8127,7 +8127,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 "... et conseiller personnel de mon Roi et de mon <i>ami</i>, Garard le "
 "Second, que vous avez <i>salement</i> trahi..."
diff --git a/po/wesnoth-httt/fur_IT.po b/po/wesnoth-httt/fur_IT.po
index 2203ea0282a..8cd4cb8789f 100644
--- a/po/wesnoth-httt/fur_IT.po
+++ b/po/wesnoth-httt/fur_IT.po
@@ -6776,7 +6776,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 
 #. [message]: speaker=Delfador
diff --git a/po/wesnoth-httt/ga.po b/po/wesnoth-httt/ga.po
index 34e1846b4b9..33f1a7587dd 100644
--- a/po/wesnoth-httt/ga.po
+++ b/po/wesnoth-httt/ga.po
@@ -6823,7 +6823,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 
 #. [message]: speaker=Delfador
diff --git a/po/wesnoth-httt/gl.po b/po/wesnoth-httt/gl.po
index 0cdac03a701..e537850a97d 100644
--- a/po/wesnoth-httt/gl.po
+++ b/po/wesnoth-httt/gl.po
@@ -8086,7 +8086,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 "...e conselleiro persoal do meu rei e <i>amigo</i>, Garard II, a quen ti, "
 "<i>estúpida entre as estúpidas</i>, traizoaches..."
diff --git a/po/wesnoth-httt/he.po b/po/wesnoth-httt/he.po
index 6234ecf924a..05eba49d114 100644
--- a/po/wesnoth-httt/he.po
+++ b/po/wesnoth-httt/he.po
@@ -6857,7 +6857,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 
 #. [message]: speaker=Delfador
diff --git a/po/wesnoth-httt/hr.po b/po/wesnoth-httt/hr.po
index 88b95a1d442..a5edca21242 100644
--- a/po/wesnoth-httt/hr.po
+++ b/po/wesnoth-httt/hr.po
@@ -6778,7 +6778,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 
 #. [message]: speaker=Delfador
diff --git a/po/wesnoth-httt/hu.po b/po/wesnoth-httt/hu.po
index 8caf2b30cdb..3815e269f96 100644
--- a/po/wesnoth-httt/hu.po
+++ b/po/wesnoth-httt/hu.po
@@ -8070,7 +8070,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 "... valamint személyi tanácsadója királyomnak és <i>barátomnak</i>, II. "
 "Garardnak, akit te aljasan elárultál..."
diff --git a/po/wesnoth-httt/id.po b/po/wesnoth-httt/id.po
index f495915076a..3dc5fdfcfa8 100644
--- a/po/wesnoth-httt/id.po
+++ b/po/wesnoth-httt/id.po
@@ -8270,7 +8270,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 "...dan penasehat pribadi untuk Raja saya dan <i>teman</i> saya, Garard "
 "Kedua, yang paling anda <i>secara kotor</i> khianati..."
diff --git a/po/wesnoth-httt/is.po b/po/wesnoth-httt/is.po
index 262991457cb..cd704b28785 100644
--- a/po/wesnoth-httt/is.po
+++ b/po/wesnoth-httt/is.po
@@ -6781,7 +6781,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 
 #. [message]: speaker=Delfador
diff --git a/po/wesnoth-httt/it.po b/po/wesnoth-httt/it.po
index 77ee64c5687..4127cc0aa2d 100644
--- a/po/wesnoth-httt/it.po
+++ b/po/wesnoth-httt/it.po
@@ -8115,7 +8115,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 "... e consigliere personale del mio Re e mio <i>amico</i>, Garad secondo, "
 "che tu hai <i>slealmente</i> tradito..."
diff --git a/po/wesnoth-httt/ja.po b/po/wesnoth-httt/ja.po
index 11301b3e2ac..9fbd17f325d 100644
--- a/po/wesnoth-httt/ja.po
+++ b/po/wesnoth-httt/ja.po
@@ -8254,7 +8254,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 "……そして、おぬしが大層汚らしく裏切った、わしの友でもある王、Garard II 世の個"
 "人的な相談役でもあった。"
diff --git a/po/wesnoth-httt/ko.po b/po/wesnoth-httt/ko.po
index ff3770dc5fd..7c47e531125 100644
--- a/po/wesnoth-httt/ko.po
+++ b/po/wesnoth-httt/ko.po
@@ -7062,7 +7062,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 
 #. [message]: speaker=Delfador
diff --git a/po/wesnoth-httt/la.po b/po/wesnoth-httt/la.po
index 9ef865f30a8..7ae86365a4b 100644
--- a/po/wesnoth-httt/la.po
+++ b/po/wesnoth-httt/la.po
@@ -7784,7 +7784,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 "... et consiliarius proprius Regis ac <i>amici</i>, Garardi II, quem "
 "<i>foedissime</i> prodidisti..."
diff --git a/po/wesnoth-httt/lt.po b/po/wesnoth-httt/lt.po
index 4f324963d5a..e388b02dfc3 100644
--- a/po/wesnoth-httt/lt.po
+++ b/po/wesnoth-httt/lt.po
@@ -7882,7 +7882,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 "... ir asmeninis patarėjas mano karaliui ir <i>draugui</i>, Garardui "
 "antrajam, kurį tu <i>šlykščiai</i> išdavei..."
diff --git a/po/wesnoth-httt/lv.po b/po/wesnoth-httt/lv.po
index 6dec2955f29..da6290d9c50 100644
--- a/po/wesnoth-httt/lv.po
+++ b/po/wesnoth-httt/lv.po
@@ -6778,7 +6778,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 
 #. [message]: speaker=Delfador
diff --git a/po/wesnoth-httt/mk.po b/po/wesnoth-httt/mk.po
index e835288656c..fe342d08fed 100644
--- a/po/wesnoth-httt/mk.po
+++ b/po/wesnoth-httt/mk.po
@@ -6783,7 +6783,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 
 #. [message]: speaker=Delfador
diff --git a/po/wesnoth-httt/mr.po b/po/wesnoth-httt/mr.po
index 4278e114a0c..a125733dc34 100644
--- a/po/wesnoth-httt/mr.po
+++ b/po/wesnoth-httt/mr.po
@@ -6776,7 +6776,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 
 #. [message]: speaker=Delfador
diff --git a/po/wesnoth-httt/nb_NO.po b/po/wesnoth-httt/nb_NO.po
index da8b12195af..20040f122a8 100644
--- a/po/wesnoth-httt/nb_NO.po
+++ b/po/wesnoth-httt/nb_NO.po
@@ -7778,7 +7778,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 
 #. [message]: speaker=Delfador
diff --git a/po/wesnoth-httt/nl.po b/po/wesnoth-httt/nl.po
index 7086aa895e1..dae6a474423 100644
--- a/po/wesnoth-httt/nl.po
+++ b/po/wesnoth-httt/nl.po
@@ -8144,7 +8144,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 "... en persoonlijk adviseur van de Koning en mijn <i>vriend</i>, Gerard de "
 "Tweede, die jij bijna <i>valselijk</i> beschuldigde ..."
diff --git a/po/wesnoth-httt/pl.po b/po/wesnoth-httt/pl.po
index 403a8dc94f7..42d3f6e218c 100644
--- a/po/wesnoth-httt/pl.po
+++ b/po/wesnoth-httt/pl.po
@@ -8001,7 +8001,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 "... i osobisty doradca Króla i mojego <i>przyjaciela</i>, Gararda Drugiego, "
 "którego w sposób wielce <i>podły</i> zdradziłaś..."
diff --git a/po/wesnoth-httt/pt.po b/po/wesnoth-httt/pt.po
index 7c822dd4e03..deb97d71657 100644
--- a/po/wesnoth-httt/pt.po
+++ b/po/wesnoth-httt/pt.po
@@ -6777,7 +6777,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 
 #. [message]: speaker=Delfador
diff --git a/po/wesnoth-httt/pt_BR.po b/po/wesnoth-httt/pt_BR.po
index 30100ed7891..757f824d60d 100644
--- a/po/wesnoth-httt/pt_BR.po
+++ b/po/wesnoth-httt/pt_BR.po
@@ -8054,7 +8054,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 "... e conselheiro pessoal de meu Rei e <i>amigo</i>, Garard Segundo, o qual "
 "você muito <i>detestavelmente</i> traiu..."
diff --git a/po/wesnoth-httt/racv.po b/po/wesnoth-httt/racv.po
index 66bae25b0b2..a4584156a8b 100644
--- a/po/wesnoth-httt/racv.po
+++ b/po/wesnoth-httt/racv.po
@@ -7943,7 +7943,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 
 #. [message]: speaker=Delfador
diff --git a/po/wesnoth-httt/ro.po b/po/wesnoth-httt/ro.po
index 438a3ccbddc..b41b23ced33 100644
--- a/po/wesnoth-httt/ro.po
+++ b/po/wesnoth-httt/ro.po
@@ -6778,7 +6778,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 
 #. [message]: speaker=Delfador
diff --git a/po/wesnoth-httt/ru.po b/po/wesnoth-httt/ru.po
index 46d57c771df..2a98f1932c1 100644
--- a/po/wesnoth-httt/ru.po
+++ b/po/wesnoth-httt/ru.po
@@ -7915,7 +7915,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 "и личный советник моего Короля и моего <i>друга</i>, Гарарда Второго, "
 "которого ты столь <i>подло</i> предала."
diff --git a/po/wesnoth-httt/sk.po b/po/wesnoth-httt/sk.po
index 0a4f84f1fb6..ffbf38f95ca 100644
--- a/po/wesnoth-httt/sk.po
+++ b/po/wesnoth-httt/sk.po
@@ -7858,7 +7858,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 "... a osobný poradca môjho kráľa a <i>priateľa</i>, Gararda Druhého, ktorého "
 "si <i>odporne</i> zradila..."
diff --git a/po/wesnoth-httt/sl.po b/po/wesnoth-httt/sl.po
index 9ac5f814cd0..495306faac0 100644
--- a/po/wesnoth-httt/sl.po
+++ b/po/wesnoth-httt/sl.po
@@ -7323,7 +7323,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 
 #. [message]: speaker=Delfador
diff --git a/po/wesnoth-httt/sr.po b/po/wesnoth-httt/sr.po
index 2b9b733d9a8..c2644a4bb17 100644
--- a/po/wesnoth-httt/sr.po
+++ b/po/wesnoth-httt/sr.po
@@ -8000,7 +8000,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 "...и лични повереник свога краља и <i>пријатеља</i>, Гарарда Другог, којег "
 "ти тако <i>прљаво</i> издаде..."
diff --git a/po/wesnoth-httt/sr@ijekavian.po b/po/wesnoth-httt/sr@ijekavian.po
index 9454b754431..3bf6e4eb789 100644
--- a/po/wesnoth-httt/sr@ijekavian.po
+++ b/po/wesnoth-httt/sr@ijekavian.po
@@ -8021,7 +8021,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 "...и лични повјереник свога краља и <i>пријатеља</i>, Гарарда Другог, којег "
 "ти тако <i>прљаво</i> издаде..."
diff --git a/po/wesnoth-httt/sr@ijekavianlatin.po b/po/wesnoth-httt/sr@ijekavianlatin.po
index df87a1d4af8..b1d5ca73c56 100644
--- a/po/wesnoth-httt/sr@ijekavianlatin.po
+++ b/po/wesnoth-httt/sr@ijekavianlatin.po
@@ -8041,7 +8041,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 "...i lični povjerenik svoga kralja i <i>prijatelja</i>, Gararda Drugog, "
 "kojeg ti tako <i>prljavo</i> izdade..."
diff --git a/po/wesnoth-httt/sr@latin.po b/po/wesnoth-httt/sr@latin.po
index c96530b61fc..df943c81e0f 100644
--- a/po/wesnoth-httt/sr@latin.po
+++ b/po/wesnoth-httt/sr@latin.po
@@ -8018,7 +8018,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 "...i lični poverenik svoga kralja i <i>prijatelja</i>, Gararda Drugog, kojeg "
 "ti tako <i>prljavo</i> izdade..."
diff --git a/po/wesnoth-httt/sv.po b/po/wesnoth-httt/sv.po
index b1dc1a121c2..fd38a7adab2 100644
--- a/po/wesnoth-httt/sv.po
+++ b/po/wesnoth-httt/sv.po
@@ -7971,7 +7971,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 "... och personlig rådgivare till min kung och min <i>vän</i>, Garard den "
 "andre, vilken du <i>hänsynslöst</i> förrådde..."
diff --git a/po/wesnoth-httt/tl.po b/po/wesnoth-httt/tl.po
index 57c39efb2da..336a52914cf 100644
--- a/po/wesnoth-httt/tl.po
+++ b/po/wesnoth-httt/tl.po
@@ -6776,7 +6776,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 
 #. [message]: speaker=Delfador
diff --git a/po/wesnoth-httt/tr.po b/po/wesnoth-httt/tr.po
index a6d2bf4dddd..5d3a912975c 100644
--- a/po/wesnoth-httt/tr.po
+++ b/po/wesnoth-httt/tr.po
@@ -7955,7 +7955,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 
 #. [message]: speaker=Delfador
diff --git a/po/wesnoth-httt/uk.po b/po/wesnoth-httt/uk.po
index 8608a755c14..dfa3c8de84e 100644
--- a/po/wesnoth-httt/uk.po
+++ b/po/wesnoth-httt/uk.po
@@ -6786,7 +6786,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 
 #. [message]: speaker=Delfador
diff --git a/po/wesnoth-httt/vi.po b/po/wesnoth-httt/vi.po
index 99f91b7b954..077fd49f8dd 100644
--- a/po/wesnoth-httt/vi.po
+++ b/po/wesnoth-httt/vi.po
@@ -8222,7 +8222,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 "... và cố vấn riêng của đức vua và <i>bạn</i> ta, Garard Đệ Nhị, người đã bị "
 "ngươi làm phản một cách <i>bẩn thỉu</i>..."
diff --git a/po/wesnoth-httt/wesnoth-httt.pot b/po/wesnoth-httt/wesnoth-httt.pot
index 3c811afb868..4631dab3c77 100644
--- a/po/wesnoth-httt/wesnoth-httt.pot
+++ b/po/wesnoth-httt/wesnoth-httt.pot
@@ -6794,7 +6794,7 @@ msgstr ""
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 
 #. [message]: speaker=Delfador
diff --git a/po/wesnoth-httt/zh_CN.po b/po/wesnoth-httt/zh_CN.po
index 1a3efd3ac34..45bcf7dedae 100644
--- a/po/wesnoth-httt/zh_CN.po
+++ b/po/wesnoth-httt/zh_CN.po
@@ -7521,7 +7521,7 @@ msgstr "……西北（West-North）人民之王国的守护法师，<i>国王</
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:384
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 "……也是吾王的个人参事。吾王，我的<i>好友</i>，伽拉德二世，你<i>无耻地</i>背叛"
 "了他……"
diff --git a/po/wesnoth-httt/zh_TW.po b/po/wesnoth-httt/zh_TW.po
index cd0717c1542..2dc02363734 100644
--- a/po/wesnoth-httt/zh_TW.po
+++ b/po/wesnoth-httt/zh_TW.po
@@ -7672,10 +7672,10 @@ msgstr "……西北王之護衛法師，王之首臣……"
 #, fuzzy
 msgid ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 msgstr ""
 "... and personal counselor to my King and my <i>friend</i>, Garard the "
-"Second, who you most <i>foully</i> betrayed..."
+"Second, whom you most <i>foully</i> betrayed..."
 
 #. [message]: speaker=Delfador
 #: data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg:388
diff --git a/utils/pofix.py b/utils/pofix.py
index c5d31ea64c5..988c8bdb39b 100755
--- a/utils/pofix.py
+++ b/utils/pofix.py
@@ -52,8 +52,13 @@ stringfixes = {
 ("roleplaying", "role-playing"),
 ),
 
-# conversion added in 1.11.0-svn
+"wesnoth-httt" : (
+# fix added in 1.10.0+svn
+("Second, who you most", "Second, whom you most"),
+),
+
 "wesnoth-tutorial" : (
+# conversion added in 1.11.0-svn
 ("$unit.type", "$unit.language_name"),
 ),