[gitg] Updated Traditional Chinese translation(Hong Kong and Taiwan)

From: Chao-Hsiung Liao <chliao src gnome org>
To: commits-list gnome org
Cc:
Subject: [gitg] Updated Traditional Chinese translation(Hong Kong and Taiwan)
Date: Thu, 21 Aug 2014 09:04:21 +0000 (UTC)
commit 648e714b89eee8942e17b0cc8aa3048762524f56
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Thu Aug 21 17:04:13 2014 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  765 ++++++++++++++++++++++++++++++++++++++++++++++-------------
 po/zh_TW.po |  763 ++++++++++++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 1199 insertions(+), 329 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index cb2828b..ba39938 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: gitg master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=gitg&keywords=I18N+L10N&component=gitg\n"
-"POT-Creation-Date: 2014-03-08 21:32+0000\n"
-"PO-Revision-Date: 2014-03-10 19:23+0800\n"
-"Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
+"POT-Creation-Date: 2014-08-21 05:41+0000\n"
+"PO-Revision-Date: 2014-08-21 17:04+0800\n"
+"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.6.5\n"
 
 #: ../data/gitg.desktop.in.in.h:1 ../gitg/gitg.vala:54
 #: ../gitg/resources/ui/gitg-window.ui.h:1
@@ -25,29 +25,39 @@ msgid "gitg"
 msgstr "gitg"
 
 #: ../data/gitg.desktop.in.in.h:2
-#, fuzzy
 msgid "Git repository browser"
 msgstr "Git 倉儲瀏覽器"
 
 #: ../data/org.gnome.gitg.gschema.xml.in.in.h:1
+msgid "Default Clone Directory"
+msgstr "預設重製目錄"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:2
+msgid ""
+"The default directory in which new repositories should be suggested to be "
+"cloned."
+msgstr "新倉儲建議重製的預設目錄。"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:3
 msgid "Orientation of the main interface (vertical or horizontal)"
 msgstr "主介面的方向 (垂直或水平)"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:2
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:4
 msgid "Setting that sets the orientation of the main interface."
 msgstr "調整主介面方向的設定。"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:3
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:5
+#, fuzzy
 msgid "When to Collapse Inactive Lanes"
-msgstr ""
+msgstr "當不活動後降低螢幕亮度(_D)"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:4
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:6
 msgid ""
 "Setting that indicates when an inactive lane should be collapsed. Valid "
 "values are 0 - 4, where 0 indicates 'early' and 4 indicates 'late'."
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:5
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:7
 msgid ""
 "Setting that indicates whether to collapse history lanes which do not show "
 "activity. Enabling this can provide a cleaner history view when there is a "
@@ -55,76 +65,157 @@ msgid ""
 "lanes should be collapsed."
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:6
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:8
 msgid "Show History in Topological Order"
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:7
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:9
 msgid ""
 "Setting that indicates whether to show the history in topological order."
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:8
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:10
+#, fuzzy
+msgid "Show Stashed Changes"
+msgstr "套用已 stash 的更改："
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:11
 msgid ""
 "Setting that indicates whether to show items for the stash in the history."
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:9
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:12
+#, fuzzy
+msgid "Show Staged Changes"
+msgstr "顯示更改(_S)"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:13
 msgid ""
 "Setting that indicates whether to show a virtual item for the currently "
 "staged changes in the history."
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:10
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:14
+#, fuzzy
+msgid "Show Unstaged Changes"
+msgstr "將未 stage 檔案的更改還原"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:15
 msgid ""
 "Setting that indicates whether to show a virtual item for the currently "
 "unstaged changes in the history."
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:11
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:16
 msgid "Show Right Margin in Commit Message View"
-msgstr ""
+msgstr "在提交訊息檢視顯示右邊界"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:12
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:17
 msgid ""
 "Show a right margin indicator in the commit message view. This can be used "
 "to easily see where to break the commit message at a particular column."
-msgstr ""
+msgstr "在提交訊息檢視顯示右邊界。這可以用來輕鬆的看出在特定欄中的何處中斷提交訊息。"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:13
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:18
 msgid "Column at Which Right Margin is Shown"
-msgstr ""
+msgstr "顯示右邊邊界於哪一欄"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:14
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:19
 msgid ""
 "The column at which the right margin is shown if the show-right-margin "
 "preference is set to TRUE."
-msgstr ""
+msgstr "如果 show-right-margin 偏好設定設為「TRUE」時右邊界要顯示在哪一欄。"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:15
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:20
 msgid "Show Subject Margin in Commit Message View"
-msgstr ""
+msgstr "在提交訊息檢視顯示主旨邊界"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:16
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:21
 msgid ""
 "Highlight the subject text of the commit message when it passes the margin "
 "specified by subject-margin-position."
-msgstr ""
+msgstr "當被送至 subject-margin-position 指定的邊界時強調顯示提交訊息的主旨文字。"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:17
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:22
 msgid "Column at Which Subject Margin is Shown"
-msgstr ""
+msgstr "顯示主旨邊界於哪一欄"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:18
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:23
 msgid ""
 "The column at which the subject margin is shown if the show-subject-margin "
 "preference is set to TRUE."
+msgstr "如果 show-subject-margin 偏好設定設為「TRUE」時顯示主旨邊界於哪一欄。"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:24
+#| msgid "Enable spell checking"
+msgid "Enable Spell Checking"
+msgstr "啟用拼字檢查"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:25
+msgid ""
+"Setting which determines whether or not spell checking is enabled when "
+"writing a commit message."
+msgstr "設定編寫提交訊息時是否啟用拼字檢查。"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:26
+msgid "Spell Checking Language"
+msgstr "拼字檢查語言"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:27
+msgid ""
+"The language to use when spell checking is enabled for writing a commit "
+"message."
+msgstr "當編寫提交訊息時啟用拼字檢查要使用哪種語言。"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:28
+msgid "Ignore Whitespace Changes"
+msgstr "忽略空白字符的更改"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:29
+msgid ""
+"Setting that indicates whether to ignore whitespace changes when showing the "
+"diff of a commit."
+msgstr ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:30
+msgid "Show Changes Inline"
+msgstr "顯示行內更改"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:31
+msgid ""
+"Setting that indicates whether changes within lines should be shown inline."
+msgstr "設定在行內的更改是否以行內顯示。"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:32
+msgid "Number of Before/After Context Lines"
+msgstr "之前/之後前後文列數"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:33
+msgid ""
+"Setting that determines how many lines of context (before and after) should "
+"be shown when showing the diff of a commit."
+msgstr "設定顯示提交的 diff 時要顯示多少列前後文 (之前與之後)。"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:34
+msgid "Rendered Width of a Tab Character"
+msgstr "Tab 字符轉換闊度"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:35
+msgid ""
+"Setting that determines how much space a tab character should occupy when "
+"showing the diff of a commit."
+msgstr "設定顯示提交的 diff 時 tab 字符要占多少空間。"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:36
+msgid ""
+"Setting that determines how many lines of context (before and after) should "
+"be shown when showing the diff to be staged/unstaged in the commit area."
 msgstr ""
 
 #: ../gitg/commit/gitg-commit-dialog.vala:283
 #, c-format
 msgid "Cannot set spell checking language: %s"
-msgstr ""
+msgstr "不能設定拼字檢查語言：%s"
 
 #: ../gitg/commit/gitg-commit.vala:59
 #: ../gitg/preferences/gitg-preferences-commit.vala:119
@@ -132,100 +223,172 @@ msgstr ""
 msgid "Commit"
 msgstr "提交"
 
-#: ../gitg/commit/gitg-commit.vala:123
-msgid "_Stage selection"
+#: ../gitg/commit/gitg-commit.vala:64
+msgid "Create new commits and manage the staging area"
 msgstr ""
 
-#: ../gitg/commit/gitg-commit.vala:146
-#, c-format
-msgid "Failed to stage the file `%s'"
-msgstr ""
+#: ../gitg/commit/gitg-commit.vala:107
+#, fuzzy
+msgid "_Stage selection"
+msgstr "舞臺的顏色"
 
-#: ../gitg/commit/gitg-commit.vala:165
-#, c-format
+#: ../gitg/commit/gitg-commit.vala:138
+#, fuzzy, c-format
 msgid "Failed to stage the removal of file `%s'"
-msgstr ""
+msgstr "%s 移除失敗。"
 
-#: ../gitg/commit/gitg-commit.vala:204
+#: ../gitg/commit/gitg-commit.vala:152
+#, fuzzy, c-format
+msgid "Failed to stage the file `%s'"
+msgstr "無法解析檔案：%s"
+
+#: ../gitg/commit/gitg-commit.vala:182
+#, fuzzy
 msgid "_Unstage selection"
-msgstr ""
+msgstr "Unstage"
 
-#: ../gitg/commit/gitg-commit.vala:227
-#, c-format
+#: ../gitg/commit/gitg-commit.vala:213
+#, fuzzy, c-format
 msgid "Failed to unstage the removal of file `%s'"
-msgstr ""
+msgstr "%s 移除失敗。"
 
-#: ../gitg/commit/gitg-commit.vala:246
-#, c-format
+#: ../gitg/commit/gitg-commit.vala:227
+#, fuzzy, c-format
 msgid "Failed to unstage the file `%s'"
-msgstr ""
+msgstr "無法解析檔案：%s"
 
-#: ../gitg/commit/gitg-commit.vala:370
+#: ../gitg/commit/gitg-commit.vala:368
+#, fuzzy
 msgid "Staged"
-msgstr ""
+msgstr "尚未選擇已 stage 檔案。"
 
-#: ../gitg/commit/gitg-commit.vala:374
+#: ../gitg/commit/gitg-commit.vala:379
+#, fuzzy
 msgid "No staged files"
-msgstr ""
+msgstr "尚未選擇已 stage 檔案。"
 
-#: ../gitg/commit/gitg-commit.vala:383
+#: ../gitg/commit/gitg-commit.vala:394
+#, fuzzy
 msgid "Unstaged"
-msgstr ""
+msgstr "將未 stage 檔案的更改還原"
 
-#: ../gitg/commit/gitg-commit.vala:387
+#: ../gitg/commit/gitg-commit.vala:402
+#, fuzzy
 msgid "No unstaged files"
-msgstr ""
+msgstr "將未 stage 檔案的更改還原"
 
-#: ../gitg/commit/gitg-commit.vala:396
+#: ../gitg/commit/gitg-commit.vala:417
 msgid "Untracked"
-msgstr ""
+msgstr "未追蹤"
 
-#: ../gitg/commit/gitg-commit.vala:400
+#: ../gitg/commit/gitg-commit.vala:421
+#, fuzzy
 msgid "No untracked files"
-msgstr ""
+msgstr "未追蹤"
 
-#: ../gitg/commit/gitg-commit.vala:436
+#: ../gitg/commit/gitg-commit.vala:505
 msgid "There are no changes to be committed"
-msgstr ""
+msgstr "沒有要提交的改變"
 
-#: ../gitg/commit/gitg-commit.vala:437
+#: ../gitg/commit/gitg-commit.vala:506
 msgid "Use amend to change the commit message of the previous commit"
 msgstr ""
 
-#: ../gitg/commit/gitg-commit.vala:463
+#: ../gitg/commit/gitg-commit.vala:532
 msgid "Failed to commit"
 msgstr "提交失敗"
 
 #. TODO: better to show user info dialog directly or something
-#: ../gitg/commit/gitg-commit.vala:479 ../gitg/commit/gitg-commit.vala:712
+#: ../gitg/commit/gitg-commit.vala:548 ../gitg/commit/gitg-commit.vala:727
 msgid "Failed to pass pre-commit"
-msgstr ""
+msgstr "送出預先提交失敗"
 
-#: ../gitg/commit/gitg-commit.vala:700
+#: ../gitg/commit/gitg-commit.vala:715
 msgid ""
 "Your user name and email are not configured yet. Please go to the user "
 "configuration and provide your name and email."
-msgstr ""
+msgstr "你的使用者名稱與電子郵件尚未設定。請至使用者組態並提供你的姓名與電子郵件。"
 
-#: ../gitg/commit/gitg-commit.vala:704
+#: ../gitg/commit/gitg-commit.vala:719
 msgid ""
 "Your user name is not configured yet. Please go to the user configuration "
 "and provide your name."
-msgstr ""
+msgstr "你的使用者名稱尚未設定。請至使用者組態並提供你的姓名。"
 
-#: ../gitg/commit/gitg-commit.vala:708
+#: ../gitg/commit/gitg-commit.vala:723
 msgid ""
 "Your email is not configured yet. Please go to the user configuration and "
 "provide your email."
-msgstr ""
+msgstr "你的電子郵件尚未設定。請至使用者組態並提供你的電子郵件。"
+
+#: ../gitg/commit/gitg-commit.vala:782 ../gitg/commit/gitg-commit.vala:909
+msgid "Discard changes"
+msgstr "放棄更改"
+
+#: ../gitg/commit/gitg-commit.vala:783
+msgid "Are you sure you want to permanently discard the selected changes?"
+msgstr "確定要永久放棄選取的更改嗎？"
+
+#: ../gitg/commit/gitg-commit.vala:792 ../gitg/commit/gitg-commit.vala:936
+#: ../gitg/gitg-commit-action-create-patch.vala:143
+#: ../gitg/gitg-window.vala:432 ../gitg/resources/ui/gitg-clone-dialog.ui.h:2
+#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:2
+#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:2
+#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:2
+#: ../gitg/resources/ui/gitg-window.ui.h:5
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: ../gitg/commit/gitg-commit.vala:793 ../gitg/commit/gitg-commit.vala:935
+msgid "Discard"
+msgstr "放棄"
+
+#: ../gitg/commit/gitg-commit.vala:821
+msgid "Failed to discard selection"
+msgstr "無法放棄已選取的檔案"
 
-#: ../gitg/commit/gitg-commit.vala:769
+#: ../gitg/commit/gitg-commit.vala:850
+#, fuzzy
 msgid "Failed to stage selection"
-msgstr ""
+msgstr "無法放棄已選取的檔案"
 
-#: ../gitg/commit/gitg-commit.vala:773
+#: ../gitg/commit/gitg-commit.vala:854
+#, fuzzy
 msgid "Failed to unstage selection"
-msgstr ""
+msgstr "Unstage"
+
+#: ../gitg/commit/gitg-commit.vala:893
+#| msgid "Failed to set Git user config."
+msgid "Failed to discard changes"
+msgstr "無法放棄更改"
+
+#: ../gitg/commit/gitg-commit.vala:914
+#, c-format
+msgid ""
+"Are you sure you want to permanently discard all changes made to the file `"
+"%s'?"
+msgstr "你確定要永久放棄對檔案「%s」所進行的所有更改？"
+
+#: ../gitg/commit/gitg-commit.vala:925
+#, c-format
+msgid ""
+"Are you sure you want to permanently discard all changes made to the files "
+"%s and `%s'?"
+msgstr "你確定要永久放棄對檔案 %s 與「%s」所進行的所有更改？"
+
+#: ../gitg/commit/gitg-commit.vala:969
+#, fuzzy
+msgid "_Stage changes"
+msgstr "舞臺的顏色"
+
+#: ../gitg/commit/gitg-commit.vala:979
+#, fuzzy
+msgid "_Unstage changes"
+msgstr "Unstage"
+
+#: ../gitg/commit/gitg-commit.vala:989
+msgid "_Discard changes"
+msgstr "放棄更改(_D)"
 
 #: ../gitg/gitg-application.vala:55
 msgid "Show the application's version"
@@ -233,39 +396,37 @@ msgstr "顯示應用程式的版本"
 
 #: ../gitg/gitg-application.vala:58
 msgid "Start gitg with a particular activity"
-msgstr ""
+msgstr "以特定活動啟動 gitg"
 
 #: ../gitg/gitg-application.vala:61
 msgid "Start gitg with the commit activity (shorthand for --activity commit)"
-msgstr ""
+msgstr "以提交活動啟動 gitg (--activity 提交的簡寫)"
 
 #: ../gitg/gitg-application.vala:64
 msgid "Do not try to load a repository from the current working directory"
-msgstr ""
+msgstr "不要嘗試從目前工作目錄載入倉儲"
 
 #: ../gitg/gitg-application.vala:88
-#, fuzzy
 msgid "- Git repository viewer"
 msgstr "- Git 倉儲檢視器"
 
 #: ../gitg/gitg-application.vala:206
-#, fuzzy
 msgid "gitg is a Git repository viewer for gtk+/GNOME"
 msgstr "gitg 是為 gtk+/GNOME 設計的 Git 倉儲檢視器"
 
 #: ../gitg/gitg-application.vala:215
 msgid "translator-credits"
-msgstr ""
+msgstr "Cheng-Chia Tseng <pswo10680 gmail com>, 2013"
 
 #: ../gitg/gitg-application.vala:218
 msgid "gitg homepage"
 msgstr "gitg 首頁"
 
-#: ../gitg/gitg-author-details-dialog.vala:65
+#: ../gitg/gitg-author-details-dialog.vala:67
 msgid "Unable to open the .gitconfig file."
 msgstr "無法開啟 .gitconfig 檔。"
 
-#: ../gitg/gitg-author-details-dialog.vala:147
+#: ../gitg/gitg-author-details-dialog.vala:149
 msgid "Failed to set Git user config."
 msgstr "無法設定 Git 使用者組態。"
 
@@ -273,6 +434,160 @@ msgstr "無法設定 Git 使用者組態。"
 msgid "The URL introduced is not supported"
 msgstr "不支援引入的 URL 。"
 
+#: ../gitg/gitg-commit-action-create-branch.vala:48
+#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:1
+msgid "Create Branch"
+msgstr "建立分支"
+
+#: ../gitg/gitg-commit-action-create-branch.vala:53
+msgid "Create a new branch at the selected commit"
+msgstr "以選取的提交建立新的分支"
+
+#: ../gitg/gitg-commit-action-create-branch.vala:85
+#| msgid "Failed to commit"
+msgid "Failed to create branch"
+msgstr "無法建立分支"
+
+#: ../gitg/gitg-commit-action-create-patch.vala:63
+msgid "Create Patch"
+msgstr "建立修補檔"
+
+#: ../gitg/gitg-commit-action-create-patch.vala:68
+msgid "Create a patch from the selected commit"
+msgstr "以選取的提交建立新的修補檔"
+
+#: ../gitg/gitg-commit-action-create-patch.vala:141
+msgid "Save Patch File"
+msgstr "儲存修補檔"
+
+#: ../gitg/gitg-commit-action-create-patch.vala:145
+#| msgid "Save Patch File"
+msgid "_Save Patch"
+msgstr "儲存修補檔(_S)"
+
+#: ../gitg/gitg-commit-action-create-patch.vala:168
+#| msgid "Failed to commit"
+msgid "Failed to create patch"
+msgstr "無法建立修補"
+
+#: ../gitg/gitg-commit-action-create-tag.vala:48
+#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:1
+msgid "Create Tag"
+msgstr "建立標籤"
+
+#: ../gitg/gitg-commit-action-create-tag.vala:53
+msgid "Create a new tag at the selected commit"
+msgstr "以選取的提交建立新的標籤"
+
+#: ../gitg/gitg-commit-action-create-tag.vala:92
+#| msgid "Failed to commit"
+msgid "Failed to create tag"
+msgstr "無法建立標籤"
+
+#: ../gitg/gitg-commit-action-create-tag.vala:109
+#| msgid "Failed to commit"
+msgid "Failed to lookup tag"
+msgstr "搜尋標籤失敗"
+
+#: ../gitg/gitg-create-tag-dialog.vala:106
+msgid "Provide a message to create an annotated tag"
+msgstr "提供訊息以建立有注釋的標籤"
+
+#: ../gitg/gitg-dash-view.vala:141
+msgid "_Delete"
+msgstr "刪除(_D)"
+
+#: ../gitg/gitg-ref-action-delete.vala:48
+#: ../gitg/gitg-ref-action-delete.vala:88
+msgid "Delete"
+msgstr "刪除"
+
+#: ../gitg/gitg-ref-action-delete.vala:53
+msgid "Delete the selected reference"
+msgstr "刪除選取的參照"
+
+#: ../gitg/gitg-ref-action-delete.vala:73
+#, c-format
+msgid "Delete branch %s"
+msgstr "刪除分支 %s"
+
+#: ../gitg/gitg-ref-action-delete.vala:74
+#, c-format
+msgid "Are you sure that you want to permanently delete the branch %s?"
+msgstr "你確定永久刪除分支 %s？"
+
+#: ../gitg/gitg-ref-action-delete.vala:78
+#, c-format
+msgid "Delete tag %s"
+msgstr "刪除標籤 %s"
+
+#: ../gitg/gitg-ref-action-delete.vala:79
+#, c-format
+msgid "Are you sure that you want to permanently delete the tag %s?"
+msgstr "你確定要永遠刪除標籤 %s 嗎？"
+
+#: ../gitg/gitg-ref-action-delete.vala:83
+#, c-format
+msgid "Delete remote branch %s"
+msgstr "刪除遠端分支 %s"
+
+#: ../gitg/gitg-ref-action-delete.vala:84
+#, c-format
+msgid "Are you sure that you want to permanently delete the remote branch %s?"
+msgstr "你確定永久刪除遠端分支 %s？"
+
+#: ../gitg/gitg-ref-action-delete.vala:89
+#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:9
+msgid "Cancel"
+msgstr "取消"
+
+#. Translators: %s is the name of the tag
+#: ../gitg/gitg-ref-action-delete.vala:119
+#, c-format
+#| msgid "Failed to set Git user config."
+msgid "Failed to delete tag %s"
+msgstr "刪除標籤 %s 失敗"
+
+#. Translators: the first %s is the name of the tag, the second is an error message
+#: ../gitg/gitg-ref-action-delete.vala:122
+#, c-format
+msgid "The tag %s could not be deleted: %s"
+msgstr "標籤 %s 無法被刪除：%s"
+
+#. Translators: %s is the name of the branch
+#: ../gitg/gitg-ref-action-delete.vala:127
+#, c-format
+msgid "Failed to delete branch %s"
+msgstr "刪除分支 %s 失敗"
+
+#. Translators: the first %s is the name of the branch, the second is an error message
+#: ../gitg/gitg-ref-action-delete.vala:130
+#, c-format
+msgid "The branch %s could not be deleted: %s"
+msgstr "分支 %s 無法被刪除：%s"
+
+#: ../gitg/gitg-ref-action-rename.vala:48
+msgid "Rename"
+msgstr "重新命名"
+
+#: ../gitg/gitg-ref-action-rename.vala:53
+msgid "Rename the selected reference"
+msgstr "重新命名所選取的參照"
+
+#: ../gitg/gitg-ref-action-rename.vala:100
+#, c-format
+msgid "The specified name ‘%s’ contains invalid characters"
+msgstr "指定名稱「%s」包含無效的字符"
+
+#: ../gitg/gitg-ref-action-rename.vala:102
+msgid "Invalid name"
+msgstr "無效的名稱"
+
+#: ../gitg/gitg-ref-action-rename.vala:141
+#| msgid "Failed to commit"
+msgid "Failed to rename"
+msgstr "無法重新命名"
+
 #: ../gitg/gitg.vala:64
 msgid ""
 "We are terribly sorry, but gitg requires libgit2 (a library on which gitg "
@@ -284,123 +599,157 @@ msgid ""
 "Otherwise, report a bug in your distributions' bug reporting system for "
 "providing libgit2 without threading support."
 msgstr ""
+"我們十分抱歉，但 gitg 需要 libgit2 (此為 gitg 相根據的程式庫) 編譯執行緒支援。\n"
+"\n"
+"如果你是手動編譯 libgit2，請將 libgit2 設定加上 -DTHREADSAFE:BOOL=ON。\n"
+"\n"
+"否則，請在你的發行版本的錯誤回報系統中回報，指出 libgit2 未提供執行緒支援。"
 
-#: ../gitg/gitg-window.vala:276
+#: ../gitg/gitg-window.vala:389
 msgid "Projects"
 msgstr "專案"
 
-#: ../gitg/gitg-window.vala:312
-#, fuzzy
+#: ../gitg/gitg-window.vala:430
 msgid "Open Repository"
 msgstr "開啟倉儲"
 
-#: ../gitg/gitg-window.vala:314
-#: ../libgitg/gitg-diff-view-request-patch.vala:109
-msgid "_Cancel"
-msgstr "取消(_C)"
-
-#: ../gitg/gitg-window.vala:315
+#: ../gitg/gitg-window.vala:433
 msgid "_Open"
 msgstr "開啟(_O)"
 
-#: ../gitg/gitg-window.vala:545
-#, fuzzy, c-format
+#: ../gitg/gitg-window.vala:707
+#, c-format
 msgid "'%s' is not a Git repository."
-msgstr "「%s」並非 Git 倉儲。"
+msgstr "「%s」不是 Git 倉儲。"
 
-#: ../gitg/history/gitg-history-navigation.vala:199
-#: ../gitg/history/gitg-history-navigation.vala:307
+#: ../gitg/history/gitg-history-refs-list.vala:136
 #, fuzzy
 msgid "All commits"
-msgstr "所有提交"
+msgstr "提交"
 
-#. Branches
-#: ../gitg/history/gitg-history-navigation.vala:202
+#: ../gitg/history/gitg-history-refs-list.vala:674
 #, fuzzy
 msgid "Branches"
 msgstr "分支"
 
-#. Remotes
-#: ../gitg/history/gitg-history-navigation.vala:239
+#: ../gitg/history/gitg-history-refs-list.vala:675
 #, fuzzy
 msgid "Remotes"
 msgstr "遠端"
 
-#. Tags
-#: ../gitg/history/gitg-history-navigation.vala:265
+#: ../gitg/history/gitg-history-refs-list.vala:676
 #, fuzzy
 msgid "Tags"
-msgstr "標籤"
+msgstr "標籤(_T)…"
 
-#: ../gitg/history/gitg-history.vala:164
+#: ../gitg/history/gitg-history.vala:219
 #: ../gitg/preferences/gitg-preferences-history.vala:144
 #, fuzzy
 msgid "History"
-msgstr "歷史"
+msgstr "歷史(_H)"
+
+#: ../gitg/history/gitg-history.vala:224
+#, fuzzy
+msgid "Examine the history of the repository"
+msgstr "檢驗"
 
 #: ../gitg/preferences/gitg-preferences-interface.vala:73
 msgid "Interface"
 msgstr "介面"
 
-#: ../libgitg/gitg-date.vala:316
+#: ../libgitg/gitg-date.vala:346
 msgid "Now"
 msgstr "現在"
 
-#: ../libgitg/gitg-date.vala:320
+#: ../libgitg/gitg-date.vala:350
 #, c-format
 msgid "A minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分鐘前"
 
-#: ../libgitg/gitg-date.vala:325
+#: ../libgitg/gitg-date.vala:355
 msgid "Half an hour ago"
 msgstr "半小時前"
 
-#: ../libgitg/gitg-date.vala:330
+#: ../libgitg/gitg-date.vala:360
 #, c-format
 msgid "An hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 小時前"
 
-#: ../libgitg/gitg-date.vala:335
+#: ../libgitg/gitg-date.vala:365
 #, c-format
 msgid "A day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天前"
 
-#: ../libgitg/gitg-diff-view-request-patch.vala:107
-msgid "Save Patch File"
-msgstr "儲存修補檔"
+#. Translators: this is a strftime type date format which is
+#. used when the date is in the current year and uses a 24 hour
+#. clock.
+#: ../libgitg/gitg-date.vala:374
+#, fuzzy
+msgid "%b %e, %H:%M"
+msgstr "%b%e日%A %H:%M"
 
-#: ../libgitg/gitg-diff-view-request-patch.vala:111
-msgid "_Save"
-msgstr "儲存(_S)"
+#. Translators: this is a strftime type date format which is
+#. used when the date is in the current year and uses a 12 hour
+#. clock.
+#: ../libgitg/gitg-date.vala:381
+#, fuzzy
+msgid "%b %e, %I:%M %p"
+msgstr "%Y年%b%e日,%p %I:%M:%S"
+
+#. Translators: this is a strftime type date format which is
+#. used when the date is not in the current year and uses a 24
+#. hour clock.
+#: ../libgitg/gitg-date.vala:391
+#, fuzzy
+msgid "%b %e %Y, %H:%M"
+msgstr "%Y年%b%e日%A %H:%M"
+
+#. Translators: this is a strftime type date format which is
+#. used when the date is not in the current year and uses a 12
+#. hour clock.
+#: ../libgitg/gitg-date.vala:398
+#, fuzzy
+msgid "%b %e %Y, %I:%M %p"
+msgstr "%Y年%b%e日,%p %I:%M:%S"
 
-#: ../libgitg/gitg-diff-view.vala:123
+#: ../libgitg/gitg-diff-view.vala:229
+#, fuzzy
 msgid "stage"
-msgstr ""
+msgstr "舞臺的顏色"
 
-#: ../libgitg/gitg-diff-view.vala:124
+#: ../libgitg/gitg-diff-view.vala:230
+#, fuzzy
 msgid "unstage"
-msgstr ""
+msgstr "Unstage"
 
-#: ../libgitg/gitg-diff-view.vala:125
+#: ../libgitg/gitg-diff-view.vala:231
 msgid "Loading diff…"
 msgstr "正載入 diff…"
 
-#: ../libgitg/gitg-stage.vala:333
+#: ../libgitg/gitg-stage.vala:335
 #, c-format
 msgid "Could not read commit message after running commit-msg hook: %s"
-msgstr ""
+msgstr "在執行 commit-msg 掛鉤後無法讀取提交訊息：%s"
 
-#: ../plugins/diff/gitg-diff.vala:62
+#: ../plugins/diff/gitg-diff.vala:89
 msgid "Diff"
 msgstr "Diff"
 
+#: ../plugins/diff/gitg-diff.vala:94
+msgid "Show the changes introduced by the selected commit"
+msgstr "顯示選取的提交所造成的更改"
+
 #: ../plugins/files/gitg-files.vala:63
 msgid "Files"
 msgstr "檔案"
 
+#: ../plugins/files/gitg-files.vala:68
+msgid "Show the files in the tree of the selected commit"
+msgstr "在選取提交的樹狀圖中顯示檔案"
+
 #. ex: ts=4 noet
 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:1
 msgid "Author Details"
@@ -409,16 +758,16 @@ msgstr "作者詳細資訊"
 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:3
 #, no-c-format
 msgid "Note: The Git config file '%s' does not exist."
-msgstr ""
+msgstr "注意：Git 設定檔「%s」不存在。"
 
 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:4
 msgid "Enter details to set as default for all repositories:"
-msgstr ""
+msgstr "輸入詳細資料以設為所有倉儲的預設值："
 
 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:6
-#, no-c-format
+#, fuzzy, no-c-format
 msgid "Enter details for repository '%s':"
-msgstr ""
+msgstr "請輸入你的帳號詳細資料"
 
 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:7
 msgid "E-mail: "
@@ -428,68 +777,94 @@ msgstr "電子郵件： "
 msgid "Name: "
 msgstr "名稱："
 
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:9
-msgid "Cancel"
-msgstr "取消"
-
 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:10
 msgid "Save"
 msgstr "儲存"
 
 #: ../gitg/resources/ui/gitg-clone-dialog.ui.h:1
+#, fuzzy
 msgid "Clone Repository"
-msgstr ""
+msgstr "重製(_C)"
 
-#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:2
+#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:3
+#, fuzzy
 msgid "Cl_one"
-msgstr ""
+msgstr "清除(_E)"
 
-#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:3
+#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:4
+#, fuzzy
 msgid "Remote _URL:"
-msgstr ""
+msgstr "遠端桌面的 URL 應該寄送至這個電郵地址"
 
-#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:4
+#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:5
+#, fuzzy
 msgid "_Local Folder:"
-msgstr ""
+msgstr "如果要開啟遠端的檔案，請先將檔案複製至本地的資料夾才進行拖曳的動作。"
 
-#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:5
+#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:6
 msgid "Select location…"
 msgstr "選取位置…"
 
-#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:6
+#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:7
+#, fuzzy
 msgid "Bare repository"
-msgstr ""
+msgstr "倉儲："
 
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:2
+#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:3
 #: ../gitg/resources/ui/gitg-commit-paned.ui.h:2
 msgid "C_ommit"
 msgstr "提交(_O)"
 
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:3
+#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:4
+#, fuzzy
 msgid "Add _signed-off-by signature"
-msgstr ""
+msgstr "加入 signed-off-by line"
 
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:4
+#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:5
+#, fuzzy
 msgid "_Amend previous commit"
-msgstr ""
+msgstr "修正上一次提交"
 
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:5
-#: ../gitg/resources/ui/gitg-window.ui.h:2
+#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:6
+#: ../gitg/resources/ui/gitg-window.ui.h:6
 msgid "Close"
 msgstr "關閉"
 
 #: ../gitg/resources/ui/gitg-commit-paned.ui.h:1
 #, fuzzy
 msgid "Skip commit _hooks"
-msgstr "略過提交掛勾(_H)"
+msgstr "跳至"
 
 #: ../gitg/resources/ui/gitg-commit-paned.ui.h:3
+#, fuzzy
 msgid "S_tage selection"
-msgstr ""
+msgstr "「%s」無法加入到選取區。"
+
+#: ../gitg/resources/ui/gitg-commit-paned.ui.h:4
+#, fuzzy
+msgid "D_iscard selection"
+msgstr "選取區(_S)"
+
+#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:3
+#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:3
+#, fuzzy
+msgid "C_reate"
+msgstr "建立(_R)"
+
+#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:4
+#, fuzzy
+msgid "Branch _name:"
+msgstr "分支名稱："
+
+#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:4
+#, fuzzy
+msgid "Tag _name:"
+msgstr "標記名稱"
 
 #: ../gitg/resources/ui/gitg-history-paned.ui.h:1
+#, fuzzy
 msgid "Subject"
-msgstr ""
+msgstr "(沒有主旨)"
 
 #: ../gitg/resources/ui/gitg-history-paned.ui.h:2
 msgid "Author"
@@ -522,11 +897,12 @@ msgstr "退出(_Q)"
 #: ../gitg/resources/ui/gitg-menus.ui.h:6
 #, fuzzy
 msgid "_Open Repository…"
-msgstr "開啟倉儲(_O)…"
+msgstr "倉儲："
 
 #: ../gitg/resources/ui/gitg-menus.ui.h:7
+#, fuzzy
 msgid "_Clone Repository…"
-msgstr ""
+msgstr "重製(_C)"
 
 #: ../gitg/resources/ui/gitg-menus.ui.h:8
 msgid "_Author Details"
@@ -541,12 +917,14 @@ msgid "Show markup"
 msgstr "顯示標記"
 
 #: ../gitg/resources/ui/gitg-preferences-commit.ui.h:2
+#, fuzzy
 msgid "Display _subject margin at column:"
-msgstr ""
+msgstr "顯示主旨邊界於哪一欄"
 
 #: ../gitg/resources/ui/gitg-preferences-commit.ui.h:3
+#, fuzzy
 msgid "Display right _margin at column:"
-msgstr ""
+msgstr "顯示右邊邊界於(_M):"
 
 #: ../gitg/resources/ui/gitg-preferences-commit.ui.h:4
 msgid "Enable spell checking"
@@ -561,32 +939,37 @@ msgid "Commits"
 msgstr "提交"
 
 #: ../gitg/resources/ui/gitg-preferences-history.ui.h:2
+#, fuzzy
 msgid "Collapse inactive lanes"
-msgstr ""
+msgstr "未使用"
 
 #: ../gitg/resources/ui/gitg-preferences-history.ui.h:3
+#, fuzzy
 msgid "Show stash in history"
-msgstr ""
+msgstr "Stash"
 
 #: ../gitg/resources/ui/gitg-preferences-history.ui.h:4
+#, fuzzy
 msgid "Show staged changes in history"
-msgstr ""
+msgstr "顯示更改(_S)"
 
 #: ../gitg/resources/ui/gitg-preferences-history.ui.h:5
+#, fuzzy
 msgid "Show unstaged changes in history"
-msgstr ""
+msgstr "將未 stage 檔案的更改還原"
 
 #: ../gitg/resources/ui/gitg-preferences-history.ui.h:6
 msgid "Show history in topological order"
 msgstr ""
 
 #: ../gitg/resources/ui/gitg-preferences-history.ui.h:7
+#, fuzzy
 msgid "Early"
-msgstr ""
+msgstr "未預期的串流過早結束"
 
 #: ../gitg/resources/ui/gitg-preferences-history.ui.h:8
 msgid "Late"
-msgstr ""
+msgstr "稍後"
 
 #: ../gitg/resources/ui/gitg-preferences-interface.ui.h:1
 msgid "Layout"
@@ -600,6 +983,56 @@ msgstr "使用水平版面配置"
 msgid "Preferences"
 msgstr "偏好設定"
 
+#: ../gitg/resources/ui/gitg-window.ui.h:2
+#, fuzzy
+msgid "Show the list of recently used repositories"
+msgstr "目前使用的資源清單大小"
+
+#: ../gitg/resources/ui/gitg-window.ui.h:3
+#, fuzzy
+msgid "Find a word or phrase"
+msgstr "在文件中尋找字詞"
+
+#: ../gitg/resources/ui/gitg-window.ui.h:4
+#, fuzzy
+msgid "General settings and options"
+msgstr "一般選項"
+
+#: ../libgitg/resources/diff-view-options.ui.h:1
+#, fuzzy
+msgid "Ignore whitespace changes"
+msgstr "忽略空白字符的更改"
+
+#: ../libgitg/resources/diff-view-options.ui.h:2
+#, fuzzy
+msgid "Show changes inline"
+msgstr "顯示行內更改"
+
+#: ../libgitg/resources/diff-view-options.ui.h:3
+#, fuzzy
+msgid "Developer tools"
+msgstr "啟用 WebKit 開發者工具"
+
+#: ../libgitg/resources/diff-view-options.ui.h:4
+#, fuzzy
+msgid "Tab width"
+msgstr "Tab 字符闊度"
+
+#: ../libgitg/resources/diff-view-options.ui.h:5
+#, fuzzy
+msgid "Context"
+msgstr "脈絡"
+
+#: ../libgitg/resources/gitg-repository-list-box-row.ui.h:1
+msgid ""
+"Remove the repository from the list (does not delete the repository from "
+"disk)"
+msgstr "從清單中移除倉儲 (不會將倉儲自硬碟上刪除)"
+
 #: ../plugins/files/resources/view-files.ui.h:1
+#, fuzzy
 msgid "column"
-msgstr ""
+msgstr "欄"
+
+#~ msgid "_Save"
+#~ msgstr "儲存(_S)"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7a72548..046d06c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: gitg master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=gitg&keywords=I18N+L10N&component=gitg\n"
-"POT-Creation-Date: 2014-03-08 21:32+0000\n"
-"PO-Revision-Date: 2014-03-09 13:28+0800\n"
-"Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
+"POT-Creation-Date: 2014-08-21 05:41+0000\n"
+"PO-Revision-Date: 2014-08-21 15:47+0800\n"
+"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Taiwan) <chinese-l10n googlegroups com>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.6.5\n"
 
 #: ../data/gitg.desktop.in.in.h:1 ../gitg/gitg.vala:54
 #: ../gitg/resources/ui/gitg-window.ui.h:1
@@ -25,29 +25,39 @@ msgid "gitg"
 msgstr "gitg"
 
 #: ../data/gitg.desktop.in.in.h:2
-#, fuzzy
 msgid "Git repository browser"
 msgstr "Git 倉儲瀏覽器"
 
 #: ../data/org.gnome.gitg.gschema.xml.in.in.h:1
+msgid "Default Clone Directory"
+msgstr "預設重製目錄"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:2
+msgid ""
+"The default directory in which new repositories should be suggested to be "
+"cloned."
+msgstr "新倉儲建議重製的預設目錄。"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:3
 msgid "Orientation of the main interface (vertical or horizontal)"
 msgstr "主介面的方向 (垂直或水平)"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:2
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:4
 msgid "Setting that sets the orientation of the main interface."
 msgstr "調整主介面方向的設定。"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:3
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:5
+#, fuzzy
 msgid "When to Collapse Inactive Lanes"
-msgstr ""
+msgstr "當不活動後降低螢幕亮度(_D)"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:4
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:6
 msgid ""
 "Setting that indicates when an inactive lane should be collapsed. Valid "
 "values are 0 - 4, where 0 indicates 'early' and 4 indicates 'late'."
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:5
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:7
 msgid ""
 "Setting that indicates whether to collapse history lanes which do not show "
 "activity. Enabling this can provide a cleaner history view when there is a "
@@ -55,76 +65,159 @@ msgid ""
 "lanes should be collapsed."
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:6
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:8
 msgid "Show History in Topological Order"
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:7
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:9
 msgid ""
 "Setting that indicates whether to show the history in topological order."
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:8
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:10
+#, fuzzy
+msgid "Show Stashed Changes"
+msgstr "套用已 stash 的變更："
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:11
 msgid ""
 "Setting that indicates whether to show items for the stash in the history."
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:9
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:12
+#, fuzzy
+msgid "Show Staged Changes"
+msgstr "顯示變更(_S)"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:13
 msgid ""
 "Setting that indicates whether to show a virtual item for the currently "
 "staged changes in the history."
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:10
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:14
+#, fuzzy
+msgid "Show Unstaged Changes"
+msgstr "將未 stage 檔案的變更還原"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:15
 msgid ""
 "Setting that indicates whether to show a virtual item for the currently "
 "unstaged changes in the history."
 msgstr ""
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:11
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:16
 msgid "Show Right Margin in Commit Message View"
-msgstr ""
+msgstr "在提交訊息檢視顯示右邊界"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:12
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:17
 msgid ""
 "Show a right margin indicator in the commit message view. This can be used "
 "to easily see where to break the commit message at a particular column."
 msgstr ""
+"在提交訊息檢視顯示右邊界。這可以用來輕鬆的看出在特定欄中的何處中斷提交訊息。"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:13
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:18
 msgid "Column at Which Right Margin is Shown"
-msgstr ""
+msgstr "顯示右邊邊界於哪一欄"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:14
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:19
 msgid ""
 "The column at which the right margin is shown if the show-right-margin "
 "preference is set to TRUE."
-msgstr ""
+msgstr "如果 show-right-margin 偏好設定設為「TRUE」時右邊界要顯示在哪一欄。"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:15
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:20
 msgid "Show Subject Margin in Commit Message View"
-msgstr ""
+msgstr "在提交訊息檢視顯示主旨邊界"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:16
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:21
 msgid ""
 "Highlight the subject text of the commit message when it passes the margin "
 "specified by subject-margin-position."
 msgstr ""
+"當被送至 subject-margin-position 指定的邊界時強調顯示提交訊息的主旨文字。"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:17
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:22
 msgid "Column at Which Subject Margin is Shown"
-msgstr ""
+msgstr "顯示主旨邊界於哪一欄"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:18
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:23
 msgid ""
 "The column at which the subject margin is shown if the show-subject-margin "
 "preference is set to TRUE."
+msgstr "如果 show-subject-margin 偏好設定設為「TRUE」時顯示主旨邊界於哪一欄。"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:24
+#| msgid "Enable spell checking"
+msgid "Enable Spell Checking"
+msgstr "啟用拼字檢查"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:25
+msgid ""
+"Setting which determines whether or not spell checking is enabled when "
+"writing a commit message."
+msgstr "設定編寫提交訊息時是否啟用拼字檢查。"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:26
+msgid "Spell Checking Language"
+msgstr "拼字檢查語言"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:27
+msgid ""
+"The language to use when spell checking is enabled for writing a commit "
+"message."
+msgstr "當編寫提交訊息時啟用拼字檢查要使用哪種語言。"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:28
+msgid "Ignore Whitespace Changes"
+msgstr "忽略空白字元的變更"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:29
+msgid ""
+"Setting that indicates whether to ignore whitespace changes when showing the "
+"diff of a commit."
+msgstr ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:30
+msgid "Show Changes Inline"
+msgstr "顯示行內變更"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:31
+msgid ""
+"Setting that indicates whether changes within lines should be shown inline."
+msgstr "設定在行內的變更是否以行內顯示。"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:32
+msgid "Number of Before/After Context Lines"
+msgstr "之前/之後前後文列數"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:33
+msgid ""
+"Setting that determines how many lines of context (before and after) should "
+"be shown when showing the diff of a commit."
+msgstr "設定顯示提交的 diff 時要顯示多少列前後文 (之前與之後)。"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:34
+msgid "Rendered Width of a Tab Character"
+msgstr "Tab 字元轉換寬度"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:35
+msgid ""
+"Setting that determines how much space a tab character should occupy when "
+"showing the diff of a commit."
+msgstr "設定顯示提交的 diff 時 tab 字元要占多少空間。"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:36
+msgid ""
+"Setting that determines how many lines of context (before and after) should "
+"be shown when showing the diff to be staged/unstaged in the commit area."
 msgstr ""
 
 #: ../gitg/commit/gitg-commit-dialog.vala:283
 #, c-format
 msgid "Cannot set spell checking language: %s"
-msgstr ""
+msgstr "不能設定拼字檢查語言：%s"
 
 #: ../gitg/commit/gitg-commit.vala:59
 #: ../gitg/preferences/gitg-preferences-commit.vala:119
@@ -132,100 +225,173 @@ msgstr ""
 msgid "Commit"
 msgstr "提交"
 
-#: ../gitg/commit/gitg-commit.vala:123
-msgid "_Stage selection"
+#: ../gitg/commit/gitg-commit.vala:64
+msgid "Create new commits and manage the staging area"
 msgstr ""
 
-#: ../gitg/commit/gitg-commit.vala:146
-#, c-format
-msgid "Failed to stage the file `%s'"
-msgstr ""
+#: ../gitg/commit/gitg-commit.vala:107
+#, fuzzy
+msgid "_Stage selection"
+msgstr "舞臺的顏色"
 
-#: ../gitg/commit/gitg-commit.vala:165
-#, c-format
+#: ../gitg/commit/gitg-commit.vala:138
+#, fuzzy, c-format
 msgid "Failed to stage the removal of file `%s'"
-msgstr ""
+msgstr "%s 移除失敗。"
 
-#: ../gitg/commit/gitg-commit.vala:204
+#: ../gitg/commit/gitg-commit.vala:152
+#, fuzzy, c-format
+msgid "Failed to stage the file `%s'"
+msgstr "無法解析檔案：%s"
+
+#: ../gitg/commit/gitg-commit.vala:182
+#, fuzzy
 msgid "_Unstage selection"
-msgstr ""
+msgstr "Unstage"
 
-#: ../gitg/commit/gitg-commit.vala:227
-#, c-format
+#: ../gitg/commit/gitg-commit.vala:213
+#, fuzzy, c-format
 msgid "Failed to unstage the removal of file `%s'"
-msgstr ""
+msgstr "%s 移除失敗。"
 
-#: ../gitg/commit/gitg-commit.vala:246
-#, c-format
+#: ../gitg/commit/gitg-commit.vala:227
+#, fuzzy, c-format
 msgid "Failed to unstage the file `%s'"
-msgstr ""
+msgstr "無法解析檔案：%s"
 
-#: ../gitg/commit/gitg-commit.vala:370
+#: ../gitg/commit/gitg-commit.vala:368
+#, fuzzy
 msgid "Staged"
-msgstr ""
+msgstr "尚未選擇已 stage 檔案。"
 
-#: ../gitg/commit/gitg-commit.vala:374
+#: ../gitg/commit/gitg-commit.vala:379
+#, fuzzy
 msgid "No staged files"
-msgstr ""
+msgstr "尚未選擇已 stage 檔案。"
 
-#: ../gitg/commit/gitg-commit.vala:383
+#: ../gitg/commit/gitg-commit.vala:394
+#, fuzzy
 msgid "Unstaged"
-msgstr ""
+msgstr "將未 stage 檔案的變更還原"
 
-#: ../gitg/commit/gitg-commit.vala:387
+#: ../gitg/commit/gitg-commit.vala:402
+#, fuzzy
 msgid "No unstaged files"
-msgstr ""
+msgstr "將未 stage 檔案的變更還原"
 
-#: ../gitg/commit/gitg-commit.vala:396
+#: ../gitg/commit/gitg-commit.vala:417
 msgid "Untracked"
-msgstr ""
+msgstr "未追蹤"
 
-#: ../gitg/commit/gitg-commit.vala:400
+#: ../gitg/commit/gitg-commit.vala:421
+#, fuzzy
 msgid "No untracked files"
-msgstr ""
+msgstr "未追蹤"
 
-#: ../gitg/commit/gitg-commit.vala:436
+#: ../gitg/commit/gitg-commit.vala:505
 msgid "There are no changes to be committed"
-msgstr ""
+msgstr "沒有要提交的改變"
 
-#: ../gitg/commit/gitg-commit.vala:437
+#: ../gitg/commit/gitg-commit.vala:506
 msgid "Use amend to change the commit message of the previous commit"
 msgstr ""
 
-#: ../gitg/commit/gitg-commit.vala:463
+#: ../gitg/commit/gitg-commit.vala:532
 msgid "Failed to commit"
 msgstr "提交失敗"
 
 #. TODO: better to show user info dialog directly or something
-#: ../gitg/commit/gitg-commit.vala:479 ../gitg/commit/gitg-commit.vala:712
+#: ../gitg/commit/gitg-commit.vala:548 ../gitg/commit/gitg-commit.vala:727
 msgid "Failed to pass pre-commit"
-msgstr ""
+msgstr "送出預先提交失敗"
 
-#: ../gitg/commit/gitg-commit.vala:700
+#: ../gitg/commit/gitg-commit.vala:715
 msgid ""
 "Your user name and email are not configured yet. Please go to the user "
 "configuration and provide your name and email."
 msgstr ""
+"您的使用者名稱與電子郵件尚未設定。請至使用者組態並提供您的姓名與電子郵件。"
 
-#: ../gitg/commit/gitg-commit.vala:704
+#: ../gitg/commit/gitg-commit.vala:719
 msgid ""
 "Your user name is not configured yet. Please go to the user configuration "
 "and provide your name."
-msgstr ""
+msgstr "您的使用者名稱尚未設定。請至使用者組態並提供您的姓名。"
 
-#: ../gitg/commit/gitg-commit.vala:708
+#: ../gitg/commit/gitg-commit.vala:723
 msgid ""
 "Your email is not configured yet. Please go to the user configuration and "
 "provide your email."
-msgstr ""
+msgstr "您的電子郵件尚未設定。請至使用者組態並提供您的電子郵件。"
 
-#: ../gitg/commit/gitg-commit.vala:769
+#: ../gitg/commit/gitg-commit.vala:782 ../gitg/commit/gitg-commit.vala:909
+msgid "Discard changes"
+msgstr "放棄變更"
+
+#: ../gitg/commit/gitg-commit.vala:783
+msgid "Are you sure you want to permanently discard the selected changes?"
+msgstr "確定要永久放棄選取的變更嗎？"
+
+#: ../gitg/commit/gitg-commit.vala:792 ../gitg/commit/gitg-commit.vala:936
+#: ../gitg/gitg-commit-action-create-patch.vala:143
+#: ../gitg/gitg-window.vala:432 ../gitg/resources/ui/gitg-clone-dialog.ui.h:2
+#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:2
+#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:2
+#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:2
+#: ../gitg/resources/ui/gitg-window.ui.h:5
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: ../gitg/commit/gitg-commit.vala:793 ../gitg/commit/gitg-commit.vala:935
+msgid "Discard"
+msgstr "放棄"
+
+#: ../gitg/commit/gitg-commit.vala:821
+msgid "Failed to discard selection"
+msgstr "無法放棄已選取的檔案"
+
+#: ../gitg/commit/gitg-commit.vala:850
+#, fuzzy
 msgid "Failed to stage selection"
-msgstr ""
+msgstr "無法放棄已選取的檔案"
 
-#: ../gitg/commit/gitg-commit.vala:773
+#: ../gitg/commit/gitg-commit.vala:854
+#, fuzzy
 msgid "Failed to unstage selection"
-msgstr ""
+msgstr "Unstage"
+
+#: ../gitg/commit/gitg-commit.vala:893
+#| msgid "Failed to set Git user config."
+msgid "Failed to discard changes"
+msgstr "無法放棄變更"
+
+#: ../gitg/commit/gitg-commit.vala:914
+#, c-format
+msgid ""
+"Are you sure you want to permanently discard all changes made to the file `"
+"%s'?"
+msgstr "您確定要永久放棄對檔案「%s」所進行的所有變更？"
+
+#: ../gitg/commit/gitg-commit.vala:925
+#, c-format
+msgid ""
+"Are you sure you want to permanently discard all changes made to the files "
+"%s and `%s'?"
+msgstr "您確定要永久放棄對檔案 %s 與「%s」所進行的所有變更？"
+
+#: ../gitg/commit/gitg-commit.vala:969
+#, fuzzy
+msgid "_Stage changes"
+msgstr "舞臺的顏色"
+
+#: ../gitg/commit/gitg-commit.vala:979
+#, fuzzy
+msgid "_Unstage changes"
+msgstr "Unstage"
+
+#: ../gitg/commit/gitg-commit.vala:989
+msgid "_Discard changes"
+msgstr "放棄變更(_D)"
 
 #: ../gitg/gitg-application.vala:55
 msgid "Show the application's version"
@@ -233,39 +399,37 @@ msgstr "顯示應用程式的版本"
 
 #: ../gitg/gitg-application.vala:58
 msgid "Start gitg with a particular activity"
-msgstr ""
+msgstr "以特定活動啟動 gitg"
 
 #: ../gitg/gitg-application.vala:61
 msgid "Start gitg with the commit activity (shorthand for --activity commit)"
-msgstr ""
+msgstr "以提交活動啟動 gitg (--activity 提交的簡寫)"
 
 #: ../gitg/gitg-application.vala:64
 msgid "Do not try to load a repository from the current working directory"
-msgstr ""
+msgstr "不要嘗試從目前工作目錄載入倉儲"
 
 #: ../gitg/gitg-application.vala:88
-#, fuzzy
 msgid "- Git repository viewer"
 msgstr "- Git 倉儲檢視器"
 
 #: ../gitg/gitg-application.vala:206
-#, fuzzy
 msgid "gitg is a Git repository viewer for gtk+/GNOME"
 msgstr "gitg 是為 gtk+/GNOME 設計的 Git 倉儲檢視器"
 
 #: ../gitg/gitg-application.vala:215
 msgid "translator-credits"
-msgstr ""
+msgstr "Cheng-Chia Tseng <pswo10680 gmail com>, 2013"
 
 #: ../gitg/gitg-application.vala:218
 msgid "gitg homepage"
 msgstr "gitg 首頁"
 
-#: ../gitg/gitg-author-details-dialog.vala:65
+#: ../gitg/gitg-author-details-dialog.vala:67
 msgid "Unable to open the .gitconfig file."
 msgstr "無法開啟 .gitconfig 檔。"
 
-#: ../gitg/gitg-author-details-dialog.vala:147
+#: ../gitg/gitg-author-details-dialog.vala:149
 msgid "Failed to set Git user config."
 msgstr "無法設定 Git 使用者組態。"
 
@@ -273,6 +437,160 @@ msgstr "無法設定 Git 使用者組態。"
 msgid "The URL introduced is not supported"
 msgstr "不支援引入的 URL 。"
 
+#: ../gitg/gitg-commit-action-create-branch.vala:48
+#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:1
+msgid "Create Branch"
+msgstr "建立分支"
+
+#: ../gitg/gitg-commit-action-create-branch.vala:53
+msgid "Create a new branch at the selected commit"
+msgstr "以選取的提交建立新的分支"
+
+#: ../gitg/gitg-commit-action-create-branch.vala:85
+#| msgid "Failed to commit"
+msgid "Failed to create branch"
+msgstr "無法建立分支"
+
+#: ../gitg/gitg-commit-action-create-patch.vala:63
+msgid "Create Patch"
+msgstr "建立修補檔"
+
+#: ../gitg/gitg-commit-action-create-patch.vala:68
+msgid "Create a patch from the selected commit"
+msgstr "以選取的提交建立新的修補檔"
+
+#: ../gitg/gitg-commit-action-create-patch.vala:141
+msgid "Save Patch File"
+msgstr "儲存修補檔"
+
+#: ../gitg/gitg-commit-action-create-patch.vala:145
+#| msgid "Save Patch File"
+msgid "_Save Patch"
+msgstr "儲存修補檔(_S)"
+
+#: ../gitg/gitg-commit-action-create-patch.vala:168
+#| msgid "Failed to commit"
+msgid "Failed to create patch"
+msgstr "無法建立修補"
+
+#: ../gitg/gitg-commit-action-create-tag.vala:48
+#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:1
+msgid "Create Tag"
+msgstr "建立標籤"
+
+#: ../gitg/gitg-commit-action-create-tag.vala:53
+msgid "Create a new tag at the selected commit"
+msgstr "以選取的提交建立新的標籤"
+
+#: ../gitg/gitg-commit-action-create-tag.vala:92
+#| msgid "Failed to commit"
+msgid "Failed to create tag"
+msgstr "無法建立標籤"
+
+#: ../gitg/gitg-commit-action-create-tag.vala:109
+#| msgid "Failed to commit"
+msgid "Failed to lookup tag"
+msgstr "搜尋標籤失敗"
+
+#: ../gitg/gitg-create-tag-dialog.vala:106
+msgid "Provide a message to create an annotated tag"
+msgstr "提供訊息以建立有注釋的標籤"
+
+#: ../gitg/gitg-dash-view.vala:141
+msgid "_Delete"
+msgstr "刪除(_D)"
+
+#: ../gitg/gitg-ref-action-delete.vala:48
+#: ../gitg/gitg-ref-action-delete.vala:88
+msgid "Delete"
+msgstr "刪除"
+
+#: ../gitg/gitg-ref-action-delete.vala:53
+msgid "Delete the selected reference"
+msgstr "刪除選取的參照"
+
+#: ../gitg/gitg-ref-action-delete.vala:73
+#, c-format
+msgid "Delete branch %s"
+msgstr "刪除分支 %s"
+
+#: ../gitg/gitg-ref-action-delete.vala:74
+#, c-format
+msgid "Are you sure that you want to permanently delete the branch %s?"
+msgstr "您確定永久刪除分支 %s？"
+
+#: ../gitg/gitg-ref-action-delete.vala:78
+#, c-format
+msgid "Delete tag %s"
+msgstr "刪除標籤 %s"
+
+#: ../gitg/gitg-ref-action-delete.vala:79
+#, c-format
+msgid "Are you sure that you want to permanently delete the tag %s?"
+msgstr "您確定要永遠刪除標籤 %s 嗎？"
+
+#: ../gitg/gitg-ref-action-delete.vala:83
+#, c-format
+msgid "Delete remote branch %s"
+msgstr "刪除遠端分支 %s"
+
+#: ../gitg/gitg-ref-action-delete.vala:84
+#, c-format
+msgid "Are you sure that you want to permanently delete the remote branch %s?"
+msgstr "您確定永久刪除遠端分支 %s？"
+
+#: ../gitg/gitg-ref-action-delete.vala:89
+#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:9
+msgid "Cancel"
+msgstr "取消"
+
+#. Translators: %s is the name of the tag
+#: ../gitg/gitg-ref-action-delete.vala:119
+#, c-format
+#| msgid "Failed to set Git user config."
+msgid "Failed to delete tag %s"
+msgstr "刪除標籤 %s 失敗"
+
+#. Translators: the first %s is the name of the tag, the second is an error message
+#: ../gitg/gitg-ref-action-delete.vala:122
+#, c-format
+msgid "The tag %s could not be deleted: %s"
+msgstr "標籤 %s 無法被刪除：%s"
+
+#. Translators: %s is the name of the branch
+#: ../gitg/gitg-ref-action-delete.vala:127
+#, c-format
+msgid "Failed to delete branch %s"
+msgstr "刪除分支 %s 失敗"
+
+#. Translators: the first %s is the name of the branch, the second is an error message
+#: ../gitg/gitg-ref-action-delete.vala:130
+#, c-format
+msgid "The branch %s could not be deleted: %s"
+msgstr "分支 %s 無法被刪除：%s"
+
+#: ../gitg/gitg-ref-action-rename.vala:48
+msgid "Rename"
+msgstr "重新命名"
+
+#: ../gitg/gitg-ref-action-rename.vala:53
+msgid "Rename the selected reference"
+msgstr "重新命名所選取的參照"
+
+#: ../gitg/gitg-ref-action-rename.vala:100
+#, c-format
+msgid "The specified name ‘%s’ contains invalid characters"
+msgstr "指定名稱「%s」包含無效的字元"
+
+#: ../gitg/gitg-ref-action-rename.vala:102
+msgid "Invalid name"
+msgstr "無效的名稱"
+
+#: ../gitg/gitg-ref-action-rename.vala:141
+#| msgid "Failed to commit"
+msgid "Failed to rename"
+msgstr "無法重新命名"
+
 #: ../gitg/gitg.vala:64
 msgid ""
 "We are terribly sorry, but gitg requires libgit2 (a library on which gitg "
@@ -284,123 +602,158 @@ msgid ""
 "Otherwise, report a bug in your distributions' bug reporting system for "
 "providing libgit2 without threading support."
 msgstr ""
+"我們十分抱歉，但 gitg 需要 libgit2 (此為 gitg 相依的程式庫) 編譯執行緒支"
+"援。\n"
+"\n"
+"如果您是手動編譯 libgit2，請將 libgit2 設定加上 -DTHREADSAFE:BOOL=ON。\n"
+"\n"
+"否則，請在您的發行版本的錯誤回報系統中回報，指出 libgit2 未提供執行緒支援。"
 
-#: ../gitg/gitg-window.vala:276
+#: ../gitg/gitg-window.vala:389
 msgid "Projects"
 msgstr "專案"
 
-#: ../gitg/gitg-window.vala:312
-#, fuzzy
+#: ../gitg/gitg-window.vala:430
 msgid "Open Repository"
 msgstr "開啟倉儲"
 
-#: ../gitg/gitg-window.vala:314
-#: ../libgitg/gitg-diff-view-request-patch.vala:109
-msgid "_Cancel"
-msgstr "取消(_C)"
-
-#: ../gitg/gitg-window.vala:315
+#: ../gitg/gitg-window.vala:433
 msgid "_Open"
 msgstr "開啟(_O)"
 
-#: ../gitg/gitg-window.vala:545
-#, fuzzy, c-format
+#: ../gitg/gitg-window.vala:707
+#, c-format
 msgid "'%s' is not a Git repository."
-msgstr "「%s」並非 Git 倉儲。"
+msgstr "「%s」不是 Git 倉儲。"
 
-#: ../gitg/history/gitg-history-navigation.vala:199
-#: ../gitg/history/gitg-history-navigation.vala:307
+#: ../gitg/history/gitg-history-refs-list.vala:136
 #, fuzzy
 msgid "All commits"
-msgstr "所有提交"
+msgstr "提交"
 
-#. Branches
-#: ../gitg/history/gitg-history-navigation.vala:202
+#: ../gitg/history/gitg-history-refs-list.vala:674
 #, fuzzy
 msgid "Branches"
 msgstr "分支"
 
-#. Remotes
-#: ../gitg/history/gitg-history-navigation.vala:239
+#: ../gitg/history/gitg-history-refs-list.vala:675
 #, fuzzy
 msgid "Remotes"
 msgstr "遠端"
 
-#. Tags
-#: ../gitg/history/gitg-history-navigation.vala:265
+#: ../gitg/history/gitg-history-refs-list.vala:676
 #, fuzzy
 msgid "Tags"
-msgstr "標籤"
+msgstr "標籤(_T)…"
 
-#: ../gitg/history/gitg-history.vala:164
+#: ../gitg/history/gitg-history.vala:219
 #: ../gitg/preferences/gitg-preferences-history.vala:144
 #, fuzzy
 msgid "History"
-msgstr "歷史"
+msgstr "歷史(_H)"
+
+#: ../gitg/history/gitg-history.vala:224
+#, fuzzy
+msgid "Examine the history of the repository"
+msgstr "檢驗"
 
 #: ../gitg/preferences/gitg-preferences-interface.vala:73
 msgid "Interface"
 msgstr "介面"
 
-#: ../libgitg/gitg-date.vala:316
+#: ../libgitg/gitg-date.vala:346
 msgid "Now"
 msgstr "現在"
 
-#: ../libgitg/gitg-date.vala:320
+#: ../libgitg/gitg-date.vala:350
 #, c-format
 msgid "A minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分鐘前"
 
-#: ../libgitg/gitg-date.vala:325
+#: ../libgitg/gitg-date.vala:355
 msgid "Half an hour ago"
 msgstr "半小時前"
 
-#: ../libgitg/gitg-date.vala:330
+#: ../libgitg/gitg-date.vala:360
 #, c-format
 msgid "An hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 小時前"
 
-#: ../libgitg/gitg-date.vala:335
+#: ../libgitg/gitg-date.vala:365
 #, c-format
 msgid "A day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天前"
 
-#: ../libgitg/gitg-diff-view-request-patch.vala:107
-msgid "Save Patch File"
-msgstr "儲存修補檔"
+#. Translators: this is a strftime type date format which is
+#. used when the date is in the current year and uses a 24 hour
+#. clock.
+#: ../libgitg/gitg-date.vala:374
+#, fuzzy
+msgid "%b %e, %H:%M"
+msgstr "%b%e日%A %H:%M"
 
-#: ../libgitg/gitg-diff-view-request-patch.vala:111
-msgid "_Save"
-msgstr "儲存(_S)"
+#. Translators: this is a strftime type date format which is
+#. used when the date is in the current year and uses a 12 hour
+#. clock.
+#: ../libgitg/gitg-date.vala:381
+#, fuzzy
+msgid "%b %e, %I:%M %p"
+msgstr "%Y年%b%e日,%p %I:%M:%S"
 
-#: ../libgitg/gitg-diff-view.vala:123
+#. Translators: this is a strftime type date format which is
+#. used when the date is not in the current year and uses a 24
+#. hour clock.
+#: ../libgitg/gitg-date.vala:391
+#, fuzzy
+msgid "%b %e %Y, %H:%M"
+msgstr "%Y年%b%e日%A %H:%M"
+
+#. Translators: this is a strftime type date format which is
+#. used when the date is not in the current year and uses a 12
+#. hour clock.
+#: ../libgitg/gitg-date.vala:398
+#, fuzzy
+msgid "%b %e %Y, %I:%M %p"
+msgstr "%Y年%b%e日,%p %I:%M:%S"
+
+#: ../libgitg/gitg-diff-view.vala:229
+#, fuzzy
 msgid "stage"
-msgstr ""
+msgstr "舞臺的顏色"
 
-#: ../libgitg/gitg-diff-view.vala:124
+#: ../libgitg/gitg-diff-view.vala:230
+#, fuzzy
 msgid "unstage"
-msgstr ""
+msgstr "Unstage"
 
-#: ../libgitg/gitg-diff-view.vala:125
+#: ../libgitg/gitg-diff-view.vala:231
 msgid "Loading diff…"
 msgstr "正載入 diff…"
 
-#: ../libgitg/gitg-stage.vala:333
+#: ../libgitg/gitg-stage.vala:335
 #, c-format
 msgid "Could not read commit message after running commit-msg hook: %s"
-msgstr ""
+msgstr "在執行 commit-msg 掛鉤後無法讀取提交訊息：%s"
 
-#: ../plugins/diff/gitg-diff.vala:62
+#: ../plugins/diff/gitg-diff.vala:89
 msgid "Diff"
 msgstr "Diff"
 
+#: ../plugins/diff/gitg-diff.vala:94
+msgid "Show the changes introduced by the selected commit"
+msgstr "顯示選取的提交所造成的變更"
+
 #: ../plugins/files/gitg-files.vala:63
 msgid "Files"
 msgstr "檔案"
 
+#: ../plugins/files/gitg-files.vala:68
+msgid "Show the files in the tree of the selected commit"
+msgstr "在選取提交的樹狀圖中顯示檔案"
+
 #. ex: ts=4 noet
 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:1
 msgid "Author Details"
@@ -409,16 +762,16 @@ msgstr "作者詳細資訊"
 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:3
 #, no-c-format
 msgid "Note: The Git config file '%s' does not exist."
-msgstr ""
+msgstr "注意：Git 設定檔「%s」不存在。"
 
 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:4
 msgid "Enter details to set as default for all repositories:"
-msgstr ""
+msgstr "輸入詳細資料以設為所有倉儲的預設值："
 
 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:6
-#, no-c-format
+#, fuzzy, no-c-format
 msgid "Enter details for repository '%s':"
-msgstr ""
+msgstr "請輸入您的帳號詳細資料"
 
 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:7
 msgid "E-mail: "
@@ -428,68 +781,94 @@ msgstr "電子郵件： "
 msgid "Name: "
 msgstr "名稱："
 
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:9
-msgid "Cancel"
-msgstr "取消"
-
 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:10
 msgid "Save"
 msgstr "儲存"
 
 #: ../gitg/resources/ui/gitg-clone-dialog.ui.h:1
+#, fuzzy
 msgid "Clone Repository"
-msgstr ""
+msgstr "重製(_C)"
 
-#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:2
+#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:3
+#, fuzzy
 msgid "Cl_one"
-msgstr ""
+msgstr "清除(_E)"
 
-#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:3
+#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:4
+#, fuzzy
 msgid "Remote _URL:"
-msgstr ""
+msgstr "遠端桌面的 URL 應該寄送至這個電郵地址"
 
-#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:4
+#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:5
+#, fuzzy
 msgid "_Local Folder:"
-msgstr ""
+msgstr "如果要開啟遠端的檔案，請先將檔案複製至本地的資料夾才進行拖曳的動作。"
 
-#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:5
+#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:6
 msgid "Select location…"
 msgstr "選取位置…"
 
-#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:6
+#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:7
+#, fuzzy
 msgid "Bare repository"
-msgstr ""
+msgstr "倉儲："
 
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:2
+#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:3
 #: ../gitg/resources/ui/gitg-commit-paned.ui.h:2
 msgid "C_ommit"
 msgstr "提交(_O)"
 
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:3
+#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:4
+#, fuzzy
 msgid "Add _signed-off-by signature"
-msgstr ""
+msgstr "加入 signed-off-by line"
 
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:4
+#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:5
+#, fuzzy
 msgid "_Amend previous commit"
-msgstr ""
+msgstr "修正上一次提交"
 
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:5
-#: ../gitg/resources/ui/gitg-window.ui.h:2
+#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:6
+#: ../gitg/resources/ui/gitg-window.ui.h:6
 msgid "Close"
 msgstr "關閉"
 
 #: ../gitg/resources/ui/gitg-commit-paned.ui.h:1
 #, fuzzy
 msgid "Skip commit _hooks"
-msgstr "略過提交掛勾(_H)"
+msgstr "跳至"
 
 #: ../gitg/resources/ui/gitg-commit-paned.ui.h:3
+#, fuzzy
 msgid "S_tage selection"
-msgstr ""
+msgstr "「%s」無法加入到選取區。"
+
+#: ../gitg/resources/ui/gitg-commit-paned.ui.h:4
+#, fuzzy
+msgid "D_iscard selection"
+msgstr "選取區(_S)"
+
+#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:3
+#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:3
+#, fuzzy
+msgid "C_reate"
+msgstr "建立(_R)"
+
+#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:4
+#, fuzzy
+msgid "Branch _name:"
+msgstr "分支名稱："
+
+#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:4
+#, fuzzy
+msgid "Tag _name:"
+msgstr "標記名稱"
 
 #: ../gitg/resources/ui/gitg-history-paned.ui.h:1
+#, fuzzy
 msgid "Subject"
-msgstr ""
+msgstr "(沒有主旨)"
 
 #: ../gitg/resources/ui/gitg-history-paned.ui.h:2
 msgid "Author"
@@ -522,11 +901,12 @@ msgstr "退出(_Q)"
 #: ../gitg/resources/ui/gitg-menus.ui.h:6
 #, fuzzy
 msgid "_Open Repository…"
-msgstr "開啟倉儲(_O)…"
+msgstr "倉儲："
 
 #: ../gitg/resources/ui/gitg-menus.ui.h:7
+#, fuzzy
 msgid "_Clone Repository…"
-msgstr ""
+msgstr "重製(_C)"
 
 #: ../gitg/resources/ui/gitg-menus.ui.h:8
 msgid "_Author Details"
@@ -541,12 +921,14 @@ msgid "Show markup"
 msgstr "顯示標記"
 
 #: ../gitg/resources/ui/gitg-preferences-commit.ui.h:2
+#, fuzzy
 msgid "Display _subject margin at column:"
-msgstr ""
+msgstr "顯示主旨邊界於哪一欄"
 
 #: ../gitg/resources/ui/gitg-preferences-commit.ui.h:3
+#, fuzzy
 msgid "Display right _margin at column:"
-msgstr ""
+msgstr "顯示右邊邊界於(_M):"
 
 #: ../gitg/resources/ui/gitg-preferences-commit.ui.h:4
 msgid "Enable spell checking"
@@ -561,32 +943,37 @@ msgid "Commits"
 msgstr "提交"
 
 #: ../gitg/resources/ui/gitg-preferences-history.ui.h:2
+#, fuzzy
 msgid "Collapse inactive lanes"
-msgstr ""
+msgstr "未使用"
 
 #: ../gitg/resources/ui/gitg-preferences-history.ui.h:3
+#, fuzzy
 msgid "Show stash in history"
-msgstr ""
+msgstr "Stash"
 
 #: ../gitg/resources/ui/gitg-preferences-history.ui.h:4
+#, fuzzy
 msgid "Show staged changes in history"
-msgstr ""
+msgstr "顯示變更(_S)"
 
 #: ../gitg/resources/ui/gitg-preferences-history.ui.h:5
+#, fuzzy
 msgid "Show unstaged changes in history"
-msgstr ""
+msgstr "將未 stage 檔案的變更還原"
 
 #: ../gitg/resources/ui/gitg-preferences-history.ui.h:6
 msgid "Show history in topological order"
 msgstr ""
 
 #: ../gitg/resources/ui/gitg-preferences-history.ui.h:7
+#, fuzzy
 msgid "Early"
-msgstr ""
+msgstr "未預期的串流過早結束"
 
 #: ../gitg/resources/ui/gitg-preferences-history.ui.h:8
 msgid "Late"
-msgstr ""
+msgstr "稍後"
 
 #: ../gitg/resources/ui/gitg-preferences-interface.ui.h:1
 msgid "Layout"
@@ -600,6 +987,56 @@ msgstr "使用水平版面配置"
 msgid "Preferences"
 msgstr "偏好設定"
 
+#: ../gitg/resources/ui/gitg-window.ui.h:2
+#, fuzzy
+msgid "Show the list of recently used repositories"
+msgstr "目前使用的資源清單大小"
+
+#: ../gitg/resources/ui/gitg-window.ui.h:3
+#, fuzzy
+msgid "Find a word or phrase"
+msgstr "在文件中尋找字詞"
+
+#: ../gitg/resources/ui/gitg-window.ui.h:4
+#, fuzzy
+msgid "General settings and options"
+msgstr "一般選項"
+
+#: ../libgitg/resources/diff-view-options.ui.h:1
+#, fuzzy
+msgid "Ignore whitespace changes"
+msgstr "忽略空白字元的變更"
+
+#: ../libgitg/resources/diff-view-options.ui.h:2
+#, fuzzy
+msgid "Show changes inline"
+msgstr "顯示行內變更"
+
+#: ../libgitg/resources/diff-view-options.ui.h:3
+#, fuzzy
+msgid "Developer tools"
+msgstr "啟用 WebKit 開發者工具"
+
+#: ../libgitg/resources/diff-view-options.ui.h:4
+#, fuzzy
+msgid "Tab width"
+msgstr "Tab 字元寬度"
+
+#: ../libgitg/resources/diff-view-options.ui.h:5
+#, fuzzy
+msgid "Context"
+msgstr "脈絡"
+
+#: ../libgitg/resources/gitg-repository-list-box-row.ui.h:1
+msgid ""
+"Remove the repository from the list (does not delete the repository from "
+"disk)"
+msgstr "從清單中移除倉儲 (不會將倉儲自硬碟上刪除)"
+
 #: ../plugins/files/resources/view-files.ui.h:1
+#, fuzzy
 msgid "column"
-msgstr ""
+msgstr "欄"
+
+#~ msgid "_Save"
+#~ msgstr "儲存(_S)"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]