msgid "Copy fro&m Right"
msgstr "從右邊複製(&M)"
-#, c-format
-msgid "&Select Line Difference"
-msgstr "選取行內差異(&S)"
+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 "選取行內差異(&S)\tF4"
+
+msgid "Add this change to Substitution &Filters"
+msgstr ""
#, c-format
msgid "&Undo"
msgid "&Paste"
msgstr "貼上(&P)"
-#, c-format
-msgid "&Goto..."
-msgstr "跳至(&G)..."
+msgid "&Go to...\tCtrl+G"
+msgstr "跳至(&G)...\tCtrl+G"
+
+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 ""
#, c-format
msgid "Op&en"
msgid "&With..."
msgstr "用(&W)..."
+msgid "Open &Parent Folder..."
+msgstr ""
+
msgid "S&hell Menu"
msgstr ""
msgid "&Horizontal Wipe"
msgstr ""
+msgid "&Rectangle Select"
+msgstr ""
+
#, c-format
msgid "&Set Background Color"
msgstr "設定背景顏色(&S)"
msgid "&Vector Image Scaling"
msgstr ""
+msgid "Compare Extracted &Text From Image"
+msgstr ""
+
#, c-format
msgid "&File"
msgstr "檔案(&F)"
#, c-format
-msgid "&New\tCtrl+N"
-msgstr "新增(&N)\tCtrl+N"
+msgid "&New"
+msgstr "新增(&N)"
+
+#, c-format
+msgid "&Text"
+msgstr ""
+
+msgid "T&able"
+msgstr ""
+
+#, c-format
+msgid "&Binary"
+msgstr "二進制(&B)"
+
+#, c-format
+msgid "&Image"
+msgstr "圖片(&I)"
#, c-format
msgid "New (&3 panes)"
msgid "< Empty >"
msgstr "< 無 >"
-#, c-format
-msgid "E&xit"
-msgstr "結束(&X)"
+msgid "E&xit\tCtrl+Q"
+msgstr "結束(&X)\tCtrl+Q"
#, c-format
msgid "&Edit"
msgid "&Window"
msgstr "視窗(&W)"
-#, c-format
-msgid "Cl&ose"
-msgstr "關閉(&O)"
+msgid "Cl&ose\tCtrl+W"
+msgstr "關閉(&O)\tCtrl+W"
#, c-format
msgid "Clo&se All"
msgstr "右邊唯讀(&G)"
#, c-format
-msgid "File En&coding..."
-msgstr "檔案編碼(&C)..."
+msgid "&File Encoding..."
+msgstr "檔案編碼(&F)..."
#, c-format
msgid "Select &All\tCtrl+A"
msgid "Sw&ap Panes"
msgstr "窗格交換(&A)"
+msgid "Swap &1st | 2nd"
+msgstr ""
+
+msgid "Swap &2nd | 3rd"
+msgstr ""
+
+msgid "Swap 1st | &3rd"
+msgstr ""
+
#, c-format
msgid "Com&pare Statistics..."
msgstr "統計比較結果(&P)"
msgid "Save &Right As..."
msgstr "儲存右邊為(&R)..."
-#, c-format
-msgid "&Print..."
-msgstr "列印(&P)..."
+msgid "&Print...\tCtrl+P"
+msgstr "列印(&P)...\tCtrl+P"
msgid "Page Set&up..."
msgstr "設定列印格式(&U)..."
msgstr "重新載入(&L)\tCtrl+F5"
#, c-format
-msgid "&File Encoding..."
-msgstr "檔案編碼(&F)..."
-
-#, c-format
msgid "Reco&mpare As"
msgstr "重新比較(&M)"
#, c-format
-msgid "&Text"
-msgstr ""
-
-msgid "T&able"
-msgstr ""
-
-#, c-format
msgid "&XML"
msgstr "&XML"
#, c-format
-msgid "&Binary"
-msgstr "二進制(&B)"
-
-#, c-format
-msgid "&Image"
-msgstr "圖片(&I)"
-
-#, c-format
msgid "&Undo\tCtrl+Z"
msgstr "復原(&U)\tCtrl+Z"
msgstr "清除全部書籤(&C)"
#, c-format
-msgid "&Go To...\tCtrl+G"
-msgstr "移至(&G)...\tCtrl+G"
-
-#, c-format
msgid "Syntax Highlight"
msgstr "語法高亮度顯示"
msgid "&Toggle All and 0-9 Lines\tCtrl+D"
msgstr "切換全部行和 0-9 行(&T)\tCtrl+D"
+msgid "&Invert (Hide Different Lines)"
+msgstr ""
+
#, c-format
msgid "&Lock Panes"
msgstr "鎖住窗格(&L)"
msgstr "開啟左邊(&O)"
#, c-format
-msgid "with &External Editor"
+msgid "With &External Editor"
msgstr "用外在編輯器(&E)"
-msgid "Open &Parent Folder..."
-msgstr ""
-
#, c-format
msgid "Open Midd&le"
msgstr "開啟中間(&L)"
msgid "Auto prediffer"
msgstr "自動先行處理器"
-#, c-format
-msgid "G&oto Diff"
+msgid "G&o to Diff"
msgstr "至差異區塊(&O)"
#, c-format
msgstr "顯示移位區塊(&A)"
#, c-format
-msgid "Moved Block for &Current Diff"
-msgstr "就目前差異處顯示其移位區塊(&C)"
-
-#, c-format
msgid "W&hitespaces"
msgstr "空格(&H)"
msgstr "忽略全部(&N)"
#, c-format
-msgid "Case sensi&tive"
-msgstr "å\8d\80å\88\86大å°\8f寫(&T)"
+msgid "Ignore &case"
+msgstr "忽ç\95¥å¤§å°\8f寫(&C)"
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
msgid "About WinMerge"
msgstr "關於 WinMerge"
-#, c-format
-msgid "Visit the WinMerge HomePage!"
+msgid "Visit the WinMerge Homepage!"
msgstr "拜訪 WinMerge 首頁!"
#, c-format
msgid "Automatically &scroll to first difference"
msgstr "自動捲至最初差異(&S)"
+msgid "Automatically s&croll to first inline difference"
+msgstr ""
+
msgid "Cl&ose windows with 'Esc':"
msgstr "按 'Esc' 關閉視窗(&O):"
msgid "&Automatically verify paths in Open-dialog"
msgstr "於「開啟」對話方塊自動檢驗路徑(&A)"
-#, c-format
-msgid "All&ow only one instance to run"
-msgstr "不能同時執行一個以上本程式(&O)"
+msgid "Single instance mode:"
+msgstr ""
#, c-format
msgid "As&k when closing multiple windows"
msgid "&Apply"
msgstr "套用(&A)"
-#, c-format
-msgid "Linefilters"
-msgstr "行之篩除器"
+msgid "Line Filters"
+msgstr ""
#, c-format
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 ""
+
#, c-format
msgid "Colors"
msgstr "色彩"
msgid "Items total:"
msgstr "項目總數:"
-#, c-format
-msgid "Go To"
+msgid "Go to"
msgstr "移至"
-#, c-format
-msgid "G&oto:"
+msgid "G&o to:"
msgstr "移至(&O):"
#, c-format
msgid "File"
msgstr "檔案"
-#, c-format
-msgid "Goto what"
+msgid "Go to what"
msgstr "移至"
#, c-format
msgid "&Difference"
msgstr "差異區塊(&D)"
-#, c-format
-msgid "&Go To"
+msgid "&Go to"
msgstr "移至(&G)"
#, c-format
msgid "Ignore blan&k lines"
msgstr "忽略空白行(&K)"
-#, c-format
-msgid "Ignore &case"
-msgstr "忽略大小寫(&C)"
+msgid "Ignore c&omment differences"
+msgstr ""
#, c-format
msgid "E&nable moved block detection"
msgid "Enable indent &heuristic"
msgstr ""
-#, c-format
-msgid "Comments"
-msgstr "備註"
-
-#, c-format
-msgid "Filter Comments"
-msgstr "篩選器註解"
+msgid "Completely unhighlight the ignored differences"
+msgstr ""
#, c-format
msgid "Editor"
msgid "&Rendering Mode:"
msgstr ""
-#, c-format
-msgid "Filefilters"
-msgstr "檔案篩選器"
+msgid "File Filters"
+msgstr ""
msgid "Test..."
msgstr "測試..."
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr "於載入 non-unicode 檔案時改變所用的編碼頁成:"
-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 ""
"偵測後面檔案的編碼頁資訊:.html, .rc, .xml \n"
"需要重新啟動程式。"
-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 "偵測使用 mlang.dll 文字檔案的編碼頁資訊\n需要重新啟動程式。"
#, c-format
msgid "&Enable image compare in folder compare"
msgstr ""
+msgid "OCR result:"
+msgstr ""
+
#, c-format
msgid "&Hex View"
msgstr "二進制顯示(&H)"
"WinMerge.資料夾比較\n"
"WinMerge 資料夾比較"
-msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaka, Gal Hammer, Alexander Skinner"
-msgstr ""
-"研發者:\n"
-"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaka, Gal Hammer, Alexander Skinner"
-
#, c-format
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 "絕不保證自由軟體 WinMerge 無瑕疵。歡迎在某些條件下再散發它;細節見說明選單中的 GNU 公共授權證。"
msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
msgstr "如果要再顯示這個訊息,請在選項對話視窗內的一般頁面點擊重設按鈕"
-msgid "Color Schemes"
-msgstr ""
-
#, c-format
msgid "Syntax"
msgstr "語法"
+msgid "Color Schemes"
+msgstr ""
+
msgid "Folder Compare"
msgstr ""
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "XML 檔 (*.xml)|*.xml|All Files (*.*)|*.*||"
+msgid "File Type"
+msgstr ""
+
+#, c-format
+msgid "Extension"
+msgstr "副檔名"
+
#, c-format
msgid "Name"
msgstr "名稱"
msgid "Untitled right"
msgstr "未設標題的右邊"
+msgid "Base File"
+msgstr ""
+
#, c-format
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 "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr "Ln: %s Col: %d/%d Ch: %d/%d"
#, c-format
+msgid " Sel: %d | %d"
+msgstr ""
+
+#, c-format
msgid "Merge"
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"
"\n"
msgstr "中間日期"
#, c-format
-msgid "Extension"
-msgstr "副檔名"
-
-#, c-format
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 "資料夾不存在。"
-#, c-format
-msgid ""
-"Archive support is not enabled.\n"
-"All needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\n"
-"See 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 ""
"未啟用壓縮支援。\n"
"找不到支援壓縮的所有必要元件 (7-Zip 和/或 Merge7z*.dll)。\n"
msgid "\nAuto Merge (Ctrl+Alt+M)"
msgstr "\n自動合併 (Ctrl+Alt+M)"
+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 "至第 %1 行(&O)"
+msgid "Go to Moved Line\tCtrl+Shift+G"
+msgstr ""
+
#, c-format
msgid "Disabled"
msgstr "關閉"
msgid "Batch"
msgstr "Batch"
-msgid "Lua"
-msgstr ""
-
#, c-format
msgid "Portable Object"
msgstr "可攜式物件"
msgstr "Shell"
#, c-format
-msgid "VHDL"
-msgstr "VHDL"
-
-#, c-format
msgid "Close &Left Tabs"
msgstr "關閉左邊分頁(&L)"
msgid "Enable &Auto Max Width"
msgstr "開啟自動最大寬度(&A)"
-#, c-format
-msgid "frhed is not installed"
-msgstr "frhed 未安裝"
+msgid "Frhed is not installed."
+msgstr "Frhed 未安裝"
#, c-format
msgid "%1 does not exist. Do you want to create it?"
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 ""
+
+#, c-format
+msgid "Allow only one instance to run"
+msgstr "不能同時執行一個以上本程式"
+
+msgid "Allow only one instance to run and wait for the instance to terminate"
+msgstr ""