From cd2a877d75c7d4849f14e047a7747179c5a44d9c Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Sat, 18 Apr 2020 10:19:34 +0200 Subject: [PATCH] + fix: grepWinNP3: optimized single-tread worker option + fix: grepWinNP3 language files --- .editorconfig | 13 ++ Versions/build.txt | 2 +- Versions/day.txt | 2 +- grepWinNP3/.clang-format | 133 ++++++++++++++++++ grepWinNP3/grepWinNP3.vcxproj | 1 + grepWinNP3/grepWinNP3.vcxproj.filters | 3 + grepWinNP3/src/Resources/grepWin.rc | Bin 37328 -> 18201 bytes grepWinNP3/src/SearchDlg.cpp | 128 ++++++++++------- grepWinNP3/src/SearchDlg.h | 2 +- grepWinNP3/src/last/version.h | 12 +- .../Afrikaans (Suid-Afrika) [af-ZA].lang | 16 +-- .../Deutsch (Deutschland) [de-DE].lang | 16 +-- .../English (United Kingdom) [en-GB].lang | 8 +- .../English (United States) [en-US].lang | 8 +- .../Español (España) [es-ES].lang | 16 +-- .../Français (France) [fr-FR].lang | 16 +-- .../Italiano (Italia) [it-IT].lang | 18 +-- .../Magyar (Magyarország) [hu-HU].lang | 8 +- .../Nederlands (Nederland) [nl-NL].lang | 16 +-- .../Polski (Polska)Polski [pl-PL].lang | 16 +-- .../Português (Brasil) [pt-BR].lang | 16 +-- .../Slovenčina (Slovensko) [sk-SK].lang | 8 +- .../Svenska (Sverige) [sv-SE].lang | 8 +- .../Türkçe (Türkiye) [tr-TR].lang | 14 +- .../Беларуская (Беларусь) [be-BY].lang | 14 +- .../Русский (Pоссия) [ru-RU].lang | 14 +- .../translations/日本語 （日本） [ja-JP].lang | 18 +-- .../简体中文 （中国） [zh-CN].lang | 18 +-- .../한국어 (대한민국) [ko-KR].lang | 8 +- res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 4 +- 31 files changed, 369 insertions(+), 189 deletions(-) create mode 100644 grepWinNP3/.clang-format diff --git a/.editorconfig b/.editorconfig index d39f8c52b..149eca7c7 100644 --- a/.editorconfig +++ b/.editorconfig @@ -48,3 +48,16 @@ indent_style = tab indent_size = 4 tab_width = 4 +[grepWinNP3/**.{h,c,cpp,hpp,cxx}] +charset = utf-8 +# tab (w=4) indentation +indent_style = tab +indent_size = 4 +tab_width = 4 + +[grepWinNP3/**.{rc}] +charset = utf-16le + +[grepWinNP3/src/resource.h] +charset = utf-16le + diff --git a/Versions/build.txt b/Versions/build.txt index 0cfbf0888..d00491fd7 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -2 +1 diff --git a/Versions/day.txt b/Versions/day.txt index 53c86ff4f..29aae8eec 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -417 +418 diff --git a/grepWinNP3/.clang-format b/grepWinNP3/.clang-format new file mode 100644 index 000000000..789742926 --- /dev/null +++ b/grepWinNP3/.clang-format @@ -0,0 +1,133 @@ +--- +Language: Cpp +AccessModifierOffset: -4 +AlignAfterOpenBracket: Align +AlignConsecutiveAssignments: true +AlignConsecutiveDeclarations: true +AlignConsecutiveMacros: true +AlignEscapedNewlines: Right +AlignOperands: true +AlignTrailingComments: true +AllowAllParametersOfDeclarationOnNextLine: true +AllowShortBlocksOnASingleLine: false +AllowShortCaseLabelsOnASingleLine: false +AllowShortFunctionsOnASingleLine: All +AllowShortIfStatementsOnASingleLine: false +AllowShortLoopsOnASingleLine: false +AlwaysBreakAfterDefinitionReturnType: None +AlwaysBreakAfterReturnType: None +AlwaysBreakBeforeMultilineStrings: false +AlwaysBreakTemplateDeclarations: false +BinPackArguments: true +BinPackParameters: true +BraceWrapping: + AfterCaseLabel: true + AfterClass: true + AfterControlStatement: true + AfterEnum: true + AfterFunction: true + AfterNamespace: true + AfterObjCDeclaration: true + AfterStruct: true + AfterUnion: true + BeforeCatch: true + BeforeElse: true + IndentBraces: false + SplitEmptyFunction: true + SplitEmptyRecord: true + SplitEmptyNamespace: true +BreakBeforeBinaryOperators: None +BreakBeforeBraces: Custom +BreakBeforeInheritanceComma: true +BreakBeforeTernaryOperators: true +BreakConstructorInitializersBeforeComma: true +BreakConstructorInitializers: BeforeColon +BreakAfterJavaFieldAnnotations: false +BreakStringLiterals: true +ColumnLimit: 0 +CommentPragmas: '^ IWYU pragma:' +CompactNamespaces: false +ConstructorInitializerAllOnOneLineOrOnePerLine: false +ConstructorInitializerIndentWidth: 4 +ContinuationIndentWidth: 4 +Cpp11BracedListStyle: true +DerivePointerAlignment: true +DisableFormat: false +ExperimentalAutoDetectBinPacking: false +FixNamespaceComments: true +ForEachMacros: + - foreach + - Q_FOREACH + - BOOST_FOREACH +IncludeCategories: + - Regex: '^"(llvm|llvm-c|clang|clang-c)/' + Priority: 2 + - Regex: '^(<|"(gtest|gmock|isl|json)/)' + Priority: 3 + - Regex: '.*' + Priority: 1 +IncludeIsMainRegex: '(Test)?$' +IndentCaseLabels: true +IndentPPDirectives: AfterHash +IndentWidth: 4 +IndentWrappedFunctionNames: true +JavaScriptQuotes: Leave +JavaScriptWrapImports: true +KeepEmptyLinesAtTheStartOfBlocks: false +MacroBlockBegin: "^\ +BEGIN_MSG_MAP|\ +BEGIN_MESSAGE_MAP|\ +BEGIN_MSG_MAP_EX|\ +BEGIN_MESSAGE_MAP_EX|\ +BEGIN_SAFE_MSG_MAP_EX|\ +CR_BEGIN_MSG_MAP_EX|\ +IPC_BEGIN_MESSAGE_MAP|\ +IPC_BEGIN_MESSAGE_MAP_WITH_PARAM|\ +IPC_PROTOBUF_MESSAGE_TRAITS_BEGIN|\ +IPC_STRUCT_BEGIN|\ +IPC_STRUCT_BEGIN_WITH_PARENT|\ +IPC_STRUCT_TRAITS_BEGIN|\ +POLPARAMS_BEGIN|\ +PPAPI_BEGIN_MESSAGE_MAP$" +MacroBlockEnd: "^\ +CR_END_MSG_MAP|\ +END_MSG_MAP|\ +END_MESSAGE_MAP|\ +IPC_END_MESSAGE_MAP|\ +IPC_PROTOBUF_MESSAGE_TRAITS_END|\ +IPC_STRUCT_END|\ +IPC_STRUCT_TRAITS_END|\ +POLPARAMS_END|\ +PPAPI_END_MESSAGE_MAP$" +MaxEmptyLinesToKeep: 1 +NamespaceIndentation: None +ObjCBlockIndentWidth: 2 +ObjCSpaceAfterProperty: false +ObjCSpaceBeforeProtocolList: true +PenaltyBreakAssignment: 2 +PenaltyBreakBeforeFirstCallParameter: 19 +PenaltyBreakComment: 300 +PenaltyBreakFirstLessLess: 120 +PenaltyBreakString: 1000 +PenaltyExcessCharacter: 1000000 +PenaltyReturnTypeOnItsOwnLine: 60 +PointerAlignment: Left +ReflowComments: true +SortIncludes: false +SortUsingDeclarations: true +SpaceAfterCStyleCast: false +SpaceAfterTemplateKeyword: true +SpaceBeforeAssignmentOperators: true +SpaceBeforeParens: ControlStatements +SpaceInEmptyParentheses: false +SpacesBeforeTrailingComments: 1 +SpacesInAngles: false +SpacesInContainerLiterals: false +SpacesInCStyleCastParentheses: false +SpacesInParentheses: false +SpacesInSquareBrackets: false +Standard: Cpp11 +TabWidth: 4 +UseTab: Never +... + diff --git a/grepWinNP3/grepWinNP3.vcxproj b/grepWinNP3/grepWinNP3.vcxproj index bf7e35fc9..92a79ec53 100644 --- a/grepWinNP3/grepWinNP3.vcxproj +++ b/grepWinNP3/grepWinNP3.vcxproj @@ -276,6 +276,7 @@ + diff --git a/grepWinNP3/grepWinNP3.vcxproj.filters b/grepWinNP3/grepWinNP3.vcxproj.filters index be0bd8b3e..1ee6ad79a 100644 --- a/grepWinNP3/grepWinNP3.vcxproj.filters +++ b/grepWinNP3/grepWinNP3.vcxproj.filters @@ -284,6 +284,9 @@ sktoolslib_mod + + Header Files + diff --git a/grepWinNP3/src/Resources/grepWin.rc b/grepWinNP3/src/Resources/grepWin.rc index 1784d48bee10f941718fb1a689515ddc2097762b..c1785930511eebed69d6b6b7dec3c57f6759e7d9 100644 GIT binary patch literal 18201 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 literal 37328 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 diff --git a/grepWinNP3/src/SearchDlg.cpp b/grepWinNP3/src/SearchDlg.cpp index f2ca66f6c..3553c85e9 100644 --- a/grepWinNP3/src/SearchDlg.cpp +++ b/grepWinNP3/src/SearchDlg.cpp @@ -624,6 +624,7 @@ LRESULT CSearchDlg::DlgFunc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara DialogEnableWindow(IDC_RESULTCONTENT, true); SendDlgItemMessage(*this, IDC_PROGRESS, PBM_SETMARQUEE, 0, 0); ShowWindow(GetDlgItem(*this, IDC_PROGRESS), SW_HIDE); + EnableWindow(GetDlgItem(*this, IDC_SETTINGSBUTTON), TRUE); KillTimer(*this, LABELUPDATETIMER); } break; @@ -787,7 +788,7 @@ LRESULT CSearchDlg::DoCommand(int id, int msg) case IDC_REPLACE: case IDOK: { - if (IsEvaluationThreadRunning()) + if (IsSearchThreadRunning()) { InterlockedExchange(&s_Cancelled, TRUE); SendDlgItemMessage(*this, IDC_PROGRESS, PBM_SETSTATE, PBST_PAUSED, 0); @@ -850,13 +851,14 @@ LRESULT CSearchDlg::DoCommand(int id, int msg) InterlockedExchange(&s_Cancelled, FALSE); InterlockedExchange(&s_NOTSearch, ((GetKeyState(VK_SHIFT) & 0x8000) != 0) ? TRUE : FALSE); ShowWindow(GetDlgItem(*this, IDC_PROGRESS), SW_SHOW); + EnableWindow(GetDlgItem(*this, IDC_SETTINGSBUTTON), FALSE); // now start the thread which does the searching InterlockedExchange(&s_SearchThreadRunning, TRUE); SetDlgItemText(*this, IDOK, TranslatedString(hResource, IDS_STOP).c_str()); DWORD dwThreadId = 0; HANDLE hThread = CreateThread( - nullptr, // no security attribute + nullptr, // no security attribute 0, // default stack size SearchThreadEntry, (LPVOID)this, // thread parameter @@ -873,30 +875,39 @@ LRESULT CSearchDlg::DoCommand(int id, int msg) InterlockedExchange(&s_Cancelled, TRUE); InterlockedExchange(&s_SearchThreadRunning, FALSE); ShowWindow(GetDlgItem(*this, IDC_PROGRESS), SW_HIDE); + EnableWindow(GetDlgItem(*this, IDC_SETTINGSBUTTON), TRUE); } - InterlockedExchange(&s_EvaluationThreadRunning, TRUE); - // now start the thread which does result evaluation - dwThreadId = 0; - hThread = CreateThread( - nullptr, // no security attribute - 0, // default stack size - EvaluationThreadEntry, - (LPVOID)this, // thread parameter - 0, // not suspended - &dwThreadId); // returns thread ID - if (hThread != nullptr) + DWORD const nMax = std::thread::hardware_concurrency() << 2; + DWORD const nOfWorker = bPortable ? g_iniFile.GetLongValue(L"global", L"MaxNumOfWorker", nMax) : + DWORD(CRegStdDWORD(L"Software\\grepWinNP3\\MaxNumOfWorker", nMax)); + + if (nOfWorker > 1) { - // Closing the handle of a running thread just decreases - // the ref count for the thread object. - CloseHandle(hThread); - } - else - { - InterlockedExchange(&s_Cancelled, TRUE); - SendMessage(*this, SEARCH_END, 0, 0); - InterlockedExchange(&s_EvaluationThreadRunning, FALSE); - ShowWindow(GetDlgItem(*this, IDC_PROGRESS), SW_HIDE); + InterlockedExchange(&s_EvaluationThreadRunning, TRUE); + // now start the thread which does result evaluation + dwThreadId = 0; + hThread = CreateThread( + nullptr, // no security attribute + 0, // default stack size + EvaluationThreadEntry, + (LPVOID)this, // thread parameter + 0, // not suspended + &dwThreadId); // returns thread ID + if (hThread != nullptr) + { + // Closing the handle of a running thread just decreases + // the ref count for the thread object. + CloseHandle(hThread); + } + else + { + InterlockedExchange(&s_Cancelled, TRUE); + SendMessage(*this, SEARCH_END, 0, 0); + InterlockedExchange(&s_EvaluationThreadRunning, FALSE); + ShowWindow(GetDlgItem(*this, IDC_PROGRESS), SW_HIDE); + EnableWindow(GetDlgItem(*this, IDC_SETTINGSBUTTON), TRUE); + } } } } @@ -2464,11 +2475,11 @@ DWORD CSearchDlg::SearchThread() std::unique_ptr pathbuf(new TCHAR[MAX_PATH_NEW]); DWORD const nMaxNumOfWorker = std::thread::hardware_concurrency() << 2; - DWORD const nWorker = max(min(bPortable ? g_iniFile.GetLongValue(L"global", L"MaxNumOfWorker", nMaxNumOfWorker >> 1) : - DWORD(CRegStdDWORD(L"Software\\grepWinNP3\\MaxNumOfWorker", nMaxNumOfWorker >> 1)), nMaxNumOfWorker), 1); + DWORD const nOfWorker = max(min(bPortable ? g_iniFile.GetLongValue(L"global", L"MaxNumOfWorker", nMaxNumOfWorker >> 1) : + DWORD(CRegStdDWORD(L"Software\\grepWinNP3\\MaxNumOfWorker", nMaxNumOfWorker >> 1)), nMaxNumOfWorker), 1); s_SearchThreadMap.clear(); - s_SearchThreadMap.set_max_worker(nWorker); + s_SearchThreadMap.set_max_worker(nOfWorker); // split the path string into single paths and // add them to an array @@ -2631,35 +2642,43 @@ DWORD CSearchDlg::SearchThread() sInfoPtr->filesize = fullfilesize; sInfoPtr->modifiedtime = ft; - if ((bSearch && bPattern) || bAlwaysSearch) + SearchFlags_t searchFlags = { + bAlwaysSearch, + m_bUTF8, + m_bIncludeBinary, + m_bUseRegex, + m_bCaseSensitive, + m_bDotMatchesNewline, + m_bCreateBackup, + (DWORD(m_regBackupInFolder) != 0), + m_bReplace + }; + + if (nOfWorker > 1) { - if (m_searchString.empty()) + if ((bSearch && bPattern) || bAlwaysSearch) { - s_SearchThreadMap.insert_ready(sInfoPtr, 1); - } - else - { - SearchFlags_t searchFlags = { - bAlwaysSearch, - m_bUTF8, - m_bIncludeBinary, - m_bUseRegex, - m_bCaseSensitive, - m_bDotMatchesNewline, - m_bCreateBackup, - (DWORD(m_regBackupInFolder) != 0), - m_bReplace - }; + if (m_searchString.empty()) + { + s_SearchThreadMap.insert_ready(sInfoPtr, 1); + } + else + { + std::shared_future foundFuture = std::async(std::launch::async, SearchFile, sInfoPtr, searchRoot, searchFlags, + m_searchString, SearchStringutf16, m_replaceString); - std::shared_future foundFuture = std::async(std::launch::async, SearchFile, sInfoPtr, searchRoot, searchFlags, - m_searchString, SearchStringutf16, m_replaceString); - - s_SearchThreadMap.insert_future(sInfoPtr, foundFuture); + s_SearchThreadMap.insert_future(sInfoPtr, foundFuture); + } } + else + { + s_SearchThreadMap.insert_ready(sInfoPtr, -1); + } } else { - s_SearchThreadMap.insert_ready(sInfoPtr, -1); + int const nFound = SearchFile(sInfoPtr, searchRoot, searchFlags, m_searchString, SearchStringutf16, m_replaceString); + SendMessage(*this, SEARCH_PROGRESS, (WPARAM)sInfoPtr.get(), nFound); } } else // directory: search for filename @@ -2721,8 +2740,19 @@ DWORD CSearchDlg::SearchThread() } // empty searchpath } // pathvector - InterlockedExchange(&s_SearchThreadRunning, FALSE); + if (nOfWorker <= 1) + { + SendMessage(*this, SEARCH_END, 0, 0); + // refresh cursor + POINT pt; + GetCursorPos(&pt); + SetCursorPos(pt.x, pt.y); + + PostMessage(m_hwnd, WM_GREPWIN_THREADEND, 0, 0); + } + + InterlockedExchange(&s_SearchThreadRunning, FALSE); return 0L; } diff --git a/grepWinNP3/src/SearchDlg.h b/grepWinNP3/src/SearchDlg.h index 53ab7d35f..e2551477a 100644 --- a/grepWinNP3/src/SearchDlg.h +++ b/grepWinNP3/src/SearchDlg.h @@ -234,4 +234,4 @@ private: CRegStdDWORD m_regDate2Low; CRegStdDWORD m_regDate2High; CRegStdDWORD m_regShowContent; -}; \ No newline at end of file +}; diff --git a/grepWinNP3/src/last/version.h b/grepWinNP3/src/last/version.h index ae23567af..22c3d72a3 100644 --- a/grepWinNP3/src/last/version.h +++ b/grepWinNP3/src/last/version.h @@ -6,13 +6,13 @@ //#pragma message(__LOC__"Run the NAnt script to get proper version info") -#define FILEVER 2, 1, 0, 4 -#define PRODUCTVER 2, 1, 0, 4 -#define STRFILEVER "2.1.0.4\0" -#define STRPRODUCTVER "2.1.0.4\0" +#define FILEVER 2, 1, 0, 5 +#define PRODUCTVER 2, 1, 0, 5 +#define STRFILEVER "2.1.0.5\0" +#define STRPRODUCTVER "2.1.0.5\0" #define GREPWIN_VERMAJOR 2 #define GREPWIN_VERMINOR 1 #define GREPWIN_VERMICRO 0 -#define GREPWIN_VERBUILD 4 -#define GREPWIN_VERDATE "2020-04-13" +#define GREPWIN_VERBUILD 5 +#define GREPWIN_VERDATE "2020-04-18" diff --git a/grepWinNP3/translations/Afrikaans (Suid-Afrika) [af-ZA].lang b/grepWinNP3/translations/Afrikaans (Suid-Afrika) [af-ZA].lang index 4a82a993c..971c163c6 100644 --- a/grepWinNP3/translations/Afrikaans (Suid-Afrika) [af-ZA].lang +++ b/grepWinNP3/translations/Afrikaans (Suid-Afrika) [af-ZA].lang @@ -421,8 +421,8 @@ msgid "The resulting text after replacing:" msgstr "Resultaat tekst na vervangen:" #. Resource IDs: (1074) -msgid "This adds a new entry to the context menu named \"Open with Editor\"" -msgstr "Dit voegt in het Context menu toe: \"Openen in Editor\"" +msgid "This adds a new entry to the context menu named 'Open with Editor'" +msgstr "Dit voegt in het Context menu toe: 'Openen in Editor'" #. Resource IDs: (1053) msgid "Treat files as UTF-8" @@ -489,8 +489,8 @@ msgid "no text to test with available" msgstr "geen tekst om te testen beschikbaar" #. Resource IDs: (112) -msgid "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h" -msgstr "alleen bestanden die overeenkomen met dit patroon, worden doorzocht.\r\nGebruik ""|"" als scheidingsteken.\r\nVoorbeeld: *.cpp|*.h" +msgid "only files that match this pattern are searched.\nUse '|' as the delimiter.\nExample: *.cpp|*.h" +msgstr "alleen bestanden die overeenkomen met dit patroon, worden doorzocht.\nGebruik '|' als scheidingsteken.\nVoorbeeld: *.cpp|*.h" #. Resource IDs: (129) msgid "read error" @@ -514,12 +514,12 @@ msgid "search string is empty" msgstr "zoekstring is leeg" #. Resource IDs: (114) -msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | symbol.\r\nExample: c:\\temp|d:\\logs" -msgstr "het pad wordt recursief doorzocht.\r\nScheidt de paden met het | symbool.\r\nVoorbeeld: c:\\temp|d:\\logs" +msgid "the path(s) which is searched recursively.\nSeparate paths with the '|' symbol.\nExample: c:\\temp|d:\\logs" +msgstr "het pad wordt recursief doorzocht.\nScheidt de paden met het '|' symbool.\nVoorbeeld: c:\\temp|d:\\logs" #. Resource IDs: (113) -msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." -msgstr "Je kunt mappen uitsluiten, bv. CVS en afbeeldingen.\r\nVoorbeeld: ^(CVS|images)$\r\nOpmerking: '.svn' mappen zijn in Windows normaal verborgen en worden daarom normaal niet doorzocht." +msgid "you can exclude directories, e.g. CVS and images.\nExample: ^(CVS|images)$\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." +msgstr "Je kunt mappen uitsluiten, bv. CVS en afbeeldingen.\nVoorbeeld: ^(CVS|images)$\nOpmerking: '.svn' mappen zijn in Windows normaal verborgen en worden daarom normaal niet doorzocht." #. Resource IDs: (1061) msgid "Reset" diff --git a/grepWinNP3/translations/Deutsch (Deutschland) [de-DE].lang b/grepWinNP3/translations/Deutsch (Deutschland) [de-DE].lang index 0a589b36e..73e1ec5a0 100644 --- a/grepWinNP3/translations/Deutsch (Deutschland) [de-DE].lang +++ b/grepWinNP3/translations/Deutsch (Deutschland) [de-DE].lang @@ -421,8 +421,8 @@ msgid "The resulting text after replacing:" msgstr "Der resultierende Text nach Ersetzung:" #. Resource IDs: (1074) -msgid "This adds a new entry to the context menu named \"Open with Editor\"" -msgstr "Dies fügt dem Kontetxmenü einen neuen Eintrag hinzu, benannt \"Mit Editor öffnen\"." +msgid "This adds a new entry to the context menu named 'Open with Editor'" +msgstr "Dies fügt dem Kontetxmenü einen neuen Eintrag hinzu, benannt 'Mit Editor öffnen'." #. Resource IDs: (1053) msgid "Treat files as UTF-8" @@ -489,8 +489,8 @@ msgid "no text to test with available" msgstr "Kein Text zum Testen mit verfügbar" #. Resource IDs: (112) -msgid "only files that match this pattern are searched.\r\nUse \"|\" as the delimiter.\r\nExample: *.cpp|*.h" -msgstr "Nur Dateien, die diesem Muster entsprechen, werden gesucht.\r\nVerwenden Sie \"|\" als Trennzeichen.\r\nBeispiel: *.cpp|*.h" +msgid "only files that match this pattern are searched.\nUse '|' as the delimiter.\nExample: *.cpp|*.h" +msgstr "Nur Dateien, die diesem Muster entsprechen, werden gesucht.\nVerwenden Sie '|' als Trennzeichen.\nBeispiel: *.cpp|*.h" #. Resource IDs: (129) msgid "read error" @@ -514,12 +514,12 @@ msgid "search string is empty" msgstr "Suchstring ist leer" #. Resource IDs: (114) -msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | symbol.\r\nExample: c:\\temp|d:\\logs" -msgstr "Der Pfad bzw. die Pfade, der bzw. die rekursiv gesucht wird bzw. werden.\r\nSeparieren Sie Pfade mit dem | Symbol.\r\nBeispiel: c:\\temp|d:\\logs" +msgid "the path(s) which is searched recursively.\nSeparate paths with the '|' symbol.\nExample: c:\\temp|d:\\logs" +msgstr "Der Pfad bzw. die Pfade, der bzw. die rekursiv gesucht wird bzw. werden.\nSeparieren Sie Pfade mit dem '|' Symbol.\nBeispiel: c:\\temp|d:\\logs" #. Resource IDs: (113) -msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." -msgstr "Sie können Verzeichnisse ausschließen, z.B. CVS und Images.\r\nBeispiel: ^(CVS|images)$\r\nHinweis´, '.svn'-Ordner sind in Windows 'versteckt', so werden diese üblicherweise nicht gescannt." +msgid "you can exclude directories, e.g. CVS and images.\nExample: ^(CVS|images)$\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." +msgstr "Sie können Verzeichnisse ausschließen, z.B. CVS und Images.\nBeispiel: ^(CVS|images)$\nHinweis´, '.svn'-Ordner sind in Windows 'versteckt', so werden diese üblicherweise nicht gescannt." #. Resource IDs: (1061) msgid "Reset" diff --git a/grepWinNP3/translations/English (United Kingdom) [en-GB].lang b/grepWinNP3/translations/English (United Kingdom) [en-GB].lang index 3bb9e623e..2ed1775a7 100644 --- a/grepWinNP3/translations/English (United Kingdom) [en-GB].lang +++ b/grepWinNP3/translations/English (United Kingdom) [en-GB].lang @@ -421,7 +421,7 @@ msgid "The resulting text after replacing:" msgstr "" #. Resource IDs: (1074) -msgid "This adds a new entry to the context menu named \"Open with Editor\"" +msgid "This adds a new entry to the context menu named 'Open with Editor'" msgstr "" #. Resource IDs: (1053) @@ -489,7 +489,7 @@ msgid "no text to test with available" msgstr "" #. Resource IDs: (112) -msgid "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h" +msgid "only files that match this pattern are searched.\nUse '|' as the delimiter.\nExample: *.cpp|*.h" msgstr "" #. Resource IDs: (129) @@ -514,11 +514,11 @@ msgid "search string is empty" msgstr "" #. Resource IDs: (114) -msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | symbol.\r\nExample: c:\\temp|d:\\logs" +msgid "the path(s) which is searched recursively.\nSeparate paths with the '|' symbol.\nExample: c:\\temp|d:\\logs" msgstr "" #. Resource IDs: (113) -msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." +msgid "you can exclude directories, e.g. CVS and images.\nExample: ^(CVS|images)$\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." msgstr "" #. Resource IDs: (1061) diff --git a/grepWinNP3/translations/English (United States) [en-US].lang b/grepWinNP3/translations/English (United States) [en-US].lang index e6e067317..472a7a9f5 100644 --- a/grepWinNP3/translations/English (United States) [en-US].lang +++ b/grepWinNP3/translations/English (United States) [en-US].lang @@ -421,7 +421,7 @@ msgid "The resulting text after replacing:" msgstr "" #. Resource IDs: (1074) -msgid "This adds a new entry to the context menu named \"Open with Editor\"" +msgid "This adds a new entry to the context menu named 'Open with Editor'" msgstr "" #. Resource IDs: (1053) @@ -489,7 +489,7 @@ msgid "no text to test with available" msgstr "" #. Resource IDs: (112) -msgid "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h" +msgid "only files that match this pattern are searched.\nUse '|' as the delimiter.\nExample: *.cpp|*.h" msgstr "" #. Resource IDs: (129) @@ -514,11 +514,11 @@ msgid "search string is empty" msgstr "" #. Resource IDs: (114) -msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | symbol.\r\nExample: c:\\temp|d:\\logs" +msgid "the path(s) which is searched recursively.\nSeparate paths with the '|' symbol.\nExample: c:\\temp|d:\\logs" msgstr "" #. Resource IDs: (113) -msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." +msgid "you can exclude directories, e.g. CVS and images.\nExample: ^(CVS|images)$\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." msgstr "" #. Resource IDs: (1061) diff --git a/grepWinNP3/translations/Español (España) [es-ES].lang b/grepWinNP3/translations/Español (España) [es-ES].lang index a18db328d..040d203be 100644 --- a/grepWinNP3/translations/Español (España) [es-ES].lang +++ b/grepWinNP3/translations/Español (España) [es-ES].lang @@ -421,8 +421,8 @@ msgid "The resulting text after replacing:" msgstr "El texto resultante después de reemplazar:" #. Resource IDs: (1074) -msgid "This adds a new entry to the context menu named \"Open with Editor\"" -msgstr "Esto agrega una nueva entrada al menú de contexto llamado \"Abrir con Editor\"" +msgid "This adds a new entry to the context menu named 'Open with Editor'" +msgstr "Esto agrega una nueva entrada al menú de contexto llamado 'Abrir con Editor'" #. Resource IDs: (1053) msgid "Treat files as UTF-8" @@ -489,8 +489,8 @@ msgid "no text to test with available" msgstr "no hay texto disponible para probar" #. Resource IDs: (112) -msgid "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h" -msgstr "solo archivos que coincidan con el patrón son utilizados.\r\nUsar ""|"" como delimitador.\r\nEjemplo: *.cpp|*.h" +msgid "only files that match this pattern are searched.\nUse '|' as the delimiter.\nExample: *.cpp|*.h" +msgstr "solo archivos que coincidan con el patrón son utilizados.\nUsar '|' como delimitador.\nEjemplo: *.cpp|*.h" #. Resource IDs: (129) msgid "read error" @@ -514,12 +514,12 @@ msgid "search string is empty" msgstr "El motivo de búsqueda está vacío" #. Resource IDs: (114) -msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | symbol.\r\nExample: c:\\temp|d:\\logs" -msgstr "la(s) ruta(s) que se busca(n) recursivamente.\r\nSepare rutas con el símbolo |.\r\nEjemplo: c:\\temp|d:\\logs" +msgid "the path(s) which is searched recursively.\nSeparate paths with the '|' symbol.\nExample: c:\\temp|d:\\logs" +msgstr "la(s) ruta(s) que se busca(n) recursivamente.\nSepare rutas con el símbolo |.\nEjemplo: c:\\temp|d:\\logs" #. Resource IDs: (113) -msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." -msgstr "puede excluir directorios, ej. CVS e imagenes.\r\nEjemplo: ^(CVS|imagenes)$\r\nNota, carpetas '.svn' están 'ocultas' en Windows, por lo que usualmente no son analizadas." +msgid "you can exclude directories, e.g. CVS and images.\nExample: ^(CVS|images)$\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." +msgstr "puede excluir directorios, ej. CVS e imagenes.\nEjemplo: ^(CVS|imagenes)$\nNota, carpetas '.svn' están 'ocultas' en Windows, por lo que usualmente no son analizadas." #. Resource IDs: (1061) msgid "Reset" diff --git a/grepWinNP3/translations/Français (France) [fr-FR].lang b/grepWinNP3/translations/Français (France) [fr-FR].lang index 63a654526..1d3f41a85 100644 --- a/grepWinNP3/translations/Français (France) [fr-FR].lang +++ b/grepWinNP3/translations/Français (France) [fr-FR].lang @@ -421,8 +421,8 @@ msgid "The resulting text after replacing:" msgstr "Texte après remplacement:" #. Resource IDs: (1074) -msgid "This adds a new entry to the context menu named \"Open with Editor\"" -msgstr "Ceci ajoute au menu contextuel une entrée nommée \"Ouvrir dans l'éditeur\"" +msgid "This adds a new entry to the context menu named 'Open with Editor'" +msgstr "Ceci ajoute au menu contextuel une entrée nommée 'Ouvrir dans l'éditeur'" #. Resource IDs: (1053) msgid "Treat files as UTF-8" @@ -489,8 +489,8 @@ msgid "no text to test with available" msgstr "Aucun texte à tester n'est disponible." #. Resource IDs: (112) -msgid "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h" -msgstr "seuls les fichiers correspondant à ce modèle sont recherchés.\r\nUtiliser ""|"" comme séparateur\r\nExemple: *.cpp|*.h" +msgid "only files that match this pattern are searched.\nUse '|' as the delimiter.\nExample: *.cpp|*.h" +msgstr "seuls les fichiers correspondant à ce modèle sont recherchés.\nUtiliser '|' comme séparateur\nExemple: *.cpp|*.h" #. Resource IDs: (129) msgid "read error" @@ -514,12 +514,12 @@ msgid "search string is empty" msgstr "Le motif de recherche est vide." #. Resource IDs: (114) -msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | symbol.\r\nExample: c:\\temp|d:\\logs" -msgstr "Chemin(s) de recherche récursive.\r\n'|' pour ajouter un chemin.\r\nExemple: c:\\temp|d:\\logs" +msgid "the path(s) which is searched recursively.\nSeparate paths with the '|' symbol.\nExample: c:\\temp|d:\\logs" +msgstr "Chemin(s) de recherche récursive.\n'|' pour ajouter un chemin.\nExemple: c:\\temp|d:\\logs" #. Resource IDs: (113) -msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." -msgstr "Il est possible d'exclure des dossiers. Exemple: ^(CVS|images)$ pour exclure CVS et images.\r\nLes dossiers '.svn' sont 'cachés' sous Windows et ne sont normalement pas parcourus." +msgid "you can exclude directories, e.g. CVS and images.\nExample: ^(CVS|images)$\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." +msgstr "Il est possible d'exclure des dossiers. Exemple: ^(CVS|images)$ pour exclure CVS et images.\nLes dossiers '.svn' sont 'cachés' sous Windows et ne sont normalement pas parcourus." #. Resource IDs: (158) msgid "Ext" diff --git a/grepWinNP3/translations/Italiano (Italia) [it-IT].lang b/grepWinNP3/translations/Italiano (Italia) [it-IT].lang index cce5afb52..a5629d860 100644 --- a/grepWinNP3/translations/Italiano (Italia) [it-IT].lang +++ b/grepWinNP3/translations/Italiano (Italia) [it-IT].lang @@ -421,8 +421,8 @@ msgid "The resulting text after replacing:" msgstr "Il testo risultante dopo la sostituzione:" #. Resource IDs: (1074) -msgid "This adds a new entry to the context menu named \"Open with Editor\"" -msgstr "Questo aggiunge una nuova voce al menu contestuale denominato \"Apri con l'Editor\"" +msgid "This adds a new entry to the context menu named 'Open with Editor'" +msgstr "Questo aggiunge una nuova voce al menu contestuale denominato 'Apri con l'Editor'" #. Resource IDs: (1053) msgid "Treat files as UTF-8" @@ -466,7 +466,7 @@ msgstr "Impostazioni grepWinNP3" #. Resource IDs: (157) msgid "hold down the shift key to find files that DO NOT contain the search string" -msgstr "tieni premuto il tasto \"Maiusc\" per trovare i file che NON contengono la stringa di ricerca" +msgstr "tieni premuto il tasto 'Maiusc' per trovare i file che NON contengono la stringa di ricerca" #. Resource IDs: (132) msgid "invalid regex!" @@ -489,8 +489,8 @@ msgid "no text to test with available" msgstr "nessun testo disponibile da provare" #. Resource IDs: (112) -msgid "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h" -msgstr "vengono cercati solo i file che corrispondono a questo modello.\r\nUsa ""|"" come delimitatore.\r\nEsempio: *.cpp|*.h" +msgid "only files that match this pattern are searched.\nUse '|' as the delimiter.\nExample: *.cpp|*.h" +msgstr "vengono cercati solo i file che corrispondono a questo modello.\nUsa '|' come delimitatore.\nEsempio: *.cpp|*.h" #. Resource IDs: (129) msgid "read error" @@ -514,12 +514,12 @@ msgid "search string is empty" msgstr "la stringa di ricerca è vuota" #. Resource IDs: (114) -msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | symbol.\r\nExample: c:\\temp|d:\\logs" -msgstr "il percorso(i) che viene cercato in modo ricorsivo.\r\nSeparare i percorsi con il | simbolo.\r\nEsempio: c:\\temp|d:\\logs" +msgid "the path(s) which is searched recursively.\nSeparate paths with the '|' symbol.\nExample: c:\\temp|d:\\logs" +msgstr "il percorso(i) che viene cercato in modo ricorsivo.\nSeparare i percorsi con il'|'simbolo.\nEsempio: c:\\temp|d:\\logs" #. Resource IDs: (113) -msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." -msgstr "puoi escludere le cartelle, ad es. CVS e immagini.\r\nEsempio: ^(CVS|immagini)$\r\nNota, le cartelle '.svn' sono 'nascoste' su Windows, quindi di solito non vengono scansionate." +msgid "you can exclude directories, e.g. CVS and images.\nExample: ^(CVS|images)$\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." +msgstr "puoi escludere le cartelle, ad es. CVS e immagini.\nEsempio: ^(CVS|immagini)$\nNota, le cartelle '.svn' sono 'nascoste' su Windows, quindi di solito non vengono scansionate." #. Resource IDs: (1061) msgid "Reset" diff --git a/grepWinNP3/translations/Magyar (Magyarország) [hu-HU].lang b/grepWinNP3/translations/Magyar (Magyarország) [hu-HU].lang index 355d99e3b..78c745ca7 100644 --- a/grepWinNP3/translations/Magyar (Magyarország) [hu-HU].lang +++ b/grepWinNP3/translations/Magyar (Magyarország) [hu-HU].lang @@ -421,7 +421,7 @@ msgid "The resulting text after replacing:" msgstr "" #. Resource IDs: (1074) -msgid "This adds a new entry to the context menu named \"Open with Editor\"" +msgid "This adds a new entry to the context menu named 'Open with Editor'" msgstr "" #. Resource IDs: (1053) @@ -489,7 +489,7 @@ msgid "no text to test with available" msgstr "" #. Resource IDs: (112) -msgid "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h" +msgid "only files that match this pattern are searched.\nUse '|' as the delimiter.\nExample: *.cpp|*.h" msgstr "" #. Resource IDs: (129) @@ -514,11 +514,11 @@ msgid "search string is empty" msgstr "" #. Resource IDs: (114) -msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | symbol.\r\nExample: c:\\temp|d:\\logs" +msgid "the path(s) which is searched recursively.\nSeparate paths with the '|' symbol.\nExample: c:\\temp|d:\\logs" msgstr "" #. Resource IDs: (113) -msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." +msgid "you can exclude directories, e.g. CVS and images.\nExample: ^(CVS|images)$\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." msgstr "" #. Resource IDs: (1061) diff --git a/grepWinNP3/translations/Nederlands (Nederland) [nl-NL].lang b/grepWinNP3/translations/Nederlands (Nederland) [nl-NL].lang index b074179c6..d4a91fc3d 100644 --- a/grepWinNP3/translations/Nederlands (Nederland) [nl-NL].lang +++ b/grepWinNP3/translations/Nederlands (Nederland) [nl-NL].lang @@ -421,8 +421,8 @@ msgid "The resulting text after replacing:" msgstr "Resultaat tekst na vervangen:" #. Resource IDs: (1074) -msgid "This adds a new entry to the context menu named \"Open with Editor\"" -msgstr "Dit voegt in het Context menu toe: \"Openen in Editor\"" +msgid "This adds a new entry to the context menu named 'Open with Editor'" +msgstr "Dit voegt in het Context menu toe: 'Openen in Editor'" #. Resource IDs: (1053) msgid "Treat files as UTF-8" @@ -489,8 +489,8 @@ msgid "no text to test with available" msgstr "geen tekst om te testen beschikbaar" #. Resource IDs: (112) -msgid "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h" -msgstr "alleen bestanden die overeenkomen met dit patroon, worden doorzocht.\r\nGebruik ""|"" als scheidingsteken.\r\nVoorbeeld: *.cpp|*.h" +msgid "only files that match this pattern are searched.\nUse '|' as the delimiter.\nExample: *.cpp|*.h" +msgstr "alleen bestanden die overeenkomen met dit patroon, worden doorzocht.\nGebruik '|' als scheidingsteken.\nVoorbeeld: *.cpp|*.h" #. Resource IDs: (129) msgid "read error" @@ -514,12 +514,12 @@ msgid "search string is empty" msgstr "zoekstring is leeg" #. Resource IDs: (114) -msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | symbol.\r\nExample: c:\\temp|d:\\logs" -msgstr "het pad wordt recursief doorzocht.\r\nScheidt de paden met het | symbool.\r\nVoorbeeld: c:\\temp|d:\\logs" +msgid "the path(s) which is searched recursively.\nSeparate paths with the '|' symbol.\nExample: c:\\temp|d:\\logs" +msgstr "het pad wordt recursief doorzocht.\nScheidt de paden met het'|'symbool.\nVoorbeeld: c:\\temp|d:\\logs" #. Resource IDs: (113) -msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." -msgstr "Je kunt mappen uitsluiten, bv. CVS en afbeeldingen.\r\nVoorbeeld: ^(CVS|images)$\r\nOpmerking: '.svn' mappen zijn in Windows normaal verborgen en worden daarom normaal niet doorzocht." +msgid "you can exclude directories, e.g. CVS and images.\nExample: ^(CVS|images)$\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." +msgstr "Je kunt mappen uitsluiten, bv. CVS en afbeeldingen.\nVoorbeeld: ^(CVS|images)$\nOpmerking: '.svn' mappen zijn in Windows normaal verborgen en worden daarom normaal niet doorzocht." #. Resource IDs: (1061) msgid "Reset" diff --git a/grepWinNP3/translations/Polski (Polska)Polski [pl-PL].lang b/grepWinNP3/translations/Polski (Polska)Polski [pl-PL].lang index 5f287f9f9..6ca910c86 100644 --- a/grepWinNP3/translations/Polski (Polska)Polski [pl-PL].lang +++ b/grepWinNP3/translations/Polski (Polska)Polski [pl-PL].lang @@ -421,8 +421,8 @@ msgid "The resulting text after replacing:" msgstr "Tekst wynikowy po zamianie:" #. Resource IDs: (1074) -msgid "This adds a new entry to the context menu named \"Open with Editor\"" -msgstr "Spowoduje to dodanie nowego wpisu do menu kontekstowego o nazwie \"Otwórz za pomocą edytora"" +msgid "This adds a new entry to the context menu named 'Open with Editor'" +msgstr "Spowoduje to dodanie nowego wpisu do menu kontekstowego o nazwie 'Otwórz za pomocą edytora"" #. Resource IDs: (1053) msgid "Treat files as UTF-8" @@ -489,8 +489,8 @@ msgid "no text to test with available" msgstr "brak tekstu do przetestowania z dostępnymi" #. Resource IDs: (112) -msgid "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h" -msgstr "Wyszukiwane są tylko pliki odpowiadające temu wzorcowi.\r\nJako separatora użyj ""|"" \r\nPrzykład: *.cpp|*." +msgid "only files that match this pattern are searched.\nUse '|' as the delimiter.\nExample: *.cpp|*.h" +msgstr "Wyszukiwane są tylko pliki odpowiadające temu wzorcowi.\nJako separatora użyj '|' \nPrzykład: *.cpp|*." #. Resource IDs: (129) msgid "read error" @@ -514,12 +514,12 @@ msgid "search string is empty" msgstr "Ciąg wyszukiwania jest pusty" #. Resource IDs: (114) -msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | symbol.\r\nExample: c:\\temp|d:\\logs" -msgstr "Ścieżka(-i), która(-e) jest(są) przeszukiwana(-e) regularnie.\r\nOddziel ścieżki za pomocą symbolu (pipe): | \r\nPrzykład: c:\\temp|d:\\logs" +msgid "the path(s) which is searched recursively.\nSeparate paths with the '|' symbol.\nExample: c:\\temp|d:\\logs" +msgstr "Ścieżka(-i), która(-e) jest(są) przeszukiwana(-e) regularnie.\nOddziel ścieżki za pomocą symbolu (pipe):'|'\nPrzykład: c:\\temp|d:\\logs" #. Resource IDs: (113) -msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." -msgstr "Można wykluczyć katalogi, np. CVS i obrazy.\r\nPrzykład: ^(CVS|obrazy)$\r\nUwaga, foldery '.svn' są ukryte w Windows, więc zwykle nie są one skanowane." +msgid "you can exclude directories, e.g. CVS and images.\nExample: ^(CVS|images)$\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." +msgstr "Można wykluczyć katalogi, np. CVS i obrazy.\nPrzykład: ^(CVS|obrazy)$\nUwaga, foldery '.svn' są ukryte w Windows, więc zwykle nie są one skanowane." #. Resource IDs: (1061) msgid "Reset" diff --git a/grepWinNP3/translations/Português (Brasil) [pt-BR].lang b/grepWinNP3/translations/Português (Brasil) [pt-BR].lang index 8f84f13b8..72aab9352 100644 --- a/grepWinNP3/translations/Português (Brasil) [pt-BR].lang +++ b/grepWinNP3/translations/Português (Brasil) [pt-BR].lang @@ -421,8 +421,8 @@ msgid "The resulting text after replacing:" msgstr "O resultado do texto após substituição:" #. Resource IDs: (1074) -msgid "This adds a new entry to the context menu named \"Open with Editor\"" -msgstr "Isso adiciona uma nova entrada para o menu de contexto, chamada: \"Abrir com o Editor\"" +msgid "This adds a new entry to the context menu named 'Open with Editor'" +msgstr "Isso adiciona uma nova entrada para o menu de contexto, chamada: 'Abrir com o Editor'" #. Resource IDs: (1053) msgid "Treat files as UTF-8" @@ -489,8 +489,8 @@ msgid "no text to test with available" msgstr "nenhum texto para testar disponível" #. Resource IDs: (112) -msgid "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h" -msgstr "Somente os arquivos correspondentes a esse padrão serão procurados.\r\nUse ""|"" como delimitador.\r\nExemplo: *.cpp|*.h" +msgid "only files that match this pattern are searched.\nUse '|' as the delimiter.\nExample: *.cpp|*.h" +msgstr "Somente os arquivos correspondentes a esse padrão serão procurados.\nUse '|' como delimitador.\nExemplo: *.cpp|*.h" #. Resource IDs: (129) msgid "read error" @@ -514,12 +514,12 @@ msgid "search string is empty" msgstr "Sequência de pesquisa está vazia" #. Resource IDs: (114) -msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | symbol.\r\nExample: c:\\temp|d:\\logs" -msgstr "O caminhos serão pesquisados recursivamente.\r\nSepare os caminhos com o | símbolo.\r\nExemplo: c:\\temp|d:\\logs" +msgid "the path(s) which is searched recursively.\nSeparate paths with the '|' symbol.\nExample: c:\\temp|d:\\logs" +msgstr "O caminhos serão pesquisados recursivamente.\nSepare os caminhos com o'|'símbolo.\nExemplo: c:\\temp|d:\\logs" #. Resource IDs: (113) -msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." -msgstr "Você pode excluir diretórios, ex. CVS e images.\r\nExemplo: ^(CVS|images)$\r\nNote, '.svn' pastas 'ocultas' no Windows, geralmente não são escaneadas." +msgid "you can exclude directories, e.g. CVS and images.\nExample: ^(CVS|images)$\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." +msgstr "Você pode excluir diretórios, ex. CVS e images.\nExemplo: ^(CVS|images)$\nNote, '.svn' pastas 'ocultas' no Windows, geralmente não são escaneadas." #. Resource IDs: (1061) msgid "Reset" diff --git a/grepWinNP3/translations/Slovenčina (Slovensko) [sk-SK].lang b/grepWinNP3/translations/Slovenčina (Slovensko) [sk-SK].lang index 4352d748e..d9a1d3f06 100644 --- a/grepWinNP3/translations/Slovenčina (Slovensko) [sk-SK].lang +++ b/grepWinNP3/translations/Slovenčina (Slovensko) [sk-SK].lang @@ -421,7 +421,7 @@ msgid "The resulting text after replacing:" msgstr "" #. Resource IDs: (1074) -msgid "This adds a new entry to the context menu named \"Open with Editor\"" +msgid "This adds a new entry to the context menu named 'Open with Editor'" msgstr "" #. Resource IDs: (1053) @@ -489,7 +489,7 @@ msgid "no text to test with available" msgstr "" #. Resource IDs: (112) -msgid "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h" +msgid "only files that match this pattern are searched.\nUse '|' as the delimiter.\nExample: *.cpp|*.h" msgstr "" #. Resource IDs: (129) @@ -514,11 +514,11 @@ msgid "search string is empty" msgstr "" #. Resource IDs: (114) -msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | symbol.\r\nExample: c:\\temp|d:\\logs" +msgid "the path(s) which is searched recursively.\nSeparate paths with the '|' symbol.\nExample: c:\\temp|d:\\logs" msgstr "" #. Resource IDs: (113) -msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." +msgid "you can exclude directories, e.g. CVS and images.\nExample: ^(CVS|images)$\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." msgstr "" #. Resource IDs: (1061) diff --git a/grepWinNP3/translations/Svenska (Sverige) [sv-SE].lang b/grepWinNP3/translations/Svenska (Sverige) [sv-SE].lang index 8e50ebcb4..ce9b01629 100644 --- a/grepWinNP3/translations/Svenska (Sverige) [sv-SE].lang +++ b/grepWinNP3/translations/Svenska (Sverige) [sv-SE].lang @@ -421,7 +421,7 @@ msgid "The resulting text after replacing:" msgstr "" #. Resource IDs: (1074) -msgid "This adds a new entry to the context menu named \"Open with Editor\"" +msgid "This adds a new entry to the context menu named 'Open with Editor'" msgstr "" #. Resource IDs: (1053) @@ -489,7 +489,7 @@ msgid "no text to test with available" msgstr "" #. Resource IDs: (112) -msgid "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h" +msgid "only files that match this pattern are searched.\nUse '|' as the delimiter.\nExample: *.cpp|*.h" msgstr "" #. Resource IDs: (129) @@ -514,11 +514,11 @@ msgid "search string is empty" msgstr "" #. Resource IDs: (114) -msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | symbol.\r\nExample: c:\\temp|d:\\logs" +msgid "the path(s) which is searched recursively.\nSeparate paths with the '|' symbol.\nExample: c:\\temp|d:\\logs" msgstr "" #. Resource IDs: (113) -msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." +msgid "you can exclude directories, e.g. CVS and images.\nExample: ^(CVS|images)$\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." msgstr "" #. Resource IDs: (1061) diff --git a/grepWinNP3/translations/Türkçe (Türkiye) [tr-TR].lang b/grepWinNP3/translations/Türkçe (Türkiye) [tr-TR].lang index a5cc7dd92..b341f2d25 100644 --- a/grepWinNP3/translations/Türkçe (Türkiye) [tr-TR].lang +++ b/grepWinNP3/translations/Türkçe (Türkiye) [tr-TR].lang @@ -421,7 +421,7 @@ msgid "The resulting text after replacing:" msgstr "Değiştirdikten sonra ortaya çıkan metin:" #. Resource IDs: (1074) -msgid "This adds a new entry to the context menu named \"Open with Editor\"" +msgid "This adds a new entry to the context menu named 'Open with Editor'" msgstr ""Editörle Aç" içerik menüsüne yeni bir giriş ekler." #. Resource IDs: (1053) @@ -489,8 +489,8 @@ msgid "no text to test with available" msgstr "test edilecek metin yok" #. Resource IDs: (112) -msgid "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h" -msgstr "yalnızca bu şablonla eşleşen dosyalar aranır.\r\nSınırlayıcı olarak ""|"" kullanın.\r\nÖrnek: *.cpp|*.h" +msgid "only files that match this pattern are searched.\nUse '|' as the delimiter.\nExample: *.cpp|*.h" +msgstr "yalnızca bu şablonla eşleşen dosyalar aranır.\nSınırlayıcı olarak '|' kullanın.\nÖrnek: *.cpp|*.h" #. Resource IDs: (129) msgid "read error" @@ -514,12 +514,12 @@ msgid "search string is empty" msgstr "arama dizesi boş!" #. Resource IDs: (114) -msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | symbol.\r\nExample: c:\\temp|d:\\logs" -msgstr "özyinelemede aranan yollar.\r\n| sembolü ile ayrı yollar.\r\nÖrnek: c:\\temp|d:\\logs" +msgid "the path(s) which is searched recursively.\nSeparate paths with the '|' symbol.\nExample: c:\\temp|d:\\logs" +msgstr "özyinelemede aranan yollar.\n| sembolü ile ayrı yollar.\nÖrnek: c:\\temp|d:\\logs" #. Resource IDs: (113) -msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." -msgstr "dizinleri hariç tutabilirsiniz, ör. CVS ve Resimler.\r\nÖrnek: ^(CVS|images)$\r\nNot: '.svn' klasörlerinin Windows\'ta 'gizli' olduğuna dikkat edin, bu nedenle genellikle taranmazlar." +msgid "you can exclude directories, e.g. CVS and images.\nExample: ^(CVS|images)$\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." +msgstr "dizinleri hariç tutabilirsiniz, ör. CVS ve Resimler.\nÖrnek: ^(CVS|images)$\nNot: '.svn' klasörlerinin Windows\'ta 'gizli' olduğuna dikkat edin, bu nedenle genellikle taranmazlar." #. Resource IDs: (1061) msgid "Reset" diff --git a/grepWinNP3/translations/Беларуская (Беларусь) [be-BY].lang b/grepWinNP3/translations/Беларуская (Беларусь) [be-BY].lang index a121f8077..c32311ffe 100644 --- a/grepWinNP3/translations/Беларуская (Беларусь) [be-BY].lang +++ b/grepWinNP3/translations/Беларуская (Беларусь) [be-BY].lang @@ -421,7 +421,7 @@ msgid "The resulting text after replacing:" msgstr "Полученный текст после замены:" #. Resource IDs: (1074) -msgid "This adds a new entry to the context menu named \"Open with Editor\"" +msgid "This adds a new entry to the context menu named 'Open with Editor'" msgstr "Добавить пункт в контекстное меню 'Открыть в редакторе'" #. Resource IDs: (1053) @@ -489,8 +489,8 @@ msgid "no text to test with available" msgstr "Тестировать нечего" #. Resource IDs: (112) -msgid "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h" -msgstr "Поиск файлов, только соответствующих шаблону.\r\nЧерта '|' как разделитель.\r\nПример: *.cpp|*.h" +msgid "only files that match this pattern are searched.\nUse '|' as the delimiter.\nExample: *.cpp|*.h" +msgstr "Поиск файлов, только соответствующих шаблону.\nЧерта '|' как разделитель.\nПример: *.cpp|*.h" #. Resource IDs: (129) msgid "read error" @@ -514,12 +514,12 @@ msgid "search string is empty" msgstr "Строка поиска пуста" #. Resource IDs: (114) -msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | symbol.\r\nExample: c:\\temp|d:\\logs" -msgstr "Рекурсивный поиск путей.\r\nРазделение путей знаком |.\r\nПример: c:\\temp|d:\\logs" +msgid "the path(s) which is searched recursively.\nSeparate paths with the '|' symbol.\nExample: c:\\temp|d:\\logs" +msgstr "Рекурсивный поиск путей.\nРазделение путей знаком |.\nПример: c:\\temp|d:\\logs" #. Resource IDs: (113) -msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." -msgstr "Вы можете исключить, например, CVS и изображения.\r\nПример: ^(CVS|images)$\r\nВнимание: папки '.svn', как правило, скрыты в Windows, поэтому они обычно не сканируются." +msgid "you can exclude directories, e.g. CVS and images.\nExample: ^(CVS|images)$\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." +msgstr "Вы можете исключить, например, CVS и изображения.\nПример: ^(CVS|images)$\nВнимание: папки '.svn', как правило, скрыты в Windows, поэтому они обычно не сканируются." #. Resource IDs: (1061) msgid "Reset" diff --git a/grepWinNP3/translations/Русский (Pоссия) [ru-RU].lang b/grepWinNP3/translations/Русский (Pоссия) [ru-RU].lang index 9e6adab0e..091241fea 100644 --- a/grepWinNP3/translations/Русский (Pоссия) [ru-RU].lang +++ b/grepWinNP3/translations/Русский (Pоссия) [ru-RU].lang @@ -421,7 +421,7 @@ msgid "The resulting text after replacing:" msgstr "Полученный текст после замены:" #. Resource IDs: (1074) -msgid "This adds a new entry to the context menu named \"Open with Editor\"" +msgid "This adds a new entry to the context menu named 'Open with Editor'" msgstr "Добавить пункт в контекстное меню 'Открыть в редакторе'" #. Resource IDs: (1053) @@ -489,8 +489,8 @@ msgid "no text to test with available" msgstr "Тестировать нечего" #. Resource IDs: (112) -msgid "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h" -msgstr "Поиск файлов, только соответствующих шаблону.\r\nЧерта '|' как разделитель.\r\nПример: *.cpp|*.h" +msgid "only files that match this pattern are searched.\nUse '|' as the delimiter.\nExample: *.cpp|*.h" +msgstr "Поиск файлов, только соответствующих шаблону.\nЧерта '|' как разделитель.\nПример: *.cpp|*.h" #. Resource IDs: (129) msgid "read error" @@ -514,12 +514,12 @@ msgid "search string is empty" msgstr "Строка поиска пуста" #. Resource IDs: (114) -msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | symbol.\r\nExample: c:\\temp|d:\\logs" -msgstr "Рекурсивный поиск путей.\r\nРазделение путей знаком |.\r\nПример: c:\\temp|d:\\logs" +msgid "the path(s) which is searched recursively.\nSeparate paths with the '|' symbol.\nExample: c:\\temp|d:\\logs" +msgstr "Рекурсивный поиск путей.\nРазделение путей знаком |.\nПример: c:\\temp|d:\\logs" #. Resource IDs: (113) -msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." -msgstr "Вы можете исключить, например, CVS и изображения.\r\nПример: ^(CVS|images)$\r\nВнимание: папки '.svn', как правило, скрыты в Windows, поэтому они обычно не сканируются." +msgid "you can exclude directories, e.g. CVS and images.\nExample: ^(CVS|images)$\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." +msgstr "Вы можете исключить, например, CVS и изображения.\nПример: ^(CVS|images)$\nВнимание: папки '.svn', как правило, скрыты в Windows, поэтому они обычно не сканируются." #. Resource IDs: (1061) msgid "Reset" diff --git a/grepWinNP3/translations/日本語 （日本） [ja-JP].lang b/grepWinNP3/translations/日本語 （日本） [ja-JP].lang index fbeb65b9f..2d0150f0f 100644 --- a/grepWinNP3/translations/日本語 （日本） [ja-JP].lang +++ b/grepWinNP3/translations/日本語 （日本） [ja-JP].lang @@ -188,7 +188,7 @@ msgstr "" #. Resource IDs: (1039) msgid "File Names match:\nuse '|' to separate multiple text match patterns, prepen&d '-' to exclude" -msgstr "ファイル名の一致:\n\"|\" で複数のテキスト一致パターンを区切る場合は \"-\" を除外してください" +msgstr "ファイル名の一致:\n'|' で複数のテキスト一致パターンを区切る場合は '-' を除外してください" #. Resource IDs: (1059) msgid "Files" @@ -421,8 +421,8 @@ msgid "The resulting text after replacing:" msgstr "置換後のテキスト:" #. Resource IDs: (1074) -msgid "This adds a new entry to the context menu named \"Open with Editor\"" -msgstr "コンテキストメニュー項目に新規エントリを追加 - \"エディタで開く\"" +msgid "This adds a new entry to the context menu named 'Open with Editor'" +msgstr "コンテキストメニュー項目に新規エントリを追加 - 'エディタで開く'" #. Resource IDs: (1053) msgid "Treat files as UTF-8" @@ -489,8 +489,8 @@ msgid "no text to test with available" msgstr "テストするテキストが存在しません" #. Resource IDs: (112) -msgid "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h" -msgstr "このパターンに一致するファイルのみ検索.\r\n区切り記号として ""|"" を使用します.\r\n指定例: *.cpp|*.h" +msgid "only files that match this pattern are searched.\nUse '|' as the delimiter.\nExample: *.cpp|*.h" +msgstr "このパターンに一致するファイルのみ検索.\n区切り記号として '|' を使用します.\n指定例: *.cpp|*.h" #. Resource IDs: (129) msgid "read error" @@ -514,12 +514,12 @@ msgid "search string is empty" msgstr "検索文字列が空白です" #. Resource IDs: (114) -msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | symbol.\r\nExample: c:\\temp|d:\\logs" -msgstr "現在のパスは再帰的に検索されます.\r\nパスは | で区切ることができます.\r\n指定例: c:\\temp|d:\\logs" +msgid "the path(s) which is searched recursively.\nSeparate paths with the '|' symbol.\nExample: c:\\temp|d:\\logs" +msgstr "現在のパスは再帰的に検索されます.\nパスは'|'で区切ることができます.\n指定例: c:\\temp|d:\\logs" #. Resource IDs: (113) -msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." -msgstr "特定のディレクトリを除外できます。指定例: CVS および images.\r\n指定例: ^(CVS|images)$\r\n注意, '.svn' フォルダは通常の Windows では非表示のため、通常はスキャンの対象外になります.." +msgid "you can exclude directories, e.g. CVS and images.\nExample: ^(CVS|images)$\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." +msgstr "特定のディレクトリを除外できます。指定例: CVS および images.\n指定例: ^(CVS|images)$\n注意, '.svn' フォルダは通常の Windows では非表示のため、通常はスキャンの対象外になります.." #. Resource IDs: (1061) msgid "Reset" diff --git a/grepWinNP3/translations/简体中文 （中国） [zh-CN].lang b/grepWinNP3/translations/简体中文 （中国） [zh-CN].lang index 9452132f0..4c9f31ba7 100644 --- a/grepWinNP3/translations/简体中文 （中国） [zh-CN].lang +++ b/grepWinNP3/translations/简体中文 （中国） [zh-CN].lang @@ -257,7 +257,7 @@ msgstr "晚于" #. Resource IDs: (115) msgid "Newline is matched by '.'" -msgstr "新行匹配 \".\" 号" +msgstr "新行匹配 '.' 号" #. Resource IDs: (1) msgid "OK" @@ -421,8 +421,8 @@ msgid "The resulting text after replacing:" msgstr "替换后的结果文本:" #. Resource IDs: (1074) -msgid "This adds a new entry to the context menu named \"Open with Editor\"" -msgstr "这将在上下文菜单中添加一个名为\"使用编辑器打开\"的条目." +msgid "This adds a new entry to the context menu named 'Open with Editor'" +msgstr "这将在上下文菜单中添加一个名为'使用编辑器打开'的条目." #. Resource IDs: (1053) msgid "Treat files as UTF-8" @@ -489,8 +489,8 @@ msgid "no text to test with available" msgstr "没有要测试的文本" #. Resource IDs: (112) -msgid "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h" -msgstr "仅匹配此样式的文件被搜索.\r\n使用 ""|"" 作为分隔符.\r\n例如: *.cpp|*.h" +msgid "only files that match this pattern are searched.\nUse '|' as the delimiter.\nExample: *.cpp|*.h" +msgstr "仅匹配此样式的文件被搜索.\n使用 '|' 作为分隔符.\n例如: *.cpp|*.h" #. Resource IDs: (129) msgid "read error" @@ -514,12 +514,12 @@ msgid "search string is empty" msgstr "搜索字符串为空" #. Resource IDs: (114) -msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | symbol.\r\nExample: c:\\temp|d:\\logs" -msgstr "将被递归搜索的路径.\r\n使用 | 符号来分隔路径.\r\n比如: c:\\temp|d:\\logs" +msgid "the path(s) which is searched recursively.\nSeparate paths with the '|' symbol.\nExample: c:\\temp|d:\\logs" +msgstr "将被递归搜索的路径.\n使用'|'符号来分隔路径.\n比如: c:\\temp|d:\\logs" #. Resource IDs: (113) -msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." -msgstr "你可以排除目录, 比如: CVS 和 images.\r\n例如: ^(CVS|images)$\r\n注意, '.svn' 目录在Windows中是隐藏的, 所以通常不扫描它们." +msgid "you can exclude directories, e.g. CVS and images.\nExample: ^(CVS|images)$\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." +msgstr "你可以排除目录, 比如: CVS 和 images.\n例如: ^(CVS|images)$\n注意, '.svn' 目录在Windows中是隐藏的, 所以通常不扫描它们." #. Resource IDs: (1061) msgid "Reset" diff --git a/grepWinNP3/translations/한국어 (대한민국) [ko-KR].lang b/grepWinNP3/translations/한국어 (대한민국) [ko-KR].lang index 029759ac4..8fe9f4ac0 100644 --- a/grepWinNP3/translations/한국어 (대한민국) [ko-KR].lang +++ b/grepWinNP3/translations/한국어 (대한민국) [ko-KR].lang @@ -421,7 +421,7 @@ msgid "The resulting text after replacing:" msgstr "" #. Resource IDs: (1074) -msgid "This adds a new entry to the context menu named \"Open with Editor\"" +msgid "This adds a new entry to the context menu named 'Open with Editor'" msgstr "" #. Resource IDs: (1053) @@ -489,7 +489,7 @@ msgid "no text to test with available" msgstr "" #. Resource IDs: (112) -msgid "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h" +msgid "only files that match this pattern are searched.\nUse '|' as the delimiter.\nExample: *.cpp|*.h" msgstr "" #. Resource IDs: (129) @@ -514,11 +514,11 @@ msgid "search string is empty" msgstr "" #. Resource IDs: (114) -msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | symbol.\r\nExample: c:\\temp|d:\\logs" +msgid "the path(s) which is searched recursively.\nSeparate paths with the '|' symbol.\nExample: c:\\temp|d:\\logs" msgstr "" #. Resource IDs: (113) -msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." +msgid "you can exclude directories, e.g. CVS and images.\nExample: ^(CVS|images)$\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." msgstr "" #. Resource IDs: (1061) diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 29fe953f2..e0915d596 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 BETA diff --git a/src/VersionEx.h b/src/VersionEx.h index 545db720d..6ea7d55d2 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,8 +8,8 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 20 -#define VERSION_REV 417 -#define VERSION_BUILD 2 +#define VERSION_REV 418 +#define VERSION_BUILD 1 #define SCINTILLA_VER 432 #define ONIGURUMA_REGEX_VER 6.9.5 #define UCHARDET_VER 2018.09.27