diff --git a/Src/Merge.rc b/Src/Merge.rc index da3b44bd673..fef2c08391c 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -1498,6 +1498,7 @@ BEGIN COMBOBOX IDC_AUTO_RELOAD_MODIFIED_FILES,7,178,270,10,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Language:",IDC_STATIC,7,193,270,10 COMBOBOX IDC_LANGUAGE_LIST,7,204,270,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Defaults", IDC_COMPARE_DEFAULTS, 191, 228, 88, 14 END IDD_EDIT_FIND DIALOGEX 30, 73, 324, 96 diff --git a/Src/PropGeneral.cpp b/Src/PropGeneral.cpp index 580a46ee15e..1cbb5d4dff8 100644 --- a/Src/PropGeneral.cpp +++ b/Src/PropGeneral.cpp @@ -91,6 +91,7 @@ void PropGeneral::DoDataExchange(CDataExchange* pDX) BEGIN_MESSAGE_MAP(PropGeneral, OptionsPanel) //{{AFX_MSG_MAP(PropGeneral) + ON_BN_CLICKED(IDC_COMPARE_DEFAULTS, OnDefaults) ON_MESSAGE(WM_APP, OnLoadLanguages) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -137,6 +138,29 @@ void PropGeneral::WriteOptions() } } +/** + * @brief Sets options to defaults. + */ +void PropGeneral::OnDefaults() +{ + m_bScroll = GetOptionsMgr()->GetDefault(OPT_SCROLL_TO_FIRST); + m_bScrollToFirstInlineDiff = GetOptionsMgr()->GetDefault(OPT_SCROLL_TO_FIRST_INLINE_DIFF); + m_nSingleInstance = GetOptionsMgr()->GetDefault(OPT_SINGLE_INSTANCE); + m_bVerifyPaths = GetOptionsMgr()->GetDefault(OPT_VERIFY_OPEN_PATHS); + m_nCloseWindowWithEsc = GetOptionsMgr()->GetDefault(OPT_CLOSE_WITH_ESC); + m_bAskMultiWindowClose = GetOptionsMgr()->GetDefault(OPT_ASK_MULTIWINDOW_CLOSE); + m_nAutoCompleteSource = GetOptionsMgr()->GetDefault(OPT_AUTO_COMPLETE_SOURCE); + m_bPreserveFiletime = GetOptionsMgr()->GetDefault(OPT_PRESERVE_FILETIMES); + m_bShowSelectFolderOnStartup = GetOptionsMgr()->GetDefault(OPT_SHOW_SELECT_FILES_AT_STARTUP); + m_bCloseWithOK = GetOptionsMgr()->GetDefault(OPT_CLOSE_WITH_OK); + m_nFileReloadMode = GetOptionsMgr()->GetDefault(OPT_AUTO_RELOAD_MODIFIED_FILES); + + LANGID lang = static_cast(GetOptionsMgr()->GetDefault(OPT_SELECTED_LANGUAGE)); + SetCursorSelectForLanguage(lang); + + UpdateData(FALSE); +} + LRESULT PropGeneral::OnLoadLanguages(WPARAM, LPARAM) { m_ctlLangList.SetRedraw(false); @@ -151,3 +175,20 @@ LRESULT PropGeneral::OnLoadLanguages(WPARAM, LPARAM) m_ctlLangList.SetRedraw(true); return 0; } + +/** + * @brief Select the item specified by the language ID in the "Language" combo box. + * @param [in] lang The language ID of the selected item. + */ +void PropGeneral::SetCursorSelectForLanguage(LANGID lang) +{ + int itemCount = m_ctlLangList.GetCount(); + for (int i = 0; i < itemCount; i++) + { + if (m_ctlLangList.GetItemData(i) == lang) + { + m_ctlLangList.SetCurSel(i); + break; + } + } +} diff --git a/Src/PropGeneral.h b/Src/PropGeneral.h index e58cc467de0..1c5f42cda92 100644 --- a/Src/PropGeneral.h +++ b/Src/PropGeneral.h @@ -42,6 +42,9 @@ class PropGeneral : public OptionsPanel CComboBox m_ctlLangList; //}}AFX_DATA +private: + // Implementation methods + void SetCursorSelectForLanguage(LANGID lang); // Overrides // ClassWizard generate virtual function overrides @@ -56,6 +59,7 @@ class PropGeneral : public OptionsPanel // Generated message map functions //{{AFX_MSG(PropGeneral) + afx_msg void OnDefaults(); afx_msg LRESULT OnLoadLanguages(WPARAM, LPARAM); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Translations/WinMerge/Arabic.po b/Translations/WinMerge/Arabic.po index c5f2deb8585..ae75e99780b 100644 --- a/Translations/WinMerge/Arabic.po +++ b/Translations/WinMerge/Arabic.po @@ -1308,6 +1308,9 @@ msgstr "" msgid "Language:" msgstr "اللغة:" +msgid "Defaults" +msgstr "الإعدادات الافتراضية" + msgid "Find" msgstr "البحث" @@ -1494,9 +1497,6 @@ msgstr "م&جلد مخصص:" msgid "Br&owse..." msgstr "&بحث..." -msgid "Defaults" -msgstr "الإعدادات الافتراضية" - msgid "Patch Generator" msgstr "أداة توليد التصحيح" diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po index cb05dcda577..8de619cf2d6 100644 --- a/Translations/WinMerge/Basque.po +++ b/Translations/WinMerge/Basque.po @@ -1566,6 +1566,10 @@ msgstr "" msgid "Language:" msgstr "" +#, c-format +msgid "Defaults" +msgstr "Berezkoak" + #, c-format msgid "Find" msgstr "Bilatu" @@ -1801,10 +1805,6 @@ msgstr "&Egile agiritegia:" msgid "Br&owse..." msgstr "Bilat&u" -#, c-format -msgid "Defaults" -msgstr "Berezkoak" - #, c-format msgid "Patch Generator" msgstr "Eranskin Sortzailea" diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po index 4201a3088e6..0f562714b1c 100644 --- a/Translations/WinMerge/Brazilian.po +++ b/Translations/WinMerge/Brazilian.po @@ -1305,6 +1305,9 @@ msgstr "Auto-&recarregar arquivos modificados:" msgid "Language:" msgstr "Idioma:" +msgid "Defaults" +msgstr "Padrões" + msgid "Find" msgstr "Achar" @@ -1491,9 +1494,6 @@ msgstr "P&asta personalizada:" msgid "Br&owse..." msgstr "Pr&ocurar..." -msgid "Defaults" -msgstr "Padrões" - msgid "Patch Generator" msgstr "Gerador de Patches" diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po index 4da37ebb51b..9de1504b0b2 100644 --- a/Translations/WinMerge/Bulgarian.po +++ b/Translations/WinMerge/Bulgarian.po @@ -1302,6 +1302,9 @@ msgstr "Автоматично &презареждане на променени msgid "Language:" msgstr "Език:" +msgid "Defaults" +msgstr "По подразбиране" + msgid "Find" msgstr "Търсене" @@ -1488,9 +1491,6 @@ msgstr "Друга &папка:" msgid "Br&owse..." msgstr "&Разглеждане…" -msgid "Defaults" -msgstr "По подразбиране" - msgid "Patch Generator" msgstr "Създаване на кръпки" diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po index 44ca62d006c..5b3f9e5f62a 100644 --- a/Translations/WinMerge/Catalan.po +++ b/Translations/WinMerge/Catalan.po @@ -1564,6 +1564,10 @@ msgstr "&Recarrega automàticament els fitxers modificats:" msgid "Language:" msgstr "Idioma:" +#, c-format +msgid "Defaults" +msgstr "Predeterminats" + #, c-format msgid "Find" msgstr "Cerca" @@ -1799,10 +1803,6 @@ 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" diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po index eaa34b8b020..6b99ba3591f 100644 --- a/Translations/WinMerge/ChineseSimplified.po +++ b/Translations/WinMerge/ChineseSimplified.po @@ -1309,6 +1309,9 @@ msgstr "自动重新加载修改过的文件(&R):" msgid "Language:" msgstr "语言:" +msgid "Defaults" +msgstr "默认" + msgid "Find" msgstr "查找" @@ -1497,9 +1500,6 @@ msgstr "自定义文件夹(&U):" msgid "Br&owse..." msgstr "浏览(&O)..." -msgid "Defaults" -msgstr "默认" - msgid "Patch Generator" msgstr "补丁生成器" diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po index e41b66aa08a..774a838c2aa 100644 --- a/Translations/WinMerge/ChineseTraditional.po +++ b/Translations/WinMerge/ChineseTraditional.po @@ -1573,6 +1573,10 @@ msgstr "自動重新載入修改的檔案(&R):" msgid "Language:" msgstr "語言:" +#, c-format +msgid "Defaults" +msgstr "預設值" + #, c-format msgid "Find" msgstr "尋找" @@ -1808,10 +1812,6 @@ msgstr "自訂資料夾 (&U):" msgid "Br&owse..." msgstr "瀏覽 (&O)..." -#, c-format -msgid "Defaults" -msgstr "預設值" - #, c-format msgid "Patch Generator" msgstr "補綴產生器" diff --git a/Translations/WinMerge/Corsican.po b/Translations/WinMerge/Corsican.po index 11cb8ff268d..95267b343d8 100644 --- a/Translations/WinMerge/Corsican.po +++ b/Translations/WinMerge/Corsican.po @@ -1307,6 +1307,9 @@ msgstr "&Ricaricà autumaticamente i schedarii mudificati :" msgid "Language:" msgstr "Lingua :" +msgid "Defaults" +msgstr "Predefinizioni" + msgid "Find" msgstr "Circà" @@ -1493,9 +1496,6 @@ msgstr "Cartulare &persunalizatu :" msgid "Br&owse..." msgstr "Na&vigà…" -msgid "Defaults" -msgstr "Predefinizioni" - msgid "Patch Generator" msgstr "Generatore di currezzioni" diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po index 38616c99660..d0adef18a81 100644 --- a/Translations/WinMerge/Croatian.po +++ b/Translations/WinMerge/Croatian.po @@ -1563,6 +1563,10 @@ msgstr "" msgid "Language:" msgstr "" +#, c-format +msgid "Defaults" +msgstr "Predpodešeno" + #, c-format msgid "Find" msgstr "Nađi" @@ -1798,10 +1802,6 @@ 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)" diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po index 067f4e90fd7..21c01edc9f2 100644 --- a/Translations/WinMerge/Czech.po +++ b/Translations/WinMerge/Czech.po @@ -1563,6 +1563,10 @@ msgstr "" msgid "Language:" msgstr "" +#, c-format +msgid "Defaults" +msgstr "&Původní" + #, c-format msgid "Find" msgstr "Najít" @@ -1798,10 +1802,6 @@ 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" diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po index 0101f0d055d..40467b615cd 100644 --- a/Translations/WinMerge/Danish.po +++ b/Translations/WinMerge/Danish.po @@ -1564,6 +1564,10 @@ msgstr "" msgid "Language:" msgstr "" +#, c-format +msgid "Defaults" +msgstr "Standard" + #, c-format msgid "Find" msgstr "Søg" @@ -1799,10 +1803,6 @@ msgstr "V&algt mappe:" msgid "Br&owse..." msgstr "G&ennemse..." -#, c-format -msgid "Defaults" -msgstr "Standard" - #, c-format msgid "Patch Generator" msgstr "Patch Generator" diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po index 883d88d1ca8..303225e8cf9 100644 --- a/Translations/WinMerge/Dutch.po +++ b/Translations/WinMerge/Dutch.po @@ -1305,6 +1305,9 @@ msgstr "Gewijzigde bestanden automatisch opnieuw laden:" msgid "Language:" msgstr "Language:" +msgid "Defaults" +msgstr "Standaardwaarden" + msgid "Find" msgstr "Zoeken" @@ -1491,9 +1494,6 @@ msgstr "Aangepaste map:" msgid "Br&owse..." msgstr "Bladeren..." -msgid "Defaults" -msgstr "Standaardwaarden" - msgid "Patch Generator" msgstr "Patch-generator" diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot index b13c81d6536..3c0e6783dc5 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-09-21 21:31+0000\n" +"POT-Creation-Date: 2024-09-28 16:54+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English \n" @@ -1299,6 +1299,9 @@ msgstr "" msgid "Language:" msgstr "" +msgid "Defaults" +msgstr "" + msgid "Find" msgstr "" @@ -1485,9 +1488,6 @@ msgstr "" msgid "Br&owse..." msgstr "" -msgid "Defaults" -msgstr "" - msgid "Patch Generator" msgstr "" diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po index a9ed8d0a5b7..a0c25f9b5d4 100644 --- a/Translations/WinMerge/Finnish.po +++ b/Translations/WinMerge/Finnish.po @@ -1305,6 +1305,9 @@ msgstr "" msgid "Language:" msgstr "Kieli:" +msgid "Defaults" +msgstr "Oletukset" + msgid "Find" msgstr "Etsi" @@ -1495,9 +1498,6 @@ msgstr "Mukautettu kansio:" msgid "Br&owse..." msgstr "Selaa..." -msgid "Defaults" -msgstr "Oletukset" - msgid "Patch Generator" msgstr "Korjausgeneraattori" diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po index d81b67b93a6..46deda59e75 100644 --- a/Translations/WinMerge/French.po +++ b/Translations/WinMerge/French.po @@ -1571,6 +1571,10 @@ msgstr "Auto-&rechargement des fichiers modifiés :" msgid "Language:" msgstr "Langue :" +#, c-format +msgid "Defaults" +msgstr "Par défaut" + #, c-format msgid "Find" msgstr "Rechercher" @@ -1806,10 +1810,6 @@ 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" diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po index 3034ec23b6c..fd97821d2b3 100644 --- a/Translations/WinMerge/Galician.po +++ b/Translations/WinMerge/Galician.po @@ -1306,6 +1306,9 @@ msgstr "Autorecarga de arquivos modificados:" msgid "Language:" msgstr "Idioma:" +msgid "Defaults" +msgstr "Predeterminados" + msgid "Find" msgstr "Buscar" @@ -1492,9 +1495,6 @@ msgstr "Carpeta &personalizada:" msgid "Br&owse..." msgstr "&Examinar..." -msgid "Defaults" -msgstr "Predeterminados" - msgid "Patch Generator" msgstr "Xerar parche" diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po index 7454bbb4aa2..392dd05a03c 100644 --- a/Translations/WinMerge/German.po +++ b/Translations/WinMerge/German.po @@ -1567,6 +1567,10 @@ msgstr "&Geänderte Dateien automatisch neu laden:" msgid "Language:" msgstr "&Sprache:" +#, c-format +msgid "Defaults" +msgstr "Vorgaben" + #, c-format msgid "Find" msgstr "Suchen" @@ -1802,10 +1806,6 @@ msgstr "&Benutzerdefinierter Ordner:" msgid "Br&owse..." msgstr "Su&chen..." -#, c-format -msgid "Defaults" -msgstr "Vorgaben" - #, c-format msgid "Patch Generator" msgstr "Patch-Generator" diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po index 80bec4cd24d..640fa875aa1 100644 --- a/Translations/WinMerge/Greek.po +++ b/Translations/WinMerge/Greek.po @@ -1562,6 +1562,10 @@ msgstr "" msgid "Language:" msgstr "" +#, c-format +msgid "Defaults" +msgstr "&Αρχικές Ρυθμίσεις" + #, c-format msgid "Find" msgstr "Αναζήτηση" @@ -1797,10 +1801,6 @@ msgstr "Προ&τιμώμενος Φάκελος:" msgid "Br&owse..." msgstr "Ανα&ζήτηση..." -#, c-format -msgid "Defaults" -msgstr "&Αρχικές Ρυθμίσεις" - #, c-format msgid "Patch Generator" msgstr "Εφαρμογή Δημιουργίας Patch" diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po index 4411b159a13..1fc27cb97fb 100644 --- a/Translations/WinMerge/Hungarian.po +++ b/Translations/WinMerge/Hungarian.po @@ -1565,6 +1565,10 @@ msgstr "Módosított fájlok automatikus újratöltése:" msgid "Language:" msgstr "Nyelv:" +#, c-format +msgid "Defaults" +msgstr "Alaphelyzetbe" + #, c-format msgid "Find" msgstr "Keresés" @@ -1800,10 +1804,6 @@ 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" diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po index e54a9c6fdb8..c0a78a09046 100644 --- a/Translations/WinMerge/Italian.po +++ b/Translations/WinMerge/Italian.po @@ -1306,6 +1306,9 @@ msgstr "&Ricarica automaticamente file modificati:" msgid "Language:" msgstr "Lingua:" +msgid "Defaults" +msgstr "Predefinito" + msgid "Find" msgstr "Trova" @@ -1497,9 +1500,6 @@ msgstr "Cartella &personalizzata:" msgid "Br&owse..." msgstr "Sf&oglia..." -msgid "Defaults" -msgstr "Predefinito" - msgid "Patch Generator" msgstr "Generatore patch" diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po index f754ed1be55..50dd2afcc3a 100644 --- a/Translations/WinMerge/Japanese.po +++ b/Translations/WinMerge/Japanese.po @@ -1304,6 +1304,9 @@ msgstr "変更されたファイルの自動再読み込み(&R):" msgid "Language:" msgstr "言語:" +msgid "Defaults" +msgstr "デフォルト" + msgid "Find" msgstr "検索" @@ -1494,9 +1497,6 @@ msgstr "指定したフォルダー(&U):" msgid "Br&owse..." msgstr "参照(&O)..." -msgid "Defaults" -msgstr "デフォルト" - msgid "Patch Generator" msgstr "パッチ生成" diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po index 125cae1dbb7..e01a524247e 100644 --- a/Translations/WinMerge/Korean.po +++ b/Translations/WinMerge/Korean.po @@ -1572,6 +1572,10 @@ msgstr "수정된 파일 자동 다시 불러오기(&R:" msgid "Language:" msgstr "언어:" +#, c-format +msgid "Defaults" +msgstr "기본값" + #, c-format msgid "Find" msgstr "찾기" @@ -1807,10 +1811,6 @@ msgstr "사용자 지정 폴더(&U):" msgid "Br&owse..." msgstr "찾아보기(&O)..." -#, c-format -msgid "Defaults" -msgstr "기본값" - #, c-format msgid "Patch Generator" msgstr "패치 생성기" diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po index 5c159306eb1..716e11372b4 100644 --- a/Translations/WinMerge/Lithuanian.po +++ b/Translations/WinMerge/Lithuanian.po @@ -1305,6 +1305,9 @@ msgstr "Automatiškais &įkelti iš naujo pakeistus failus:" msgid "Language:" msgstr "Kalba:" +msgid "Defaults" +msgstr "Numat. reikšmės" + msgid "Find" msgstr "Rasti" @@ -1491,9 +1494,6 @@ msgstr "P&asirinktinis katalogas:" msgid "Br&owse..." msgstr "Ra&sti..." -msgid "Defaults" -msgstr "Numat. reikšmės" - msgid "Patch Generator" msgstr "Pataisos generatorius" diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po index 4bc73892cf0..0e3b5d28995 100644 --- a/Translations/WinMerge/Norwegian.po +++ b/Translations/WinMerge/Norwegian.po @@ -1304,6 +1304,9 @@ msgstr "" msgid "Language:" msgstr "" +msgid "Defaults" +msgstr "Standardverdier" + msgid "Find" msgstr "Søk" @@ -1492,9 +1495,6 @@ msgstr "E&gen mappe:" msgid "Br&owse..." msgstr "B&la gjennom.." -msgid "Defaults" -msgstr "Standardverdier" - msgid "Patch Generator" msgstr "Rettelsegenerator" diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po index 80189c6c421..59c23f7f4d2 100644 --- a/Translations/WinMerge/Persian.po +++ b/Translations/WinMerge/Persian.po @@ -1566,6 +1566,10 @@ msgstr "" msgid "Language:" msgstr "" +#, c-format +msgid "Defaults" +msgstr " پيش فرضها " + #, c-format msgid "Find" msgstr " يافتن " @@ -1801,10 +1805,6 @@ msgstr "&u پوشه سفارشي : " msgid "Br&owse..." msgstr "&o مرور ... " -#, c-format -msgid "Defaults" -msgstr " پيش فرضها " - #, c-format msgid "Patch Generator" msgstr " توليد کننده وصله " diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po index 5d6936509b3..5de5896eedb 100644 --- a/Translations/WinMerge/Polish.po +++ b/Translations/WinMerge/Polish.po @@ -1306,6 +1306,9 @@ msgstr "Automatycznie przeładuj zmodyfikowane pliki:" msgid "Language:" msgstr "Język:" +msgid "Defaults" +msgstr "Domyślne" + msgid "Find" msgstr "Znajdź" @@ -1492,9 +1495,6 @@ msgstr "Folder niestandardowy:" msgid "Br&owse..." msgstr "Przeglądaj..." -msgid "Defaults" -msgstr "Domyślne" - msgid "Patch Generator" msgstr "Generuj łatkę" diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po index 15d5b86354f..94f68cd8a96 100644 --- a/Translations/WinMerge/Portuguese.po +++ b/Translations/WinMerge/Portuguese.po @@ -1306,6 +1306,9 @@ msgstr "&Recarregar automaticamente ficheiros modificados:" msgid "Language:" msgstr "Idioma:" +msgid "Defaults" +msgstr "Predefinições" + msgid "Find" msgstr "Localizar" @@ -1496,9 +1499,6 @@ msgstr "Pasta p&ersonalizada:" msgid "Br&owse..." msgstr "L&ocalizar..." -msgid "Defaults" -msgstr "Predefinições" - msgid "Patch Generator" msgstr "Gerador de correção" diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po index 33e6c161535..560566a14f4 100644 --- a/Translations/WinMerge/Romanian.po +++ b/Translations/WinMerge/Romanian.po @@ -1306,6 +1306,9 @@ msgstr "&Reîncarcă automat fișierele modificate:" msgid "Language:" msgstr "Limba:" +msgid "Defaults" +msgstr "Implicite" + msgid "Find" msgstr "Găsește" @@ -1496,9 +1499,6 @@ msgstr "Director personali&zat:" msgid "Br&owse..." msgstr "Ră&sfoiește..." -msgid "Defaults" -msgstr "Implicite" - msgid "Patch Generator" msgstr "Generator petice" diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po index 071a4222ebd..82650edac0e 100644 --- a/Translations/WinMerge/Russian.po +++ b/Translations/WinMerge/Russian.po @@ -1307,6 +1307,9 @@ msgstr "Авто&перезагрузка измененных файлов:" msgid "Language:" msgstr "Язык:" +msgid "Defaults" +msgstr "По умолчанию" + msgid "Find" msgstr "Найти" @@ -1493,9 +1496,6 @@ msgstr "Указанная папка:" msgid "Br&owse..." msgstr "Обзор..." -msgid "Defaults" -msgstr "По умолчанию" - msgid "Patch Generator" msgstr "Генератор патчей" diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po index c6c610557df..2b8dd59ecee 100644 --- a/Translations/WinMerge/Serbian.po +++ b/Translations/WinMerge/Serbian.po @@ -1550,6 +1550,10 @@ msgstr "" msgid "Language:" msgstr "" +#, c-format +msgid "Defaults" +msgstr "Подразумевано" + #, c-format msgid "Find" msgstr "Нађи" @@ -1783,10 +1787,6 @@ msgstr "Подешена фасцикла:" msgid "Br&owse..." msgstr "Пр&егледај..." -#, c-format -msgid "Defaults" -msgstr "Подразумевано" - #, c-format msgid "Patch Generator" msgstr "Створене разлике" diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po index 87890a24ce5..dd8d1880f7a 100644 --- a/Translations/WinMerge/Sinhala.po +++ b/Translations/WinMerge/Sinhala.po @@ -1563,6 +1563,10 @@ msgstr "" msgid "Language:" msgstr "" +#, fuzzy, c-format +msgid "Defaults" +msgstr "Defaults" + #, c-format msgid "Find" msgstr "සොයන්න" @@ -1798,10 +1802,6 @@ msgstr "C&ustom folder:" msgid "Br&owse..." msgstr "සැරි සරන්න..." -#, fuzzy, c-format -msgid "Defaults" -msgstr "Defaults" - #, fuzzy, c-format msgid "Patch Generator" msgstr "Patch Generator" diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po index d4e7ef43967..fc3ded26e89 100644 --- a/Translations/WinMerge/Slovak.po +++ b/Translations/WinMerge/Slovak.po @@ -1305,6 +1305,9 @@ msgstr "" msgid "Language:" msgstr "Jazyk:" +msgid "Defaults" +msgstr "Predvolené" + msgid "Find" msgstr "Hľadať" @@ -1491,9 +1494,6 @@ 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" diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po index ee755ebec29..5d855bf6105 100644 --- a/Translations/WinMerge/Slovenian.po +++ b/Translations/WinMerge/Slovenian.po @@ -1305,6 +1305,9 @@ msgstr "Samodejno &znova naloži spremenjene datoteke:" msgid "Language:" msgstr "Jezik:" +msgid "Defaults" +msgstr "Privzeto" + msgid "Find" msgstr "Najdi" @@ -1491,9 +1494,6 @@ msgstr "&Mapa po meri:" msgid "Br&owse..." msgstr "Prebr&skaj..." -msgid "Defaults" -msgstr "Privzeto" - msgid "Patch Generator" msgstr "Ustvarjalec popravkov" diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po index 2608956ae91..367cfbbd7cd 100644 --- a/Translations/WinMerge/Spanish.po +++ b/Translations/WinMerge/Spanish.po @@ -1308,6 +1308,9 @@ msgstr "Recarga automática de archivos modificados:" msgid "Language:" msgstr "Idioma:" +msgid "Defaults" +msgstr "Predeterminados" + msgid "Find" msgstr "Buscar" @@ -1494,9 +1497,6 @@ msgstr "Carpeta &personalizada:" msgid "Br&owse..." msgstr "&Examinar..." -msgid "Defaults" -msgstr "Predeterminados" - msgid "Patch Generator" msgstr "Generar parche" diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po index e2038339f52..6721d090754 100644 --- a/Translations/WinMerge/Swedish.po +++ b/Translations/WinMerge/Swedish.po @@ -1310,6 +1310,9 @@ msgstr "Läs in ändrade filer på nytt automatiskt:" msgid "Language:" msgstr "Språk:" +msgid "Defaults" +msgstr "Förval" + msgid "Find" msgstr "Sök" @@ -1500,9 +1503,6 @@ msgstr "Egen katalog:" msgid "Br&owse..." msgstr "Bläddra..." -msgid "Defaults" -msgstr "Förval" - msgid "Patch Generator" msgstr "Patchgenererare" diff --git a/Translations/WinMerge/Tamil.po b/Translations/WinMerge/Tamil.po index 986a87a60f3..3583b8d378c 100644 --- a/Translations/WinMerge/Tamil.po +++ b/Translations/WinMerge/Tamil.po @@ -1303,6 +1303,9 @@ msgstr "" msgid "Language:" msgstr "மொழி:" +msgid "Defaults" +msgstr "இயல்புநிலைகள்" + msgid "Find" msgstr "கண்டுபிடி" @@ -1489,9 +1492,6 @@ msgstr "C&ustom கோப்புறை:" msgid "Br&owse..." msgstr "உலாவும்..." -msgid "Defaults" -msgstr "இயல்புநிலைகள்" - msgid "Patch Generator" msgstr "பேட்ச் ஜெனரேட்டர்" diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po index ac0859c1d8b..b173bab071b 100644 --- a/Translations/WinMerge/Turkish.po +++ b/Translations/WinMerge/Turkish.po @@ -1304,6 +1304,9 @@ msgstr "Değiştirilen dosyalar &otomatik yenilensin:" msgid "Language:" msgstr "Dil:" +msgid "Defaults" +msgstr "Varsayılanlar" + msgid "Find" msgstr "Bul" @@ -1490,9 +1493,6 @@ msgstr "Ö&zel klasör:" msgid "Br&owse..." msgstr "Göz a&t..." -msgid "Defaults" -msgstr "Varsayılanlar" - msgid "Patch Generator" msgstr "Yama oluşturucu" diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po index b487f298fea..16595948e35 100644 --- a/Translations/WinMerge/Ukrainian.po +++ b/Translations/WinMerge/Ukrainian.po @@ -1547,6 +1547,10 @@ msgstr "" msgid "Language:" msgstr "" +#, c-format +msgid "Defaults" +msgstr "Звичайні параметри" + #, c-format msgid "Find" msgstr "Знайти" @@ -1782,10 +1786,6 @@ msgstr "Власна тека:" msgid "Br&owse..." msgstr "Переглядання ..." -#, c-format -msgid "Defaults" -msgstr "Звичайні параметри" - #, c-format msgid "Patch Generator" msgstr "Генератор латок"