WinMerge · sdottaka · May 27, 2023 · May 27, 2023
diff --git a/Src/DiffWrapper.cpp b/Src/DiffWrapper.cpp
@@ -494,8 +494,8 @@ bool CDiffWrapper::RunFileDiff()
 			if (m_infoPrediffer && !m_infoPrediffer->Prediffing(strFileTemp[file], m_sToFindPrediffer, m_bPathsAreTemp, { strFileTemp[file] }))
 			{
 				// display a message box
-				String sError = strutils::format(
-					_T("An error occurred while prediffing the file '%s' with the plugin '%s'. The prediffing is not applied any more."),
+				String sError = strutils::format_string2(
+					_("An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."),
 					strFileTemp[file].c_str(),
 					m_infoPrediffer->GetPluginPipeline().c_str());
 				AppErrorMessageBox(sError);

diff --git a/Src/FileTransform.cpp b/Src/FileTransform.cpp
@@ -269,7 +269,7 @@ bool PackingInfo::GetPackUnpackPlugin(const String& filteredFilenames, bool bUrl
 						else
 						{
 							plugin = nullptr;
-							errorMessage = strutils::format(_T("'%s' is not PACK_UNPACK plugin"), pluginName);
+							errorMessage = strutils::format_string1(_("'%1' is not unpacker plugin"), pluginName);
 						}
 						return false;
 					}
@@ -553,7 +553,7 @@ bool PrediffingInfo::GetPrediffPlugin(const String& filteredFilenames, bool bRev
 					}
 					else
 					{
-						errorMessage = strutils::format(_T("'%s' is not PREDIFF plugin"), pluginName);
+						errorMessage = strutils::format_string1(_("'%1' is not prediffer plugin"), pluginName);
 					}
 					return false;
 				}

diff --git a/Src/Merge.rc b/Src/Merge.rc
@@ -4141,6 +4141,12 @@ BEGIN
     IDS_PLUGIN_MISSING_QUOTATION_MARK 
                             "Missing quotation mark in plugin pipeline: %1"
     IDS_PLUGIN_TITLE1       "Specify plugin arguments"
+    IDS_PLUGIN_NOTFOUND_INVALID
+                            "Plugin not found or invalid: %1"
+    IDS_PLUGIN_NOT_UNPACK   "'%1' is not unpacker plugin"
+    IDS_PLUGIN_NOT_PREDIFF  "'%1' is not prediffer plugin"
+    IDS_PLUGIN_PREDIFF_ERROR
+                            "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 END
 
 STRINGTABLE

diff --git a/Src/resource.h b/Src/resource.h
@@ -1606,6 +1606,10 @@
 #define IDS_PLUGIN_MISSING_PLUGIN_NAME  44490
 #define IDS_PLUGIN_MISSING_QUOTATION_MARK 44491
 #define IDS_PLUGIN_TITLE1               44492
+#define IDS_PLUGIN_NOTFOUND_INVALID     44493
+#define IDS_PLUGIN_NOT_UNPACK           44494
+#define IDS_PLUGIN_NOT_PREDIFF          44495
+#define IDS_PLUGIN_PREDIFF_ERROR        44496
 #define IDS_L2M                         44500
 #define IDS_R2M                         44501
 #define IDS_COPY_FROM_MIDDLE_R          44502

diff --git a/Translations/WinMerge/Arabic.po b/Translations/WinMerge/Arabic.po
@@ -3933,6 +3933,22 @@ msgstr ""
 msgid "Specify plugin arguments"
 msgstr ""
 
+#, c-format
+msgid "Plugin not found or invalid: %1"
+msgstr ""
+
+#, c-format
+msgid "'%1' is not unpacker plugin"
+msgstr ""
+
+#, c-format
+msgid "'%1' is not prediffer plugin"
+msgstr ""
+
+#, c-format
+msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
+msgstr ""
+
 msgid "Filter applied"
 msgstr ""
 

diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
@@ -4540,6 +4540,22 @@ msgstr ""
 msgid "Specify plugin arguments"
 msgstr ""
 
+#, c-format
+msgid "Plugin not found or invalid: %1"
+msgstr ""
+
+#, c-format
+msgid "'%1' is not unpacker plugin"
+msgstr ""
+
+#, c-format
+msgid "'%1' is not prediffer plugin"
+msgstr ""
+
+#, c-format
+msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
+msgstr ""
+
 msgid "Filter applied"
 msgstr ""
 

diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
@@ -3615,6 +3615,22 @@ msgstr "Marca das aspas ausentes na tubulação do plugin: %1"
 msgid "Specify plugin arguments"
 msgstr "Especificar os argumentos do plugin"
 
+#, c-format
+msgid "Plugin not found or invalid: %1"
+msgstr ""
+
+#, c-format
+msgid "'%1' is not unpacker plugin"
+msgstr ""
+
+#, c-format
+msgid "'%1' is not prediffer plugin"
+msgstr ""
+
+#, c-format
+msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
+msgstr ""
+
 msgid "Filter applied"
 msgstr "Filtro aplicado"
 

diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
@@ -4017,6 +4017,22 @@ msgstr ""
 msgid "Specify plugin arguments"
 msgstr ""
 
+#, c-format
+msgid "Plugin not found or invalid: %1"
+msgstr ""
+
+#, c-format
+msgid "'%1' is not unpacker plugin"
+msgstr ""
+
+#, c-format
+msgid "'%1' is not prediffer plugin"
+msgstr ""
+
+#, c-format
+msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
+msgstr ""
+
 msgid "Filter applied"
 msgstr ""
 

diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
@@ -4695,6 +4695,22 @@ msgstr "Manca les cometes a la seqüència: %1"
 msgid "Specify plugin arguments"
 msgstr "Especifiqueu els paràmetres del connector"
 
+#, c-format
+msgid "Plugin not found or invalid: %1"
+msgstr ""
+
+#, c-format
+msgid "'%1' is not unpacker plugin"
+msgstr ""
+
+#, c-format
+msgid "'%1' is not prediffer plugin"
+msgstr ""
+
+#, c-format
+msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
+msgstr ""
+
 msgid "Filter applied"
 msgstr "Filtre aplicat"
 

diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
@@ -4037,6 +4037,22 @@ msgstr "插件流程（pipeline）中缺少引号: %1"
 msgid "Specify plugin arguments"
 msgstr "指定插件参数"
 
+#, c-format
+msgid "Plugin not found or invalid: %1"
+msgstr ""
+
+#, c-format
+msgid "'%1' is not unpacker plugin"
+msgstr ""
+
+#, c-format
+msgid "'%1' is not prediffer plugin"
+msgstr ""
+
+#, c-format
+msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
+msgstr ""
+
 msgid "Filter applied"
 msgstr "过滤器已应用"
 

diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
@@ -4694,6 +4694,22 @@ msgstr "外掛程式管線缺少引號：%1"
 msgid "Specify plugin arguments"
 msgstr "指定外掛程式參數"
 
+#, c-format
+msgid "Plugin not found or invalid: %1"
+msgstr ""
+
+#, c-format
+msgid "'%1' is not unpacker plugin"
+msgstr ""
+
+#, c-format
+msgid "'%1' is not prediffer plugin"
+msgstr ""
+
+#, c-format
+msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
+msgstr ""
+
 msgid "Filter applied"
 msgstr ""
 

diff --git a/Translations/WinMerge/Corsican.po b/Translations/WinMerge/Corsican.po
@@ -4008,6 +4008,22 @@ msgstr "Marca di citazione assente in u cundottu di u modulu d’estensione : %
 msgid "Specify plugin arguments"
 msgstr "Indicate i parametri di u modulu d’estensione"
 
+#, c-format
+msgid "Plugin not found or invalid: %1"
+msgstr ""
+
+#, c-format
+msgid "'%1' is not unpacker plugin"
+msgstr ""
+
+#, c-format
+msgid "'%1' is not prediffer plugin"
+msgstr ""
+
+#, c-format
+msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
+msgstr ""
+
 msgid "Filter applied"
 msgstr "Filtru appiecatu"
 

diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
@@ -4539,6 +4539,22 @@ msgstr ""
 msgid "Specify plugin arguments"
 msgstr ""
 
+#, c-format
+msgid "Plugin not found or invalid: %1"
+msgstr ""
+
+#, c-format
+msgid "'%1' is not unpacker plugin"
+msgstr ""
+
+#, c-format
+msgid "'%1' is not prediffer plugin"
+msgstr ""
+
+#, c-format
+msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
+msgstr ""
+
 msgid "Filter applied"
 msgstr ""
 

diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
@@ -4472,6 +4472,22 @@ msgstr ""
 msgid "Specify plugin arguments"
 msgstr ""
 
+#, c-format
+msgid "Plugin not found or invalid: %1"
+msgstr ""
+
+#, c-format
+msgid "'%1' is not unpacker plugin"
+msgstr ""
+
+#, c-format
+msgid "'%1' is not prediffer plugin"
+msgstr ""
+
+#, c-format
+msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
+msgstr ""
+
 msgid "Filter applied"
 msgstr ""
 

diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
@@ -4577,6 +4577,22 @@ msgstr ""
 msgid "Specify plugin arguments"
 msgstr ""
 
+#, c-format
+msgid "Plugin not found or invalid: %1"
+msgstr ""
+
+#, c-format
+msgid "'%1' is not unpacker plugin"
+msgstr ""
+
+#, c-format
+msgid "'%1' is not prediffer plugin"
+msgstr ""
+
+#, c-format
+msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
+msgstr ""
+
 msgid "Filter applied"
 msgstr ""
 

diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
@@ -3994,6 +3994,22 @@ msgstr "Ontbrekend aanhalingsteken in plugin-pipeline: %1"
 msgid "Specify plugin arguments"
 msgstr "Plugin-argumenten opgeven"
 
+#, c-format
+msgid "Plugin not found or invalid: %1"
+msgstr ""
+
+#, c-format
+msgid "'%1' is not unpacker plugin"
+msgstr ""
+
+#, c-format
+msgid "'%1' is not prediffer plugin"
+msgstr ""
+
+#, c-format
+msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
+msgstr ""
+
 msgid "Filter applied"
 msgstr "Filter toegepast"
 

diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2023-05-01 23:13+0000\n"
+"POT-Creation-Date: 2023-05-27 17:24+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <[email protected]>\n"
@@ -3609,6 +3609,22 @@ msgstr ""
 msgid "Specify plugin arguments"
 msgstr ""
 
+#, c-format
+msgid "Plugin not found or invalid: %1"
+msgstr ""
+
+#, c-format
+msgid "'%1' is not unpacker plugin"
+msgstr ""
+
+#, c-format
+msgid "'%1' is not prediffer plugin"
+msgstr ""
+
+#, c-format
+msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
+msgstr ""
+
 msgid "Filter applied"
 msgstr ""
 

diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po
@@ -4029,6 +4029,22 @@ msgstr "Puuttuva lainausmerkki laajennusputkessa: %1"
 msgid "Specify plugin arguments"
 msgstr "Määritä laajennuksen argumentit"
 
+#, c-format
+msgid "Plugin not found or invalid: %1"
+msgstr ""
+
+#, c-format
+msgid "'%1' is not unpacker plugin"
+msgstr ""
+
+#, c-format
+msgid "'%1' is not prediffer plugin"
+msgstr ""
+
+#, c-format
+msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
+msgstr ""
+
 msgid "Filter applied"
 msgstr "Sovellettu suodatin"