Updated

Tortoise_zh_TW.po

@@ -12,7 +12,7 @@
 # Hydriz Scholz <hydriz@jorked.com>, 2013,2015
 # Jack Chang, 2017
 # Sven Strickroth <sstrickroth@googlemail.com>, 2013
-# Yue Lin Ho <yuelinho777@gmail.com>, 2014-2017
+# Yue Lin Ho <yuelinho777@gmail.com>, 2014-2018
 # 乙酸鋰 <ch3cooli@gmail.com>, 2012,2017
 # Yue Lin Ho <yuelinho777@gmail.com>, 2017
 # 乙酸鋰 <ch3cooli@gmail.com>, 2012-2013
@@ -21,8 +21,8 @@ msgstr ""
 "Project-Id-Version: TortoiseGit\n"
 "Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n"
 "POT-Creation-Date: 1900-01-01 00:00+0000\n"
-"PO-Revision-Date: 2018-01-21 21:11+0000\n"
-"Last-Translator: Sven Strickroth <sstrickroth@googlemail.com>\n"
+"PO-Revision-Date: 2018-02-14 03:45+0000\n"
+"Last-Translator: Yue Lin Ho <yuelinho777@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/lznuaa/tortoisegit/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -749,7 +749,7 @@ msgstr "隱藏 (&H)"
 #. Resource IDs: (cmdShowFileList_LabelTitle_RESID)
 msgid "&Hide/Show the patch file list"
-msgstr ""
+msgstr "「隱藏／顯示」補綴檔列表(&H)"
 #. Resource IDs: (Dialog IDD_SETOVERLAYICONS: Control id 1170)
 msgid "&Icon Set:"
@@ -2309,7 +2309,7 @@ msgstr "Git 預設行為並不會「儲存／快取」憑證，然而，你可
 #. Resource IDs: (cmdCopy_Keytip_RESID)
 msgid "C"
-msgstr ""
+msgstr "C"
 #. Resource IDs: (Dialog IDD_FIRSTSTARTWIZARD_GIT: Control id 1216, Dialog
 #. IDD_SETTINGSMAIN: Control id 1215, Dialog IDD_SETTINGSMAIN: Control id
@@ -3008,7 +3008,7 @@ msgstr "組態類型："
 #. Resource IDs: (cmdRegexFilterConfig2_LabelTitle_RESID)
 msgid "Configure Filter Regex"
-msgstr ""
+msgstr "設定篩選器 Regex"
 #. Resource IDs: (IDS_CONFIGUREREGEXES, ID_REGEXFILTER - Menu)
 msgid "Configure Filter Regexes"
@@ -4142,7 +4142,7 @@ msgstr "Dumy Group For locat TabCtr"
 #. Resource IDs: (cmdEditEnabled_Keytip_RESID, cmdTabEdit_Keytip_RESID)
 msgid "E"
-msgstr ""
+msgstr "E"
 #. Resource IDs: (IDS_PROC_REBASE_UNSELECTED_EDIT)
 msgid "E&dit unselected"
@@ -4549,7 +4549,7 @@ msgstr "外部程式："
 #. Resource IDs: (cmdFind_Keytip_RESID)
 msgid "F"
-msgstr ""
+msgstr "F"
 #. Resource IDs: (IDS_MENUFETCH)
 msgid "F&etch..."
@@ -4834,7 +4834,7 @@ msgstr "篩選器:"
 #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 65535)
 msgid "Filtered"
-msgstr ""
+msgstr "已篩選的"
 #. Resource IDs: (Dialog IDD_FIND: Control id 139, Dialog IDD_FIND: Control id
 #. 20100, ID_EDIT_FIND - Menu, cmdFind_LabelTitle_RESID)
@@ -5071,7 +5071,7 @@ msgstr "更多提交視窗的選項在視窗 3。"
 #. Resource IDs: (cmdGotoLine_Keytip_RESID)
 msgid "G"
-msgstr ""
+msgstr "G"
 #. Resource IDs: (IDS_VIEW_SHOWGRAVATAR)
 msgid "G&ravatar"
@@ -6057,7 +6057,7 @@ msgid ""
 "Do you want to ignore this warning and keep these lines or abort committing in order to edit the commit message?\n"
 "\n"
 "You can automatically remove these lines by enabling \"Strip lines starting with \"#\" in commit messages\" in TortoiseGit settings."
-msgstr ""
+msgstr "提交訊息似乎含有「衝突提示」（有一行「# Conflicts:」），這個提示是 Git 為命令列介面的使用者而自動附加的，實際上並不需要被保留。\n\n你是否想要「忽略」這個警告，保留提示內容直接提交？或者「中止」提交，以重編提交訊息？\n\n註：如果你想要自動移除這些提示，可以進入設定畫面啟用『移除以「#」開頭的提交訊息』。"
 #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 1074)
 msgid "J&ump to first conflict when loading"
@@ -6099,7 +6099,7 @@ msgstr "韓文"
 #. Resource IDs: (cmdViewWrapLines_Keytip_RESID)
 msgid "L"
-msgstr ""
+msgstr "L"
 #. Resource IDs: (Dialog IDD_CLONE: Control id 1847)
 msgid "LFS"
@@ -6620,15 +6620,15 @@ msgstr "我的檔案："
 #. Resource IDs: (cmdNavigateNextConflict_Keytip_RESID)
 msgid "NC"
-msgstr ""
+msgstr "NC"
 #. Resource IDs: (cmdNavigateNextDifference_Keytip_RESID)
 msgid "ND"
-msgstr ""
+msgstr "ND"
 #. Resource IDs: (cmdNavigateNextInlineDiff_Keytip_RESID)
 msgid "NI"
-msgstr ""
+msgstr "NI"
 #. Resource IDs: (59138)
 msgid "NUM"
@@ -6810,7 +6810,7 @@ msgstr "從上次提交以來沒有任何檔案\n變動或加入。\n要檢視
 #. Resource IDs: (33002)
 msgid "No filter"
-msgstr ""
+msgstr "不篩選"
 #. Resource IDs: (IDS_PROC_NOMSYSGIT)
 msgid ""
@@ -7230,7 +7230,7 @@ msgstr "遠端名稱"
 #. Resource IDs: (IDS_VIEW_SHOWROTHERLABELS)
 msgid "Other refs"
-msgstr ""
+msgstr "其它參照"
 #. Resource IDs: (IDS_STATGRAPH_OTHERGROUP)
 msgid "Others"
@@ -7270,15 +7270,15 @@ msgstr "版面設定(&A)..."
 #. Resource IDs: (cmdNavigatePreviousConflict_Keytip_RESID)
 msgid "PC"
-msgstr ""
+msgstr "PC"
 #. Resource IDs: (cmdNavigatePreviousDifference_Keytip_RESID)
 msgid "PD"
-msgstr ""
+msgstr "PD"
 #. Resource IDs: (cmdNavigatePreviousInlineDiff_Keytip_RESID)
 msgid "PI"
-msgstr ""
+msgstr "PI"
 #. Resource IDs: (AFX_IDS_PRINTPAGENUM)
 #, c-format
@@ -7488,7 +7488,7 @@ msgid ""
 "Please see the <a id=\"manual\">manual</a> for general hints. E.g. in most "
 "dialogs there are some shared shortcuts such as F5 for refresh or CTRL+F for"
 " search and oftentimes there are powerful context menus."
-msgstr ""
+msgstr "請查閱<a id=\"manual\">手冊</a>以取得更多詳細的提示。例如：在大多數的視窗中，可以按 F5 來更新畫面，或者按 CTRL + F 搜尋內容，另外許多地方都有強大的快顯功能表可用。"
 #. Resource IDs: (IDS_ERR_NOHOOKTYPESPECIFIED)
 msgid "Please select a hook type"
@@ -7763,7 +7763,7 @@ msgstr "QuotePath"
 #. Resource IDs: (cmdReload_Keytip_RESID)
 msgid "R"
-msgstr ""
+msgstr "R"
 #. Resource IDs: (Dialog IDD_SETTINGSOVERLAY: Control id 1073)
 msgid "R&AM drives"
@@ -8095,7 +8095,7 @@ msgstr "移除不適用的鎖定檔案"
 #. Resource IDs: (Dialog IDD_CLEAN: Control id 1631)
 msgid "Remove unmanaged directories with .git folder (-f)"
-msgstr ""
+msgstr "移除含有 .git 檔但不再被管理的資料夾 (-f)"
 #. Resource IDs: (Dialog IDD_CLEAN: Control id 1626)
 msgid "Remove untracked directories (-d)"
@@ -8423,7 +8423,7 @@ msgstr "當工作目錄如下時執行："
 #. Resource IDs: (cmdSave_Keytip_RESID)
 msgid "S"
-msgstr ""
+msgstr "S"
 #. Resource IDs: (Dialog IDD_MERGEABORT: Control id 1383, Dialog IDD_RESET:
 #. Control id 1383)
@@ -10257,7 +10257,7 @@ msgid ""
 "have a look into its settings dialog. The settings dialog is reachable using"
 " the start menu or the context menu of the Windows Explorer: TortoiseGit -> "
 "Settings."
-msgstr ""
+msgstr "這是「首次啟動精靈」，用來幫助你完成基本的設定值。其實 TortoiseGit 有相當多的組態能夠被設定，所以相當值得你進入設定畫面瞧個究竟；你可以使用「Windows 開始選單」或者「檔案總管的快顯功能表：TortoiseGit -> Settings」來開啟設定畫面。"
 #. Resource IDs: (IDS_PROC_LOG_ONLYONCE)
 msgid ""
@@ -10282,7 +10282,7 @@ msgstr "這會保留合併點的提交。然而，它在調整提交的順序上
 msgid ""
 "This program is linked to the missing export %Ts in the file %Ts. This "
 "machine may have an incompatible version of %Ts."
-msgstr "這個程式連結到遺失的匯出項目 %Ts (在檔案 %Ts)。這個電腦的 %Ts 版本可能不相容。"
+msgstr "這個程式連結到遺失的匯出項目 %Ts（在檔案 %Ts）。這個電腦的 %Ts 版本可能不相容。"
 #. Resource IDs: (AFX_IDP_DLL_LOAD_FAILED)
 #, c-format
@@ -10490,7 +10490,7 @@ msgid ""
 " agent for caching the password (done automatically if a PuTTY key is "
 "configured for a remote). For advanced tips & tricks see our <a "
 "id=\"manual\">manual</a> and <a id=\"sshfaq\">FAQ</a>."
-msgstr ""
+msgstr "建議使用 TortoiseGitPlink 做為你的 SSH 客戶端程式。如果你還沒有「金鑰對(key pair)」，你應該產生一組，並將私鑰存放在安全的地方以備後用，然後在伺服端設定好你的公鑰；使用 PuTTY 認證代理程式（Pageant）幫你快取密碼（如果你已經為遠端設定好 PuTTY 金鑰，這就會自動完成）。請查閱我們的<a id=\"manual\">手冊</a>和 <a id=\"sshfaq\">FAQ</a> 以取得更多進階的提示和技巧。"
 #. Resource IDs: (Dialog IDD_SETTINGSUDIFF: Control id 357, IDS_APP_TITLE)
 msgid "TortoiseGitUDiff"
@@ -10687,7 +10687,7 @@ msgstr "不明"
 #. Resource IDs: (Dialog IDD_SETTINGSCOLORS_1: Control id 65535)
 msgid "Unknown ref-types"
-msgstr ""
+msgstr "未知的參照型別"
 #. Resource IDs: (IDS_VIEWCONTEXTMENU_UNMARKBLOCK)
 msgid "Unmark this block"
@@ -11028,7 +11028,7 @@ msgstr "當狀態快取提高執行優先權時，會自動改用「無」的選
 #. Resource IDs: (cmdPaste_Keytip_RESID)
 msgid "V"
-msgstr ""
+msgstr "V"
 #. Resource IDs: (IDS_COMMANDLINEHELP)
 msgid ""
@@ -11136,7 +11136,7 @@ msgstr "瀏覽我們的網站"
 #. Resource IDs: (cmdShowWhitespaces_Keytip_RESID)
 msgid "W"
-msgstr ""
+msgstr "W"
 #. Resource IDs: (Dialog IDD_SETTINGS_CONFIG: Control id 65535)
 msgid ""
@@ -11174,7 +11174,7 @@ msgid ""
 "We hope you enjoy using TortoiseGit! In case of questions or problems, "
 "please consult our manual or go to <a "
 "id=\"support\">https://tortoisegit.org/support/</a>"
-msgstr ""
+msgstr "我們希望你可以盡情地使用 TortoiseGit！如果你有任何使用上的問題，請參考我們的手冊，或者瀏覽 <a id=\"support\">https://tortoisegit.org/support/</a>"
 #. Resource IDs: (IDS_FIRSTSTART_STARTTITLE)
 msgid "Welcome to TortoiseGit!"
@@ -11246,7 +11246,7 @@ msgid ""
 "If you want to abort the merge, do a hard reset on HEAD or select abort merge on the context menu.\n"
 "\n"
 "See help for more information."
-msgstr ""
+msgstr "在合併期間（例如：整合一個（遠端）分支進入你的本地端分支中）有衝突發生，這代表你需要手動解決衝突（例如：你需要整合同時在二個分支中對同一個檔案的同一個區塊的修改）。\n\n在你解完所有檔案的衝突點之後，你需要再做一次提交動作以完成合併操作。\n\n如果你想中止合併，請使用快顯功能表的「中止合併」，或在  HEAD 上使用「重設(reset)」。\n\n查看說明文件以取得更多訊息。"
 #. Resource IDs: (IDS_DAEMON_SECURITY_WARN)
 msgid ""
@@ -11335,7 +11335,7 @@ msgstr "在窗格的右邊界自動換行\n自動斷行"
 #. Resource IDs: (cmdRedo_Keytip_RESID)
 msgid "Y"
-msgstr ""
+msgstr "Y"
 #. Resource IDs: (IDS_PROC_YESTOALL)
 msgid "Yes to all"
@@ -11462,7 +11462,7 @@ msgstr "你的版本是：%d.%d.%d.%d"
 #. Resource IDs: (cmdUndo_Keytip_RESID)
 msgid "Z"
-msgstr ""
+msgstr "Z"
 #. Resource IDs: (IDS_ARCHIVEFILEFILTER)
 msgid "ZIP archive (*.zip)|*.zip|All Files (*.*)|*.*||"
@@ -11848,7 +11848,7 @@ msgstr "子模組尚未初始化"
 #. Resource IDs: (cmdOpen_Keytip_RESID)
 msgid "o1"
-msgstr ""
+msgstr "o1"
 #. Resource IDs: (IDS_STATUSOBSTRUCTED)
 msgid "obstructed"