From 6d9daa5459e0e500a1284476b4103341188d45f6 Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Tue, 4 Jan 2022 21:29:51 +0100
Subject: [PATCH] Correct various fmt issues in the translation files

---
 Translations/cs.po    |  2 +-
 Translations/de.po    |  6 +++---
 Translations/fr.po    | 11 +++++------
 Translations/it.po    |  2 +-
 Translations/ja.po    |  2 +-
 Translations/pl.po    | 12 +++++-------
 Translations/pt_BR.po |  6 ++----
 Translations/ro.po    |  8 +++-----
 Translations/ru.po    | 10 +++++-----
 Translations/uk.po    |  2 +-
 Translations/zh_CN.po |  2 +-
 Translations/zh_TW.po | 14 ++++++--------
 12 files changed, 34 insertions(+), 43 deletions(-)

diff --git a/Translations/cs.po b/Translations/cs.po
index df9b9189e..b5adfefbc 100644
--- a/Translations/cs.po
+++ b/Translations/cs.po
@@ -3656,7 +3656,7 @@ msgstr ""
 #. TRANSLATORS: Constructs item names. Format: {Item} of {Suffix}. Example: Long Sword of the Whale
 #: Source/items.cpp:1220
 msgid "{0} of {1}"
-msgstr "{:s} {:s}"
+msgstr "{0} {1}"
 
 #: Source/items.cpp:1906 Source/items.cpp:1918
 msgid "increases a weapon's"
diff --git a/Translations/de.po b/Translations/de.po
index b4a9dee9d..b37c3b16f 100644
--- a/Translations/de.po
+++ b/Translations/de.po
@@ -3837,7 +3837,7 @@ msgstr "{0}{1}"
 #. TRANSLATORS: Constructs item names. Format: {Item} of {Suffix}. Example: Long Sword of the Whale
 #: Source/items.cpp:1166
 msgid "{0} of {1}"
-msgstr "{:s} de{:s}"
+msgstr "{0} de{1}"
 
 #: Source/items.cpp:1850 Source/items.cpp:1862
 msgid "increases a weapon's"
@@ -4356,7 +4356,7 @@ msgstr "Blitzschaden: {:d}"
 
 #: Source/items.cpp:3930
 msgid "lightning damage: {:d}-{:d}"
-msgstr "Blitzschaden: {:d}"
+msgstr "Blitzschaden: {:d}-{:d}"
 
 #: Source/items.cpp:3932
 msgid "charged bolts on hits"
@@ -4412,7 +4412,7 @@ msgstr "Schaden: {:d}  Haltb.: {:d}/{:d}"
 
 #: Source/items.cpp:3999 Source/items.cpp:4044
 msgid "damage: {:d}-{:d}  Indestructible"
-msgstr "Schaden: {:d}  Unzerstörbar"
+msgstr "Schaden: {:d}-{:d}  Unzerstörbar"
 
 #. TRANSLATORS: Dur: is durability
 #: Source/items.cpp:4001 Source/items.cpp:4046
diff --git a/Translations/fr.po b/Translations/fr.po
index 8da1ae098..ca103a30a 100644
--- a/Translations/fr.po
+++ b/Translations/fr.po
@@ -955,10 +955,11 @@ msgid "Scroll of {:s}"
 msgstr "Parchemin de {:s}"
 
 #: Source/control.cpp:747 Source/control.cpp:1257
+#, fuzzy
 msgid "{:d} Scroll"
 msgid_plural "{:d} Scrolls"
-msgstr[0] "Parchemin de {:s}"
-msgstr[1] "Parchemins de {:s}"
+msgstr[0] "{:d} Parchemin"
+msgstr[1] "{:d} Parchemins"
 
 #: Source/control.cpp:754 Source/itemdat.cpp:167 Source/itemdat.cpp:168
 #: Source/itemdat.cpp:169 Source/itemdat.cpp:170 Source/itemdat.cpp:171
@@ -3624,11 +3625,9 @@ msgstr "Huile d'Imperméabilité"
 
 #. TRANSLATORS: Constructs item names. Format: {Item} of {Spell}. Example: War Staff of Firewall
 #: Source/items.cpp:1183
-#, fuzzy
-#| msgid "{0} of {1}"
 msgctxt "spell"
 msgid "{0} of {1}"
-msgstr "{:s} de {:s}"
+msgstr "{0} de {1}"
 
 #. TRANSLATORS: Constructs item names. Format: {Prefix} {Item} of {Spell}. Example: King's War Staff of Firewall
 #: Source/items.cpp:1193
@@ -3651,7 +3650,7 @@ msgstr ""
 #. TRANSLATORS: Constructs item names. Format: {Item} of {Suffix}. Example: Long Sword of the Whale
 #: Source/items.cpp:1220
 msgid "{0} of {1}"
-msgstr "{:s} de {:s}"
+msgstr "{0} de {1}"
 
 #: Source/items.cpp:1906 Source/items.cpp:1918
 msgid "increases a weapon's"
diff --git a/Translations/it.po b/Translations/it.po
index 93e3f327a..73632acd8 100644
--- a/Translations/it.po
+++ b/Translations/it.po
@@ -3781,7 +3781,7 @@ msgstr "{1} {0}"
 #. TRANSLATORS: Constructs item names. Format: {Item} of {Suffix}. Example: Long Sword of the Whale
 #: Source/items.cpp:1166
 msgid "{0} of {1}"
-msgstr "{:s} di {:s}"
+msgstr "{0} di {1}"
 
 #: Source/items.cpp:1850 Source/items.cpp:1862
 msgid "increases a weapon's"
diff --git a/Translations/ja.po b/Translations/ja.po
index f8893912e..d2ac12eb9 100644
--- a/Translations/ja.po
+++ b/Translations/ja.po
@@ -4162,7 +4162,7 @@ msgstr "ダメージ: {:d}-{:d}  壊れ​ない"
 #. TRANSLATORS: Dur: is durability
 #: Source/items.cpp:4146 Source/items.cpp:4193
 msgid "damage: {:d}-{:d}  Dur: {:d}/{:d}"
-msgstr "ダメージ:{:d}  耐久​度:{:d}/{:d}"
+msgstr "ダメージ:{:d}-{:d}  耐久​度:{:d}/{:d}"
 
 #: Source/items.cpp:4152 Source/items.cpp:4205
 msgid "armor: {:d}  Indestructible"
diff --git a/Translations/pl.po b/Translations/pl.po
index ada909323..7010efa33 100644
--- a/Translations/pl.po
+++ b/Translations/pl.po
@@ -3618,11 +3618,9 @@ msgstr "Olej Nieprzenikalności"
 
 #. TRANSLATORS: Constructs item names. Format: {Item} of {Spell}. Example: War Staff of Firewall
 #: Source/items.cpp:1183
-#, fuzzy
-#| msgid "{0} of {1}"
 msgctxt "spell"
 msgid "{0} of {1}"
-msgstr "{:s} {:s}"
+msgstr "{0} {1}"
 
 #. TRANSLATORS: Constructs item names. Format: {Prefix} {Item} of {Spell}. Example: King's War Staff of Firewall
 #: Source/items.cpp:1193
@@ -3645,7 +3643,7 @@ msgstr ""
 #. TRANSLATORS: Constructs item names. Format: {Item} of {Suffix}. Example: Long Sword of the Whale
 #: Source/items.cpp:1220
 msgid "{0} of {1}"
-msgstr "{:s} {:s}"
+msgstr "{0} {1}"
 
 #: Source/items.cpp:1906 Source/items.cpp:1918
 msgid "increases a weapon's"
@@ -6735,15 +6733,15 @@ msgstr "Akceptuj"
 
 #: Source/stores.cpp:1249
 msgid "Talk to {:s}"
-msgstr "Rozmowa"
+msgstr "Rozmawiaj z {:s}"
 
 #: Source/stores.cpp:1253
 msgid "Talking to {:s}"
-msgstr "Rozmowa"
+msgstr "Rozmowa z {:s}"
 
 #: Source/stores.cpp:1255
 msgid "is not available"
-msgstr "jest niedostępny"
+msgstr "jest niedostępna"
 
 #: Source/stores.cpp:1256
 msgid "in the shareware"
diff --git a/Translations/pt_BR.po b/Translations/pt_BR.po
index c9583ffc6..44b10098d 100644
--- a/Translations/pt_BR.po
+++ b/Translations/pt_BR.po
@@ -3664,11 +3664,9 @@ msgstr "Óleo de impermeabilidade"
 
 #. TRANSLATORS: Constructs item names. Format: {Item} of {Spell}. Example: War Staff of Firewall
 #: Source/items.cpp:1183
-#, fuzzy
-#| msgid "{0} of {1}"
 msgctxt "spell"
 msgid "{0} of {1}"
-msgstr "{:s} {:s}"
+msgstr "{0} {1}"
 
 #. TRANSLATORS: Constructs item names. Format: {Prefix} {Item} of {Spell}. Example: King's War Staff of Firewall
 #: Source/items.cpp:1193
@@ -3691,7 +3689,7 @@ msgstr ""
 #. TRANSLATORS: Constructs item names. Format: {Item} of {Suffix}. Example: Long Sword of the Whale
 #: Source/items.cpp:1220
 msgid "{0} of {1}"
-msgstr "{:s} {:s}"
+msgstr "{0} {1}"
 
 #: Source/items.cpp:1906 Source/items.cpp:1918
 msgid "increases a weapon's"
diff --git a/Translations/ro.po b/Translations/ro.po
index 861679ee8..a91cffda8 100644
--- a/Translations/ro.po
+++ b/Translations/ro.po
@@ -3626,11 +3626,9 @@ msgstr ""
 
 #. TRANSLATORS: Constructs item names. Format: {Item} of {Spell}. Example: War Staff of Firewall
 #: Source/items.cpp:1183
-#, fuzzy
-#| msgid "{0} of {1}"
 msgctxt "spell"
 msgid "{0} of {1}"
-msgstr "{:s} de {:s}"
+msgstr "{0} de {1}"
 
 #. TRANSLATORS: Constructs item names. Format: {Prefix} {Item} of {Spell}. Example: King's War Staff of Firewall
 #: Source/items.cpp:1193
@@ -3653,7 +3651,7 @@ msgstr ""
 #. TRANSLATORS: Constructs item names. Format: {Item} of {Suffix}. Example: Long Sword of the Whale
 #: Source/items.cpp:1220
 msgid "{0} of {1}"
-msgstr "{:s} de {:s}"
+msgstr "{0} de {1}"
 
 #: Source/items.cpp:1906 Source/items.cpp:1918
 msgid "increases a weapon's"
@@ -4247,7 +4245,7 @@ msgstr "daune: {:d}-{:d}  Dur: {:d}/{:d}"
 
 #: Source/items.cpp:4157 Source/items.cpp:4210
 msgid "armor: {:d}  Indestructible"
-msgstr "armură: {:d}-{:d}  Indestructibil"
+msgstr "armură: {:d}  Indestructibil"
 
 #. TRANSLATORS: Dur: is durability
 #: Source/items.cpp:4159 Source/items.cpp:4212
diff --git a/Translations/ru.po b/Translations/ru.po
index b4b6f77e6..e9a91895b 100644
--- a/Translations/ru.po
+++ b/Translations/ru.po
@@ -3648,7 +3648,7 @@ msgstr ""
 #: Source/items.cpp:1187 Source/items.cpp:1254 Source/items.cpp:1273
 #: Source/items.cpp:1315
 msgid "{0} of {1}"
-msgstr "{:s} {:s}"
+msgstr "{0} {1}"
 
 #: Source/items.cpp:1895 Source/items.cpp:1907
 msgid "increases a weapon's"
@@ -3872,7 +3872,7 @@ msgstr "класс брони: {:d}"
 
 #: Source/items.cpp:3842 Source/items.cpp:4067
 msgid "Resist Fire: {:+d}%"
-msgstr "Сопротивление огню: {:d}%"
+msgstr "Сопротивление огню: {:+d}%"
 
 #: Source/items.cpp:3844
 #, no-c-format
@@ -3881,7 +3881,7 @@ msgstr "Сопротивление огню: 75% MAX"
 
 #: Source/items.cpp:3849
 msgid "Resist Lightning: {:+d}%"
-msgstr "Сопротивление молнии: {:d}%"
+msgstr "Сопротивление молнии: {:+d}%"
 
 #: Source/items.cpp:3851
 #, no-c-format
@@ -3890,7 +3890,7 @@ msgstr "Сопротивление молнии: 75% MAX"
 
 #: Source/items.cpp:3856
 msgid "Resist Magic: {:+d}%"
-msgstr "Сопротивление магии: {:d}%"
+msgstr "Сопротивление магии: {:+d}%"
 
 #: Source/items.cpp:3858
 #, no-c-format
@@ -3899,7 +3899,7 @@ msgstr "Сопротивление магии: 75% MAX"
 
 #: Source/items.cpp:3863
 msgid "Resist All: {:+d}%"
-msgstr "Общее сопротивление: {:d}%"
+msgstr "Общее сопротивление: {:+d}%"
 
 #: Source/items.cpp:3865
 #, no-c-format
diff --git a/Translations/uk.po b/Translations/uk.po
index df17fbc1a..94552bbaa 100644
--- a/Translations/uk.po
+++ b/Translations/uk.po
@@ -4148,7 +4148,7 @@ msgstr "шкода кулі вогню: {:d}"
 
 #: Source/items.cpp:3853
 msgid "fireball damage: {:d}-{:d}"
-msgstr "шкода кулі вогню: {:d}"
+msgstr "шкода кулі вогню: {:d}-{:d}"
 
 #: Source/items.cpp:3855
 msgid "attacker takes 1-3 damage"
diff --git a/Translations/zh_CN.po b/Translations/zh_CN.po
index b9ae6fd82..f8946f017 100644
--- a/Translations/zh_CN.po
+++ b/Translations/zh_CN.po
@@ -6732,7 +6732,7 @@ msgstr "卷轴"
 
 #: Source/panels/spell_list.cpp:207
 msgid "Spell Hotkey {:s}"
-msgstr "法术​热键 {:d}"
+msgstr "法术​热键 {:s}"
 
 #: Source/pfile.cpp:242
 msgid "Failed to open player archive for writing."
diff --git a/Translations/zh_TW.po b/Translations/zh_TW.po
index fd06c2ccd..aac856fb0 100644
--- a/Translations/zh_TW.po
+++ b/Translations/zh_TW.po
@@ -825,9 +825,9 @@ msgid ""
 "\n"
 "The error occurred at: {:s} line {:d}"
 msgstr ""
-"{: s}\n"
+"{:s}\n"
 "\n"
-"錯誤​發生​在: {: s}，行{: d}"
+"錯誤​發生​在: {:s}，行{:d}"
 
 #: Source/appfat.cpp:117
 #, fuzzy
@@ -856,7 +856,7 @@ msgid ""
 "{:s}"
 msgstr ""
 "無​法​寫入​位置: \n"
-"{: s}"
+"{:s}"
 
 #: Source/appfat.cpp:133
 msgid "Read-Only Directory Error"
@@ -1243,7 +1243,7 @@ msgstr ""
 
 #: Source/diablo.cpp:870
 msgid "unrecognized option '{:s}'\n"
-msgstr "無​法識別​的​選項​{: s}\n"
+msgstr "無​法識別​的​選項​{:s}\n"
 
 #: Source/diablo.cpp:901
 msgid "version {:s}"
@@ -3631,11 +3631,9 @@ msgstr "防水​之​油"
 
 #. TRANSLATORS: Constructs item names. Format: {Item} of {Spell}. Example: War Staff of Firewall
 #: Source/items.cpp:1184
-#, fuzzy
-#| msgid "{0} of {1}"
 msgctxt "spell"
 msgid "{0} of {1}"
-msgstr "{:s} / {:s}"
+msgstr "{0} / {1}"
 
 #. TRANSLATORS: Constructs item names. Format: {Prefix} {Item} of {Spell}. Example: King's War Staff of Firewall
 #: Source/items.cpp:1192
@@ -3658,7 +3656,7 @@ msgstr ""
 #. TRANSLATORS: Constructs item names. Format: {Item} of {Suffix}. Example: Long Sword of the Whale
 #: Source/items.cpp:1216
 msgid "{0} of {1}"
-msgstr "{:s} / {:s}"
+msgstr "{0} / {1}"
 
 #: Source/items.cpp:1900 Source/items.cpp:1912
 msgid "increases a weapon's"