l10n: zh_CN: v2.34.0 round 3
Signed-off-by: Fangyi Zhou <me@fangyi.io>
Fangyi Zhou committed
Nov 10, 2021 at 12:29 UTC
ffa14514a9a243b257f4a00e7a4f256e3deac2d9
1 file changed
+98
-94
po/zh_CN.po
+98
-94
@@ -142,8 +142,8 @@ msgid ""
142
msgstr ""
143
"Project-Id-Version: Git\n"
144
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
145
-"POT-Creation-Date: 2021-11-04 08:34+0800\n"
146
-"PO-Revision-Date: 2021-11-04 11:01+0000\n"
145
+"POT-Creation-Date: 2021-11-10 08:55+0800\n"
146
+"PO-Revision-Date: 2021-11-10 12:16+0000\n"
147
"Last-Translator: Fangyi Zhou <me@fangyi.io>\n"
148
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
149
"Language: zh_CN\n"
@@ -346,7 +346,7 @@ msgstr "未缓存"
346
347
#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
348
#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
349
-#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:190
349
+#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
350
#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
351
#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
352
#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
@@ -3423,7 +3423,7 @@ msgstr "-G 和 --pickaxe-regex 互斥，使用 --pickaxe-regex 和 -S"
3423
msgid ""
3424
"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
3425
"with -G and -S"
3426
-msgstr "---pickaxe-all 和 --find-object 互斥，使用 --pickaxe-all 与 -G 和 -S"
3426
+msgstr "--pickaxe-all 和 --find-object 互斥，使用 --pickaxe-all 与 -G 和 -S"
3427
3428
#: diff.c:4730
3429
msgid "--follow requires exactly one pathspec"
@@ -10362,7 +10362,7 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"
10362
msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
10363
10364
#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
10365
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
10365
+#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
10366
#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
10367
msgid "dry run"
10368
msgstr "演习"
@@ -10812,11 +10812,11 @@ msgstr "传递给 git-apply"
10812
10813
#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
10814
#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
10815
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
10815
+#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
10816
#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
10817
#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
10818
#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
10819
-#: parse-options.h:316
10819
+#: parse-options.h:315
10820
msgid "n"
10821
msgstr "n"
10822
@@ -10867,7 +10867,7 @@ msgid "use current timestamp for author date"
10867
msgstr "用当前时间作为作者日期"
10868
10869
#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
10870
-#: builtin/merge.c:299 builtin/pull.c:175 builtin/rebase.c:1099
10870
+#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
10871
#: builtin/revert.c:117 builtin/tag.c:460
10872
msgid "key-id"
10873
msgstr "key-id"
@@ -11364,7 +11364,7 @@ msgstr "显示工作消耗统计"
11364
#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
11365
#: builtin/merge.c:298 builtin/multi-pack-index.c:103
11366
#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
11367
-#: builtin/multi-pack-index.c:204 builtin/pull.c:119 builtin/push.c:566
11367
+#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
11368
#: builtin/send-pack.c:202
11369
msgid "force progress reporting"
11370
msgstr "强制显示进度报告"
@@ -12625,7 +12625,7 @@ msgstr "缺少分支或提交参数"
12625
msgid "perform a 3-way merge with the new branch"
12626
msgstr "和新的分支执行三方合并"
12627
12628
-#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:322
12628
+#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
12629
msgid "style"
12630
msgstr "风格"
12631
@@ -13047,7 +13047,7 @@ msgid "path to git-upload-pack on the remote"
13047
msgstr "远程 git-upload-pack 路径"
13048
13049
#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
13050
-#: builtin/pull.c:208
13050
+#: builtin/pull.c:212
13051
msgid "depth"
13052
msgstr "深度"
13053
@@ -13056,7 +13056,7 @@ msgid "create a shallow clone of that depth"
13056
msgstr "创建一个指定深度的浅克隆"
13057
13058
#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
13059
-#: builtin/pull.c:211
13059
+#: builtin/pull.c:215
13060
msgid "time"
13061
msgstr "时间"
13062
@@ -13065,11 +13065,11 @@ msgid "create a shallow clone since a specific time"
13065
msgstr "从一个特定时间创建一个浅克隆"
13066
13067
#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
13068
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1022
13068
+#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
13069
msgid "revision"
13070
msgstr "版本"
13071
13072
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
13072
+#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
13073
msgid "deepen history of shallow clone, excluding rev"
13074
msgstr "深化浅克隆的历史，除了特定版本"
13075
@@ -13103,21 +13103,21 @@ msgid "set config inside the new repository"
13103
msgstr "在新仓库中设置配置信息"
13104
13105
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
13106
-#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:200
13106
+#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
13107
msgid "server-specific"
13108
msgstr "server-specific"
13109
13110
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
13111
-#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:201
13111
+#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
13112
msgid "option to transmit"
13113
msgstr "传输选项"
13114
13115
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
13115
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
13116
#: builtin/push.c:576
13117
msgid "use IPv4 addresses only"
13118
msgstr "只使用 IPv4 地址"
13119
13120
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
13120
+#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
13121
#: builtin/push.c:578
13122
msgid "use IPv6 addresses only"
13123
msgstr "只使用 IPv6 地址"
@@ -13505,7 +13505,7 @@ msgid "read commit log message from file"
13505
msgstr "从文件中读取提交说明"
13506
13507
#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
13508
-#: builtin/pull.c:176 builtin/revert.c:118
13508
+#: builtin/pull.c:180 builtin/revert.c:118
13509
msgid "GPG sign commit"
13510
msgstr "GPG 提交签名"
13511
@@ -13905,7 +13905,7 @@ msgstr "条目以 NUL 字符结尾"
13905
13906
#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
13907
#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
13908
-#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:336
13908
+#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
13909
msgid "mode"
13910
msgstr "模式"
13911
@@ -13980,7 +13980,7 @@ msgid "override date for commit"
13980
msgstr "提交时覆盖日期"
13981
13982
#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
13983
-#: parse-options.h:328 ref-filter.h:92
13983
+#: parse-options.h:327 ref-filter.h:92
13984
msgid "commit"
13985
msgstr "提交"
13986
@@ -14021,7 +14021,7 @@ msgid "add custom trailer(s)"
14021
msgstr "添加自定义尾注"
14022
14023
#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
14024
-#: builtin/pull.c:145 builtin/revert.c:110
14024
+#: builtin/pull.c:146 builtin/revert.c:110
14025
msgid "add a Signed-off-by trailer"
14026
msgstr "添加 Signed-off-by 尾注"
14027
@@ -14982,15 +14982,15 @@ msgstr "git fetch --all [<选项>]"
14982
msgid "fetch.parallel cannot be negative"
14983
msgstr "fetch.parallel 不能为负数"
14984
14985
-#: builtin/fetch.c:145 builtin/pull.c:185
14985
+#: builtin/fetch.c:145 builtin/pull.c:189
14986
msgid "fetch from all remotes"
14987
msgstr "从所有的远程抓取"
14988
14989
-#: builtin/fetch.c:147 builtin/pull.c:245
14989
+#: builtin/fetch.c:147 builtin/pull.c:249
14990
msgid "set upstream for git pull/fetch"
14991
msgstr "为 git pull/fetch 设置上游"
14992
14993
-#: builtin/fetch.c:149 builtin/pull.c:188
14993
+#: builtin/fetch.c:149 builtin/pull.c:192
14994
msgid "append to .git/FETCH_HEAD instead of overwriting"
14995
msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
14996
@@ -14998,7 +14998,7 @@ msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
14998
msgid "use atomic transaction to update references"
14999
msgstr "使用原子事务更新引用"
15000
15001
-#: builtin/fetch.c:153 builtin/pull.c:191
15001
+#: builtin/fetch.c:153 builtin/pull.c:195
15002
msgid "path to upload pack on remote end"
15003
msgstr "上传包到远程的路径"
15004
@@ -15010,7 +15010,7 @@ msgstr "强制覆盖本地引用"
15010
msgid "fetch from multiple remotes"
15011
msgstr "从多个远程抓取"
15012
15013
-#: builtin/fetch.c:158 builtin/pull.c:195
15013
+#: builtin/fetch.c:158 builtin/pull.c:199
15014
msgid "fetch all tags and associated objects"
15015
msgstr "抓取所有的标签和关联对象"
15016
@@ -15026,7 +15026,7 @@ msgstr "子模组获取的并发数"
15026
msgid "modify the refspec to place all refs within refs/prefetch/"
15027
msgstr "修改引用规格以将所有引用放入 refs/prefetch/"
15028
15029
-#: builtin/fetch.c:166 builtin/pull.c:198
15029
+#: builtin/fetch.c:166 builtin/pull.c:202
15030
msgid "prune remote-tracking branches no longer on remote"
15031
msgstr "清除远程已经不存在的分支的跟踪分支"
15032
@@ -15035,7 +15035,7 @@ msgid "prune local tags no longer on remote and clobber changed tags"
15035
msgstr "清除远程不存在的本地标签，并且替换变更标签"
15036
15037
# 译者：可选值，不能翻译
15038
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
15038
+#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
15039
msgid "on-demand"
15040
msgstr "on-demand"
15041
@@ -15047,7 +15047,7 @@ msgstr "控制子模组的递归抓取"
15047
msgid "write fetched references to the FETCH_HEAD file"
15048
msgstr "将获取到的引用写入 FETCH_HEAD 文件"
15049
15050
-#: builtin/fetch.c:176 builtin/pull.c:206
15050
+#: builtin/fetch.c:176 builtin/pull.c:210
15051
msgid "keep downloaded pack"
15052
msgstr "保持下载包"
15053
@@ -15055,16 +15055,16 @@ msgstr "保持下载包"
15055
msgid "allow updating of HEAD ref"
15056
msgstr "允许更新 HEAD 引用"
15057
15058
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
15059
-#: builtin/pull.c:218
15058
+#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
15059
+#: builtin/pull.c:222
15060
msgid "deepen history of shallow clone"
15061
msgstr "深化浅克隆的历史"
15062
15063
-#: builtin/fetch.c:183 builtin/pull.c:212
15063
+#: builtin/fetch.c:183 builtin/pull.c:216
15064
msgid "deepen history of shallow repository based on time"
15065
msgstr "基于时间来深化浅克隆的历史"
15066
15067
-#: builtin/fetch.c:189 builtin/pull.c:221
15067
+#: builtin/fetch.c:189 builtin/pull.c:225
15068
msgid "convert to a complete repository"
15069
msgstr "转换为一个完整的仓库"
15070
@@ -15078,19 +15078,19 @@ msgid ""
15078
"files)"
15079
msgstr "递归获取子模组的缺省值（比配置文件优先级低）"
15080
15081
-#: builtin/fetch.c:199 builtin/pull.c:224
15081
+#: builtin/fetch.c:199 builtin/pull.c:228
15082
msgid "accept refs that update .git/shallow"
15083
msgstr "接受更新 .git/shallow 的引用"
15084
15085
-#: builtin/fetch.c:200 builtin/pull.c:226
15085
+#: builtin/fetch.c:200 builtin/pull.c:230
15086
msgid "refmap"
15087
msgstr "引用映射"
15088
15089
-#: builtin/fetch.c:201 builtin/pull.c:227
15089
+#: builtin/fetch.c:201 builtin/pull.c:231
15090
msgid "specify fetch refmap"
15091
msgstr "指定获取操作的引用映射"
15092
15093
-#: builtin/fetch.c:208 builtin/pull.c:240
15093
+#: builtin/fetch.c:208 builtin/pull.c:244
15094
msgid "report that we have only objects reachable from this object"
15095
msgstr "报告我们只拥有从该对象开始可达的对象"
15096
@@ -15102,7 +15102,7 @@ msgstr "不获取包文件；而是打印协商的祖先提交"
15102
msgid "run 'maintenance --auto' after fetching"
15103
msgstr "获取后执行 'maintenance --auto'"
15104
15105
-#: builtin/fetch.c:217 builtin/pull.c:243
15105
+#: builtin/fetch.c:217 builtin/pull.c:247
15106
msgid "check for forced-updates on all updated branches"
15107
msgstr "在所有更新分支上检查强制更新"
15108
@@ -17745,31 +17745,31 @@ msgstr "可用的策略有："
17745
msgid "Available custom strategies are:"
17746
msgstr "可用的自定义策略有："
17747
17748
-#: builtin/merge.c:257 builtin/pull.c:133
17748
+#: builtin/merge.c:257 builtin/pull.c:134
17749
msgid "do not show a diffstat at the end of the merge"
17750
msgstr "在合并的最后不显示差异统计"
17751
17752
-#: builtin/merge.c:260 builtin/pull.c:136
17752
+#: builtin/merge.c:260 builtin/pull.c:137
17753
msgid "show a diffstat at the end of the merge"
17754
msgstr "在合并的最后显示差异统计"
17755
17756
-#: builtin/merge.c:261 builtin/pull.c:139
17756
+#: builtin/merge.c:261 builtin/pull.c:140
17757
msgid "(synonym to --stat)"
17758
msgstr "（和 --stat 同义）"
17759
17760
-#: builtin/merge.c:263 builtin/pull.c:142
17760
+#: builtin/merge.c:263 builtin/pull.c:143
17761
msgid "add (at most <n>) entries from shortlog to merge commit message"
17762
msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录"
17763
17764
-#: builtin/merge.c:266 builtin/pull.c:148
17764
+#: builtin/merge.c:266 builtin/pull.c:149
17765
msgid "create a single commit instead of doing a merge"
17766
msgstr "创建一个单独的提交而不是做一次合并"
17767
17768
-#: builtin/merge.c:268 builtin/pull.c:151
17768
+#: builtin/merge.c:268 builtin/pull.c:152
17769
msgid "perform a commit if the merge succeeds (default)"
17770
msgstr "如果合并成功，执行一次提交（默认）"
17771
17772
-#: builtin/merge.c:270 builtin/pull.c:154
17772
+#: builtin/merge.c:270 builtin/pull.c:155
17773
msgid "edit message before committing"
17774
msgstr "在提交前编辑提交说明"
17775
@@ -17777,28 +17777,28 @@ msgstr "在提交前编辑提交说明"
17777
msgid "allow fast-forward (default)"
17778
msgstr "允许快进（默认）"
17779
17780
-#: builtin/merge.c:274 builtin/pull.c:161
17780
+#: builtin/merge.c:274 builtin/pull.c:162
17781
msgid "abort if fast-forward is not possible"
17782
msgstr "如果不能快进就放弃合并"
17783
17784
-#: builtin/merge.c:278 builtin/pull.c:164
17784
+#: builtin/merge.c:278 builtin/pull.c:168
17785
msgid "verify that the named commit has a valid GPG signature"
17786
msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
17787
17788
-#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:168
17788
+#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
17789
#: builtin/rebase.c:1117 builtin/revert.c:114
17790
msgid "strategy"
17791
msgstr "策略"
17792
17793
-#: builtin/merge.c:280 builtin/pull.c:169
17793
+#: builtin/merge.c:280 builtin/pull.c:173
17794
msgid "merge strategy to use"
17795
msgstr "要使用的合并策略"
17796
17797
-#: builtin/merge.c:281 builtin/pull.c:172
17797
+#: builtin/merge.c:281 builtin/pull.c:176
17798
msgid "option=value"
17799
msgstr "option=value"
17800
17801
-#: builtin/merge.c:282 builtin/pull.c:173
17801
+#: builtin/merge.c:282 builtin/pull.c:177
17802
msgid "option for selected merge strategy"
17803
msgstr "所选的合并策略的选项"
17804
@@ -17819,7 +17819,7 @@ msgstr "--abort，但是保留索引和工作区"
17819
msgid "continue the current in-progress merge"
17820
msgstr "继续当前正在进行的合并"
17821
17822
-#: builtin/merge.c:297 builtin/pull.c:180
17822
+#: builtin/merge.c:297 builtin/pull.c:184
17823
msgid "allow merging unrelated histories"
17824
msgstr "允许合并不相关的历史"
17825
@@ -19199,61 +19199,65 @@ msgstr "%s 的值无效：%s"
19199
msgid "git pull [<options>] [<repository> [<refspec>...]]"
19200
msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
19201
19202
-#: builtin/pull.c:123
19202
+#: builtin/pull.c:124
19203
msgid "control for recursive fetching of submodules"
19204
msgstr "控制子模组的递归获取"
19205
19206
-#: builtin/pull.c:127
19206
+#: builtin/pull.c:128
19207
msgid "Options related to merging"
19208
msgstr "和合并相关的选项"
19209
19210
-#: builtin/pull.c:130
19210
+#: builtin/pull.c:131
19211
msgid "incorporate changes by rebasing rather than merging"
19212
msgstr "使用变基操作取代合并操作以合入修改"
19213
19214
-#: builtin/pull.c:158 builtin/revert.c:126
19214
+#: builtin/pull.c:159 builtin/revert.c:126
19215
msgid "allow fast-forward"
19216
msgstr "允许快进式"
19217
19218
-#: builtin/pull.c:167 parse-options.h:339
19218
+#: builtin/pull.c:165
19219
+msgid "control use of pre-merge-commit and commit-msg hooks"
19220
+msgstr "控制 pre-merge-commit 和 commit-msg 钩子的使用"
19221
+
19222
+#: builtin/pull.c:171 parse-options.h:338
19223
msgid "automatically stash/stash pop before and after"
19224
msgstr "在操作前后执行自动贮藏和弹出贮藏"
19225
19222
-#: builtin/pull.c:183
19226
+#: builtin/pull.c:187
19227
msgid "Options related to fetching"
19228
msgstr "和获取相关的参数"
19229
19226
-#: builtin/pull.c:193
19230
+#: builtin/pull.c:197
19231
msgid "force overwrite of local branch"
19232
msgstr "强制覆盖本地分支"
19233
19230
-#: builtin/pull.c:201
19234
+#: builtin/pull.c:205
19235
msgid "number of submodules pulled in parallel"
19236
msgstr "并发拉取的子模组的数量"
19237
19234
-#: builtin/pull.c:317
19238
+#: builtin/pull.c:321
19239
#, c-format
19240
msgid "Invalid value for pull.ff: %s"
19241
msgstr "pull.ff 的取值无效：%s"
19242
19239
-#: builtin/pull.c:445
19243
+#: builtin/pull.c:449
19244
msgid ""
19245
"There is no candidate for rebasing against among the refs that you just "
19246
"fetched."
19247
msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
19248
19245
-#: builtin/pull.c:447
19249
+#: builtin/pull.c:451
19250
msgid ""
19251
"There are no candidates for merging among the refs that you just fetched."
19252
msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
19253
19250
-#: builtin/pull.c:448
19254
+#: builtin/pull.c:452
19255
msgid ""
19256
"Generally this means that you provided a wildcard refspec which had no\n"
19257
"matches on the remote end."
19258
msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
19259
19256
-#: builtin/pull.c:451
19260
+#: builtin/pull.c:455
19261
#, c-format
19262
msgid ""
19263
"You asked to pull from the remote '%s', but did not specify\n"
@@ -19263,41 +19267,41 @@ msgstr ""
19267
"您要求从远程 '%s' 拉取，但是未指定一个分支。因为这不是当前\n"
19268
"分支默认的远程仓库，您必须在命令行中指定一个分支名。"
19269
19266
-#: builtin/pull.c:456 builtin/rebase.c:951
19270
+#: builtin/pull.c:460 builtin/rebase.c:951
19271
msgid "You are not currently on a branch."
19272
msgstr "您当前不在一个分支上。"
19273
19270
-#: builtin/pull.c:458 builtin/pull.c:473
19274
+#: builtin/pull.c:462 builtin/pull.c:477
19275
msgid "Please specify which branch you want to rebase against."
19276
msgstr "请指定您要变基到哪一个分支。"
19277
19274
-#: builtin/pull.c:460 builtin/pull.c:475
19278
+#: builtin/pull.c:464 builtin/pull.c:479
19279
msgid "Please specify which branch you want to merge with."
19280
msgstr "请指定您要合并哪一个分支。"
19281
19278
-#: builtin/pull.c:461 builtin/pull.c:476
19282
+#: builtin/pull.c:465 builtin/pull.c:480
19283
msgid "See git-pull(1) for details."
19284
msgstr "详见 git-pull(1)。"
19285
19282
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
19286
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
19287
#: builtin/rebase.c:957
19288
msgid "<remote>"
19289
msgstr "<远程>"
19290
19287
-#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
19291
+#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
19292
msgid "<branch>"
19293
msgstr "<分支>"
19294
19291
-#: builtin/pull.c:471 builtin/rebase.c:949
19295
+#: builtin/pull.c:475 builtin/rebase.c:949
19296
msgid "There is no tracking information for the current branch."
19297
msgstr "当前分支没有跟踪信息。"
19298
19295
-#: builtin/pull.c:480
19299
+#: builtin/pull.c:484
19300
msgid ""
19301
"If you wish to set tracking information for this branch you can do so with:"
19302
msgstr "如果您想要为此分支创建跟踪信息，您可以执行："
19303
19300
-#: builtin/pull.c:485
19304
+#: builtin/pull.c:489
19305
#, c-format
19306
msgid ""
19307
"Your configuration specifies to merge with the ref '%s'\n"
@@ -19306,16 +19310,16 @@ msgstr ""
19310
"您的配置中指定要合并远程的引用 '%s'，\n"
19311
"但是没有获取到这个引用。"
19312
19309
-#: builtin/pull.c:596
19313
+#: builtin/pull.c:600
19314
#, c-format
19315
msgid "unable to access commit %s"
19316
msgstr "无法访问提交 %s"
19317
19314
-#: builtin/pull.c:902
19318
+#: builtin/pull.c:908
19319
msgid "ignoring --verify-signatures for rebase"
19320
msgstr "为变基操作忽略 --verify-signatures"
19321
19318
-#: builtin/pull.c:936
19322
+#: builtin/pull.c:942
19323
msgid ""
19324
"You have divergent branches and need to specify how to reconcile them.\n"
19325
"You can do so by running one of the following commands sometime before\n"
@@ -19342,19 +19346,19 @@ msgstr ""
19346
"缺省的配置项。您也可以在每次执行 pull 命令时添加 --rebase、--no-rebase，\n"
19347
"或者 --ff-only 参数覆盖缺省设置。\n"
19348
19345
-#: builtin/pull.c:1010
19349
+#: builtin/pull.c:1016
19350
msgid "Updating an unborn branch with changes added to the index."
19351
msgstr "更新尚未诞生的分支，变更添加至索引。"
19352
19349
-#: builtin/pull.c:1014
19353
+#: builtin/pull.c:1020
19354
msgid "pull with rebase"
19355
msgstr "变基式拉取"
19356
19353
-#: builtin/pull.c:1015
19357
+#: builtin/pull.c:1021
19358
msgid "please commit or stash them."
19359
msgstr "请提交或贮藏它们。"
19360
19357
-#: builtin/pull.c:1040
19361
+#: builtin/pull.c:1046
19362
#, c-format
19363
msgid ""
19364
"fetch updated the current branch head.\n"
@@ -19364,7 +19368,7 @@ msgstr ""
19368
"fetch 更新了当前的分支。快进您的工作区\n"
19369
"至提交 %s。"
19370
19367
-#: builtin/pull.c:1046
19371
+#: builtin/pull.c:1052
19372
#, c-format
19373
msgid ""
19374
"Cannot fast-forward your working tree.\n"
@@ -19381,23 +19385,23 @@ msgstr ""
19385
"$ git reset --hard\n"
19386
"恢复之前的状态。"
19387
19384
-#: builtin/pull.c:1061
19388
+#: builtin/pull.c:1067
19389
msgid "Cannot merge multiple branches into empty head."
19390
msgstr "无法将多个分支合并到空分支。"
19391
19388
-#: builtin/pull.c:1066
19392
+#: builtin/pull.c:1072
19393
msgid "Cannot rebase onto multiple branches."
19394
msgstr "无法变基到多个分支。"
19395
19392
-#: builtin/pull.c:1068
19396
+#: builtin/pull.c:1074
19397
msgid "Cannot fast-forward to multiple branches."
19398
msgstr "无法快进到多个分支。"
19399
19396
-#: builtin/pull.c:1082
19400
+#: builtin/pull.c:1088
19401
msgid "Need to specify how to reconcile divergent branches."
19402
msgstr "需要指定如何调和偏离的分支。"
19403
19400
-#: builtin/pull.c:1096
19404
+#: builtin/pull.c:1102
19405
msgid "cannot rebase with locally recorded submodule modifications"
19406
msgstr "本地子模组中有修改，无法变基"
19407
@@ -24437,27 +24441,27 @@ msgstr "到期时间"
24441
msgid "no-op (backward compatibility)"
24442
msgstr "空操作（向后兼容）"
24443
24440
-#: parse-options.h:309
24444
+#: parse-options.h:308
24445
msgid "be more verbose"
24446
msgstr "更加详细"
24447
24444
-#: parse-options.h:311
24448
+#: parse-options.h:310
24449
msgid "be more quiet"
24450
msgstr "更加安静"
24451
24448
-#: parse-options.h:317
24452
+#: parse-options.h:316
24453
msgid "use <n> digits to display object names"
24454
msgstr "用 <n> 位数字显示对象名"
24455
24452
-#: parse-options.h:336
24456
+#: parse-options.h:335
24457
msgid "how to strip spaces and #comments from message"
24458
msgstr "设置如何删除提交说明里的空格和#注释"
24459
24456
-#: parse-options.h:337
24460
+#: parse-options.h:336
24461
msgid "read pathspec from file"
24462
msgstr "从文件读取路径表达式"
24463
24460
-#: parse-options.h:338
24464
+#: parse-options.h:337
24465
msgid ""
24466
"with --pathspec-from-file, pathspec elements are separated with NUL character"
24467
msgstr "使用 --pathspec-from-file，路径表达式用空字符分隔"