msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2021-01-09 11:00+0000\n"
+"POT-Creation-Date: 2021-04-20 21:03+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
msgid "Copy fro&m Right"
msgstr ""
+msgid "Copy Selected Line(s) to Right"
+msgstr ""
+
+msgid "Copy Selected Line(s) to Left"
+msgstr ""
+
+msgid "Copy Selected Line(s) from Left"
+msgstr ""
+
+msgid "Copy Selected Line(s) from Right"
+msgstr ""
+
msgid "&Select Line Difference\tF4"
msgstr ""
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
msgstr ""
msgid "&Undo"
msgid "&With..."
msgstr ""
+msgid "Open &Parent Folder..."
+msgstr ""
+
msgid "S&hell Menu"
msgstr ""
msgid "&Vector Image Scaling"
msgstr ""
+msgid "Compare Extracted &Text From Image"
+msgstr ""
+
msgid "&File"
msgstr ""
msgid "Ri&ght Read-only"
msgstr ""
-msgid "File En&coding..."
+msgid "&File Encoding..."
msgstr ""
msgid "Select &All\tCtrl+A"
msgid "Re&load\tCtrl+F5"
msgstr ""
-msgid "&File Encoding..."
-msgstr ""
-
msgid "Reco&mpare As"
msgstr ""
msgid "with &External Editor"
msgstr ""
-msgid "Open &Parent Folder..."
-msgstr ""
-
msgid "Open Midd&le"
msgstr ""
msgid "&Automatically verify paths in Open-dialog"
msgstr ""
-msgid "All&ow only one instance to run"
+msgid "Single instance mode:"
msgstr ""
msgid "As&k when closing multiple windows"
msgid "Find &Prev"
msgstr ""
-msgid "&OK"
+msgid "&Ok"
msgstr ""
msgid "Replace"
msgid "&Background color:"
msgstr ""
-msgid "&Ok"
-msgstr ""
-
msgid "&Apply"
msgstr ""
msgid "Remove"
msgstr ""
-msgid "Ignored Substitutions"
-msgstr ""
-
-msgid "Enable"
-msgstr ""
-
-msgid "Add"
+msgid "Substitution Filters"
msgstr ""
msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
msgstr ""
-msgid "Ignore changes in both directions"
-msgstr ""
-
-msgid "Completely unhighlight the ignored changes"
+msgid "Enable"
msgstr ""
-msgid "Use regular expressions"
+msgid "Add"
msgstr ""
msgid "Clear"
msgid "Enable indent &heuristic"
msgstr ""
+msgid "Completely unhighlight the ignored differences"
+msgstr ""
+
msgid "Editor"
msgstr ""
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr ""
-msgid "Detect codepage info for these files: .html, .rc, .xml\nNeed to restart session."
+msgid "Detect codepage info for these type of files: .html, .rc, .xml\nNeed to restart session."
msgstr ""
-msgid "Detect codepage for text files using mlang.dll\nNeed to restart session."
+msgid "Detect codepage for text files with mlang.dll\nNeed to restart session."
msgstr ""
msgid "System codepage"
msgid "&Enable image compare in folder compare"
msgstr ""
+msgid "OCR result:"
+msgstr ""
+
msgid "&Hex View"
msgstr ""
msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
msgstr ""
-msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaka, Gal Hammer, Alexander Skinner"
-msgstr ""
-
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
msgstr ""
msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
msgstr ""
-msgid "Color Schemes"
+msgid "Syntax"
msgstr ""
-msgid "Syntax"
+msgid "Color Schemes"
msgstr ""
msgid "Folder Compare"
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr ""
+msgid "File Type"
+msgstr ""
+
+msgid "Extension"
+msgstr ""
+
msgid "Name"
msgstr ""
msgid "Mine File"
msgstr ""
+msgid "Original File"
+msgstr ""
+
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr ""
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr ""
+#, c-format
+msgid " Sel: %d | %d"
+msgstr ""
+
msgid "Merge"
msgstr ""
msgid "Middle Date"
msgstr ""
-msgid "Extension"
-msgstr ""
-
msgid "Left Size"
msgstr ""
msgid "Do you want to move to the previous page?"
msgstr ""
+msgid "Do you want to move to the first file?"
+msgstr ""
+
+msgid "Do you want to move to the last file?"
+msgstr ""
+
#, c-format
msgid "Different codepages found in left (cp%d) and right (cp%d) files.\nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default Windows codepage (recommended)?"
msgstr ""
msgid "\nAuto Merge (Ctrl+Alt+M)"
msgstr ""
+msgid "\nFirst File"
+msgstr ""
+
+msgid "\nNext File (Ctrl+F8)"
+msgstr ""
+
+msgid "\nLast File"
+msgstr ""
+
+msgid "\nPrevious File (Ctrl+F7)"
+msgstr ""
+
msgid "The adapted unpacker is applied to both files (one file only needs the extension)."
msgstr ""
msgid "Rc: (%d, %d) "
msgstr ""
-msgid "On one panel"
+msgid "<Edit here>"
msgstr ""
-msgid "On the other panel"
+msgid "No differences to select found"
msgstr ""
-msgid "<Edit here>"
+msgid "No differences found to add as substitution filter"
msgstr ""
-msgid "No differences to select found"
+msgid "The pair is already present in the list of Substitution Filters"
+msgstr ""
+
+msgid "Add this change to Substitution Filters?"
+msgstr ""
+
+msgid "Text only"
+msgstr ""
+
+msgid "Line-by-line position and text"
msgstr ""
-msgid "No differences found to add as ignored substitution"
+msgid "Word-by-word position and text"
msgstr ""
-msgid "The pair is already present in the list of Ignored Substiturions"
+msgid "Allow only one instance to run"
msgstr ""
-msgid "Add this change to Ignored Substitutions?"
+msgid "Allow only one instance to run and wait for the instance to terminate"
msgstr ""