l10n: zh_TW.po: v2.34.0 round 3 (0 untranslated)
Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>
Yi-Jyun Pan committed
Nov 11, 2021 at 06:43 UTC
569a03f24b98d1850bd18ec95d5e57ffc31477d3
1 file changed
+97
-93
po/zh_TW.po
+97
-93
@@ -22,8 +22,8 @@ msgid ""
22
msgstr ""
23
"Project-Id-Version: Git\n"
24
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
25
-"POT-Creation-Date: 2021-11-04 08:34+0800\n"
26
-"PO-Revision-Date: 2021-11-05 12:41+0800\n"
25
+"POT-Creation-Date: 2021-11-10 08:55+0800\n"
26
+"PO-Revision-Date: 2021-11-11 06:38+0800\n"
27
"Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
28
"Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-"
29
"po/git-cli/zh_Hant/>\n"
@@ -226,7 +226,7 @@ msgstr "未快取"
226
227
#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
228
#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
229
-#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:190
229
+#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
230
#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
231
#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
232
#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
@@ -10225,7 +10225,7 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"
10225
msgstr "下列路徑根據您的一個 .gitignore 檔案而被忽略：\n"
10226
10227
#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
10228
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
10228
+#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
10229
#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
10230
msgid "dry run"
10231
msgstr "測試執行"
@@ -10677,11 +10677,11 @@ msgstr "傳遞給 git-apply"
10677
10678
#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
10679
#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
10680
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
10680
+#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
10681
#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
10682
#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
10683
#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
10684
-#: parse-options.h:316
10684
+#: parse-options.h:315
10685
msgid "n"
10686
msgstr "n"
10687
@@ -10732,7 +10732,7 @@ msgid "use current timestamp for author date"
10732
msgstr "用目前時間作為作者日期"
10733
10734
#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
10735
-#: builtin/merge.c:299 builtin/pull.c:175 builtin/rebase.c:1099
10735
+#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
10736
#: builtin/revert.c:117 builtin/tag.c:460
10737
msgid "key-id"
10738
msgstr "key-id"
@@ -11232,7 +11232,7 @@ msgstr "顯示工作量統計"
11232
#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
11233
#: builtin/merge.c:298 builtin/multi-pack-index.c:103
11234
#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
11235
-#: builtin/multi-pack-index.c:204 builtin/pull.c:119 builtin/push.c:566
11235
+#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
11236
#: builtin/send-pack.c:202
11237
msgid "force progress reporting"
11238
msgstr "強制顯示進度報告"
@@ -12479,7 +12479,7 @@ msgstr "缺少分支或提交參數"
12479
msgid "perform a 3-way merge with the new branch"
12480
msgstr "和新的分支執行三方合併"
12481
12482
-#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:322
12482
+#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
12483
msgid "style"
12484
msgstr "風格"
12485
@@ -12900,7 +12900,7 @@ msgid "path to git-upload-pack on the remote"
12900
msgstr "遠端 git-upload-pack 路徑"
12901
12902
#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
12903
-#: builtin/pull.c:208
12903
+#: builtin/pull.c:212
12904
msgid "depth"
12905
msgstr "深度"
12906
@@ -12909,7 +12909,7 @@ msgid "create a shallow clone of that depth"
12909
msgstr "建立一個指定深度的淺複製"
12910
12911
#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
12912
-#: builtin/pull.c:211
12912
+#: builtin/pull.c:215
12913
msgid "time"
12914
msgstr "時間"
12915
@@ -12918,11 +12918,11 @@ msgid "create a shallow clone since a specific time"
12918
msgstr "建立從指定時間到現在的淺複製"
12919
12920
#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
12921
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1022
12921
+#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
12922
msgid "revision"
12923
msgstr "修訂版"
12924
12925
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
12925
+#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
12926
msgid "deepen history of shallow clone, excluding rev"
12927
msgstr "取得更多淺複製的過去歷史記錄，除了特定版本"
12928
@@ -12956,21 +12956,21 @@ msgid "set config inside the new repository"
12956
msgstr "在新版本庫中設定設定訊息"
12957
12958
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
12959
-#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:200
12959
+#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
12960
msgid "server-specific"
12961
msgstr "server-specific"
12962
12963
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
12964
-#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:201
12964
+#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
12965
msgid "option to transmit"
12966
msgstr "傳輸選項"
12967
12968
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
12968
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
12969
#: builtin/push.c:576
12970
msgid "use IPv4 addresses only"
12971
msgstr "只使用 IPv4 位址"
12972
12973
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
12973
+#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
12974
#: builtin/push.c:578
12975
msgid "use IPv6 addresses only"
12976
msgstr "只使用 IPv6 位址"
@@ -13358,7 +13358,7 @@ msgid "read commit log message from file"
13358
msgstr "從檔案中讀取提交說明"
13359
13360
#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
13361
-#: builtin/pull.c:176 builtin/revert.c:118
13361
+#: builtin/pull.c:180 builtin/revert.c:118
13362
msgid "GPG sign commit"
13363
msgstr "GPG 提交簽名"
13364
@@ -13763,7 +13763,7 @@ msgstr "條目以 NUL 字元結尾"
13763
13764
#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
13765
#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
13766
-#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:336
13766
+#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
13767
msgid "mode"
13768
msgstr "模式"
13769
@@ -13839,7 +13839,7 @@ msgid "override date for commit"
13839
msgstr "提交時覆蓋日期"
13840
13841
#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
13842
-#: parse-options.h:328 ref-filter.h:92
13842
+#: parse-options.h:327 ref-filter.h:92
13843
msgid "commit"
13844
msgstr "提交"
13845
@@ -13880,7 +13880,7 @@ msgid "add custom trailer(s)"
13880
msgstr "加入自訂尾部署名"
13881
13882
#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
13883
-#: builtin/pull.c:145 builtin/revert.c:110
13883
+#: builtin/pull.c:146 builtin/revert.c:110
13884
msgid "add a Signed-off-by trailer"
13885
msgstr "在結尾加入 Signed-off-by"
13886
@@ -14843,15 +14843,15 @@ msgstr "git fetch --all [<選項>]"
14843
msgid "fetch.parallel cannot be negative"
14844
msgstr "fetch.parallel 不能為負數"
14845
14846
-#: builtin/fetch.c:145 builtin/pull.c:185
14846
+#: builtin/fetch.c:145 builtin/pull.c:189
14847
msgid "fetch from all remotes"
14848
msgstr "從所有的遠端抓取"
14849
14850
-#: builtin/fetch.c:147 builtin/pull.c:245
14850
+#: builtin/fetch.c:147 builtin/pull.c:249
14851
msgid "set upstream for git pull/fetch"
14852
msgstr "為 git pull/fetch 設定上游"
14853
14854
-#: builtin/fetch.c:149 builtin/pull.c:188
14854
+#: builtin/fetch.c:149 builtin/pull.c:192
14855
msgid "append to .git/FETCH_HEAD instead of overwriting"
14856
msgstr "追加到 .git/FETCH_HEAD 而不是覆蓋它"
14857
@@ -14859,7 +14859,7 @@ msgstr "追加到 .git/FETCH_HEAD 而不是覆蓋它"
14859
msgid "use atomic transaction to update references"
14860
msgstr "使用 atomic 事務更新引用"
14861
14862
-#: builtin/fetch.c:153 builtin/pull.c:191
14862
+#: builtin/fetch.c:153 builtin/pull.c:195
14863
msgid "path to upload pack on remote end"
14864
msgstr "上傳包到遠端的路徑"
14865
@@ -14871,7 +14871,7 @@ msgstr "強制覆蓋本機引用"
14871
msgid "fetch from multiple remotes"
14872
msgstr "從多個遠端抓取"
14873
14874
-#: builtin/fetch.c:158 builtin/pull.c:195
14874
+#: builtin/fetch.c:158 builtin/pull.c:199
14875
msgid "fetch all tags and associated objects"
14876
msgstr "抓取所有的標籤和關聯物件"
14877
@@ -14887,7 +14887,7 @@ msgstr "並行取得的子模組數量"
14887
msgid "modify the refspec to place all refs within refs/prefetch/"
14888
msgstr "修改引用規格 (refspec) 以便將所有引用 (refs) 放置在 refs/prefetch/ 中"
14889
14890
-#: builtin/fetch.c:166 builtin/pull.c:198
14890
+#: builtin/fetch.c:166 builtin/pull.c:202
14891
msgid "prune remote-tracking branches no longer on remote"
14892
msgstr "清除遠端已經不存在的分支的追蹤分支"
14893
@@ -14896,7 +14896,7 @@ msgid "prune local tags no longer on remote and clobber changed tags"
14896
msgstr "清除遠端不存在的本機標籤，並且取代變更標籤"
14897
14898
# 譯者：可選值，不能翻譯
14899
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
14899
+#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
14900
msgid "on-demand"
14901
msgstr "on-demand"
14902
@@ -14908,7 +14908,7 @@ msgstr "控制子模組的遞迴抓取"
14908
msgid "write fetched references to the FETCH_HEAD file"
14909
msgstr "將取得的引用寫入 FETCH_HEAD 檔案"
14910
14911
-#: builtin/fetch.c:176 builtin/pull.c:206
14911
+#: builtin/fetch.c:176 builtin/pull.c:210
14912
msgid "keep downloaded pack"
14913
msgstr "保持下載包"
14914
@@ -14916,16 +14916,16 @@ msgstr "保持下載包"
14916
msgid "allow updating of HEAD ref"
14917
msgstr "允許更新 HEAD 引用"
14918
14919
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
14920
-#: builtin/pull.c:218
14919
+#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
14920
+#: builtin/pull.c:222
14921
msgid "deepen history of shallow clone"
14922
msgstr "取得淺複製的更多過去歷史記錄"
14923
14924
-#: builtin/fetch.c:183 builtin/pull.c:212
14924
+#: builtin/fetch.c:183 builtin/pull.c:216
14925
msgid "deepen history of shallow repository based on time"
14926
msgstr "基於時間來深化淺複製的歷史"
14927
14928
-#: builtin/fetch.c:189 builtin/pull.c:221
14928
+#: builtin/fetch.c:189 builtin/pull.c:225
14929
msgid "convert to a complete repository"
14930
msgstr "轉換為一個完整的版本庫"
14931
@@ -14939,19 +14939,19 @@ msgid ""
14939
"files)"
14940
msgstr "遞迴取得子模組的預設值（比設定檔案優先度低）"
14941
14942
-#: builtin/fetch.c:199 builtin/pull.c:224
14942
+#: builtin/fetch.c:199 builtin/pull.c:228
14943
msgid "accept refs that update .git/shallow"
14944
msgstr "接受更新 .git/shallow 的引用"
14945
14946
-#: builtin/fetch.c:200 builtin/pull.c:226
14946
+#: builtin/fetch.c:200 builtin/pull.c:230
14947
msgid "refmap"
14948
msgstr "引用映射"
14949
14950
-#: builtin/fetch.c:201 builtin/pull.c:227
14950
+#: builtin/fetch.c:201 builtin/pull.c:231
14951
msgid "specify fetch refmap"
14952
msgstr "指定取得動作的引用映射"
14953
14954
-#: builtin/fetch.c:208 builtin/pull.c:240
14954
+#: builtin/fetch.c:208 builtin/pull.c:244
14955
msgid "report that we have only objects reachable from this object"
14956
msgstr "報告我們只擁有從該物件開始可以取得的物件"
14957
@@ -14963,7 +14963,7 @@ msgstr "不取得包檔案，而是輸出交涉的祖先提交"
14963
msgid "run 'maintenance --auto' after fetching"
14964
msgstr "取得 (fetch) 後執行 'maintenance --auto'"
14965
14966
-#: builtin/fetch.c:217 builtin/pull.c:243
14966
+#: builtin/fetch.c:217 builtin/pull.c:247
14967
msgid "check for forced-updates on all updated branches"
14968
msgstr "在所有更新分支上檢查強制更新"
14969
@@ -17599,31 +17599,31 @@ msgstr "可用的策略有："
17599
msgid "Available custom strategies are:"
17600
msgstr "可用的自訂策略有："
17601
17602
-#: builtin/merge.c:257 builtin/pull.c:133
17602
+#: builtin/merge.c:257 builtin/pull.c:134
17603
msgid "do not show a diffstat at the end of the merge"
17604
msgstr "在合併的最後不顯示差異統計"
17605
17606
-#: builtin/merge.c:260 builtin/pull.c:136
17606
+#: builtin/merge.c:260 builtin/pull.c:137
17607
msgid "show a diffstat at the end of the merge"
17608
msgstr "在合併的最後顯示差異統計"
17609
17610
-#: builtin/merge.c:261 builtin/pull.c:139
17610
+#: builtin/merge.c:261 builtin/pull.c:140
17611
msgid "(synonym to --stat)"
17612
msgstr "（和 --stat 同義）"
17613
17614
-#: builtin/merge.c:263 builtin/pull.c:142
17614
+#: builtin/merge.c:263 builtin/pull.c:143
17615
msgid "add (at most <n>) entries from shortlog to merge commit message"
17616
msgstr "在合併提交說明中新增（最多 <n> 條）精簡提交記錄"
17617
17618
-#: builtin/merge.c:266 builtin/pull.c:148
17618
+#: builtin/merge.c:266 builtin/pull.c:149
17619
msgid "create a single commit instead of doing a merge"
17620
msgstr "建立一個單獨的提交而不是做一次合併"
17621
17622
-#: builtin/merge.c:268 builtin/pull.c:151
17622
+#: builtin/merge.c:268 builtin/pull.c:152
17623
msgid "perform a commit if the merge succeeds (default)"
17624
msgstr "如果合併成功，執行一次提交（預設）"
17625
17626
-#: builtin/merge.c:270 builtin/pull.c:154
17626
+#: builtin/merge.c:270 builtin/pull.c:155
17627
msgid "edit message before committing"
17628
msgstr "在提交前編輯提交說明"
17629
@@ -17631,28 +17631,28 @@ msgstr "在提交前編輯提交說明"
17631
msgid "allow fast-forward (default)"
17632
msgstr "允許快轉（預設）"
17633
17634
-#: builtin/merge.c:274 builtin/pull.c:161
17634
+#: builtin/merge.c:274 builtin/pull.c:162
17635
msgid "abort if fast-forward is not possible"
17636
msgstr "如果不能快轉就放棄合併"
17637
17638
-#: builtin/merge.c:278 builtin/pull.c:164
17638
+#: builtin/merge.c:278 builtin/pull.c:168
17639
msgid "verify that the named commit has a valid GPG signature"
17640
msgstr "驗證指定的提交是否包含一個有效的 GPG 簽名"
17641
17642
-#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:168
17642
+#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
17643
#: builtin/rebase.c:1117 builtin/revert.c:114
17644
msgid "strategy"
17645
msgstr "策略"
17646
17647
-#: builtin/merge.c:280 builtin/pull.c:169
17647
+#: builtin/merge.c:280 builtin/pull.c:173
17648
msgid "merge strategy to use"
17649
msgstr "要使用的合併策略"
17650
17651
-#: builtin/merge.c:281 builtin/pull.c:172
17651
+#: builtin/merge.c:281 builtin/pull.c:176
17652
msgid "option=value"
17653
msgstr "option=value"
17654
17655
-#: builtin/merge.c:282 builtin/pull.c:173
17655
+#: builtin/merge.c:282 builtin/pull.c:177
17656
msgid "option for selected merge strategy"
17657
msgstr "所選的合併策略的選項"
17658
@@ -17673,7 +17673,7 @@ msgstr "--abort，但是保留索引和工作區"
17673
msgid "continue the current in-progress merge"
17674
msgstr "繼續目前正在進行的合併"
17675
17676
-#: builtin/merge.c:297 builtin/pull.c:180
17676
+#: builtin/merge.c:297 builtin/pull.c:184
17677
msgid "allow merging unrelated histories"
17678
msgstr "允許合並不相關的歷史"
17679
@@ -19055,61 +19055,65 @@ msgstr "%s 的值無效：%s"
19055
msgid "git pull [<options>] [<repository> [<refspec>...]]"
19056
msgstr "git pull [<選項>] [<版本庫> [<引用規格>...]]"
19057
19058
-#: builtin/pull.c:123
19058
+#: builtin/pull.c:124
19059
msgid "control for recursive fetching of submodules"
19060
msgstr "控制子模組的遞迴取得"
19061
19062
-#: builtin/pull.c:127
19062
+#: builtin/pull.c:128
19063
msgid "Options related to merging"
19064
msgstr "和合併相關的選項"
19065
19066
-#: builtin/pull.c:130
19066
+#: builtin/pull.c:131
19067
msgid "incorporate changes by rebasing rather than merging"
19068
msgstr "使用重定基底動作取代合併動作以套用修改"
19069
19070
-#: builtin/pull.c:158 builtin/revert.c:126
19070
+#: builtin/pull.c:159 builtin/revert.c:126
19071
msgid "allow fast-forward"
19072
msgstr "允許快轉式"
19073
19074
-#: builtin/pull.c:167 parse-options.h:339
19074
+#: builtin/pull.c:165
19075
+msgid "control use of pre-merge-commit and commit-msg hooks"
19076
+msgstr "控制 pre-merge-commit 和 commit-msg 掛鉤的使用"
19077
+
19078
+#: builtin/pull.c:171 parse-options.h:338
19079
msgid "automatically stash/stash pop before and after"
19080
msgstr "在動作前後執行自動儲藏和彈出儲藏"
19081
19078
-#: builtin/pull.c:183
19082
+#: builtin/pull.c:187
19083
msgid "Options related to fetching"
19084
msgstr "和取得相關的參數"
19085
19082
-#: builtin/pull.c:193
19086
+#: builtin/pull.c:197
19087
msgid "force overwrite of local branch"
19088
msgstr "強制覆蓋本機分支"
19089
19086
-#: builtin/pull.c:201
19090
+#: builtin/pull.c:205
19091
msgid "number of submodules pulled in parallel"
19092
msgstr "並行拉取的子模組數量"
19093
19090
-#: builtin/pull.c:317
19094
+#: builtin/pull.c:321
19095
#, c-format
19096
msgid "Invalid value for pull.ff: %s"
19097
msgstr "pull.ff 的取值無效：%s"
19098
19095
-#: builtin/pull.c:445
19099
+#: builtin/pull.c:449
19100
msgid ""
19101
"There is no candidate for rebasing against among the refs that you just "
19102
"fetched."
19103
msgstr "在您剛剛取得到的引用中沒有重定基底動作的候選。"
19104
19101
-#: builtin/pull.c:447
19105
+#: builtin/pull.c:451
19106
msgid ""
19107
"There are no candidates for merging among the refs that you just fetched."
19108
msgstr "在您剛剛取得到的引用中沒有合併動作的候選。"
19109
19106
-#: builtin/pull.c:448
19110
+#: builtin/pull.c:452
19111
msgid ""
19112
"Generally this means that you provided a wildcard refspec which had no\n"
19113
"matches on the remote end."
19114
msgstr "這通常表示您有提供萬用字元引用規格，但遠端沒有符合項目。"
19115
19112
-#: builtin/pull.c:451
19116
+#: builtin/pull.c:455
19117
#, c-format
19118
msgid ""
19119
"You asked to pull from the remote '%s', but did not specify\n"
@@ -19119,41 +19123,41 @@ msgstr ""
19123
"您要求從遠端 '%s' 拉取，但是未指定一個分支。因為這不是目前\n"
19124
"分支預設的遠端版本庫，您必須在指令列中指定一個分支名。"
19125
19122
-#: builtin/pull.c:456 builtin/rebase.c:951
19126
+#: builtin/pull.c:460 builtin/rebase.c:951
19127
msgid "You are not currently on a branch."
19128
msgstr "您目前不在一個分支上。"
19129
19126
-#: builtin/pull.c:458 builtin/pull.c:473
19130
+#: builtin/pull.c:462 builtin/pull.c:477
19131
msgid "Please specify which branch you want to rebase against."
19132
msgstr "請指定您要重定基底到哪一個分支。"
19133
19130
-#: builtin/pull.c:460 builtin/pull.c:475
19134
+#: builtin/pull.c:464 builtin/pull.c:479
19135
msgid "Please specify which branch you want to merge with."
19136
msgstr "請指定您要合併哪一個分支。"
19137
19134
-#: builtin/pull.c:461 builtin/pull.c:476
19138
+#: builtin/pull.c:465 builtin/pull.c:480
19139
msgid "See git-pull(1) for details."
19140
msgstr "詳見 git-pull(1)。"
19141
19138
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
19142
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
19143
#: builtin/rebase.c:957
19144
msgid "<remote>"
19145
msgstr "<遠端>"
19146
19143
-#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
19147
+#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
19148
msgid "<branch>"
19149
msgstr "<分支>"
19150
19147
-#: builtin/pull.c:471 builtin/rebase.c:949
19151
+#: builtin/pull.c:475 builtin/rebase.c:949
19152
msgid "There is no tracking information for the current branch."
19153
msgstr "目前分支沒有追蹤訊息。"
19154
19151
-#: builtin/pull.c:480
19155
+#: builtin/pull.c:484
19156
msgid ""
19157
"If you wish to set tracking information for this branch you can do so with:"
19158
msgstr "如果您想要為此分支建立追蹤訊息，您可以執行："
19159
19156
-#: builtin/pull.c:485
19160
+#: builtin/pull.c:489
19161
#, c-format
19162
msgid ""
19163
"Your configuration specifies to merge with the ref '%s'\n"
@@ -19162,16 +19166,16 @@ msgstr ""
19166
"您的設定中指定要合併遠端的引用 '%s'，\n"
19167
"但是沒有取得到這個引用。"
19168
19165
-#: builtin/pull.c:596
19169
+#: builtin/pull.c:600
19170
#, c-format
19171
msgid "unable to access commit %s"
19172
msgstr "無法存取提交 %s"
19173
19170
-#: builtin/pull.c:902
19174
+#: builtin/pull.c:908
19175
msgid "ignoring --verify-signatures for rebase"
19176
msgstr "為重定基底動作忽略 --verify-signatures"
19177
19174
-#: builtin/pull.c:936
19178
+#: builtin/pull.c:942
19179
msgid ""
19180
"You have divergent branches and need to specify how to reconcile them.\n"
19181
"You can do so by running one of the following commands sometime before\n"
@@ -19200,19 +19204,19 @@ msgstr ""
19204
"pull 命令時傳遞 --rebase、--no-rebase 或 --ff-only 覆蓋\n"
19205
"設定的預設值。\n"
19206
19203
-#: builtin/pull.c:1010
19207
+#: builtin/pull.c:1016
19208
msgid "Updating an unborn branch with changes added to the index."
19209
msgstr "更新尚未誕生的分支，變更新增至索引。"
19210
19207
-#: builtin/pull.c:1014
19211
+#: builtin/pull.c:1020
19212
msgid "pull with rebase"
19213
msgstr "重定基底式拉取"
19214
19211
-#: builtin/pull.c:1015
19215
+#: builtin/pull.c:1021
19216
msgid "please commit or stash them."
19217
msgstr "請提交或儲藏它們。"
19218
19215
-#: builtin/pull.c:1040
19219
+#: builtin/pull.c:1046
19220
#, c-format
19221
msgid ""
19222
"fetch updated the current branch head.\n"
@@ -19222,7 +19226,7 @@ msgstr ""
19226
"fetch 更新了目前的分支。快轉您的工作區\n"
19227
"至提交 %s。"
19228
19225
-#: builtin/pull.c:1046
19229
+#: builtin/pull.c:1052
19230
#, c-format
19231
msgid ""
19232
"Cannot fast-forward your working tree.\n"
@@ -19239,23 +19243,23 @@ msgstr ""
19243
"$ git reset --hard\n"
19244
"復原之前的狀態。"
19245
19242
-#: builtin/pull.c:1061
19246
+#: builtin/pull.c:1067
19247
msgid "Cannot merge multiple branches into empty head."
19248
msgstr "無法將多個分支合併到空分支。"
19249
19246
-#: builtin/pull.c:1066
19250
+#: builtin/pull.c:1072
19251
msgid "Cannot rebase onto multiple branches."
19252
msgstr "無法重定基底到多個分支。"
19253
19250
-#: builtin/pull.c:1068
19254
+#: builtin/pull.c:1074
19255
msgid "Cannot fast-forward to multiple branches."
19256
msgstr "無法快轉至多個分支。"
19257
19254
-#: builtin/pull.c:1082
19258
+#: builtin/pull.c:1088
19259
msgid "Need to specify how to reconcile divergent branches."
19260
msgstr "需要指定如何調和偏離的分支。"
19261
19258
-#: builtin/pull.c:1096
19262
+#: builtin/pull.c:1102
19263
msgid "cannot rebase with locally recorded submodule modifications"
19264
msgstr "本機子模組中有修改，無法重定基底"
19265
@@ -24289,27 +24293,27 @@ msgstr "到期時間"
24293
msgid "no-op (backward compatibility)"
24294
msgstr "空動作（向後相容）"
24295
24292
-#: parse-options.h:309
24296
+#: parse-options.h:308
24297
msgid "be more verbose"
24298
msgstr "更加詳細"
24299
24296
-#: parse-options.h:311
24300
+#: parse-options.h:310
24301
msgid "be more quiet"
24302
msgstr "更加安靜"
24303
24300
-#: parse-options.h:317
24304
+#: parse-options.h:316
24305
msgid "use <n> digits to display object names"
24306
msgstr "用 <n> 位數字顯示物件名稱"
24307
24304
-#: parse-options.h:336
24308
+#: parse-options.h:335
24309
msgid "how to strip spaces and #comments from message"
24310
msgstr "設定如何刪除提交說明裡的空格和 #備註"
24311
24308
-#: parse-options.h:337
24312
+#: parse-options.h:336
24313
msgid "read pathspec from file"
24314
msgstr "從檔案讀取 <路徑規格>"
24315
24312
-#: parse-options.h:338
24316
+#: parse-options.h:337
24317
msgid ""
24318
"with --pathspec-from-file, pathspec elements are separated with NUL character"
24319
msgstr "如使用 --pathspec-from-file，則 <路徑規格> 元件會使用 NUL 字元分隔"