Add "Open Parent Folder" menu item to the file compare window's context menu

[winmerge-jp/winmerge-jp.git] / Translations / WinMerge / English.pot

diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index 42788b0..f2c9005 100644 (file)
--- 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: 2020-12-31 11:40+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"
@@ -32,9 +32,24 @@ msgstr ""
 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 Substitution &Filters"
+msgstr ""
+
 msgid "&Undo"
 msgstr ""
 
@@ -71,6 +86,9 @@ msgstr ""
 msgid "&With..."
 msgstr ""
 
+msgid "Open &Parent Folder..."
+msgstr ""
+
 msgid "S&hell Menu"
 msgstr ""
 
@@ -154,6 +172,9 @@ msgstr ""
 msgid "&Vector Image Scaling"
 msgstr ""
 
+msgid "Compare Extracted &Text From Image"
+msgstr ""
+
 msgid "&File"
 msgstr ""
 
@@ -163,6 +184,9 @@ msgstr ""
 msgid "&Text"
 msgstr ""
 
+msgid "T&able"
+msgstr ""
+
 msgid "&Binary"
 msgstr ""
 
@@ -307,7 +331,7 @@ msgstr ""
 msgid "Ri&ght Read-only"
 msgstr ""
 
-msgid "File En&coding..."
+msgid "&File Encoding..."
 msgstr ""
 
 msgid "Select &All\tCtrl+A"
@@ -376,6 +400,15 @@ msgstr ""
 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 ""
 
@@ -469,15 +502,9 @@ msgstr ""
 msgid "Re&load\tCtrl+F5"
 msgstr ""
 
-msgid "&File Encoding..."
-msgstr ""
-
 msgid "Reco&mpare As"
 msgstr ""
 
-msgid "T&able"
-msgstr ""
-
 msgid "&XML"
 msgstr ""
 
@@ -763,9 +790,6 @@ msgstr ""
 msgid "with &External Editor"
 msgstr ""
 
-msgid "Open &Parent Folder..."
-msgstr ""
-
 msgid "Open Midd&le"
 msgstr ""
 
@@ -990,7 +1014,7 @@ 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"
@@ -1044,7 +1068,7 @@ msgstr ""
 msgid "Find &Prev"
 msgstr ""
 
-msgid "&OK"
+msgid "&Ok"
 msgstr ""
 
 msgid "Replace"
@@ -1086,13 +1110,10 @@ msgstr ""
 msgid "&Background color:"
 msgstr ""
 
-msgid "&Ok"
-msgstr ""
-
 msgid "&Apply"
 msgstr ""
 
-msgid "Linefilters"
+msgid "Line Filters"
 msgstr ""
 
 msgid "Enable Line Filters"
@@ -1107,6 +1128,21 @@ msgstr ""
 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 ""
 
@@ -1329,6 +1365,9 @@ msgstr ""
 msgid "Enable indent &heuristic"
 msgstr ""
 
+msgid "Completely unhighlight the ignored differences"
+msgstr ""
+
 msgid "Editor"
 msgstr ""
 
@@ -1371,7 +1410,7 @@ msgstr ""
 msgid "&Rendering Mode:"
 msgstr ""
 
-msgid "Filefilters"
+msgid "File Filters"
 msgstr ""
 
 msgid "Test..."
@@ -1431,10 +1470,10 @@ 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"
@@ -1811,6 +1850,9 @@ msgstr ""
 msgid "&Enable image compare in folder compare"
 msgstr ""
 
+msgid "OCR result:"
+msgstr ""
+
 msgid "&Hex View"
 msgstr ""
 
@@ -1865,9 +1907,6 @@ 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 ""
 
@@ -1910,10 +1949,10 @@ 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"
@@ -1985,6 +2024,12 @@ msgstr ""
 msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
 msgstr ""
 
+msgid "File Type"
+msgstr ""
+
+msgid "Extension"
+msgstr ""
+
 msgid "Name"
 msgstr ""
 
@@ -2051,12 +2096,18 @@ 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 ""
@@ -2069,6 +2120,10 @@ msgstr ""
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
+#, c-format
+msgid "  Sel: %d | %d"
+msgstr ""
+
 msgid "Merge"
 msgstr ""
 
@@ -2186,6 +2241,10 @@ msgid "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\n
 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 ""
 
@@ -2362,9 +2421,6 @@ msgstr ""
 msgid "Middle Date"
 msgstr ""
 
-msgid "Extension"
-msgstr ""
-
 msgid "Left Size"
 msgstr ""
 
@@ -2699,6 +2755,12 @@ 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 ""
@@ -2906,6 +2968,18 @@ 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 ""
 
@@ -2966,12 +3040,6 @@ msgstr ""
 msgid "Batch"
 msgstr ""
 
-msgid "JavaScript"
-msgstr ""
-
-msgid "Lua"
-msgstr ""
-
 msgid "Portable Object"
 msgstr ""
 
@@ -2981,9 +3049,6 @@ msgstr ""
 msgid "Shell"
 msgstr ""
 
-msgid "VHDL"
-msgstr ""
-
 msgid "Close &Left Tabs"
 msgstr ""
 
@@ -3136,3 +3201,33 @@ msgstr ""
 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 ""
+