5.11

1 files changed, 163 insertions, 142 deletions

diff --git a/BUILD/Languages/chinese_traditional.lng b/BUILD/Languages/chinese_traditional.lng
index 69e79b2d..79391ed1 100644
--- a/BUILD/Languages/chinese_traditional.lng
+++ b/BUILD/Languages/chinese_traditional.lng
@@ -32,7 +32,7 @@
 <target>中止請求：正在等待目前操作完成...</target>
 
 <source>Failure to create time stamp for versioning:</source>
-<target></target>
+<target>無法新建時間戳記的版本控制：</target>
 
 <source>RealtimeSync - Automated Synchronization</source>
 <target>即時同步 - 自動同步</target>
@@ -58,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>清除篩選器設定</target>
 
-<source>Create a batch job</source>
-<target>新建一個批次處理作業</target>
+<source>Save as batch job</source>
+<target>另存為批次處理作業</target>
 
 <source>Comparison settings</source>
 <target>比對設定</target>
@@ -79,9 +79,6 @@
 <source>Global settings</source>
 <target>整體設定</target>
 
-<source>Summary</source>
-<target>概要</target>
-
 <source>Find</source>
 <target>尋找</target>
 
@@ -174,7 +171,7 @@
 </target>
 
 <source>Error parsing file %x, row %y, column %z.</source>
-<target>解析檔案 %x、行 %y、列 %z 時出現錯誤。</target>
+<target>解析 %x 檔案，第 %y 列，第 %z 行出現錯誤。</target>
 
 <source>Scanning:</source>
 <target>正在掃瞄：</target>
@@ -224,7 +221,7 @@
 <target>開啟(&O)...</target>
 
 <source>Save &as...</source>
-<target>另存新檔(&a)...</target>
+<target>另存新檔(&A)...</target>
 
 <source>&Quit</source>
 <target>離開(&Q)</target>
@@ -271,11 +268,11 @@
 <source>Select a folder</source>
 <target>選擇一個資料夾</target>
 
-<source>Delay [seconds]</source>
-<target>延遲 [秒]</target>
+<source>Idle time [seconds]</source>
+<target>閒置時間 [秒]</target>
 
 <source>Idle time between last detected change and execution of command</source>
-<target>最後檢測到更改和執行命令之間的閒置時間</target>
+<target>最後檢測到變更和執行命令之間的閒置時間</target>
 
 <source>Command line</source>
 <target>命令列</target>
@@ -287,7 +284,7 @@ The command is triggered if:
 </source>
 <target>
 假如要觸發該命令：
-- 檔案或子資料夾更改
+- 檔案或子資料夾變更
 - 新資料夾到來(例如插入USB隨身碟)
 </target>
 
@@ -321,48 +318,30 @@ The command is triggered if:
 <source>A folder input field is empty.</source>
 <target>資料夾輸入欄位是空的。</target>
 
-<source>File time and size</source>
-<target>檔案大小和日期</target>
-
-<source>File content</source>
-<target>檔案内容</target>
-
-<source><Automatic></source>
-<target><自動></target>
-
-<source>Mirror ->></source>
-<target>鏡像 ->></target>
-
-<source>Update -></source>
-<target>更新 -></target>
-
-<source>Custom</source>
-<target>自訂</target>
-
-<source>FreeFileSync batch</source>
-<target>FreeFileSync批次處理</target>
-
 <source>Synchronization aborted!</source>
 <target>同步已中止！</target>
 
 <source>Synchronization completed with errors!</source>
 <target>同步完成但有錯誤！</target>
 
+<source>Synchronization completed with warnings.</source>
+<target>同步已完成，但出現警告。</target>
+
 <source>Nothing to synchronize!</source>
 <target>沒有什麼東西可同步！</target>
 
-<source>Synchronization completed successfully!</source>
-<target>已成功的完成同步！</target>
+<source>Synchronization completed successfully.</source>
+<target>同步已成功完成。</target>
+
+<source>Saving log file %x...</source>
+<target>正在儲存日誌檔 %x...</target>
 
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>在FreeFileSync主對話框，按下"切換"來解決問題。</target>
+<target>在FreeFileSync主對話框，按下 "切換" 來解決問題。</target>
 
 <source>Switching to FreeFileSync main dialog...</source>
 <target>切換到FreeFileSync主對話框...</target>
 
-<source>Unable to connect to sourceforge.net!</source>
-<target>無法連接到sourceforge.net！</target>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>FreeFileSync有新版本可用：</target>
 
@@ -375,6 +354,12 @@ The command is triggered if:
 <source>Information</source>
 <target>訊息</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>無法連接到sourceforge.net！</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target>目前FreeFileSync版本號碼連線未找到！是否要手動檢查？</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>要每週自動檢查更新FreeFileSync嗎？</target>
 
@@ -438,27 +423,27 @@ The command is triggered if:
 <source>Hibernate</source>
 <target>休眠</target>
 
+<source>&New</source>
+<target>新增(&N)</target>
+
+<source>&Save</source>
+<target>儲存(&S)</target>
+
+<source>Save as &batch job...</source>
+<target>另存為批次處理作業(&B)</target>
+
 <source>1. &Compare</source>
 <target>1. 比對(&C)</target>
 
 <source>2. &Synchronize</source>
 <target>2. 同步(&S)</target>
 
-<source>&New</source>
-<target>新增專案(&N)</target>
-
-<source>&Save</source>
-<target>儲存(&S)</target>
-
 <source>&Language</source>
 <target>語言(&L)</target>
 
 <source>&Global settings...</source>
 <target>整體設定(&G)...</target>
 
-<source>&Create batch job...</source>
-<target>新建批次處理作業(&C)...</target>
-
 <source>&Export file list...</source>
 <target>匯出檔案清單(&E)...</target>
 
@@ -466,7 +451,7 @@ The command is triggered if:
 <target>進階(&A)</target>
 
 <source>&Check for new version</source>
-<target>檢查更新(&C)</target>
+<target>檢查是否有新版本(&C)</target>
 
 <source>Compare</source>
 <target>比對</target>
@@ -492,17 +477,17 @@ The command is triggered if:
 <source>Swap sides</source>
 <target>兩邊交換</target>
 
-<source>Load configuration from file</source>
-<target>從檔案載入配置</target>
+<source>Open</source>
+<target>開啟</target>
 
-<source>Save current configuration to file</source>
-<target>將目前配置儲存到檔案</target>
+<source>Save</source>
+<target>儲存</target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>上次使用的配置(按DEL鍵，從清單中移除)</target>
 
-<source>Show excluded items</source>
-<target>顯示排除的項目</target>
+<source>Hide excluded items</source>
+<target>隱藏排除項目</target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>顯示已篩選或暫時排除的檔案</target>
@@ -535,20 +520,11 @@ The command is triggered if:
 <target>批次處理作業</target>
 
 <source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
-<target>新建一個批次檔來自動執行同步。按兩下此檔案或安排在您的系統任務計畫表：FreeFileSync.exe <工作名稱>.ffs_batch</target>
+<target>新建一個批次檔來自動執行同步。 按兩下此檔案或安排在您的系統任務計畫表： FreeFileSync.exe <工作名稱>.ffs_batch</target>
 
 <source>Help</source>
 <target>說明</target>
 
-<source>Filter files</source>
-<target>篩選檔案</target>
-
-<source>Left</source>
-<target>左邊</target>
-
-<source>Right</source>
-<target>右邊</target>
-
 <source>Error handling</source>
 <target>錯誤處理</target>
 
@@ -570,14 +546,14 @@ The command is triggered if:
 <source>Abort synchronization on first error</source>
 <target>在第一個錯誤出現即中止同步</target>
 
-<source>On completion:</source>
-<target>完成後：</target>
+<source>On completion</source>
+<target>完成後</target>
 
 <source>Show progress dialog</source>
 <target>顯示進度對話框</target>
 
-<source>Generate log file</source>
-<target>產生日誌檔</target>
+<source>Save log</source>
+<target>儲存日誌</target>
 
 <source>Select folder to save log files</source>
 <target>選擇要儲存日誌檔的資料夾</target>
@@ -588,11 +564,8 @@ The command is triggered if:
 <source>Limit maximum number of log files</source>
 <target>限制日誌檔的最大數量</target>
 
-<source>Batch settings</source>
-<target>批次處理設定</target>
-
-<source>Compare by...</source>
-<target>比對選項...</target>
+<source>Select variant</source>
+<target>選擇變數</target>
 
 <source>
 Files are found equal if
@@ -602,6 +575,9 @@ are the same
 </source>
 <target>如果檔案大小和最後修改時間和日期相同則判斷兩者相同</target>
 
+<source>File time and size</source>
+<target>檔案大小和日期</target>
+
 <source>
 Files are found equal if
      - file content
@@ -609,24 +585,36 @@ is the same
 </source>
 <target>如果檔案内容相同則判斷兩者相同</target>
 
+<source>File content</source>
+<target>檔案内容</target>
+
 <source>Symbolic Link handling</source>
 <target>符號連結處理</target>
 
 <source>OK</source>
 <target>確定</target>
 
-<source>Select variant:</source>
-<target>選擇變數：</target>
+<source><- Two way -></source>
+<target><- 雙向 -></target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>對兩邊使用同一個資料庫來識別和傳送更改。自動檢測刪除、重新命名和衝突部份。</target>
+<target>對兩邊使用同一個資料庫來識別和傳送變更。 自動檢測刪除、重新命名和衝突部份。</target>
+
+<source>Mirror ->></source>
+<target>鏡像 ->></target>
 
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>鏡像備份的左邊的資料夾。同步後，右邊的資料夾進行修改以完全相配左邊的資料夾。</target>
+<target>鏡像備份的左邊的資料夾。 同步後，右邊的資料夾進行修改以完全相配左邊的資料夾。</target>
+
+<source>Update -></source>
+<target>更新 -></target>
 
 <source>Copy new or updated files to right folder.</source>
 <target>將新的或更新過的檔案複製到右邊的資料夾中。</target>
 
+<source>Custom</source>
+<target>自訂</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>配置你自己的同步規則。</target>
 
@@ -642,8 +630,8 @@ is the same
 <source>Recycle Bin</source>
 <target>資源回收筒</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>當刪除或覆蓋檔案時使用資源回收筒</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target>將刪除和覆蓋的檔案移動到資源回收筒</target>
 
 <source>Versioning</source>
 <target>版本控制</target>
@@ -651,8 +639,8 @@ is the same
 <source>Move time-stamped files into specified folder</source>
 <target>將時間戳記檔案移動到指定的資料夾</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>限制每個檔案版本的最大數量</target>
+<source>Naming convention:</source>
+<target>命名慣例：</target>
 
 <source>Configuration</source>
 <target>配置</target>
@@ -748,7 +736,7 @@ Note: File names must be relative to base directories!
 <target>故障保護檔案複製</target>
 
 <source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
-<target>第一次將檔寫入到一個暫存(*.ffs_tmp)，順便將它們重新命名。即使在嚴重錯誤的情況下，還可確保一致的狀態。</target>
+<target>第一次將檔寫入到一個暫存(*.ffs_tmp)，順便將它們重新命名。 即使在嚴重錯誤的情況下，還可確保一致的狀態。</target>
 
 <source>Copy locked files</source>
 <target>複製被鎖定的檔案</target>
@@ -801,6 +789,9 @@ Note: File names must be relative to base directories!
 <source>Overview</source>
 <target>摘要</target>
 
+<source>Filter files</source>
+<target>篩選檔案</target>
+
 <source>Select view</source>
 <target>選擇檢視</target>
 
@@ -852,24 +843,27 @@ Note: File names must be relative to base directories!
 <source><Last session></source>
 <target><最後連線></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>資料夾比對和同步</target>
+
 <source>Configuration saved!</source>
 <target>配置已儲存！</target>
 
+<source>FreeFileSync batch</source>
+<target>FreeFileSync批次處理</target>
+
 <source>Never save changes</source>
-<target>從不更改儲存</target>
+<target>不要儲存變更</target>
 
 <source>Do you want to save changes to %x?</source>
-<target>是否要更改儲存到 %x？</target>
+<target>是否要儲存變更到 %x？</target>
 
 <source>Do&n't save</source>
-<target>不儲存(&n)</target>
+<target>不儲存(&N)</target>
 
 <source>Configuration loaded!</source>
 <target>配置已載入！</target>
 
-<source>Folder Comparison and Synchronization</source>
-<target>資料夾比對和同步</target>
-
 <source>Hide files that exist on left side only</source>
 <target>隱藏只存在於左邊的檔案</target>
 
@@ -995,7 +989,7 @@ Note: File names must be relative to base directories!
 <pluralform>%x of %y rows in view</pluralform>
 </source>
 <target>
-<pluralform>顯示 %y 之 %x 行</pluralform>
+<pluralform>檢視中的 %x 之 %y 列</pluralform>
 </target>
 
 <source>Ignore further errors</source>
@@ -1022,6 +1016,9 @@ Note: File names must be relative to base directories!
 <source>Comparing content...</source>
 <target>正在比對内容...</target>
 
+<source>Copy</source>
+<target>複製</target>
+
 <source>Paused</source>
 <target>已暫停</target>
 
@@ -1080,13 +1077,13 @@ Note: File names must be relative to base directories!
 <target>直接</target>
 
 <source>Follow</source>
-<target>遵循</target>
+<target>遵從</target>
 
 <source>Copy NTFS permissions</source>
 <target>複製NTFS權限</target>
 
 <source>Integrate external applications into context menu. The following macros are available:</source>
-<target>整合上下文功能表中的外部應用程式。可以使用下面的巨集：</target>
+<target>整合上下文功能表中的外部應用程式。 可以使用下面的巨集：</target>
 
 <source>- full file or folder name</source>
 <target>- 完整檔案或資料夾名稱</target>
@@ -1094,14 +1091,14 @@ Note: File names must be relative to base directories!
 <source>- folder part only</source>
 <target>- 只有資料夾一部分</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- 另一邊對應到 %name</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target>- 另一邊對應到 %item_path%</target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- 另一邊對應到 %dir</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target>- 另一邊對應到 %item_folder%</target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>讓隱藏的對話框和警告訊息再被看見嗎？</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target>使隱藏的警告和對話框再次可見？</target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1122,44 +1119,29 @@ Note: File names must be relative to base directories!
 <source>Leave as unresolved conflict</source>
 <target>保留給未解決的衝突</target>
 
-<source>Files</source>
-<target>檔案</target>
+<source>Replace</source>
+<target>取代</target>
 
-<source>Percentage</source>
-<target>百分比</target>
+<source>Move files and replace if existing</source>
+<target>如果存在，移動檔案並取代</target>
 
-<source>%x TB</source>
-<target>%x TB</target>
+<source>Append a timestamp to each file name</source>
+<target>將時間戳記附加到每個檔案名稱上</target>
 
-<source>%x PB</source>
-<target>%x PB</target>
+<source>Folder</source>
+<target>資料夾</target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target>檔案</target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>%x 分</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target>YYYY-MM-DD hhmmss</target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>%x 小時</pluralform>
-</target>
+<source>Files</source>
+<target>檔案</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>%x 天</pluralform>
-</target>
+<source>Percentage</source>
+<target>百分比</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>無法監測目錄 %x。</target>
@@ -1209,6 +1191,9 @@ Note: File names must be relative to base directories!
 <source>Cannot copy file %x to %y.</source>
 <target>無法複製檔案 %x 到 %y。</target>
 
+<source>Type of item %x is not supported:</source>
+<target>項目類型 %x 不被支援：</target>
+
 <source>Cannot open directory %x.</source>
 <target>無法開啟目錄 %x。</target>
 
@@ -1218,6 +1203,39 @@ Note: File names must be relative to base directories!
 <source>Detected endless directory recursion.</source>
 <target>檢測到無限目錄遞迴。</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>%x 分</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>%x 小時</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>%x 天</pluralform>
+</target>
+
 <source>Cannot set privilege %x.</source>
 <target>無法設定權限 %x。</target>
 
@@ -1225,13 +1243,13 @@ Note: File names must be relative to base directories!
 <target>無法將 %x 移動到資源回收筒！</target>
 
 <source>Both sides have changed since last synchronization!</source>
-<target>自上次同步後，兩邊均已更改過！</target>
+<target>自上次同步後，兩邊均已變更過！</target>
 
 <source>Cannot determine sync-direction:</source>
 <target>無法判斷同步方向：</target>
 
 <source>No change since last synchronization!</source>
-<target>自上次同步以來都沒有更改！</target>
+<target>自上次同步以來都沒有變更！</target>
 
 <source>The corresponding database entries are not in sync considering current settings.</source>
 <target>相應的資料庫條目在同步時，不考慮到目前的設定。</target>
@@ -1252,7 +1270,7 @@ Note: File names must be relative to base directories!
 <target>目錄有依靠性！請小心設定同步規則：</target>
 
 <source>Start comparison</source>
-<target>開始比較</target>
+<target>開始比對</target>
 
 <source>Preparing synchronization...</source>
 <target>正在準備同步...</target>
@@ -1348,7 +1366,7 @@ Note: File names must be relative to base directories!
 <target>正在移動符號連結 %x 到 %y</target>
 
 <source>Removing old versions...</source>
-<target></target>
+<target>正在刪除舊版本...</target>
 
 <source>Creating file %x</source>
 <target>正在新建檔案 %x</target>
@@ -1371,6 +1389,9 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>正在更新 %x 個屬性</target>
 
+<source>Target folder %x already existing.</source>
+<target>目標資料夾 %x 已存在。</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>目標資料夾輸入欄位不能為空。</target>
 
@@ -1380,11 +1401,8 @@ Note: File names must be relative to base directories!
 <source>Source folder %x not found.</source>
 <target>來源資料夾 %x 找不到。</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>存在未解決的衝突！</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>你可以忽略衝突，並繼續同步。</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target>下列項目有未解決的衝突，將不會同步：</target>
 
 <source>Significant difference detected:</source>
 <target>檢測到顯著的差異：</target>
@@ -1402,14 +1420,17 @@ Note: File names must be relative to base directories!
 <target>可用：</target>
 
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
-<target>一個將被修改的資料夾，是多個配對資料夾的一部分。請檢查同步設定。</target>
+<target>一個將被修改的資料夾，是多個配對資料夾的一部分。 請檢查同步設定。</target>
+
+<source>Left</source>
+<target>左邊</target>
+
+<source>Right</source>
+<target>右邊</target>
 
 <source>Synchronizing folder pair:</source>
 <target>同步配對資料夾：</target>
 
-<source>Target folder %x already existing.</source>
-<target>目標資料夾 %x 已存在。</target>
-
 <source>Generating database...</source>
 <target>正在產生資料庫...</target>