diff --git a/components/codetools/codetoolsstrconsts.pas b/components/codetools/codetoolsstrconsts.pas
index 71fb9a6a63..a34d3bd33d 100644
--- a/components/codetools/codetoolsstrconsts.pas
+++ b/components/codetools/codetoolsstrconsts.pas
@@ -54,7 +54,7 @@ ResourceString
   // customcodetool
   ctsIdentExpectedButAtomFound = 'identifier expected, but %s found';
   ctsIdentExpectedButKeyWordFound = 'identifier expected, but keyword %s found';
-  ctsStrExpectedButAtomFound = '%s expected, but %s found';
+  ctsStrExpectedButAtomFound = 'expected %s, but %s found';
   ctsEndOfFile = 'end of file';
   ctsPositionNotInSource = 'Position not in source';
   ctsInvalidClassName = 'invalid class name=%s%s%s';
diff --git a/components/codetools/languages/codetoolsstrconsts.ca.po b/components/codetools/languages/codetoolsstrconsts.ca.po
index e92d8c868b..42b22a2845 100644
--- a/components/codetools/languages/codetoolsstrconsts.ca.po
+++ b/components/codetools/languages/codetoolsstrconsts.ca.po
@@ -830,7 +830,9 @@ msgid "SrcPath Initialization"
 msgstr "Inicialització de SrcPath"
 
 #: codetoolsstrconsts.ctsstrexpectedbutatomfound
-msgid "%s expected, but %s found"
+#, fuzzy
+#| msgid "%s expected, but %s found"
+msgid "expected %s, but %s found"
 msgstr "s'esperava %s, però s'ha trobat %s"
 
 #: codetoolsstrconsts.ctsstringconstant
diff --git a/components/codetools/languages/codetoolsstrconsts.cs.po b/components/codetools/languages/codetoolsstrconsts.cs.po
index eb7dc25406..c9bf952c1f 100644
--- a/components/codetools/languages/codetoolsstrconsts.cs.po
+++ b/components/codetools/languages/codetoolsstrconsts.cs.po
@@ -831,7 +831,9 @@ msgid "SrcPath Initialization"
 msgstr "Inicializace SrcPath"
 
 #: codetoolsstrconsts.ctsstrexpectedbutatomfound
-msgid "%s expected, but %s found"
+#, fuzzy
+#| msgid "%s expected, but %s found"
+msgid "expected %s, but %s found"
 msgstr "%s očekáváno, ale nalezeno %s"
 
 #: codetoolsstrconsts.ctsstringconstant
diff --git a/components/codetools/languages/codetoolsstrconsts.de.po b/components/codetools/languages/codetoolsstrconsts.de.po
index 80de9ca655..e9215b3395 100644
--- a/components/codetools/languages/codetoolsstrconsts.de.po
+++ b/components/codetools/languages/codetoolsstrconsts.de.po
@@ -831,7 +831,9 @@ msgid "SrcPath Initialization"
 msgstr "Quellpfad-Initialisierung"
 
 #: codetoolsstrconsts.ctsstrexpectedbutatomfound
-msgid "%s expected, but %s found"
+#, fuzzy
+#| msgid "%s expected, but %s found"
+msgid "expected %s, but %s found"
 msgstr "%s erwartet aber %s gefunden"
 
 #: codetoolsstrconsts.ctsstringconstant
diff --git a/components/codetools/languages/codetoolsstrconsts.es.po b/components/codetools/languages/codetoolsstrconsts.es.po
index f7a0ba7ce6..72e1447319 100644
--- a/components/codetools/languages/codetoolsstrconsts.es.po
+++ b/components/codetools/languages/codetoolsstrconsts.es.po
@@ -830,7 +830,9 @@ msgid "SrcPath Initialization"
 msgstr "Inicialización SrcPath"
 
 #: codetoolsstrconsts.ctsstrexpectedbutatomfound
-msgid "%s expected, but %s found"
+#, fuzzy
+#| msgid "%s expected, but %s found"
+msgid "expected %s, but %s found"
 msgstr "se esperaba %s, pero se encontró %s"
 
 #: codetoolsstrconsts.ctsstringconstant
diff --git a/components/codetools/languages/codetoolsstrconsts.fi.po b/components/codetools/languages/codetoolsstrconsts.fi.po
index f8c6f9d35e..1c2e924f89 100644
--- a/components/codetools/languages/codetoolsstrconsts.fi.po
+++ b/components/codetools/languages/codetoolsstrconsts.fi.po
@@ -821,7 +821,7 @@ msgid "SrcPath Initialization"
 msgstr ""
 
 #: codetoolsstrconsts.ctsstrexpectedbutatomfound
-msgid "%s expected, but %s found"
+msgid "expected %s, but %s found"
 msgstr ""
 
 #: codetoolsstrconsts.ctsstringconstant
diff --git a/components/codetools/languages/codetoolsstrconsts.fr.po b/components/codetools/languages/codetoolsstrconsts.fr.po
index 76a96781b5..1a21e48ee3 100644
--- a/components/codetools/languages/codetoolsstrconsts.fr.po
+++ b/components/codetools/languages/codetoolsstrconsts.fr.po
@@ -831,7 +831,9 @@ msgid "SrcPath Initialization"
 msgstr "Initialisation de SrcPath"
 
 #: codetoolsstrconsts.ctsstrexpectedbutatomfound
-msgid "%s expected, but %s found"
+#, fuzzy
+#| msgid "%s expected, but %s found"
+msgid "expected %s, but %s found"
 msgstr "%s prévu, mais %s trouvé"
 
 #: codetoolsstrconsts.ctsstringconstant
diff --git a/components/codetools/languages/codetoolsstrconsts.he.po b/components/codetools/languages/codetoolsstrconsts.he.po
index 5d482dbca8..0fa965ab7c 100644
--- a/components/codetools/languages/codetoolsstrconsts.he.po
+++ b/components/codetools/languages/codetoolsstrconsts.he.po
@@ -830,7 +830,9 @@ msgid "SrcPath Initialization"
 msgstr "איתחול של SrcPath"
 
 #: codetoolsstrconsts.ctsstrexpectedbutatomfound
-msgid "%s expected, but %s found"
+#, fuzzy
+#| msgid "%s expected, but %s found"
+msgid "expected %s, but %s found"
 msgstr "מצפה ל s%  אבל נמצא s%"
 
 #: codetoolsstrconsts.ctsstringconstant
diff --git a/components/codetools/languages/codetoolsstrconsts.id.po b/components/codetools/languages/codetoolsstrconsts.id.po
index 72cd15a09c..06dd22368d 100644
--- a/components/codetools/languages/codetoolsstrconsts.id.po
+++ b/components/codetools/languages/codetoolsstrconsts.id.po
@@ -831,7 +831,9 @@ msgid "SrcPath Initialization"
 msgstr "Inisialisasi SrcPath"
 
 #: codetoolsstrconsts.ctsstrexpectedbutatomfound
-msgid "%s expected, but %s found"
+#, fuzzy
+#| msgid "%s expected, but %s found"
+msgid "expected %s, but %s found"
 msgstr "%s diharapkan, tapi %s ditemukan"
 
 #: codetoolsstrconsts.ctsstringconstant
diff --git a/components/codetools/languages/codetoolsstrconsts.it.po b/components/codetools/languages/codetoolsstrconsts.it.po
index 8d032b93bd..7cbf7e8824 100644
--- a/components/codetools/languages/codetoolsstrconsts.it.po
+++ b/components/codetools/languages/codetoolsstrconsts.it.po
@@ -828,7 +828,9 @@ msgid "SrcPath Initialization"
 msgstr "Inizializzazione SrcPath"
 
 #: codetoolsstrconsts.ctsstrexpectedbutatomfound
-msgid "%s expected, but %s found"
+#, fuzzy
+#| msgid "%s expected, but %s found"
+msgid "expected %s, but %s found"
 msgstr "era previsto %s invece è stato trovato %s"
 
 #: codetoolsstrconsts.ctsstringconstant
diff --git a/components/codetools/languages/codetoolsstrconsts.lt.po b/components/codetools/languages/codetoolsstrconsts.lt.po
index 6ba89d5225..a9738d5c6c 100644
--- a/components/codetools/languages/codetoolsstrconsts.lt.po
+++ b/components/codetools/languages/codetoolsstrconsts.lt.po
@@ -831,7 +831,9 @@ msgid "SrcPath Initialization"
 msgstr "Pirminio kodo kelio inicializacija"
 
 #: codetoolsstrconsts.ctsstrexpectedbutatomfound
-msgid "%s expected, but %s found"
+#, fuzzy
+#| msgid "%s expected, but %s found"
+msgid "expected %s, but %s found"
 msgstr "%s tikėtasi, tačiau rasta %s"
 
 #: codetoolsstrconsts.ctsstringconstant
diff --git a/components/codetools/languages/codetoolsstrconsts.nl.po b/components/codetools/languages/codetoolsstrconsts.nl.po
index 590f0dc231..8bf7feb25e 100644
--- a/components/codetools/languages/codetoolsstrconsts.nl.po
+++ b/components/codetools/languages/codetoolsstrconsts.nl.po
@@ -830,7 +830,9 @@ msgid "SrcPath Initialization"
 msgstr ""
 
 #: codetoolsstrconsts.ctsstrexpectedbutatomfound
-msgid "%s expected, but %s found"
+#, fuzzy
+#| msgid "%s expected, but %s found"
+msgid "expected %s, but %s found"
 msgstr "%s verwacht, maar %s gevonden"
 
 #: codetoolsstrconsts.ctsstringconstant
diff --git a/components/codetools/languages/codetoolsstrconsts.pl.po b/components/codetools/languages/codetoolsstrconsts.pl.po
index 302a60a086..5e6a7c5548 100644
--- a/components/codetools/languages/codetoolsstrconsts.pl.po
+++ b/components/codetools/languages/codetoolsstrconsts.pl.po
@@ -834,7 +834,9 @@ msgid "SrcPath Initialization"
 msgstr "Inicjowanie SrcPath"
 
 #: codetoolsstrconsts.ctsstrexpectedbutatomfound
-msgid "%s expected, but %s found"
+#, fuzzy
+#| msgid "%s expected, but %s found"
+msgid "expected %s, but %s found"
 msgstr "zamiast: %s znaleziono: %s"
 
 #: codetoolsstrconsts.ctsstringconstant
diff --git a/components/codetools/languages/codetoolsstrconsts.po b/components/codetools/languages/codetoolsstrconsts.po
index 83c42c6e54..f126378f8c 100644
--- a/components/codetools/languages/codetoolsstrconsts.po
+++ b/components/codetools/languages/codetoolsstrconsts.po
@@ -821,7 +821,7 @@ msgid "SrcPath Initialization"
 msgstr ""
 
 #: codetoolsstrconsts.ctsstrexpectedbutatomfound
-msgid "%s expected, but %s found"
+msgid "expected %s, but %s found"
 msgstr ""
 
 #: codetoolsstrconsts.ctsstringconstant
diff --git a/components/codetools/languages/codetoolsstrconsts.pt_BR.po b/components/codetools/languages/codetoolsstrconsts.pt_BR.po
index 512d950c72..38f354bf6f 100644
--- a/components/codetools/languages/codetoolsstrconsts.pt_BR.po
+++ b/components/codetools/languages/codetoolsstrconsts.pt_BR.po
@@ -829,7 +829,9 @@ msgid "SrcPath Initialization"
 msgstr "Inicialização \"SrcPath\""
 
 #: codetoolsstrconsts.ctsstrexpectedbutatomfound
-msgid "%s expected, but %s found"
+#, fuzzy
+#| msgid "%s expected, but %s found"
+msgid "expected %s, but %s found"
 msgstr "%s esperado, mas %s encontrado"
 
 #: codetoolsstrconsts.ctsstringconstant
diff --git a/components/codetools/languages/codetoolsstrconsts.ru.po b/components/codetools/languages/codetoolsstrconsts.ru.po
index 47825bdd82..5bb07e3d36 100644
--- a/components/codetools/languages/codetoolsstrconsts.ru.po
+++ b/components/codetools/languages/codetoolsstrconsts.ru.po
@@ -828,7 +828,9 @@ msgid "SrcPath Initialization"
 msgstr "Инициализация путей к исходному коду"
 
 #: codetoolsstrconsts.ctsstrexpectedbutatomfound
-msgid "%s expected, but %s found"
+#, fuzzy
+#| msgid "%s expected, but %s found"
+msgid "expected %s, but %s found"
 msgstr "ожидается %s, но найдено %s"
 
 #: codetoolsstrconsts.ctsstringconstant
diff --git a/components/codetools/languages/codetoolsstrconsts.sk.po b/components/codetools/languages/codetoolsstrconsts.sk.po
index 6b29027cf5..fe7eb28a1e 100644
--- a/components/codetools/languages/codetoolsstrconsts.sk.po
+++ b/components/codetools/languages/codetoolsstrconsts.sk.po
@@ -827,7 +827,7 @@ msgid "SrcPath Initialization"
 msgstr ""
 
 #: codetoolsstrconsts.ctsstrexpectedbutatomfound
-msgid "%s expected, but %s found"
+msgid "expected %s, but %s found"
 msgstr ""
 
 #: codetoolsstrconsts.ctsstringconstant
diff --git a/components/codetools/languages/codetoolsstrconsts.uk.po b/components/codetools/languages/codetoolsstrconsts.uk.po
index 55fd839138..b968c519e1 100644
--- a/components/codetools/languages/codetoolsstrconsts.uk.po
+++ b/components/codetools/languages/codetoolsstrconsts.uk.po
@@ -831,7 +831,9 @@ msgid "SrcPath Initialization"
 msgstr "Ініціалізація шляхів до текстів програм"
 
 #: codetoolsstrconsts.ctsstrexpectedbutatomfound
-msgid "%s expected, but %s found"
+#, fuzzy
+#| msgid "%s expected, but %s found"
+msgid "expected %s, but %s found"
 msgstr "очікується %s, але знайдено %s"
 
 #: codetoolsstrconsts.ctsstringconstant
diff --git a/components/codetools/languages/codetoolsstrconsts.zh_CN.po b/components/codetools/languages/codetoolsstrconsts.zh_CN.po
index abb8e6e0de..092f2fd5dd 100644
--- a/components/codetools/languages/codetoolsstrconsts.zh_CN.po
+++ b/components/codetools/languages/codetoolsstrconsts.zh_CN.po
@@ -833,7 +833,9 @@ msgid "SrcPath Initialization"
 msgstr "SrcPath Initialization"
 
 #: codetoolsstrconsts.ctsstrexpectedbutatomfound
-msgid "%s expected, but %s found"
+#, fuzzy
+#| msgid "%s expected, but %s found"
+msgid "expected %s, but %s found"
 msgstr "应该是 %s , 但是却出现 %s"
 
 #: codetoolsstrconsts.ctsstringconstant