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 1784d48be..c17859305 100644 Binary files a/grepWinNP3/src/Resources/grepWin.rc and b/grepWinNP3/src/Resources/grepWin.rc differ 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