From 2b2ad2aa4544f6f3d06d836dbb5ce12ae476a3dd Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Sun, 19 Jan 2025 09:24:36 +0900
Subject: [PATCH] Some Plugins window fixes (#2621)

---
 Src/InternalPlugins.cpp                     |  4 +-
 Src/Merge.rc                                | 29 ++++++++--
 Src/PluginsListDlg.cpp                      | 63 ++++++++++++++-------
 Src/PluginsListDlg.h                        |  8 ++-
 Translations/WinMerge/Arabic.po             |  6 +-
 Translations/WinMerge/Basque.po             |  6 +-
 Translations/WinMerge/Brazilian.po          |  6 +-
 Translations/WinMerge/Bulgarian.po          |  6 +-
 Translations/WinMerge/Catalan.po            |  6 +-
 Translations/WinMerge/ChineseSimplified.po  |  6 +-
 Translations/WinMerge/ChineseTraditional.po |  6 +-
 Translations/WinMerge/Corsican.po           |  6 +-
 Translations/WinMerge/Croatian.po           |  6 +-
 Translations/WinMerge/Czech.po              |  6 +-
 Translations/WinMerge/Danish.po             |  6 +-
 Translations/WinMerge/Dutch.po              |  6 +-
 Translations/WinMerge/English.pot           |  8 +--
 Translations/WinMerge/Finnish.po            |  6 +-
 Translations/WinMerge/French.po             |  6 +-
 Translations/WinMerge/Galician.po           |  6 +-
 Translations/WinMerge/German.po             |  6 +-
 Translations/WinMerge/Greek.po              |  6 +-
 Translations/WinMerge/Hungarian.po          |  6 +-
 Translations/WinMerge/Italian.po            |  6 +-
 Translations/WinMerge/Japanese.po           |  6 +-
 Translations/WinMerge/Korean.po             |  6 +-
 Translations/WinMerge/Lithuanian.po         |  6 +-
 Translations/WinMerge/Norwegian.po          |  6 +-
 Translations/WinMerge/Persian.po            |  6 +-
 Translations/WinMerge/Polish.po             |  6 +-
 Translations/WinMerge/Portuguese.po         |  6 +-
 Translations/WinMerge/Romanian.po           |  6 +-
 Translations/WinMerge/Russian.po            |  6 +-
 Translations/WinMerge/Serbian.po            |  6 +-
 Translations/WinMerge/Sinhala.po            |  6 +-
 Translations/WinMerge/Slovak.po             |  6 +-
 Translations/WinMerge/Slovenian.po          |  6 +-
 Translations/WinMerge/Spanish.po            |  6 +-
 Translations/WinMerge/Swedish.po            |  6 +-
 Translations/WinMerge/Tamil.po              |  6 +-
 Translations/WinMerge/Turkish.po            |  6 +-
 Translations/WinMerge/Ukrainian.po          |  6 +-
 42 files changed, 191 insertions(+), 143 deletions(-)

diff --git a/Src/InternalPlugins.cpp b/Src/InternalPlugins.cpp
index 6ce64b094a6..e90f2aae721 100644
--- a/Src/InternalPlugins.cpp
+++ b/Src/InternalPlugins.cpp
@@ -716,7 +716,7 @@ Info* GetInternalPluginInfo(const PluginInfo* plugin)
 
 bool FindPluginNameConflict(const Info& info)
 {
-	for (auto& eventNames : { plugin::UnpackerEventNames, plugin::PredifferEventNames, plugin::EditorScriptEventNames })
+	for (auto& eventNames : { plugin::ProtocolHanlderEventNames, plugin::UnpackerEventNames, plugin::PredifferEventNames, plugin::EditorScriptEventNames })
 	{
 		if (std::find(eventNames.begin(), eventNames.end(), info.m_event) != eventNames.end())
 		{
@@ -830,7 +830,7 @@ bool RemovePlugin(const Info& info, String& errmsg)
 		return false;
 	for (auto it = list.begin(); it != list.end(); ++it)
 	{
-		if (it->m_name == info.m_name)
+		if (it->m_name == info.m_name && it->m_event == info.m_event)
 		{
 			list.erase(it);
 			break;
diff --git a/Src/Merge.rc b/Src/Merge.rc
index fd63bacff29..9637f95bca6 100644
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -2346,16 +2346,18 @@ BEGIN
 END
 
 IDD_PLUGINS_LIST DIALOGEX 0, 0, 470, 257
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 CAPTION "Plugins"
 FONT 8, FONTNAME, 0, 0, 0x1
 BEGIN
-    CONTROL         "&Enable plugins",IDC_PLUGINS_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,266,10
-    CONTROL         "",IDC_PLUGINSLIST_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,22,456,155
+    CONTROL         "&Enable plugins",IDC_PLUGINS_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,455,10
+    LTEXT           "Plugin &type:",IDC_STATIC,7,21,70,10
+    COMBOBOX        IDC_PLUGIN_TYPE,80,20,306,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "",IDC_PLUGINSLIST_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,38,456,139
     LTEXT           "File filters:",IDC_STATIC,7,183,70,10
     COMBOBOX        IDC_PLUGIN_FILEFILTERS,80,183,305,14,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
     LTEXT           "&Plugin arguments:",IDC_STATIC,7,200,70,10
-    EDITTEXT        IDC_PLUGIN_ARGUMENTS,80,200,305,14,ES_AUTOHSCROLL | WS_GROUP
+    EDITTEXT        IDC_PLUGIN_ARGUMENTS,80,200,305,12,ES_AUTOHSCROLL | WS_GROUP
     CONTROL         "Enable &automatic unpacking/prediffing for the plugin",IDC_PLUGIN_AUTOMATIC,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,218,300,10
     PUSHBUTTON      "Defaults",IDC_PLUGIN_DEFAULTS,393,183,70,14
@@ -3363,7 +3365,24 @@ END
 
 IDD_PLUGINS_LIST AFX_DIALOG_LAYOUT
 BEGIN
-    0
+    0,
+    0, 0, 100, 0,
+    0, 0, 0, 0,
+    0, 0, 100, 0,
+    0, 0, 100, 100,
+    0, 100, 0, 0,
+    0, 100, 100, 0,
+    0, 100, 0, 0,
+    0, 100, 100, 0,
+    0, 100, 0, 0,
+    100, 100, 0, 0,
+    0, 100, 0, 0,
+    0, 100, 0, 0,
+    0, 100, 0, 0,
+    0, 100, 0, 0,
+    100, 100, 0, 0,
+    100, 100, 0, 0,
+    100, 100, 0, 0
 END
 
 IDD_PROPPAGE_COLORS_SYSTEM AFX_DIALOG_LAYOUT
diff --git a/Src/PluginsListDlg.cpp b/Src/PluginsListDlg.cpp
index 206be2b482c..733a5aca00c 100644
--- a/Src/PluginsListDlg.cpp
+++ b/Src/PluginsListDlg.cpp
@@ -34,6 +34,7 @@ BEGIN_MESSAGE_MAP(PluginsListDlg, CTrDialog)
 	ON_BN_CLICKED(IDC_PLUGIN_DEFAULTS, OnBnClickedFileFiltesDefaults)
 	ON_CBN_DROPDOWN(IDC_PLUGIN_FILEFILTERS, OnDropDownPatterns)
 	ON_CBN_CLOSEUP(IDC_PLUGIN_FILEFILTERS, OnCloseUpPatterns)
+	ON_CBN_SELCHANGE(IDC_PLUGIN_TYPE, OnSelchangePluginType)
 	ON_NOTIFY(NM_DBLCLK, IDC_PLUGINSLIST_LIST, OnNMDblclkList)
 	ON_NOTIFY(LVN_ITEMCHANGING, IDC_PLUGINSLIST_LIST, OnLVNItemChanging)
 	ON_NOTIFY(LVN_ITEMCHANGED, IDC_PLUGINSLIST_LIST, OnLVNItemChanged)
@@ -58,6 +59,7 @@ PluginsListDlg::~PluginsListDlg()
 void PluginsListDlg::DoDataExchange(CDataExchange* pDX)
 {
 	CTrDialog::DoDataExchange(pDX);
+	DDX_Control(pDX, IDC_PLUGIN_TYPE, m_comboType);
 	DDX_Control(pDX, IDC_PLUGINSLIST_LIST, m_list);
 	DDX_Control(pDX, IDC_PLUGIN_FILEFILTERS, m_comboPatterns);
 }
@@ -77,12 +79,19 @@ BOOL PluginsListDlg::OnInitDialog()
 
 	
 	InitList();
-	AddPlugins();
+	SetDlgItemComboBoxList(IDC_PLUGIN_TYPE, { _("Unpacker"), _("Prediffer"), _("Editor script") });
+	m_comboType.SetCurSel(0);
+	SetPlugins(0);
 	m_list.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);
 
 	CheckDlgButton(IDC_PLUGINS_ENABLE, 
 		GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED) ? BST_CHECKED : BST_UNCHECKED);
 
+	m_constraint.InitializeCurrentSize(this);
+	m_constraint.SubclassWnd(); // install subclassing
+	// persist size via registry
+	m_constraint.LoadPosition(_T("ResizeableDialogs"), _T("PluginsListDlg"), false);
+
 	return FALSE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
@@ -102,34 +111,40 @@ void PluginsListDlg::InitList()
 	String title = _("Name");
 	m_list.InsertColumn(0, title.c_str(), LVCFMT_LEFT, pointToPixel(150));
 	title = _("Type");
-	m_list.InsertColumn(1, title.c_str(), LVCFMT_LEFT, pointToPixel(150));
+	m_list.InsertColumn(1, title.c_str(), LVCFMT_LEFT, pointToPixel(100));
 	title = _("Description");
-	m_list.InsertColumn(2, title.c_str(), LVCFMT_LEFT, pointToPixel(300));
+	m_list.InsertColumn(2, title.c_str(), LVCFMT_LEFT, pointToPixel(600));
 }
 
 /**
  * @brief Add found plugins to the list.
  */
-void PluginsListDlg::AddPlugins()
+void PluginsListDlg::SetPlugins(int sel)
 {
-	String type = _("Unpacker");
-	AddPluginsToList(L"URL_PACK_UNPACK", type);
-	for (const auto& event : plugin::UnpackerEventNames)
-		AddPluginsToList(event.c_str(), type);
-	type = _("Prediffer");
-	for (const auto& event : plugin::PredifferEventNames)
-		AddPluginsToList(event.c_str(), type);
-	type = _("Editor script");
-	for (const auto& event : plugin::EditorScriptEventNames)
-		AddPluginsToList(event.c_str(), type);
+	m_list.DeleteAllItems();
+	if (sel == 0)
+	{
+		AddPluginsToList(L"URL_PACK_UNPACK");
+		for (const auto& event : plugin::UnpackerEventNames)
+			AddPluginsToList(event.c_str());
+	}
+	else if (sel == 1)
+	{
+		for (const auto& event : plugin::PredifferEventNames)
+			AddPluginsToList(event.c_str());
+	}
+	else if (sel == 2)
+	{
+		for (const auto& event : plugin::EditorScriptEventNames)
+			AddPluginsToList(event.c_str() );
+	}
 }
 
 /**
  * @brief Add plugins of given event type to the list.
  * @param [in] pluginEvent Event type for plugins to add.
- * @param [in] pluginType String to use as type in the list.
  */
-void PluginsListDlg::AddPluginsToList(const wchar_t *pluginEvent, const String& pluginType)
+void PluginsListDlg::AddPluginsToList(const wchar_t *pluginEvent)
 {
 	PluginArray * piPluginArray = 
 		CAllThreadsScripts::GetActiveSet()->GetAvailableScripts(pluginEvent);
@@ -146,7 +161,7 @@ void PluginsListDlg::AddPluginsToList(const wchar_t *pluginEvent, const String&
 		String desc = containsNonAsciiChars  ? plugin->m_description : tr(ucr::toUTF8(plugin->m_description));
 		strutils::replace(desc, _T("\r"), _T(""));
 		strutils::replace(desc, _T("\n"), _T(" "));
-		m_list.SetItemText(ind, 1, (pluginType + _T("/") + processType2).c_str());
+		m_list.SetItemText(ind, 1, processType2.c_str());
 		m_list.SetItemText(ind, 2, desc.c_str());
 		m_list.SetCheck(ind, !plugin->m_disabled);
 		m_list.SetItemData(ind, reinterpret_cast<DWORD_PTR>(plugin.get()));
@@ -180,8 +195,7 @@ void PluginsListDlg::RefreshList()
 	auto pos = m_list.GetFirstSelectedItemPosition();
 	if (pos)
 		index = m_list.GetNextSelectedItem(pos);
-	m_list.DeleteAllItems();
-	AddPlugins();
+	SetPlugins(m_comboType.GetCurSel());
 	if (index >= m_list.GetItemCount())
 		index = m_list.GetItemCount() - 1;
 	if (index > 0)
@@ -203,7 +217,10 @@ void PluginsListDlg::AddPlugin(unsigned id)
 			return;
 		String errmsg;
 		if (internal_plugin::AddPlugin(*info, errmsg))
+		{
+			m_comboType.SetCurSel(id == ID_PLUGIN_ADD_UNPACKER ? 0 : 1);
 			break;
+		}
 		AfxMessageBox(errmsg.c_str(), MB_OK | MB_ICONEXCLAMATION);
 	}
 	RefreshList();
@@ -410,6 +427,14 @@ void PluginsListDlg::OnLVNItemChanged(NMHDR *pNMHDR, LRESULT *pResult)
 	}
 }
 
+/**
+ * @brief Prepares multi-selection drop list 
+ */
+void PluginsListDlg::OnSelchangePluginType()
+{
+	SetPlugins(m_comboType.GetCurSel());
+}
+
 /**
  * @brief Prepares multi-selection drop list 
  */
diff --git a/Src/PluginsListDlg.h b/Src/PluginsListDlg.h
index 9522a6c8676..fde963a1ef1 100644
--- a/Src/PluginsListDlg.h
+++ b/Src/PluginsListDlg.h
@@ -7,6 +7,7 @@
 
 #include "TrDialogs.h"
 #include "UnicodeString.h"
+#include "CMoveConstraint.h"
 
 class PluginInfo;
 namespace internal_plugin { struct Info; }
@@ -30,8 +31,8 @@ class PluginsListDlg : public CTrDialog
 
 protected:
 	void InitList();
-	void AddPlugins();
-	void AddPluginsToList(const wchar_t *pluginEvent, const String& pluginType);
+	void SetPlugins(int sel);
+	void AddPluginsToList(const wchar_t *pluginEvent);
 	void RefreshList();
 	void AddPlugin(unsigned id);
 	void EditPlugin();
@@ -55,10 +56,13 @@ class PluginsListDlg : public CTrDialog
 	afx_msg void OnNMDblclkList(NMHDR *pNMHDR, LRESULT *pResult);
 	afx_msg void OnDropDownPatterns();
 	afx_msg void OnCloseUpPatterns();
+	afx_msg void OnSelchangePluginType();
 	afx_msg void OnHelp();
 	DECLARE_MESSAGE_MAP()
 
 public:
 	CComboBox m_comboPatterns;
+	CComboBox m_comboType;
 	CListCtrl m_list; /**< A list control for plugins. */	
+	prdlg::CMoveConstraint m_constraint; /**< Resizes dialog controls when dialog resized */
 };
diff --git a/Translations/WinMerge/Arabic.po b/Translations/WinMerge/Arabic.po
index 824f744dbc4..0467e1c3c5b 100644
--- a/Translations/WinMerge/Arabic.po
+++ b/Translations/WinMerge/Arabic.po
@@ -2067,6 +2067,9 @@ msgstr "الإضافات"
 msgid "&Enable plugins"
 msgstr "تفعيل الإضافات"
 
+msgid "Plugin &type:"
+msgstr ""
+
 msgid "File filters:"
 msgstr ""
 
@@ -2198,9 +2201,6 @@ msgstr "ع&رض بصيغة نظام عد ستة عشري"
 msgid "Edit Plugin"
 msgstr ""
 
-msgid "Plugin &type:"
-msgstr ""
-
 msgid "&Category:"
 msgstr ""
 
diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
index baea05f7665..6d77ab38049 100644
--- a/Translations/WinMerge/Basque.po
+++ b/Translations/WinMerge/Basque.po
@@ -2516,6 +2516,9 @@ msgstr "Pluginak"
 msgid "&Enable plugins"
 msgstr "Gaitu &pluginak"
 
+msgid "Plugin &type:"
+msgstr ""
+
 msgid "File filters:"
 msgstr ""
 
@@ -2664,9 +2667,6 @@ msgstr ""
 msgid "Edit Plugin"
 msgstr ""
 
-msgid "Plugin &type:"
-msgstr ""
-
 msgid "&Category:"
 msgstr ""
 
diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
index 3b2288d927b..9450a8bb830 100644
--- a/Translations/WinMerge/Brazilian.po
+++ b/Translations/WinMerge/Brazilian.po
@@ -2058,6 +2058,9 @@ msgstr "Plugins"
 msgid "&Enable plugins"
 msgstr "&Ativar plugins"
 
+msgid "Plugin &type:"
+msgstr "&Tipo de Plugin:"
+
 msgid "File filters:"
 msgstr "Filtros dos arquivo:"
 
@@ -2189,9 +2192,6 @@ msgstr "&Visualização Hex"
 msgid "Edit Plugin"
 msgstr "Editar Plugin"
 
-msgid "Plugin &type:"
-msgstr "&Tipo de Plugin:"
-
 msgid "&Category:"
 msgstr "&Categoria:"
 
diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
index 18b1fca1a50..3905be28dc4 100644
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -2063,6 +2063,9 @@ msgstr "Добавки"
 msgid "&Enable plugins"
 msgstr "Включване на &добавките"
 
+msgid "Plugin &type:"
+msgstr ""
+
 msgid "File filters:"
 msgstr "Филтри за файлове:"
 
@@ -2194,9 +2197,6 @@ msgstr "&Шестнадесетичен изглед"
 msgid "Edit Plugin"
 msgstr ""
 
-msgid "Plugin &type:"
-msgstr ""
-
 msgid "&Category:"
 msgstr ""
 
diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
index 0e2cb0a879b..3c12b72be4a 100644
--- a/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@ -2521,6 +2521,9 @@ msgstr "&Connectors"
 msgid "&Enable plugins"
 msgstr "&Habilita els Connectors"
 
+msgid "Plugin &type:"
+msgstr ""
+
 msgid "File filters:"
 msgstr "Filtres de fitxer:"
 
@@ -2669,9 +2672,6 @@ msgstr "Vista &Hexadecimal"
 msgid "Edit Plugin"
 msgstr ""
 
-msgid "Plugin &type:"
-msgstr ""
-
 msgid "&Category:"
 msgstr ""
 
diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
index 008fc784917..62ca8eba3c0 100644
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -2075,6 +2075,9 @@ msgstr "插件"
 msgid "&Enable plugins"
 msgstr "启用插件(&E)"
 
+msgid "Plugin &type:"
+msgstr "插件类型(&T)："
+
 msgid "File filters:"
 msgstr "文件过滤器："
 
@@ -2206,9 +2209,6 @@ msgstr "十六进制查看(&H)"
 msgid "Edit Plugin"
 msgstr "编辑插件"
 
-msgid "Plugin &type:"
-msgstr "插件类型(&T)："
-
 msgid "&Category:"
 msgstr "类别(&C)："
 
diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
index 5e223d85a8a..35d9c9e4ed7 100644
--- a/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@ -2531,6 +2531,9 @@ msgstr "外掛程式"
 msgid "&Enable plugins"
 msgstr "啟用外掛程式 (&E)"
 
+msgid "Plugin &type:"
+msgstr ""
+
 msgid "File filters:"
 msgstr "檔案篩選器："
 
@@ -2679,9 +2682,6 @@ msgstr "二進制顯示 (&H)"
 msgid "Edit Plugin"
 msgstr ""
 
-msgid "Plugin &type:"
-msgstr ""
-
 msgid "&Category:"
 msgstr ""
 
diff --git a/Translations/WinMerge/Corsican.po b/Translations/WinMerge/Corsican.po
index 8bb9c91c0cb..71e303fce04 100644
--- a/Translations/WinMerge/Corsican.po
+++ b/Translations/WinMerge/Corsican.po
@@ -2068,6 +2068,9 @@ msgstr "Moduli d’estensione"
 msgid "&Enable plugins"
 msgstr "&Attivà i moduli d’estensione"
 
+msgid "Plugin &type:"
+msgstr "Tipu di &modulu d’estensione :"
+
 msgid "File filters:"
 msgstr "Filtri di schedariu :"
 
@@ -2199,9 +2202,6 @@ msgstr "Vista &esadecimale"
 msgid "Edit Plugin"
 msgstr "Mudificà u modulu d’estensione"
 
-msgid "Plugin &type:"
-msgstr "Tipu di &modulu d’estensione :"
-
 msgid "&Category:"
 msgstr "&Categuria :"
 
diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
index 7da38288ba1..b5e009aa2a4 100644
--- a/Translations/WinMerge/Croatian.po
+++ b/Translations/WinMerge/Croatian.po
@@ -2514,6 +2514,9 @@ msgstr "Dodaci"
 msgid "&Enable plugins"
 msgstr "&Omogući dodatke"
 
+msgid "Plugin &type:"
+msgstr ""
+
 msgid "File filters:"
 msgstr ""
 
@@ -2662,9 +2665,6 @@ msgstr ""
 msgid "Edit Plugin"
 msgstr ""
 
-msgid "Plugin &type:"
-msgstr ""
-
 msgid "&Category:"
 msgstr ""
 
diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
index fb18f2393d0..0ae2ec3f516 100644
--- a/Translations/WinMerge/Czech.po
+++ b/Translations/WinMerge/Czech.po
@@ -2514,6 +2514,9 @@ msgstr "Pluginy"
 msgid "&Enable plugins"
 msgstr "&Povolit pluginy"
 
+msgid "Plugin &type:"
+msgstr ""
+
 msgid "File filters:"
 msgstr ""
 
@@ -2662,9 +2665,6 @@ msgstr ""
 msgid "Edit Plugin"
 msgstr ""
 
-msgid "Plugin &type:"
-msgstr ""
-
 msgid "&Category:"
 msgstr ""
 
diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
index d7b5a4f670f..4f1c356e4f0 100644
--- a/Translations/WinMerge/Danish.po
+++ b/Translations/WinMerge/Danish.po
@@ -2519,6 +2519,9 @@ msgstr "Plugins"
 msgid "&Enable plugins"
 msgstr "&Aktiver plugins"
 
+msgid "Plugin &type:"
+msgstr ""
+
 msgid "File filters:"
 msgstr ""
 
@@ -2667,9 +2670,6 @@ msgstr ""
 msgid "Edit Plugin"
 msgstr ""
 
-msgid "Plugin &type:"
-msgstr ""
-
 msgid "&Category:"
 msgstr ""
 
diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
index 923b355c279..d694f59af75 100644
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -2076,6 +2076,9 @@ msgstr "Plugins"
 msgid "&Enable plugins"
 msgstr "Plugins inschakelen"
 
+msgid "Plugin &type:"
+msgstr "Type plugin:"
+
 msgid "File filters:"
 msgstr "Bestandsfilters:"
 
@@ -2207,9 +2210,6 @@ msgstr "Hex-weergave"
 msgid "Edit Plugin"
 msgstr "Plugin bewerken"
 
-msgid "Plugin &type:"
-msgstr "Type plugin:"
-
 msgid "&Category:"
 msgstr "Categorie:"
 
diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index d3ddbbf40b4..5920a88e9dd 100644
--- 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: 2025-01-01 15:10+0000\n"
+"POT-Creation-Date: 2025-01-16 08:10+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
@@ -2052,6 +2052,9 @@ msgstr ""
 msgid "&Enable plugins"
 msgstr ""
 
+msgid "Plugin &type:"
+msgstr ""
+
 msgid "File filters:"
 msgstr ""
 
@@ -2183,9 +2186,6 @@ msgstr ""
 msgid "Edit Plugin"
 msgstr ""
 
-msgid "Plugin &type:"
-msgstr ""
-
 msgid "&Category:"
 msgstr ""
 
diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po
index d3c6984a32e..425ab9d9a25 100644
--- a/Translations/WinMerge/Finnish.po
+++ b/Translations/WinMerge/Finnish.po
@@ -2067,6 +2067,9 @@ msgstr "Lisäosat"
 msgid "&Enable plugins"
 msgstr "Ota laajennukset käyttöön"
 
+msgid "Plugin &type:"
+msgstr ""
+
 msgid "File filters:"
 msgstr "Tiedostosuodattimet:"
 
@@ -2204,9 +2207,6 @@ msgstr "&Hexanäkymä"
 msgid "Edit Plugin"
 msgstr ""
 
-msgid "Plugin &type:"
-msgstr ""
-
 msgid "&Category:"
 msgstr ""
 
diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po
index ce46d775a5c..63e1fb796d0 100644
--- a/Translations/WinMerge/French.po
+++ b/Translations/WinMerge/French.po
@@ -2530,6 +2530,9 @@ msgstr "Plugins"
 msgid "&Enable plugins"
 msgstr "&Activer les plugins"
 
+msgid "Plugin &type:"
+msgstr "&Type de plugin :"
+
 msgid "File filters:"
 msgstr "Filtres de fichier :"
 
@@ -2678,9 +2681,6 @@ msgstr "Affichage &Hexa"
 msgid "Edit Plugin"
 msgstr "Modifier plugin"
 
-msgid "Plugin &type:"
-msgstr "&Type de plugin :"
-
 msgid "&Category:"
 msgstr "&Catégorie :"
 
diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po
index a167774c581..1e3fb3e2ead 100644
--- a/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@ -2067,6 +2067,9 @@ msgstr "Complementos"
 msgid "&Enable plugins"
 msgstr "Habilitar compl&ementos"
 
+msgid "Plugin &type:"
+msgstr ""
+
 msgid "File filters:"
 msgstr "Filtros de ficheiro:"
 
@@ -2198,9 +2201,6 @@ msgstr "Vista &hexadecimal"
 msgid "Edit Plugin"
 msgstr ""
 
-msgid "Plugin &type:"
-msgstr ""
-
 msgid "&Category:"
 msgstr ""
 
diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po
index c103d67eb92..c76f328ef2c 100644
--- a/Translations/WinMerge/German.po
+++ b/Translations/WinMerge/German.po
@@ -2516,6 +2516,9 @@ msgstr "Plugins"
 msgid "&Enable plugins"
 msgstr "&Plugins aktivieren"
 
+msgid "Plugin &type:"
+msgstr ""
+
 msgid "File filters:"
 msgstr "Dateifilter:"
 
@@ -2664,9 +2667,6 @@ msgstr "&Hex-Ansicht"
 msgid "Edit Plugin"
 msgstr ""
 
-msgid "Plugin &type:"
-msgstr ""
-
 msgid "&Category:"
 msgstr ""
 
diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
index 2a318e2bf0d..ae75d71bb01 100644
--- a/Translations/WinMerge/Greek.po
+++ b/Translations/WinMerge/Greek.po
@@ -2511,6 +2511,9 @@ msgstr "Αρθρώματα"
 msgid "&Enable plugins"
 msgstr "Ενεργοποίηση Αρθρωμάτων"
 
+msgid "Plugin &type:"
+msgstr ""
+
 msgid "File filters:"
 msgstr ""
 
@@ -2659,9 +2662,6 @@ msgstr ""
 msgid "Edit Plugin"
 msgstr ""
 
-msgid "Plugin &type:"
-msgstr ""
-
 msgid "&Category:"
 msgstr ""
 
diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
index 5008b9c8b18..68a0cbdc019 100644
--- a/Translations/WinMerge/Hungarian.po
+++ b/Translations/WinMerge/Hungarian.po
@@ -2522,6 +2522,9 @@ msgstr "Bővítmények"
 msgid "&Enable plugins"
 msgstr "Bővítmények bekapcsolása"
 
+msgid "Plugin &type:"
+msgstr "Bővítmény &típusa:"
+
 msgid "File filters:"
 msgstr "Fájlszűrők:"
 
@@ -2670,9 +2673,6 @@ msgstr "Hexadecimális nézet"
 msgid "Edit Plugin"
 msgstr "Bővítmény szerkesztése"
 
-msgid "Plugin &type:"
-msgstr "Bővítmény &típusa:"
-
 msgid "&Category:"
 msgstr "&Kategória:"
 
diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
index 447c8c65963..8f638344c3c 100644
--- a/Translations/WinMerge/Italian.po
+++ b/Translations/WinMerge/Italian.po
@@ -2078,6 +2078,9 @@ msgstr "Plugin"
 msgid "&Enable plugins"
 msgstr "&Abilita plugin"
 
+msgid "Plugin &type:"
+msgstr "&Tipo plugin:"
+
 msgid "File filters:"
 msgstr "Filtri file:"
 
@@ -2209,9 +2212,6 @@ msgstr "Vista &esadecimale"
 msgid "Edit Plugin"
 msgstr "Modifica plugin"
 
-msgid "Plugin &type:"
-msgstr "&Tipo plugin:"
-
 msgid "&Category:"
 msgstr "&Categoria:"
 
diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index aba30401948..e82853ea42a 100644
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -2069,6 +2069,9 @@ msgstr "プラグイン"
 msgid "&Enable plugins"
 msgstr "プラグインを有効にする(&E)"
 
+msgid "Plugin &type:"
+msgstr "プラグインの種類(&T):"
+
 msgid "File filters:"
 msgstr "ファイル フィルター:"
 
@@ -2200,9 +2203,6 @@ msgstr "HEX 表示(&H)"
 msgid "Edit Plugin"
 msgstr "プラグインの編集"
 
-msgid "Plugin &type:"
-msgstr "プラグインの種類(&T)"
-
 msgid "&Category:"
 msgstr "カテゴリー(&C)"
 
diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
index 6554385c022..a1e5849c880 100644
--- a/Translations/WinMerge/Korean.po
+++ b/Translations/WinMerge/Korean.po
@@ -2529,6 +2529,9 @@ msgstr "플러그인"
 msgid "&Enable plugins"
 msgstr "플러그인 활성화(&E)"
 
+msgid "Plugin &type:"
+msgstr "플러그인(&T):"
+
 msgid "File filters:"
 msgstr "파일 필터:"
 
@@ -2677,9 +2680,6 @@ msgstr "16진수 보기(&H)"
 msgid "Edit Plugin"
 msgstr "편집 플러그인"
 
-msgid "Plugin &type:"
-msgstr "플러그인(&T):"
-
 msgid "&Category:"
 msgstr "범주(&C):"
 
diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po
index 686bfbe540d..55bef7759ef 100644
--- a/Translations/WinMerge/Lithuanian.po
+++ b/Translations/WinMerge/Lithuanian.po
@@ -2058,6 +2058,9 @@ msgstr "Papildiniai"
 msgid "&Enable plugins"
 msgstr "Įjungti &papildinius"
 
+msgid "Plugin &type:"
+msgstr "Papildinio &tipas:"
+
 msgid "File filters:"
 msgstr "Failų filtrai:"
 
@@ -2189,9 +2192,6 @@ msgstr "Žiūrėti &Hex režimu"
 msgid "Edit Plugin"
 msgstr "Redaguoti papildinį"
 
-msgid "Plugin &type:"
-msgstr "Papildinio &tipas:"
-
 msgid "&Category:"
 msgstr "&Kategorija:"
 
diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
index 1ca692507ba..d485a4a7a44 100644
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -2070,6 +2070,9 @@ msgstr "Programtillegg"
 msgid "&Enable plugins"
 msgstr "&Aktiver programtillegg"
 
+msgid "Plugin &type:"
+msgstr ""
+
 msgid "File filters:"
 msgstr ""
 
@@ -2201,9 +2204,6 @@ msgstr ""
 msgid "Edit Plugin"
 msgstr ""
 
-msgid "Plugin &type:"
-msgstr ""
-
 msgid "&Category:"
 msgstr ""
 
diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
index 4635e8e2769..3927ecd954e 100644
--- a/Translations/WinMerge/Persian.po
+++ b/Translations/WinMerge/Persian.po
@@ -2521,6 +2521,9 @@ msgstr " افزايه ها"
 msgid "&Enable plugins"
 msgstr "&E فعال سازي افزايه ها "
 
+msgid "Plugin &type:"
+msgstr ""
+
 msgid "File filters:"
 msgstr ""
 
@@ -2669,9 +2672,6 @@ msgstr ""
 msgid "Edit Plugin"
 msgstr ""
 
-msgid "Plugin &type:"
-msgstr ""
-
 msgid "&Category:"
 msgstr ""
 
diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po
index 40ee00e8b15..8ebe5b1615d 100644
--- a/Translations/WinMerge/Polish.po
+++ b/Translations/WinMerge/Polish.po
@@ -2059,6 +2059,9 @@ msgstr "Wtyczki"
 msgid "&Enable plugins"
 msgstr "Włącz wtyczki"
 
+msgid "Plugin &type:"
+msgstr "Typ wtyczki:"
+
 msgid "File filters:"
 msgstr "Filtry pliku:"
 
@@ -2190,9 +2193,6 @@ msgstr "Widok szesnastkowy"
 msgid "Edit Plugin"
 msgstr ""
 
-msgid "Plugin &type:"
-msgstr "Typ wtyczki:"
-
 msgid "&Category:"
 msgstr "Kategoria:"
 
diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po
index 80b41409afe..90cd30df603 100644
--- a/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@ -2075,6 +2075,9 @@ msgstr "Plugins"
 msgid "&Enable plugins"
 msgstr "&Ativar plugins"
 
+msgid "Plugin &type:"
+msgstr "&Tipo de plugin:"
+
 msgid "File filters:"
 msgstr "Filtros de ficheiro:"
 
@@ -2206,9 +2209,6 @@ msgstr "Visualização &Hex"
 msgid "Edit Plugin"
 msgstr "Editar plugin"
 
-msgid "Plugin &type:"
-msgstr "&Tipo de plugin:"
-
 msgid "&Category:"
 msgstr "&Categoria:"
 
diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po
index fa2d2d7563b..761b9bbc636 100644
--- a/Translations/WinMerge/Romanian.po
+++ b/Translations/WinMerge/Romanian.po
@@ -2078,6 +2078,9 @@ msgstr "Plugin-uri"
 msgid "&Enable plugins"
 msgstr "Activ&ează plugin-uri"
 
+msgid "Plugin &type:"
+msgstr ""
+
 msgid "File filters:"
 msgstr "Filtre fișiere:"
 
@@ -2209,9 +2212,6 @@ msgstr "Afișare &hexadecimală"
 msgid "Edit Plugin"
 msgstr ""
 
-msgid "Plugin &type:"
-msgstr ""
-
 msgid "&Category:"
 msgstr ""
 
diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po
index 6ae30a43b88..ec9a739c65b 100644
--- a/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@ -2060,6 +2060,9 @@ msgstr "Плагины"
 msgid "&Enable plugins"
 msgstr "&Включить плагины"
 
+msgid "Plugin &type:"
+msgstr "Тип плагина:"
+
 msgid "File filters:"
 msgstr "Фильтры файлов:"
 
@@ -2191,9 +2194,6 @@ msgstr "16-ричный вид"
 msgid "Edit Plugin"
 msgstr "Редактировать плагин"
 
-msgid "Plugin &type:"
-msgstr "Тип плагина:"
-
 msgid "&Category:"
 msgstr "Категория"
 
diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po
index ecc0b811147..838db7b088d 100644
--- a/Translations/WinMerge/Serbian.po
+++ b/Translations/WinMerge/Serbian.po
@@ -2497,6 +2497,9 @@ msgstr "Додаци"
 msgid "&Enable plugins"
 msgstr "Омогући додатк&е"
 
+msgid "Plugin &type:"
+msgstr ""
+
 msgid "File filters:"
 msgstr ""
 
@@ -2645,9 +2648,6 @@ msgstr ""
 msgid "Edit Plugin"
 msgstr ""
 
-msgid "Plugin &type:"
-msgstr ""
-
 msgid "&Category:"
 msgstr ""
 
diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po
index e3d639acc75..eb9c3e0f0c9 100644
--- a/Translations/WinMerge/Sinhala.po
+++ b/Translations/WinMerge/Sinhala.po
@@ -2512,6 +2512,9 @@ msgstr "උපකාරක"
 msgid "&Enable plugins"
 msgstr "&උපකාරක බලය වැඩිකිරීම"
 
+msgid "Plugin &type:"
+msgstr ""
+
 msgid "File filters:"
 msgstr ""
 
@@ -2660,9 +2663,6 @@ msgstr ""
 msgid "Edit Plugin"
 msgstr ""
 
-msgid "Plugin &type:"
-msgstr ""
-
 msgid "&Category:"
 msgstr ""
 
diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po
index 47e3f352bbd..5b654280dca 100644
--- a/Translations/WinMerge/Slovak.po
+++ b/Translations/WinMerge/Slovak.po
@@ -2066,6 +2066,9 @@ msgstr "Rozšírenia"
 msgid "&Enable plugins"
 msgstr "&Povoliť rozšírenia"
 
+msgid "Plugin &type:"
+msgstr ""
+
 msgid "File filters:"
 msgstr "Filtre súborov:"
 
@@ -2197,9 +2200,6 @@ msgstr "Zobraziť &hexadecimálne"
 msgid "Edit Plugin"
 msgstr ""
 
-msgid "Plugin &type:"
-msgstr ""
-
 msgid "&Category:"
 msgstr ""
 
diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po
index 0c8f18c404d..de22f4398ac 100644
--- a/Translations/WinMerge/Slovenian.po
+++ b/Translations/WinMerge/Slovenian.po
@@ -2066,6 +2066,9 @@ msgstr "Vtičniki"
 msgid "&Enable plugins"
 msgstr "&Omogoči vtičnike"
 
+msgid "Plugin &type:"
+msgstr ""
+
 msgid "File filters:"
 msgstr "Filtri datotek:"
 
@@ -2197,9 +2200,6 @@ msgstr "16-tiški prikaz"
 msgid "Edit Plugin"
 msgstr ""
 
-msgid "Plugin &type:"
-msgstr ""
-
 msgid "&Category:"
 msgstr ""
 
diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po
index 6f9fbd00369..5d6412cb8f3 100644
--- a/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@ -2069,6 +2069,9 @@ msgstr "Complementos"
 msgid "&Enable plugins"
 msgstr "Habilitar compl&ementos"
 
+msgid "Plugin &type:"
+msgstr ""
+
 msgid "File filters:"
 msgstr "Filtros de archivo:"
 
@@ -2200,9 +2203,6 @@ msgstr "Vista &hexadecimal"
 msgid "Edit Plugin"
 msgstr ""
 
-msgid "Plugin &type:"
-msgstr ""
-
 msgid "&Category:"
 msgstr ""
 
diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po
index 5419d18992a..52f23ec2e10 100644
--- a/Translations/WinMerge/Swedish.po
+++ b/Translations/WinMerge/Swedish.po
@@ -2079,6 +2079,9 @@ msgstr "Programtillägg"
 msgid "&Enable plugins"
 msgstr "Aktivera programtillägg"
 
+msgid "Plugin &type:"
+msgstr ""
+
 msgid "File filters:"
 msgstr "Filfilter:"
 
@@ -2210,9 +2213,6 @@ msgstr "Hex visning"
 msgid "Edit Plugin"
 msgstr ""
 
-msgid "Plugin &type:"
-msgstr ""
-
 msgid "&Category:"
 msgstr ""
 
diff --git a/Translations/WinMerge/Tamil.po b/Translations/WinMerge/Tamil.po
index 0a16e78a29f..72b5f935195 100644
--- a/Translations/WinMerge/Tamil.po
+++ b/Translations/WinMerge/Tamil.po
@@ -2064,6 +2064,9 @@ msgstr "செருகுகள்"
 msgid "&Enable plugins"
 msgstr "&செருகுநிரல்களை இயக்கு"
 
+msgid "Plugin &type:"
+msgstr ""
+
 msgid "File filters:"
 msgstr "கோப்பு வடிப்பான்கள்:"
 
@@ -2195,9 +2198,6 @@ msgstr "&ஹெக்ஸ் வியூ"
 msgid "Edit Plugin"
 msgstr ""
 
-msgid "Plugin &type:"
-msgstr ""
-
 msgid "&Category:"
 msgstr ""
 
diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po
index b7ef802e2f3..a849660184d 100644
--- a/Translations/WinMerge/Turkish.po
+++ b/Translations/WinMerge/Turkish.po
@@ -2057,6 +2057,9 @@ msgstr "Eklentiler"
 msgid "&Enable plugins"
 msgstr "&Eklentiler kullanılsın"
 
+msgid "Plugin &type:"
+msgstr ""
+
 msgid "File filters:"
 msgstr "Dosya süzgeçleri:"
 
@@ -2188,9 +2191,6 @@ msgstr "Onaltılık &görünüm"
 msgid "Edit Plugin"
 msgstr ""
 
-msgid "Plugin &type:"
-msgstr ""
-
 msgid "&Category:"
 msgstr ""
 
diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po
index 433415f8c5f..c86073adae6 100644
--- a/Translations/WinMerge/Ukrainian.po
+++ b/Translations/WinMerge/Ukrainian.po
@@ -2498,6 +2498,9 @@ msgstr "Доповнення"
 msgid "&Enable plugins"
 msgstr "&Ввімкнути доповнення"
 
+msgid "Plugin &type:"
+msgstr ""
+
 msgid "File filters:"
 msgstr ""
 
@@ -2646,9 +2649,6 @@ msgstr ""
 msgid "Edit Plugin"
 msgstr ""
 
-msgid "Plugin &type:"
-msgstr ""
-
 msgid "&Category:"
 msgstr ""