[gitg/gnome-3-30] Update Chinese (China) translation

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

commit a01d62a79e78f13ed179c59e99c04c61e69108b7
Author: Dz Chen <wsxy162 gmail com>
Date:   Tue Jun 23 23:52:09 2020 +0000

    Update Chinese (China) translation

 po/zh_CN.po | 1188 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 631 insertions(+), 557 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e0f7a842..a78dc2f9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,104 +1,150 @@
 # Chinese (China) translation for gitg.
-# Copyright (C) 2010 gitg's COPYRIGHT HOLDER
+# Copyright (C) 2010-2019 gitg's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gitg package.
 # lainme <lainme993 gmail com>, 2010.
 # Wylmer Wang <wantinghard gmail com>, 2014.
 # Boyuan Yang <073plan gmail com>, 2016.
 # Mingcong Bai <jeffbai aosc xyz>, 2017.
+# Dingzhong Chen <wsxy162 gmail com>, 2019.
 #
 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-06-22 15:48+0000\n"
-"PO-Revision-Date: 2017-03-25 15:44-0400\n"
-"Last-Translator: Jeff Bai <jeffbai aosc xyz>\n"
+"Project-Id-Version: gitg 3.30\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gitg/issues\n";
+"POT-Creation-Date: 2019-04-06 14:59+0000\n"
+"PO-Revision-Date: 2019-04-11 18:06+0800\n"
+"Last-Translator: Dingzhong Chen <wsxy162 gmail com>\n"
 "Language-Team: Chinese (China) <i18n-zh googlegroups com>\n"
 "Language: zh_CN\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.8.12\n"
+"X-Generator: Poedit 2.2.1\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
-msgid "gitg"
-msgstr "gitg"
+#: data/gitg.appdata.xml.in:8
+msgid ""
+"gitg is a graphical user interface for git. It aims at being a small, fast "
+"and convenient tool to visualize the history of git repositories. Besides "
+"visualization, gitg also provides several utilities to manage your "
+"repository and commit your work."
+msgstr ""
+"gitg 是个 git 的图形用户界面。它的目标是成为小型、快速方便的工具，可视化 git "
+"仓库的历史。除了可视化功能，gitg 也提供了多个实用工具来管理你的仓库以及提交你"
+"的工作。"
+
+#: data/gitg.appdata.xml.in:14
+msgid "Goals"
+msgstr "目标"
+
+#: data/gitg.appdata.xml.in:16
+msgid "Browse local git repositories"
+msgstr "浏览本地 git 仓库"
+
+#: data/gitg.appdata.xml.in:17
+msgid "Clone local and remote git repositories"
+msgstr "克隆本地和远程 git 仓库"
+
+#: data/gitg.appdata.xml.in:18
+msgid "Commit files"
+msgstr "提交文件"
+
+#: data/gitg.appdata.xml.in:19
+msgid "Retrieve patch from a commit"
+msgstr "从提交中提取补丁"
+
+#: data/gitg.appdata.xml.in:30
+msgid "Browse repository history"
+msgstr "浏览仓库历史"
+
+#: data/gitg.appdata.xml.in:34
+msgid "Staging area to compose your commit"
+msgstr "暂存区，用以撰写你的提交"
 
-#: ../data/gitg.desktop.in.in.h:2
+#: data/gitg.appdata.xml.in:38
+msgid "Commit staged changes"
+msgstr "提交暂存的变更"
+
+#: data/gitg.appdata.xml.in:42
+msgid "Overview of recently used repositories"
+msgstr "当前所用仓库的概览"
+
+#: data/gitg.appdata.xml.in:49
+msgid "The GNOME Project"
+msgstr "GNOME 项目"
+
+#: data/gitg.desktop.in:4
 msgid "Git repository browser"
 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 "建议克隆新版本库到的默认目录。"
 
-#: ../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 "主界面方向(横向或纵向)"
+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 "启用差异高亮"
 
-#: ../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 "设置是否启用差异视图语法高亮。"
 
-#: ../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'."
 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 +154,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 "显示储藏变更"
 
-#: ../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 "指示是否在历史记录中显示进度保存的项目的设置。"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:20
+#: data/org.gnome.gitg.gschema.xml.in:107
 msgid "Show Staged Changes"
 msgstr "显示暂存的变更"
 
-#: ../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 "指示是否在历史中显示对应当前已暂存变更的虚项（virtual item）的设置。"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:22
+#: data/org.gnome.gitg.gschema.xml.in:115
 msgid "Show Unstaged Changes"
 msgstr "显示未暂存的变更"
 
-#: ../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 "指示是否在历史中显示对应当前撤回的变更的虚项。"
 
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:24
+#: data/org.gnome.gitg.gschema.xml.in:123
 msgid "Mainline Head"
 msgstr "主线头指针"
 
-#: ../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 "历史活动的默认选择"
+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,21 +242,21 @@ 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."
@@ -218,407 +264,418 @@ 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 "使用耐心算法来显示差异"
+
+#: data/org.gnome.gitg.gschema.xml.in:214
+msgid "Setting to use patience algorithm to show diffs of a commit."
+msgstr "设置使用耐心（patience）算法来显示提交的差异。"
+
+#: 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 "设置显示提交间的不同时是否忽略空白变更。"
 
-#: ../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 "自动折行"
+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 "设置显示一个提交的变更时应该显示的上下文行数。"
 
-#: ../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 "设置显示提交的变更时，一个制表符(Tab)应该占用几个空格。"
+msgstr "设置显示提交的变更时，一个制表符（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."
 msgstr "设置显示已暂存和未暂存的不同时应该显示的上下文行数。"
 
-#: ../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 "请使用 amend （修补）更改上次提交的提交说明"
 
-#: ../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 "创建新的提交及管理暂存区"
 
-#: ../gitg/commit/gitg-commit.vala:193
+#: gitg/commit/gitg-commit.vala:193
 msgid "_Stage selection"
 msgstr "暂存选中项(_S)"
 
-#: ../gitg/commit/gitg-commit.vala:232
+#: gitg/commit/gitg-commit.vala:232
 #, c-format
 msgid "Failed to stage the removal of submodule `%s'"
 msgstr "暂存子模组“%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 "试图暂存时无法打开子模组“%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 "试图暂存时无法查找子模组“%s”的工作目录提交"
 
-#: ../gitg/commit/gitg-commit.vala:276
+#: gitg/commit/gitg-commit.vala:276
 #, c-format
 msgid "Failed to stage the submodule `%s'"
 msgstr "暂存子模组“%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 "暂存文件“%s”的移除操作失败"
 
-#: ../gitg/commit/gitg-commit.vala:312
+#: gitg/commit/gitg-commit.vala:312
 #, c-format
 msgid "Failed to stage the file `%s'"
 msgstr "暂存文件“%s”失败"
 
-#: ../gitg/commit/gitg-commit.vala:584
+#: gitg/commit/gitg-commit.vala:584
 msgid "_Unstage selection"
-msgstr "取消暂存选择内容(_U)"
+msgstr "取消暂存选中项(_U)"
 
-#: ../gitg/commit/gitg-commit.vala:650
+#: gitg/commit/gitg-commit.vala:650
 #, c-format
 msgid "Failed to unstage the removal of file `%s'"
 msgstr "取消暂存文件“%s”的移除操作失败"
 
-#: ../gitg/commit/gitg-commit.vala:651
+#: gitg/commit/gitg-commit.vala:651
 #, c-format
 msgid "Failed to unstage the file `%s'"
 msgstr "取消暂存文件“%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 "取消暂存子模组“%s”的移除操作失败"
 
-#: ../gitg/commit/gitg-commit.vala:659
+#: gitg/commit/gitg-commit.vala:659
 #, c-format
 msgid "Failed to unstage the submodule `%s'"
 msgstr "取消暂存子模组“%s”失败"
 
 #. Populate staged items
-#: ../gitg/commit/gitg-commit.vala:863
+#: gitg/commit/gitg-commit.vala:863
 msgid "Staged"
 msgstr "已暂存"
 
-#: ../gitg/commit/gitg-commit.vala:871
+#: gitg/commit/gitg-commit.vala:871
 msgid "No staged files"
 msgstr "无已暂存的文件"
 
 #. Populate unstaged items
-#: ../gitg/commit/gitg-commit.vala:894
+#: gitg/commit/gitg-commit.vala:894
 msgid "Unstaged"
 msgstr "未暂存"
 
-#: ../gitg/commit/gitg-commit.vala:902
+#: gitg/commit/gitg-commit.vala:902
 msgid "No unstaged files"
 msgstr "无未暂存的文件"
 
 #. 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' 的所有变更吗？"
+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' 的所有变更吗？"
+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 吗？"
+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 吗？"
+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 commit 的简写)"
+msgstr "以提交活动启动 gitg（即 --activity commit 的简写）"
 
-#: ../gitg/gitg-application.vala:65
+#: gitg/gitg-application.vala:66
 msgid "Do not try to load a repository from the current working directory"
 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 仓库查看器"
 
-#: ../gitg/gitg-application.vala:231
+#: gitg/gitg-application.vala:240
 msgid "translator-credits"
 msgstr ""
 "lainme <lainme993 gmail com>\n"
 "Wylmer Wang <wantinghard gmail com>\n"
 "Mingye Wang <arthur2e5 aosc xyz>\n"
-"Mandy Wang <wangmychn gmail com>"
+"Mandy Wang <wangmychn gmail com>\n"
+"Dingzhong Chen <wsxy162 gmail com>"
 
-#: ../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"
@@ -629,61 +686,60 @@ msgid ""
 "Otherwise, report a bug in your distributions' bug reporting system for "
 "providing libgit2 without threading support."
 msgstr ""
-"非常抱歉，gitg 需要带线程支持的 libgit2 编译库(gitg 的一个依赖库)。\n"
+"非常抱歉，gitg 需要带线程支持的 libgit2 编译库（gitg 的一个依赖库）。\n"
 "\n"
 "如果您是手动编译的 libgit2，请在配置 libgit2 时加上 -DTHREADSAFE:BOOL=ON。\n"
 "\n"
 "否则，请在您发行版的 BUG 提交系统中报告一条“libgit2 未带有线程支持”的 BUG。"
 
-#. 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 "请输入所有版本库的默认详细信息："
 
 #. 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”的全局详细信息："
 
-#: ../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 "不支持引入的 URI"
 
-#: ../gitg/gitg-commit-action-cherry-pick.vala:53
+#: gitg/gitg-commit-action-cherry-pick.vala:53
 msgid "Cherry pick onto"
-msgstr "拣选到…"
+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 "
@@ -693,7 +749,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 "
@@ -702,120 +758,119 @@ 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 版本库。"
 
 #. 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 "克隆仓库失败"
 
-#: ../gitg/gitg-dash-view.vala:420
+#: gitg/gitg-dash-view.vala:420
 msgid "Failed to add repository"
 msgstr "添加仓库失败"
 
-#: ../gitg/gitg-dash-view.vala:436
+#: gitg/gitg-dash-view.vala:436
 msgid "Create new repository"
 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 "
@@ -823,179 +878,177 @@ msgid ""
 msgstr ""
 "位置 <i>%s</i> 不像是个有效的 git 仓库。你要在这个位置新建一个 git 仓库吗？"
 
-#: ../gitg/gitg-dash-view.vala:445
+#: gitg/gitg-dash-view.vala:445
 msgid "Create repository"
 msgstr "创建仓库"
 
-#: ../gitg/gitg-dash-view.vala:461
+#: gitg/gitg-dash-view.vala:461
 msgid "Failed to create repository"
 msgstr "创建仓库失败"
 
-#: ../gitg/gitg-dash-view.vala:531
+#: gitg/gitg-dash-view.vala:531
 #, c-format
 msgid "Scanning for repositories in %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 "新的"
 
 # Translating as up-to-date
 #. 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 "
@@ -1004,7 +1057,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 "
@@ -1013,760 +1066,781 @@ 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’包含无效字符"
+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 "添加仓库"
 
-#: ../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)"
 
-#: ../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 仓库。"
 
-#: ../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 "查看仓库的历史"
 
-#: ../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 "%m-%d, %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 "%m-%d, %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 "%F, %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 "%F, %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 "差异"
-
-#: ../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 "所有版本库的默认详细信息"
 
-#: ../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 "克隆仓库"
 
-#: ../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 "暂存选择内容(_T)"
+msgstr "暂存选中项(_T)"
 
-#: ../gitg/resources/ui/gitg-commit-paned.ui.h:4
+#: gitg/resources/ui/gitg-commit-paned.ui:107
 msgid "D_iscard selection"
-msgstr "丢弃选择内容(_)"
+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 "已暂存："
 
-#: ../gitg/resources/ui/gitg-commit-submodule-diff-view.ui.h:3
+#: gitg/resources/ui/gitg-commit-submodule-diff-view.ui:86
 msgid "Unstaged:"
 msgstr "未暂存："
 
-#: ../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 "尚未添加任何仓库。若要开始，您可以添加现有的仓库或者克隆一个新的。"
 
-#: ../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 "显示标记（markup）"
 
-#: ../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 "默认选择"
+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 "差异"
+
+#: gitg/resources/ui/gitg-preferences-interface.ui:232
 msgid "Enable syntax highlighting of source code in diff views"
 msgstr "在查看差异时启用源代码语法高亮"
 
-#: ../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 "打开仓库"
 
-#: ../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 "显示最近使用的版本库列表"
 
-#: ../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 "克隆仓库"
 
-#: ../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 "添加仓库"
 
-#: ../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年%-m月%-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年%-m月%-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:65
+#, 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:71
+#, 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 "从列表中移除仓库（仍在磁盘上保留）"
 
+#: 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 "gitg"
+#~ msgstr "gitg"
+
+#~ msgid "Color scheme to use for syntax highlighting"
+#~ msgstr "用于语法高亮的 gtksourceview 配色方案"
+
+#~ msgid "Used by GtkSourceView to determine colors for syntax highlighting"
+#~ msgstr "由 GtkSourceView 使用来确定语法高亮的颜色"
+
+#~ msgid "Syntax highlighting color scheme:"
+#~ msgstr "语法高亮配色方案："
+
+#~ msgctxt "shortcut window"
+#~ msgid "Open shortcut window"
+#~ msgstr "打开快捷键窗口"
+
 #~ msgid "_Delete"
 #~ msgstr "删除(_D)"