[gitg] Updated Chinese (Taiwan) translation

[Damned-Lies <translations src gnome org>]

commit 9cef99a5e95d7adf5b5ce0313319d237b6a06aec
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Sat Feb 13 06:46:24 2016 +0000

    Updated Chinese (Taiwan) translation

 po/zh_TW.po | 1153 ++++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 856 insertions(+), 297 deletions(-)
---
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8b7f34b..c1f4e20 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,18 +8,23 @@ 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: 2015-03-19 06:28+0000\n"
-"PO-Revision-Date: 2015-03-19 21:04+0800\n"
-"Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
+"POT-Creation-Date: 2016-02-10 07:21+0000\n"
+"PO-Revision-Date: 2016-02-13 12:43+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.7.1\n"
+"X-Generator: Poedit 1.8.6\n"
 
-#: ../data/gitg.desktop.in.in.h:1 ../gitg/gitg.vala:54
+#: ../contrib/xml/xml-reader.c:327
+#, c-format
+msgid "Could not parse XML from stream"
+msgstr "無法分析來自串流的 XML"
+
+#: ../data/gitg.desktop.in.in.h:1 ../gitg/gitg.vala:39
 #: ../gitg/resources/ui/gitg-window.ui.h:1
 msgid "gitg"
 msgstr "gitg"
@@ -55,10 +60,36 @@ msgid "The activity which gitg activates by default when first launched."
 msgstr "當第一次執行時 gitg é è¨­ä½¿ç”¨çš„æ´»å‹•ã€‚"
 
 #: ../data/org.gnome.gitg.gschema.xml.in.in.h:7
+msgid "Use Gravatar"
+msgstr "使用 Gravatar"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:8
+msgid "Enable the use of gravatar to display user avatars."
+msgstr "啟用 gravatar ä¾†é¡¯ç¤ºä½¿ç”¨è€…å¤§é ­è²¼ã€‚"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:9
+msgid "Enable Monitoring"
+msgstr "啟用監控"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:10
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:10
+msgid "Automatically update when external changes to .git are detected"
+msgstr "當檢測到.git 外部變更時自動更新"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:11
+msgid "Enable Diff Highlighting"
+msgstr "啟用 Diff 色彩標示"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:12
+msgid ""
+"Setting that determines whether to enable syntax highlighting in diff views."
+msgstr "決定在 diff 檢視中啟用語法色彩標示的設定值。"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:13
 msgid "When to Collapse Inactive Lanes"
 msgstr "æ”¶ç–Šæœªä½¿ç”¨çª—æ ¼çš„æ™‚é–“"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:8
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:14
 msgid ""
 "Setting that indicates when an inactive lane should be collapsed. Valid "
 "values are 0 - 4, where 0 indicates 'early' and 4 indicates 'late'."
@@ -66,7 +97,7 @@ msgstr ""
 "æŒ‡ç¤ºä½•æ™‚è©²æ”¶ç–Šæœªä½¿ç”¨çª—æ ¼çš„è¨­å®šå€¼ã€‚æœ‰æ•ˆçš„å€¼æœ‰ 0 -4，0 代表「快」，而 4 代表"
 "「慢」。"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:9
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:15
 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 "
@@ -77,61 +108,87 @@ msgstr ""
 "境下提供較清靜的歷史檢視。請查看 collapse-inactive-lanes 以控制何時應該收疊窗"
 "æ ¼ã€‚"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:10
-#, fuzzy
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:16
 msgid "Show History in Topological Order"
 msgstr "ä»¥æ‹“æ¨¸é †åºé¡¯ç¤ºæ­·å²"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:11
-#, fuzzy
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:17
 msgid ""
 "Setting that indicates whether to show the history in topological order."
 msgstr "æŒ‡ç¤ºæ˜¯å¦è¦ä»¥æ‹“æ¨¸é †åºé¡¯ç¤ºæ­·å²çš„è¨­å®šå€¼ã€‚"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:12
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:18
 msgid "Show Stashed Changes"
 msgstr "顯示已 stash 的變更"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:13
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:19
 msgid ""
 "Setting that indicates whether to show items for the stash in the history."
 msgstr "指示是否要在歷史中為 stash 顯示條目。"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:14
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:20
 msgid "Show Staged Changes"
 msgstr "顯示已 stage 的變更"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:15
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:21
 msgid ""
 "Setting that indicates whether to show a virtual item for the currently "
 "staged changes in the history."
 msgstr "指示是否要在歷史中為目前 stage 的變動顯示虛擬條目的設定值。"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:16
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:22
 msgid "Show Unstaged Changes"
 msgstr "顯示已 unstage 的變更"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:17
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:23
 msgid ""
 "Setting that indicates whether to show a virtual item for the currently "
 "unstaged changes in the history."
 msgstr "指示是否要在歷史中為目前 unstage 的變動顯示虛擬條目的設定值。"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:18
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:24
 msgid "Mainline Head"
 msgstr "主線 Head"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:19
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:25
 msgid ""
 "Setting that indicates whether to always preserve a mainline in the history "
 "for the current HEAD."
 msgstr "指示是否要在歷史中為目前的 HEAD 保留主線的設定值。"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:20
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:26
+msgid "Default selection of the history activity"
+msgstr "æ­·å²æ´»å‹•çš„é è¨­é¸é …"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:27
+msgid ""
+"Setting that determines the default selection on startup of the history "
+"activity."
+msgstr "è¨­å®šæ­·å²æ´»å‹•å•Ÿå‹•æ™‚çš„é è¨­é¸æ“‡å€åŸŸã€‚"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:28
+msgid "Reference Sort Order"
+msgstr "參照排列次序"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:29
+msgid "The order by which references in the history sidebar should be sorted."
+msgstr "歷史側邊欄中的應依哪參照排序。"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:30
+msgid "Show Upstream With Branch"
+msgstr "在分支顯示上游"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:31
+msgid ""
+"Determines whether to also show the upstream (remote) tracking branch when "
+"selecting a local branch in the history view."
+msgstr "決定在歷史檢視中選擇本地端分支時是否同時顯示上游 (é ç«¯) 追蹤分支。"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:32
 msgid "Show Right Margin in Commit Message View"
 msgstr "在提交訊息檢視顯示右邊界"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:21
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:33
 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."
@@ -139,97 +196,105 @@ msgstr ""
 "在提交訊息檢視中顯示右邊界。這可以用來輕鬆的看出在特定欄中的何處中斷提交訊"
 "息。"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:22
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:34
 msgid "Column at Which Right Margin is Shown"
 msgstr "顯示右邊邊界於哪一欄"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:23
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:35
 msgid ""
 "The column at which the right margin is shown if the show-right-margin "
 "preference is set to TRUE."
 msgstr "如果 show-right-margin 偏好設定設為「TRUE」時右邊界要顯示在哪一欄。"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:24
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:36
 msgid "Show Subject Margin in Commit Message View"
 msgstr "在提交訊息檢視顯示主旨邊界"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:25
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:37
 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:26
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:38
 msgid "Column at Which Subject Margin is Shown"
 msgstr "顯示主旨邊界於哪一欄"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:27
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:39
 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:28
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:40
 msgid "Enable Spell Checking"
 msgstr "啟用拼字檢查"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:29
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:41
 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:30
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:42
 msgid "Spell Checking Language"
 msgstr "拼字檢查語言"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:31
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:43
 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:32
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:44
 msgid "Ignore Whitespace Changes"
 msgstr "忽略空白字元的變更"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:33
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:45
 msgid ""
 "Setting that indicates whether to ignore whitespace changes when showing the "
 "diff of a commit."
 msgstr "指示在顯示提交的 diff 時，是否要忽略空白字元變更的設定值。"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:34
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:46
 msgid "Show Changes Inline"
 msgstr "顯示行內變更"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:35
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:47
 msgid ""
 "Setting that indicates whether changes within lines should be shown inline."
 msgstr "設定在行內的變更是否以行內顯示。"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:36
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:48
+msgid "Wrap"
+msgstr "換列"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:49
+msgid "Wrap lines."
+msgstr "換列。"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:50
 msgid "Number of Before/After Context Lines"
 msgstr "之前/之後前後文列數"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:37
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:51
 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:38
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:52
 msgid "Rendered Width of a Tab Character"
 msgstr "Tab 字元轉換寬度"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:39
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:53
 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:40
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:54
 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."
@@ -237,223 +302,286 @@ msgstr ""
 "設定提交區域中要顯示 diff 以 stage 或 unstage 時，應該要顯示多少列前後文的設"
 "定值。"
 
-#: ../gitg/commit/gitg-commit-dialog.vala:283
+#: ../gitg/commit/gitg-commit-dialog.vala:308
 #, c-format
 msgid "Cannot set spell checking language: %s"
 msgstr "不能設定拼字檢查語言：%s"
 
-#: ../gitg/commit/gitg-commit.vala:72
-#: ../gitg/preferences/gitg-preferences-commit.vala:119
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:1
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:4
+#: ../gitg/commit/gitg-commit-dialog.vala:508
+#: ../gitg/commit/gitg-commit.vala:1067
+msgid "There are no changes to be committed"
+msgstr "沒有要提交的改變"
+
+#: ../gitg/commit/gitg-commit-dialog.vala:509
+#: ../gitg/commit/gitg-commit.vala:1068
+msgid "Use amend to change the commit message of the previous commit"
+msgstr "使用修訂以變更前次提交的提交訊息"
+
+#: ../gitg/commit/gitg-commit.vala:104
+msgctxt "Activity"
 msgid "Commit"
 msgstr "提交"
 
-#: ../gitg/commit/gitg-commit.vala:77
+#: ../gitg/commit/gitg-commit.vala:109
 msgid "Create new commits and manage the staging area"
 msgstr "建立新的提交並管理 stage 區域"
 
-#: ../gitg/commit/gitg-commit.vala:152
+#: ../gitg/commit/gitg-commit.vala:184
 msgid "_Stage selection"
 msgstr "_Stage 選擇"
 
-#: ../gitg/commit/gitg-commit.vala:188
+#: ../gitg/commit/gitg-commit.vala:223
 #, c-format
 msgid "Failed to stage the removal of submodule `%s'"
 msgstr "無法 stage 子模組「%s」的移除"
 
-#: ../gitg/commit/gitg-commit.vala:204
+#: ../gitg/commit/gitg-commit.vala:239
 #, c-format
 msgid "Failed to open the repository of submodule `%s' while trying to stage"
 msgstr "試圖 stage 時無法開啟子模組「%s」的倉儲"
 
-#: ../gitg/commit/gitg-commit.vala:218
+#: ../gitg/commit/gitg-commit.vala:253
 #, c-format
 msgid ""
 "Failed to lookup the working directory commit of submodule `%s' while trying "
 "to stage"
 msgstr "試圖 stage 時無法查詢子模組「%s」的工作目錄提交"
 
-#: ../gitg/commit/gitg-commit.vala:231
+#: ../gitg/commit/gitg-commit.vala:266
 #, c-format
 msgid "Failed to stage the submodule `%s'"
 msgstr "無法 stage 子模組「%s」"
 
-#: ../gitg/commit/gitg-commit.vala:253
+#: ../gitg/commit/gitg-commit.vala:288
 #, c-format
 msgid "Failed to stage the removal of file `%s'"
 msgstr "無法 stage 檔案「%s」的移除"
 
-#: ../gitg/commit/gitg-commit.vala:267
+#: ../gitg/commit/gitg-commit.vala:302
 #, c-format
 msgid "Failed to stage the file `%s'"
 msgstr "無法 stage 檔案「%s」"
 
-#: ../gitg/commit/gitg-commit.vala:536
+#: ../gitg/commit/gitg-commit.vala:574
 msgid "_Unstage selection"
 msgstr "_Unstage 選擇"
 
-#: ../gitg/commit/gitg-commit.vala:601
+#: ../gitg/commit/gitg-commit.vala:640
 #, c-format
 msgid "Failed to unstage the removal of file `%s'"
 msgstr "無法 unstage 檔案「%s」的移除"
 
-#: ../gitg/commit/gitg-commit.vala:602
+#: ../gitg/commit/gitg-commit.vala:641
 #, c-format
 msgid "Failed to unstage the file `%s'"
 msgstr "無法 unstage 檔案「%s」"
 
-#: ../gitg/commit/gitg-commit.vala:609
+#: ../gitg/commit/gitg-commit.vala:648
 #, c-format
 msgid "Failed to unstage the removal of submodule `%s'"
 msgstr "無法 unstage 子模組「%s」的移除"
 
-#: ../gitg/commit/gitg-commit.vala:610
+#: ../gitg/commit/gitg-commit.vala:649
 #, c-format
 msgid "Failed to unstage the submodule `%s'"
 msgstr "無法 unstage 子模組「%s」"
 
 #. Populate staged items
-#: ../gitg/commit/gitg-commit.vala:805
+#: ../gitg/commit/gitg-commit.vala:853
 msgid "Staged"
 msgstr "å·² stage"
 
-#: ../gitg/commit/gitg-commit.vala:813
+#: ../gitg/commit/gitg-commit.vala:861
 msgid "No staged files"
 msgstr "未 stage 的檔案"
 
 #. Populate unstaged items
-#: ../gitg/commit/gitg-commit.vala:829
+#: ../gitg/commit/gitg-commit.vala:884
 msgid "Unstaged"
 msgstr "未 stage"
 
-#: ../gitg/commit/gitg-commit.vala:837
+#: ../gitg/commit/gitg-commit.vala:892
 msgid "No unstaged files"
 msgstr "未 stage 檔案"
 
 #. Populate untracked items
-#: ../gitg/commit/gitg-commit.vala:853
+#: ../gitg/commit/gitg-commit.vala:915
 msgid "Untracked"
 msgstr "未追蹤"
 
-#: ../gitg/commit/gitg-commit.vala:857
+#: ../gitg/commit/gitg-commit.vala:919
 msgid "No untracked files"
 msgstr "無未追蹤的檔案"
 
-#: ../gitg/commit/gitg-commit.vala:875
+#: ../gitg/commit/gitg-commit.vala:944
 msgid "Submodule"
 msgstr "子模組"
 
-#: ../gitg/commit/gitg-commit.vala:879
-#, fuzzy
+#: ../gitg/commit/gitg-commit.vala:948
 msgid "No dirty submodules"
-msgstr "無 dirty 子模組"
-
-#: ../gitg/commit/gitg-commit.vala:991
-msgid "There are no changes to be committed"
-msgstr "沒有要提交的改變"
-
-#: ../gitg/commit/gitg-commit.vala:992
-msgid "Use amend to change the commit message of the previous commit"
-msgstr "使用修訂以變更前次提交的提交訊息"
+msgstr "不允許粗糙子模組"
 
-#: ../gitg/commit/gitg-commit.vala:1018
+#: ../gitg/commit/gitg-commit.vala:1095
 msgid "Failed to commit"
 msgstr "提交失敗"
 
-#. TODO: better to show user info dialog directly or something
-#: ../gitg/commit/gitg-commit.vala:1034 ../gitg/commit/gitg-commit.vala:1213
+#: ../gitg/commit/gitg-commit.vala:1111
 msgid "Failed to pass pre-commit"
 msgstr "é€å‡ºé å…ˆæäº¤å¤±æ•—"
 
-#: ../gitg/commit/gitg-commit.vala:1201
-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:1205
-msgid ""
-"Your user name is not configured yet. Please go to the user configuration "
-"and provide your name."
-msgstr "您的使用者名稱尚未設定。請至使用者組態並提供您的姓名。"
-
-#: ../gitg/commit/gitg-commit.vala:1209
-msgid ""
-"Your email is not configured yet. Please go to the user configuration and "
-"provide your email."
-msgstr "您的電子郵件尚未設定。請至使用者組態並提供您的電子郵件。"
-
-#: ../gitg/commit/gitg-commit.vala:1268 ../gitg/commit/gitg-commit.vala:1415
+#: ../gitg/commit/gitg-commit.vala:1314 ../gitg/commit/gitg-commit.vala:1464
 msgid "Discard changes"
 msgstr "放棄變更"
 
-#: ../gitg/commit/gitg-commit.vala:1269
+#: ../gitg/commit/gitg-commit.vala:1315
 msgid "Are you sure you want to permanently discard the selected changes?"
 msgstr "確定要永久放棄選取的變更嗎？"
 
-#: ../gitg/commit/gitg-commit.vala:1278 ../gitg/commit/gitg-commit.vala:1441
-#: ../gitg/gitg-commit-action-create-patch.vala:143
-#: ../gitg/gitg-window.vala:468 ../gitg/resources/ui/gitg-clone-dialog.ui.h:2
+#: ../gitg/commit/gitg-commit.vala:1324 ../gitg/commit/gitg-commit.vala:1490
+#: ../gitg/commit/gitg-commit.vala:1605
+#: ../gitg/gitg-commit-action-create-patch.vala:145
+#: ../gitg/gitg-dash-view.vala:437 ../gitg/gitg-window.vala:190
+#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:2
+#: ../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
+#: ../gitg/resources/ui/gitg-window.ui.h:9
 #: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:1
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../gitg/commit/gitg-commit.vala:1279 ../gitg/commit/gitg-commit.vala:1442
+#: ../gitg/commit/gitg-commit.vala:1325 ../gitg/commit/gitg-commit.vala:1491
 msgid "Discard"
 msgstr "放棄"
 
-#: ../gitg/commit/gitg-commit.vala:1307
+#: ../gitg/commit/gitg-commit.vala:1354
 msgid "Failed to discard selection"
 msgstr "ç„¡æ³•æ”¾æ£„é¸å–é …ç›®"
 
-#: ../gitg/commit/gitg-commit.vala:1336
+#: ../gitg/commit/gitg-commit.vala:1384
 msgid "Failed to stage selection"
-msgstr "無法 stage 選擇"
+msgstr "無法暫存選擇"
 
-#: ../gitg/commit/gitg-commit.vala:1340
+#: ../gitg/commit/gitg-commit.vala:1388
 msgid "Failed to unstage selection"
-msgstr "無法 unstage 選擇"
+msgstr "無法取消暫存選擇"
 
-#: ../gitg/commit/gitg-commit.vala:1399
+#: ../gitg/commit/gitg-commit.vala:1448
 msgid "Failed to discard changes"
 msgstr "無法放棄變更"
 
-#: ../gitg/commit/gitg-commit.vala:1420
+#: ../gitg/commit/gitg-commit.vala:1469
 #, 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:1431
+#: ../gitg/commit/gitg-commit.vala:1480
 #, 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:1475
+#: ../gitg/commit/gitg-commit.vala:1563
+msgid "Failed to delete files"
+msgstr "無法刪除檔案"
+
+#: ../gitg/commit/gitg-commit.vala:1579
+msgid "Delete file"
+msgid_plural "Delete files"
+msgstr[0] "刪除檔案"
+
+#: ../gitg/commit/gitg-commit.vala:1584
+#, c-format
+msgid "Are you sure you want to permanently delete the file `%s'?"
+msgstr "ç¢ºå®šè¦æ°¸é åˆªé™¤æª”æ¡ˆã€Œ%s」嗎？"
+
+#: ../gitg/commit/gitg-commit.vala:1595
+#, c-format
+msgid "Are you sure you want to permanently delete the files %s and `%s'?"
+msgstr "ç¢ºå®šè¦æ°¸é åˆªé™¤æª”æ¡ˆã€Œ%s」與「%s」嗎？"
+
+#: ../gitg/commit/gitg-commit.vala:1640
 msgid "_Stage changes"
-msgstr "_Stage 變更"
+msgstr "暫存變更(_S)"
 
-#: ../gitg/commit/gitg-commit.vala:1485
+#: ../gitg/commit/gitg-commit.vala:1650
 msgid "_Unstage changes"
-msgstr "_Unstage 變更"
+msgstr "取消暫存變更(_U)"
 
-#: ../gitg/commit/gitg-commit.vala:1495
+#: ../gitg/commit/gitg-commit.vala:1660
 msgid "_Discard changes"
 msgstr "放棄變更(_D)"
 
-#: ../gitg/commit/gitg-commit.vala:1518
+#: ../gitg/commit/gitg-commit.vala:1670
+msgid "D_elete file"
+msgid_plural "D_elete files"
+msgstr[0] "刪除檔案(_E)"
+
+#: ../gitg/commit/gitg-commit.vala:1693
 msgid "_Edit file"
 msgstr "編輯檔案(_E)"
 
+#: ../gitg/gitg-action-support.vala:95
+#, c-format
+msgid "Failed to stash changes: %s"
+msgstr "無法儲藏變更：%s"
+
+#: ../gitg/gitg-action-support.vala:130
+msgid "Unstaged changes"
+msgstr "未暫存的變更"
+
+#: ../gitg/gitg-action-support.vala:131
+msgid ""
+"You appear to have unstaged changes in your working directory. Would you "
+"like to stash the changes before the checkout?"
+msgstr "您的工作目錄中似乎有未暫存的變更。您是否想要在檢出前先儲藏變更嗎？"
+
+#: ../gitg/gitg-action-support.vala:133
+#: ../gitg/gitg-commit-action-cherry-pick.vala:163
+#: ../gitg/gitg-ref-action-delete.vala:88
+#: ../gitg/gitg-ref-action-merge.vala:194
+#: ../gitg/resources/ui/gitg-remote-notification.ui.h:1
+#: ../gitg/resources/ui/gitg-simple-notification.ui.h:1
+msgid "Cancel"
+msgstr "取消"
+
+#: ../gitg/gitg-action-support.vala:134
+msgid "Stash changes"
+msgstr "儲藏變更"
+
+#: ../gitg/gitg-action-support.vala:138 ../gitg/gitg-action-support.vala:165
+msgid "Failed with conflicts"
+msgstr "å› è¡çªå¤±æ•—"
+
+#: ../gitg/gitg-action-support.vala:181
+#, c-format
+msgid "Failed to checkout conflicts: %s"
+msgstr "無法檢出衝突：%s"
+
+#: ../gitg/gitg-action-support.vala:199
+msgid "Failed to obtain author details"
+msgstr "無法獲得作者詳細資料"
+
+#: ../gitg/gitg-action-support.vala:223
+#: ../gitg/gitg-ref-action-checkout.vala:88
+#, c-format
+msgid "Failed to lookup commit: %s"
+msgstr "查詢提交失敗：%s"
+
+#: ../gitg/gitg-action-support.vala:255
+#, c-format
+msgid "Failed to create commit: %s"
+msgstr "建立提交失敗：%s"
+
+#: ../gitg/gitg-action-support.vala:277
+#, c-format
+msgid "Failed to checkout index: %s"
+msgstr "無法檢出索引：%s"
+
 #: ../gitg/gitg-application.vala:56
 msgid "Show the application's version"
 msgstr "顯示應用程式的版本"
@@ -470,70 +598,169 @@ msgstr "以提交活動啟動 gitg (--activity 提交的簡寫)"
 msgid "Do not try to load a repository from the current working directory"
 msgstr "不要嘗試從目前工作目錄載入倉儲"
 
-#: ../gitg/gitg-application.vala:90
+#: ../gitg/gitg-application.vala:94
 msgid "- Git repository viewer"
 msgstr "- Git 倉儲檢視器"
 
-#: ../gitg/gitg-application.vala:209
+#: ../gitg/gitg-application.vala:226
 msgid "gitg is a Git repository viewer for gtk+/GNOME"
 msgstr "gitg 是為 gtk+/GNOME 設計的 Git 倉儲檢視器"
 
-#: ../gitg/gitg-application.vala:218
+#: ../gitg/gitg-application.vala:235
 msgid "translator-credits"
 msgstr "Cheng-Chia Tseng <pswo10680 gmail com>, 2013"
 
-#: ../gitg/gitg-application.vala:221
+#: ../gitg/gitg-application.vala:238
 msgid "gitg homepage"
 msgstr "gitg é¦–é "
 
-#: ../gitg/gitg-author-details-dialog.vala:67
-msgid "Unable to open the .gitconfig file."
-msgstr "無法開啟 .gitconfig 檔。"
+#: ../gitg/gitg-application.vala:369
+msgid ""
+"We are terribly sorry, but gitg requires libgit2 (a library on which gitg "
+"depends) to be compiled with threading support.\n"
+"\n"
+"If you manually compiled libgit2, then please configure libgit2 with -"
+"DTHREADSAFE:BOOL=ON.\n"
+"\n"
+"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 未提供執行緒支援。"
+
+#. ex: ts=4 noet
+#: ../gitg/gitg-author-details-dialog.vala:85
+#: ../gitg/gitg-author-details-dialog.vala:105
+#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:1
+msgid "Author Details"
+msgstr "作者詳細資訊"
+
+#: ../gitg/gitg-author-details-dialog.vala:86
+msgid "Enter default details used for all repositories:"
+msgstr "è¼¸å…¥æ‰€æœ‰å€‰å„²çš„é è¨­è©³ç´°è³‡æ–™ï¼š"
+
+#. Translators: %s is the repository name
+#: ../gitg/gitg-author-details-dialog.vala:108
+#, c-format
+msgid "Override global details for repository '%s':"
+msgstr "覆蓋倉儲「%s」的全域詳細資料："
 
-#: ../gitg/gitg-author-details-dialog.vala:148
+#: ../gitg/gitg-author-details-dialog.vala:220
 msgid "Failed to set Git user config."
 msgstr "無法設定 Git 使用者組態。"
 
-#: ../gitg/gitg-clone-dialog.vala:87
+#: ../gitg/gitg-clone-dialog.vala:89
 msgid "The URL introduced is not supported"
 msgstr "不支援引入的 URL 。"
 
+#: ../gitg/gitg-commit-action-cherry-pick.vala:53
+msgid "Cherry pick onto"
+msgstr "挑選到"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:58
+msgid "Cherry pick this commit onto a branch"
+msgstr "將這個提交挑選到分支"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:117
+#, c-format
+msgid "Failed to lookup the commit for branch %s: %s"
+msgstr "無法查詢分支 %s 的提交：%s"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:132
+#, c-format
+msgid "Failed to cherry-pick the commit: %s"
+msgstr "無法挑選此提交：%s"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:144
+#: ../gitg/gitg-commit-action-cherry-pick.vala:160
+msgid "Cherry pick has conflicts"
+msgstr "挑選產生衝突"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:153
+#, c-format
+msgid ""
+"The cherry pick of %s onto %s has caused conflicts, would you like to "
+"checkout branch %s with the cherry pick to your working directory to resolve "
+"the conflicts?"
+msgstr ""
+"å°‡ %s 挑選到 %s ä¸Šçš„æ“ä½œé€ æˆè¡çªï¼Œæ‚¨æ˜¯å¦æƒ³è¦æª¢å‡ºæŒ‘é¸çš„åˆ†æ”¯ %s 到您的工作目錄"
+"以解決衝突？"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:157
+#, c-format
+msgid ""
+"The cherry-pick of %s onto %s has caused conflicts, would you like to "
+"checkout the cherry pick to your working directory to resolve the conflicts?"
+msgstr ""
+"å°‡ %s 挑選到 %s ä¸Šçš„æ“ä½œé€ æˆè¡çªï¼Œæ‚¨æ˜¯å¦æƒ³è¦æª¢å‡ºæŒ‘é¸åˆ°æ‚¨çš„å·¥ä½œç›®éŒ„ä»¥è§£æ±ºè¡"
+"突？"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:164
+#: ../gitg/gitg-ref-action-checkout.vala:48
+#: ../gitg/gitg-ref-action-merge.vala:195
+msgid "Checkout"
+msgstr "檢出"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:168
+msgid "Cherry pick failed with conflicts"
+msgstr "æŒ‘é¸å› è¡çªå¤±æ•—"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:179
+msgid "Cherry pick finished with conflicts in working directory"
+msgstr "工作目錄中的挑選以發生衝突的狀況結束"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:199
+#, c-format
+msgid "Cherry pick %s onto %s"
+msgstr "挑選 %s 到 %s 上"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:224
+msgid "Successfully cherry picked"
+msgstr "成功進行挑選"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:261
+#, c-format
+msgid "Cherry pick onto %s"
+msgstr "挑選到 %s 上"
+
 #: ../gitg/gitg-commit-action-create-branch.vala:48
-#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:1
-msgid "Create Branch"
+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
+#: ../gitg/gitg-commit-action-create-branch.vala:75
 msgid "Failed to create branch"
 msgstr "無法建立分支"
 
 #: ../gitg/gitg-commit-action-create-patch.vala:63
-msgid "Create Patch"
-msgstr "建立修補檔"
+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
+#: ../gitg/gitg-commit-action-create-patch.vala:143
 msgid "Save Patch File"
 msgstr "儲存修補檔"
 
-#: ../gitg/gitg-commit-action-create-patch.vala:145
+#: ../gitg/gitg-commit-action-create-patch.vala:147
 msgid "_Save Patch"
 msgstr "儲存修補檔(_S)"
 
-#: ../gitg/gitg-commit-action-create-patch.vala:168
+#: ../gitg/gitg-commit-action-create-patch.vala:172
 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"
+msgid "Create tag"
 msgstr "建立標籤"
 
 #: ../gitg/gitg-commit-action-create-tag.vala:53
@@ -552,9 +779,79 @@ msgstr "搜尋標籤失敗"
 msgid "Provide a message to create an annotated tag"
 msgstr "提供訊息以建立有注釋的標籤"
 
-#: ../gitg/gitg-dash-view.vala:148
-msgid "_Delete"
-msgstr "刪除(_D)"
+#: ../gitg/gitg-dash-view.vala:171
+msgid "_Remove"
+msgstr "移除(_R)"
+
+#. Translators: the two %s will be replaced to create a link to perform the scanning action.
+#: ../gitg/gitg-dash-view.vala:227
+#, c-format
+msgid "We can also %sscan your home directory%s for git repositories."
+msgstr "我們也可以 %s掃描您的家目錄%s 尋找 git 倉儲。"
+
+#. Translators: the two %s will be used to create a link to the author dialog.
+#: ../gitg/gitg-dash-view.vala:230
+#, c-format
+msgid "In the mean time, you may want to %sset up your git profile%s."
+msgstr "在此同時，您可能會想要 %s設定您的 git 設定檔%s。"
+
+#: ../gitg/gitg-dash-view.vala:382
+msgid "Failed to clone repository"
+msgstr "無法重製倉儲"
+
+#: ../gitg/gitg-dash-view.vala:413
+msgid "Failed to add repository"
+msgstr "ç„¡æ³•åŠ å…¥å€‰å„²"
+
+#: ../gitg/gitg-dash-view.vala:429
+msgid "Create new repository"
+msgstr "建立新倉儲"
+
+#. Translators: %s is a file name
+#: ../gitg/gitg-dash-view.vala:432
+#, c-format
+msgid ""
+"The location <i>%s</i> does not appear to be a valid git repository. Would "
+"you like to initialize a new git repository at this location?"
+msgstr ""
+"位置 <i>%s</i> 似乎不是有效的 git 倉儲。您想要在這個位置初始化一個新的 git 倉"
+"儲嗎？"
+
+#: ../gitg/gitg-dash-view.vala:438
+msgid "Create repository"
+msgstr "建立倉儲"
+
+#: ../gitg/gitg-dash-view.vala:454
+msgid "Failed to create repository"
+msgstr "無法建立倉儲"
+
+#: ../gitg/gitg-dash-view.vala:524
+#, c-format
+msgid "Scanning for repositories in %s"
+msgstr "掃描「%s」內的倉儲"
+
+#: ../gitg/gitg-ref-action-checkout.vala:53
+msgid "Checkout the selected reference"
+msgstr "檢出選取的參照"
+
+#: ../gitg/gitg-ref-action-checkout.vala:72
+#, c-format
+msgid "Checkout %s"
+msgstr "檢出 %s"
+
+#: ../gitg/gitg-ref-action-checkout.vala:101
+#, c-format
+msgid "Failed to checkout branch: %s"
+msgstr "無法檢出分支：%s"
+
+#: ../gitg/gitg-ref-action-checkout.vala:111
+#, c-format
+msgid "Failed to update HEAD: %s"
+msgstr "無法更新 HEAD：%s"
+
+#: ../gitg/gitg-ref-action-checkout.vala:121
+msgid "Successfully checked out branch to working directory"
+msgstr "成功檢出分支到工作目錄"
 
 #: ../gitg/gitg-ref-action-copy-name.vala:48
 msgid "Copy name"
@@ -565,7 +862,7 @@ msgid "Copy the name of the reference to the clipboard"
 msgstr "將參照的名稱複製到剪貼簿"
 
 #: ../gitg/gitg-ref-action-delete.vala:48
-#: ../gitg/gitg-ref-action-delete.vala:88
+#: ../gitg/gitg-ref-action-delete.vala:89
 msgid "Delete"
 msgstr "刪除"
 
@@ -603,12 +900,6 @@ msgstr "åˆªé™¤é ç«¯åˆ†æ”¯ %s"
 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
-#: ../libgitg/resources/ui/gitg-remote-notification.ui.h:1
-msgid "Cancel"
-msgstr "取消"
-
 #. Translators: %s is the name of the tag
 #: ../gitg/gitg-ref-action-delete.vala:119
 #, c-format
@@ -643,39 +934,116 @@ msgstr "從 %s 取回"
 msgid "Fetch remote objects from %s"
 msgstr "從 %s å–å›žé ç«¯ç‰©ä»¶"
 
-#: ../gitg/gitg-ref-action-fetch.vala:110
+#: ../gitg/gitg-ref-action-fetch.vala:98
 #, c-format
 msgid "Fetching from %s"
 msgstr "正在從 %s 取回"
 
 #. Translators: new refers to a new remote reference having been fetched,
-#: ../gitg/gitg-ref-action-fetch.vala:118
+#: ../gitg/gitg-ref-action-fetch.vala:106
 msgid "new"
 msgstr "æ–°çš„"
 
 #. Translators: updated refers to a remote reference having been updated,
-#: ../gitg/gitg-ref-action-fetch.vala:123
+#: ../gitg/gitg-ref-action-fetch.vala:111
 msgid "updated"
 msgstr "已更新"
 
-#: ../gitg/gitg-ref-action-fetch.vala:134
+#: ../gitg/gitg-ref-action-fetch.vala:121
 #, c-format
 msgid "Failed to fetch from %s: %s"
 msgstr "從 %s 取回失敗：%s"
 
 #. Translators: the %s will get replaced with the remote url,
-#: ../gitg/gitg-ref-action-fetch.vala:146
+#: ../gitg/gitg-ref-action-fetch.vala:134
 #, c-format
 msgid "Fetched from %s: everything is up to date"
 msgstr "從 %s 取回：一切都是最新的"
 
 #. Translators: the first %s is the remote url to fetch from,
 #. * the second is a list of references that got updated.
-#: ../gitg/gitg-ref-action-fetch.vala:152
+#: ../gitg/gitg-ref-action-fetch.vala:140
 #, c-format
 msgid "Fetched from %s: %s"
 msgstr "已從 %s 取回：%s"
 
+#: ../gitg/gitg-ref-action-merge.vala:63
+#, c-format
+msgid "Merge into %s"
+msgstr "合併到 %s"
+
+#. TODO
+#: ../gitg/gitg-ref-action-merge.vala:69
+#, c-format
+msgid "Merge another branch into branch %s"
+msgstr "從另一個分支合併到分支 %s"
+
+#: ../gitg/gitg-ref-action-merge.vala:106
+#, c-format
+msgid "Failed to merge commits: %s"
+msgstr "無法合併提交：%s"
+
+#: ../gitg/gitg-ref-action-merge.vala:175
+#: ../gitg/gitg-ref-action-merge.vala:191
+msgid "Merge has conflicts"
+msgstr "合併有衝突"
+
+#: ../gitg/gitg-ref-action-merge.vala:184
+#, c-format
+msgid ""
+"The merge of %s into %s has caused conflicts, would you like to checkout "
+"branch %s with the merge to your working directory to resolve the conflicts?"
+msgstr ""
+"å°‡ %s 合併到 %s ä¸Šçš„æ“ä½œé€ æˆè¡çªï¼Œæ‚¨æ˜¯å¦æƒ³è¦æª¢å‡ºåˆä½µçš„åˆ†æ”¯ %s 到您的工作目錄"
+"以解決衝突？"
+
+#: ../gitg/gitg-ref-action-merge.vala:188
+#, c-format
+msgid ""
+"The merge of %s into %s has caused conflicts, would you like to checkout the "
+"merge to your working directory to resolve the conflicts?"
+msgstr ""
+"å°‡ %s 合併到 %s ä¸Šçš„æ“ä½œé€ æˆè¡çªï¼Œæ‚¨æ˜¯å¦æƒ³è¦æª¢å‡ºåˆä½µåˆ°æ‚¨çš„å·¥ä½œç›®éŒ„ä»¥è§£æ±ºè¡"
+"突？"
+
+#: ../gitg/gitg-ref-action-merge.vala:199
+msgid "Merge failed with conflicts"
+msgstr "åˆä½µå› è¡çªå¤±æ•—"
+
+#: ../gitg/gitg-ref-action-merge.vala:210
+msgid "Finished merge with conflicts in working directory"
+msgstr "工作目錄中的合併以發生衝突的狀況結束"
+
+#: ../gitg/gitg-ref-action-merge.vala:222
+#, c-format
+msgid "Merge %s into %s"
+msgstr "合併 %s 到 %s"
+
+#: ../gitg/gitg-ref-action-merge.vala:231
+#, c-format
+msgid "Failed to lookup our commit: %s"
+msgstr "無法查詢我們的提交：%s"
+
+#: ../gitg/gitg-ref-action-merge.vala:241
+#, c-format
+msgid "Failed to lookup their commit: %s"
+msgstr "無法查詢他們的提交：%s"
+
+#: ../gitg/gitg-ref-action-merge.vala:278
+#, c-format
+msgid "Successfully merged %s into %s"
+msgstr "已成功合併 %s 到 %s"
+
+#: ../gitg/gitg-ref-action-merge.vala:320
+#, c-format
+msgid "Merge %s into branch %s"
+msgstr "合併 %s 到分支 %s"
+
+#: ../gitg/gitg-ref-action-merge.vala:482
+#: ../gitg/history/gitg-history-refs-list.vala:1176
+msgid "Tags"
+msgstr "標籤"
+
 #: ../gitg/gitg-ref-action-rename.vala:48
 msgid "Rename"
 msgstr "重新命名"
@@ -693,76 +1061,132 @@ msgstr "指定名稱「%s」包含無效的字元"
 msgid "Invalid name"
 msgstr "無效的名稱"
 
-#: ../gitg/gitg-ref-action-rename.vala:141
+#: ../gitg/gitg-ref-action-rename.vala:131
 msgid "Failed to rename"
 msgstr "無法重新命名"
 
-#: ../gitg/gitg.vala:64
-msgid ""
-"We are terribly sorry, but gitg requires libgit2 (a library on which gitg "
-"depends) to be compiled with threading support.\n"
-"\n"
-"If you manually compiled libgit2, then please configure libgit2 with -"
-"DTHREADSAFE:BOOL=ON.\n"
-"\n"
-"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:187
+msgid "Add Repository"
+msgstr "åŠ å…¥å€‰å„²"
 
-#: ../gitg/gitg-window.vala:403
-msgid "Projects"
-msgstr "專案"
+#: ../gitg/gitg-window.vala:191
+msgid "_Add"
+msgstr "åŠ å…¥(_A)"
 
-#: ../gitg/gitg-window.vala:466
-msgid "Open Repository"
-msgstr "開啟倉儲"
+#: ../gitg/gitg-window.vala:193
+msgid "_Scan for all git repositories from this directory"
+msgstr "掃描這個目錄中所有的 git 倉儲(_S)"
 
-#: ../gitg/gitg-window.vala:469
-msgid "_Open"
-msgstr "é–‹å•Ÿ(_O)"
+#: ../gitg/gitg-window.vala:481
+msgid "Projects"
+msgstr "專案"
 
-#: ../gitg/gitg-window.vala:764
+#: ../gitg/gitg-window.vala:912
 #, c-format
 msgid "'%s' is not a Git repository."
 msgstr "「%s」不是 Git 倉儲。"
 
-#: ../gitg/history/gitg-history-refs-list.vala:136
+#: ../gitg/gitg-window.vala:1061
+msgid ""
+"Your user name and email are not configured yet. Please go to the user "
+"configuration and provide your name and email."
+msgstr ""
+"您的使用者名稱與電子郵件尚未設定。請至使用者組態並提供您的姓名與電子郵件。"
+
+#: ../gitg/gitg-window.vala:1065
+msgid ""
+"Your user name is not configured yet. Please go to the user configuration "
+"and provide your name."
+msgstr "您的使用者名稱尚未設定。請至使用者組態並提供您的姓名。"
+
+#: ../gitg/gitg-window.vala:1069
+msgid ""
+"Your email is not configured yet. Please go to the user configuration and "
+"provide your email."
+msgstr "您的電子郵件尚未設定。請至使用者組態並提供您的電子郵件。"
+
+#: ../gitg/gitg-window.vala:1072
+msgid "Missing author details"
+msgstr "缺少作者詳細資料"
+
+#: ../gitg/gitg-remote-notification.vala:90
+#: ../gitg/gitg-simple-notification.vala:99
+#: ../gitg/resources/ui/gitg-window.ui.h:10
+msgid "Close"
+msgstr "關閉"
+
+#: ../gitg/history/gitg-history-command-line.vala:42
+msgid "Select all commits by default in the history activity"
+msgstr "åœ¨æ­·å²æ´»å‹•ä¸­é è¨­é¸æ“‡æ‰€æœ‰çš„æäº¤"
+
+#: ../gitg/history/gitg-history-command-line.vala:44
+msgid "Select all branches by default in the history activity"
+msgstr "åœ¨æ­·å²æ´»å‹•ä¸­é è¨­é¸æ“‡æ‰€æœ‰çš„åˆ†æ”¯"
+
+#: ../gitg/history/gitg-history-command-line.vala:46
+msgid "Select all remotes by default in the history activity"
+msgstr "åœ¨æ­·å²æ´»å‹•ä¸­é è¨­é¸æ“‡æ‰€æœ‰çš„é ç«¯"
+
+#: ../gitg/history/gitg-history-command-line.vala:48
+msgid "Select all tags by default in the history activity"
+msgstr "åœ¨æ­·å²æ´»å‹•ä¸­é è¨­é¸æ“‡æ‰€æœ‰çš„æ¨™ç±¤"
+
+#: ../gitg/history/gitg-history-command-line.vala:50
+msgid "Select the specified reference by default in the history activity"
+msgstr "åœ¨æ­·å²æ´»å‹•ä¸­é è¨­é¸æ“‡æ‰€æœ‰æŒ‡å®šçš„åƒç…§"
+
+#: ../gitg/history/gitg-history-command-line.vala:50
+msgid "REFERENCE"
+msgstr "參照"
+
+#: ../gitg/history/gitg-history-refs-list.vala:165
+#, c-format
+msgid "%d ahead, %d behind"
+msgstr "%d é ˜å…ˆï¼Œ%d 落後"
+
+#: ../gitg/history/gitg-history-refs-list.vala:169
+#, c-format
+msgid "%d ahead"
+msgstr "%d é ˜å…ˆ"
+
+#: ../gitg/history/gitg-history-refs-list.vala:173
+#, c-format
+msgid "%d behind"
+msgstr "%d 落後"
+
+#: ../gitg/history/gitg-history-refs-list.vala:207
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:4
 msgid "All commits"
 msgstr "所有的提交"
 
-#: ../gitg/history/gitg-history-refs-list.vala:835
+#: ../gitg/history/gitg-history-refs-list.vala:1174
 msgid "Branches"
 msgstr "分支"
 
-#: ../gitg/history/gitg-history-refs-list.vala:836
+#: ../gitg/history/gitg-history-refs-list.vala:1175
 msgid "Remotes"
 msgstr "é ç«¯"
 
-#: ../gitg/history/gitg-history-refs-list.vala:837
-msgid "Tags"
-msgstr "標籤"
-
-#: ../gitg/history/gitg-history.vala:246
-#: ../gitg/preferences/gitg-preferences-history.vala:128
+#: ../gitg/history/gitg-history.vala:306
+#: ../gitg/preferences/gitg-preferences-history.vala:218
 #: ../gitg/resources/ui/gitg-preferences-interface.ui.h:3
 msgid "History"
 msgstr "歷史"
 
-#: ../gitg/history/gitg-history.vala:251
+#: ../gitg/history/gitg-history.vala:311
 msgid "Examine the history of the repository"
 msgstr "檢驗倉儲的歷史"
 
-#: ../gitg/history/gitg-history.vala:602
+#: ../gitg/history/gitg-history.vala:796
 msgid "Mainline"
 msgstr "主線"
 
-#: ../gitg/preferences/gitg-preferences-interface.vala:96
+#: ../gitg/preferences/gitg-preferences-commit.vala:119
+msgctxt "Preferences"
+msgid "Commit"
+msgstr "提交"
+
+#: ../gitg/preferences/gitg-preferences-interface.vala:120
 msgid "Interface"
 msgstr "介面"
 
@@ -820,50 +1244,47 @@ msgstr "%Y年%b%e日，%H:%M"
 msgid "%b %e %Y, %I:%M %p"
 msgstr "%Y年%b%e日，%p %I:%M"
 
-#: ../libgitg/gitg-diff-view.vala:249
-msgid "stage"
-msgstr "stage"
-
-#: ../libgitg/gitg-diff-view.vala:250
-msgid "unstage"
-msgstr "unstage"
-
-#: ../libgitg/gitg-diff-view.vala:251
-msgid "Loading diff…"
-msgstr "正載入 diff…"
+#: ../libgitg/gitg-diff-view-commit-details.vala:142
+msgid "Collapse all"
+msgstr "全部收摺"
 
-#: ../libgitg/gitg-diff-view.vala:252
-msgid "Notes:"
-msgstr "備註："
+#: ../libgitg/gitg-diff-view-commit-details.vala:146
+#: ../libgitg/resources/ui/gitg-diff-view-commit-details.ui.h:2
+msgid "Expand all"
+msgstr "全部展開"
 
-#: ../libgitg/gitg-diff-view.vala:253
-msgid "Parents:"
-msgstr "çˆ¶é …ï¼š"
+#: ../libgitg/gitg-diff-view-commit-details.vala:199
+#, c-format
+msgid "Committed by %s"
+msgstr "由 %s 提交"
 
-#: ../libgitg/gitg-diff-view.vala:254
-msgid "Diff against:"
-msgstr "比對差異："
+#. Translators: this is used to construct: "at <directory>", to indicate where the repository is at.
+#: ../libgitg/gitg-repository-list-box.vala:154
+#, c-format
+msgid "at %s"
+msgstr "在 %s"
 
-#: ../libgitg/gitg-diff-view.vala:255
-msgid "Committed by:"
-msgstr "提交者："
+#. Translators: this is used to construct: "<branch-name> at <directory>"
+#: ../libgitg/gitg-repository-list-box.vala:163
+#, c-format
+msgid "%s at %s"
+msgstr "%s 在 %s"
 
-#: ../libgitg/gitg-remote-notification.vala:72
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:6
-#: ../gitg/resources/ui/gitg-window.ui.h:6
-msgid "Close"
-msgstr "關閉"
+#: ../libgitg/gitg-repository-list-box.vala:409
+msgid "Cloning…"
+msgstr "重製中…"
 
 #: ../libgitg/gitg-stage.vala:334
 #, c-format
 msgid "Could not read commit message after running commit-msg hook: %s"
 msgstr "在執行 commit-msg 掛鉤後無法讀取提交訊息：%s"
 
-#: ../plugins/diff/gitg-diff.vala:106
+#: ../plugins/diff/gitg-diff.vala:112
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:11
 msgid "Diff"
 msgstr "Diff"
 
-#: ../plugins/diff/gitg-diff.vala:111
+#: ../plugins/diff/gitg-diff.vala:117
 msgid "Show the changes introduced by the selected commit"
 msgstr "é¡¯ç¤ºé¸å–çš„æäº¤æ‰€é€ æˆçš„è®Šæ›´"
 
@@ -875,37 +1296,22 @@ msgstr "檔案"
 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"
-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 "注意：Git 設定檔「%s」不存在。"
+msgid "_Save"
+msgstr "儲存(_S)"
 
 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:4
-msgid "Enter details to set as default for all repositories:"
-msgstr "è¼¸å…¥è©³ç´°è³‡æ–™ä»¥è¨­ç‚ºæ‰€æœ‰å€‰å„²çš„é è¨­å€¼ï¼š"
+msgid "Default details used for all repositories"
+msgstr "æ‰€æœ‰å€‰å„²çš„é è¨­è©³ç´°è³‡æ–™"
 
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:6
-#, no-c-format
-msgid "Enter details for repository '%s':"
-msgstr "請輸入倉儲「%s」的詳細資料："
-
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:7
-msgid "E-mail: "
-msgstr "電子郵件： "
+#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:5
+msgid "E-mail:"
+msgstr "電子郵件："
 
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:8
-msgid "Name: "
+#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:6
+msgid "Name:"
 msgstr "名稱："
 
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:10
-msgid "Save"
-msgstr "儲存"
-
 #: ../gitg/resources/ui/gitg-clone-dialog.ui.h:1
 msgid "Clone Repository"
 msgstr "重製倉儲"
@@ -930,6 +1336,11 @@ msgstr "選取位置…"
 msgid "Bare repository"
 msgstr "原始檔案庫"
 
+#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:1
+msgctxt "Create Dialog"
+msgid "Commit"
+msgstr "提交"
+
 #: ../gitg/resources/ui/gitg-commit-dialog.ui.h:3
 #: ../gitg/resources/ui/gitg-commit-paned.ui.h:2
 msgid "C_ommit"
@@ -956,13 +1367,10 @@ msgid "D_iscard selection"
 msgstr "æ”¾æ£„é¸å–é …ç›®(_I)"
 
 #: ../gitg/resources/ui/gitg-commit-submodule-diff-view.ui.h:1
-#, fuzzy
 msgid ""
 "The submodule is in a dirty state and has staged and/or unstaged changes "
 "that are not yet committed as shown below."
-msgstr ""
-"子模組處於 dirty 狀態，且有尚未提交的已 stage 與/或未 stage 更動會顯示於下"
-"方。"
+msgstr "子模組處於粗糙狀態，且有尚未提交的已暫存與/或未暫存更動會顯示於下方。"
 
 #: ../gitg/resources/ui/gitg-commit-submodule-diff-view.ui.h:2
 msgid "Staged:"
@@ -991,6 +1399,10 @@ msgstr "日期"
 msgid "Open"
 msgstr "é–‹å•Ÿ"
 
+#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:1
+msgid "Create Branch"
+msgstr "建立分支"
+
 #: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:3
 #: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:3
 msgid "C_reate"
@@ -1000,43 +1412,49 @@ msgstr "建立(_R)"
 msgid "Branch _name:"
 msgstr "分支名稱(_N):"
 
+#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:1
+msgid "Create Tag"
+msgstr "建立標籤"
+
 #: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:4
 msgid "Tag _name:"
 msgstr "標籤名稱(_N):"
 
+#: ../gitg/resources/ui/gitg-dash-view.ui.h:1
+msgid ""
+"No repositories have been added yet. To get started, you can add an existing "
+"repository or clone a new one."
+msgstr "å°šæœªåŠ å…¥å€‰å„²ã€‚è¦é–‹å§‹ä½¿ç”¨ï¼Œæ‚¨å¯ä»¥åŠ å…¥æ—¢å­˜çš„å€‰å„²æˆ–é‡è£½ä¸€å€‹æ–°çš„å€‰å„²ã€‚"
+
 #: ../gitg/resources/ui/gitg-menus.ui.h:1
 msgid "_New Window"
 msgstr "新開視窗(_N)"
 
 #: ../gitg/resources/ui/gitg-menus.ui.h:2
+msgid "_Author Details"
+msgstr "作者詳細資料(_A)"
+
+#: ../gitg/resources/ui/gitg-menus.ui.h:3
 msgid "_Preferences"
 msgstr "偏好設定(_P)"
 
-#: ../gitg/resources/ui/gitg-menus.ui.h:3
+#: ../gitg/resources/ui/gitg-menus.ui.h:4
+msgid "_Keyboard Shortcuts"
+msgstr "鍵盤捷徑鍵(_K)"
+
+#: ../gitg/resources/ui/gitg-menus.ui.h:5
 msgid "_Help"
 msgstr "求助(_H)"
 
-#: ../gitg/resources/ui/gitg-menus.ui.h:4
+#: ../gitg/resources/ui/gitg-menus.ui.h:6
 msgid "_About"
 msgstr "關於(_A)"
 
-#: ../gitg/resources/ui/gitg-menus.ui.h:5
+#: ../gitg/resources/ui/gitg-menus.ui.h:7
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: ../gitg/resources/ui/gitg-menus.ui.h:6
-msgid "_Open Repository…"
-msgstr "開啟倉儲(_O)…"
-
-#: ../gitg/resources/ui/gitg-menus.ui.h:7
-msgid "_Clone Repository…"
-msgstr "重製倉儲(_C)…"
-
 #: ../gitg/resources/ui/gitg-menus.ui.h:8
-msgid "_Author Details"
-msgstr "作者詳細資料(_A)"
-
-#: ../gitg/resources/ui/gitg-menus.ui.h:9
 msgid "_Reload"
 msgstr "重新載入(_R)"
 
@@ -1061,28 +1479,50 @@ msgid "Commit Message"
 msgstr "提交訊息"
 
 #: ../gitg/resources/ui/gitg-preferences-history.ui.h:1
+msgid "Default selection"
+msgstr "é è¨­é¸æ“‡å€åŸŸ"
+
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:2
+msgid "Current branch"
+msgstr "目前的分支"
+
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:3
+msgid "All branches"
+msgstr "所有的分支"
+
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:5
+msgid "References"
+msgstr "參照"
+
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:6
+msgid "Sort references in the sidebar by latest activity"
+msgstr "在側邊欄中依最新活動排序參照"
+
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:7
+msgid "Show upstream (remote) branch when selecting a local branch"
+msgstr "當選擇一個本地端分支時顯示上游 (é ç«¯) 分支"
+
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:8
 msgid "Commits"
 msgstr "提交"
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:2
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:9
 msgid "Collapse inactive lanes"
 msgstr "æ”¶ç–Šæœªä½¿ç”¨çš„çª—æ ¼"
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:3
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:10
 msgid "Early"
 msgstr "å¿«"
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:4
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:11
 msgid "Late"
 msgstr "æ…¢"
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:5
-#, fuzzy
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:12
 msgid "Show history in topological order"
 msgstr "ä»¥æ‹“æ¨¸é †åºé¡¯ç¤ºæ­·å²"
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:6
-#, fuzzy
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:13
 msgid "Preserve mainline for currently checked out branch"
 msgstr "保留目前檢出分支的主線"
 
@@ -1094,6 +1534,10 @@ msgstr "å•Ÿå‹•"
 msgid "Start with activity:"
 msgstr "以特定活動啟動："
 
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:4
+msgid "Commit"
+msgstr "提交"
+
 #: ../gitg/resources/ui/gitg-preferences-interface.ui.h:5
 msgid "Layout"
 msgstr "版面配置"
@@ -1102,41 +1546,93 @@ msgstr "版面配置"
 msgid "Use horizontal layout"
 msgstr "使用水平版面配置"
 
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:7
+msgid "Avatars"
+msgstr "å¤§é ­è²¼"
+
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:8
+msgid "Use gravatar service to provide user avatars"
+msgstr "使用 gravatar æœå‹™ä¾†æä¾›ä½¿ç”¨è€…å¤§é ­è²¼"
+
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:9
+msgid "Monitoring"
+msgstr "監控"
+
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:12
+msgid "Enable syntax highlighting of source code in diff views"
+msgstr "在 diff 檢視中啟用原始碼的語法色彩標示"
+
 #: ../gitg/resources/ui/gitg-preferences.ui.h:1
 msgid "Preferences"
 msgstr "偏好設定"
 
+#: ../gitg/resources/ui/gitg-shortcuts.ui.h:1
+msgctxt "shortcut window"
+msgid "Windows"
+msgstr "視窗"
+
+#: ../gitg/resources/ui/gitg-shortcuts.ui.h:2
+msgctxt "shortcut window"
+msgid "Open a new window"
+msgstr "開啟新的視窗"
+
+#: ../gitg/resources/ui/gitg-shortcuts.ui.h:3
+msgctxt "shortcut window"
+msgid "Open the window menu"
+msgstr "開啟視窗選單"
+
+#: ../gitg/resources/ui/gitg-shortcuts.ui.h:4
+msgctxt "shortcut window"
+msgid "Open a repository"
+msgstr "開啟倉儲"
+
+#: ../gitg/resources/ui/gitg-shortcuts.ui.h:5
+msgctxt "shortcut window"
+msgid "Open the help"
+msgstr "開啟求助文件"
+
+#: ../gitg/resources/ui/gitg-shortcuts.ui.h:6
+msgctxt "shortcut window"
+msgid "Find"
+msgstr "尋找"
+
+#: ../gitg/resources/ui/gitg-shortcuts.ui.h:7
+msgctxt "shortcut window"
+msgid "Close the active window"
+msgstr "關閉使用中視窗"
+
+#: ../gitg/resources/ui/gitg-shortcuts.ui.h:8
+msgctxt "shortcut window"
+msgid "Quit the application"
+msgstr "退出應用程式"
+
 #: ../gitg/resources/ui/gitg-window.ui.h:2
 msgid "Show the list of recently used repositories"
 msgstr "顯示目前使用的倉儲清單"
 
 #: ../gitg/resources/ui/gitg-window.ui.h:3
-msgid "Find a word or phrase"
-msgstr "尋找字詞"
+msgid "Clone"
+msgstr "重製"
 
 #: ../gitg/resources/ui/gitg-window.ui.h:4
-msgid "General settings and options"
-msgstr "ä¸€èˆ¬è¨­å®šå€¼èˆ‡é¸é …"
-
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:1
-msgid "Ignore whitespace changes"
-msgstr "忽略空白字元的變更"
+msgid "Clone repository"
+msgstr "重製倉儲"
 
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:2
-msgid "Show changes inline"
-msgstr "顯示行內變更"
+#: ../gitg/resources/ui/gitg-window.ui.h:5
+msgid "Add"
+msgstr "åŠ å…¥"
 
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:3
-msgid "Developer tools"
-msgstr "開發者工具"
+#: ../gitg/resources/ui/gitg-window.ui.h:6
+msgid "Add repository"
+msgstr "åŠ å…¥å€‰å„²"
 
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:4
-msgid "Tab width"
-msgstr "Tab 字元寬度"
+#: ../gitg/resources/ui/gitg-window.ui.h:7
+msgid "Find a word or phrase"
+msgstr "尋找字詞"
 
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:5
-msgid "Context"
-msgstr "脈絡"
+#: ../gitg/resources/ui/gitg-window.ui.h:8
+msgid "General settings and options"
+msgstr "ä¸€èˆ¬è¨­å®šå€¼èˆ‡é¸é …"
 
 #: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:2
 msgid "_Authenticate"
@@ -1168,6 +1664,30 @@ msgstr "記憶密碼到登出之前(_L)"
 msgid "Remember _forever"
 msgstr "æ°¸é è¨˜ä½å¯†ç¢¼(_F)"
 
+#: ../libgitg/resources/ui/gitg-diff-view-commit-details.ui.h:1
+msgid "Parents"
+msgstr "çˆ¶é …"
+
+#: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:1
+msgid "Tab width:"
+msgstr "Tab 字元寬度："
+
+#: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:2
+msgid "Wrap lines:"
+msgstr "換列："
+
+#: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:3
+msgid "Ignore whitespace:"
+msgstr "忽略空白字元："
+
+#: ../libgitg/resources/ui/gitg-diff-view-options.ui.h:1
+msgid "Context:"
+msgstr "脈絡："
+
+#: ../libgitg/resources/ui/gitg-diff-view-options.ui.h:2
+msgid "Spacing"
+msgstr "é–“éš”"
+
 #: ../libgitg/resources/ui/gitg-repository-list-box-row.ui.h:1
 msgid ""
 "Remove the repository from the list (does not delete the repository from "
@@ -1178,6 +1698,48 @@ msgstr "從清單中移除倉儲 (不會將倉儲自硬碟上刪除)"
 msgid "column"
 msgstr "欄"
 
+#~ msgid "Unable to open the .gitconfig file."
+#~ msgstr "無法開啟 .gitconfig 檔。"
+
+#~ msgid "_Delete"
+#~ msgstr "刪除(_D)"
+
+#~ msgid "_Open"
+#~ msgstr "é–‹å•Ÿ(_O)"
+
+#~ msgid "stage"
+#~ msgstr "stage"
+
+#~ msgid "unstage"
+#~ msgstr "unstage"
+
+#~ msgid "Loading diff…"
+#~ msgstr "正載入 diff…"
+
+#~ msgid "Notes:"
+#~ msgstr "備註："
+
+#~ msgid "Diff against:"
+#~ msgstr "比對差異："
+
+#~ msgid "Note: The Git config file '%s' does not exist."
+#~ msgstr "注意：Git 設定檔「%s」不存在。"
+
+#~ msgid "Save"
+#~ msgstr "儲存"
+
+#~ msgid "_Open Repository…"
+#~ msgstr "開啟倉儲(_O)…"
+
+#~ msgid "_Clone Repository…"
+#~ msgstr "重製倉儲(_C)…"
+
+#~ msgid "Show changes inline"
+#~ msgstr "顯示行內變更"
+
+#~ msgid "Developer tools"
+#~ msgstr "開發者工具"
+
 #, fuzzy
 #~ msgid "Show stash in history"
 #~ msgstr "在歷史中顯示 stash"
@@ -1189,6 +1751,3 @@ msgstr "欄"
 #, fuzzy
 #~ msgid "Show unstaged changes in history"
 #~ msgstr "在歷史中顯示未 stage 的變動"
-
-#~ msgid "_Save"
-#~ msgstr "儲存(_S)"