[gitg] Update Chinese (Taiwan) translation

[Translations User D-L <translations src gnome org>]

commit 570e53328cea3b57938426fb71d64262494db240
Author: Yi-Jyun Pan <pan93412 gmail com>
Date:   Sun Oct 28 15:43:58 2018 +0000

    Update Chinese (Taiwan) translation
    
    (cherry picked from commit f0aca012fa02007dd4a24e50171e0787a6d8b5a7)

 po/zh_TW.po | 1146 ++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 580 insertions(+), 566 deletions(-)
---
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 94b3f211..2b17e8a9 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,90 +6,90 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gitg master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
-"product=gitg&keywords=I18N+L10N&component=gitg\n"
-"POT-Creation-Date: 2017-07-27 14:16+0000\n"
-"PO-Revision-Date: 2018-03-26 18:07+0800\n"
-"Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gitg/issues\n";
+"POT-Creation-Date: 2018-10-27 15:48+0000\n"
+"PO-Revision-Date: 2018-10-28 23:42+0800\n"
+"Last-Translator: pan93412 <pan93412 gmail com>\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 2.0.6\n"
+"X-Generator: Poedit 2.2\n"
 
-#: ../contrib/xml/xml-reader.c:327
+#: 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
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/gitg.desktop.in:3 data/gitg.desktop.in:10 gitg/gitg.vala:39
+#: gitg/resources/ui/gitg-window.ui:8
 msgid "gitg"
 msgstr "gitg"
 
-#: ../data/gitg.desktop.in.in.h:2
+#: data/gitg.desktop.in:4
 msgid "Git repository browser"
-msgstr "Git 倉儲瀏覽器"
+msgstr "Git 版本庫瀏覽器"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:1
+#: data/org.gnome.gitg.gschema.xml.in:27
 msgid "Default Clone Directory"
 msgstr "é è¨­é‡è£½ç›®éŒ„"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:2
+#: data/org.gnome.gitg.gschema.xml.in:28
 msgid ""
 "The default directory in which new repositories should be suggested to be "
 "cloned."
-msgstr "æ–°å€‰å„²é‡è£½æ™‚æ‡‰æ”¾ç½®çš„é è¨­ç›®éŒ„ã€‚"
+msgstr "æ–°ç‰ˆæœ¬åº«é‡è£½æ™‚æ‡‰æ”¾ç½®çš„é è¨­ç›®éŒ„ã€‚"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:3
+#: data/org.gnome.gitg.gschema.xml.in:37
 msgid "Orientation of the main interface (vertical or horizontal)"
 msgstr "主介面的方向 (垂直或水平)"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:4
+#: data/org.gnome.gitg.gschema.xml.in:38
 msgid "Setting that sets the orientation of the main interface."
 msgstr "調整主介面方向的設定。"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:5
+#: data/org.gnome.gitg.gschema.xml.in:44
 msgid "Default Activity"
 msgstr "é è¨­æ´»å‹•"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:6
+#: data/org.gnome.gitg.gschema.xml.in:45
 msgid "The activity which gitg activates by default when first launched."
 msgstr "當第一次執行時 gitg é è¨­ä½¿ç”¨çš„æ´»å‹•ã€‚"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:7
+#: data/org.gnome.gitg.gschema.xml.in:51
 msgid "Use Gravatar"
 msgstr "使用 Gravatar"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:8
+#: data/org.gnome.gitg.gschema.xml.in:52
 msgid "Enable the use of gravatar to display user avatars."
 msgstr "啟用 gravatar ä¾†é¡¯ç¤ºä½¿ç”¨è€…å¤§é ­è²¼ã€‚"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:9
+#: data/org.gnome.gitg.gschema.xml.in:58
 msgid "Enable Monitoring"
 msgstr "啟用監控"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:10
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:10
+#: data/org.gnome.gitg.gschema.xml.in:59
+#: gitg/resources/ui/gitg-preferences-interface.ui:188
 msgid "Automatically update when external changes to .git are detected"
 msgstr "當檢測到.git 外部變更時自動更新"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:11
+#: data/org.gnome.gitg.gschema.xml.in:65
 msgid "Enable Diff Highlighting"
 msgstr "啟用 Diff 色彩標示"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:12
+#: data/org.gnome.gitg.gschema.xml.in:66
 msgid ""
 "Setting that determines whether to enable syntax highlighting in diff views."
 msgstr "決定在 diff 檢視中啟用語法色彩標示的設定值。"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:13
+#: data/org.gnome.gitg.gschema.xml.in:75
 msgid "When to Collapse Inactive Lanes"
 msgstr "æ”¶ç–Šæœªä½¿ç”¨çª—æ ¼çš„æ™‚é–“"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:14
+#: data/org.gnome.gitg.gschema.xml.in:76
 msgid ""
 "Setting that indicates when an inactive lane should be collapsed. Valid "
 "values are 0 - 4, where 0 indicates 'early' and 4 indicates 'late'."
@@ -97,7 +97,7 @@ msgstr ""
 "æŒ‡ç¤ºä½•æ™‚è©²æ”¶ç–Šæœªä½¿ç”¨çª—æ ¼çš„è¨­å®šå€¼ã€‚æœ‰æ•ˆçš„å€¼æœ‰ 0 -4，0 代表「快」，而 4 代表"
 "「慢」。"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:15
+#: data/org.gnome.gitg.gschema.xml.in:83
 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 "
@@ -108,87 +108,87 @@ msgstr ""
 "境下提供較清靜的歷史檢視。請查看 collapse-inactive-lanes 以控制何時應該收疊窗"
 "æ ¼ã€‚"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:16
+#: data/org.gnome.gitg.gschema.xml.in:92
 msgid "Show History in Topological Order"
 msgstr "ä»¥æ‹“æ¨¸é †åºé¡¯ç¤ºæ­·å²"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:17
+#: data/org.gnome.gitg.gschema.xml.in:93
 msgid ""
 "Setting that indicates whether to show the history in topological order."
 msgstr "æŒ‡ç¤ºæ˜¯å¦è¦ä»¥æ‹“æ¨¸é †åºé¡¯ç¤ºæ­·å²çš„è¨­å®šå€¼ã€‚"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:18
+#: data/org.gnome.gitg.gschema.xml.in:99
 msgid "Show Stashed Changes"
 msgstr "顯示已 stash 的變更"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:19
+#: data/org.gnome.gitg.gschema.xml.in:100
 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:20
+#: data/org.gnome.gitg.gschema.xml.in:107
 msgid "Show Staged Changes"
 msgstr "顯示已 stage 的變更"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:21
+#: data/org.gnome.gitg.gschema.xml.in:108
 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:22
+#: data/org.gnome.gitg.gschema.xml.in:115
 msgid "Show Unstaged Changes"
 msgstr "顯示已 unstage 的變更"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:23
+#: data/org.gnome.gitg.gschema.xml.in:116
 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:24
+#: data/org.gnome.gitg.gschema.xml.in:123
 msgid "Mainline Head"
 msgstr "主線 Head"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:25
+#: data/org.gnome.gitg.gschema.xml.in:124
 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:26
+#: data/org.gnome.gitg.gschema.xml.in:131
 msgid "Default selection of the history activity"
 msgstr "æ­·å²æ´»å‹•çš„é è¨­é¸é …"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:27
+#: data/org.gnome.gitg.gschema.xml.in:132
 msgid ""
 "Setting that determines the default selection on startup of the history "
 "activity."
 msgstr "è¨­å®šæ­·å²æ´»å‹•å•Ÿå‹•æ™‚çš„é è¨­é¸æ“‡å€åŸŸã€‚"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:28
+#: data/org.gnome.gitg.gschema.xml.in:138
 msgid "Reference Sort Order"
 msgstr "參照排列次序"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:29
+#: data/org.gnome.gitg.gschema.xml.in:139
 msgid "The order by which references in the history sidebar should be sorted."
 msgstr "歷史側邊欄中的應依哪參照排序。"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:30
+#: data/org.gnome.gitg.gschema.xml.in:145
 msgid "Show Upstream With Branch"
 msgstr "在分支顯示上游"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:31
+#: data/org.gnome.gitg.gschema.xml.in:146
 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
+#: data/org.gnome.gitg.gschema.xml.in:162
 msgid "Show Right Margin in Commit Message View"
 msgstr "在提交訊息檢視顯示右邊界"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:33
+#: data/org.gnome.gitg.gschema.xml.in:163
 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."
@@ -196,105 +196,116 @@ msgstr ""
 "在提交訊息檢視中顯示右邊界。這可以用來輕鬆的看出在特定欄中的何處中斷提交訊"
 "息。"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:34
+#: data/org.gnome.gitg.gschema.xml.in:171
 msgid "Column at Which Right Margin is Shown"
 msgstr "顯示右邊邊界於哪一欄"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:35
+#: data/org.gnome.gitg.gschema.xml.in:172
 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:36
+#: data/org.gnome.gitg.gschema.xml.in:179
 msgid "Show Subject Margin in Commit Message View"
 msgstr "在提交訊息檢視顯示主旨邊界"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:37
+#: data/org.gnome.gitg.gschema.xml.in:180
 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:38
+#: data/org.gnome.gitg.gschema.xml.in:187
 msgid "Column at Which Subject Margin is Shown"
 msgstr "顯示主旨邊界於哪一欄"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:39
+#: data/org.gnome.gitg.gschema.xml.in:188
 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:40
+#: data/org.gnome.gitg.gschema.xml.in:195
 msgid "Enable Spell Checking"
 msgstr "啟用拼字檢查"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:41
+#: data/org.gnome.gitg.gschema.xml.in:196
 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:42
+#: data/org.gnome.gitg.gschema.xml.in:203
 msgid "Spell Checking Language"
 msgstr "拼字檢查語言"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:43
+#: data/org.gnome.gitg.gschema.xml.in:204
 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:44
+#: data/org.gnome.gitg.gschema.xml.in:213
+msgid "Use patience algorithm to show diffs"
+msgstr "使用耐心算法 (patience algorithm) 顯示差異"
+
+#: data/org.gnome.gitg.gschema.xml.in:214
+msgid "Setting to use patience algorithm to show diffs of a commit."
+msgstr "è¨­å®šæ­¤é¸é …ä»¥ä½¿ç”¨è€å¿ƒç®—æ³• (patience algorithm) 來顯示提交差異。"
+
+#: data/org.gnome.gitg.gschema.xml.in:220
 msgid "Ignore Whitespace Changes"
 msgstr "忽略空白字元的變更"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:45
+#: data/org.gnome.gitg.gschema.xml.in:221
 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:46
+#: data/org.gnome.gitg.gschema.xml.in:228
 msgid "Show Changes Inline"
 msgstr "顯示行內變更"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:47
+#: data/org.gnome.gitg.gschema.xml.in:229
 msgid ""
 "Setting that indicates whether changes within lines should be shown inline."
 msgstr "設定在行內的變更是否以行內顯示。"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:48
+#: data/org.gnome.gitg.gschema.xml.in:236
 msgid "Wrap"
 msgstr "換列"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:49
+#: data/org.gnome.gitg.gschema.xml.in:237
 msgid "Wrap lines."
 msgstr "換列。"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:50
+#: data/org.gnome.gitg.gschema.xml.in:243
+#: data/org.gnome.gitg.gschema.xml.in:261
 msgid "Number of Before/After Context Lines"
 msgstr "之前/之後前後文列數"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:51
+#: data/org.gnome.gitg.gschema.xml.in:244
 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:52
+#: data/org.gnome.gitg.gschema.xml.in:251
+#: data/org.gnome.gitg.gschema.xml.in:270
 msgid "Rendered Width of a Tab Character"
 msgstr "Tab 字元轉換寬度"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:53
+#: data/org.gnome.gitg.gschema.xml.in:252
+#: data/org.gnome.gitg.gschema.xml.in:271
 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:54
+#: data/org.gnome.gitg.gschema.xml.in:262
 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."
@@ -302,319 +313,320 @@ msgstr ""
 "設定提交區域中要顯示 diff 以 stage 或 unstage 時，應該要顯示多少列前後文的設"
 "定值。"
 
-#: ../gitg/commit/gitg-commit-dialog.vala:308
+#: gitg/commit/gitg-commit-dialog.vala:298
 #, c-format
 msgid "Cannot set spell checking language: %s"
 msgstr "不能設定拼字檢查語言：%s"
 
-#: ../gitg/commit/gitg-commit-dialog.vala:508
-#: ../gitg/commit/gitg-commit.vala:1077
+#: gitg/commit/gitg-commit-dialog.vala:504 gitg/commit/gitg-commit.vala:1077
 msgid "There are no changes to be committed"
 msgstr "沒有要提交的改變"
 
-#: ../gitg/commit/gitg-commit-dialog.vala:509
-#: ../gitg/commit/gitg-commit.vala:1078
+#: gitg/commit/gitg-commit-dialog.vala:505 gitg/commit/gitg-commit.vala:1078
 msgid "Use amend to change the commit message of the previous commit"
 msgstr "使用修訂以變更前次提交的提交訊息"
 
-#: ../gitg/commit/gitg-commit.vala:113
+#: gitg/commit/gitg-commit.vala:113
 msgctxt "Activity"
 msgid "Commit"
 msgstr "提交"
 
-#: ../gitg/commit/gitg-commit.vala:118
+#: gitg/commit/gitg-commit.vala:118
 msgid "Create new commits and manage the staging area"
 msgstr "建立新的提交並管理 stage 區域"
 
-#: ../gitg/commit/gitg-commit.vala:193
+#: gitg/commit/gitg-commit.vala:193
 msgid "_Stage selection"
 msgstr "_Stage 選擇"
 
-#: ../gitg/commit/gitg-commit.vala:232
+#: gitg/commit/gitg-commit.vala:232
 #, c-format
 msgid "Failed to stage the removal of submodule `%s'"
 msgstr "無法 stage 子模組「%s」的移除"
 
-#: ../gitg/commit/gitg-commit.vala:248
+#: gitg/commit/gitg-commit.vala:248
 #, c-format
 msgid "Failed to open the repository of submodule `%s' while trying to stage"
-msgstr "試圖 stage 時無法開啟子模組「%s」的倉儲"
+msgstr "試圖 stage 時無法開啟子模組「%s」的版本庫"
 
-#: ../gitg/commit/gitg-commit.vala:263
+#: gitg/commit/gitg-commit.vala:263
 #, 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:276
+#: gitg/commit/gitg-commit.vala:276
 #, c-format
 msgid "Failed to stage the submodule `%s'"
 msgstr "無法 stage 子模組「%s」"
 
-#: ../gitg/commit/gitg-commit.vala:298
+#: gitg/commit/gitg-commit.vala:298
 #, c-format
 msgid "Failed to stage the removal of file `%s'"
 msgstr "無法 stage 檔案「%s」的移除"
 
-#: ../gitg/commit/gitg-commit.vala:312
+#: gitg/commit/gitg-commit.vala:312
 #, c-format
 msgid "Failed to stage the file `%s'"
 msgstr "無法 stage 檔案「%s」"
 
-#: ../gitg/commit/gitg-commit.vala:584
+#: gitg/commit/gitg-commit.vala:584
 msgid "_Unstage selection"
 msgstr "_Unstage 選擇"
 
-#: ../gitg/commit/gitg-commit.vala:650
+#: gitg/commit/gitg-commit.vala:650
 #, c-format
 msgid "Failed to unstage the removal of file `%s'"
 msgstr "無法 unstage 檔案「%s」的移除"
 
-#: ../gitg/commit/gitg-commit.vala:651
+#: gitg/commit/gitg-commit.vala:651
 #, c-format
 msgid "Failed to unstage the file `%s'"
 msgstr "無法 unstage 檔案「%s」"
 
-#: ../gitg/commit/gitg-commit.vala:658
+#: gitg/commit/gitg-commit.vala:658
 #, c-format
 msgid "Failed to unstage the removal of submodule `%s'"
 msgstr "無法 unstage 子模組「%s」的移除"
 
-#: ../gitg/commit/gitg-commit.vala:659
+#: gitg/commit/gitg-commit.vala:659
 #, c-format
 msgid "Failed to unstage the submodule `%s'"
 msgstr "無法 unstage 子模組「%s」"
 
 #. Populate staged items
-#: ../gitg/commit/gitg-commit.vala:863
+#: gitg/commit/gitg-commit.vala:863
 msgid "Staged"
 msgstr "å·² stage"
 
-#: ../gitg/commit/gitg-commit.vala:871
+#: gitg/commit/gitg-commit.vala:871
 msgid "No staged files"
 msgstr "未 stage 的檔案"
 
 #. Populate unstaged items
-#: ../gitg/commit/gitg-commit.vala:894
+#: gitg/commit/gitg-commit.vala:894
 msgid "Unstaged"
 msgstr "未 stage"
 
-#: ../gitg/commit/gitg-commit.vala:902
+#: gitg/commit/gitg-commit.vala:902
 msgid "No unstaged files"
 msgstr "未 stage 檔案"
 
 #. Populate untracked items
-#: ../gitg/commit/gitg-commit.vala:925
+#: gitg/commit/gitg-commit.vala:925
 msgid "Untracked"
 msgstr "未追蹤"
 
-#: ../gitg/commit/gitg-commit.vala:929
+#: gitg/commit/gitg-commit.vala:929
 msgid "No untracked files"
 msgstr "無未追蹤的檔案"
 
-#: ../gitg/commit/gitg-commit.vala:954
+#: gitg/commit/gitg-commit.vala:954
 msgid "Submodule"
 msgstr "子模組"
 
-#: ../gitg/commit/gitg-commit.vala:958
+#: gitg/commit/gitg-commit.vala:958
 msgid "No dirty submodules"
 msgstr "不允許粗糙子模組"
 
-#: ../gitg/commit/gitg-commit.vala:1107
+#: gitg/commit/gitg-commit.vala:1107
 msgid "Failed to commit"
 msgstr "提交失敗"
 
-#: ../gitg/commit/gitg-commit.vala:1123
+#: gitg/commit/gitg-commit.vala:1123
 msgid "Failed to pass pre-commit"
 msgstr "é€å‡ºé å…ˆæäº¤å¤±æ•—"
 
-#: ../gitg/commit/gitg-commit.vala:1331 ../gitg/commit/gitg-commit.vala:1481
+#: gitg/commit/gitg-commit.vala:1331 gitg/commit/gitg-commit.vala:1481
 msgid "Discard changes"
 msgstr "放棄變更"
 
-#: ../gitg/commit/gitg-commit.vala:1332
+#: gitg/commit/gitg-commit.vala:1332
 msgid "Are you sure you want to permanently discard the selected changes?"
 msgstr "確定要永久放棄選取的變更嗎？"
 
-#: ../gitg/commit/gitg-commit.vala:1341 ../gitg/commit/gitg-commit.vala:1507
-#: ../gitg/commit/gitg-commit.vala:1622
-#: ../gitg/gitg-commit-action-create-patch.vala:145
-#: ../gitg/gitg-dash-view.vala:444 ../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:9
-#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:1
+#: gitg/commit/gitg-commit.vala:1341 gitg/commit/gitg-commit.vala:1507
+#: gitg/commit/gitg-commit.vala:1622
+#: gitg/gitg-commit-action-create-patch.vala:150 gitg/gitg-dash-view.vala:444
+#: gitg/gitg-window.vala:190 gitg/resources/ui/gitg-author-details-dialog.ui:20
+#: gitg/resources/ui/gitg-clone-dialog.ui:18
+#: gitg/resources/ui/gitg-commit-dialog.ui:20
+#: gitg/resources/ui/gitg-create-branch-dialog.ui:18
+#: gitg/resources/ui/gitg-create-tag-dialog.ui:20
+#: gitg/resources/ui/gitg-window.ui:151
+#: libgitg/resources/ui/gitg-authentication-dialog.ui:11
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../gitg/commit/gitg-commit.vala:1342 ../gitg/commit/gitg-commit.vala:1508
+#: gitg/commit/gitg-commit.vala:1342 gitg/commit/gitg-commit.vala:1508
 msgid "Discard"
 msgstr "放棄"
 
-#: ../gitg/commit/gitg-commit.vala:1371
+#: gitg/commit/gitg-commit.vala:1371
 msgid "Failed to discard selection"
 msgstr "ç„¡æ³•æ”¾æ£„é¸å–é …ç›®"
 
-#: ../gitg/commit/gitg-commit.vala:1401
+#: gitg/commit/gitg-commit.vala:1401
 msgid "Failed to stage selection"
 msgstr "無法暫存選擇"
 
-#: ../gitg/commit/gitg-commit.vala:1405
+#: gitg/commit/gitg-commit.vala:1405
 msgid "Failed to unstage selection"
 msgstr "無法取消暫存選擇"
 
-#: ../gitg/commit/gitg-commit.vala:1465
+#: gitg/commit/gitg-commit.vala:1465
 msgid "Failed to discard changes"
 msgstr "無法放棄變更"
 
-#: ../gitg/commit/gitg-commit.vala:1486
+#: gitg/commit/gitg-commit.vala:1486
 #, 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:1497
+#: gitg/commit/gitg-commit.vala:1497
 #, 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:1580
+#: gitg/commit/gitg-commit.vala:1580
 msgid "Failed to delete files"
 msgstr "無法刪除檔案"
 
-#: ../gitg/commit/gitg-commit.vala:1596
+#: gitg/commit/gitg-commit.vala:1596
 msgid "Delete file"
 msgid_plural "Delete files"
 msgstr[0] "刪除檔案"
 
-#: ../gitg/commit/gitg-commit.vala:1601
+#: gitg/commit/gitg-commit.vala:1601
 #, c-format
 msgid "Are you sure you want to permanently delete the file `%s'?"
 msgstr "ç¢ºå®šè¦æ°¸é åˆªé™¤æª”æ¡ˆã€Œ%s」嗎？"
 
-#: ../gitg/commit/gitg-commit.vala:1612
+#: gitg/commit/gitg-commit.vala:1612
 #, c-format
 msgid "Are you sure you want to permanently delete the files %s and `%s'?"
 msgstr "ç¢ºå®šè¦æ°¸é åˆªé™¤æª”æ¡ˆã€Œ%s」與「%s」嗎？"
 
-#: ../gitg/commit/gitg-commit.vala:1658
+#: gitg/commit/gitg-commit.vala:1658
 msgid "_Stage changes"
 msgstr "暫存變更(_S)"
 
-#: ../gitg/commit/gitg-commit.vala:1670
+#: gitg/commit/gitg-commit.vala:1670
 msgid "_Unstage changes"
 msgstr "取消暫存變更(_U)"
 
-#: ../gitg/commit/gitg-commit.vala:1682
+#: gitg/commit/gitg-commit.vala:1682
 msgid "_Discard changes"
 msgstr "放棄變更(_D)"
 
-#: ../gitg/commit/gitg-commit.vala:1694
+#: gitg/commit/gitg-commit.vala:1694
 msgid "D_elete file"
 msgid_plural "D_elete files"
 msgstr[0] "刪除檔案(_E)"
 
-#: ../gitg/commit/gitg-commit.vala:1724
+#: gitg/commit/gitg-commit.vala:1724
 msgid "_Edit file"
 msgstr "編輯檔案(_E)"
 
-#: ../gitg/gitg-action-support.vala:95
+#: gitg/gitg-action-support.vala:95
 #, c-format
 msgid "Failed to stash changes: %s"
 msgstr "無法儲藏變更：%s"
 
-#: ../gitg/gitg-action-support.vala:130
+#: gitg/gitg-action-support.vala:130
 msgid "Unstaged changes"
 msgstr "未暫存的變更"
 
-#: ../gitg/gitg-action-support.vala:131
+#: 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
+#: 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:30
+#: gitg/resources/ui/gitg-simple-notification.ui:61
 msgid "Cancel"
 msgstr "取消"
 
-#: ../gitg/gitg-action-support.vala:134
+#: gitg/gitg-action-support.vala:134
 msgid "Stash changes"
 msgstr "儲藏變更"
 
-#: ../gitg/gitg-action-support.vala:138 ../gitg/gitg-action-support.vala:165
+#: gitg/gitg-action-support.vala:138 gitg/gitg-action-support.vala:165
 msgid "Failed with conflicts"
 msgstr "å› è¡çªå¤±æ•—"
 
-#: ../gitg/gitg-action-support.vala:181
+#: gitg/gitg-action-support.vala:181
 #, c-format
 msgid "Failed to checkout conflicts: %s"
 msgstr "無法檢出衝突：%s"
 
-#: ../gitg/gitg-action-support.vala:199
+#: 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
+#: 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
+#: gitg/gitg-action-support.vala:255
 #, c-format
 msgid "Failed to create commit: %s"
 msgstr "建立提交失敗：%s"
 
-#: ../gitg/gitg-action-support.vala:277
+#: gitg/gitg-action-support.vala:277
 #, c-format
 msgid "Failed to checkout index: %s"
 msgstr "無法檢出索引：%s"
 
-#: ../gitg/gitg-application.vala:56
+#: gitg/gitg-application.vala:57
 msgid "Show the application's version"
 msgstr "顯示應用程式的版本"
 
-#: ../gitg/gitg-application.vala:59
+#: gitg/gitg-application.vala:60
 msgid "Start gitg with a particular activity"
 msgstr "以特定活動啟動 gitg"
 
-#: ../gitg/gitg-application.vala:62
+#: gitg/gitg-application.vala:63
 msgid "Start gitg with the commit activity (shorthand for --activity commit)"
 msgstr "以提交活動啟動 gitg (--activity 提交的簡寫)"
 
-#: ../gitg/gitg-application.vala:65
+#: gitg/gitg-application.vala:66
 msgid "Do not try to load a repository from the current working directory"
-msgstr "不要嘗試從目前工作目錄載入倉儲"
+msgstr "不要嘗試從目前工作目錄載入版本庫"
 
-#: ../gitg/gitg-application.vala:94
+#: gitg/gitg-application.vala:69
+msgid "Run gitg in standalone mode"
+msgstr "以獨立模式執行 gitg"
+
+#: gitg/gitg-application.vala:98
 msgid "- Git repository viewer"
-msgstr "- Git 倉儲檢視器"
+msgstr "- Git 版本庫檢視器"
 
-#: ../gitg/gitg-application.vala:222
+#: gitg/gitg-application.vala:231
 msgid "gitg is a Git repository viewer for gtk+/GNOME"
-msgstr "gitg 是為 gtk+/GNOME 設計的 Git 倉儲檢視器"
+msgstr "gitg 是為 gtk+/GNOME 設計的 Git 版本庫檢視器"
 
-#: ../gitg/gitg-application.vala:231
+#: gitg/gitg-application.vala:240
 msgid "translator-credits"
-msgstr "Cheng-Chia Tseng <pswo10680 gmail com>, 2013"
+msgstr ""
+"Cheng-Chia Tseng <pswo10680 gmail com>, 2013.\n"
+"Yi-Jyun Pan <pan93412 gmail com>, 2018."
 
-#: ../gitg/gitg-application.vala:234
+#: gitg/gitg-application.vala:243
 msgid "gitg homepage"
 msgstr "gitg é¦–é "
 
-#: ../gitg/gitg-application.vala:364
+#: gitg/gitg-application.vala:373
 msgid ""
 "We are terribly sorry, but gitg requires libgit2 (a library on which gitg "
 "depends) to be compiled with threading support.\n"
@@ -632,55 +644,54 @@ msgstr ""
 "\n"
 "å¦å‰‡ï¼Œè«‹åœ¨æ‚¨çš„æ•£å¸ƒç‰ˆéŒ¯èª¤å›žå ±ç³»çµ±ä¸­å›žå ±ï¼ŒæŒ‡å‡º libgit2 未提供執行緒支援。"
 
-#. ex: ts=4 noet
-#: ../gitg/gitg-author-details-dialog.vala:97
-#: ../gitg/gitg-author-details-dialog.vala:117
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:1
+#: gitg/gitg-author-details-dialog.vala:97
+#: gitg/gitg-author-details-dialog.vala:117
+#: gitg/resources/ui/gitg-author-details-dialog.ui:9
 msgid "Author Details"
 msgstr "作者詳細資訊"
 
-#: ../gitg/gitg-author-details-dialog.vala:98
+#: gitg/gitg-author-details-dialog.vala:98
 msgid "Enter default details used for all repositories:"
-msgstr "è¼¸å…¥æ‰€æœ‰å€‰å„²çš„é è¨­è©³ç´°è³‡æ–™ï¼š"
+msgstr "è¼¸å…¥æ‰€æœ‰ç‰ˆæœ¬åº«çš„é è¨­è©³ç´°è³‡æ–™ï¼š"
 
 #. Translators: %s is the repository name
-#: ../gitg/gitg-author-details-dialog.vala:120
+#: gitg/gitg-author-details-dialog.vala:120
 #, c-format
 msgid "Override global details for repository '%s':"
-msgstr "覆蓋倉儲「%s」的全域詳細資料："
+msgstr "覆蓋版本庫「%s」的全域詳細資料："
 
-#: ../gitg/gitg-author-details-dialog.vala:232
+#: gitg/gitg-author-details-dialog.vala:232
 msgid "Failed to set Git user config."
 msgstr "無法設定 Git 使用者組態。"
 
-#: ../gitg/gitg-clone-dialog.vala:89
+#: gitg/gitg-clone-dialog.vala:89
 msgid "The URL introduced is not supported"
-msgstr "不支援引入的 URL 。"
+msgstr "不支援引入的 URL"
 
-#: ../gitg/gitg-commit-action-cherry-pick.vala:53
+#: gitg/gitg-commit-action-cherry-pick.vala:53
 msgid "Cherry pick onto"
 msgstr "挑選到"
 
-#: ../gitg/gitg-commit-action-cherry-pick.vala:58
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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 "
@@ -690,7 +701,7 @@ msgstr ""
 "å°‡ %s 挑選到 %s ä¸Šçš„æ“ä½œé€ æˆè¡çªï¼Œæ‚¨æ˜¯å¦æƒ³è¦æª¢å‡ºæŒ‘é¸çš„åˆ†æ”¯ %s 到您的工作目錄"
 "以解決衝突？"
 
-#: ../gitg/gitg-commit-action-cherry-pick.vala:157
+#: 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 "
@@ -699,300 +710,297 @@ 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
+#: 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
+#: gitg/gitg-commit-action-cherry-pick.vala:168
 msgid "Cherry pick failed with conflicts"
 msgstr "æŒ‘é¸å› è¡çªå¤±æ•—"
 
-#: ../gitg/gitg-commit-action-cherry-pick.vala:179
+#: 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
+#: 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
+#: gitg/gitg-commit-action-cherry-pick.vala:224
 msgid "Successfully cherry picked"
 msgstr "成功進行挑選"
 
-#: ../gitg/gitg-commit-action-cherry-pick.vala:261
+#: 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/gitg-commit-action-create-branch.vala:48
 msgid "Create branch"
 msgstr "建立分支"
 
-#: ../gitg/gitg-commit-action-create-branch.vala:53
+#: 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:75
+#: gitg/gitg-commit-action-create-branch.vala:75
 msgid "Failed to create branch"
 msgstr "無法建立分支"
 
-#: ../gitg/gitg-commit-action-create-patch.vala:63
+#: gitg/gitg-commit-action-create-patch.vala:63
 msgid "Create patch"
 msgstr "建立修補"
 
-#: ../gitg/gitg-commit-action-create-patch.vala:68
+#: gitg/gitg-commit-action-create-patch.vala:68
 msgid "Create a patch from the selected commit"
 msgstr "以選取的提交建立新的修補檔"
 
-#: ../gitg/gitg-commit-action-create-patch.vala:143
+#: gitg/gitg-commit-action-create-patch.vala:148
 msgid "Save Patch File"
 msgstr "儲存修補檔"
 
-#: ../gitg/gitg-commit-action-create-patch.vala:147
+#: gitg/gitg-commit-action-create-patch.vala:152
 msgid "_Save Patch"
 msgstr "儲存修補檔(_S)"
 
-#: ../gitg/gitg-commit-action-create-patch.vala:172
+#: gitg/gitg-commit-action-create-patch.vala:177
 msgid "Failed to create patch"
 msgstr "無法建立修補"
 
-#: ../gitg/gitg-commit-action-create-tag.vala:48
+#: gitg/gitg-commit-action-create-tag.vala:48
 msgid "Create tag"
 msgstr "建立標籤"
 
-#: ../gitg/gitg-commit-action-create-tag.vala:53
+#: 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
+#: gitg/gitg-commit-action-create-tag.vala:92
 msgid "Failed to create tag"
 msgstr "無法建立標籤"
 
-#: ../gitg/gitg-commit-action-create-tag.vala:109
+#: gitg/gitg-commit-action-create-tag.vala:109
 msgid "Failed to lookup tag"
 msgstr "搜尋標籤失敗"
 
-#: ../gitg/gitg-create-tag-dialog.vala:110
+#: gitg/gitg-create-tag-dialog.vala:110
 msgid "Provide a message to create an annotated tag"
 msgstr "提供訊息以建立有注釋的標籤"
 
-#: ../gitg/gitg-dash-view.vala:87
+#: gitg/gitg-dash-view.vala:87
 msgid "Select and manage projects"
 msgstr "選擇與管理專案"
 
-#: ../gitg/gitg-dash-view.vala:176
+#: gitg/gitg-dash-view.vala:174
 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:232
+#: gitg/gitg-dash-view.vala:230
 #, c-format
 msgid "We can also %sscan your home directory%s for git repositories."
-msgstr "我們也可以 %s掃描您的家目錄%s 尋找 git 倉儲。"
+msgstr "我們也可以 %s掃描您的家目錄%s 尋找 git 版本庫。"
 
 #. Translators: the two %s will be used to create a link to the author dialog.
-#: ../gitg/gitg-dash-view.vala:235
+#: gitg/gitg-dash-view.vala:233
 #, 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:389
+#: gitg/gitg-dash-view.vala:389
 msgid "Failed to clone repository"
-msgstr "無法重製倉儲"
+msgstr "無法重製版本庫"
 
-#: ../gitg/gitg-dash-view.vala:420
+#: gitg/gitg-dash-view.vala:420
 msgid "Failed to add repository"
-msgstr "ç„¡æ³•åŠ å…¥å€‰å„²"
+msgstr "ç„¡æ³•åŠ å…¥ç‰ˆæœ¬åº«"
 
-#: ../gitg/gitg-dash-view.vala:436
+#: gitg/gitg-dash-view.vala:436
 msgid "Create new repository"
-msgstr "建立新倉儲"
+msgstr "建立新版本庫"
 
 #. Translators: %s is a file name
-#: ../gitg/gitg-dash-view.vala:439
+#: gitg/gitg-dash-view.vala:439
 #, 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 倉"
-"儲嗎？"
+"位置 <i>%s</i> 似乎不是有效的 git 版本庫。您想要在這個位置初始化一個新的 git "
+"版本庫嗎？"
 
-#: ../gitg/gitg-dash-view.vala:445
+#: gitg/gitg-dash-view.vala:445
 msgid "Create repository"
-msgstr "建立倉儲"
+msgstr "建立版本庫"
 
-#: ../gitg/gitg-dash-view.vala:461
+#: gitg/gitg-dash-view.vala:461
 msgid "Failed to create repository"
-msgstr "無法建立倉儲"
+msgstr "無法建立版本庫"
 
-#: ../gitg/gitg-dash-view.vala:531
+#: gitg/gitg-dash-view.vala:531
 #, c-format
 msgid "Scanning for repositories in %s"
-msgstr "掃描「%s」內的倉儲"
+msgstr "掃描「%s」內的版本庫"
 
-#: ../gitg/gitg-ref-action-checkout.vala:53
+#: gitg/gitg-ref-action-checkout.vala:53
 msgid "Checkout the selected reference"
 msgstr "檢出選取的參照"
 
-#: ../gitg/gitg-ref-action-checkout.vala:72
+#: gitg/gitg-ref-action-checkout.vala:72
 #, c-format
 msgid "Checkout %s"
 msgstr "檢出 %s"
 
-#: ../gitg/gitg-ref-action-checkout.vala:101
+#: gitg/gitg-ref-action-checkout.vala:101
 #, c-format
 msgid "Failed to checkout branch: %s"
 msgstr "無法檢出分支：%s"
 
-#: ../gitg/gitg-ref-action-checkout.vala:111
+#: 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
+#: gitg/gitg-ref-action-checkout.vala:121
 msgid "Successfully checked out branch to working directory"
 msgstr "成功檢出分支到工作目錄"
 
-#: ../gitg/gitg-ref-action-copy-name.vala:48
+#: gitg/gitg-ref-action-copy-name.vala:48
 msgid "Copy name"
 msgstr "複製名稱"
 
-#: ../gitg/gitg-ref-action-copy-name.vala:53
+#: gitg/gitg-ref-action-copy-name.vala:53
 msgid "Copy the name of the reference to the clipboard"
 msgstr "將參照的名稱複製到剪貼簿"
 
-#: ../gitg/gitg-ref-action-delete.vala:48
-#: ../gitg/gitg-ref-action-delete.vala:89
+#: gitg/gitg-ref-action-delete.vala:48 gitg/gitg-ref-action-delete.vala:89
 msgid "Delete"
 msgstr "刪除"
 
-#: ../gitg/gitg-ref-action-delete.vala:53
+#: gitg/gitg-ref-action-delete.vala:53
 msgid "Delete the selected reference"
 msgstr "刪除選取的參照"
 
-#: ../gitg/gitg-ref-action-delete.vala:73
+#: gitg/gitg-ref-action-delete.vala:73
 #, c-format
 msgid "Delete branch %s"
 msgstr "刪除分支 %s"
 
-#: ../gitg/gitg-ref-action-delete.vala:74
+#: 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
+#: gitg/gitg-ref-action-delete.vala:78
 #, c-format
 msgid "Delete tag %s"
 msgstr "刪除標籤 %s"
 
-#: ../gitg/gitg-ref-action-delete.vala:79
+#: 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
+#: gitg/gitg-ref-action-delete.vala:83
 #, c-format
 msgid "Delete remote branch %s"
 msgstr "åˆªé™¤é ç«¯åˆ†æ”¯ %s"
 
-#: ../gitg/gitg-ref-action-delete.vala:84
+#: 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？"
 
 #. Translators: %s is the name of the tag
-#: ../gitg/gitg-ref-action-delete.vala:119
+#: gitg/gitg-ref-action-delete.vala:119
 #, c-format
 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
+#: 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
+#: 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
+#: 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-fetch.vala:74
+#: gitg/gitg-ref-action-fetch.vala:74
 #, c-format
 msgid "Fetch from %s"
 msgstr "從 %s 取回"
 
-#: ../gitg/gitg-ref-action-fetch.vala:85
+#: gitg/gitg-ref-action-fetch.vala:85
 #, c-format
 msgid "Fetch remote objects from %s"
 msgstr "從 %s å–å›žé ç«¯ç‰©ä»¶"
 
-#: ../gitg/gitg-ref-action-fetch.vala:98
+#: 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:106
+#: 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:111
+#: gitg/gitg-ref-action-fetch.vala:111
 msgid "updated"
 msgstr "已更新"
 
-#: ../gitg/gitg-ref-action-fetch.vala:121
+#: 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:134
+#: 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:140
+#: gitg/gitg-ref-action-fetch.vala:140
 #, c-format
 msgid "Fetched from %s: %s"
 msgstr "已從 %s 取回：%s"
 
-#: ../gitg/gitg-ref-action-merge.vala:63
+#: gitg/gitg-ref-action-merge.vala:63
 #, c-format
 msgid "Merge into %s"
 msgstr "合併到 %s"
 
 #. TODO
-#: ../gitg/gitg-ref-action-merge.vala:69
+#: 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
+#: 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
+#: 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
+#: gitg/gitg-ref-action-merge.vala:184
 #, c-format
 msgid ""
 "The merge of %s into %s has caused conflicts, would you like to checkout "
@@ -1001,7 +1009,7 @@ msgstr ""
 "å°‡ %s 合併到 %s ä¸Šçš„æ“ä½œé€ æˆè¡çªï¼Œæ‚¨æ˜¯å¦æƒ³è¦æª¢å‡ºåˆä½µçš„åˆ†æ”¯ %s 到您的工作目錄"
 "以解決衝突？"
 
-#: ../gitg/gitg-ref-action-merge.vala:188
+#: 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 "
@@ -1010,760 +1018,766 @@ msgstr ""
 "å°‡ %s 合併到 %s ä¸Šçš„æ“ä½œé€ æˆè¡çªï¼Œæ‚¨æ˜¯å¦æƒ³è¦æª¢å‡ºåˆä½µåˆ°æ‚¨çš„å·¥ä½œç›®éŒ„ä»¥è§£æ±ºè¡"
 "突？"
 
-#: ../gitg/gitg-ref-action-merge.vala:199
+#: gitg/gitg-ref-action-merge.vala:199
 msgid "Merge failed with conflicts"
 msgstr "åˆä½µå› è¡çªå¤±æ•—"
 
-#: ../gitg/gitg-ref-action-merge.vala:210
+#: gitg/gitg-ref-action-merge.vala:210
 msgid "Finished merge with conflicts in working directory"
 msgstr "工作目錄中的合併以發生衝突的狀況結束"
 
-#: ../gitg/gitg-ref-action-merge.vala:222
+#: gitg/gitg-ref-action-merge.vala:222
 #, c-format
 msgid "Merge %s into %s"
 msgstr "合併 %s 到 %s"
 
-#: ../gitg/gitg-ref-action-merge.vala:231
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: gitg/gitg-ref-action-rename.vala:48
 msgid "Rename"
 msgstr "重新命名"
 
-#: ../gitg/gitg-ref-action-rename.vala:53
+#: gitg/gitg-ref-action-rename.vala:53
 msgid "Rename the selected reference"
 msgstr "重新命名所選取的參照"
 
-#: ../gitg/gitg-ref-action-rename.vala:100
+#: 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
+#: gitg/gitg-ref-action-rename.vala:102
 msgid "Invalid name"
 msgstr "無效的名稱"
 
-#: ../gitg/gitg-ref-action-rename.vala:131
+#: gitg/gitg-ref-action-rename.vala:131
 msgid "Failed to rename"
 msgstr "無法重新命名"
 
-#: ../gitg/gitg-remote-notification.vala:90
-#: ../gitg/gitg-simple-notification.vala:99
-#: ../gitg/resources/ui/gitg-window.ui.h:10
+#: gitg/gitg-remote-notification.vala:90 gitg/gitg-simple-notification.vala:99
+#: gitg/resources/ui/gitg-window.ui:226
 msgid "Close"
 msgstr "關閉"
 
-#: ../gitg/gitg-window.vala:187
+#: gitg/gitg-window.vala:187
 msgid "Add Repository"
-msgstr "åŠ å…¥å€‰å„²"
+msgstr "åŠ å…¥ç‰ˆæœ¬åº«"
 
-#: ../gitg/gitg-window.vala:191
+#: gitg/gitg-window.vala:191
 msgid "_Add"
 msgstr "åŠ å…¥(_A)"
 
-#: ../gitg/gitg-window.vala:193
+#: gitg/gitg-window.vala:193
 msgid "_Scan for all git repositories from this directory"
-msgstr "掃描這個目錄中所有的 git 倉儲(_S)"
+msgstr "掃描這個目錄中所有的 git 版本庫(_S)"
 
-#: ../gitg/gitg-window.vala:501
+#: gitg/gitg-window.vala:498
 msgid "Projects"
 msgstr "專案"
 
-#: ../gitg/gitg-window.vala:751
+#: gitg/gitg-window.vala:748
 msgid "Select items"
 msgstr "é¸æ“‡é …ç›®"
 
-#: ../gitg/gitg-window.vala:958
+#: gitg/gitg-window.vala:955
 #, c-format
 msgid "'%s' is not a Git repository."
-msgstr "「%s」不是 Git 倉儲。"
+msgstr "「%s」不是 Git 版本庫。"
 
-#: ../gitg/gitg-window.vala:1107
+#: gitg/gitg-window.vala:1104
 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:1111
+#: gitg/gitg-window.vala:1108
 msgid ""
 "Your user name is not configured yet. Please go to the user configuration "
 "and provide your name."
 msgstr "您的使用者名稱尚未設定。請至使用者組態並提供您的姓名。"
 
-#: ../gitg/gitg-window.vala:1115
+#: gitg/gitg-window.vala:1112
 msgid ""
 "Your email is not configured yet. Please go to the user configuration and "
 "provide your email."
 msgstr "您的電子郵件尚未設定。請至使用者組態並提供您的電子郵件。"
 
-#: ../gitg/gitg-window.vala:1118
+#: gitg/gitg-window.vala:1115
 msgid "Missing author details"
 msgstr "缺少作者詳細資料"
 
-#: ../gitg/history/gitg-history-command-line.vala:42
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: gitg/history/gitg-history-command-line.vala:50
 msgid "REFERENCE"
 msgstr "參照"
 
-#: ../gitg/history/gitg-history-refs-list.vala:165
+#: gitg/history/gitg-history-refs-list.vala:165
 #, c-format
 msgid "%zu ahead, %zu behind"
 msgstr "%zu é ˜å…ˆï¼Œ%zu 落後"
 
-#: ../gitg/history/gitg-history-refs-list.vala:169
+#: gitg/history/gitg-history-refs-list.vala:169
 #, c-format
 msgid "%zu ahead"
 msgstr "%zu é ˜å…ˆ"
 
-#: ../gitg/history/gitg-history-refs-list.vala:173
+#: gitg/history/gitg-history-refs-list.vala:173
 #, c-format
 msgid "%zu behind"
 msgstr "%zu 落後"
 
-#: ../gitg/history/gitg-history-refs-list.vala:207
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:4
+#: gitg/history/gitg-history-refs-list.vala:207
+#: gitg/resources/ui/gitg-preferences-history.ui:81
 msgid "All commits"
 msgstr "所有的提交"
 
-#: ../gitg/history/gitg-history-refs-list.vala:1174
+#: gitg/history/gitg-history-refs-list.vala:1174
 msgid "Branches"
 msgstr "分支"
 
-#: ../gitg/history/gitg-history-refs-list.vala:1175
+#: gitg/history/gitg-history-refs-list.vala:1175
 msgid "Remotes"
 msgstr "é ç«¯"
 
-#: ../gitg/history/gitg-history.vala:342
-#: ../gitg/preferences/gitg-preferences-history.vala:218
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:3
+#: gitg/history/gitg-history.vala:342
+#: gitg/preferences/gitg-preferences-history.vala:218
+#: gitg/resources/ui/gitg-preferences-interface.ui:60
 msgid "History"
 msgstr "歷史"
 
-#: ../gitg/history/gitg-history.vala:347
+#: gitg/history/gitg-history.vala:347
 msgid "Examine the history of the repository"
-msgstr "檢驗倉儲的歷史"
+msgstr "檢驗版本庫的歷史"
 
-#: ../gitg/history/gitg-history.vala:909
+#: gitg/history/gitg-history.vala:909
 msgid "Mainline"
 msgstr "主線"
 
-#: ../gitg/preferences/gitg-preferences-commit.vala:119
+#: gitg/preferences/gitg-preferences-commit.vala:119
 msgctxt "Preferences"
 msgid "Commit"
 msgstr "提交"
 
-#: ../gitg/preferences/gitg-preferences-interface.vala:120
+#: gitg/preferences/gitg-preferences-interface.vala:120
 msgid "Interface"
 msgstr "介面"
 
-#. Translators: %s will be replaced with a URL indicating the resource
-#. for which the authentication is required.
-#: ../libgitg/gitg-authentication-dialog.vala:69
-#, c-format
-msgid "Password required for %s"
-msgstr "%s 需要的密碼 "
-
-#: ../libgitg/gitg-date.vala:346
-msgid "Now"
-msgstr "現在"
-
-#: ../libgitg/gitg-date.vala:350
-#, c-format
-msgid "A minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d 分鐘前"
-
-#: ../libgitg/gitg-date.vala:355
-msgid "Half an hour ago"
-msgstr "半小時前"
-
-#: ../libgitg/gitg-date.vala:360
-#, c-format
-msgid "An hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d 小時前"
-
-#: ../libgitg/gitg-date.vala:365
-#, c-format
-msgid "A day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d 天前"
-
-#. 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
-msgid "%b %e, %H:%M"
-msgstr "%b%e日，%H:%M"
-
-#. 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
-msgid "%b %e, %I:%M %p"
-msgstr "%b%e日，%p %I:%M"
-
-#. 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
-msgid "%b %e %Y, %H:%M"
-msgstr "%Y年%b%e日，%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
-msgid "%b %e %Y, %I:%M %p"
-msgstr "%Y年%b%e日，%p %I:%M"
-
-#. Translators: this label is displayed below the image diff, %s
-#. is substituted with the size of the image
-#: ../libgitg/gitg-diff-image-side-by-side.vala:39
-#, c-format
-msgid "before (%s)"
-msgstr "先於 (%s)"
-
-#. Translators: this label is displayed below the image diff, %s
-#. is substituted with the size of the image
-#: ../libgitg/gitg-diff-image-side-by-side.vala:45
-#, c-format
-msgid "removed (%s)"
-msgstr "已移除 (%s)"
-
-#. Translators: this label is displayed below the image diff, %s
-#. is substituted with the size of the image
-#: ../libgitg/gitg-diff-image-side-by-side.vala:67
-#, c-format
-msgid "after (%s)"
-msgstr "晚於 (%s)"
-
-#. Translators: this label is displayed below the image diff, %s
-#. is substituted with the size of the image
-#: ../libgitg/gitg-diff-image-side-by-side.vala:73
-#, c-format
-msgid "added (%s)"
-msgstr "已新增 (%s)"
-
-#: ../libgitg/gitg-diff-view-commit-details.vala:145
-msgid "Collapse all"
-msgstr "全部收摺"
-
-#: ../libgitg/gitg-diff-view-commit-details.vala:149
-#: ../libgitg/resources/ui/gitg-diff-view-commit-details.ui.h:2
-msgid "Expand all"
-msgstr "全部展開"
-
-#: ../libgitg/gitg-diff-view-commit-details.vala:202
-#, c-format
-msgid "Committed by %s"
-msgstr "由 %s 提交"
-
-#: ../libgitg/gitg-diff-view-file.vala:177
-msgid "_Open file"
-msgstr "開啟檔案(_O)"
-
-#: ../libgitg/gitg-diff-view-file.vala:209
-msgid "Open containing _folder"
-msgstr "開啟包含的資料夾(_F)"
-
-#: ../libgitg/gitg-diff-view-file.vala:229
-msgid "_Copy file path"
-msgstr "複製檔案路徑(_C)"
-
-#. 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"
-
-#. 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-repository-list-box.vala:541
-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:115
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:11
-msgid "Diff"
-msgstr "Diff"
-
-#: ../plugins/diff/gitg-diff.vala:120
-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 "在選取提交的樹狀圖中顯示檔案"
-
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:3
+#: gitg/resources/ui/gitg-author-details-dialog.ui:35
 msgid "_Save"
 msgstr "儲存(_S)"
 
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:4
+#: gitg/resources/ui/gitg-author-details-dialog.ui:65
 msgid "Default details used for all repositories"
-msgstr "æ‰€æœ‰å€‰å„²çš„é è¨­è©³ç´°è³‡æ–™"
+msgstr "æ‰€æœ‰ç‰ˆæœ¬åº«çš„é è¨­è©³ç´°è³‡æ–™"
 
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:5
+#: gitg/resources/ui/gitg-author-details-dialog.ui:114
 msgid "E-mail:"
 msgstr "電子郵件："
 
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:6
+#: gitg/resources/ui/gitg-author-details-dialog.ui:125
 msgid "Name:"
 msgstr "名稱："
 
-#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:1
+#: gitg/resources/ui/gitg-clone-dialog.ui:7
 msgid "Clone Repository"
-msgstr "重製倉儲"
+msgstr "重製版本庫"
 
-#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:3
+#: gitg/resources/ui/gitg-clone-dialog.ui:33
 msgid "Cl_one"
 msgstr "重製(_O)"
 
-#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:4
+#: gitg/resources/ui/gitg-clone-dialog.ui:68
 msgid "Remote _URL:"
 msgstr "é ç«¯ _URL："
 
-#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:5
+#: gitg/resources/ui/gitg-clone-dialog.ui:99
 msgid "_Local Folder:"
 msgstr "本地資料夾(_L):"
 
-#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:6
+#: gitg/resources/ui/gitg-clone-dialog.ui:116
 msgid "Select location…"
 msgstr "選取位置…"
 
-#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:7
+#: gitg/resources/ui/gitg-clone-dialog.ui:127
 msgid "Bare repository"
 msgstr "原始檔案庫"
 
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:1
+#: gitg/resources/ui/gitg-commit-dialog.ui:8
 msgctxt "Create Dialog"
 msgid "Commit"
 msgstr "提交"
 
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:3
-#: ../gitg/resources/ui/gitg-commit-paned.ui.h:2
+#: gitg/resources/ui/gitg-commit-dialog.ui:36
+#: gitg/resources/ui/gitg-commit-paned.ui:86
 msgid "C_ommit"
 msgstr "提交(_O)"
 
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:4
+#: gitg/resources/ui/gitg-commit-dialog.ui:109
 msgid "Add _signed-off-by signature"
 msgstr "åŠ å…¥ _signed-off-by ç°½ç« "
 
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:5
+#: gitg/resources/ui/gitg-commit-dialog.ui:126
 msgid "_Amend previous commit"
 msgstr "修正上一次提交(_A)"
 
-#: ../gitg/resources/ui/gitg-commit-paned.ui.h:1
+#: gitg/resources/ui/gitg-commit-paned.ui:76
 msgid "Skip commit _hooks"
 msgstr "略過提交掛鉤(_H)"
 
-#: ../gitg/resources/ui/gitg-commit-paned.ui.h:3
+#: gitg/resources/ui/gitg-commit-paned.ui:96
 msgid "S_tage selection"
 msgstr "S_tage 選擇"
 
-#: ../gitg/resources/ui/gitg-commit-paned.ui.h:4
+#: gitg/resources/ui/gitg-commit-paned.ui:107
 msgid "D_iscard selection"
 msgstr "æ”¾æ£„é¸å–é …ç›®(_I)"
 
-#: ../gitg/resources/ui/gitg-commit-submodule-diff-view.ui.h:1
+#: gitg/resources/ui/gitg-commit-submodule-diff-view.ui:24
 msgid ""
 "The submodule is in a dirty state and has staged and/or unstaged changes "
 "that are not yet committed as shown below."
 msgstr "子模組處於粗糙狀態，且有尚未提交的已暫存與/或未暫存更動會顯示於下方。"
 
-#: ../gitg/resources/ui/gitg-commit-submodule-diff-view.ui.h:2
+#: gitg/resources/ui/gitg-commit-submodule-diff-view.ui:50
 msgid "Staged:"
 msgstr "Staged:"
 
-#: ../gitg/resources/ui/gitg-commit-submodule-diff-view.ui.h:3
+#: gitg/resources/ui/gitg-commit-submodule-diff-view.ui:86
 msgid "Unstaged:"
 msgstr "Unstaged:"
 
-#: ../gitg/resources/ui/gitg-commit-submodule-history-view.ui.h:1
-#: ../gitg/resources/ui/gitg-history-paned.ui.h:1
+#: gitg/resources/ui/gitg-commit-submodule-history-view.ui:24
+#: gitg/resources/ui/gitg-history-paned.ui:93
 msgid "Subject"
 msgstr "主旨"
 
-#: ../gitg/resources/ui/gitg-commit-submodule-history-view.ui.h:2
-#: ../gitg/resources/ui/gitg-history-paned.ui.h:2
+#: gitg/resources/ui/gitg-commit-submodule-history-view.ui:41
+#: gitg/resources/ui/gitg-history-paned.ui:110
 msgid "Author"
 msgstr "作者"
 
-#: ../gitg/resources/ui/gitg-commit-submodule-history-view.ui.h:3
-#: ../gitg/resources/ui/gitg-history-paned.ui.h:3
+#: gitg/resources/ui/gitg-commit-submodule-history-view.ui:57
+#: gitg/resources/ui/gitg-history-paned.ui:126
 msgid "Date"
 msgstr "日期"
 
-#: ../gitg/resources/ui/gitg-commit-submodule-info.ui.h:1
+#: gitg/resources/ui/gitg-commit-submodule-info.ui:70
 msgid "Open"
 msgstr "é–‹å•Ÿ"
 
-#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:1
+#: gitg/resources/ui/gitg-create-branch-dialog.ui:7
 msgid "Create Branch"
 msgstr "建立分支"
 
-#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:3
-#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:3
+#: gitg/resources/ui/gitg-create-branch-dialog.ui:34
+#: gitg/resources/ui/gitg-create-tag-dialog.ui:36
 msgid "C_reate"
 msgstr "建立(_R)"
 
-#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:4
+#: gitg/resources/ui/gitg-create-branch-dialog.ui:69
 msgid "Branch _name:"
 msgstr "分支名稱(_N):"
 
-#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:1
+#: gitg/resources/ui/gitg-create-tag-dialog.ui:7
 msgid "Create Tag"
 msgstr "建立標籤"
 
-#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:4
+#: gitg/resources/ui/gitg-create-tag-dialog.ui:71
 msgid "Tag _name:"
 msgstr "標籤名稱(_N):"
 
-#: ../gitg/resources/ui/gitg-dash-view.ui.h:1
+#: gitg/resources/ui/gitg-dash-view.ui:32
 msgid ""
 "No repositories have been added yet. To get started, you can add an existing "
 "repository or clone a new one."
-msgstr "å°šæœªåŠ å…¥å€‰å„²ã€‚è¦é–‹å§‹ä½¿ç”¨ï¼Œæ‚¨å¯ä»¥åŠ å…¥æ—¢å­˜çš„å€‰å„²æˆ–é‡è£½ä¸€å€‹æ–°çš„å€‰å„²ã€‚"
+msgstr ""
+"å°šæœªåŠ å…¥ç‰ˆæœ¬åº«ã€‚è¦é–‹å§‹ä½¿ç”¨ï¼Œæ‚¨å¯ä»¥åŠ å…¥æ—¢å­˜çš„ç‰ˆæœ¬åº«æˆ–é‡è£½ä¸€å€‹æ–°çš„ç‰ˆæœ¬åº«ã€‚"
 
-#: ../gitg/resources/ui/gitg-menus.ui.h:1
+#: gitg/resources/ui/gitg-menus.ui:7 gitg/resources/ui/gitg-menus.ui:55
+#: gitg/resources/ui/gitg-menus.ui:91
 msgid "_New Window"
 msgstr "新開視窗(_N)"
 
-#: ../gitg/resources/ui/gitg-menus.ui.h:2
+#: gitg/resources/ui/gitg-menus.ui:13 gitg/resources/ui/gitg-menus.ui:47
+#: gitg/resources/ui/gitg-menus.ui:61 gitg/resources/ui/gitg-menus.ui:103
 msgid "_Author Details"
 msgstr "作者詳細資料(_A)"
 
-#: ../gitg/resources/ui/gitg-menus.ui.h:3
+#: gitg/resources/ui/gitg-menus.ui:19 gitg/resources/ui/gitg-menus.ui:67
+#: gitg/resources/ui/gitg-menus.ui:109
 msgid "_Preferences"
 msgstr "偏好設定(_P)"
 
-#: ../gitg/resources/ui/gitg-menus.ui.h:4
+#: gitg/resources/ui/gitg-menus.ui:25 gitg/resources/ui/gitg-menus.ui:73
+#: gitg/resources/ui/gitg-menus.ui:115
 msgid "_Keyboard Shortcuts"
 msgstr "鍵盤捷徑鍵(_K)"
 
-#: ../gitg/resources/ui/gitg-menus.ui.h:5
+#: gitg/resources/ui/gitg-menus.ui:29 gitg/resources/ui/gitg-menus.ui:77
+#: gitg/resources/ui/gitg-menus.ui:119
 msgid "_About"
 msgstr "關於(_A)"
 
-#: ../gitg/resources/ui/gitg-menus.ui.h:6
+#: gitg/resources/ui/gitg-menus.ui:33 gitg/resources/ui/gitg-menus.ui:83
+#: gitg/resources/ui/gitg-menus.ui:125
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: ../gitg/resources/ui/gitg-menus.ui.h:7
+#: gitg/resources/ui/gitg-menus.ui:41 gitg/resources/ui/gitg-menus.ui:97
 msgid "_Reload"
 msgstr "重新載入(_R)"
 
-#: ../gitg/resources/ui/gitg-preferences-commit.ui.h:1
+#: gitg/resources/ui/gitg-preferences-commit.ui:44
 msgid "Show markup"
 msgstr "顯示標記"
 
-#: ../gitg/resources/ui/gitg-preferences-commit.ui.h:2
+#: gitg/resources/ui/gitg-preferences-commit.ui:71
 msgid "Display _subject margin at column:"
 msgstr "顯示主旨邊界於哪一欄(_S):"
 
-#: ../gitg/resources/ui/gitg-preferences-commit.ui.h:3
+#: gitg/resources/ui/gitg-preferences-commit.ui:126
 msgid "Display right _margin at column:"
 msgstr "顯示右邊邊界於(_M):"
 
-#: ../gitg/resources/ui/gitg-preferences-commit.ui.h:4
+#: gitg/resources/ui/gitg-preferences-commit.ui:189
 msgid "Enable spell checking"
 msgstr "啟用拼字檢查"
 
-#: ../gitg/resources/ui/gitg-preferences-commit.ui.h:5
+#: gitg/resources/ui/gitg-preferences-commit.ui:220
 msgid "Commit Message"
 msgstr "提交訊息"
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:1
+#: gitg/resources/ui/gitg-preferences-history.ui:31
 msgid "Default selection"
 msgstr "é è¨­é¸æ“‡å€åŸŸ"
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:2
+#: gitg/resources/ui/gitg-preferences-history.ui:50
 msgid "Current branch"
 msgstr "目前的分支"
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:3
+#: gitg/resources/ui/gitg-preferences-history.ui:65
 msgid "All branches"
 msgstr "所有的分支"
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:5
+#: gitg/resources/ui/gitg-preferences-history.ui:106
 msgid "References"
 msgstr "參照"
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:6
+#: gitg/resources/ui/gitg-preferences-history.ui:119
 msgid "Sort references in the sidebar by latest activity"
 msgstr "在側邊欄中依最新活動排序參照"
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:7
+#: gitg/resources/ui/gitg-preferences-history.ui:135
 msgid "Show upstream (remote) branch when selecting a local branch"
 msgstr "當選擇一個本地端分支時顯示上游 (é ç«¯) 分支"
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:8
+#: gitg/resources/ui/gitg-preferences-history.ui:154
 msgid "Commits"
 msgstr "提交"
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:9
+#: gitg/resources/ui/gitg-preferences-history.ui:174
 msgid "Collapse inactive lanes"
 msgstr "æ”¶ç–Šæœªä½¿ç”¨çš„çª—æ ¼"
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:10
+#: gitg/resources/ui/gitg-preferences-history.ui:215
 msgid "Early"
 msgstr "å¿«"
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:11
+#: gitg/resources/ui/gitg-preferences-history.ui:227
 msgid "Late"
 msgstr "æ…¢"
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:12
+#: gitg/resources/ui/gitg-preferences-history.ui:242
 msgid "Show history in topological order"
 msgstr "ä»¥æ‹“æ¨¸é †åºé¡¯ç¤ºæ­·å²"
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:13
+#: gitg/resources/ui/gitg-preferences-history.ui:257
 msgid "Preserve mainline for currently checked out branch"
 msgstr "保留目前檢出分支的主線"
 
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:1
+#: gitg/resources/ui/gitg-preferences-interface.ui:24
 msgid "Startup"
 msgstr "å•Ÿå‹•"
 
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:2
+#: gitg/resources/ui/gitg-preferences-interface.ui:47
 msgid "Start with activity:"
 msgstr "以特定活動啟動："
 
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:4
+#: gitg/resources/ui/gitg-preferences-interface.ui:61
 msgid "Commit"
 msgstr "提交"
 
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:5
+#: gitg/resources/ui/gitg-preferences-interface.ui:80
 msgid "Layout"
 msgstr "版面配置"
 
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:6
+#: gitg/resources/ui/gitg-preferences-interface.ui:100
 msgid "Use horizontal layout"
 msgstr "使用水平版面配置"
 
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:7
+#: gitg/resources/ui/gitg-preferences-interface.ui:124
 msgid "Avatars"
 msgstr "å¤§é ­è²¼"
 
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:8
+#: gitg/resources/ui/gitg-preferences-interface.ui:144
 msgid "Use gravatar service to provide user avatars"
 msgstr "使用 gravatar æœå‹™ä¾†æä¾›ä½¿ç”¨è€…å¤§é ­è²¼"
 
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:9
+#: gitg/resources/ui/gitg-preferences-interface.ui:168
 msgid "Monitoring"
 msgstr "監控"
 
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:12
+#: gitg/resources/ui/gitg-preferences-interface.ui:212
+#: plugins/diff/gitg-diff.vala:115
+msgid "Diff"
+msgstr "Diff"
+
+#: gitg/resources/ui/gitg-preferences-interface.ui:232
 msgid "Enable syntax highlighting of source code in diff views"
 msgstr "在 diff 檢視中啟用原始碼的語法色彩標示"
 
-#: ../gitg/resources/ui/gitg-preferences.ui.h:1
+#: gitg/resources/ui/gitg-preferences.ui:11
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../gitg/resources/ui/gitg-shortcuts.ui.h:1
+#: gitg/resources/ui/gitg-shortcuts.ui:14
 msgctxt "shortcut window"
 msgid "Windows"
 msgstr "視窗"
 
-#: ../gitg/resources/ui/gitg-shortcuts.ui.h:2
+#: gitg/resources/ui/gitg-shortcuts.ui:19
 msgctxt "shortcut window"
 msgid "Open a new window"
 msgstr "開啟新的視窗"
 
-#: ../gitg/resources/ui/gitg-shortcuts.ui.h:3
+#: gitg/resources/ui/gitg-shortcuts.ui:26
 msgctxt "shortcut window"
 msgid "Open the window menu"
 msgstr "開啟視窗選單"
 
-#: ../gitg/resources/ui/gitg-shortcuts.ui.h:4
+#: gitg/resources/ui/gitg-shortcuts.ui:33
 msgctxt "shortcut window"
 msgid "Open a repository"
-msgstr "開啟倉儲"
+msgstr "開啟版本庫"
 
-#: ../gitg/resources/ui/gitg-shortcuts.ui.h:5
+#: gitg/resources/ui/gitg-shortcuts.ui:40
 msgctxt "shortcut window"
 msgid "Open the help"
 msgstr "開啟求助文件"
 
-#: ../gitg/resources/ui/gitg-shortcuts.ui.h:6
+#: gitg/resources/ui/gitg-shortcuts.ui:47
 msgctxt "shortcut window"
 msgid "Find"
 msgstr "尋找"
 
-#: ../gitg/resources/ui/gitg-shortcuts.ui.h:7
+#: gitg/resources/ui/gitg-shortcuts.ui:54
 msgctxt "shortcut window"
 msgid "Close the active window"
 msgstr "關閉使用中視窗"
 
-#: ../gitg/resources/ui/gitg-shortcuts.ui.h:8
+#: gitg/resources/ui/gitg-shortcuts.ui:61
 msgctxt "shortcut window"
 msgid "Quit the application"
 msgstr "退出應用程式"
 
-#: ../gitg/resources/ui/gitg-window.ui.h:2
+#: gitg/resources/ui/gitg-window.ui:23
 msgid "Show the list of recently used repositories"
-msgstr "顯示目前使用的倉儲清單"
+msgstr "顯示目前使用的版本庫清單"
 
-#: ../gitg/resources/ui/gitg-window.ui.h:3
+#: gitg/resources/ui/gitg-window.ui:45
 msgid "Clone"
 msgstr "重製"
 
-#: ../gitg/resources/ui/gitg-window.ui.h:4
+#: gitg/resources/ui/gitg-window.ui:46
 msgid "Clone repository"
-msgstr "重製倉儲"
+msgstr "重製版本庫"
 
-#: ../gitg/resources/ui/gitg-window.ui.h:5
+#: gitg/resources/ui/gitg-window.ui:61
 msgid "Add"
 msgstr "åŠ å…¥"
 
-#: ../gitg/resources/ui/gitg-window.ui.h:6
+#: gitg/resources/ui/gitg-window.ui:62
 msgid "Add repository"
-msgstr "åŠ å…¥å€‰å„²"
+msgstr "åŠ å…¥ç‰ˆæœ¬åº«"
 
-#: ../gitg/resources/ui/gitg-window.ui.h:7
+#: gitg/resources/ui/gitg-window.ui:86
 msgid "Find a word or phrase"
 msgstr "尋找字詞"
 
-#: ../gitg/resources/ui/gitg-window.ui.h:8
+#: gitg/resources/ui/gitg-window.ui:131
 msgid "General settings and options"
 msgstr "ä¸€èˆ¬è¨­å®šå€¼èˆ‡é¸é …"
 
-#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:2
+#. Translators: %s will be replaced with a URL indicating the resource
+#. for which the authentication is required.
+#: libgitg/gitg-authentication-dialog.vala:69
+#, c-format
+msgid "Password required for %s"
+msgstr "%s 需要的密碼 "
+
+#: libgitg/gitg-date.vala:346
+msgid "Now"
+msgstr "現在"
+
+#: libgitg/gitg-date.vala:350
+#, c-format
+msgid "A minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d 分鐘前"
+
+#: libgitg/gitg-date.vala:355
+msgid "Half an hour ago"
+msgstr "半小時前"
+
+#: libgitg/gitg-date.vala:360
+#, c-format
+msgid "An hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d 小時前"
+
+#: libgitg/gitg-date.vala:365
+#, c-format
+msgid "A day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d 天前"
+
+#. 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
+msgid "%b %e, %H:%M"
+msgstr "%b%e日，%H:%M"
+
+#. 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
+msgid "%b %e, %I:%M %p"
+msgstr "%b%e日，%p %I:%M"
+
+#. 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
+msgid "%b %e %Y, %H:%M"
+msgstr "%Y年%b%e日，%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
+msgid "%b %e %Y, %I:%M %p"
+msgstr "%Y年%b%e日，%p %I:%M"
+
+#. Translators: this label is displayed below the image diff, %s
+#. is substituted with the size of the image
+#: libgitg/gitg-diff-image-side-by-side.vala:39
+#, c-format
+msgid "before (%s)"
+msgstr "先於 (%s)"
+
+#. Translators: this label is displayed below the image diff, %s
+#. is substituted with the size of the image
+#: libgitg/gitg-diff-image-side-by-side.vala:45
+#, c-format
+msgid "removed (%s)"
+msgstr "已移除 (%s)"
+
+#. Translators: this label is displayed below the image diff, %s
+#. is substituted with the size of the image
+#: libgitg/gitg-diff-image-side-by-side.vala:67
+#, c-format
+msgid "after (%s)"
+msgstr "晚於 (%s)"
+
+#. Translators: this label is displayed below the image diff, %s
+#. is substituted with the size of the image
+#: libgitg/gitg-diff-image-side-by-side.vala:73
+#, c-format
+msgid "added (%s)"
+msgstr "已新增 (%s)"
+
+#: libgitg/gitg-diff-view-commit-details.vala:144
+msgid "Collapse all"
+msgstr "全部收摺"
+
+#: libgitg/gitg-diff-view-commit-details.vala:148
+#: libgitg/resources/ui/gitg-diff-view-commit-details.ui:211
+msgid "Expand all"
+msgstr "全部展開"
+
+#: libgitg/gitg-diff-view-commit-details.vala:203
+#, c-format
+msgid "Committed by %s"
+msgstr "由 %s 提交"
+
+#: libgitg/gitg-diff-view-file.vala:177
+msgid "_Open file"
+msgstr "開啟檔案(_O)"
+
+#: libgitg/gitg-diff-view-file.vala:209
+msgid "Open containing _folder"
+msgstr "開啟包含的資料夾(_F)"
+
+#: libgitg/gitg-diff-view-file.vala:229
+msgid "_Copy file path"
+msgstr "複製檔案路徑(_C)"
+
+#. Translators: this is used to construct: "at <directory>", to indicate where the repository is at.
+#: libgitg/gitg-repository-list-box.vala:153
+#, c-format
+msgid "at %s"
+msgstr "在 %s"
+
+#. Translators: this is used to construct: "<branch-name> at <directory>"
+#: libgitg/gitg-repository-list-box.vala:162
+#, c-format
+msgid "%s at %s"
+msgstr "%s 在 %s"
+
+#: libgitg/gitg-repository-list-box.vala:545
+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"
+
+#: libgitg/resources/ui/gitg-authentication-dialog.ui:18
 msgid "_Authenticate"
 msgstr "æ ¸å°(_A)"
 
-#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:3
+#: libgitg/resources/ui/gitg-authentication-dialog.ui:76
 msgid ""
 "The previous attempt to authenticate has failed, please provide your user "
 "name and password and try again."
 msgstr "å‰ä¸€æ¬¡æ ¸å°çš„å˜—è©¦å¤±æ•—äº†ï¼Œè«‹æä¾›æ‚¨çš„ä½¿ç”¨è€…åç¨±èˆ‡å¯†ç¢¼å¾Œå†è©¦ä¸€æ¬¡ã€‚"
 
-#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:4
+#: libgitg/resources/ui/gitg-authentication-dialog.ui:95
 msgid "_Username:"
 msgstr "使用者名稱(_U):"
 
-#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:5
+#: libgitg/resources/ui/gitg-authentication-dialog.ui:109
 msgid "_Password:"
 msgstr "密碼(_P):"
 
-#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:6
+#: libgitg/resources/ui/gitg-authentication-dialog.ui:154
 msgid "Forget password _immediately"
 msgstr "立刻忘記密碼(_I)"
 
-#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:7
+#: libgitg/resources/ui/gitg-authentication-dialog.ui:171
 msgid "Remember password until you _logout"
 msgstr "記憶密碼到登出之前(_L)"
 
-#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:8
+#: libgitg/resources/ui/gitg-authentication-dialog.ui:189
 msgid "Remember _forever"
 msgstr "æ°¸é è¨˜ä½å¯†ç¢¼(_F)"
 
-#: ../libgitg/resources/ui/gitg-diff-view-commit-details.ui.h:1
+#: libgitg/resources/ui/gitg-diff-view-commit-details.ui:151
 msgid "Parents"
 msgstr "çˆ¶é …"
 
-#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-binary.ui.h:1
+#: libgitg/resources/ui/gitg-diff-view-file-renderer-binary.ui:10
 msgid "Unable to display changes for binary file"
 msgstr "無法顯示二進位檔案的變更"
 
-#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:1
+#: libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui:35
 msgid "Side by side"
 msgstr "一起"
 
-#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:2
+#: libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui:62
 msgid "Slider"
 msgstr "滑動鈕"
 
-#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:3
+#: libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui:89
 msgid "Overlay"
 msgstr "覆疊"
 
-#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:4
+#: libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui:107
 msgid "Difference"
 msgstr "差異"
 
-#: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:1
+#: libgitg/resources/ui/gitg-diff-view-options-spacing.ui:20
 msgid "Tab width:"
 msgstr "Tab 字元寬度："
 
-#: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:2
+#: libgitg/resources/ui/gitg-diff-view-options-spacing.ui:44
 msgid "Wrap lines:"
 msgstr "換列："
 
-#: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:3
+#: libgitg/resources/ui/gitg-diff-view-options-spacing.ui:67
 msgid "Ignore whitespace:"
 msgstr "忽略空白字元："
 
-#: ../libgitg/resources/ui/gitg-diff-view-options.ui.h:1
+#: libgitg/resources/ui/gitg-diff-view-options.ui:31
 msgid "Context:"
 msgstr "脈絡："
 
-#: ../libgitg/resources/ui/gitg-diff-view-options.ui.h:2
+#: libgitg/resources/ui/gitg-diff-view-options.ui:63
 msgid "Spacing"
 msgstr "é–“éš”"
 
-#: ../libgitg/resources/ui/gitg-repository-list-box-row.ui.h:1
+#: libgitg/resources/ui/gitg-repository-list-box-row.ui:37
 msgid ""
 "Remove the repository from the list (does not delete the repository from "
 "disk)"
-msgstr "從清單中移除倉儲 (不會將倉儲自硬碟上刪除)"
+msgstr "從清單中移除版本庫 (不會將版本庫自硬碟上刪除)"
+
+#: plugins/diff/gitg-diff.vala:120
+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 "在選取提交的樹狀圖中顯示檔案"
 
 #~ msgid "_Help"
 #~ msgstr "求助(_H)"