From a31ad1d186cdccdfb366b4f52ead667db3b3dac3 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Tue, 30 Jun 2020 15:10:19 +0200 Subject: [PATCH] + chg: Minor changes: Trip Trailing Blanks --- grepWinNP3/sktoolslib_mod/ProfilingInfo.h | 2 +- grepWinNP3/sktoolslib_mod/StringUtils.h | 2 +- grepWinNP3/src/Resources/grepWin.rc | 6 ++--- grepWinNP3/src/SearchMT.h | 10 +++---- grepWinNP3/src/resource.h | 2 +- .../Magyar (Magyarország) [hu-HU].lang | 4 +-- language/np3_af_za/menu_af_za.rc | 2 +- language/np3_af_za/resource.h | 2 +- language/np3_af_za/strings_af_za.rc | 2 +- language/np3_be_by/dialogs_be_by.rc | 2 +- language/np3_be_by/resource.h | 2 +- language/np3_be_by/strings_be_by.rc | 2 +- language/np3_de_de/resource.h | 2 +- language/np3_en_gb/resource.h | 2 +- language/np3_en_gb/strings_en_gb.rc | 2 +- language/np3_en_us/resource.h | 2 +- language/np3_en_us/strings_en_us.rc | 2 +- language/np3_es_es/resource.h | 2 +- language/np3_es_es/strings_es_es.rc | 2 +- language/np3_fr_fr/menu_fr_fr.rc | 2 +- language/np3_fr_fr/resource.h | 2 +- language/np3_fr_fr/strings_fr_fr.rc | 2 +- language/np3_hi_in/resource.h | 2 +- language/np3_hi_in/strings_hi_in.rc | 2 +- language/np3_hu_hu/resource.h | 2 +- language/np3_hu_hu/strings_hu_hu.rc | 2 +- language/np3_id_id/resource.h | 2 +- language/np3_id_id/strings_id_id.rc | 2 +- language/np3_it_it/resource.h | 2 +- language/np3_it_it/strings_it_it.rc | 2 +- language/np3_ja_jp/resource.h | 2 +- language/np3_ja_jp/strings_ja_jp.rc | 2 +- language/np3_ko_kr/resource.h | 2 +- language/np3_ko_kr/strings_ko_kr.rc | 2 +- language/np3_nl_nl/menu_nl_nl.rc | 26 +++++++++---------- language/np3_nl_nl/resource.h | 2 +- language/np3_nl_nl/strings_nl_nl.rc | 2 +- language/np3_pl_pl/menu_pl_pl.rc | 4 +-- language/np3_pl_pl/resource.h | 2 +- language/np3_pl_pl/strings_pl_pl.rc | 2 +- language/np3_pt_br/resource.h | 2 +- language/np3_pt_br/strings_pt_br.rc | 2 +- language/np3_pt_pt/resource.h | 2 +- language/np3_pt_pt/strings_pt_pt.rc | 2 +- language/np3_ru_ru/resource.h | 2 +- language/np3_ru_ru/strings_ru_ru.rc | 2 +- language/np3_sk_sk/resource.h | 2 +- language/np3_sk_sk/strings_sk_sk.rc | 2 +- language/np3_sv_se/resource.h | 2 +- language/np3_sv_se/strings_sv_se.rc | 2 +- language/np3_tr_tr/resource.h | 2 +- language/np3_tr_tr/strings_tr_tr.rc | 2 +- language/np3_vi_vn/resource.h | 2 +- language/np3_vi_vn/strings_vi_vn.rc | 2 +- language/np3_zh_cn/resource.h | 2 +- language/np3_zh_cn/strings_zh_cn.rc | 2 +- language/np3_zh_tw/resource.h | 2 +- language/np3_zh_tw/strings_zh_tw.rc | 2 +- minipath/language/mp_af_za/resource.h | 2 +- minipath/language/mp_be_by/resource.h | 2 +- minipath/language/mp_de_de/resource.h | 2 +- minipath/language/mp_en_gb/resource.h | 2 +- minipath/language/mp_en_us/resource.h | 2 +- minipath/language/mp_es_es/resource.h | 2 +- minipath/language/mp_fr_fr/resource.h | 2 +- minipath/language/mp_hi_in/resource.h | 2 +- minipath/language/mp_hu_hu/resource.h | 2 +- minipath/language/mp_id_id/resource.h | 2 +- minipath/language/mp_it_it/resource.h | 2 +- minipath/language/mp_ja_jp/resource.h | 2 +- minipath/language/mp_ko_kr/resource.h | 2 +- minipath/language/mp_nl_nl/resource.h | 2 +- minipath/language/mp_pl_pl/resource.h | 2 +- minipath/language/mp_pt_br/resource.h | 2 +- minipath/language/mp_pt_pt/resource.h | 2 +- minipath/language/mp_ru_ru/resource.h | 2 +- minipath/language/mp_sk_sk/resource.h | 2 +- minipath/language/mp_sv_se/resource.h | 2 +- minipath/language/mp_tr_tr/resource.h | 2 +- minipath/language/mp_vi_vn/resource.h | 2 +- minipath/language/mp_zh_cn/resource.h | 2 +- minipath/language/mp_zh_tw/resource.h | 2 +- minipath/src/Config.h | 2 +- minipath/src/Helpers.h | 2 +- minipath/src/minipath.h | 10 +++---- scintilla/src/UniConversion.h | 2 +- src/ChooseFont/GdiTextRenderer.h | 2 +- src/Dialogs.h | 2 +- src/MuiLanguage.h | 2 +- src/Notepad3.h | 8 +++--- src/Notepad3.rc | 20 +++++++------- src/Version.h | 8 +++--- src/resource.h | 2 +- 93 files changed, 132 insertions(+), 132 deletions(-) diff --git a/grepWinNP3/sktoolslib_mod/ProfilingInfo.h b/grepWinNP3/sktoolslib_mod/ProfilingInfo.h index bb6811cca..b550e7f7a 100644 --- a/grepWinNP3/sktoolslib_mod/ProfilingInfo.h +++ b/grepWinNP3/sktoolslib_mod/ProfilingInfo.h @@ -462,7 +462,7 @@ inline std::string CProfilingInfo::GetReport() const result += lineBuffer; sprintf_s ( lineBuffer, format - , "KernelMode[us]" + , "KernelMode[us]" , IntToStr ((*iter)->GetK().sum/10).c_str() , IntToStr ((*iter)->GetK().sum/10/nCount).c_str() , IntToStr ((*iter)->GetK().minValue/10).c_str() diff --git a/grepWinNP3/sktoolslib_mod/StringUtils.h b/grepWinNP3/sktoolslib_mod/StringUtils.h index 19325640c..907973460 100644 --- a/grepWinNP3/sktoolslib_mod/StringUtils.h +++ b/grepWinNP3/sktoolslib_mod/StringUtils.h @@ -502,7 +502,7 @@ public: } // Trim container T of values in T2. - // T1 can at least be a string, wstring, vector, + // T1 can at least be a string, wstring, vector, // T2 can be simiar but initializer_list is the typical type used. template static void TrimLeadingAndTrailing(T& s, const T2& vals) { diff --git a/grepWinNP3/src/Resources/grepWin.rc b/grepWinNP3/src/Resources/grepWin.rc index bb9e3ced6..e4cde53f0 100644 --- a/grepWinNP3/src/Resources/grepWin.rc +++ b/grepWinNP3/src/Resources/grepWin.rc @@ -317,12 +317,12 @@ IDR_INFODLG HTML "infodlg.htm" // TEXTINCLUDE // -1 TEXTINCLUDE +1 TEXTINCLUDE BEGIN "..\\resource.h\0" END -2 TEXTINCLUDE +2 TEXTINCLUDE BEGIN "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" "#include ""windows.h""\r\n" @@ -332,7 +332,7 @@ BEGIN "#endif\0" END -3 TEXTINCLUDE +3 TEXTINCLUDE BEGIN "\r\n" "\0" diff --git a/grepWinNP3/src/SearchMT.h b/grepWinNP3/src/SearchMT.h index a27d8a23a..27c27376f 100644 --- a/grepWinNP3/src/SearchMT.h +++ b/grepWinNP3/src/SearchMT.h @@ -23,7 +23,7 @@ #include // --------------------------------------- -// a semaphore class +// a semaphore class // (until C++20 std::counting_semaphore) // --------------------------------------- class Semaphore @@ -75,7 +75,7 @@ public: m_cndvar.notify_all(); } -private: +private: mutable std::mutex m_mtx; std::condition_variable m_cndvar; unsigned int m_max; @@ -109,7 +109,7 @@ public: return (m_set.find(filePath) != m_set.end()); } // auto unlock (lock_guard, RAII) - + private: mutable std::mutex m_mtx; std::set m_set; @@ -144,8 +144,8 @@ public: m_threadFutureMap.insert(std::make_pair(sInfoPtr, sFuturePtr)); } - inline bool empty() - { + inline bool empty() + { std::lock_guard lock(m_mtx); return (m_threadReadyMap.empty() && m_threadFutureMap.empty()); } diff --git a/grepWinNP3/src/resource.h b/grepWinNP3/src/resource.h index c01426299..c47afffb1 100644 --- a/grepWinNP3/src/resource.h +++ b/grepWinNP3/src/resource.h @@ -174,7 +174,7 @@ #define IDC_STATIC -1 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/grepWinNP3/translationsNP3/Magyar (Magyarország) [hu-HU].lang b/grepWinNP3/translationsNP3/Magyar (Magyarország) [hu-HU].lang index 9c4a11281..bae436369 100644 --- a/grepWinNP3/translationsNP3/Magyar (Magyarország) [hu-HU].lang +++ b/grepWinNP3/translationsNP3/Magyar (Magyarország) [hu-HU].lang @@ -460,8 +460,8 @@ msgstr "Fájlok UTF-8-ként kezelése" msgid "Visit Stefan Küng's website" msgstr "Ugrás Stefan Küng weboldalára" -#. Resource IDs: (116) -msgid "a regular expression used for searching. Press F1 for more info." +#. Resource IDs: (116) +msgid "a regular expression used for searching. Press F1 for more info." msgstr "Egy reguláris kifejezés volt használva a keresésnél. További információért nyomja meg az F1-et." #. Resource IDs: (125) diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc index 73f10ab63..5f78ee293 100644 --- a/language/np3_af_za/menu_af_za.rc +++ b/language/np3_af_za/menu_af_za.rc @@ -510,7 +510,7 @@ BEGIN MENUITEM "Wys &Menubalk", IDM_VIEW_MENUBAR MENUITEM "Wys &Nutsbalk", IDM_VIEW_TOOLBAR MENUITEM "Wys &Statusbalk", IDM_VIEW_STATUSBAR - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Laai Toolbar Tema...", IDM_VIEW_LOADTHEMETB MENUITEM "Pas&maak Nutsbalk...", IDM_VIEW_CUSTOMIZETB MENUITEM "To&ggle Nutsbalke", IDM_VIEW_TOGGLETB diff --git a/language/np3_af_za/resource.h b/language/np3_af_za/resource.h index 6227af7be..949aa354c 100644 --- a/language/np3_af_za/resource.h +++ b/language/np3_af_za/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/language/np3_af_za/strings_af_za.rc b/language/np3_af_za/strings_af_za.rc index ad0347a34..4ae269166 100644 --- a/language/np3_af_za/strings_af_za.rc +++ b/language/np3_af_za/strings_af_za.rc @@ -150,7 +150,7 @@ BEGIN IDS_MUI_ERR_ADMINEXE "Kon geen administrasie uitvoerbaar vind nie. \nGaan na https://www.rizonesoft.com vir meer?" IDS_MUI_WARN_LOAD_BIG_FILE "Is jy seker jy wil hierdie groot lêer oopmaak?\n\t(Grootte: %s >= %s)!\n(Styling en sintaksis-uitlig word nie toegepas nie!)" - IDS_MUI_ERR_FILE_TOO_LARGE + IDS_MUI_ERR_FILE_TOO_LARGE "Kan nie daardie groot lêer hanteer nie (Grootte: %s)!" IDS_MUI_WARN_UNKNOWN_EXT "Onbekende lêernaam uitbreiding (%s)!\nLaai data in elk geval?" diff --git a/language/np3_be_by/dialogs_be_by.rc b/language/np3_be_by/dialogs_be_by.rc index 521d6ada2..5a7c615f6 100644 --- a/language/np3_be_by/dialogs_be_by.rc +++ b/language/np3_be_by/dialogs_be_by.rc @@ -352,7 +352,7 @@ BEGIN GROUPBOX "Статыстыка па радкам: ",IDC_STATIC,7,7,217,48,WS_GROUP LTEXT "Табуляцыя[%i]:",IDC_INDENT_WIDTH_TAB,40,18,66,8 LTEXT "Прабелы[%i]:",IDC_INDENT_WIDTH_SPC,44,30,66,8 - LTEXT "Змешаныя[x]:",IDC_STATIC,39,42,66,8 + LTEXT "Змешаныя[x]:",IDC_STATIC,39,42,66,8 RTEXT "%s",IDC_INDENT_SUM_TAB,90,18,46,8 RTEXT "%s",IDC_INDENT_SUM_SPC,90,30,46,8 RTEXT "%s",IDC_INDENT_SUM_MIX,90,42,46,8 diff --git a/language/np3_be_by/resource.h b/language/np3_be_by/resource.h index 808d886da..77b4210e4 100644 --- a/language/np3_be_by/resource.h +++ b/language/np3_be_by/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/language/np3_be_by/strings_be_by.rc b/language/np3_be_by/strings_be_by.rc index 6b40c42fb..70af1e1eb 100644 --- a/language/np3_be_by/strings_be_by.rc +++ b/language/np3_be_by/strings_be_by.rc @@ -150,7 +150,7 @@ BEGIN IDS_MUI_ERR_ADMINEXE "Не знойдены інструмент адміністратара\nНаведаць сайт https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "Вы ўпэўнены, што хочаце адкрыць гэты вялікі файл?\n\t(памер: %s >= %s)!\n(Стылі і схема сінтаксісу не будуць скарыстаны!)" - IDS_MUI_ERR_FILE_TOO_LARGE + IDS_MUI_ERR_FILE_TOO_LARGE "Немагчыма апрацаваць гэты вялікі файл (памер: %s)!" IDS_MUI_WARN_UNKNOWN_EXT "Невядомае пашырэнне файла (%s)!\nПрацягнуць ладаванне даных?" diff --git a/language/np3_de_de/resource.h b/language/np3_de_de/resource.h index 3be648e56..0d4479871 100644 --- a/language/np3_de_de/resource.h +++ b/language/np3_de_de/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/language/np3_en_gb/resource.h b/language/np3_en_gb/resource.h index 1f5cb45e5..6e399a41c 100644 --- a/language/np3_en_gb/resource.h +++ b/language/np3_en_gb/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/language/np3_en_gb/strings_en_gb.rc b/language/np3_en_gb/strings_en_gb.rc index bfcfade65..561465217 100644 --- a/language/np3_en_gb/strings_en_gb.rc +++ b/language/np3_en_gb/strings_en_gb.rc @@ -150,7 +150,7 @@ BEGIN IDS_MUI_ERR_ADMINEXE "No administration executable found.\nCheck website https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "Are you sure you want to open this large file?\n\t(size: %s >= %s)!\n(Styling and Syntax Highlighting will not be applied!)" - IDS_MUI_ERR_FILE_TOO_LARGE + IDS_MUI_ERR_FILE_TOO_LARGE "Can't handle that huge file (size: %s)!" IDS_MUI_WARN_UNKNOWN_EXT "Unknown file name extension (%s)!\nLoading data anyway?" diff --git a/language/np3_en_us/resource.h b/language/np3_en_us/resource.h index 51fd2af2c..b2a6e4a17 100644 --- a/language/np3_en_us/resource.h +++ b/language/np3_en_us/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/language/np3_en_us/strings_en_us.rc b/language/np3_en_us/strings_en_us.rc index 946f80fc1..3959eca44 100644 --- a/language/np3_en_us/strings_en_us.rc +++ b/language/np3_en_us/strings_en_us.rc @@ -150,7 +150,7 @@ BEGIN IDS_MUI_ERR_ADMINEXE "No administration executable found.\nCheck website https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "Are you sure you want to open this large file?\n\t(size: %s >= %s)!\n(Styling and Syntax Highlighting will not be applied!)" - IDS_MUI_ERR_FILE_TOO_LARGE + IDS_MUI_ERR_FILE_TOO_LARGE "Can't handle that huge file (size: %s)!" IDS_MUI_WARN_UNKNOWN_EXT "Unknown file name extension (%s)!\nLoading data anyway?" diff --git a/language/np3_es_es/resource.h b/language/np3_es_es/resource.h index 700524e8d..cd1d5201a 100644 --- a/language/np3_es_es/resource.h +++ b/language/np3_es_es/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/language/np3_es_es/strings_es_es.rc b/language/np3_es_es/strings_es_es.rc index bc35b9915..a2b06992b 100644 --- a/language/np3_es_es/strings_es_es.rc +++ b/language/np3_es_es/strings_es_es.rc @@ -150,7 +150,7 @@ BEGIN IDS_MUI_ERR_ADMINEXE "No se ha encontrado administración ejecutable.\n¿Consultar website https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "¿Seguro que quiere abrir este archivo tan grande?\n\t(tamaño: %s >= %s)!\n(¡No se aplicarán el estilo y el resaltado de sintaxis!)" - IDS_MUI_ERR_FILE_TOO_LARGE + IDS_MUI_ERR_FILE_TOO_LARGE "No puedo manejar ese archivo enorme (tamaño: %s)!" IDS_MUI_WARN_UNKNOWN_EXT "¡Extensión de nombre de archivo desconocido (%s)!\n¿Cargar de todos modos?" diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc index ff951746a..93e86bbd6 100644 --- a/language/np3_fr_fr/menu_fr_fr.rc +++ b/language/np3_fr_fr/menu_fr_fr.rc @@ -510,7 +510,7 @@ BEGIN MENUITEM "Afficher la barre de &menus", IDM_VIEW_MENUBAR MENUITEM "&Afficher la barre à outils", IDM_VIEW_TOOLBAR MENUITEM "Affic&her la barre d'état", IDM_VIEW_STATUSBAR - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Charger un thème d'outils...", IDM_VIEW_LOADTHEMETB MENUITEM "&Gérer la barre à outils...", IDM_VIEW_CUSTOMIZETB MENUITEM "Al&terner les barres à outils", IDM_VIEW_TOGGLETB diff --git a/language/np3_fr_fr/resource.h b/language/np3_fr_fr/resource.h index 576f11cff..bb497874c 100644 --- a/language/np3_fr_fr/resource.h +++ b/language/np3_fr_fr/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/language/np3_fr_fr/strings_fr_fr.rc b/language/np3_fr_fr/strings_fr_fr.rc index d560abd82..34ee66a9a 100644 --- a/language/np3_fr_fr/strings_fr_fr.rc +++ b/language/np3_fr_fr/strings_fr_fr.rc @@ -150,7 +150,7 @@ BEGIN IDS_MUI_ERR_ADMINEXE "Aucun fichier exécutable d'administration trouvé.\nCheck website https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "Etes-vous sûr de vouloir ouvrir ce gros fichier?\n\t(taille: %s >= %s)!\n(Styling and Syntax Highlighting will not be applied!)" - IDS_MUI_ERR_FILE_TOO_LARGE + IDS_MUI_ERR_FILE_TOO_LARGE "Ne peut pas gérer cet énorme fichier (taille: %s)!" IDS_MUI_WARN_UNKNOWN_EXT "Extension de nom de fichier inconnue (%s)!\nChargement des données quand même?" diff --git a/language/np3_hi_in/resource.h b/language/np3_hi_in/resource.h index 1f5cb45e5..6e399a41c 100644 --- a/language/np3_hi_in/resource.h +++ b/language/np3_hi_in/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/language/np3_hi_in/strings_hi_in.rc b/language/np3_hi_in/strings_hi_in.rc index 36edbabc4..cfacd936b 100644 --- a/language/np3_hi_in/strings_hi_in.rc +++ b/language/np3_hi_in/strings_hi_in.rc @@ -150,7 +150,7 @@ BEGIN IDS_MUI_ERR_ADMINEXE "No administration executable found.\nCheck website https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "Are you sure you want to open this large file?\n\t(size: %s >= %s)!\n(Styling and Syntax Highlighting will not be applied!)" - IDS_MUI_ERR_FILE_TOO_LARGE + IDS_MUI_ERR_FILE_TOO_LARGE "Can't handle that huge file (size: %s)!" IDS_MUI_WARN_UNKNOWN_EXT "Unknown file name extension (%s)!\nLoading data anyway?" diff --git a/language/np3_hu_hu/resource.h b/language/np3_hu_hu/resource.h index ae54aba57..fb4d25440 100644 --- a/language/np3_hu_hu/resource.h +++ b/language/np3_hu_hu/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/language/np3_hu_hu/strings_hu_hu.rc b/language/np3_hu_hu/strings_hu_hu.rc index ccfe05b9a..3873f7467 100644 --- a/language/np3_hu_hu/strings_hu_hu.rc +++ b/language/np3_hu_hu/strings_hu_hu.rc @@ -150,7 +150,7 @@ BEGIN IDS_MUI_ERR_ADMINEXE "Adminisztrátor végrehajtható nem található.\nFelkeressük ezt a weboldalt: https://rizonesoft.com ?" IDS_MUI_WARN_LOAD_BIG_FILE "Biztosan meg szeretné nyitni ezt a nagy fájlt?\n\t(méret: %s >= %s)!\n(A stílus és a szintaxis kiemelés nem lesz alkalmazva!)" - IDS_MUI_ERR_FILE_TOO_LARGE + IDS_MUI_ERR_FILE_TOO_LARGE "Nem tudok ilyen nagy fájlt kezelni (méret: %s)!" IDS_MUI_WARN_UNKNOWN_EXT "Ismeretlen fájlkiterjesztés (%s)!\nMindenképpen betöltsem?" diff --git a/language/np3_id_id/resource.h b/language/np3_id_id/resource.h index 1f5cb45e5..6e399a41c 100644 --- a/language/np3_id_id/resource.h +++ b/language/np3_id_id/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/language/np3_id_id/strings_id_id.rc b/language/np3_id_id/strings_id_id.rc index 941da2b02..b5f6015fe 100644 --- a/language/np3_id_id/strings_id_id.rc +++ b/language/np3_id_id/strings_id_id.rc @@ -150,7 +150,7 @@ BEGIN IDS_MUI_ERR_ADMINEXE "No administration executable found.\nCheck website https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "Are you sure you want to open this large file?\n\t(size: %s >= %s)!\n(Styling and Syntax Highlighting will not be applied!)" - IDS_MUI_ERR_FILE_TOO_LARGE + IDS_MUI_ERR_FILE_TOO_LARGE "Can't handle that huge file (size: %s)!" IDS_MUI_WARN_UNKNOWN_EXT "Unknown file name extension (%s)!\nLoading data anyway?" diff --git a/language/np3_it_it/resource.h b/language/np3_it_it/resource.h index f9f64f5ea..9b63c4478 100644 --- a/language/np3_it_it/resource.h +++ b/language/np3_it_it/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/language/np3_it_it/strings_it_it.rc b/language/np3_it_it/strings_it_it.rc index 1f8a55871..4131bbd8c 100644 --- a/language/np3_it_it/strings_it_it.rc +++ b/language/np3_it_it/strings_it_it.rc @@ -150,7 +150,7 @@ BEGIN IDS_MUI_ERR_ADMINEXE "Nessun eseguibile di administration trovato.\nControllare https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "Sei sicuro di voler aprire questo file grande?\n\t(dimensione: %s >= %s)!\n(Le evidenziature di stile e sintassi non saranno applicate!)" - IDS_MUI_ERR_FILE_TOO_LARGE + IDS_MUI_ERR_FILE_TOO_LARGE "Impossibile gestire un file così grande (dimensione: %s)!" IDS_MUI_WARN_UNKNOWN_EXT "Estensione sconosciuta (%s)!\nProseguire con il caricamento?" diff --git a/language/np3_ja_jp/resource.h b/language/np3_ja_jp/resource.h index 58638d39e..1196bb00c 100644 --- a/language/np3_ja_jp/resource.h +++ b/language/np3_ja_jp/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/language/np3_ja_jp/strings_ja_jp.rc b/language/np3_ja_jp/strings_ja_jp.rc index 81bb5c924..2c5d8441e 100644 --- a/language/np3_ja_jp/strings_ja_jp.rc +++ b/language/np3_ja_jp/strings_ja_jp.rc @@ -150,7 +150,7 @@ BEGIN IDS_MUI_ERR_ADMINEXE "管理ツールが見つかりません。\nNotepad3 の公式サイトを開きますか？ https://rizonesoft.com" IDS_MUI_WARN_LOAD_BIG_FILE "大容量のファイルです。このファイルを開きますか？\n\t(サイズ: %s >= %s)!\n(配色や構文ハイライトは適用されません!)" - IDS_MUI_ERR_FILE_TOO_LARGE + IDS_MUI_ERR_FILE_TOO_LARGE "大容量すぎて処理できません！ (サイズ: %s)" IDS_MUI_WARN_UNKNOWN_EXT "%s は設定のない拡張子です。\n読み込みますか？" diff --git a/language/np3_ko_kr/resource.h b/language/np3_ko_kr/resource.h index 1044151af..51ccef22e 100644 --- a/language/np3_ko_kr/resource.h +++ b/language/np3_ko_kr/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/language/np3_ko_kr/strings_ko_kr.rc b/language/np3_ko_kr/strings_ko_kr.rc index d9ddcdded..468056a5e 100644 --- a/language/np3_ko_kr/strings_ko_kr.rc +++ b/language/np3_ko_kr/strings_ko_kr.rc @@ -150,7 +150,7 @@ BEGIN IDS_MUI_ERR_ADMINEXE "사용 가능한 관리 도구를 찾을 수 없습니다. https://rizonesoft.com 에서 확인 하시겠습니까?" IDS_MUI_WARN_LOAD_BIG_FILE "이 대용량 파일을 열겠습니까?\n\t(size: %s >= %s)!\n(Styling and Syntax Highlighting will not be applied!)" - IDS_MUI_ERR_FILE_TOO_LARGE + IDS_MUI_ERR_FILE_TOO_LARGE "Can't handle that huge file (size: %s)!" IDS_MUI_WARN_UNKNOWN_EXT "알 수 없는 확장자 (%s)!\n데이터를 로딩 하시겠습니까?" diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc index 0c2b925f2..1f315146e 100644 --- a/language/np3_nl_nl/menu_nl_nl.rc +++ b/language/np3_nl_nl/menu_nl_nl.rc @@ -200,7 +200,7 @@ BEGIN BEGIN MENUITEM "&Inspringen", IDM_EDIT_INDENT MENUITEM "Teru&gspringen", IDM_EDIT_UNINDENT - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "Gaan naar begin van sele&ctie\tCtrl+,", CMD_JUMP2SELSTART MENUITEM "Gaan naar ei&nde van selectie\tCtrl+.", CMD_JUMP2SELEND MENUITEM SEPARATOR @@ -208,39 +208,39 @@ BEGIN BEGIN MENUITEM "En&kele aanhalingstekens\tCtrl+1", CMD_STRINGIFY MENUITEM "&Dubbele aanhalingstekens\tCtrl+2", CMD_STRINGIFY2 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "( )\tCtrl+3", CMD_EMBRACE MENUITEM "[ ]\tCtrl+4", CMD_EMBRACE2 MENUITEM "{ }\tCtrl+5", CMD_EMBRACE3 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Backticks\tCtrl+6", CMD_EMBRACE4 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Met...\tAlt+Q", IDM_EDIT_ENCLOSESELECTION - END + END MENUITEM "Du&pliceren selectie/lijn\tCtrl+D", IDM_EDIT_DUPLINEORSELECTION - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "Blok &met blancos\tAlt+B", IDM_EDIT_PADWITHSPACES MENUITEM "Strippen &eerste teken\tAlt+Z", IDM_EDIT_STRIP1STCHAR MENUITEM "Strippen &laatste teken\tAlt+U", IDM_EDIT_STRIPLASTCHAR MENUITEM "Strippen &achteraan blancos\tAlt+W", IDM_EDIT_TRIMLINES MENUITEM "Comp&rimeren blancos\tCtrl+Alt+P", IDM_EDIT_COMPRESS_BLANKS - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Wijzigen lijnen...\tAlt+M", IDM_EDIT_MODIFYLINES MENUITEM "Lijnen &uitlijnen...\tAlt+J", IDM_EDIT_ALIGN MENUITEM "Sorteren li&jnen...\tAlt+O", IDM_EDIT_SORTLINES - END - POPUP "Co&nverteren" - BEGIN + END + POPUP "Co&nverteren" + BEGIN MENUITEM "&Hoofdletters\tCtrl+Shift+U", IDM_EDIT_CONVERTUPPERCASE MENUITEM "&kleine letters\tCtrl+U", IDM_EDIT_CONVERTLOWERCASE - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "Hoofdletters &inverteer \tCtrl+Alt+U", IDM_EDIT_INVERTCASE MENUITEM "Titel &hoofdletters\tCtrl+Alt+I", IDM_EDIT_TITLECASE MENUITEM "&Zin hoofdletters\tCtrl+Alt+O", IDM_EDIT_SENTENCECASE - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Tab selectie\tCtrl+Shift+T", IDM_EDIT_CONVERTSPACES MENUITEM "U&ntab selectie\tCtrl+Shift+S", IDM_EDIT_CONVERTTABS - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "Ta&b inspringen\tCtrl+Alt+T", IDM_EDIT_CONVERTSPACES2 MENUITEM "Untab ins&pringen\tCtrl+Alt+S", IDM_EDIT_CONVERTTABS2 MENUITEM SEPARATOR diff --git a/language/np3_nl_nl/resource.h b/language/np3_nl_nl/resource.h index 5b4ac7202..650eb6631 100644 --- a/language/np3_nl_nl/resource.h +++ b/language/np3_nl_nl/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/language/np3_nl_nl/strings_nl_nl.rc b/language/np3_nl_nl/strings_nl_nl.rc index c87c1eb32..5b9f45c38 100644 --- a/language/np3_nl_nl/strings_nl_nl.rc +++ b/language/np3_nl_nl/strings_nl_nl.rc @@ -150,7 +150,7 @@ BEGIN IDS_MUI_ERR_ADMINEXE "Geen administratief uitvoerbaar bestand gevonden.\nControleer website https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "Weet je zeker dat je dit grote bestand wilt openen?\n\t(grootte: %s >= %s)!\n(Styling en syntax highlighting wordt niet toegepast!)" - IDS_MUI_ERR_FILE_TOO_LARGE + IDS_MUI_ERR_FILE_TOO_LARGE "Kan dat enorme bestand niet aan (grootte: %s)!" IDS_MUI_WARN_UNKNOWN_EXT "Onbekende bestandsnaamextensie (%s)!\nGegevens toch laden?" diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc index a5696757c..93f98406b 100644 --- a/language/np3_pl_pl/menu_pl_pl.rc +++ b/language/np3_pl_pl/menu_pl_pl.rc @@ -489,10 +489,10 @@ BEGIN POPUP "+" BEGIN MENUITEM "Otwórz łącze", CMD_OPEN_HYPERLINK - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Cofnij", IDM_EDIT_UNDO MENUITEM "&Do przodu", IDM_EDIT_REDO - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "Wytnij", IDM_EDIT_CUT MENUITEM "&Kopiuj", IDM_EDIT_COPY MENUITEM "&Wklej", IDM_EDIT_PASTE diff --git a/language/np3_pl_pl/resource.h b/language/np3_pl_pl/resource.h index 519d48ff4..8167dede0 100644 --- a/language/np3_pl_pl/resource.h +++ b/language/np3_pl_pl/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/language/np3_pl_pl/strings_pl_pl.rc b/language/np3_pl_pl/strings_pl_pl.rc index a8d315f7d..19e83c9f3 100644 --- a/language/np3_pl_pl/strings_pl_pl.rc +++ b/language/np3_pl_pl/strings_pl_pl.rc @@ -150,7 +150,7 @@ BEGIN IDS_MUI_ERR_ADMINEXE "Nie znaleziono narzędzia administracyjnego.\nSprawdź stronę https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "Czy na pewno chcesz otworzyć ten duży plik?\n\t(rozmiar: %s >= %s)!\n(Projekt i podświetlenie składni nie będzie zastosowane!)" - IDS_MUI_ERR_FILE_TOO_LARGE + IDS_MUI_ERR_FILE_TOO_LARGE "Nie można przetworzyć tego pliku, jest zbyt duży (size: %s)!" IDS_MUI_WARN_UNKNOWN_EXT "Nieznane rozszerzenie nazwy pliku (%s)!\nCzy mimo to załadować?" diff --git a/language/np3_pt_br/resource.h b/language/np3_pt_br/resource.h index 306292212..b9418ec3d 100644 --- a/language/np3_pt_br/resource.h +++ b/language/np3_pt_br/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/language/np3_pt_br/strings_pt_br.rc b/language/np3_pt_br/strings_pt_br.rc index 7a309d529..90568e648 100644 --- a/language/np3_pt_br/strings_pt_br.rc +++ b/language/np3_pt_br/strings_pt_br.rc @@ -150,7 +150,7 @@ BEGIN IDS_MUI_ERR_ADMINEXE "No administration executable found.\nCheck website https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "Are you sure you want to open this large file?\n\t(size: %s >= %s)!\n(Styling and Syntax Highlighting will not be applied!)" - IDS_MUI_ERR_FILE_TOO_LARGE + IDS_MUI_ERR_FILE_TOO_LARGE "Can't handle that huge file (size: %s)!" IDS_MUI_WARN_UNKNOWN_EXT "Unknown file name extension (%s)!\nLoading data anyway?" diff --git a/language/np3_pt_pt/resource.h b/language/np3_pt_pt/resource.h index 1f5cb45e5..6e399a41c 100644 --- a/language/np3_pt_pt/resource.h +++ b/language/np3_pt_pt/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/language/np3_pt_pt/strings_pt_pt.rc b/language/np3_pt_pt/strings_pt_pt.rc index 22669fc41..33ecffd33 100644 --- a/language/np3_pt_pt/strings_pt_pt.rc +++ b/language/np3_pt_pt/strings_pt_pt.rc @@ -150,7 +150,7 @@ BEGIN IDS_MUI_ERR_ADMINEXE "Não foi encontrado nenhum executável de administração.\nVerifique na página https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "Tem a certeza que deseja abrir este ficheiro grande?\n\t(tamanho: %s >= %s)!\n(Não serão aplicados realces de estilo e sintaxe!)" - IDS_MUI_ERR_FILE_TOO_LARGE + IDS_MUI_ERR_FILE_TOO_LARGE "Não é possível manusear este enorme ficheiro (tamanho: %s)!" IDS_MUI_WARN_UNKNOWN_EXT "Extensão de ficheiro desconhecida (%s)!\nCarregar dados mesmo assim?" diff --git a/language/np3_ru_ru/resource.h b/language/np3_ru_ru/resource.h index 20cf16e7a..d77556929 100644 --- a/language/np3_ru_ru/resource.h +++ b/language/np3_ru_ru/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/language/np3_ru_ru/strings_ru_ru.rc b/language/np3_ru_ru/strings_ru_ru.rc index 35040e8fd..1fa9fbb61 100644 --- a/language/np3_ru_ru/strings_ru_ru.rc +++ b/language/np3_ru_ru/strings_ru_ru.rc @@ -150,7 +150,7 @@ BEGIN IDS_MUI_ERR_ADMINEXE "Не найден инструмент администратора\nПосетить сайт https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "Вы уверены, что хотите открыть этот очень большой файл?\n\t(размер: %s >= %s)!\n(Стили и схема синтаксиса не будут применены!)" - IDS_MUI_ERR_FILE_TOO_LARGE + IDS_MUI_ERR_FILE_TOO_LARGE "Невозможно обработать этот большой файл (размер: %s)!" IDS_MUI_WARN_UNKNOWN_EXT "Неизвестное расширения файла (%s)!\nПродолжить загрузку данных?" diff --git a/language/np3_sk_sk/resource.h b/language/np3_sk_sk/resource.h index 0b129d046..9a3e01ec3 100644 --- a/language/np3_sk_sk/resource.h +++ b/language/np3_sk_sk/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/language/np3_sk_sk/strings_sk_sk.rc b/language/np3_sk_sk/strings_sk_sk.rc index edd465d09..a6b9f6feb 100644 --- a/language/np3_sk_sk/strings_sk_sk.rc +++ b/language/np3_sk_sk/strings_sk_sk.rc @@ -150,7 +150,7 @@ BEGIN IDS_MUI_ERR_ADMINEXE "Nenašiel sa žiadny spustiteľný súbor správy.\nSkontrolujte webovú stránku https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "Súbor je príliš veľký. Chcete ho otvoriť?\n\t(veľkosť: %s >= %s)!\n(Štýly a zvýraznenie syntaxie sa nepoužijú!)" - IDS_MUI_ERR_FILE_TOO_LARGE + IDS_MUI_ERR_FILE_TOO_LARGE "Nedá sa spracovať tento veľký súbor (veľkosť: %s)!" IDS_MUI_WARN_UNKNOWN_EXT "Neznáma prípona názvu súboru (%s)!\nNačítať aj napriek tomu?" diff --git a/language/np3_sv_se/resource.h b/language/np3_sv_se/resource.h index 5ee1bd8d4..542a151ff 100644 --- a/language/np3_sv_se/resource.h +++ b/language/np3_sv_se/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/language/np3_sv_se/strings_sv_se.rc b/language/np3_sv_se/strings_sv_se.rc index 98577ce72..3aa238528 100644 --- a/language/np3_sv_se/strings_sv_se.rc +++ b/language/np3_sv_se/strings_sv_se.rc @@ -150,7 +150,7 @@ BEGIN IDS_MUI_ERR_ADMINEXE "Ingen exekverbar fil för administratör kan hittas.\nGå till websidan https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "Vill du öppna denna stora fil?\n\t(storlek: %s >= %s)!\n(Stil och syntaxmarkering kommer inte användas!)" - IDS_MUI_ERR_FILE_TOO_LARGE + IDS_MUI_ERR_FILE_TOO_LARGE "Kan inte hantera så stor fil (storlek: %s)!" IDS_MUI_WARN_UNKNOWN_EXT "Okändt filnamnstillägg (%s)!\nVill du fortsätta ändå?" diff --git a/language/np3_tr_tr/resource.h b/language/np3_tr_tr/resource.h index 8eb87f8b8..acc5dfcd4 100644 --- a/language/np3_tr_tr/resource.h +++ b/language/np3_tr_tr/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/language/np3_tr_tr/strings_tr_tr.rc b/language/np3_tr_tr/strings_tr_tr.rc index ae5647c98..c1e483ae9 100644 --- a/language/np3_tr_tr/strings_tr_tr.rc +++ b/language/np3_tr_tr/strings_tr_tr.rc @@ -150,7 +150,7 @@ BEGIN IDS_MUI_ERR_ADMINEXE "No administration executable found.\nCheck website https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "Are you sure you want to open this large file?\n\t(size: %s >= %s)!\n(Styling and Syntax Highlighting will not be applied!)" - IDS_MUI_ERR_FILE_TOO_LARGE + IDS_MUI_ERR_FILE_TOO_LARGE "Can't handle that huge file (size: %s)!" IDS_MUI_WARN_UNKNOWN_EXT "Unknown file name extension (%s)!\nLoading data anyway?" diff --git a/language/np3_vi_vn/resource.h b/language/np3_vi_vn/resource.h index 1f5cb45e5..6e399a41c 100644 --- a/language/np3_vi_vn/resource.h +++ b/language/np3_vi_vn/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/language/np3_vi_vn/strings_vi_vn.rc b/language/np3_vi_vn/strings_vi_vn.rc index 7a80cd3ba..c0cf9a05d 100644 --- a/language/np3_vi_vn/strings_vi_vn.rc +++ b/language/np3_vi_vn/strings_vi_vn.rc @@ -150,7 +150,7 @@ BEGIN IDS_MUI_ERR_ADMINEXE "No administration executable found.\nCheck website https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE "Are you sure you want to open this large file?\n\t(size: %s >= %s)!\n(Styling and Syntax Highlighting will not be applied!)" - IDS_MUI_ERR_FILE_TOO_LARGE + IDS_MUI_ERR_FILE_TOO_LARGE "Can't handle that huge file (size: %s)!" IDS_MUI_WARN_UNKNOWN_EXT "Unknown file name extension (%s)!\nLoading data anyway?" diff --git a/language/np3_zh_cn/resource.h b/language/np3_zh_cn/resource.h index fb82a83db..3d7093cf8 100644 --- a/language/np3_zh_cn/resource.h +++ b/language/np3_zh_cn/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/language/np3_zh_cn/strings_zh_cn.rc b/language/np3_zh_cn/strings_zh_cn.rc index b81a4e7d0..6e9cc6056 100644 --- a/language/np3_zh_cn/strings_zh_cn.rc +++ b/language/np3_zh_cn/strings_zh_cn.rc @@ -150,7 +150,7 @@ BEGIN IDS_MUI_ERR_ADMINEXE "无管理工具可用。\n\n访问 https://rizonesoft.com/ 看看？" IDS_MUI_WARN_LOAD_BIG_FILE "是否确实要打开一个如此庞大的文件？\n\t（大小 %s >= %s）\n样式和语法高亮将被禁用。" - IDS_MUI_ERR_FILE_TOO_LARGE + IDS_MUI_ERR_FILE_TOO_LARGE "无法处理如此庞大的文件（大小 %s）！" IDS_MUI_WARN_UNKNOWN_EXT "扩展名“%s”不是已知的文本文件。仍然要尝试打开吗？" diff --git a/language/np3_zh_tw/resource.h b/language/np3_zh_tw/resource.h index 1f5cb45e5..6e399a41c 100644 --- a/language/np3_zh_tw/resource.h +++ b/language/np3_zh_tw/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/language/np3_zh_tw/strings_zh_tw.rc b/language/np3_zh_tw/strings_zh_tw.rc index 9bed339d8..06afdef78 100644 --- a/language/np3_zh_tw/strings_zh_tw.rc +++ b/language/np3_zh_tw/strings_zh_tw.rc @@ -150,7 +150,7 @@ BEGIN IDS_MUI_ERR_ADMINEXE "無管理工具可用。\n\n訪問 https://rizonesoft.com/ 看看？" IDS_MUI_WARN_LOAD_BIG_FILE "是否確實要打開一個如此龐大的檔案？\n\t（大小 %s >= %s）\n樣式和語法高亮將被禁用。" - IDS_MUI_ERR_FILE_TOO_LARGE + IDS_MUI_ERR_FILE_TOO_LARGE "無法處理如此龐大的檔案（大小 %s）！" IDS_MUI_WARN_UNKNOWN_EXT "副檔名「%s」不是已知的文字檔案。仍然要嘗試打開嗎？" diff --git a/minipath/language/mp_af_za/resource.h b/minipath/language/mp_af_za/resource.h index b5f8736dc..4f8f45317 100644 --- a/minipath/language/mp_af_za/resource.h +++ b/minipath/language/mp_af_za/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/minipath/language/mp_be_by/resource.h b/minipath/language/mp_be_by/resource.h index 808d886da..77b4210e4 100644 --- a/minipath/language/mp_be_by/resource.h +++ b/minipath/language/mp_be_by/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/minipath/language/mp_de_de/resource.h b/minipath/language/mp_de_de/resource.h index c38854c75..c1c6e7267 100644 --- a/minipath/language/mp_de_de/resource.h +++ b/minipath/language/mp_de_de/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/minipath/language/mp_en_gb/resource.h b/minipath/language/mp_en_gb/resource.h index d2a1be918..feb96549d 100644 --- a/minipath/language/mp_en_gb/resource.h +++ b/minipath/language/mp_en_gb/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/minipath/language/mp_en_us/resource.h b/minipath/language/mp_en_us/resource.h index 9f9c99c89..a8a58ddda 100644 --- a/minipath/language/mp_en_us/resource.h +++ b/minipath/language/mp_en_us/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/minipath/language/mp_es_es/resource.h b/minipath/language/mp_es_es/resource.h index d2a1be918..feb96549d 100644 --- a/minipath/language/mp_es_es/resource.h +++ b/minipath/language/mp_es_es/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/minipath/language/mp_fr_fr/resource.h b/minipath/language/mp_fr_fr/resource.h index d2a1be918..feb96549d 100644 --- a/minipath/language/mp_fr_fr/resource.h +++ b/minipath/language/mp_fr_fr/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/minipath/language/mp_hi_in/resource.h b/minipath/language/mp_hi_in/resource.h index d2a1be918..feb96549d 100644 --- a/minipath/language/mp_hi_in/resource.h +++ b/minipath/language/mp_hi_in/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/minipath/language/mp_hu_hu/resource.h b/minipath/language/mp_hu_hu/resource.h index dd2e9d74b..ba7ff9140 100644 --- a/minipath/language/mp_hu_hu/resource.h +++ b/minipath/language/mp_hu_hu/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/minipath/language/mp_id_id/resource.h b/minipath/language/mp_id_id/resource.h index d2a1be918..feb96549d 100644 --- a/minipath/language/mp_id_id/resource.h +++ b/minipath/language/mp_id_id/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/minipath/language/mp_it_it/resource.h b/minipath/language/mp_it_it/resource.h index dc0c42430..2b6bd688b 100644 --- a/minipath/language/mp_it_it/resource.h +++ b/minipath/language/mp_it_it/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/minipath/language/mp_ja_jp/resource.h b/minipath/language/mp_ja_jp/resource.h index 9b5e9eb4c..4aacfe7dc 100644 --- a/minipath/language/mp_ja_jp/resource.h +++ b/minipath/language/mp_ja_jp/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/minipath/language/mp_ko_kr/resource.h b/minipath/language/mp_ko_kr/resource.h index c2db047d5..9c3c926b3 100644 --- a/minipath/language/mp_ko_kr/resource.h +++ b/minipath/language/mp_ko_kr/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/minipath/language/mp_nl_nl/resource.h b/minipath/language/mp_nl_nl/resource.h index d2a1be918..feb96549d 100644 --- a/minipath/language/mp_nl_nl/resource.h +++ b/minipath/language/mp_nl_nl/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/minipath/language/mp_pl_pl/resource.h b/minipath/language/mp_pl_pl/resource.h index a56dbc3bf..a66fd02f1 100644 --- a/minipath/language/mp_pl_pl/resource.h +++ b/minipath/language/mp_pl_pl/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/minipath/language/mp_pt_br/resource.h b/minipath/language/mp_pt_br/resource.h index 2c5a61e51..6feafecad 100644 --- a/minipath/language/mp_pt_br/resource.h +++ b/minipath/language/mp_pt_br/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/minipath/language/mp_pt_pt/resource.h b/minipath/language/mp_pt_pt/resource.h index d2a1be918..feb96549d 100644 --- a/minipath/language/mp_pt_pt/resource.h +++ b/minipath/language/mp_pt_pt/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/minipath/language/mp_ru_ru/resource.h b/minipath/language/mp_ru_ru/resource.h index 20cf16e7a..d77556929 100644 --- a/minipath/language/mp_ru_ru/resource.h +++ b/minipath/language/mp_ru_ru/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/minipath/language/mp_sk_sk/resource.h b/minipath/language/mp_sk_sk/resource.h index 2b46b1d01..c25e35e52 100644 --- a/minipath/language/mp_sk_sk/resource.h +++ b/minipath/language/mp_sk_sk/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/minipath/language/mp_sv_se/resource.h b/minipath/language/mp_sv_se/resource.h index 63634cbd1..6e4788715 100644 --- a/minipath/language/mp_sv_se/resource.h +++ b/minipath/language/mp_sv_se/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/minipath/language/mp_tr_tr/resource.h b/minipath/language/mp_tr_tr/resource.h index d2a1be918..feb96549d 100644 --- a/minipath/language/mp_tr_tr/resource.h +++ b/minipath/language/mp_tr_tr/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/minipath/language/mp_vi_vn/resource.h b/minipath/language/mp_vi_vn/resource.h index d2a1be918..feb96549d 100644 --- a/minipath/language/mp_vi_vn/resource.h +++ b/minipath/language/mp_vi_vn/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/minipath/language/mp_zh_cn/resource.h b/minipath/language/mp_zh_cn/resource.h index d2a1be918..feb96549d 100644 --- a/minipath/language/mp_zh_cn/resource.h +++ b/minipath/language/mp_zh_cn/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/minipath/language/mp_zh_tw/resource.h b/minipath/language/mp_zh_tw/resource.h index d2a1be918..feb96549d 100644 --- a/minipath/language/mp_zh_tw/resource.h +++ b/minipath/language/mp_zh_tw/resource.h @@ -10,7 +10,7 @@ #endif // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 diff --git a/minipath/src/Config.h b/minipath/src/Config.h index 787063a12..c6cdaf233 100644 --- a/minipath/src/Config.h +++ b/minipath/src/Config.h @@ -76,7 +76,7 @@ extern "C" { // ---------------------------------------------------------------------------- // ========================================== - // open file , get/set value, save(set) file + // open file , get/set value, save(set) file // ========================================== size_t IniFileGetString(LPCWSTR lpFilePath, LPCWSTR lpSectionName, LPCWSTR lpKeyName, LPCWSTR lpDefault, diff --git a/minipath/src/Helpers.h b/minipath/src/Helpers.h index 04e737d9b..e549a19a7 100644 --- a/minipath/src/Helpers.h +++ b/minipath/src/Helpers.h @@ -118,7 +118,7 @@ inline BOOL PathIsExistingFile(LPCWSTR pszPath) { return (PathFileExists(pszPath //==== StrNextTok methods =================== CHAR* StrNextTokA(CHAR*, const CHAR*); WCHAR* StrNextTokW(WCHAR*, const WCHAR*); -#if defined(UNICODE) || defined(_UNICODE) +#if defined(UNICODE) || defined(_UNICODE) #define StrNextTok StrNextTokW #else #define StrNextTok _StrNextTokA diff --git a/minipath/src/minipath.h b/minipath/src/minipath.h index 415a2912a..3709ff575 100644 --- a/minipath/src/minipath.h +++ b/minipath/src/minipath.h @@ -132,9 +132,9 @@ typedef struct _settings_t int cxOpenWithDlg; int cyOpenWithDlg; int cxCopyMoveDlg; - + BOOL bHasQuickview; - + WCHAR tchFilter[DL_FILTER_BUFSIZE]; BOOL bNegFilter; BOOL bDefCrNoFilt; @@ -142,14 +142,14 @@ typedef struct _settings_t COLORREF crNoFilt; COLORREF crFilter; COLORREF crCustom[16]; - + WININFO wi; - + WCHAR szCurDir[MAX_PATH + 40]; DWORD dwFillMask; int nSortFlags; BOOL fSortRev; - + } SETTINGS_T, * PSETTINGS_T; extern SETTINGS_T Settings; diff --git a/scintilla/src/UniConversion.h b/scintilla/src/UniConversion.h index bfa247c06..d48c85018 100644 --- a/scintilla/src/UniConversion.h +++ b/scintilla/src/UniConversion.h @@ -75,7 +75,7 @@ inline bool UTF8IsNEL(const unsigned char *us) noexcept { return (us[0] == 0xc2) && (us[1] == 0x85); } -// Is the sequence of 3 char a UTF-8 line end? Only the last two char are tested for a NEL. +// Is the sequence of 3 char a UTF-8 line end? Only the last two char are tested for a NEL. constexpr bool UTF8IsMultibyteLineEnd(unsigned char ch0, unsigned char ch1, unsigned char ch2) noexcept { return ((ch0 == 0xe2) && (ch1 == 0x80) && ((ch2 == 0xa8) || (ch2 == 0xa9))) || diff --git a/src/ChooseFont/GdiTextRenderer.h b/src/ChooseFont/GdiTextRenderer.h index fd60b2b0c..3db2cf835 100644 --- a/src/ChooseFont/GdiTextRenderer.h +++ b/src/ChooseFont/GdiTextRenderer.h @@ -77,7 +77,7 @@ private: HRESULT STDMETHODCALLTYPE GetPixelsPerDip( void* clientDrawingContext, OUT FLOAT* pixelsPerDip) override; - + public: HRESULT STDMETHODCALLTYPE QueryInterface( diff --git a/src/Dialogs.h b/src/Dialogs.h index 881c00c45..4d25de86d 100644 --- a/src/Dialogs.h +++ b/src/Dialogs.h @@ -103,7 +103,7 @@ void ResizeDlgCtl(HWND hwndDlg, int nCtlId, int dx, int dy); HDWP DeferCtlPos(HDWP hdwp, HWND hwndDlg, int nCtlId, int dx, int dy, UINT uFlags); -void MakeBitmapButton(HWND hwnd, int nCtlId, HINSTANCE hInstance, WORD uBmpId); +void MakeBitmapButton(HWND hwnd, int nCtlId, HINSTANCE hInstance, WORD uBmpId); void MakeColorPickButton(HWND hwnd, int nCtlId, HINSTANCE hInstance, COLORREF crColor); void DeleteBitmapButton(HWND hwnd, int nCtlId); diff --git a/src/MuiLanguage.h b/src/MuiLanguage.h index 99dfca852..e58c64987 100644 --- a/src/MuiLanguage.h +++ b/src/MuiLanguage.h @@ -23,7 +23,7 @@ typedef struct _muilanguage UINT rid; const WCHAR* szLocaleName; const WCHAR* szMenuItem; - // !!! WARNING: LCID is DEPRECATED + // !!! WARNING: LCID is DEPRECATED LANGID LangId; bool bHasDLL; bool bIsActive; diff --git a/src/Notepad3.h b/src/Notepad3.h index b5184ca7d..c4620a77f 100644 --- a/src/Notepad3.h +++ b/src/Notepad3.h @@ -42,7 +42,7 @@ typedef struct np3params { int flagTitleExcerpt; int flagMatchText; WCHAR wchData; -} +} np3params, *LPnp3params; @@ -60,7 +60,7 @@ typedef struct _undoSel UT_array* curPos_redo; UT_array* anchorVS_redo; UT_array* curVS_redo; -} +} UndoRedoSelection_t; #pragma pack(pop) @@ -198,11 +198,11 @@ LRESULT MsgSysCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam); void IgnoreNotifyChangeEvent(); void ObserveNotifyChangeEvent(); -#define _IGNORE_NOTIFY_CHANGE_ __try { IgnoreNotifyChangeEvent(); +#define _IGNORE_NOTIFY_CHANGE_ __try { IgnoreNotifyChangeEvent(); #define _OBSERVE_NOTIFY_CHANGE_ } __finally { ObserveNotifyChangeEvent(); } -#define BeginWaitCursor(cond,text) if (cond) { __try { SciCall_SetCursor(SC_CURSORWAIT); StatusSetText(Globals.hwndStatus, STATUS_HELP, (text)); +#define BeginWaitCursor(cond,text) if (cond) { __try { SciCall_SetCursor(SC_CURSORWAIT); StatusSetText(Globals.hwndStatus, STATUS_HELP, (text)); #define EndWaitCursor() } __finally { SciCall_SetCursor(SC_CURSORNORMAL); POINT pt; GetCursorPos(&pt); SetCursorPos(pt.x, pt.y); UpdateStatusbar(true); } } diff --git a/src/Notepad3.rc b/src/Notepad3.rc index eecd0774a..d326a503b 100644 --- a/src/Notepad3.rc +++ b/src/Notepad3.rc @@ -144,7 +144,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // - Press LeftAlt Shift to switch out of the IME (taskbar shows your original language code). // // -------------------------------------------------------------------------------------------------------------------- -// +// // GLOBAL INTERCEPTED HOTKEYS: // // - Ctrl+Alt+Shift+F @@ -272,7 +272,7 @@ BEGIN //VK_END, CMD_VKEND, VIRTKEY, NOINVERT //VK_HOME, CMD_VKEND, VIRTKEY, NOINVERT //VK_PRIOR, CMD_VKEND, VIRTKEY, NOINVERT /// PAGE UP Key - //VK_NEXT, CMD_VKEND, VIRTKEY, NOINVERT /// PAGE NEXT Key + //VK_NEXT, CMD_VKEND, VIRTKEY, NOINVERT /// PAGE NEXT Key //~VK_LEFT, CMD_LEFT, VIRTKEY, NOINVERT VK_LEFT, CMD_CTRLLEFT, VIRTKEY, CONTROL, NOINVERT VK_LEFT, CMD_FOLDCOLLAPSE, VIRTKEY, ALT, NOINVERT @@ -375,10 +375,10 @@ BEGIN VK_TAB, CMD_BACKTAB, VIRTKEY, SHIFT, NOINVERT VK_TAB, CMD_CTRLTAB, VIRTKEY, CONTROL, NOINVERT VK_INSERT, CMD_VK_INSERT, VIRTKEY, NOINVERT -END - -IDR_ACCFINDREPLACE ACCELERATORS -BEGIN +END + +IDR_ACCFINDREPLACE ACCELERATORS +BEGIN "F", IDACC_FIND, VIRTKEY, CONTROL, NOINVERT "H", IDACC_REPLACE, VIRTKEY, CONTROL, NOINVERT "S", IDACC_SAVEPOS, VIRTKEY, CONTROL, NOINVERT @@ -389,10 +389,10 @@ BEGIN VK_F3, IDACC_SAVEFIND, VIRTKEY, ALT, NOINVERT VK_F3, IDACC_FINDPREV, VIRTKEY, SHIFT, NOINVERT VK_F4, IDACC_REPLACENEXT, VIRTKEY, NOINVERT -END - -IDR_ACCCUSTOMSCHEMES ACCELERATORS -BEGIN +END + +IDR_ACCCUSTOMSCHEMES ACCELERATORS +BEGIN "S", IDACC_SAVEPOS, VIRTKEY, CONTROL, NOINVERT "R", IDACC_RESETPOS, VIRTKEY, CONTROL, NOINVERT "S", IDACC_PREVIEW, VIRTKEY, CONTROL, NOINVERT diff --git a/src/Version.h b/src/Version.h index 7e711cafe..e65765ebf 100644 --- a/src/Version.h +++ b/src/Version.h @@ -132,13 +132,13 @@ #define VER_CPL MS Visual C++ 2017 v15.9.11 #elif(_MSC_FULL_VER >= 191627027) #define VER_CPL MS Visual C++ 2017 v15.9.(7-10) - #elif(_MSC_FULL_VER >= 191627026) + #elif(_MSC_FULL_VER >= 191627026) #define VER_CPL MS Visual C++ 2017 v15.9.(5-6) - #elif(_MSC_FULL_VER >= 191627025) + #elif(_MSC_FULL_VER >= 191627025) #define VER_CPL MS Visual C++ 2017 v15.9.4 - #elif(_MSC_FULL_VER >= 191627024) + #elif(_MSC_FULL_VER >= 191627024) #define VER_CPL MS Visual C++ 2017 v15.9.(2-3) - #elif(_MSC_FULL_VER >= 191627023) + #elif(_MSC_FULL_VER >= 191627023) #define VER_CPL MS Visual C++ 2017 v15.9.(0-1) #endif #elif (_MSC_VER == 1915) diff --git a/src/resource.h b/src/resource.h index f477cffff..b059c27fb 100644 --- a/src/resource.h +++ b/src/resource.h @@ -67,7 +67,7 @@ #include "../language/common_res.h" // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1