+#: diff.c:5242
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "坏的 --word-diff 参数：%s"
+
+#: diff.c:5265
+msgid "Diff output format options"
+msgstr "差异输出格式化选项"
+
+#: diff.c:5267 diff.c:5273
+msgid "generate patch"
+msgstr "生成补丁"
+
+#: diff.c:5270 builtin/log.c:167
+msgid "suppress diff output"
+msgstr "不显示差异输出"
+
+#: diff.c:5275 diff.c:5389 diff.c:5396
+msgid "<n>"
+msgstr "<n>"
+
+#: diff.c:5276 diff.c:5279
+msgid "generate diffs with <n> lines context"
+msgstr "生成含 <n> 行上下文的差异"
+
+#: diff.c:5281
+msgid "generate the diff in raw format"
+msgstr "生成原始格式的差异"
+
+#: diff.c:5284
+msgid "synonym for '-p --raw'"
+msgstr "和 '-p --raw' 同义"
+
+#: diff.c:5288
+msgid "synonym for '-p --stat'"
+msgstr "和 '-p --stat' 同义"
+
+#: diff.c:5292
+msgid "machine friendly --stat"
+msgstr "机器友好的 --stat"
+
+#: diff.c:5295
+msgid "output only the last line of --stat"
+msgstr "只输出 --stat 的最后一行"
+
+#: diff.c:5297 diff.c:5305
+msgid "<param1,param2>..."
+msgstr "<参数1,参数2>..."
+
+#: diff.c:5298
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr "输出每个子目录相对变更的分布"
+
+#: diff.c:5302
+msgid "synonym for --dirstat=cumulative"
+msgstr "和 --dirstat=cumulative 同义"
+
+#: diff.c:5306
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "是 --dirstat=files,param1,param2... 的同义词"
+
+#: diff.c:5310
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr "如果变更中引入冲突定界符或空白错误，给出警告"
+
+#: diff.c:5313
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr "精简摘要，例如创建、重命名和模式变更"
+
+#: diff.c:5316
+msgid "show only names of changed files"
+msgstr "只显示变更文件的文件名"
+
+#: diff.c:5319
+msgid "show only names and status of changed files"
+msgstr "只显示变更文件的文件名和状态"
+
+#: diff.c:5321
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
+
+#: diff.c:5322
+msgid "generate diffstat"
+msgstr "生成差异统计（diffstat）"
+
+#: diff.c:5324 diff.c:5327 diff.c:5330
+msgid "<width>"
+msgstr "<宽度>"
+
+#: diff.c:5325
+msgid "generate diffstat with a given width"
+msgstr "使用给定的长度生成差异统计"
+
+#: diff.c:5328
+msgid "generate diffstat with a given name width"
+msgstr "使用给定的文件名长度生成差异统计"
+
+#: diff.c:5331
+msgid "generate diffstat with a given graph width"
+msgstr "使用给定的图形长度生成差异统计"
+
+#: diff.c:5333
+msgid "<count>"
+msgstr "<次数>"
+
+#: diff.c:5334
+msgid "generate diffstat with limited lines"
+msgstr "生成有限行数的差异统计"
+
+#: diff.c:5337
+msgid "generate compact summary in diffstat"
+msgstr "生成差异统计的简洁摘要"
+
+#: diff.c:5340
+msgid "output a binary diff that can be applied"
+msgstr "输出一个可以应用的二进制差异"
+
+#: diff.c:5343
+msgid "show full pre- and post-image object names on the \"index\" lines"
+msgstr "在 \"index\" 行显示完整的前后对象名称"
+
+#: diff.c:5345
+msgid "show colored diff"
+msgstr "显示带颜色的差异"
+
+#: diff.c:5346
+msgid "<kind>"
+msgstr "<类型>"
+
+#: diff.c:5347
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符"
+
+#: diff.c:5350
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
+"符"
+
+#: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465
+msgid "<prefix>"
+msgstr "<前缀>"
+
+#: diff.c:5354
+msgid "show the given source prefix instead of \"a/\""
+msgstr "显示给定的源前缀取代 \"a/\""
+
+#: diff.c:5357
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "显示给定的目标前缀取代 \"b/\""
+
+#: diff.c:5360
+msgid "prepend an additional prefix to every line of output"
+msgstr "输出的每一行附加前缀"
+
+#: diff.c:5363
+msgid "do not show any source or destination prefix"
+msgstr "不显示任何源和目标前缀"
+
+#: diff.c:5366
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr "显示指定行数的差异块间的上下文"
+
+#: diff.c:5370 diff.c:5375 diff.c:5380
+msgid "<char>"
+msgstr "<字符>"
+
+#: diff.c:5371
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr "指定一个字符取代 '+' 来表示新的一行"
+
+#: diff.c:5376
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "指定一个字符取代 '-' 来表示旧的一行"
+
+#: diff.c:5381
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "指定一个字符取代 ' ' 来表示一行上下文"
+
+#: diff.c:5384
+msgid "Diff rename options"
+msgstr "差异重命名选项"
+
+#: diff.c:5385
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+#: diff.c:5386
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr "将完全重写的变更打破为成对的删除和创建"
+
+#: diff.c:5390
+msgid "detect renames"
+msgstr "检测重命名"
+
+#: diff.c:5394
+msgid "omit the preimage for deletes"
+msgstr "省略删除操作的差异输出"
+
+#: diff.c:5397
+msgid "detect copies"
+msgstr "检测拷贝"
+
+#: diff.c:5401
+msgid "use unmodified files as source to find copies"
+msgstr "使用未修改的文件做为发现拷贝的源"
+
+#: diff.c:5403
+msgid "disable rename detection"
+msgstr "禁用重命名探测"
+
+#: diff.c:5406
+msgid "use empty blobs as rename source"
+msgstr "使用空的数据对象做为重命名的源"
+
+#: diff.c:5408
+msgid "continue listing the history of a file beyond renames"
+msgstr "继续列出文件重命名以外的历史记录"
+
+#: diff.c:5411
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测"
+
+#: diff.c:5413
+msgid "Diff algorithm options"
+msgstr "差异算法选项"
+
+#: diff.c:5415
+msgid "produce the smallest possible diff"
+msgstr "生成尽可能小的差异"
+
+#: diff.c:5418
+msgid "ignore whitespace when comparing lines"
+msgstr "行比较时忽略空白字符"
+
+#: diff.c:5421
+msgid "ignore changes in amount of whitespace"
+msgstr "忽略空白字符的变更"
+
+#: diff.c:5424
+msgid "ignore changes in whitespace at EOL"
+msgstr "忽略行尾的空白字符变更"
+
+#: diff.c:5427
+msgid "ignore carrier-return at the end of line"
+msgstr "忽略行尾的回车符（CR）"
+
+#: diff.c:5430
+msgid "ignore changes whose lines are all blank"
+msgstr "忽略整行都是空白的变更"
+
+#: diff.c:5433
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr "启发式转换差异边界以便阅读"
+
+#: diff.c:5436
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "使用 \"patience diff\" 算法生成差异"
+
+#: diff.c:5440
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "使用 \"histogram diff\" 算法生成差异"
+
+#: diff.c:5442
+msgid "<algorithm>"
+msgstr "<算法>"
+
+#: diff.c:5443
+msgid "choose a diff algorithm"
+msgstr "选择一个差异算法"
+
+#: diff.c:5445
+msgid "<text>"
+msgstr "<文本>"
+
+#: diff.c:5446
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "使用 \"anchored diff\" 算法生成差异"
+
+#: diff.c:5448 diff.c:5457 diff.c:5460
+msgid "<mode>"
+msgstr "<模式>"
+
+#: diff.c:5449
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr "显示单词差异，使用 <模式> 分隔变更的单词"
+
+#: diff.c:5451 diff.c:5454 diff.c:5499
+msgid "<regex>"
+msgstr "<正则>"
+
+#: diff.c:5452
+msgid "use <regex> to decide what a word is"
+msgstr "使用 <正则表达式> 确定何为一个词"
+
+#: diff.c:5455
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
+
+#: diff.c:5458
+msgid "moved lines of code are colored differently"
+msgstr "移动的代码行用不同方式着色"
+
+#: diff.c:5461
+msgid "how white spaces are ignored in --color-moved"
+msgstr "在 --color-moved 下如何忽略空白字符"
+
+#: diff.c:5464
+msgid "Other diff options"
+msgstr "其它差异选项"
+
+#: diff.c:5466
+msgid "when run from subdir, exclude changes outside and show relative paths"
+msgstr "当从子目录运行，排除目录之外的变更并显示相对路径"
+
+#: diff.c:5470
+msgid "treat all files as text"
+msgstr "把所有文件当做文本处理"
+
+#: diff.c:5472
+msgid "swap two inputs, reverse the diff"
+msgstr "交换两个输入，反转差异"
+
+#: diff.c:5474
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr "有差异时退出码为 1，否则为 0"
+
+#: diff.c:5476
+msgid "disable all output of the program"
+msgstr "禁用本程序的所有输出"
+
+#: diff.c:5478
+msgid "allow an external diff helper to be executed"
+msgstr "允许执行一个外置的差异助手"
+
+#: diff.c:5480
+msgid "run external text conversion filters when comparing binary files"
+msgstr "当比较二进制文件时，运行外部的文本转换过滤器"
+
+#: diff.c:5482
+msgid "<when>"
+msgstr "<何时>"
+
+#: diff.c:5483
+msgid "ignore changes to submodules in the diff generation"
+msgstr "在生成差异时，忽略子模组的更改"
+
+#: diff.c:5486
+msgid "<format>"
+msgstr "<格式>"
+
+#: diff.c:5487
+msgid "specify how differences in submodules are shown"
+msgstr "指定子模组的差异如何显示"
+
+#: diff.c:5491
+msgid "hide 'git add -N' entries from the index"
+msgstr "隐藏索引中 'git add -N' 条目"
+
+#: diff.c:5494
+msgid "treat 'git add -N' entries as real in the index"
+msgstr "将索引中 'git add -N' 条目当做真实的"
+
+#: diff.c:5496
+msgid "<string>"
+msgstr "<字符串>"
+
+#: diff.c:5497
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr "查找改变了指定字符串出现次数的差异"
+
+#: diff.c:5500
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr "查找改变指定正则匹配出现次数的差异"
+
+#: diff.c:5503
+msgid "show all changes in the changeset with -S or -G"
+msgstr "显示使用 -S 或 -G 的变更集的所有变更"
+
+#: diff.c:5506
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
+
+#: diff.c:5509
+msgid "control the order in which files appear in the output"
+msgstr "控制输出中的文件显示顺序"
+
+#: diff.c:5510
+msgid "<object-id>"
+msgstr "<对象 ID>"
+
+#: diff.c:5511
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr "查找改变指定对象出现次数的差异"
+
+#: diff.c:5513
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
+
+#: diff.c:5514
+msgid "select files by diff type"
+msgstr "通过差异类型选择文件"
+
+#: diff.c:5516
+msgid "<file>"
+msgstr "<文件>"
+
+#: diff.c:5517
+msgid "Output to a specific file"
+msgstr "输出到一个指定的文件"
+
+#: diff.c:6150
projects / thirdparty / git.git / blobdiff