Skip to content
Permalink
Browse files

Make it possible to select whether to close the main window (if no ch…

…lid window) or only the child window when pressing the ESC key
  • Loading branch information
sdottaka committed Jan 5, 2020
1 parent 88171a3 commit 943d37bae059c37a47590675c7e3ea4fdd3720c5
Showing with 340 additions and 105 deletions.
  1. +3 −3 Src/DirView.cpp
  2. +1 −1 Src/DirView.h
  3. +1 −1 Src/HexMergeView.cpp
  4. +1 −1 Src/ImgMergeFrm.cpp
  5. +2 −2 Src/MainFrm.cpp
  6. +24 −16 Src/Merge.rc
  7. +2 −2 Src/MergeEditView.cpp
  8. +1 −1 Src/OptionsInit.cpp
  9. +13 −4 Src/PropGeneral.cpp
  10. +1 −1 Src/PropGeneral.h
  11. +3 −1 Src/resource.h
  12. +8 −2 Translations/WinMerge/Arabic.po
  13. +8 −2 Translations/WinMerge/Basque.po
  14. +8 −2 Translations/WinMerge/Brazilian.po
  15. +8 −2 Translations/WinMerge/Bulgarian.po
  16. +8 −2 Translations/WinMerge/Catalan.po
  17. +8 −2 Translations/WinMerge/ChineseSimplified.po
  18. +8 −2 Translations/WinMerge/ChineseTraditional.po
  19. +8 −2 Translations/WinMerge/Croatian.po
  20. +8 −2 Translations/WinMerge/Czech.po
  21. +8 −2 Translations/WinMerge/Danish.po
  22. +8 −2 Translations/WinMerge/Dutch.po
  23. +8 −2 Translations/WinMerge/English.pot
  24. +8 −2 Translations/WinMerge/Finnish.po
  25. +8 −2 Translations/WinMerge/French.po
  26. +8 −2 Translations/WinMerge/Galician.po
  27. +8 −2 Translations/WinMerge/German.po
  28. +8 −2 Translations/WinMerge/Greek.po
  29. +8 −2 Translations/WinMerge/Hungarian.po
  30. +8 −2 Translations/WinMerge/Italian.po
  31. +8 −2 Translations/WinMerge/Japanese.po
  32. +8 −2 Translations/WinMerge/Korean.po
  33. +8 −2 Translations/WinMerge/Lithuanian.po
  34. +8 −2 Translations/WinMerge/Norwegian.po
  35. +8 −2 Translations/WinMerge/Persian.po
  36. +8 −2 Translations/WinMerge/Polish.po
  37. +8 −2 Translations/WinMerge/Portuguese.po
  38. +8 −2 Translations/WinMerge/Romanian.po
  39. +8 −2 Translations/WinMerge/Russian.po
  40. +8 −2 Translations/WinMerge/Serbian.po
  41. +8 −2 Translations/WinMerge/Sinhala.po
  42. +8 −2 Translations/WinMerge/Slovak.po
  43. +8 −2 Translations/WinMerge/Slovenian.po
  44. +8 −2 Translations/WinMerge/Spanish.po
  45. +8 −2 Translations/WinMerge/Swedish.po
  46. +8 −2 Translations/WinMerge/Turkish.po
  47. +8 −2 Translations/WinMerge/Ukrainian.po
@@ -126,7 +126,7 @@ CDirView::CDirView()

m_bTreeMode = GetOptionsMgr()->GetBool(OPT_TREE_MODE);
m_bExpandSubdirs = GetOptionsMgr()->GetBool(OPT_DIRVIEW_EXPAND_SUBDIRS);
m_bEscCloses = GetOptionsMgr()->GetBool(OPT_CLOSE_WITH_ESC);
m_nEscCloses = GetOptionsMgr()->GetInt(OPT_CLOSE_WITH_ESC);
Options::DirColors::Load(GetOptionsMgr(), m_cachedColors);
m_bUseColors = GetOptionsMgr()->GetBool(OPT_DIRCLR_USE_COLORS);
}
@@ -2137,7 +2137,7 @@ BOOL CDirView::PreTranslateMessage(MSG* pMsg)
return TRUE;
}

if (m_bEscCloses)
if (m_nEscCloses != 0)
{
AfxGetMainWnd()->PostMessage(WM_COMMAND, ID_FILE_CLOSE);
return FALSE;
@@ -2898,7 +2898,7 @@ void CDirView::OnUpdatePluginPredifferMode(CCmdUI* pCmdUI)
*/
void CDirView::RefreshOptions()
{
m_bEscCloses = GetOptionsMgr()->GetBool(OPT_CLOSE_WITH_ESC);
m_nEscCloses = GetOptionsMgr()->GetInt(OPT_CLOSE_WITH_ESC);
m_bExpandSubdirs = GetOptionsMgr()->GetBool(OPT_DIRVIEW_EXPAND_SUBDIRS);
Options::DirColors::Load(GetOptionsMgr(), m_cachedColors);
m_bUseColors = GetOptionsMgr()->GetBool(OPT_DIRCLR_USE_COLORS);
@@ -201,7 +201,7 @@ class CDirView : public CListView
CImageList m_imageState;
CListCtrl* m_pList;
std::unique_ptr<IListCtrl> m_pIList;
bool m_bEscCloses; /**< Cached value for option for ESC closing window */
int m_nEscCloses; /**< Cached value for option for ESC closing window */
bool m_bExpandSubdirs;
CFont m_font; /**< User-selected font */
UINT m_nHiddenItems; /**< Count of items we have hidden */
@@ -508,7 +508,7 @@ BOOL CHexMergeView::PreTranslateMessage(MSG* pMsg)
if (pMsg->message == WM_KEYDOWN)
{
// Close window in response to VK_ESCAPE if user has allowed it from options
if (pMsg->wParam == VK_ESCAPE && GetOptionsMgr()->GetBool(OPT_CLOSE_WITH_ESC))
if (pMsg->wParam == VK_ESCAPE && GetOptionsMgr()->GetInt(OPT_CLOSE_WITH_ESC) != 0)
{
GetParentFrame()->PostMessage(WM_CLOSE, 0, 0);
return TRUE;
@@ -1251,7 +1251,7 @@ BOOL CImgMergeFrame::PreTranslateMessage(MSG* pMsg)
}

// Close window in response to VK_ESCAPE if user has allowed it from options
if (pMsg->wParam == VK_ESCAPE && GetOptionsMgr()->GetBool(OPT_CLOSE_WITH_ESC))
if (pMsg->wParam == VK_ESCAPE && GetOptionsMgr()->GetInt(OPT_CLOSE_WITH_ESC) != 0)
{
PostMessage(WM_CLOSE, 0, 0);
return true;
@@ -1690,11 +1690,11 @@ BOOL CMainFrame::PreTranslateMessage(MSG* pMsg)
AfxGetMainWnd()->SendMessage(WM_COMMAND, ID_APP_EXIT);
return TRUE;
}
/* else if (GetOptionsMgr()->GetBool(OPT_CLOSE_WITH_ESC) && m_wndTabBar.GetItemCount() == 0)
else if (GetOptionsMgr()->GetInt(OPT_CLOSE_WITH_ESC) == 1 && m_wndTabBar.GetItemCount() == 0)
{
AfxGetMainWnd()->PostMessage(WM_COMMAND, ID_APP_EXIT);
return FALSE;
}*/ // Don't close the app when user press escape and there is no tab opened, use Ctrl + Q instead like all editors do
}
}

if (WM_KEYDOWN == pMsg->message && VK_TAB == pMsg->wParam && GetAsyncKeyState(VK_CONTROL) < 0 && m_arrChild.GetSize() > 1)
@@ -637,14 +637,14 @@ BEGIN
POPUP "_ITEM_POPUP_"
BEGIN
MENUITEM "Comp&are", ID_MERGE_COMPARE
MENUITEM "Compare Non-hor&izontally...", ID_MERGE_COMPARE_NONHORIZONTALLY
MENUITEM "Compare Non-hor&izontally...", ID_MERGE_COMPARE_NONHORIZONTALLY
POPUP "Compare Non-hor&izontally"
BEGIN
MENUITEM "First &left item with second left item", ID_MERGE_COMPARE_LEFT1_LEFT2
MENUITEM "First &right item with second right item", ID_MERGE_COMPARE_RIGHT1_RIGHT2
MENUITEM "&First left item with second right item", ID_MERGE_COMPARE_LEFT1_RIGHT2
MENUITEM "&Second left item with first right item", ID_MERGE_COMPARE_LEFT2_RIGHT1
MENUITEM "Compare Non-hor&izontally...", ID_MERGE_COMPARE_NONHORIZONTALLY
MENUITEM "Compare Non-hor&izontally...", ID_MERGE_COMPARE_NONHORIZONTALLY
END
POPUP "Co&mpare As"
BEGIN
@@ -977,25 +977,26 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
CONTROL "Automatically &scroll to first difference",IDC_SCROLL_CHECK,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,240,10
CONTROL "Cl&ose windows with ESC",IDC_ESC_CLOSES_WINDOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,18,240,10
LTEXT "Cl&ose windows with ESC:",IDC_STATIC,7,16,200,10
COMBOBOX IDC_ESC_CLOSES_WINDOW,7,27,240,10,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "&Automatically verify paths in Open-dialog",IDC_VERIFY_OPEN_PATHS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,30,240,10
CONTROL "All&ow only one instance to run",IDC_SINGLE_INSTANCE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,42,240,10
CONTROL "As&k when closing multiple windows",IDC_ASK_MULTIWINDOW_CLOSE,
CONTROL "All&ow only one instance to run",IDC_SINGLE_INSTANCE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,54,240,10
CONTROL "&Preserve file time in file compare",IDC_PRESERVE_FILETIME,
CONTROL "As&k when closing multiple windows",IDC_ASK_MULTIWINDOW_CLOSE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,66,240,10
CONTROL "Show ""Select Files or Folders"" Dialog on Startup",IDC_STARTUP_FOLDER_SELECT,
CONTROL "&Preserve file time in file compare",IDC_PRESERVE_FILETIME,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,78,240,10
CONTROL "Show ""Select Files or Folders"" Dialog on Startup",IDC_STARTUP_FOLDER_SELECT,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,240,10
CONTROL "Close ""Select Files or Folders"" Dialog on clicking OK button",IDC_CLOSE_WITH_OK,
"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,7,90,240,20
LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,7,110,240,10
COMBOBOX IDC_AUTO_COMPLETE_SOURCE,7,122,240,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Language:",IDC_STATIC,7,140,80,10
COMBOBOX IDC_LANGUAGE_LIST,7,152,241,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",IDC_STATIC,7,186,193,40
PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,203,205,45,14,NOT WS_TABSTOP
"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,7,102,240,20
LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,7,122,240,10
COMBOBOX IDC_AUTO_COMPLETE_SOURCE,7,134,240,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Language:",IDC_STATIC,7,152,80,10
COMBOBOX IDC_LANGUAGE_LIST,7,164,240,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",IDC_STATIC,7,198,193,40
PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,203,217,45,14,NOT WS_TABSTOP
END

IDD_EDIT_FIND DIALOGEX 30, 73, 293, 96
@@ -1150,7 +1151,8 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
CAPTION "Colors"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
CONTROL "&Use folder compare colors",IDC_USE_DIR_COMPARE_COLORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,15,152,10
CONTROL "&Use folder compare colors",IDC_USE_DIR_COMPARE_COLORS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,15,152,10
CTEXT "Background",IDC_STATIC,154,29,50,10
CTEXT "Text",IDC_STATIC,207,29,29,10
RTEXT "Items equal:",IDC_STATIC,4,49,152,20
@@ -2880,6 +2882,12 @@ BEGIN
IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC "DirectWrite Natural Symmetric"
END

STRINGTABLE
BEGIN
IDS_CLOSE_WINDOWS_WITH_ESC_1 "MDI child window or main window"
IDS_CLOSE_WINDOWS_WITH_ESC_2 "MDI child window only"
END

#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////

@@ -2461,8 +2461,8 @@ BOOL CMergeEditView::PreTranslateMessage(MSG* pMsg)
// Close window if user has allowed it from options
if (pMsg->wParam == VK_ESCAPE)
{
bool bCloseWithEsc = GetOptionsMgr()->GetBool(OPT_CLOSE_WITH_ESC);
if (bCloseWithEsc)
int nCloseWithEsc = GetOptionsMgr()->GetInt(OPT_CLOSE_WITH_ESC);
if (nCloseWithEsc != 0)
GetParentFrame()->PostMessage(WM_CLOSE, 0, 0);
return false;
}
@@ -113,7 +113,7 @@ void Init(COptionsMgr *pOptions)
pOptions->InitOption(OPT_BREAK_ON_WORDS, false);
pOptions->InitOption(OPT_BREAK_TYPE, 1);

pOptions->InitOption(OPT_CLOSE_WITH_ESC, true);
pOptions->InitOption(OPT_CLOSE_WITH_ESC, 1);
pOptions->InitOption(OPT_CLOSE_WITH_OK, false);
pOptions->InitOption(OPT_IGNORE_SMALL_FILETIME, false);
pOptions->InitOption(OPT_ASK_MULTIWINDOW_CLOSE, false);
@@ -45,7 +45,7 @@ PropGeneral::PropGeneral(COptionsMgr *optionsMgr)
, m_bScroll(false)
, m_bSingleInstance(false)
, m_bVerifyPaths(false)
, m_bCloseWindowWithEsc(false) // default is false !
, m_nCloseWindowWithEsc(1)
, m_bAskMultiWindowClose(false)
, m_nAutoCompleteSource(0)
, m_bPreserveFiletime(false)
@@ -72,6 +72,15 @@ BOOL PropGeneral::OnInitDialog()

pWnd->SetCurSel(m_nAutoCompleteSource);

pWnd = (CComboBox*)GetDlgItem(IDC_ESC_CLOSES_WINDOW);
ASSERT(pWnd != nullptr);

pWnd->AddString(_("Disabled").c_str());
pWnd->AddString(_("MDI child window or main window").c_str());
pWnd->AddString(_("MDI child window only").c_str());

pWnd->SetCurSel(m_nCloseWindowWithEsc);

m_ctlLangList.SetDroppedWidth(600);
m_ctlLangList.EnableWindow(FALSE);
m_pLoadLanguagesThread = AfxBeginThread(LoadLanguagesThreadProc, this, 0, 0, CREATE_SUSPENDED);
@@ -98,7 +107,7 @@ void PropGeneral::DoDataExchange(CDataExchange* pDX)
DDX_Check(pDX, IDC_SCROLL_CHECK, m_bScroll);
DDX_Check(pDX, IDC_SINGLE_INSTANCE, m_bSingleInstance);
DDX_Check(pDX, IDC_VERIFY_OPEN_PATHS, m_bVerifyPaths);
DDX_Check(pDX, IDC_ESC_CLOSES_WINDOW, m_bCloseWindowWithEsc);
DDX_CBIndex(pDX, IDC_ESC_CLOSES_WINDOW, m_nCloseWindowWithEsc);
DDX_Check(pDX, IDC_ASK_MULTIWINDOW_CLOSE, m_bAskMultiWindowClose);
DDX_CBIndex(pDX, IDC_AUTO_COMPLETE_SOURCE, m_nAutoCompleteSource);
DDX_Check(pDX, IDC_PRESERVE_FILETIME, m_bPreserveFiletime);
@@ -125,7 +134,7 @@ void PropGeneral::ReadOptions()
m_bScroll = GetOptionsMgr()->GetBool(OPT_SCROLL_TO_FIRST);
m_bSingleInstance = GetOptionsMgr()->GetBool(OPT_SINGLE_INSTANCE);
m_bVerifyPaths = GetOptionsMgr()->GetBool(OPT_VERIFY_OPEN_PATHS);
m_bCloseWindowWithEsc = GetOptionsMgr()->GetBool(OPT_CLOSE_WITH_ESC);
m_nCloseWindowWithEsc = GetOptionsMgr()->GetInt(OPT_CLOSE_WITH_ESC);
m_bAskMultiWindowClose = GetOptionsMgr()->GetBool(OPT_ASK_MULTIWINDOW_CLOSE);
m_nAutoCompleteSource = GetOptionsMgr()->GetInt(OPT_AUTO_COMPLETE_SOURCE);
m_bPreserveFiletime = GetOptionsMgr()->GetBool(OPT_PRESERVE_FILETIMES);
@@ -141,7 +150,7 @@ void PropGeneral::WriteOptions()
GetOptionsMgr()->SaveOption(OPT_SCROLL_TO_FIRST, m_bScroll);
GetOptionsMgr()->SaveOption(OPT_SINGLE_INSTANCE, m_bSingleInstance);
GetOptionsMgr()->SaveOption(OPT_VERIFY_OPEN_PATHS, m_bVerifyPaths);
GetOptionsMgr()->SaveOption(OPT_CLOSE_WITH_ESC, m_bCloseWindowWithEsc);
GetOptionsMgr()->SaveOption(OPT_CLOSE_WITH_ESC, m_nCloseWindowWithEsc);
GetOptionsMgr()->SaveOption(OPT_ASK_MULTIWINDOW_CLOSE, m_bAskMultiWindowClose);
GetOptionsMgr()->SaveOption(OPT_AUTO_COMPLETE_SOURCE, m_nAutoCompleteSource);
GetOptionsMgr()->SaveOption(OPT_PRESERVE_FILETIMES, m_bPreserveFiletime);
@@ -29,7 +29,7 @@ class PropGeneral : public OptionsPanel
bool m_bScroll;
bool m_bSingleInstance;
bool m_bVerifyPaths;
bool m_bCloseWindowWithEsc;
int m_nCloseWindowWithEsc;
bool m_bAskMultiWindowClose;
int m_nAutoCompleteSource;
bool m_bPreserveFiletime;
@@ -1288,14 +1288,16 @@
#define IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL 33714
#define IDS_RENDERING_MODE_DIRECTWRITE_NATURAL 33715
#define IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC 33716
#define IDS_CLOSE_WINDOWS_WITH_ESC_1 33717
#define IDS_CLOSE_WINDOWS_WITH_ESC_2 33718

// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 253
#define _APS_NEXT_COMMAND_VALUE 33664
#define _APS_NEXT_COMMAND_VALUE 33719
#define _APS_NEXT_CONTROL_VALUE 8831
#define _APS_NEXT_SYMED_VALUE 116
#endif
@@ -968,8 +968,8 @@ msgstr "عام"
msgid "Automatically &scroll to first difference"
msgstr "الانتقال إلى الا&ختلاف الأول تلقائيا"

msgid "Cl&ose windows with ESC"
msgstr "إغلاق النوافذ باستخدام زر ESC"
msgid "Cl&ose windows with ESC:"
msgstr "إغلاق النوافذ باستخدام زر ESC:"

msgid "&Automatically verify paths in Open-dialog"
msgstr "&تحقق من المسارات في النافذة المفتوحة"
@@ -3357,3 +3357,9 @@ msgstr ""
msgid "DirectWrite Natural Symmetric"
msgstr ""

msgid "MDI child window or main window"
msgstr ""

msgid "MDI child window only"
msgstr ""

@@ -1246,8 +1246,8 @@ msgid "Automatically &scroll to first difference"
msgstr "Berezgaitasunez &irristatu lehen ezberdintasunera"

#, c-format
msgid "Cl&ose windows with ESC"
msgstr "Itxi leihoak ES&C-rekin"
msgid "Cl&ose windows with ESC:"
msgstr "Itxi leihoak ES&C-rekin:"

#, c-format
msgid "&Automatically verify paths in Open-dialog"
@@ -3996,3 +3996,9 @@ msgstr ""
msgid "DirectWrite Natural Symmetric"
msgstr ""

msgid "MDI child window or main window"
msgstr ""

msgid "MDI child window only"
msgstr ""

@@ -1246,8 +1246,8 @@ msgid "Automatically &scroll to first difference"
msgstr "Automaticame&nte rolar pra primeira diferença"

#, c-format
msgid "Cl&ose windows with ESC"
msgstr "Fe&char as janelas com o ESC"
msgid "Cl&ose windows with ESC:"
msgstr "Fe&char as janelas com o ESC:"

#, c-format
msgid "&Automatically verify paths in Open-dialog"
@@ -4102,3 +4102,9 @@ msgstr ""
msgid "DirectWrite Natural Symmetric"
msgstr ""

msgid "MDI child window or main window"
msgstr ""

msgid "MDI child window only"
msgstr ""

@@ -961,8 +961,8 @@ msgstr "Основни"
msgid "Automatically &scroll to first difference"
msgstr "Автоматично &плъзване към първото различие"

msgid "Cl&ose windows with ESC"
msgstr "Затваряне &прозорците при ESC"
msgid "Cl&ose windows with ESC:"
msgstr "Затваряне &прозорците при ESC:"

msgid "&Automatically verify paths in Open-dialog"
msgstr "&Автоматична проверка на пътищата в диалога за отваряне"
@@ -3318,3 +3318,9 @@ msgstr "Естествен DirectWrite"
msgid "DirectWrite Natural Symmetric"
msgstr "Естествен симтричен DirectWrite"

msgid "MDI child window or main window"
msgstr ""

msgid "MDI child window only"
msgstr ""

@@ -1242,8 +1242,8 @@ msgid "Automatically &scroll to first difference"
msgstr "&Desplaça automàticament fins a la primera diferència"

#, c-format
msgid "Cl&ose windows with ESC"
msgstr "T&anca les finestres amb ESC"
msgid "Cl&ose windows with ESC:"
msgstr "T&anca les finestres amb ESC:"

#, c-format
msgid "&Automatically verify paths in Open-dialog"
@@ -3917,3 +3917,9 @@ msgstr ""
msgid "DirectWrite Natural Symmetric"
msgstr ""

msgid "MDI child window or main window"
msgstr ""

msgid "MDI child window only"
msgstr ""

@@ -1245,8 +1245,8 @@ msgid "Automatically &scroll to first difference"
msgstr "自动滚动到第一处差异(&S)"

#, c-format
msgid "Cl&ose windows with ESC"
msgstr "按 ESC 关闭窗口(&O)"
msgid "Cl&ose windows with ESC:"
msgstr "按 ESC 关闭窗口(&O):"

#, c-format
msgid "&Automatically verify paths in Open-dialog"
@@ -3911,3 +3911,9 @@ msgstr ""
msgid "DirectWrite Natural Symmetric"
msgstr ""

msgid "MDI child window or main window"
msgstr ""

msgid "MDI child window only"
msgstr ""

@@ -1251,8 +1251,8 @@ msgid "Automatically &scroll to first difference"
msgstr "自動捲至最初差異(&S)"

#, c-format
msgid "Cl&ose windows with ESC"
msgstr "按 ESC 關閉視窗(&O)"
msgid "Cl&ose windows with ESC:"
msgstr "按 ESC 關閉視窗(&O):"

#, c-format
msgid "&Automatically verify paths in Open-dialog"
@@ -4008,3 +4008,9 @@ msgstr ""
msgid "DirectWrite Natural Symmetric"
msgstr ""

msgid "MDI child window or main window"
msgstr ""

msgid "MDI child window only"
msgstr ""

0 comments on commit 943d37b

Please sign in to comment.
You can’t perform that action at this time.