diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml index 5e0614f2d..0a2729862 100644 --- a/PowerEditor/installer/nativeLang/english.xml +++ b/PowerEditor/installer/nativeLang/english.xml @@ -49,8 +49,8 @@ The comments are here for explanation, it's not necessary to translate them. - - + + @@ -267,8 +267,8 @@ The comments are here for explanation, it's not necessary to translate them. - - + + @@ -619,22 +619,22 @@ The comments are here for explanation, it's not necessary to translate them. - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -928,7 +928,7 @@ The comments are here for explanation, it's not necessary to translate them. - + @@ -1376,8 +1376,8 @@ Continue?"/> - - + + @@ -1503,8 +1503,8 @@ Find in all files but exclude all folders log or logs recursively: - - + + diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index 4d1bf7ca6..cce817bc4 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -7316,6 +7316,8 @@ static const QuoteParams quotes[] = {TEXT("Anonymous #193"), QuoteParams::rapid, false, SC_CP_UTF8, L_TEXT, TEXT("Do you know:\nthere are more airplanes in the oceans, than submarines in the sky?\n") }, {TEXT("Anonymous #194"), QuoteParams::rapid, false, SC_CP_UTF8, L_TEXT, TEXT("If you hold a Unix shell up to your ear,\nyou might just be able to hear the C.\n") }, {TEXT("Anonymous #195"), QuoteParams::rapid, false, SC_CP_UTF8, L_TEXT, TEXT("Why do programmers always mix up Halloween and Christmas?\nBecause Oct 31 == Dec 25\n") }, + {TEXT("Anonymous #196"), QuoteParams::rapid, false, SC_CP_UTF8, L_TEXT, TEXT("What happened to the function that ran away?\nIt never returned.\n") }, + {TEXT("Anonymous #197"), QuoteParams::rapid, false, SC_CP_UTF8, L_TEXT, TEXT("When I am tasked with sorting through a stack of résumés, I throw about half of them in the garbage.\nI do not want unlucky people working in our company.\n") }, {TEXT("xkcd"), QuoteParams::rapid, false, SC_CP_UTF8, L_TEXT, TEXT("Never have I felt so close to another soul\nAnd yet so helplessly alone\nAs when I Google an error\nAnd there's one result\nA thread by someone with the same problem\nAnd no answer\nLast posted to in 2003\n\n\"Who were you, DenverCoder9?\"\n\"What did you see?!\"\n\n(ref: https://xkcd.com/979/)") }, {TEXT("A developer"), QuoteParams::slow, false, SC_CP_UTF8, L_TEXT, TEXT("No hugs & kisses.\nOnly bugs & fixes.") }, {TEXT("Elon Musk"), QuoteParams::rapid, false, SC_CP_UTF8, L_TEXT, TEXT("Don't set your password as your child's name.\nName your child after your password.") }, diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index 2fb1d8691..fc8562d24 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -712,9 +712,9 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Fold All", IDM_VIEW_FOLDALL MENUITEM "Unfold All", IDM_VIEW_UNFOLDALL - MENUITEM "Collapse Current Level", IDM_VIEW_FOLD_CURRENT - MENUITEM "Uncollapse Current Level", IDM_VIEW_UNFOLD_CURRENT - POPUP "Collapse Level" + MENUITEM "Fold Current Level", IDM_VIEW_FOLD_CURRENT + MENUITEM "Unfold Current Level", IDM_VIEW_UNFOLD_CURRENT + POPUP "Fold Level" BEGIN MENUITEM "1", IDM_VIEW_FOLD_1 MENUITEM "2", IDM_VIEW_FOLD_2 @@ -725,7 +725,7 @@ BEGIN MENUITEM "7", IDM_VIEW_FOLD_7 MENUITEM "8", IDM_VIEW_FOLD_8 END - POPUP "Uncollapse Level" + POPUP "Unfold Level" BEGIN MENUITEM "1", IDM_VIEW_UNFOLD_1 MENUITEM "2", IDM_VIEW_UNFOLD_2 diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp index 1792efb72..66cde374f 100644 --- a/PowerEditor/src/Parameters.cpp +++ b/PowerEditor/src/Parameters.cpp @@ -290,23 +290,23 @@ static const WinMenuKeyDefinition winKeyDefs[] = { VK_0, IDM_VIEW_UNFOLDALL, false, true, true, nullptr }, { VK_F, IDM_VIEW_FOLD_CURRENT, true, true, false, nullptr }, { VK_F, IDM_VIEW_UNFOLD_CURRENT, true, true, true, nullptr }, - { VK_1, IDM_VIEW_FOLD_1, false, true, false, TEXT("Collapse Level 1") }, - { VK_2, IDM_VIEW_FOLD_2, false, true, false, TEXT("Collapse Level 2") }, - { VK_3, IDM_VIEW_FOLD_3, false, true, false, TEXT("Collapse Level 3") }, - { VK_4, IDM_VIEW_FOLD_4, false, true, false, TEXT("Collapse Level 4") }, - { VK_5, IDM_VIEW_FOLD_5, false, true, false, TEXT("Collapse Level 5") }, - { VK_6, IDM_VIEW_FOLD_6, false, true, false, TEXT("Collapse Level 6") }, - { VK_7, IDM_VIEW_FOLD_7, false, true, false, TEXT("Collapse Level 7") }, - { VK_8, IDM_VIEW_FOLD_8, false, true, false, TEXT("Collapse Level 8") }, + { VK_1, IDM_VIEW_FOLD_1, false, true, false, TEXT("Fold Level 1") }, + { VK_2, IDM_VIEW_FOLD_2, false, true, false, TEXT("Fold Level 2") }, + { VK_3, IDM_VIEW_FOLD_3, false, true, false, TEXT("Fold Level 3") }, + { VK_4, IDM_VIEW_FOLD_4, false, true, false, TEXT("Fold Level 4") }, + { VK_5, IDM_VIEW_FOLD_5, false, true, false, TEXT("Fold Level 5") }, + { VK_6, IDM_VIEW_FOLD_6, false, true, false, TEXT("Fold Level 6") }, + { VK_7, IDM_VIEW_FOLD_7, false, true, false, TEXT("Fold Level 7") }, + { VK_8, IDM_VIEW_FOLD_8, false, true, false, TEXT("Fold Level 8") }, - { VK_1, IDM_VIEW_UNFOLD_1, false, true, true, TEXT("Uncollapse Level 1") }, - { VK_2, IDM_VIEW_UNFOLD_2, false, true, true, TEXT("Uncollapse Level 2") }, - { VK_3, IDM_VIEW_UNFOLD_3, false, true, true, TEXT("Uncollapse Level 3") }, - { VK_4, IDM_VIEW_UNFOLD_4, false, true, true, TEXT("Uncollapse Level 4") }, - { VK_5, IDM_VIEW_UNFOLD_5, false, true, true, TEXT("Uncollapse Level 5") }, - { VK_6, IDM_VIEW_UNFOLD_6, false, true, true, TEXT("Uncollapse Level 6") }, - { VK_7, IDM_VIEW_UNFOLD_7, false, true, true, TEXT("Uncollapse Level 7") }, - { VK_8, IDM_VIEW_UNFOLD_8, false, true, true, TEXT("Uncollapse Level 8") }, + { VK_1, IDM_VIEW_UNFOLD_1, false, true, true, TEXT("Unfold Level 1") }, + { VK_2, IDM_VIEW_UNFOLD_2, false, true, true, TEXT("Unfold Level 2") }, + { VK_3, IDM_VIEW_UNFOLD_3, false, true, true, TEXT("Unfold Level 3") }, + { VK_4, IDM_VIEW_UNFOLD_4, false, true, true, TEXT("Unfold Level 4") }, + { VK_5, IDM_VIEW_UNFOLD_5, false, true, true, TEXT("Unfold Level 5") }, + { VK_6, IDM_VIEW_UNFOLD_6, false, true, true, TEXT("Unfold Level 6") }, + { VK_7, IDM_VIEW_UNFOLD_7, false, true, true, TEXT("Unfold Level 7") }, + { VK_8, IDM_VIEW_UNFOLD_8, false, true, true, TEXT("Unfold Level 8") }, { VK_NULL, IDM_VIEW_SUMMARY, false, false, false, nullptr }, { VK_NULL, IDM_VIEW_PROJECT_PANEL_1, false, false, false, TEXT("Toggle Project Panel 1") }, { VK_NULL, IDM_VIEW_PROJECT_PANEL_2, false, false, false, TEXT("Toggle Project Panel 2") }, diff --git a/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp index 16347dcd3..3b8080590 100644 --- a/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp +++ b/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp @@ -4922,8 +4922,8 @@ intptr_t CALLBACK Finder::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam generic_string findInFinder = pNativeSpeaker->getLocalizedStrFromID("finder-find-in-finder", TEXT("Find in these search results...")); generic_string closeThis = pNativeSpeaker->getLocalizedStrFromID("finder-close-this", TEXT("Close these search results")); - generic_string collapseAll = pNativeSpeaker->getLocalizedStrFromID("finder-collapse-all", TEXT("Collapse all")); - generic_string uncollapseAll = pNativeSpeaker->getLocalizedStrFromID("finder-uncollapse-all", TEXT("Uncollapse all")); + generic_string collapseAll = pNativeSpeaker->getLocalizedStrFromID("finder-collapse-all", TEXT("Fold all")); + generic_string uncollapseAll = pNativeSpeaker->getLocalizedStrFromID("finder-uncollapse-all", TEXT("Unfold all")); generic_string copyLines = pNativeSpeaker->getLocalizedStrFromID("finder-copy", TEXT("Copy Selected Line(s)")); generic_string copyVerbatim = pNativeSpeaker->getLocalizedStrFromID("finder-copy-verbatim", TEXT("Copy")); copyVerbatim += TEXT("\tCtrl+C"); diff --git a/PowerEditor/src/WinControls/FileBrowser/fileBrowser.h b/PowerEditor/src/WinControls/FileBrowser/fileBrowser.h index 4f7c9b13c..9317f7346 100644 --- a/PowerEditor/src/WinControls/FileBrowser/fileBrowser.h +++ b/PowerEditor/src/WinControls/FileBrowser/fileBrowser.h @@ -176,8 +176,8 @@ protected: std::vector sortingDataArray; - generic_string _expandAllFolders = TEXT("Expand all folders"); - generic_string _collapseAllFolders = TEXT("Collapse all folders"); + generic_string _expandAllFolders = TEXT("Unfold all"); + generic_string _collapseAllFolders = TEXT("Fold all"); generic_string _locateCurrentFile = TEXT("Locate current file"); void initPopupMenus(); diff --git a/PowerEditor/src/WinControls/Preference/preference.rc b/PowerEditor/src/WinControls/Preference/preference.rc index 33d8f3646..c19827f82 100644 --- a/PowerEditor/src/WinControls/Preference/preference.rc +++ b/PowerEditor/src/WinControls/Preference/preference.rc @@ -136,7 +136,7 @@ IDD_PREFERENCE_SUB_MARGING_BORDER_EDGE DIALOGEX 0, 0, 455, 185 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Folder Margin Style",IDC_FMS_GB_STATIC,22,21,83,89,BS_CENTER + GROUPBOX "Fold Margin Style",IDC_FMS_GB_STATIC,22,21,83,89,BS_CENTER CONTROL "Simple",IDC_RADIO_SIMPLE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,31,34,59,10 CONTROL "Arrow",IDC_RADIO_ARROW,"Button",BS_AUTORADIOBUTTON,31,48,60,10 CONTROL "Circle tree",IDC_RADIO_CIRCLE,"Button",BS_AUTORADIOBUTTON,31,63,62,10