Merge pull request #4591 from wb180/mapeditor_fix

Placeholders fix in map validation

mapeditor/translation/chinese.ts

@@ -1761,12 +1761,12 @@
     </message>
     <message>
         <location filename="../validator.cpp" line="148"/>
-        <source>Spell scroll % 1 doesn&apos;t have instance assigned and must be removed</source>
+        <source>Spell scroll %1 doesn&apos;t have instance assigned and must be removed</source>
         <translation>魔法卷轴 %1 没有分配任何实例，需要被移除</translation>
     </message>
     <message>
         <location filename="../validator.cpp" line="154"/>
-        <source>Artifact % 1 is prohibited by map settings</source>
+        <source>Artifact %1 is prohibited by map settings</source>
         <translation>宝物 %1 被地图设置禁止</translation>
     </message>
     <message>

mapeditor/translation/czech.ts

@@ -1761,12 +1761,12 @@
     </message>
     <message>
         <location filename="../validator.cpp" line="148"/>
-        <source>Spell scroll % 1 doesn&apos;t have instance assigned and must be removed</source>
+        <source>Spell scroll %1 doesn&apos;t have instance assigned and must be removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../validator.cpp" line="154"/>
-        <source>Artifact % 1 is prohibited by map settings</source>
+        <source>Artifact %1 is prohibited by map settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

mapeditor/translation/english.ts

@@ -1761,12 +1761,12 @@
     </message>
     <message>
         <location filename="../validator.cpp" line="148"/>
-        <source>Spell scroll % 1 doesn&apos;t have instance assigned and must be removed</source>
+        <source>Spell scroll %1 doesn&apos;t have instance assigned and must be removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../validator.cpp" line="154"/>
-        <source>Artifact % 1 is prohibited by map settings</source>
+        <source>Artifact %1 is prohibited by map settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

mapeditor/translation/french.ts

@@ -1761,12 +1761,12 @@
     </message>
     <message>
         <location filename="../validator.cpp" line="148"/>
-        <source>Spell scroll % 1 doesn&apos;t have instance assigned and must be removed</source>
+        <source>Spell scroll %1 doesn&apos;t have instance assigned and must be removed</source>
         <translation>Le défilement de sort %1 n&apos;a pas d&apos;instance assignée et doit être enlevé</translation>
     </message>
     <message>
         <location filename="../validator.cpp" line="154"/>
-        <source>Artifact % 1 is prohibited by map settings</source>
+        <source>Artifact %1 is prohibited by map settings</source>
         <translation>L&apos;artéfact %1 est interdit par la configuration de la carte</translation>
     </message>
     <message>

mapeditor/translation/german.ts

@@ -1761,12 +1761,12 @@
     </message>
     <message>
         <location filename="../validator.cpp" line="148"/>
-        <source>Spell scroll % 1 doesn&apos;t have instance assigned and must be removed</source>
+        <source>Spell scroll %1 doesn&apos;t have instance assigned and must be removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../validator.cpp" line="154"/>
-        <source>Artifact % 1 is prohibited by map settings</source>
+        <source>Artifact %1 is prohibited by map settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

mapeditor/translation/polish.ts

@@ -1761,12 +1761,12 @@
     </message>
     <message>
         <location filename="../validator.cpp" line="148"/>
-        <source>Spell scroll % 1 doesn&apos;t have instance assigned and must be removed</source>
+        <source>Spell scroll %1 doesn&apos;t have instance assigned and must be removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../validator.cpp" line="154"/>
-        <source>Artifact % 1 is prohibited by map settings</source>
+        <source>Artifact %1 is prohibited by map settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

mapeditor/translation/portuguese.ts

@@ -1761,12 +1761,12 @@
     </message>
     <message>
         <location filename="../validator.cpp" line="148"/>
-        <source>Spell scroll % 1 doesn&apos;t have instance assigned and must be removed</source>
+        <source>Spell scroll %1 doesn&apos;t have instance assigned and must be removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../validator.cpp" line="154"/>
-        <source>Artifact % 1 is prohibited by map settings</source>
+        <source>Artifact %1 is prohibited by map settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

mapeditor/translation/russian.ts

@@ -1761,12 +1761,12 @@
     </message>
     <message>
         <location filename="../validator.cpp" line="148"/>
-        <source>Spell scroll % 1 doesn&apos;t have instance assigned and must be removed</source>
+        <source>Spell scroll %1 doesn&apos;t have instance assigned and must be removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../validator.cpp" line="154"/>
-        <source>Artifact % 1 is prohibited by map settings</source>
+        <source>Artifact %1 is prohibited by map settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

mapeditor/translation/spanish.ts

@@ -1761,12 +1761,12 @@
     </message>
     <message>
         <location filename="../validator.cpp" line="148"/>
-        <source>Spell scroll % 1 doesn&apos;t have instance assigned and must be removed</source>
+        <source>Spell scroll %1 doesn&apos;t have instance assigned and must be removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../validator.cpp" line="154"/>
-        <source>Artifact % 1 is prohibited by map settings</source>
+        <source>Artifact %1 is prohibited by map settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

mapeditor/translation/ukrainian.ts

@@ -1761,12 +1761,12 @@
     </message>
     <message>
         <location filename="../validator.cpp" line="148"/>
-        <source>Spell scroll % 1 doesn&apos;t have instance assigned and must be removed</source>
+        <source>Spell scroll %1 doesn&apos;t have instance assigned and must be removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../validator.cpp" line="154"/>
-        <source>Artifact % 1 is prohibited by map settings</source>
+        <source>Artifact %1 is prohibited by map settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

mapeditor/translation/vietnamese.ts

@@ -1761,12 +1761,12 @@
     </message>
     <message>
         <location filename="../validator.cpp" line="148"/>
-        <source>Spell scroll % 1 doesn&apos;t have instance assigned and must be removed</source>
+        <source>Spell scroll %1 doesn&apos;t have instance assigned and must be removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../validator.cpp" line="154"/>
-        <source>Artifact % 1 is prohibited by map settings</source>
+        <source>Artifact %1 is prohibited by map settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

mapeditor/validator.cpp

@@ -145,13 +145,13 @@ std::set<Validator::Issue> Validator::validate(const CMap * map)
 							issues.insert({ tr("Spell scroll %1 is prohibited by map settings").arg(ins->storedArtifact->getScrollSpellID().toEntity(VLC->spells())->getNameTranslated().c_str()), false });
 					}
 					else
-						issues.insert({ tr("Spell scroll % 1 doesn't have instance assigned and must be removed").arg(ins->instanceName.c_str()), true });
+						issues.insert({ tr("Spell scroll %1 doesn't have instance assigned and must be removed").arg(ins->instanceName.c_str()), true });
 				}
 				else
 				{
 					if(ins->ID == Obj::ARTIFACT && map->allowedArtifact.count(ins->getArtifact()) == 0)
 					{
-						issues.insert({ tr("Artifact % 1 is prohibited by map settings").arg(ins->getObjectName().c_str()), false });
+						issues.insert({ tr("Artifact %1 is prohibited by map settings").arg(ins->getObjectName().c_str()), false });
 					}
 				}
 			}