From 1c31dd0d7958599c934194ea4f06be334364eeb8 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Wed, 13 Mar 2024 21:29:19 +0900 Subject: [PATCH] Add the ability to replace using patterns from Substitution Filters to the Replace plugin. (#2252) --- Plugins/Strings.rc | 6 +- Plugins/dlls/PrediffLineFilter.sct | 77 +++++++- Plugins/dlls/editor addin.sct | 185 ++++++++++++++------ Testing/PluginTests/PluginTests.js | 87 ++++++++- Translations/WinMerge/Arabic.po | 2 +- Translations/WinMerge/Basque.po | 2 +- Translations/WinMerge/Brazilian.po | 4 +- Translations/WinMerge/Bulgarian.po | 8 +- Translations/WinMerge/Catalan.po | 12 +- Translations/WinMerge/ChineseSimplified.po | 12 +- Translations/WinMerge/ChineseTraditional.po | 12 +- Translations/WinMerge/Corsican.po | 12 +- Translations/WinMerge/Croatian.po | 2 +- Translations/WinMerge/Czech.po | 2 +- Translations/WinMerge/Danish.po | 2 +- Translations/WinMerge/Dutch.po | 12 +- Translations/WinMerge/English.pot | 4 +- Translations/WinMerge/Finnish.po | 14 +- Translations/WinMerge/French.po | 12 +- Translations/WinMerge/Galician.po | 12 +- Translations/WinMerge/German.po | 4 +- Translations/WinMerge/Greek.po | 2 +- Translations/WinMerge/Hungarian.po | 4 +- Translations/WinMerge/Italian.po | 12 +- Translations/WinMerge/Japanese.po | 12 +- Translations/WinMerge/Korean.po | 12 +- Translations/WinMerge/Lithuanian.po | 2 +- Translations/WinMerge/Norwegian.po | 8 +- Translations/WinMerge/Persian.po | 2 +- Translations/WinMerge/Polish.po | 4 +- Translations/WinMerge/Portuguese.po | 12 +- Translations/WinMerge/Romanian.po | 12 +- Translations/WinMerge/Russian.po | 4 +- Translations/WinMerge/Serbian.po | 2 +- Translations/WinMerge/Sinhala.po | 2 +- Translations/WinMerge/Slovak.po | 12 +- Translations/WinMerge/Slovenian.po | 12 +- Translations/WinMerge/Spanish.po | 14 +- Translations/WinMerge/Swedish.po | 12 +- Translations/WinMerge/Tamil.po | 12 +- Translations/WinMerge/Turkish.po | 4 +- Translations/WinMerge/Ukrainian.po | 2 +- 42 files changed, 388 insertions(+), 253 deletions(-) diff --git a/Plugins/Strings.rc b/Plugins/Strings.rc index 4a356e924e8..cdf137ecc8b 100644 --- a/Plugins/Strings.rc +++ b/Plugins/Strings.rc @@ -114,7 +114,7 @@ BEGIN IDS_PLUGIN_DESCRIPTION6 "Sort lines descending" IDS_PLUGIN_DESCRIPTION7 "Reverse columns" IDS_PLUGIN_DESCRIPTION8 "Reverse lines" - IDS_PLUGIN_DESCRIPTION9 "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression" + IDS_PLUGIN_DESCRIPTION9 "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" IDS_PLUGIN_DESCRIPTION10 "Apply filter command. \r\nUsage: ExecFilterCommand COMMAND\r\n COMMAND - command to execute. %1 in the command is replaced with the filename." IDS_PLUGIN_DESCRIPTION11 @@ -185,7 +185,7 @@ END STRINGTABLE BEGIN - IDS_PLUGIN_DESCRIPTION50 + IDS_PLUGIN_DESCRIPTION51 "Windows Registry URL Scheme Handler. \r\nArguments: Command line options passed to the reg.exe command." END @@ -212,7 +212,7 @@ END STRINGTABLE BEGIN - IDS_PLUGIN_COMPAREMSEXCELFILES_STR13 "Compare VBA macros" + IDS_PLUGIN_COMPAREMSEXCELFILES_STR14 "Compare VBA macros" IDS_PLUGIN_COMPAREMSWORDFILES_STR1 "CompareMSWordFiles.sct WinMerge Plugin Options" IDS_PLUGIN_COMPAREMSWORDFILES_STR2 diff --git a/Plugins/dlls/PrediffLineFilter.sct b/Plugins/dlls/PrediffLineFilter.sct index 96573b7b792..ae92ada0a5a 100644 --- a/Plugins/dlls/PrediffLineFilter.sct +++ b/Plugins/dlls/PrediffLineFilter.sct @@ -100,7 +100,7 @@ function PrediffBufferW(pText, pSize, pbChanged) { try { var re = new RegExp(pattern, ignoreCase ? "gi" : "g"); for (var j = 0; j < lines.length; j++) { - lines[j] = lines[j].replace(re, replaceText); + lines[j] = lines[j].replace(re, unescape(replaceText)); } } catch (e) { mergeApp.MsgBox("RegExp Pattern" + i + ": " + pattern + " error: " + e.message, 16, "PrediffLineFilter plugin"); @@ -136,6 +136,81 @@ function replacei(text, find, replace, ignorecase) { return text; } +function unescape(text) { + var result = ""; + var textLen = text.length; + var i = 0; + while (i < textLen) { + var ch = text.charAt(i); + switch (ch) { + case "\\": + if (i < textLen - 1) { + i++; + ch = text.charAt(i); + switch (ch) { + case "a": + result += String.fromCharCode(0x07); + break; + case "b": + result += "\b"; + break; + case "t": + result += "\t"; + break; + case "n": + result += "\n"; + break; + case "v": + result += String.fromCharCode(0x0b); + break; + case "f": + result += "\f"; + break; + case "r": + result += "\r"; + break; + case "\\": + result += "\\"; + break; + case "x": + if (i + 2 < textLen) { + var hexValue = text.substring(i + 1, i + 3); + try { + var intValue = parseInt(hexValue, 16); + result += String.fromCharCode(intValue); + i += 2; + } catch (e) { + result += "\\x"; + } + } else { + result += "\\x"; + } + break; + default: + if (!isNaN(ch)) { + if (ch !== '0') { + result += '$' + ch; + } else { + result += '$&'; + } + } else { + result += '\\' + ch; + } + break; + } + } else { + result += ch; + } + break; + default: + result += ch; + break; + } + i++; + } + return result; +} + function translate(text) { var re = /\${([^}]+)}/g; var matches; diff --git a/Plugins/dlls/editor addin.sct b/Plugins/dlls/editor addin.sct index 6bd475fddab..1fed1a83834 100644 --- a/Plugins/dlls/editor addin.sct +++ b/Plugins/dlls/editor addin.sct @@ -59,44 +59,44 @@ function get_PluginFileFilters() { } function get_PluginExtendedProperties() { - return "GenerateUnpacker;" + - "MakeUpper.MenuCaption=Make Uppercase;" + - "MakeUpper.Description=Make characters uppercase;" + - "MakeLower.MenuCaption=Make Lowercase;" + - "MakeLower.Description=Make characters lowercase;" + - "RemoveDuplicates.MenuCaption=Remove Duplicate Lines;" + - "RemoveDuplicates.Description=Remove duplicate lines;" + - "CountDuplicates.MenuCaption=Count Duplicate Lines;" + - "CountDuplicates.Description=Count duplicate lines;" + - "SortAscending.MenuCaption=Sort Lines Ascending;" + - "SortAscending.Description=Sort lines ascending;" + - "SortDescending.MenuCaption=Sort Lines Descending;" + - "SortDescending.Description=Sort lines descending;" + - "ExecFilterCommand.MenuCaption=Apply Filter Command...;" + - "ExecFilterCommand.Description=Apply filter command. \r\n" + + return "GenerateUnpacker;" + + "MakeUpper.MenuCaption=Make Uppercase;" + + "MakeUpper.Description=Make characters uppercase;" + + "MakeLower.MenuCaption=Make Lowercase;" + + "MakeLower.Description=Make characters lowercase;" + + "RemoveDuplicates.MenuCaption=Remove Duplicate Lines;" + + "RemoveDuplicates.Description=Remove duplicate lines;" + + "CountDuplicates.MenuCaption=Count Duplicate Lines;" + + "CountDuplicates.Description=Count duplicate lines;" + + "SortAscending.MenuCaption=Sort Lines Ascending;" + + "SortAscending.Description=Sort lines ascending;" + + "SortDescending.MenuCaption=Sort Lines Descending;" + + "SortDescending.Description=Sort lines descending;" + + "ExecFilterCommand.MenuCaption=Apply Filter Command...;" + + "ExecFilterCommand.Description=Apply filter command. \r\n" + "Usage: ExecFilterCommand COMMAND\r\n"+ - " COMMAND - command to execute. %1 in the command is replaced with the filename.;" + - "ExecFilterCommand.ArgumentsRequired;" + - "Tokenize.MenuCaption=Tokenize...;" + - "Tokenize.Description=Tokenize selection. \r\n" + - "Usage: Tokenize PATTERNS\r\n" + - " PATTERNS - regular expression for tokenizing. (e.g. [^\\w]+);" + - "Tokenize.ArgumentsRequired;" + - "Tokenize.Arguments=[^\\w]+;" + - "Trim.MenuCaption=Trim Spaces;" + - "Trim.Description=Trim spaces;" + - "SelectColumns.MenuCaption=Select Columns...;" + - "SelectColumns.Description=Select some columns.\r\n" + - "Usage: SelectColumns RANGES\r\n" + - " or: SelectColumns [-v] [-i] [-g] -e PATTERNS\r\n" + - " RANGES - list of column ranges to select. (e.g. -3,5-10,30-)\r\n" + + " COMMAND - command to execute. %1 in the command is replaced with the filename.;" + + "ExecFilterCommand.ArgumentsRequired;" + + "Tokenize.MenuCaption=Tokenize...;" + + "Tokenize.Description=Tokenize selection. \r\n" + + "Usage: Tokenize PATTERNS\r\n" + + " PATTERNS - regular expression for tokenizing. (e.g. [^\\w]+);" + + "Tokenize.ArgumentsRequired;" + + "Tokenize.Arguments=[^\\w]+;" + + "Trim.MenuCaption=Trim Spaces;" + + "Trim.Description=Trim spaces;" + + "SelectColumns.MenuCaption=Select Columns...;" + + "SelectColumns.Description=Select some columns.\r\n" + + "Usage: SelectColumns RANGES\r\n" + + " or: SelectColumns [-v] [-i] [-g] -e PATTERNS\r\n" + + " RANGES - list of column ranges to select. (e.g. -3,5-10,30-)\r\n" + " PATTERNS - regular expression\r\n" + " -v - select non-matching columns\r\n" + " -i - ignore case\r\n" + " -g - enable global flag\r\n" + - " -e - use PATTERNS for matching;" + - "SelectColumns.ArgumentsRequired;" + - "SelectLines.MenuCaption=Select Lines...;" + + " -e - use PATTERNS for matching;" + + "SelectColumns.ArgumentsRequired;" + + "SelectLines.MenuCaption=Select Lines...;" + "SelectLines.Description=Select some lines.\r\n" + "Usage: SelectLines RANGES\r\n" + " or: SelectLines [-v] [-i] -e PATTERNS\r\n" + @@ -104,19 +104,21 @@ function get_PluginExtendedProperties() { " PATTERNS - regular expression\r\n" + " -v - select non-matching lines\r\n" + " -i - ignore case\r\n" + - " -e - use PATTERNS for matching;" + - "SelectLines.ArgumentsRequired;" + - "ReverseColumns.MenuCaption=Reverse Columns;" + - "ReverseColumns.Description=Reverse columns;" + - "ReverseLines.MenuCaption=Reverse Lines;" + - "ReverseLines.Description=Reverse lines;" + - "Replace.MenuCaption=Replace...;" + + " -e - use PATTERNS for matching;" + + "SelectLines.ArgumentsRequired;" + + "ReverseColumns.MenuCaption=Reverse Columns;" + + "ReverseColumns.Description=Reverse columns;" + + "ReverseLines.MenuCaption=Reverse Lines;" + + "ReverseLines.Description=Reverse lines;" + + "Replace.MenuCaption=Replace...;" + "Replace.Description=Replace text with another text.\r\n" + "Usage: Replace [-i] [-e] FIND REPLACE\r\n" + + " or: Replace -s\r\n" + " FIND - text to find\r\n" + " REPLACE - text to replace\r\n" + " -i - ignore case (only for -e)\r\n" + - " -e - treat the specified text as a regular expression;" + + " -e - treat the specified text as a regular expression\r\n" + + " -s - replace using Substitution Filters patterns;" + "Replace.ArgumentsRequired;"; } @@ -285,11 +287,13 @@ function ParseSelectColumnsLinesArguments(args) { } function ParseReplaceArguments(args) { + var list = new Array(); var patterns = new Array(); var isOption = false; var argAry = ParseArguments(args); var regex = false; var ignoreCase = false; + var useSubstitutionFilters = false; for (var i = 0; i < argAry.length; i++) { isOption = false; if (argAry[i].length >= 2) { @@ -305,15 +309,62 @@ function ParseReplaceArguments(args) { ignoreCase = true; } break; + case "s": + useSubstitutionFilters = true; + break; } break; } } if (!isOption) { patterns.push(argAry[i]); + if (patterns.length === 1) { + list.push({"patterns": patterns, "regex": regex, "ignoreCase": ignoreCase}); + } else { + list[list.length - 1].patterns.push(argAry[i]); + patterns = new Array(); + } } } - return { "patterns": patterns, "regex": regex, "ignoreCase": ignoreCase }; + if (useSubstitutionFilters) { + var count = regRead("SubstitutionFilters/Values", 0); + for (var i = 0; i < count; i++) { + var ii = "00" + i; + ii = ii.substring(ii.length - 2); + if (regRead("SubstitutionFilters/Enabled" + ii, 0)) { + patterns = new Array(); + patterns.push(regRead("SubstitutionFilters/Pattern" + ii, "")); + patterns.push(regRead("SubstitutionFilters/Replacement" + ii, "")); + regex = regRead("SubstitutionFilters/UseRegExp" + ii, 0); + ignoreCase = !regRead("SubstitutionFilters/CaseSensitive" + ii, 1); + if (regRead("SubstitutionFilters/MatchWholeWordOnly" + ii, 0)) { + regex = true; + patterns[0] = "\\b" + Escape(patterns[0]) + "\\b"; + patterns[1] = Escape(patterns[1]); + } + list.push({"patterns": patterns, "regex": regex, "ignoreCase": ignoreCase}); + } + } + } + return list; +} + +function Escape(text) { + var result = ""; + for (var i = 0; i < text.length; i++) { + var c = text.charAt(i); + switch (c) { + case '\\': case '.': case '^': case '$': case '|': + case '[': case ']': case '(': case ')': case '!': + case '?': case '*': case '+': case '{': case '}': + result += '\\'; + break; + default: + break; + } + result += c; + } + return result; } function Unescape(text) { @@ -352,8 +403,30 @@ function Unescape(text) { case "\\": result += "\\"; break; + case "x": + if (i + 2 < textLen) { + var hexValue = text.substring(i + 1, i + 3); + try { + var intValue = parseInt(hexValue, 16); + result += String.fromCharCode(intValue); + i += 2; + } catch (e) { + result += "\\x"; + } + } else { + result += "\\x"; + } + break; default: - result += "\\" + ch; + if (!isNaN(ch)) { + if (ch !== '0') { + result += '$' + ch; + } else { + result += '$&'; + } + } else { + result += '\\' + ch; + } break; } } else { @@ -549,24 +622,22 @@ function ReplaceText(Text) { throw new Error(30001, "Canceled"); } var parseResult = ParseReplaceArguments(args); - var patterns = parseResult.patterns; - var regex = parseResult.regex; - var ignoreCase = parseResult.ignoreCase; - if (regex) { - for (var i = 0; i < patterns.length; i += 2) { - var re = new RegExp(patterns[i], ignoreCase ? "gmi" : "gm"); - if (i + 1 < patterns.length) { - result = result.replace(re, Unescape(patterns[i + 1])); + for (var i = 0; i < parseResult.length; i++) { + var patterns = parseResult[i].patterns; + var regex = parseResult[i].regex; + var ignoreCase = parseResult[i].ignoreCase; + if (regex) { + var re = new RegExp(patterns[0], ignoreCase ? "gmi" : "gm"); + if (patterns.length > 1) { + result = result.replace(re, Unescape(patterns[1])); } else { result = result.replace(re, result, ""); } - } - } else { - for (var i = 0; i < patterns.length; i += 2) { - if (i + 1 < patterns.length) { - result = replacei(result, patterns[i], patterns[i + 1]); + } else { + if (patterns.length > 1) { + result = replacei(result, patterns[0], patterns[1], ignoreCase); } else { - result = replacei(result, patterns[i], ""); + result = replacei(result, patterns[0], "", ignoreCase); } } } diff --git a/Testing/PluginTests/PluginTests.js b/Testing/PluginTests/PluginTests.js index 796aaff22e1..b59aa581eea 100644 --- a/Testing/PluginTests/PluginTests.js +++ b/Testing/PluginTests/PluginTests.js @@ -79,8 +79,8 @@ var PluginSettings = { "Enabled3": 1, "IgnoreCase3": 0, "UseRegExp3": 1, - "Pattern3": "\\d+\\.\\d+", - "ReplaceText3": "x.x", + "Pattern3": "(\\d+)\\.(\\d+)", + "ReplaceText3": "\\2.\\1", "Enabled4": 1, "IgnoreCase4": 1, "UseRegExp4": 1, @@ -92,6 +92,51 @@ var PluginSettings = { "Pattern5": "disabled", "ReplaceText5": "" } + }, + "SubstitutionFilters": { + "Values": 6, + + "Enabled00": 1, + "CaseSensitive00": 1, + "UseRegExp00": 0, + "MatchWholeWordOnly00": 0, + "Pattern00": "abc", + "Replacement00": "def", + + "Enabled01": 1, + "CaseSensitive01": 0, + "UseRegExp01": 0, + "MatchWholeWordOnly01": 0, + "Pattern01": "Ghi", + "Replacement01": "Jkl", + + "Enabled02": 1, + "CaseSensitive02": 0, + "UseRegExp02": 1, + "MatchWholeWordOnly02": 0, + "Pattern02": "(\\d+)\\.(\\d+)", + "Replacement02": "\\2.\\1", + + "Enabled03": 1, + "CaseSensitive03": 0, + "UseRegExp03": 1, + "MatchWholeWordOnly03": 0, + "Pattern03": "Mno.*Z", + "Replacement03": "XxxX", + + "Enabled04": 0, + "CaseSensitive04": 1, + "UseRegExp04": 0, + "MatchWholeWordOnly04": 0, + "Pattern04": "disabled", + "Replacement04": "", + + "Enabled05": 1, + "CaseSensitive05": 1, + "UseRegExp05": 0, + "MatchWholeWordOnly05": 1, + "Pattern05": "word", + "Replacement05": "XXX\\a\\b\\t\\f\\r\\n\\v\\\\" } }; @@ -110,7 +155,7 @@ var MergeApp = { "Translate": function (text) { return text; }, - "Log": function (level, text) { + "LogError": function (text) { WScript.Echo(text); }, "MsgBox": function (prompt, buttons, title) { @@ -297,8 +342,36 @@ function EditorAddinTest() { assertEquals("XXX abc\r\nXXX def", p.Replace("1000 abc\r\n1001 def")); p.PluginArguments = "-e (.{3}) $1\\r\\n"; assertEquals("012\r\n345\r\n678\r\n9", p.Replace("0123456789")); - p.PluginArguments = "-e (\\d+) \\a\\b\\t\\n\\v\\f\\r\\\\$1\\1\\0"; - assertEquals(String.fromCharCode(0x07) + String.fromCharCode(0x08) + String.fromCharCode(0x09) + String.fromCharCode(0x0A) + String.fromCharCode(0x0B) + String.fromCharCode(0x0C) + String.fromCharCode(0x0D) + "\\0123456789\\1\\0", p.Replace("0123456789")); + p.PluginArguments = "-e (\\d+) \\a\\b\\t\\n\\v\\f\\r\\\\$1\\1\\0\\x21\\x7E"; + assertEquals(String.fromCharCode(0x07) + String.fromCharCode(0x08) + String.fromCharCode(0x09) + String.fromCharCode(0x0A) + String.fromCharCode(0x0B) + String.fromCharCode(0x0C) + String.fromCharCode(0x0D) + "\\012345678901234567890123456789!~", p.Replace("0123456789")); + // + p.PluginArguments = "-s"; + assertEquals("", p.Replace("")); + p.PluginArguments = "-s"; + assertEquals("def def def", p.Replace("abc def abc")); + p.PluginArguments = "-s"; + assertEquals("Jkl def Jkl", p.Replace("gHI def Ghi")); + p.PluginArguments = "-s"; + assertEquals("2.1 def 4.3", p.Replace("1.2 def 3.4")); + p.PluginArguments = "-s"; + assertEquals("XxxX", p.Replace("mnopqrstuvwxyz")); + p.PluginArguments = "-s"; + assertEquals("disabled", p.Replace("disabled")); + p.PluginArguments = "-s"; + var text = "abc def abc\r\n"; + text += "gHI def GHI\r\n"; + text += "1.2 def 3.4\r\n"; + text += "mnopqrstuvwxyz\r\n"; + text += "disabled"; + var expected = + "def def def\r\n" + + "Jkl def Jkl\r\n" + + "2.1 def 4.3\r\n" + + "XxxX\r\n" + + "disabled"; + assertEquals(expected, p.Replace(text)); + p.PluginArguments = "-s"; + assertEquals("XXX\\a\\b\\t\\f\\r\\n\\v\\\\ wordword XXX\\a\\b\\t\\f\\r\\n\\v\\\\", p.Replace("word wordword word")); // ReverseColumns setTestName("ReverseColumns"); @@ -475,7 +548,7 @@ function PrediffLineFilterTest() { changed = false; var result = p.PrediffBufferW(text, size, changed); if (typeof result !== "string") { text = result.getItem(1); size = result.getItem(2); changed = result.getItem(3); } - assertEquals("x.x def x.x", text); + assertEquals("2.1 def 4.3", text); assertEquals(text.length, size); assertEquals(true, changed); @@ -512,7 +585,7 @@ function PrediffLineFilterTest() { var expected = "def def def\r\n" + "Jkl def Jkl\r\n" + - "x.x def x.x\r\n" + + "2.1 def 4.3\r\n" + "XxxX\r\n" + "disabled"; assertEquals(expected, text); diff --git a/Translations/WinMerge/Arabic.po b/Translations/WinMerge/Arabic.po index dc846cce65c..70f910b4649 100644 --- a/Translations/WinMerge/Arabic.po +++ b/Translations/WinMerge/Arabic.po @@ -4245,7 +4245,7 @@ msgstr "" msgid "Reverse lines" msgstr "" -msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" #, c-format diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po index b615154bc09..51a4b72040d 100644 --- a/Translations/WinMerge/Basque.po +++ b/Translations/WinMerge/Basque.po @@ -4850,7 +4850,7 @@ msgstr "" msgid "Reverse lines" msgstr "" -msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" #, c-format diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po index eb0224d9d9b..c52d928820d 100644 --- a/Translations/WinMerge/Brazilian.po +++ b/Translations/WinMerge/Brazilian.po @@ -3927,8 +3927,8 @@ msgstr "Reverter colunas" msgid "Reverse lines" msgstr "Reverter linhas" -msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression" -msgstr "Substituir texto por outro texto.\r\nUso: Replace [-i] [-e] FIND REPLACE\r\n FIND - texto a procurar\r\n REPLACE - texto para substituir\r\n -i - ignorar maiúsculas/minúsculas (apenas para -e)\r\n -e - trata o texto especificado como expressão regular" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" +msgstr "Substituir texto por outro texto.\r\nUso: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - texto a procurar\r\n REPLACE - texto para substituir\r\n -i - ignorar maiúsculas/minúsculas (apenas para -e)\r\n -e - trata o texto especificado como expressão regular\r\n -s - replace using Substitution Filters patterns" #, c-format msgid "Apply filter command. \r\nUsage: ExecFilterCommand COMMAND\r\n COMMAND - command to execute. %1 in the command is replaced with the filename." diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po index 3b0ad6348ea..7ecce380005 100644 --- a/Translations/WinMerge/Bulgarian.po +++ b/Translations/WinMerge/Bulgarian.po @@ -4306,13 +4306,7 @@ msgstr "" msgid "Reverse lines" msgstr "" -msgid "" -"Replace text with another text.\r\n" -"Usage: Replace [-i] [-e] FIND REPLACE\r\n" -" FIND - text to find\r\n" -" REPLACE - text to replace\r\n" -" -i - ignore case (only for -e)\r\n" -" -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" #, c-format diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po index a340a3ffeb8..6bf859015a9 100644 --- a/Translations/WinMerge/Catalan.po +++ b/Translations/WinMerge/Catalan.po @@ -5009,20 +5009,16 @@ msgstr "Capgira les columnes" msgid "Reverse lines" msgstr "Capgira les línies" -msgid "" -"Replace text with another text.\r\n" -"Usage: Replace [-i] [-e] FIND REPLACE\r\n" -" FIND - text to find\r\n" -" REPLACE - text to replace\r\n" -" -i - ignore case (only for -e)\r\n" -" -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" "Reemplaça el text amb un altre text.\r\n" "Ús: Replace [-i] [-e] TROBA REEMPLAÇA\r\n" +"or: Replace -s\r\n" " TROBA - text a cercar\r\n" " REEMPLAÇA - text amb que reemplaçar\r\n" " -i - ignora majúscules/minúscules (només per a -e)\r\n" -" -e - considera el text a cercar com una expressió regular" +" -e - considera el text a cercar com una expressió regular\r\n" +" -s - replace using Substitution Filters patterns" #, c-format msgid "" diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po index fcc9a5ad67e..f1a503e7007 100644 --- a/Translations/WinMerge/ChineseSimplified.po +++ b/Translations/WinMerge/ChineseSimplified.po @@ -4360,20 +4360,16 @@ msgstr "反转列" msgid "Reverse lines" msgstr "反转行" -msgid "" -"Replace text with another text.\r\n" -"Usage: Replace [-i] [-e] FIND REPLACE\r\n" -" FIND - text to find\r\n" -" REPLACE - text to replace\r\n" -" -i - ignore case (only for -e)\r\n" -" -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" "文本替换。\r\n" "用法： Replace [-i] [-e] FIND REPLACE\r\n" +" or: Replace -s\r\n" " FIND - 查找的文本\r\n" " REPLACE - 替换的文本\r\n" " -i - 忽略大小写 (只用于 -e)\r\n" -" -e - 将指定文本视为正则表达式" +" -e - 将指定文本视为正则表达式\r\n" +" -s - replace using Substitution Filters patterns" #, c-format msgid "" diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po index 548900ec5f8..76969672e45 100644 --- a/Translations/WinMerge/ChineseTraditional.po +++ b/Translations/WinMerge/ChineseTraditional.po @@ -5009,20 +5009,16 @@ msgstr "顛倒欄" msgid "Reverse lines" msgstr "顛倒行" -msgid "" -"Replace text with another text.\r\n" -"Usage: Replace [-i] [-e] FIND REPLACE\r\n" -" FIND - text to find\r\n" -" REPLACE - text to replace\r\n" -" -i - ignore case (only for -e)\r\n" -" -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" "替換文本為另一個文本。\r\n" "用法：Replace [-i] [-e] FIND REPLACE\r\n" +" or: Replace -s\r\n" "FIND - 要尋找的文本\r\n" "REPLACE - 要替換的文本\r\n" "-i - 忽略大小寫（僅適用於 -e）\r\n" -"-e - 將指定的文本視為正則表示式" +"-e - 將指定的文本視為正則表示式\r\n" +"-s - replace using Substitution Filters patterns" #, c-format msgid "" diff --git a/Translations/WinMerge/Corsican.po b/Translations/WinMerge/Corsican.po index 6e297afa5bd..7db503bd764 100644 --- a/Translations/WinMerge/Corsican.po +++ b/Translations/WinMerge/Corsican.po @@ -4324,20 +4324,16 @@ msgstr "Invertisce e culonne" msgid "Reverse lines" msgstr "Invertisce e linee" -msgid "" -"Replace text with another text.\r\n" -"Usage: Replace [-i] [-e] FIND REPLACE\r\n" -" FIND - text to find\r\n" -" REPLACE - text to replace\r\n" -" -i - ignore case (only for -e)\r\n" -" -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" "Rimpiazzà u testu cù un altru testu.\\r\n" "Aghjovu : Replace [-i] [-e] CIRCÀ RIMPIAZZÀ\\r\n" +" or: Replace -s\r\n" " CIRCÀ - testu à circà\\r\n" " RIMPIAZZÀ - testu à rimpiazzà\\r\n" " -i - ignurà a cassa (solu per -e)\\r\n" -" -e - cunsiderà u testu specificatu cum’è un’espressione regulare" +" -e - cunsiderà u testu specificatu cum’è un’espressione regulare\r\n" +" -s - replace using Substitution Filters patterns" #, c-format msgid "" diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po index 28e6672cfaf..5301d6d68fd 100644 --- a/Translations/WinMerge/Croatian.po +++ b/Translations/WinMerge/Croatian.po @@ -4849,7 +4849,7 @@ msgstr "" msgid "Reverse lines" msgstr "" -msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" #, c-format diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po index 156dee90f15..e6718992e46 100644 --- a/Translations/WinMerge/Czech.po +++ b/Translations/WinMerge/Czech.po @@ -4782,7 +4782,7 @@ msgstr "" msgid "Reverse lines" msgstr "" -msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" #, c-format diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po index 43058590e95..b4845d7669a 100644 --- a/Translations/WinMerge/Danish.po +++ b/Translations/WinMerge/Danish.po @@ -4887,7 +4887,7 @@ msgstr "" msgid "Reverse lines" msgstr "" -msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" #, c-format diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po index 2184d52ced7..8edca15db8d 100644 --- a/Translations/WinMerge/Dutch.po +++ b/Translations/WinMerge/Dutch.po @@ -4310,20 +4310,16 @@ msgstr "Kolommen omkeren" msgid "Reverse lines" msgstr "Regels omkeren" -msgid "" -"Replace text with another text.\r\n" -"Usage: Replace [-i] [-e] FIND REPLACE\r\n" -" FIND - text to find\r\n" -" REPLACE - text to replace\r\n" -" -i - ignore case (only for -e)\r\n" -" -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" "Tekst door andere tekst vervangen.\r\n" "Gebruik: Replace [-i] [-e] ZOEKEN VERVANGEN\r\n" +" or: Replace -s\r\n" " ZOEKEN - te zoeken tekst\r\n" " VERVANGEN - te vervangen tekst\r\n" " -i - hoofdlettergebruik negeren (alleen voor -e)\r\n" -" -e - de opgegeven tekst als een reguliere expressie behandelen" +" -e - de opgegeven tekst als een reguliere expressie behandelen\r\n" +" -s - replace using Substitution Filters patterns" #, c-format msgid "" diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot index 037809ef6a8..dbd8ed99349 100644 --- a/Translations/WinMerge/English.pot +++ b/Translations/WinMerge/English.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n" -"POT-Creation-Date: 2024-03-06 21:04+0000\n" +"POT-Creation-Date: 2024-03-13 08:45+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English \n" @@ -3922,7 +3922,7 @@ msgstr "" msgid "Reverse lines" msgstr "" -msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" #, c-format diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po index 5c297a63977..169c05c2c97 100644 --- a/Translations/WinMerge/Finnish.po +++ b/Translations/WinMerge/Finnish.po @@ -4347,20 +4347,16 @@ msgstr "Käänteiset sarakkeet" msgid "Reverse lines" msgstr "Käänteiset rivit" -msgid "" -"Replace text with another text.\r\n" -"Usage: Replace [-i] [-e] FIND REPLACE\r\n" -" FIND - text to find\r\n" -" REPLACE - text to replace\r\n" -" -i - ignore case (only for -e)\r\n" -" -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" "Korvaa teksti toisella tekstillä.\r\n" -"Käyttö: Korvaa [-i ] [-e] FIND REPLACE\r\n" +"Käyttö: Replace [-i ] [-e] FIND REPLACE\r\n" +" or: Replace -s\r\n" " FIND - etsittävä teksti\r\n" " REPLACE - korvattava teksti\r\n" " -i - ohita kirjainkoko (vain -e:lle)\r\n" -" -e - käsittelee määritettyä tekstiä säännöllisenä lausekkeena" +" -e - käsittelee määritettyä tekstiä säännöllisenä lausekkeena\r\n" +" -s - replace using Substitution Filters patterns" #, c-format msgid "" diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po index 832d1f2b79e..3a594623840 100644 --- a/Translations/WinMerge/French.po +++ b/Translations/WinMerge/French.po @@ -5039,20 +5039,16 @@ msgstr "Inverser les colonnes" msgid "Reverse lines" msgstr "Inverser les lignes" -msgid "" -"Replace text with another text.\r\n" -"Usage: Replace [-i] [-e] FIND REPLACE\r\n" -" FIND - text to find\r\n" -" REPLACE - text to replace\r\n" -" -i - ignore case (only for -e)\r\n" -" -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" "Remplacer le texte par un autre texte.\r\n" "Utilisation : Replace [-i] [-e] FIND REPLACE\r\n" +" or: Replace -s\r\n" " FIND - texte à rechercher\r\n" " REPLACE - texte à remplacer\r\n" " -i - ignore la casse (uniquement pour -e)\r\n" -" -e - traite le texte spécifié comme une expression régulière" +" -e - traite le texte spécifié comme une expression régulière\r\n" +" -s - replace using Substitution Filters patterns" #, c-format msgid "" diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po index 8407ea849e1..f5a6fc18377 100644 --- a/Translations/WinMerge/Galician.po +++ b/Translations/WinMerge/Galician.po @@ -4314,20 +4314,16 @@ msgstr "Invertir columnas" msgid "Reverse lines" msgstr "Invertir liñas" -msgid "" -"Replace text with another text.\r\n" -"Usage: Replace [-i] [-e] FIND REPLACE\r\n" -" FIND - text to find\r\n" -" REPLACE - text to replace\r\n" -" -i - ignore case (only for -e)\r\n" -" -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" "Substituír texto con outro.\r\n" "Uso: Replace [-i] [-e] BUSCAR SUBSTITUÍR\r\n" +" or: Replace -s\r\n" " BUSCAR - Texto a buscar\r\n" " SUBSTITUIR - Texto a substituír\r\n" " -i - Ignora maiúsculas/minúsculas (só para -e)\r\n" -" -e - Trata o texto especificado coma unha expresión regular" +" -e - Trata o texto especificado coma unha expresión regular\r\n" +" -s - replace using Substitution Filters patterns" #, c-format msgid "" diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po index 3f54b049000..d53ba035e16 100644 --- a/Translations/WinMerge/German.po +++ b/Translations/WinMerge/German.po @@ -4645,8 +4645,8 @@ msgstr "Spalten umkehren" msgid "Reverse lines" msgstr "Zeilen umkehren" -msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression" -msgstr "Text durch einen anderen Text ersetzen.\r\nVerwendung: Replace [-i] [-e] FIND REPLACE\r\n FIND - zu suchender Text\r\n REPLACE - zu ersetzender Text\r\n -i - Groß-/Kleinschreibung ignorieren (nur für -e)\r\n -e - den angegebenen Text als regulären Ausdruck behandeln" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" +msgstr "Text durch einen anderen Text ersetzen.\r\nVerwendung: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - zu suchender Text\r\n REPLACE - zu ersetzender Text\r\n -i - Groß-/Kleinschreibung ignorieren (nur für -e)\r\n -e - den angegebenen Text als regulären Ausdruck behandeln\r\n -s - replace using Substitution Filters patterns" #, c-format msgid "Apply filter command. \r\nUsage: ExecFilterCommand COMMAND\r\n COMMAND - command to execute. %1 in the command is replaced with the filename." diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po index 7bab1c92caf..d65f89daf43 100644 --- a/Translations/WinMerge/Greek.po +++ b/Translations/WinMerge/Greek.po @@ -4827,7 +4827,7 @@ msgstr "" msgid "Reverse lines" msgstr "" -msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" #, c-format diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po index ea2143a1be8..d81e2af21c7 100644 --- a/Translations/WinMerge/Hungarian.po +++ b/Translations/WinMerge/Hungarian.po @@ -4981,8 +4981,8 @@ msgstr "Oszlopok megfordítása" msgid "Reverse lines" msgstr "Sorok megfordítása" -msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression" -msgstr "Szöveg cseréje egy másikra.\r\nHasználata: Replace [-i] [-e] FIND REPLACE\r\n ahol FIND - keresendő szöveg\r\n REPLACE - új szöveg\r\n -i - kis/nagybetű nem számít (csak ez -e)\r\n -e - a megadott szöveget reguláris kifejezésként kezeli" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" +msgstr "Szöveg cseréje egy másikra.\r\nHasználata: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n ahol FIND - keresendő szöveg\r\n REPLACE - új szöveg\r\n -i - kis/nagybetű nem számít (csak ez -e)\r\n -e - a megadott szöveget reguláris kifejezésként kezeli\r\n -s - replace using Substitution Filters patterns" #, c-format msgid "Apply filter command. \r\nUsage: ExecFilterCommand COMMAND\r\n COMMAND - command to execute. %1 in the command is replaced with the filename." diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po index 7708b64939c..30c2b1c3bdc 100644 --- a/Translations/WinMerge/Italian.po +++ b/Translations/WinMerge/Italian.po @@ -4351,20 +4351,16 @@ msgstr "Colonne invertite" msgid "Reverse lines" msgstr "Linee invertite" -msgid "" -"Replace text with another text.\r\n" -"Usage: Replace [-i] [-e] FIND REPLACE\r\n" -" FIND - text to find\r\n" -" REPLACE - text to replace\r\n" -" -i - ignore case (only for -e)\r\n" -" -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" "Sostituisci il testo con un altro testo.\n" "Uso sostituisci [-i] [-e] TROVA SOSTITUISCI\n" +" or: Replace -s\r\n" " TROVA: testo da trovare\n" " SOSTITUISCI: testo da sostituire\n" " -i - ignora maiuscole e minuscole (solo per -e)\n" -" -e - tratta il testo specificato come un'espressione regolare" +" -e - tratta il testo specificato come un'espressione regolare\r\n" +" -s - replace using Substitution Filters patterns" #, c-format msgid "" diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po index bf350a0831b..a872d82e4ed 100644 --- a/Translations/WinMerge/Japanese.po +++ b/Translations/WinMerge/Japanese.po @@ -4315,20 +4315,16 @@ msgstr "列を逆順にします" msgid "Reverse lines" msgstr "行を逆順にします" -msgid "" -"Replace text with another text.\r\n" -"Usage: Replace [-i] [-e] FIND REPLACE\r\n" -" FIND - text to find\r\n" -" REPLACE - text to replace\r\n" -" -i - ignore case (only for -e)\r\n" -" -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" "テキストを置換します。\r\n" "使い方: Replace [-i] [-e] FIND REPLACE\r\n" +"または: Replace -s\r\n" " FIND - 検索するテキスト\r\n" " REPLACE - 置換するテキスト\r\n" " -i - 大文字小文字を無視します (-e 指定時のみ有効)\r\n" -" -e - 指定したテキストを正規表現として扱います" +" -e - 指定したテキストを正規表現として扱います\r\n" +" -s - 置換フィルタに登録されているパターンを使用して置換します" #, c-format msgid "" diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po index 8f970395829..f7495a5209d 100644 --- a/Translations/WinMerge/Korean.po +++ b/Translations/WinMerge/Korean.po @@ -5034,20 +5034,16 @@ msgstr "열 반전" msgid "Reverse lines" msgstr "줄 반전" -msgid "" -"Replace text with another text.\r\n" -"Usage: Replace [-i] [-e] FIND REPLACE\r\n" -" FIND - text to find\r\n" -" REPLACE - text to replace\r\n" -" -i - ignore case (only for -e)\r\n" -" -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" "텍스트를 다른 텍스트로 바꿉니다.\r\n" "사용법: Replace [-i] [-e] FIND REPLACE\r\n" +" or: Replace -s\r\n" " FIND - 찾을 텍스트\r\n" " REPLACE - 바꿀 텍스트\r\n" " -i - 대소문자 무시(-e의 경우에만)\r\n" -" -e - 지정된 텍스트를 정규식으로 취급" +" -e - 지정된 텍스트를 정규식으로 취급\r\n" +" -s - replace using Substitution Filters patterns" #, c-format msgid "" diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po index 0e9de73f962..5f5a524da2e 100644 --- a/Translations/WinMerge/Lithuanian.po +++ b/Translations/WinMerge/Lithuanian.po @@ -3927,7 +3927,7 @@ msgstr "Sukeisti stulpelius" msgid "Reverse lines" msgstr "Sukeisti eilutes" -msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" #, c-format diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po index 7e8bb364fb4..f705c39b6f1 100644 --- a/Translations/WinMerge/Norwegian.po +++ b/Translations/WinMerge/Norwegian.po @@ -4317,13 +4317,7 @@ msgstr "" msgid "Reverse lines" msgstr "" -msgid "" -"Replace text with another text.\r\n" -"Usage: Replace [-i] [-e] FIND REPLACE\r\n" -" FIND - text to find\r\n" -" REPLACE - text to replace\r\n" -" -i - ignore case (only for -e)\r\n" -" -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" #, c-format diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po index 13f69ecce88..f7ee8282af5 100644 --- a/Translations/WinMerge/Persian.po +++ b/Translations/WinMerge/Persian.po @@ -4896,7 +4896,7 @@ msgstr "" msgid "Reverse lines" msgstr "" -msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" #, c-format diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po index 87f1776a6ae..5b87ebf88cb 100644 --- a/Translations/WinMerge/Polish.po +++ b/Translations/WinMerge/Polish.po @@ -3928,8 +3928,8 @@ msgstr "Odwróć kolumny" msgid "Reverse lines" msgstr "Odwróć wiersze" -msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression" -msgstr "Zastąp tekst innym tekstem.\r\nUżycie: Replace [-i] [-e] ZNAJDŹ ZASTĄP\r\n ZNAJDŹ - tekst do znalezienia\r\n ZASTĄP - tekst do zastąpienia\r\n -i - ignoruj wielkość liter (tylko dla -e)\r\n -e - traktuj określony tekst jako wyrażenie regularne" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" +msgstr "Zastąp tekst innym tekstem.\r\nUżycie: Replace [-i] [-e] ZNAJDŹ ZASTĄP\r\n or: Replace -s\r\n ZNAJDŹ - tekst do znalezienia\r\n ZASTĄP - tekst do zastąpienia\r\n -i - ignoruj wielkość liter (tylko dla -e)\r\n -e - traktuj określony tekst jako wyrażenie regularne\r\n -s - replace using Substitution Filters patterns" #, c-format msgid "Apply filter command. \r\nUsage: ExecFilterCommand COMMAND\r\n COMMAND - command to execute. %1 in the command is replaced with the filename." diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po index be980d3f765..f54ff125f0e 100644 --- a/Translations/WinMerge/Portuguese.po +++ b/Translations/WinMerge/Portuguese.po @@ -4322,20 +4322,16 @@ msgstr "Colunas invertidas" msgid "Reverse lines" msgstr "Linhas invertidas" -msgid "" -"Replace text with another text.\r\n" -"Usage: Replace [-i] [-e] FIND REPLACE\r\n" -" FIND - text to find\r\n" -" REPLACE - text to replace\r\n" -" -i - ignore case (only for -e)\r\n" -" -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" "Substituir o texto por outro texto.\r\n" "Utilização: Substituir [-i] [-e] FIND REPLACE\r\n" +" or: Replace -s\r\n" " FIND - texto para encontrar\r\n" " REPLACE- texto a ser substituído\r\n" " -i - ignorar maiúsculas/minúsculas (apenas para -e)\r\n" -" -e - tratar o texto especificado como uma expressão regular" +" -e - tratar o texto especificado como uma expressão regular\r\n" +" -s - replace using Substitution Filters patterns" #, c-format msgid "" diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po index fae6ca107b1..8d9c14bcbd6 100644 --- a/Translations/WinMerge/Romanian.po +++ b/Translations/WinMerge/Romanian.po @@ -4404,20 +4404,16 @@ msgstr "Inversează coloanele" msgid "Reverse lines" msgstr "Inversează rânduri" -msgid "" -"Replace text with another text.\r\n" -"Usage: Replace [-i] [-e] FIND REPLACE\r\n" -" FIND - text to find\r\n" -" REPLACE - text to replace\r\n" -" -i - ignore case (only for -e)\r\n" -" -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" "Înlocuiește textul cu alt text.\r\n" "Uz: Replace [-i] [-e] CAUTĂ ÎNLOCUIEȘTE\r\n" +" or: Replace -s\r\n" " CAUTĂ - textul de căutat\r\n" " ÎNLOCUIEȘTE - textul de înlocuit\r\n" " -i - ignoră minuscule/majuscule (doar pentru -e)\r\n" -" -e - tratează textul specificat ca expresie regulată" +" -e - tratează textul specificat ca expresie regulată\r\n" +" -s - replace using Substitution Filters patterns" #, c-format msgid "" diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po index d90cbbaff25..9db74788e3a 100644 --- a/Translations/WinMerge/Russian.po +++ b/Translations/WinMerge/Russian.po @@ -3929,8 +3929,8 @@ msgstr "Реверс столбцов" msgid "Reverse lines" msgstr "Реверс строк" -msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression" -msgstr "Заменить текст.\r\n• : Replace [-i] [-e] FIND REPLACE\r\n FIND - текст для поиска\r\n REPLACE - текст для замены\r\n -i - игнорировать регистр (только с -e)\r\n -e - рассматривать как регулярное выражение" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" +msgstr "Заменить текст.\r\n• : Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - текст для поиска\r\n REPLACE - текст для замены\r\n -i - игнорировать регистр (только с -e)\r\n -e - рассматривать как регулярное выражение\r\n -s - replace using Substitution Filters patterns" #, c-format msgid "Apply filter command. \r\nUsage: ExecFilterCommand COMMAND\r\n COMMAND - command to execute. %1 in the command is replaced with the filename." diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po index def815814f2..a5d327079ed 100644 --- a/Translations/WinMerge/Serbian.po +++ b/Translations/WinMerge/Serbian.po @@ -4821,7 +4821,7 @@ msgstr "" msgid "Reverse lines" msgstr "" -msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" #, c-format diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po index e34ee4d3124..7c3e7a0db57 100644 --- a/Translations/WinMerge/Sinhala.po +++ b/Translations/WinMerge/Sinhala.po @@ -4850,7 +4850,7 @@ msgstr "" msgid "Reverse lines" msgstr "" -msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" #, c-format diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po index 7be5b4eb60f..2a07694cdaa 100644 --- a/Translations/WinMerge/Slovak.po +++ b/Translations/WinMerge/Slovak.po @@ -4289,20 +4289,16 @@ msgstr "Prevrátiť stĺpce" msgid "Reverse lines" msgstr "Prevrátiť riadky" -msgid "" -"Replace text with another text.\r\n" -"Usage: Replace [-i] [-e] FIND REPLACE\r\n" -" FIND - text to find\r\n" -" REPLACE - text to replace\r\n" -" -i - ignore case (only for -e)\r\n" -" -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" "Nahradenie textu iným textom.\r\n" "Použitie: Replace [-i] [-e] FIND REPLACE\r\n" +" or: Replace -s\r\n" " FIND - text, ktorý sa má nájsť\r\n" " REPLACE - text, ktorý sa má nahradiť\r\n" " -i - ignorovať veľké a malé písmená (len pre -e)\r\n" -" -e - spracovať zadaný text ako regulárny výraz" +" -e - spracovať zadaný text ako regulárny výraz\r\n" +" -s - replace using Substitution Filters patterns" #, c-format msgid "" diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po index 4ab933547ee..6c620e55386 100644 --- a/Translations/WinMerge/Slovenian.po +++ b/Translations/WinMerge/Slovenian.po @@ -4312,20 +4312,16 @@ msgstr "Obrni stolpce" msgid "Reverse lines" msgstr "Obrni vrstice" -msgid "" -"Replace text with another text.\r\n" -"Usage: Replace [-i] [-e] FIND REPLACE\r\n" -" FIND - text to find\r\n" -" REPLACE - text to replace\r\n" -" -i - ignore case (only for -e)\r\n" -" -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" "Zamenjaj besedilo z drugim besedilom.\r\n" "Uporaba: Zamenjaj [-i] [-e] FIND REPLACE\r\n" +" or: Replace -s\r\n" " FIND - besedilo za iskanje\r\n" " REPLACE - besedilo za zamenjavo\r\n" " -i - prezri velike in male črke (samo za -e)\r\n" -" -e - obravnavaj navedeno besedilo kot regularni izraz" +" -e - obravnavaj navedeno besedilo kot regularni izraz\r\n" +" -s - replace using Substitution Filters patterns" #, c-format msgid "" diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po index 3b8d9fbc1b1..42b7f8c3b72 100644 --- a/Translations/WinMerge/Spanish.po +++ b/Translations/WinMerge/Spanish.po @@ -4316,20 +4316,16 @@ msgstr "Invertir columnas" msgid "Reverse lines" msgstr "Invertir líneas" -msgid "" -"Replace text with another text.\r\n" -"Usage: Replace [-i] [-e] FIND REPLACE\r\n" -" FIND - text to find\r\n" -" REPLACE - text to replace\r\n" -" -i - ignore case (only for -e)\r\n" -" -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" "Sustituir un texto por otro.\r\n" -"Uso: sustituir [-i] [-e] BUSCAR SUSTITUIR\r\n" +"Uso: Replace [-i] [-e] BUSCAR SUSTITUIR\r\n" +" or: Replace -s\r\n" " BUSCAR - Texto a buscar\r\n" " SUSTITUIR - Texto a sustituir\r\n" " -i - Ignora argumentos (solo para -e)\r\n" -" -e - Trata el texto especificado como una expresión regular" +" -e - Trata el texto especificado como una expresión regular\r\n" +" -s - replace using Substitution Filters patterns" #, c-format msgid "" diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po index ce65ad74c4b..f4ae9310e67 100644 --- a/Translations/WinMerge/Swedish.po +++ b/Translations/WinMerge/Swedish.po @@ -4394,20 +4394,16 @@ msgstr "Reversera kolumner" msgid "Reverse lines" msgstr "Reversera rader" -msgid "" -"Replace text with another text.\r\n" -"Usage: Replace [-i] [-e] FIND REPLACE\r\n" -" FIND - text to find\r\n" -" REPLACE - text to replace\r\n" -" -i - ignore case (only for -e)\r\n" -" -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" "Ersätt text med annan text.\r\n" "Användning: Replace [-i] [-e] HITTA ERSÄTT\r\n" +" or: Replace -s\r\n" " HITTA - text att hitta\n" " ERSÄTT - text att ersätta\n" " -i - ignorera skiftläge (endast vid -e)\n" -" -e - behandla angiven text som reguljärt uttryck" +" -e - behandla angiven text som reguljärt uttryck\r\n" +" -s - replace using Substitution Filters patterns" #, c-format msgid "" diff --git a/Translations/WinMerge/Tamil.po b/Translations/WinMerge/Tamil.po index 4e67b701da3..0a8640f4c54 100644 --- a/Translations/WinMerge/Tamil.po +++ b/Translations/WinMerge/Tamil.po @@ -4311,20 +4311,16 @@ msgstr "தலைகீழ் நெடுவரிசைகள்" msgid "Reverse lines" msgstr "தலைகீழ் கோடுகள்" -msgid "" -"Replace text with another text.\r\n" -"Usage: Replace [-i] [-e] FIND REPLACE\r\n" -" FIND - text to find\r\n" -" REPLACE - text to replace\r\n" -" -i - ignore case (only for -e)\r\n" -" -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" "உரையை வேறொரு உரையுடன் மாற்றவும்.\r\n" "பயன்பாடு: [-i] மாற்றவும் [-e] மாற்றீட்டைக் கண்டுபிடி\r\n" +" or: Replace -s\r\n" "கண்டுபிடி - கண்டுபிடிக்க உரை\r\n" " REPLACE - பதிலாக உரை\r\n" " -i - புறக்கணிப்பு வழக்கை (-eக்கு மட்டும்)\r\n" -" -e - குறிப்பிட்ட உரையை வழக்கமான வெளிப்பாடாகக் கருதுங்கள்" +" -e - குறிப்பிட்ட உரையை வழக்கமான வெளிப்பாடாகக் கருதுங்கள்\r\n" +" -s - replace using Substitution Filters patterns" #, c-format msgid "" diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po index 0841c0183b4..2217ed321d3 100644 --- a/Translations/WinMerge/Turkish.po +++ b/Translations/WinMerge/Turkish.po @@ -3926,8 +3926,8 @@ msgstr "Sütunları tersine çevir" msgid "Reverse lines" msgstr "Satırları tersine çevir" -msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression" -msgstr "Metni başka bir metin ile değiştirir.\r\nKullanımı: Replace [-i] [-e] FIND REPLACE\r\n FIND - Aranacak metin\r\n REPLACE - Değiştirilecek metin\r\n -i - Büyük/küçük harf yok sayılır (yalnızca -e için)\r\ns -e - Belirtilen metin kurallı ifade olarak işlenir" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" +msgstr "Metni başka bir metin ile değiştirir.\r\nKullanımı: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - Aranacak metin\r\n REPLACE - Değiştirilecek metin\r\n -i - Büyük/küçük harf yok sayılır (yalnızca -e için)\r\ns -e - Belirtilen metin kurallı ifade olarak işlenir\r\n -s - replace using Substitution Filters patterns" #, c-format msgid "Apply filter command. \r\nUsage: ExecFilterCommand COMMAND\r\n COMMAND - command to execute. %1 in the command is replaced with the filename." diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po index d04c6ed4e9b..097ef54f071 100644 --- a/Translations/WinMerge/Ukrainian.po +++ b/Translations/WinMerge/Ukrainian.po @@ -4836,7 +4836,7 @@ msgstr "" msgid "Reverse lines" msgstr "" -msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression" +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n or: Replace -s\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression\r\n -s - replace using Substitution Filters patterns" msgstr "" #, c-format