From 99d26078c61d712db97ca5b56a4df1bd380e8dd5 Mon Sep 17 00:00:00 2001
From: Jun Tajima <56220423+tjmprm77@users.noreply.github.com>
Date: Sun, 11 Aug 2024 15:23:37 +0900
Subject: [PATCH] Add a "Defaults" button to the "Options (System)" dialog.
 (#2405)

---
 Src/Merge.rc                                |  1 +
 Src/PropRegistry.cpp                        | 22 +++++++++++++++++++++
 Src/PropRegistry.h                          |  1 +
 Translations/WinMerge/Arabic.po             |  6 +++---
 Translations/WinMerge/Basque.po             |  8 ++++----
 Translations/WinMerge/Brazilian.po          |  6 +++---
 Translations/WinMerge/Bulgarian.po          |  6 +++---
 Translations/WinMerge/Catalan.po            |  8 ++++----
 Translations/WinMerge/ChineseSimplified.po  |  6 +++---
 Translations/WinMerge/ChineseTraditional.po |  8 ++++----
 Translations/WinMerge/Corsican.po           |  6 +++---
 Translations/WinMerge/Croatian.po           |  8 ++++----
 Translations/WinMerge/Czech.po              |  8 ++++----
 Translations/WinMerge/Danish.po             |  8 ++++----
 Translations/WinMerge/Dutch.po              |  6 +++---
 Translations/WinMerge/English.pot           |  8 ++++----
 Translations/WinMerge/Finnish.po            |  6 +++---
 Translations/WinMerge/French.po             |  8 ++++----
 Translations/WinMerge/Galician.po           |  6 +++---
 Translations/WinMerge/German.po             |  8 ++++----
 Translations/WinMerge/Greek.po              |  8 ++++----
 Translations/WinMerge/Hungarian.po          |  8 ++++----
 Translations/WinMerge/Italian.po            |  6 +++---
 Translations/WinMerge/Japanese.po           |  6 +++---
 Translations/WinMerge/Korean.po             |  8 ++++----
 Translations/WinMerge/Lithuanian.po         |  6 +++---
 Translations/WinMerge/Norwegian.po          |  6 +++---
 Translations/WinMerge/Persian.po            |  8 ++++----
 Translations/WinMerge/Polish.po             |  6 +++---
 Translations/WinMerge/Portuguese.po         |  6 +++---
 Translations/WinMerge/Romanian.po           |  6 +++---
 Translations/WinMerge/Russian.po            |  6 +++---
 Translations/WinMerge/Serbian.po            |  8 ++++----
 Translations/WinMerge/Sinhala.po            |  8 ++++----
 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          |  8 ++++----
 41 files changed, 154 insertions(+), 130 deletions(-)

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 241a7606321..5c1bff4f48c 100644
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1690,6 +1690,7 @@ BEGIN
     CONTROL         "C&ustom folder:",IDC_STATIC,"Button",BS_AUTORADIOBUTTON,17,114,253,10
     EDITTEXT        IDC_TMPFOLDER_NAME,27,126,191,14,ES_AUTOHSCROLL | WS_GROUP
     PUSHBUTTON      "Br&owse...",IDC_TMPFOLDER_BROWSE,224,126,50,14
+    PUSHBUTTON      "Defaults", IDC_COMPARE_DEFAULTS, 191, 228, 88, 14
 END
 
 IDD_GENERATE_PATCH DIALOGEX 0, 0, 340, 190
diff --git a/Src/PropRegistry.cpp b/Src/PropRegistry.cpp
index 3a6c3c08bb2..5f2b739240a 100644
--- a/Src/PropRegistry.cpp
+++ b/Src/PropRegistry.cpp
@@ -11,6 +11,9 @@
 #include "OptionsDef.h"
 #include "OptionsMgr.h"
 #include "OptionsPanel.h"
+#include "Constants.h"
+#include "Environment.h"
+#include "paths.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -37,6 +40,7 @@ void PropRegistry::DoDataExchange(CDataExchange* pDX)
 
 BEGIN_MESSAGE_MAP(PropRegistry, OptionsPanel)
 	//{{AFX_MSG_MAP(PropRegistry)
+	ON_BN_CLICKED(IDC_COMPARE_DEFAULTS, OnDefaults)
 	ON_BN_CLICKED(IDC_EXT_EDITOR_BROWSE, OnBrowseEditor)
 	ON_BN_CLICKED(IDC_FILTER_USER_BROWSE, OnBrowseFilterPath)
 	ON_BN_CLICKED(IDC_TMPFOLDER_BROWSE, OnBrowseTmpFolder)
@@ -89,6 +93,24 @@ BOOL PropRegistry::OnInitDialog()
 	return TRUE;
 }
 
+/**
+ * @brief Sets options to defaults
+ * @remarks We must specify the default value of OPT_FILTER_USERPATH explicitly because it is not set for faster startup.
+ *          (Refer to Options::Init().)
+ */
+void PropRegistry::OnDefaults()
+{
+	m_strEditorPath = GetOptionsMgr()->GetDefault<String>(OPT_EXT_EDITOR_CMD);
+	m_bUseRecycleBin = GetOptionsMgr()->GetDefault<bool>(OPT_USE_RECYCLE_BIN);
+	m_strUserFilterPath = GetOptionsMgr()->GetDefault<String>(OPT_FILTER_USERPATH);
+	if (m_strUserFilterPath.empty())
+		m_strUserFilterPath = paths::ConcatPath(env::GetMyDocuments(), DefaultRelativeFilterPath);
+	m_tempFolderType = GetOptionsMgr()->GetDefault<bool>(OPT_USE_SYSTEM_TEMP_PATH) ? 0 : 1;
+	m_tempFolder = GetOptionsMgr()->GetDefault<String>(OPT_CUSTOM_TEMP_PATH);
+
+	UpdateData(FALSE);
+}
+
 /// Open file browse dialog to locate editor
 void PropRegistry::OnBrowseEditor()
 {
diff --git a/Src/PropRegistry.h b/Src/PropRegistry.h
index eb5695937e4..b8bec05ffba 100644
--- a/Src/PropRegistry.h
+++ b/Src/PropRegistry.h
@@ -52,6 +52,7 @@ class PropRegistry : public OptionsPanel
 protected:
 	// Generated message map functions
 	//{{AFX_MSG(PropRegistry)
+	afx_msg void OnDefaults();
 	afx_msg void OnBrowseEditor();
 	afx_msg void OnBrowseFilterPath();
 	afx_msg void OnBrowseTmpFolder();
diff --git a/Translations/WinMerge/Arabic.po b/Translations/WinMerge/Arabic.po
index 124befdcd2e..31e90e699ee 100644
--- a/Translations/WinMerge/Arabic.po
+++ b/Translations/WinMerge/Arabic.po
@@ -1479,6 +1479,9 @@ msgstr "م&جلد مخصص:"
 msgid "Br&owse..."
 msgstr "&بحث..."
 
+msgid "Defaults"
+msgstr "الإعدادات الافتراضية"
+
 msgid "Patch Generator"
 msgstr "أداة توليد التصحيح"
 
@@ -1518,9 +1521,6 @@ msgstr "دمج سطر الأوامر"
 msgid "Open to e&xternal editor"
 msgstr "فتح في المحرر الخارجي"
 
-msgid "Defaults"
-msgstr "الإعدادات الافتراضية"
-
 msgid "Display Columns"
 msgstr "عرض الأعمدة"
 
diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
index 074d45b789c..bfe36a5b5e5 100644
--- a/Translations/WinMerge/Basque.po
+++ b/Translations/WinMerge/Basque.po
@@ -1786,6 +1786,10 @@ msgstr "&Egile agiritegia:"
 msgid "Br&owse..."
 msgstr "Bilat&u"
 
+#, c-format
+msgid "Defaults"
+msgstr "Berezkoak"
+
 #, c-format
 msgid "Patch Generator"
 msgstr "Eranskin Sortzailea"
@@ -1838,10 +1842,6 @@ msgstr "Ko&mando lerroa barne"
 msgid "Open to e&xternal editor"
 msgstr "Ireki kan&poko editatzailean"
 
-#, c-format
-msgid "Defaults"
-msgstr "Berezkoak"
-
 #, c-format
 msgid "Display Columns"
 msgstr "Erakutsi Zutabeak"
diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
index c27eb4cc1fe..f852e22b53f 100644
--- a/Translations/WinMerge/Brazilian.po
+++ b/Translations/WinMerge/Brazilian.po
@@ -1476,6 +1476,9 @@ msgstr "P&asta personalizada:"
 msgid "Br&owse..."
 msgstr "Pr&ocurar..."
 
+msgid "Defaults"
+msgstr "Padrões"
+
 msgid "Patch Generator"
 msgstr "Gerador de Patches"
 
@@ -1515,9 +1518,6 @@ msgstr "Inclu&ir a linha de comando"
 msgid "Open to e&xternal editor"
 msgstr "Abrir no e&ditor externo"
 
-msgid "Defaults"
-msgstr "Padrões"
-
 msgid "Display Columns"
 msgstr "Exibir Colunas"
 
diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
index 8d546edc3fa..7c939f5dda7 100644
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -1473,6 +1473,9 @@ msgstr "Друга &папка:"
 msgid "Br&owse..."
 msgstr "&Разглеждане…"
 
+msgid "Defaults"
+msgstr "По подразбиране"
+
 msgid "Patch Generator"
 msgstr "Създаване на кръпки"
 
@@ -1512,9 +1515,6 @@ msgstr "Включително командния &ред"
 msgid "Open to e&xternal editor"
 msgstr "Отваряне с външе&н редактор"
 
-msgid "Defaults"
-msgstr "По подразбиране"
-
 msgid "Display Columns"
 msgstr "Видими колони"
 
diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
index bff6a9a81a0..8b100cda76a 100644
--- a/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@ -1784,6 +1784,10 @@ msgstr "Directori personalitzat:"
 msgid "Br&owse..."
 msgstr "N&avega..."
 
+#, c-format
+msgid "Defaults"
+msgstr "Predeterminats"
+
 #, c-format
 msgid "Patch Generator"
 msgstr "Generador de pedaços"
@@ -1836,10 +1840,6 @@ msgstr "Inc&lou-hi la línia d'ordres"
 msgid "Open to e&xternal editor"
 msgstr "Obre-ho en un &editor extern"
 
-#, c-format
-msgid "Defaults"
-msgstr "Predeterminats"
-
 #, c-format
 msgid "Display Columns"
 msgstr "Visualització de columnes"
diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
index 00e6d5fb0f2..ccf1d0bacd4 100644
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -1482,6 +1482,9 @@ msgstr "自定义文件夹(&U)："
 msgid "Br&owse..."
 msgstr "浏览(&O)..."
 
+msgid "Defaults"
+msgstr "默认"
+
 msgid "Patch Generator"
 msgstr "补丁生成器"
 
@@ -1521,9 +1524,6 @@ msgstr "包含命令行(&D)"
 msgid "Open to e&xternal editor"
 msgstr "用外部编辑器打开(&X)"
 
-msgid "Defaults"
-msgstr "默认"
-
 msgid "Display Columns"
 msgstr "选择显示的列"
 
diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
index b484a217d0c..05031dbd687 100644
--- a/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@ -1793,6 +1793,10 @@ msgstr "自訂資料夾 (&U)："
 msgid "Br&owse..."
 msgstr "瀏覽 (&O)..."
 
+#, c-format
+msgid "Defaults"
+msgstr "預設值"
+
 #, c-format
 msgid "Patch Generator"
 msgstr "補綴產生器"
@@ -1845,10 +1849,6 @@ msgstr "附加 diff 命令於檔首 (&P)"
 msgid "Open to e&xternal editor"
 msgstr "開啟外部編輯器 (&X)"
 
-#, c-format
-msgid "Defaults"
-msgstr "預設值"
-
 #, c-format
 msgid "Display Columns"
 msgstr "顯示欄位"
diff --git a/Translations/WinMerge/Corsican.po b/Translations/WinMerge/Corsican.po
index dd741872145..bb175a902aa 100644
--- a/Translations/WinMerge/Corsican.po
+++ b/Translations/WinMerge/Corsican.po
@@ -1478,6 +1478,9 @@ msgstr "Cartulare &persunalizatu :"
 msgid "Br&owse..."
 msgstr "Na&vigà…"
 
+msgid "Defaults"
+msgstr "Predefinizioni"
+
 msgid "Patch Generator"
 msgstr "Generatore di currezzioni"
 
@@ -1517,9 +1520,6 @@ msgstr "Inclu&de a linea di cumanda"
 msgid "Open to e&xternal editor"
 msgstr "Apre cù l’&editore esternu"
 
-msgid "Defaults"
-msgstr "Predefinizioni"
-
 msgid "Display Columns"
 msgstr "Affissera di e culonne"
 
diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
index d6a969951c7..17b6b305ebb 100644
--- a/Translations/WinMerge/Croatian.po
+++ b/Translations/WinMerge/Croatian.po
@@ -1783,6 +1783,10 @@ msgstr "Ko&risnikova mapa"
 msgid "Br&owse..."
 msgstr "&Odabir..."
 
+#, c-format
+msgid "Defaults"
+msgstr "Predpodešeno"
+
 #, c-format
 msgid "Patch Generator"
 msgstr "Pohrana razlika (Patch)"
@@ -1835,10 +1839,6 @@ msgstr "&Uključi naredbeni redak"
 msgid "Open to e&xternal editor"
 msgstr "Otvori u vanjskom pregledniku."
 
-#, c-format
-msgid "Defaults"
-msgstr "Predpodešeno"
-
 #, c-format
 msgid "Display Columns"
 msgstr "Prikaži kolone"
diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
index 44398a6cf63..4d4eba766cb 100644
--- a/Translations/WinMerge/Czech.po
+++ b/Translations/WinMerge/Czech.po
@@ -1783,6 +1783,10 @@ msgstr "&Vlastní složka:"
 msgid "Br&owse..."
 msgstr "Procházet..."
 
+#, c-format
+msgid "Defaults"
+msgstr "&Původní"
+
 #, c-format
 msgid "Patch Generator"
 msgstr "Vytvoření opravného souboru"
@@ -1835,10 +1839,6 @@ msgstr "Vložit pří&kazový řádek"
 msgid "Open to e&xternal editor"
 msgstr "Otevřít v &externím editoru"
 
-#, c-format
-msgid "Defaults"
-msgstr "&Původní"
-
 #, c-format
 msgid "Display Columns"
 msgstr "Zobrazit sloupce"
diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
index 6f7ea4c16dc..82bb429049b 100644
--- a/Translations/WinMerge/Danish.po
+++ b/Translations/WinMerge/Danish.po
@@ -1784,6 +1784,10 @@ msgstr "V&algt mappe:"
 msgid "Br&owse..."
 msgstr "G&ennemse..."
 
+#, c-format
+msgid "Defaults"
+msgstr "Standard"
+
 #, c-format
 msgid "Patch Generator"
 msgstr "Patch Generator"
@@ -1836,10 +1840,6 @@ msgstr "Inkluder &kommandolinjen"
 msgid "Open to e&xternal editor"
 msgstr "Åben i ekstern e&ditor"
 
-#, c-format
-msgid "Defaults"
-msgstr "Standard"
-
 #, c-format
 msgid "Display Columns"
 msgstr "Vis søjler"
diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
index fedbc1825c7..09798045f9a 100644
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -1476,6 +1476,9 @@ msgstr "Aangepaste map:"
 msgid "Br&owse..."
 msgstr "Bladeren..."
 
+msgid "Defaults"
+msgstr "Standaardwaarden"
+
 msgid "Patch Generator"
 msgstr "Patch-generator"
 
@@ -1515,9 +1518,6 @@ msgstr "Inclusief opdrachtregel"
 msgid "Open to e&xternal editor"
 msgstr "Openen met externe editor"
 
-msgid "Defaults"
-msgstr "Standaardwaarden"
-
 msgid "Display Columns"
 msgstr "Kolommen weergeven"
 
diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index 9d01bced1b1..509e443bdd3 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: 2024-07-23 21:46+0000\n"
+"POT-Creation-Date: 2024-08-10 20:44+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
@@ -1470,6 +1470,9 @@ msgstr ""
 msgid "Br&owse..."
 msgstr ""
 
+msgid "Defaults"
+msgstr ""
+
 msgid "Patch Generator"
 msgstr ""
 
@@ -1509,9 +1512,6 @@ msgstr ""
 msgid "Open to e&xternal editor"
 msgstr ""
 
-msgid "Defaults"
-msgstr ""
-
 msgid "Display Columns"
 msgstr ""
 
diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po
index 6889873368c..01d1bf4c17b 100644
--- a/Translations/WinMerge/Finnish.po
+++ b/Translations/WinMerge/Finnish.po
@@ -1480,6 +1480,9 @@ msgstr "Mukautettu kansio:"
 msgid "Br&owse..."
 msgstr "Selaa..."
 
+msgid "Defaults"
+msgstr "Oletukset"
+
 msgid "Patch Generator"
 msgstr "Korjausgeneraattori"
 
@@ -1519,9 +1522,6 @@ msgstr "Sisällytä komentorivi"
 msgid "Open to e&xternal editor"
 msgstr "Avaa ulkoiseen editoriin"
 
-msgid "Defaults"
-msgstr "Oletukset"
-
 msgid "Display Columns"
 msgstr "Näytä sarakkeet"
 
diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po
index f34b3f3b286..3ed7fb0d8bd 100644
--- a/Translations/WinMerge/French.po
+++ b/Translations/WinMerge/French.po
@@ -1791,6 +1791,10 @@ msgstr "Dossier personnalisé :"
 msgid "Br&owse..."
 msgstr "P&arcourir..."
 
+#, c-format
+msgid "Defaults"
+msgstr "Par défaut"
+
 #, c-format
 msgid "Patch Generator"
 msgstr "Générateur de retouche"
@@ -1843,10 +1847,6 @@ msgstr "Inclure la ligne de co&mmande"
 msgid "Open to e&xternal editor"
 msgstr "Ouvrir avec l'éditeur e&xterne"
 
-#, c-format
-msgid "Defaults"
-msgstr "Par défaut"
-
 #, c-format
 msgid "Display Columns"
 msgstr "Affichage des colonnes"
diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po
index b86eed4ed07..3d19a761020 100644
--- a/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@ -1477,6 +1477,9 @@ msgstr "Carpeta &personalizada:"
 msgid "Br&owse..."
 msgstr "&Examinar..."
 
+msgid "Defaults"
+msgstr "Predeterminados"
+
 msgid "Patch Generator"
 msgstr "Xerar parche"
 
@@ -1516,9 +1519,6 @@ msgstr "Incluír liña de coman&dos"
 msgid "Open to e&xternal editor"
 msgstr "Abrir nun editor e&xterno"
 
-msgid "Defaults"
-msgstr "Predeterminados"
-
 msgid "Display Columns"
 msgstr "Mostrar columnas"
 
diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po
index 35bdf81ebc2..b75ac59f9b0 100644
--- a/Translations/WinMerge/German.po
+++ b/Translations/WinMerge/German.po
@@ -1787,6 +1787,10 @@ msgstr "&Benutzerdefinierter Ordner:"
 msgid "Br&owse..."
 msgstr "Su&chen..."
 
+#, c-format
+msgid "Defaults"
+msgstr "Vorgaben"
+
 #, c-format
 msgid "Patch Generator"
 msgstr "Patch-Generator"
@@ -1839,10 +1843,6 @@ msgstr "&Befehlszeile einfügen"
 msgid "Open to e&xternal editor"
 msgstr "Im e&xternen Editor öffnen"
 
-#, c-format
-msgid "Defaults"
-msgstr "Vorgaben"
-
 #, c-format
 msgid "Display Columns"
 msgstr "Spalten anpassen"
diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
index 2c1c978a13b..b0da7e7ab8a 100644
--- a/Translations/WinMerge/Greek.po
+++ b/Translations/WinMerge/Greek.po
@@ -1782,6 +1782,10 @@ msgstr "Προ&τιμώμενος Φάκελος:"
 msgid "Br&owse..."
 msgstr "Ανα&ζήτηση..."
 
+#, c-format
+msgid "Defaults"
+msgstr "&Αρχικές Ρυθμίσεις"
+
 #, c-format
 msgid "Patch Generator"
 msgstr "Εφαρμογή Δημιουργίας Patch"
@@ -1834,10 +1838,6 @@ msgstr "Η γραμμή εντολής να συμπεριλαμβάνεται"
 msgid "Open to e&xternal editor"
 msgstr "Άν&οιγμα με άλλη εφαρμογή επεξεργασίας"
 
-#, c-format
-msgid "Defaults"
-msgstr "&Αρχικές Ρυθμίσεις"
-
 #, c-format
 msgid "Display Columns"
 msgstr "Εμφάνιση Στηλών"
diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
index fd7ed207a9d..c920aa1b2b8 100644
--- a/Translations/WinMerge/Hungarian.po
+++ b/Translations/WinMerge/Hungarian.po
@@ -1785,6 +1785,10 @@ msgstr "Egyéni könyvtár:"
 msgid "Br&owse..."
 msgstr "T&allózás..."
 
+#, c-format
+msgid "Defaults"
+msgstr "Alaphelyzetbe"
+
 #, c-format
 msgid "Patch Generator"
 msgstr "Patch Generátor"
@@ -1837,10 +1841,6 @@ msgstr "&Parancssor is"
 msgid "Open to e&xternal editor"
 msgstr "Megnyitás a külső szerkesztővel"
 
-#, c-format
-msgid "Defaults"
-msgstr "Alaphelyzetbe"
-
 #, c-format
 msgid "Display Columns"
 msgstr "Oszlopok mutatása"
diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
index fefc29db841..7e2294b4b22 100644
--- a/Translations/WinMerge/Italian.po
+++ b/Translations/WinMerge/Italian.po
@@ -1479,6 +1479,9 @@ msgstr "Cartella &personalizzata:"
 msgid "Br&owse..."
 msgstr "Sf&oglia..."
 
+msgid "Defaults"
+msgstr "Predefinito"
+
 msgid "Patch Generator"
 msgstr "Generatore patch"
 
@@ -1518,9 +1521,6 @@ msgstr "Includi &linea di comando"
 msgid "Open to e&xternal editor"
 msgstr "Apri in e&ditor esterno"
 
-msgid "Defaults"
-msgstr "Predefinito"
-
 msgid "Display Columns"
 msgstr "Scelta delle colonne"
 
diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index 84f6c5a6dad..611cc4e3d06 100644
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -1479,6 +1479,9 @@ msgstr "指定したフォルダー(&U):"
 msgid "Br&owse..."
 msgstr "参照(&O)..."
 
+msgid "Defaults"
+msgstr "デフォルト"
+
 msgid "Patch Generator"
 msgstr "パッチ生成"
 
@@ -1518,9 +1521,6 @@ msgstr "コマンド行を含める(&D)"
 msgid "Open to e&xternal editor"
 msgstr "外部エディターで開く(&X)"
 
-msgid "Defaults"
-msgstr "デフォルト"
-
 msgid "Display Columns"
 msgstr "列の表示"
 
diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
index acbb259cd4a..56d66b3f651 100644
--- a/Translations/WinMerge/Korean.po
+++ b/Translations/WinMerge/Korean.po
@@ -1792,6 +1792,10 @@ msgstr "사용자 지정 폴더(&U):"
 msgid "Br&owse..."
 msgstr "찾아보기(&O)..."
 
+#, c-format
+msgid "Defaults"
+msgstr "기본값"
+
 #, c-format
 msgid "Patch Generator"
 msgstr "패치 생성기"
@@ -1844,10 +1848,6 @@ msgstr "명령행 포함(&D)"
 msgid "Open to e&xternal editor"
 msgstr "외부 편집기로 열기(&X)"
 
-#, c-format
-msgid "Defaults"
-msgstr "기본값"
-
 #, c-format
 msgid "Display Columns"
 msgstr "열 표시"
diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po
index e6a2de2fd76..7fb00028ec7 100644
--- a/Translations/WinMerge/Lithuanian.po
+++ b/Translations/WinMerge/Lithuanian.po
@@ -1476,6 +1476,9 @@ msgstr "P&asirinktinis katalogas:"
 msgid "Br&owse..."
 msgstr "Ra&sti..."
 
+msgid "Defaults"
+msgstr "Numat. reikšmės"
+
 msgid "Patch Generator"
 msgstr "Pataisos generatorius"
 
@@ -1515,9 +1518,6 @@ msgstr "Įterpti koman&dinę eilutę"
 msgid "Open to e&xternal editor"
 msgstr "Atverti &išoriniame redaktoriuje"
 
-msgid "Defaults"
-msgstr "Numat. reikšmės"
-
 msgid "Display Columns"
 msgstr "Rodyti stulpelius"
 
diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
index aa6c553a3b4..17e3c51b68d 100644
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -1477,6 +1477,9 @@ msgstr "E&gen mappe:"
 msgid "Br&owse..."
 msgstr "B&la gjennom.."
 
+msgid "Defaults"
+msgstr "Standardverdier"
+
 msgid "Patch Generator"
 msgstr "Rettelsegenerator"
 
@@ -1516,9 +1519,6 @@ msgstr "Inklud&er kommandolinje"
 msgid "Open to e&xternal editor"
 msgstr "Åpne i e&ksternt redigeringsprogram"
 
-msgid "Defaults"
-msgstr "Standardverdier"
-
 msgid "Display Columns"
 msgstr "Visningskolonner"
 
diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
index cff1b37ba47..c56202d724c 100644
--- a/Translations/WinMerge/Persian.po
+++ b/Translations/WinMerge/Persian.po
@@ -1786,6 +1786,10 @@ msgstr "&u  پوشه سفارشي : "
 msgid "Br&owse..."
 msgstr "&o مرور ... "
 
+#, c-format
+msgid "Defaults"
+msgstr " پيش فرضها "
+
 #, c-format
 msgid "Patch Generator"
 msgstr " توليد کننده  وصله  "
@@ -1838,10 +1842,6 @@ msgstr "&d شامل خط فرمان "
 msgid "Open to e&xternal editor"
 msgstr "&x بازکردن با ويراستار خارجي "
 
-#, c-format
-msgid "Defaults"
-msgstr " پيش فرضها "
-
 #, c-format
 msgid "Display Columns"
 msgstr " نمايش ستون ها "
diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po
index 1829b2cf7b5..c52c97ca6b7 100644
--- a/Translations/WinMerge/Polish.po
+++ b/Translations/WinMerge/Polish.po
@@ -1477,6 +1477,9 @@ msgstr "Folder niestandardowy:"
 msgid "Br&owse..."
 msgstr "Przeglądaj..."
 
+msgid "Defaults"
+msgstr "Domyślne"
+
 msgid "Patch Generator"
 msgstr "Generuj łatkę"
 
@@ -1516,9 +1519,6 @@ msgstr "Uwzględnij wiersz poleceń"
 msgid "Open to e&xternal editor"
 msgstr "Otwórz w zewnętrznym edytorze"
 
-msgid "Defaults"
-msgstr "Domyślne"
-
 msgid "Display Columns"
 msgstr "Wyświetl kolumny"
 
diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po
index dd19d74d69e..55397c14e64 100644
--- a/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@ -1483,6 +1483,9 @@ msgstr "Pasta p&ersonalizada:"
 msgid "Br&owse..."
 msgstr "L&ocalizar..."
 
+msgid "Defaults"
+msgstr "Predefinições"
+
 msgid "Patch Generator"
 msgstr "Gerador de correção"
 
@@ -1522,9 +1525,6 @@ msgstr "Incluir linha &de comandos"
 msgid "Open to e&xternal editor"
 msgstr "Abrir em editor e&xterno"
 
-msgid "Defaults"
-msgstr "Predefinições"
-
 msgid "Display Columns"
 msgstr "Mostrar colunas"
 
diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po
index 00f6fa2ec26..a865726dd02 100644
--- a/Translations/WinMerge/Romanian.po
+++ b/Translations/WinMerge/Romanian.po
@@ -1481,6 +1481,9 @@ msgstr "Director personali&zat:"
 msgid "Br&owse..."
 msgstr "Ră&sfoiește..."
 
+msgid "Defaults"
+msgstr "Implicite"
+
 msgid "Patch Generator"
 msgstr "Generator petice"
 
@@ -1520,9 +1523,6 @@ msgstr "Inclu&de linia de comandă"
 msgid "Open to e&xternal editor"
 msgstr "Deschide în editor e&xtern"
 
-msgid "Defaults"
-msgstr "Implicite"
-
 msgid "Display Columns"
 msgstr "Afișează coloanele"
 
diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po
index 16b2414013d..0d3fae99ea0 100644
--- a/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@ -1478,6 +1478,9 @@ msgstr "Указанная папка:"
 msgid "Br&owse..."
 msgstr "Обзор..."
 
+msgid "Defaults"
+msgstr "По умолчанию"
+
 msgid "Patch Generator"
 msgstr "Генератор патчей"
 
@@ -1517,9 +1520,6 @@ msgstr "Вкл&ючать командную строку"
 msgid "Open to e&xternal editor"
 msgstr "Открыть во внешнем редакторе"
 
-msgid "Defaults"
-msgstr "По умолчанию"
-
 msgid "Display Columns"
 msgstr "Отображать столбцы"
 
diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po
index 3be17596ce4..edc96e0aba5 100644
--- a/Translations/WinMerge/Serbian.po
+++ b/Translations/WinMerge/Serbian.po
@@ -1768,6 +1768,10 @@ msgstr "Подешена фасцикла:"
 msgid "Br&owse..."
 msgstr "Пр&егледај..."
 
+#, c-format
+msgid "Defaults"
+msgstr "Подразумевано"
+
 #, c-format
 msgid "Patch Generator"
 msgstr "Створене разлике"
@@ -1820,10 +1824,6 @@ msgstr "Укључи наредбени ред"
 msgid "Open to e&xternal editor"
 msgstr "Отвори у другом уре&ђивачу"
 
-#, c-format
-msgid "Defaults"
-msgstr "Подразумевано"
-
 #, c-format
 msgid "Display Columns"
 msgstr "Прикажи стубце"
diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po
index 51b0f677d01..e279b6644ba 100644
--- a/Translations/WinMerge/Sinhala.po
+++ b/Translations/WinMerge/Sinhala.po
@@ -1783,6 +1783,10 @@ msgstr "C&ustom folder:"
 msgid "Br&owse..."
 msgstr "සැරි සරන්න..."
 
+#, fuzzy, c-format
+msgid "Defaults"
+msgstr "Defaults"
+
 #, fuzzy, c-format
 msgid "Patch Generator"
 msgstr "Patch Generator"
@@ -1835,10 +1839,6 @@ msgstr "Inclu&de command line"
 msgid "Open to e&xternal editor"
 msgstr "බාහිර සංස්කරණය සඳහා විවෘත කරන්න"
 
-#, fuzzy, c-format
-msgid "Defaults"
-msgstr "Defaults"
-
 #, c-format
 msgid "Display Columns"
 msgstr "කොලම දර්ශනය කරන්න"
diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po
index a63334b122f..540c9354b2d 100644
--- a/Translations/WinMerge/Slovak.po
+++ b/Translations/WinMerge/Slovak.po
@@ -1476,6 +1476,9 @@ msgstr "&Vlastný priečinok:"
 msgid "Br&owse..."
 msgstr "Pre&hľadávať..."
 
+msgid "Defaults"
+msgstr "Predvolené"
+
 msgid "Patch Generator"
 msgstr "Generátor opravných záplat"
 
@@ -1515,9 +1518,6 @@ msgstr "Zahrnúť príkazový ria&dok"
 msgid "Open to e&xternal editor"
 msgstr "Otvoriť v e&xternom editore"
 
-msgid "Defaults"
-msgstr "Predvolené"
-
 msgid "Display Columns"
 msgstr "Zobrazovať stĺpce"
 
diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po
index ba3aac65d76..e0a743b0255 100644
--- a/Translations/WinMerge/Slovenian.po
+++ b/Translations/WinMerge/Slovenian.po
@@ -1476,6 +1476,9 @@ msgstr "&Mapa po meri:"
 msgid "Br&owse..."
 msgstr "Prebr&skaj..."
 
+msgid "Defaults"
+msgstr "Privzeto"
+
 msgid "Patch Generator"
 msgstr "Ustvarjalec popravkov"
 
@@ -1515,9 +1518,6 @@ msgstr "&Vključi ukazno vrstico"
 msgid "Open to e&xternal editor"
 msgstr "Odpri v zu&nanjem urejevalniku"
 
-msgid "Defaults"
-msgstr "Privzeto"
-
 msgid "Display Columns"
 msgstr "Prikaži stolpce"
 
diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po
index 6329bc53845..8cc89e49460 100644
--- a/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@ -1479,6 +1479,9 @@ msgstr "Carpeta &personalizada:"
 msgid "Br&owse..."
 msgstr "&Examinar..."
 
+msgid "Defaults"
+msgstr "Predeterminados"
+
 msgid "Patch Generator"
 msgstr "Generar parche"
 
@@ -1518,9 +1521,6 @@ msgstr "Incluir línea de coman&dos"
 msgid "Open to e&xternal editor"
 msgstr "Abrir en editor e&xterno"
 
-msgid "Defaults"
-msgstr "Predeterminados"
-
 msgid "Display Columns"
 msgstr "Mostrar columnas"
 
diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po
index 4385640dca6..6082496797a 100644
--- a/Translations/WinMerge/Swedish.po
+++ b/Translations/WinMerge/Swedish.po
@@ -1485,6 +1485,9 @@ msgstr "Egen katalog:"
 msgid "Br&owse..."
 msgstr "Bläddra..."
 
+msgid "Defaults"
+msgstr "Förval"
+
 msgid "Patch Generator"
 msgstr "Patchgenererare"
 
@@ -1524,9 +1527,6 @@ msgstr "Inkludera kommandorad"
 msgid "Open to e&xternal editor"
 msgstr "Öppna i externt program"
 
-msgid "Defaults"
-msgstr "Förval"
-
 msgid "Display Columns"
 msgstr "Visa kolumner"
 
diff --git a/Translations/WinMerge/Tamil.po b/Translations/WinMerge/Tamil.po
index 92255881dc6..f52d0a0999c 100644
--- a/Translations/WinMerge/Tamil.po
+++ b/Translations/WinMerge/Tamil.po
@@ -1474,6 +1474,9 @@ msgstr "C&ustom கோப்புறை:"
 msgid "Br&owse..."
 msgstr "உலாவும்..."
 
+msgid "Defaults"
+msgstr "இயல்புநிலைகள்"
+
 msgid "Patch Generator"
 msgstr "பேட்ச் ஜெனரேட்டர்"
 
@@ -1513,9 +1516,6 @@ msgstr "கட்டளை வரியைச் சேர்&செய்"
 msgid "Open to e&xternal editor"
 msgstr "மின்&புற எடிட்டருக்கு திற"
 
-msgid "Defaults"
-msgstr "இயல்புநிலைகள்"
-
 msgid "Display Columns"
 msgstr "காட்சி நெடுவரிசைகள்"
 
diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po
index 81e7a88e9c9..815a342e3fa 100644
--- a/Translations/WinMerge/Turkish.po
+++ b/Translations/WinMerge/Turkish.po
@@ -1475,6 +1475,9 @@ msgstr "Ö&zel klasör:"
 msgid "Br&owse..."
 msgstr "Göz a&t..."
 
+msgid "Defaults"
+msgstr "Varsayılanlar"
+
 msgid "Patch Generator"
 msgstr "Yama oluşturucu"
 
@@ -1514,9 +1517,6 @@ msgstr "Ko&mut satırı katılsın"
 msgid "Open to e&xternal editor"
 msgstr "Dış düzen&leyici ile açılsın"
 
-msgid "Defaults"
-msgstr "Varsayılanlar"
-
 msgid "Display Columns"
 msgstr "Sütunlar görüntülensin"
 
diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po
index 11d8ceb0cea..5f1faac722f 100644
--- a/Translations/WinMerge/Ukrainian.po
+++ b/Translations/WinMerge/Ukrainian.po
@@ -1767,6 +1767,10 @@ msgstr "Власна тека:"
 msgid "Br&owse..."
 msgstr "Переглядання ..."
 
+#, c-format
+msgid "Defaults"
+msgstr "Звичайні параметри"
+
 #, c-format
 msgid "Patch Generator"
 msgstr "Генератор латок"
@@ -1819,10 +1823,6 @@ msgstr "Ввім&кнути командний рядок"
 msgid "Open to e&xternal editor"
 msgstr "Відкрити у зовнішньому редакторі"
 
-#, c-format
-msgid "Defaults"
-msgstr "Звичайні параметри"
-
 #, c-format
 msgid "Display Columns"
 msgstr "Відображати стовпчики"