[gitg/gnome-3-18] Updated Chinese (Taiwan) translation

From: Damned-Lies <translations src gnome org>
To: commits-list gnome org
Cc:
Subject: [gitg/gnome-3-18] Updated Chinese (Taiwan) translation
Date: Tue, 25 Aug 2015 22:46:24 +0000 (UTC)
commit aef733ac2dbbd71f1ba57c68ad1df96d264fb4af
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Tue Aug 25 22:46:19 2015 +0000

    Updated Chinese (Taiwan) translation

 po/zh_TW.po |  922 +++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 683 insertions(+), 239 deletions(-)
---
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8b7f34b..038372b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,18 +8,18 @@ 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: 2015-08-25 12:56+0800\n"
+"PO-Revision-Date: 2015-08-25 12:57+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.4\n"
 
-#: ../data/gitg.desktop.in.in.h:1 ../gitg/gitg.vala:54
+#: ../data/gitg.desktop.in.in.h:1 ../gitg/gitg.vala:58
 #: ../gitg/resources/ui/gitg-window.ui.h:1
 msgid "gitg"
 msgstr "gitg"
@@ -55,10 +55,29 @@ msgid "The activity which gitg activates by default when first launched."
 msgstr "當第一次執行時 gitg 預設使用的活動。"
 
 #: ../data/org.gnome.gitg.gschema.xml.in.in.h:7
+#, fuzzy
+msgid "Use Gravatar"
+msgstr "將它視為(_U)"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:8
+msgid "Enable the use of gravatar to display user avatars."
+msgstr ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:9
+#, fuzzy
+msgid "Enable Monitoring"
+msgstr "啟用(_E)"
+
+#: ../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 ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:11
 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:12
 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 +85,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:13
 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 +96,79 @@ msgstr ""
 "境下提供較清靜的歷史檢視。請查看 collapse-inactive-lanes 以控制何時應該收疊窗"
 "格。"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:10
-#, fuzzy
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:14
 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:15
 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:16
 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:17
 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:18
 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:19
 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:20
 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:21
 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:22
 msgid "Mainline Head"
 msgstr "主線 Head"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:19
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:23
 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:24
+#, fuzzy
+msgid "Default selection of the history activity"
+msgstr "目前的選擇區域（預設為文件）"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:25
+msgid ""
+"Setting that determines the default selection on startup of the history "
+"activity."
+msgstr ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:26
+#, fuzzy
+msgid "Reference Sort Order"
+msgstr "快捷鍵參照表(_Q)"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:27
+msgid "The order by which references in the history sidebar should be sorted."
+msgstr ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:28
 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:29
 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 +176,107 @@ msgstr ""
 "在提交訊息檢視中顯示右邊界。這可以用來輕鬆的看出在特定欄中的何處中斷提交訊"
 "息。"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:22
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:30
 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:31
 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:32
 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:33
 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:34
 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:35
 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:36
 msgid "Enable Spell Checking"
 msgstr "啟用拼字檢查"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:29
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:37
 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:38
 msgid "Spell Checking Language"
 msgstr "拼字檢查語言"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:31
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:39
 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:40
 msgid "Ignore Whitespace Changes"
 msgstr "忽略空白字元的變更"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:33
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:41
 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:42
 msgid "Show Changes Inline"
 msgstr "顯示行內變更"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:35
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:43
 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:44
+#, fuzzy
+msgid "Wrap"
+msgstr "自動換列模式"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:45
+#, fuzzy
+msgid "Wrap lines."
+msgstr "換列(_W)"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:46
 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:47
 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:48
 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:49
 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:50
 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,165 +284,147 @@ msgstr ""
 "設定提交區域中要顯示 diff 以 stage 或 unstage 時，應該要顯示多少列前後文的設"
 "定值。"
 
-#: ../gitg/commit/gitg-commit-dialog.vala:283
+#: ../gitg/commit/gitg-commit-dialog.vala:298
 #, 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:498
+#: ../gitg/commit/gitg-commit.vala:1064
+msgid "There are no changes to be committed"
+msgstr "沒有要提交的改變"
+
+#: ../gitg/commit/gitg-commit-dialog.vala:499
+#: ../gitg/commit/gitg-commit.vala:1065
+msgid "Use amend to change the commit message of the previous commit"
+msgstr "使用修訂以變更前次提交的提交訊息"
+
+#: ../gitg/commit/gitg-commit.vala:104
+msgctxt "Activity"
 msgid "Commit"
-msgstr "提交"
+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:222
 #, 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:238
 #, 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:252
 #, 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:265
 #, c-format
 msgid "Failed to stage the submodule `%s'"
 msgstr "無法 stage 子模組「%s」"
 
-#: ../gitg/commit/gitg-commit.vala:253
+#: ../gitg/commit/gitg-commit.vala:287
 #, 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:301
 #, c-format
 msgid "Failed to stage the file `%s'"
 msgstr "無法 stage 檔案「%s」"
 
-#: ../gitg/commit/gitg-commit.vala:536
+#: ../gitg/commit/gitg-commit.vala:572
 msgid "_Unstage selection"
 msgstr "_Unstage 選擇"
 
-#: ../gitg/commit/gitg-commit.vala:601
+#: ../gitg/commit/gitg-commit.vala:637
 #, 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:638
 #, c-format
 msgid "Failed to unstage the file `%s'"
 msgstr "無法 unstage 檔案「%s」"
 
-#: ../gitg/commit/gitg-commit.vala:609
+#: ../gitg/commit/gitg-commit.vala:645
 #, 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:646
 #, 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:850
 msgid "Staged"
 msgstr "已 stage"
 
-#: ../gitg/commit/gitg-commit.vala:813
+#: ../gitg/commit/gitg-commit.vala:858
 msgid "No staged files"
 msgstr "未 stage 的檔案"
 
 #. Populate unstaged items
-#: ../gitg/commit/gitg-commit.vala:829
+#: ../gitg/commit/gitg-commit.vala:881
 msgid "Unstaged"
 msgstr "未 stage"
 
-#: ../gitg/commit/gitg-commit.vala:837
+#: ../gitg/commit/gitg-commit.vala:889
 msgid "No unstaged files"
 msgstr "未 stage 檔案"
 
 #. Populate untracked items
-#: ../gitg/commit/gitg-commit.vala:853
+#: ../gitg/commit/gitg-commit.vala:912
 msgid "Untracked"
 msgstr "未追蹤"
 
-#: ../gitg/commit/gitg-commit.vala:857
+#: ../gitg/commit/gitg-commit.vala:916
 msgid "No untracked files"
 msgstr "無未追蹤的檔案"
 
-#: ../gitg/commit/gitg-commit.vala:875
+#: ../gitg/commit/gitg-commit.vala:941
 msgid "Submodule"
 msgstr "子模組"
 
-#: ../gitg/commit/gitg-commit.vala:879
-#, fuzzy
+#: ../gitg/commit/gitg-commit.vala:945
 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 "使用修訂以變更前次提交的提交訊息"
-
-#: ../gitg/commit/gitg-commit.vala:1018
+#: ../gitg/commit/gitg-commit.vala:1092
 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:1108
 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:1311 ../gitg/commit/gitg-commit.vala:1461
 msgid "Discard changes"
 msgstr "放棄變更"
 
-#: ../gitg/commit/gitg-commit.vala:1269
+#: ../gitg/commit/gitg-commit.vala:1312
 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:1321 ../gitg/commit/gitg-commit.vala:1487
+#: ../gitg/commit/gitg-commit.vala:1602
+#: ../gitg/gitg-commit-action-create-patch.vala:145
+#: ../gitg/gitg-dash-view.vala:467 ../gitg/gitg-dash-view.vala:598
+#: ../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
@@ -404,56 +433,123 @@ msgstr "確定要永久放棄選取的變更嗎？"
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../gitg/commit/gitg-commit.vala:1279 ../gitg/commit/gitg-commit.vala:1442
+#: ../gitg/commit/gitg-commit.vala:1322 ../gitg/commit/gitg-commit.vala:1488
 msgid "Discard"
 msgstr "放棄"
 
-#: ../gitg/commit/gitg-commit.vala:1307
+#: ../gitg/commit/gitg-commit.vala:1351
 msgid "Failed to discard selection"
 msgstr "無法放棄選取項目"
 
-#: ../gitg/commit/gitg-commit.vala:1336
+#: ../gitg/commit/gitg-commit.vala:1381
 msgid "Failed to stage selection"
 msgstr "無法 stage 選擇"
 
-#: ../gitg/commit/gitg-commit.vala:1340
+#: ../gitg/commit/gitg-commit.vala:1385
 msgid "Failed to unstage selection"
 msgstr "無法 unstage 選擇"
 
-#: ../gitg/commit/gitg-commit.vala:1399
+#: ../gitg/commit/gitg-commit.vala:1445
 msgid "Failed to discard changes"
 msgstr "無法放棄變更"
 
-#: ../gitg/commit/gitg-commit.vala:1420
+#: ../gitg/commit/gitg-commit.vala:1466
 #, 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:1477
 #, 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:1560
+#, fuzzy
+msgid "Failed to delete files"
+msgstr "刪除連絡人失敗"
+
+#: ../gitg/commit/gitg-commit.vala:1576
+msgid "Delete file"
+msgid_plural "Delete files"
+msgstr[0] "刪除檔案"
+
+#: ../gitg/commit/gitg-commit.vala:1581
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the file `%s'?"
+msgstr "確定要永遠刪除“%s”嗎？"
+
+#: ../gitg/commit/gitg-commit.vala:1592
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the files %s and `%s'?"
+msgstr "確定要永遠刪除“%s”嗎？"
+
+#: ../gitg/commit/gitg-commit.vala:1637
 msgid "_Stage changes"
 msgstr "_Stage 變更"
 
-#: ../gitg/commit/gitg-commit.vala:1485
+#: ../gitg/commit/gitg-commit.vala:1647
 msgid "_Unstage changes"
 msgstr "_Unstage 變更"
 
-#: ../gitg/commit/gitg-commit.vala:1495
+#: ../gitg/commit/gitg-commit.vala:1657
 msgid "_Discard changes"
 msgstr "放棄變更(_D)"
 
-#: ../gitg/commit/gitg-commit.vala:1518
+#: ../gitg/commit/gitg-commit.vala:1667
+msgid "D_elete file"
+msgid_plural "D_elete files"
+msgstr[0] "刪除檔案(_E)"
+
+#: ../gitg/commit/gitg-commit.vala:1690
 msgid "_Edit file"
 msgstr "編輯檔案(_E)"
 
+#: ../gitg/gitg-action-support.vala:93
+#, fuzzy, c-format
+msgid "Failed to stash changes: %s"
+msgstr "正在儲存資料夾「%s」的變更"
+
+#: ../gitg/gitg-action-support.vala:128
+#, fuzzy
+msgid "Unstaged changes"
+msgstr "放棄變更(_D)"
+
+#: ../gitg/gitg-action-support.vala:129
+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:131 ../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:132
+#, fuzzy
+msgid "Stash changes"
+msgstr "儲存變更(_S)"
+
+#: ../gitg/gitg-action-support.vala:136 ../gitg/gitg-ref-action-merge.vala:199
+#, fuzzy
+msgid "Merge failed with conflicts"
+msgstr "合併(_M)"
+
+#: ../gitg/gitg-action-support.vala:163
+msgid "Failed with conflicts"
+msgstr ""
+
+#: ../gitg/gitg-action-support.vala:179
+#, fuzzy, c-format
+msgid "Failed to checkout conflicts: %s"
+msgstr "行事曆 '%s' 中的約會和這個會議相衝突"
+
 #: ../gitg/gitg-application.vala:56
 msgid "Show the application's version"
 msgstr "顯示應用程式的版本"
@@ -474,67 +570,81 @@ msgstr "不要嘗試從目前工作目錄載入倉儲"
 msgid "- Git repository viewer"
 msgstr "- Git 倉儲檢視器"
 
-#: ../gitg/gitg-application.vala:209
+#: ../gitg/gitg-application.vala:222
 msgid "gitg is a Git repository viewer for gtk+/GNOME"
 msgstr "gitg 是為 gtk+/GNOME 設計的 Git 倉儲檢視器"
 
-#: ../gitg/gitg-application.vala:218
+#: ../gitg/gitg-application.vala:231
 msgid "translator-credits"
 msgstr "Cheng-Chia Tseng <pswo10680 gmail com>, 2013"
 
-#: ../gitg/gitg-application.vala:221
+#: ../gitg/gitg-application.vala:234
 msgid "gitg homepage"
 msgstr "gitg 首頁"
 
-#: ../gitg/gitg-author-details-dialog.vala:67
-msgid "Unable to open the .gitconfig file."
-msgstr "無法開啟 .gitconfig 檔。"
+#. 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 ""
 
-#: ../gitg/gitg-author-details-dialog.vala:148
+#. Translators: %s is the repository name
+#: ../gitg/gitg-author-details-dialog.vala:108
+#, c-format
+msgid "Override global details for repository '%s':"
+msgstr ""
+
+#: ../gitg/gitg-author-details-dialog.vala:220
 msgid "Failed to set Git user config."
-msgstr "無法設定 Git 使用者組態。"
+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-create-branch.vala:48
-#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:1
-msgid "Create Branch"
-msgstr "建立分支"
+#, fuzzy
+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 "建立修補檔"
+#, fuzzy
+msgid "Create patch"
+msgstr "_Patch/diff"
 
 #: ../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"
-msgstr "建立標籤"
+#, fuzzy
+msgid "Create tag"
+msgstr "無效的參數給 (user-tag)"
 
 #: ../gitg/gitg-commit-action-create-tag.vala:53
 msgid "Create a new tag at the selected commit"
@@ -552,10 +662,107 @@ msgstr "搜尋標籤失敗"
 msgid "Provide a message to create an annotated tag"
 msgstr "提供訊息以建立有注釋的標籤"
 
-#: ../gitg/gitg-dash-view.vala:148
+#: ../gitg/gitg-dash-view.vala:190
 msgid "_Delete"
 msgstr "刪除(_D)"
 
+#. Translators: the two %s will be replaced to create a link to perform the scanning action.
+#: ../gitg/gitg-dash-view.vala:247
+#, c-format
+msgid "We can also %sscan your home directory%s for git repositories."
+msgstr ""
+
+#. Translators: the two %s will be used to create a link to the author dialog.
+#: ../gitg/gitg-dash-view.vala:250
+#, c-format
+msgid "In the mean time, you may want to %sset up your git profile%s."
+msgstr ""
+
+#: ../gitg/gitg-dash-view.vala:395
+#, fuzzy
+msgid "Failed to clone repository"
+msgstr "倉庫已離線"
+
+#: ../gitg/gitg-dash-view.vala:443
+#, fuzzy
+msgid "Failed to add repository"
+msgstr "資料庫離線"
+
+#: ../gitg/gitg-dash-view.vala:459
+#, fuzzy
+msgid "Create new repository"
+msgstr "建立新資料夾"
+
+#. Translators: %s is a file name
+#: ../gitg/gitg-dash-view.vala:462
+#, 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 ""
+
+#: ../gitg/gitg-dash-view.vala:468
+#, fuzzy
+msgid "Create repository"
+msgstr "資料庫離線"
+
+#: ../gitg/gitg-dash-view.vala:484
+#, fuzzy
+msgid "Failed to create repository"
+msgstr "無法建立 GdkPixbufLoader 物件。"
+
+#: ../gitg/gitg-dash-view.vala:554
+#, fuzzy, c-format
+msgid "Scanning for repositories in %s"
+msgstr "掃描「%s」內的資料夾"
+
+#: ../gitg/gitg-dash-view.vala:595
+#, fuzzy
+msgid "Add Repository"
+msgstr "資料庫離線"
+
+#: ../gitg/gitg-dash-view.vala:599
+msgid "_Add"
+msgstr "加入(_A)"
+
+#: ../gitg/gitg-dash-view.vala:601
+msgid "_Scan for all git repositories from this directory"
+msgstr ""
+
+#: ../gitg/gitg-ref-action-checkout.vala:48
+#: ../gitg/gitg-ref-action-merge.vala:195
+msgid "Checkout"
+msgstr ""
+
+#: ../gitg/gitg-ref-action-checkout.vala:53
+#, fuzzy
+msgid "Checkout the selected reference"
+msgstr "快捷鍵參照表(_Q)"
+
+#: ../gitg/gitg-ref-action-checkout.vala:72
+#, fuzzy, c-format
+msgid "Checkout %s"
+msgstr "%s (%s)"
+
+#: ../gitg/gitg-ref-action-checkout.vala:88
+#, fuzzy, c-format
+msgid "Failed to lookup commit: %s"
+msgstr "查詢主機「%s」失敗：%s"
+
+#: ../gitg/gitg-ref-action-checkout.vala:101
+#, fuzzy, c-format
+msgid "Failed to checkout branch: %s"
+msgstr "%s 編譯失敗：%s"
+
+#: ../gitg/gitg-ref-action-checkout.vala:111
+#, fuzzy, c-format
+msgid "Failed to update HEAD: %s"
+msgstr "無法在行事曆「{0}」更新事件"
+
+#: ../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"
 msgstr "複製名稱"
@@ -565,7 +772,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 +810,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 +844,129 @@ 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
+#, fuzzy, c-format
+msgid "Merge into %s"
+msgstr "合併(_M)"
+
+#. TODO
+#: ../gitg/gitg-ref-action-merge.vala:69
+#, c-format
+msgid "Merge another branch into branch %s"
+msgstr ""
+
+#: ../gitg/gitg-ref-action-merge.vala:106
+#, fuzzy, c-format
+msgid "Failed to merge commits: %s"
+msgstr "%s 編譯失敗：%s"
+
+#: ../gitg/gitg-ref-action-merge.vala:175
+#: ../gitg/gitg-ref-action-merge.vala:191
+#, fuzzy
+msgid "Merge has conflicts"
+msgstr "合併(_M)"
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../gitg/gitg-ref-action-merge.vala:210
+msgid "Finished merge with conflicts in working directory"
+msgstr ""
+
+#: ../gitg/gitg-ref-action-merge.vala:222
+#, fuzzy, c-format
+msgid "Merge %s into %s"
+msgstr "合併(_M)"
+
+#: ../gitg/gitg-ref-action-merge.vala:231
+#, fuzzy, c-format
+msgid "Failed to lookup our commit: %s"
+msgstr "查詢主機「%s」失敗：%s"
+
+#: ../gitg/gitg-ref-action-merge.vala:241
+#, fuzzy, c-format
+msgid "Failed to lookup their commit: %s"
+msgstr "查詢主機「%s」失敗：%s"
+
+#: ../gitg/gitg-ref-action-merge.vala:262
+#, fuzzy
+msgid "Failed to obtain author details"
+msgstr "無法獲得「%s」的存取記號："
+
+#: ../gitg/gitg-ref-action-merge.vala:298
+#, fuzzy, c-format
+msgid "Failed to obtain HEAD tree: %s"
+msgstr "無法獲得「%s」的存取記號："
+
+#: ../gitg/gitg-ref-action-merge.vala:316
+#, fuzzy, c-format
+msgid "Failed to create commit: %s"
+msgstr "無法建立目錄“%s”。"
+
+#: ../gitg/gitg-ref-action-merge.vala:338
+#, fuzzy, c-format
+msgid "Failed to checkout index: %s"
+msgstr "%s 編譯失敗：%s"
+
+#: ../gitg/gitg-ref-action-merge.vala:343
+#, fuzzy, c-format
+msgid "Successfully merged %s into %s"
+msgstr "這次的查詢並未完全成功。%s"
+
+#: ../gitg/gitg-ref-action-merge.vala:383
+#, fuzzy, c-format
+msgid "Merge %s into branch %s"
+msgstr "%s (%s)"
+
+#: ../gitg/gitg-ref-action-merge.vala:545
+#: ../gitg/history/gitg-history-refs-list.vala:1139
+msgid "Tags"
+msgstr "標籤"
+
 #: ../gitg/gitg-ref-action-rename.vala:48
 msgid "Rename"
 msgstr "重新命名"
@@ -693,11 +984,11 @@ 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
+#: ../gitg/gitg.vala:68
 msgid ""
 "We are terribly sorry, but gitg requires libgit2 (a library on which gitg "
 "depends) to be compiled with threading support.\n"
@@ -715,54 +1006,103 @@ msgstr ""
 "\n"
 "否則，請在您的發行版本的錯誤回報系統中回報，指出 libgit2 未提供執行緒支援。"
 
-#: ../gitg/gitg-window.vala:403
+#: ../gitg/gitg-window.vala:410
 msgid "Projects"
 msgstr "專案"
 
-#: ../gitg/gitg-window.vala:466
-msgid "Open Repository"
-msgstr "開啟倉儲"
-
-#: ../gitg/gitg-window.vala:469
-msgid "_Open"
-msgstr "開啟(_O)"
-
-#: ../gitg/gitg-window.vala:764
+#: ../gitg/gitg-window.vala:826
 #, c-format
 msgid "'%s' is not a Git repository."
 msgstr "「%s」不是 Git 倉儲。"
 
-#: ../gitg/history/gitg-history-refs-list.vala:136
+#: ../gitg/gitg-window.vala:975
+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:979
+msgid ""
+"Your user name is not configured yet. Please go to the user configuration "
+"and provide your name."
+msgstr "您的使用者名稱尚未設定。請至使用者設定並提供您的姓名。"
+
+#: ../gitg/gitg-window.vala:983
+msgid ""
+"Your email is not configured yet. Please go to the user configuration and "
+"provide your email."
+msgstr "您的電子郵件尚未設定。請至使用者設定並提供您的電子郵件。"
+
+#: ../gitg/gitg-window.vala:986
+#, fuzzy
+msgid "Missing author details"
+msgstr "作者："
+
+#: ../gitg/gitg-remote-notification.vala:90
+#: ../gitg/gitg-simple-notification.vala:99
+#: ../gitg/resources/ui/gitg-window.ui.h:6
+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
+#, fuzzy
+msgid "REFERENCE"
+msgstr "快捷鍵參照表(_Q)"
+
+#: ../gitg/history/gitg-history-refs-list.vala:170
+#: ../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:1137
 msgid "Branches"
 msgstr "分支"
 
-#: ../gitg/history/gitg-history-refs-list.vala:836
+#: ../gitg/history/gitg-history-refs-list.vala:1138
 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:302
+#: ../gitg/preferences/gitg-preferences-history.vala:210
 #: ../gitg/resources/ui/gitg-preferences-interface.ui.h:3
 msgid "History"
 msgstr "歷史"
 
-#: ../gitg/history/gitg-history.vala:251
+#: ../gitg/history/gitg-history.vala:307
 msgid "Examine the history of the repository"
 msgstr "檢驗倉儲的歷史"
 
-#: ../gitg/history/gitg-history.vala:602
+#: ../gitg/history/gitg-history.vala:787
 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:112
 msgid "Interface"
 msgstr "介面"
 
@@ -820,50 +1160,70 @@ 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
+#: ../libgitg/gitg-diff-view.vala:282
 msgid "stage"
 msgstr "stage"
 
-#: ../libgitg/gitg-diff-view.vala:250
+#: ../libgitg/gitg-diff-view.vala:283
 msgid "unstage"
 msgstr "unstage"
 
-#: ../libgitg/gitg-diff-view.vala:251
+#: ../libgitg/gitg-diff-view.vala:284
 msgid "Loading diff…"
 msgstr "正載入 diff…"
 
-#: ../libgitg/gitg-diff-view.vala:252
+#: ../libgitg/gitg-diff-view.vala:285
 msgid "Notes:"
 msgstr "備註："
 
-#: ../libgitg/gitg-diff-view.vala:253
+#: ../libgitg/gitg-diff-view.vala:286
 msgid "Parents:"
 msgstr "父項："
 
-#: ../libgitg/gitg-diff-view.vala:254
+#: ../libgitg/gitg-diff-view.vala:287
 msgid "Diff against:"
 msgstr "比對差異："
 
-#: ../libgitg/gitg-diff-view.vala:255
+#: ../libgitg/gitg-diff-view.vala:288
 msgid "Committed by:"
 msgstr "提交者："
 
-#: ../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-diff-view.vala:289
+#, fuzzy
+msgid "Expand all"
+msgstr "展開所有的資料夾"
+
+#: ../libgitg/gitg-diff-view.vala:290
+#, fuzzy
+msgid "Collapse all"
+msgstr "收摺所有的資料夾"
+
+#. Translators: this is used to construct: "at <directory>", to indicate where the repository is at.
+#: ../libgitg/gitg-repository-list-box.vala:175
+#, fuzzy, c-format
+msgid "at %s"
+msgstr "%s, %s, %s, %s, %s, %s, %s"
+
+#. Translators: this is used to construct: "<branch-name> at <directory>"
+#: ../libgitg/gitg-repository-list-box.vala:184
+#, fuzzy, c-format
+msgid "%s at %s"
+msgstr "簽署者： %s<%s>： %s\n"
+
+#: ../libgitg/gitg-repository-list-box.vala:423
+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:120
 msgid "Diff"
 msgstr "Diff"
 
-#: ../plugins/diff/gitg-diff.vala:111
+#: ../plugins/diff/gitg-diff.vala:125
 msgid "Show the changes introduced by the selected commit"
 msgstr "顯示選取的提交所造成的變更"
 
@@ -875,37 +1235,24 @@ 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 "輸入詳細資料以設為所有倉儲的預設值："
-
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:6
-#, no-c-format
-msgid "Enter details for repository '%s':"
-msgstr "請輸入倉儲「%s」的詳細資料："
+msgid "Default details used for all repositories"
+msgstr ""
 
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:7
-msgid "E-mail: "
-msgstr "電子郵件： "
+#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:5
+#, fuzzy
+msgid "E-mail:"
+msgstr "電子郵件(_M)"
 
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:8
-msgid "Name: "
+#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:6
+#, fuzzy
+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 +1277,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,7 +1308,6 @@ 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."
@@ -991,6 +1342,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 +1355,55 @@ 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-dash-view.ui.h:2
+#, fuzzy
+msgid "_Add repository"
+msgstr "資料庫離線"
+
+#: ../gitg/resources/ui/gitg-dash-view.ui.h:3
+#, fuzzy
+msgid "_Clone repository"
+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 "_Help"
 msgstr "求助(_H)"
 
-#: ../gitg/resources/ui/gitg-menus.ui.h:4
+#: ../gitg/resources/ui/gitg-menus.ui.h:5
 msgid "_About"
 msgstr "關於(_A)"
 
-#: ../gitg/resources/ui/gitg-menus.ui.h:5
+#: ../gitg/resources/ui/gitg-menus.ui.h:6
 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 +1428,51 @@ msgid "Commit Message"
 msgstr "提交訊息"
 
 #: ../gitg/resources/ui/gitg-preferences-history.ui.h:1
+#, fuzzy
+msgid "Default selection"
+msgstr "目前的選擇區域（預設為文件）"
+
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:2
+#, fuzzy
+msgid "Current branch"
+msgstr "目前的資料夾"
+
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:3
+#, fuzzy
+msgid "All branches"
+msgstr "這還不是全部"
+
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:5
+#, fuzzy
+msgid "References"
+msgstr ""
+"當郵件不包含 In-Reply-To 或 References 檔頭時，是否按照主旨放回郵件群組。"
+
+#: ../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 "Commits"
 msgstr "提交"
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:2
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:8
 msgid "Collapse inactive lanes"
 msgstr "收疊未使用的窗格"
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:3
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:9
 msgid "Early"
 msgstr "快"
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:4
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:10
 msgid "Late"
 msgstr "慢"
 
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:5
-#, fuzzy
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:11
 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:12
 msgid "Preserve mainline for currently checked out branch"
 msgstr "保留目前檢出分支的主線"
 
@@ -1094,6 +1484,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,6 +1496,18 @@ 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 ""
+
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:9
+msgid "Monitoring"
+msgstr ""
+
 #: ../gitg/resources/ui/gitg-preferences.ui.h:1
 msgid "Preferences"
 msgstr "偏好設定"
@@ -1127,14 +1533,19 @@ msgid "Show changes inline"
 msgstr "顯示行內變更"
 
 #: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:3
+#, fuzzy
+msgid "Wrap lines"
+msgstr "換列(_W)"
+
+#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:4
 msgid "Developer tools"
 msgstr "開發者工具"
 
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:4
+#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:5
 msgid "Tab width"
 msgstr "Tab 字元寬度"
 
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:5
+#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:6
 msgid "Context"
 msgstr "脈絡"
 
@@ -1178,6 +1589,42 @@ msgstr "從清單中移除倉儲 (不會將倉儲自硬碟上刪除)"
 msgid "column"
 msgstr "欄"
 
+#~ msgid "Unable to open the .gitconfig file."
+#~ msgstr "無法開啟 .gitconfig 檔。"
+
+#~ msgid "Create Patch"
+#~ msgstr "建立修補檔"
+
+#~ msgid "Open Repository"
+#~ msgstr "開啟倉儲"
+
+#~ msgid "_Open"
+#~ msgstr "開啟(_O)"
+
+#~ msgid "Note: The Git config file '%s' does not exist."
+#~ msgstr "注意：Git 設定檔「%s」不存在。"
+
+#~ msgid "Enter details to set as default for all repositories:"
+#~ msgstr "輸入詳細資料以設為所有倉儲的預設值："
+
+#~ msgid "Enter details for repository '%s':"
+#~ msgstr "請輸入倉儲「%s」的詳細資料："
+
+#~ msgid "E-mail: "
+#~ msgstr "電子郵件： "
+
+#~ msgid "Name: "
+#~ msgstr "名稱："
+
+#~ msgid "Save"
+#~ msgstr "儲存"
+
+#~ msgid "_Open Repository…"
+#~ msgstr "開啟倉儲(_O)…"
+
+#~ msgid "_Clone Repository…"
+#~ msgstr "重製倉儲(_C)…"
+
 #, fuzzy
 #~ msgid "Show stash in history"
 #~ msgstr "在歷史中顯示 stash"
@@ -1189,6 +1636,3 @@ msgstr "欄"
 #, fuzzy
 #~ msgid "Show unstaged changes in history"
 #~ msgstr "在歷史中顯示未 stage 的變動"
-
-#~ msgid "_Save"
-#~ msgstr "儲存(_S)"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]