msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2020-11-21 13:50+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 "&Select Line Difference"
+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 Substitution &Filters"
msgstr ""
msgid "&Undo"
msgid "&Paste"
msgstr ""
-msgid "&Goto..."
+msgid "&Go to...\tCtrl+G"
+msgstr ""
+
+msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G"
+msgstr ""
+
+msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G"
msgstr ""
msgid "Op&en"
msgid "&With..."
msgstr ""
+msgid "Open &Parent Folder..."
+msgstr ""
+
msgid "S&hell Menu"
msgstr ""
msgid "&Horizontal Wipe"
msgstr ""
+msgid "&Rectangle Select"
+msgstr ""
+
msgid "&Set Background Color"
msgstr ""
msgid "&Vector Image Scaling"
msgstr ""
+msgid "Compare Extracted &Text From Image"
+msgstr ""
+
msgid "&File"
msgstr ""
-msgid "&New\tCtrl+N"
+msgid "&New"
+msgstr ""
+
+msgid "&Text"
+msgstr ""
+
+msgid "T&able"
+msgstr ""
+
+msgid "&Binary"
+msgstr ""
+
+msgid "&Image"
msgstr ""
msgid "New (&3 panes)"
msgid "< Empty >"
msgstr ""
-msgid "E&xit"
+msgid "E&xit\tCtrl+Q"
msgstr ""
msgid "&Edit"
msgid "&Window"
msgstr ""
-msgid "Cl&ose"
+msgid "Cl&ose\tCtrl+W"
msgstr ""
msgid "Clo&se All"
msgid "Ri&ght Read-only"
msgstr ""
-msgid "File En&coding..."
+msgid "&File Encoding..."
msgstr ""
msgid "Select &All\tCtrl+A"
msgid "Sw&ap Panes"
msgstr ""
+msgid "Swap &1st | 2nd"
+msgstr ""
+
+msgid "Swap &2nd | 3rd"
+msgstr ""
+
+msgid "Swap 1st | &3rd"
+msgstr ""
+
msgid "Com&pare Statistics..."
msgstr ""
msgid "Save &Right As..."
msgstr ""
-msgid "&Print..."
+msgid "&Print...\tCtrl+P"
msgstr ""
msgid "Page Set&up..."
msgid "Re&load\tCtrl+F5"
msgstr ""
-msgid "&File Encoding..."
-msgstr ""
-
msgid "Reco&mpare As"
msgstr ""
-msgid "&Text"
-msgstr ""
-
-msgid "T&able"
-msgstr ""
-
msgid "&XML"
msgstr ""
-msgid "&Binary"
-msgstr ""
-
-msgid "&Image"
-msgstr ""
-
msgid "&Undo\tCtrl+Z"
msgstr ""
msgid "&Clear All Bookmarks"
msgstr ""
-msgid "&Go To...\tCtrl+G"
-msgstr ""
-
msgid "Syntax Highlight"
msgstr ""
msgid "&Toggle All and 0-9 Lines\tCtrl+D"
msgstr ""
+msgid "&Invert (Hide Different Lines)"
+msgstr ""
+
msgid "&Lock Panes"
msgstr ""
msgid "with &External Editor"
msgstr ""
-msgid "Open &Parent Folder..."
-msgstr ""
-
msgid "Open Midd&le"
msgstr ""
msgid "Auto prediffer"
msgstr ""
-msgid "G&oto Diff"
+msgid "G&o to Diff"
msgstr ""
msgid "&No Moved Blocks"
msgid "&All Moved Blocks"
msgstr ""
-msgid "Moved Block for &Current Diff"
-msgstr ""
-
msgid "W&hitespaces"
msgstr ""
msgid "Ig&nore all"
msgstr ""
-msgid "Case sensi&tive"
+msgid "Ignore &case"
msgstr ""
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
msgid "About WinMerge"
msgstr ""
-msgid "Visit the WinMerge HomePage!"
+msgid "Visit the WinMerge Homepage!"
msgstr ""
msgid "OK"
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 "&Apply"
msgstr ""
-msgid "Linefilters"
+msgid "Line Filters"
msgstr ""
msgid "Enable Line Filters"
msgid "Remove"
msgstr ""
+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 "Enable"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Clear"
+msgstr ""
+
msgid "Colors"
msgstr ""
msgid "Items total:"
msgstr ""
-msgid "Go To"
+msgid "Go to"
msgstr ""
-msgid "G&oto:"
+msgid "G&o to:"
msgstr ""
msgid "File"
msgstr ""
-msgid "Goto what"
+msgid "Go to what"
msgstr ""
msgid "Li&ne"
msgid "&Difference"
msgstr ""
-msgid "&Go To"
+msgid "&Go to"
msgstr ""
msgid "Compare"
msgid "Ignore blan&k lines"
msgstr ""
-msgid "Ignore &case"
-msgstr ""
-
msgid "Ignore c&omment differences"
msgstr ""
msgid "Enable indent &heuristic"
msgstr ""
+msgid "Completely unhighlight the ignored differences"
+msgstr ""
+
msgid "Editor"
msgstr ""
msgid "&Rendering Mode:"
msgstr ""
-msgid "Filefilters"
+msgid "File Filters"
msgstr ""
msgid "Test..."
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 "Untitled right"
msgstr ""
+msgid "Base File"
+msgstr ""
+
msgid "Theirs File"
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 ""
msgstr ""
#, c-format
+msgid "Plugin '%2' cannot pack your changes to the middle file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
+msgstr ""
+
+#, c-format
msgid "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
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 "Folder does not exist."
msgstr ""
-msgid "Archive support is not enabled.\nAll needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\nSee manual for more info about archive support and how to enable it."
+msgid "Archive support is not enabled.\nAll needed components (7-Zip and/or Merge7z*.dll) for archive support cannot be found.\nSee manual for more info about archive support and how to enable it."
msgstr ""
msgid "Select file for export"
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 ""
msgstr ""
#, c-format
-msgid "G&oto Line %1"
+msgid "G&o to Line %1"
+msgstr ""
+
+msgid "Go to Moved Line\tCtrl+Shift+G"
msgstr ""
msgid "Disabled"
msgid "Batch"
msgstr ""
-msgid "Lua"
-msgstr ""
-
msgid "Portable Object"
msgstr ""
msgid "Shell"
msgstr ""
-msgid "VHDL"
-msgstr ""
-
msgid "Close &Left Tabs"
msgstr ""
msgid "Enable &Auto Max Width"
msgstr ""
-msgid "frhed is not installed"
+msgid "Frhed is not installed."
msgstr ""
#, c-format
msgid "Page: %d/%d Zoom: %d%% %dx%dpx %dbpp"
msgstr ""
+#, c-format
+msgid "Rc: (%d, %d) "
+msgstr ""
+
+msgid "<Edit here>"
+msgstr ""
+
+msgid "No differences to select found"
+msgstr ""
+
+msgid "No differences found to add as substitution filter"
+msgstr ""
+
+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 "Word-by-word position and text"
+msgstr ""
+
+msgid "Allow only one instance to run"
+msgstr ""
+
+msgid "Allow only one instance to run and wait for the instance to terminate"
+msgstr ""
+
OSDN Git Service
