@matheusbsbs / matheus-bagliano / commits / d83443820f

l10n: git.pot: v2.34.0 round 3 (1 new)

Generate po/git.pot from v2.34.0-rc2 for git v2.34.0 l10n round 3. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed Nov 10, 2021 at 08:56 UTC d83443820f00c2bcf08cf146fb4112cac5e6d8a8
1 file changed +96 -92
po/git.pot
+96 -92
@@ -8,7 +8,7 @@ msgid ""
8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
11 -"POT-Creation-Date: 2021-11-04 08:34+0800\n"
11 +"POT-Creation-Date: 2021-11-10 08:55+0800\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -211,7 +211,7 @@ msgstr ""
211
212 #: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
213 #: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
214 -#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:190
214 +#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
215 #: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
216 #: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
217 #: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
@@ -9692,7 +9692,7 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"
9692 msgstr ""
9693
9694 #: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
9695 -#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
9695 +#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
9696 #: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
9697 msgid "dry run"
9698 msgstr ""
@@ -10118,11 +10118,11 @@ msgstr ""
10118
10119 #: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
10120 #: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
10121 -#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
10121 +#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
10122 #: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
10123 #: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
10124 #: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
10125 -#: parse-options.h:316
10125 +#: parse-options.h:315
10126 msgid "n"
10127 msgstr ""
10128
@@ -10173,7 +10173,7 @@ msgid "use current timestamp for author date"
10173 msgstr ""
10174
10175 #: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
10176 -#: builtin/merge.c:299 builtin/pull.c:175 builtin/rebase.c:1099
10176 +#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
10177 #: builtin/revert.c:117 builtin/tag.c:460
10178 msgid "key-id"
10179 msgstr ""
@@ -10655,7 +10655,7 @@ msgstr ""
10655 #: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
10656 #: builtin/merge.c:298 builtin/multi-pack-index.c:103
10657 #: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
10658 -#: builtin/multi-pack-index.c:204 builtin/pull.c:119 builtin/push.c:566
10658 +#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
10659 #: builtin/send-pack.c:202
10660 msgid "force progress reporting"
10661 msgstr ""
@@ -11845,7 +11845,7 @@ msgstr ""
11845 msgid "perform a 3-way merge with the new branch"
11846 msgstr ""
11847
11848 -#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:322
11848 +#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
11849 msgid "style"
11850 msgstr ""
11851
@@ -12244,7 +12244,7 @@ msgid "path to git-upload-pack on the remote"
12244 msgstr ""
12245
12246 #: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
12247 -#: builtin/pull.c:208
12247 +#: builtin/pull.c:212
12248 msgid "depth"
12249 msgstr ""
12250
@@ -12253,7 +12253,7 @@ msgid "create a shallow clone of that depth"
12253 msgstr ""
12254
12255 #: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
12256 -#: builtin/pull.c:211
12256 +#: builtin/pull.c:215
12257 msgid "time"
12258 msgstr ""
12259
@@ -12262,11 +12262,11 @@ msgid "create a shallow clone since a specific time"
12262 msgstr ""
12263
12264 #: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
12265 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1022
12265 +#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
12266 msgid "revision"
12267 msgstr ""
12268
12269 -#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
12269 +#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
12270 msgid "deepen history of shallow clone, excluding rev"
12271 msgstr ""
12272
@@ -12300,21 +12300,21 @@ msgid "set config inside the new repository"
12300 msgstr ""
12301
12302 #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
12303 -#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:200
12303 +#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
12304 msgid "server-specific"
12305 msgstr ""
12306
12307 #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
12308 -#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:201
12308 +#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
12309 msgid "option to transmit"
12310 msgstr ""
12311
12312 -#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
12312 +#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
12313 #: builtin/push.c:576
12314 msgid "use IPv4 addresses only"
12315 msgstr ""
12316
12317 -#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
12317 +#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
12318 #: builtin/push.c:578
12319 msgid "use IPv6 addresses only"
12320 msgstr ""
@@ -12692,7 +12692,7 @@ msgid "read commit log message from file"
12692 msgstr ""
12693
12694 #: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
12695 -#: builtin/pull.c:176 builtin/revert.c:118
12695 +#: builtin/pull.c:180 builtin/revert.c:118
12696 msgid "GPG sign commit"
12697 msgstr ""
12698
@@ -13059,7 +13059,7 @@ msgstr ""
13059
13060 #: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
13061 #: builtin/fast-export.c:1199 builtin/fast-export.c:1202
13062 -#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:336
13062 +#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
13063 msgid "mode"
13064 msgstr ""
13065
@@ -13132,7 +13132,7 @@ msgid "override date for commit"
13132 msgstr ""
13133
13134 #: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
13135 -#: parse-options.h:328 ref-filter.h:92
13135 +#: parse-options.h:327 ref-filter.h:92
13136 msgid "commit"
13137 msgstr ""
13138
@@ -13173,7 +13173,7 @@ msgid "add custom trailer(s)"
13173 msgstr ""
13174
13175 #: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
13176 -#: builtin/pull.c:145 builtin/revert.c:110
13176 +#: builtin/pull.c:146 builtin/revert.c:110
13177 msgid "add a Signed-off-by trailer"
13178 msgstr ""
13179
@@ -14111,15 +14111,15 @@ msgstr ""
14111 msgid "fetch.parallel cannot be negative"
14112 msgstr ""
14113
14114 -#: builtin/fetch.c:145 builtin/pull.c:185
14114 +#: builtin/fetch.c:145 builtin/pull.c:189
14115 msgid "fetch from all remotes"
14116 msgstr ""
14117
14118 -#: builtin/fetch.c:147 builtin/pull.c:245
14118 +#: builtin/fetch.c:147 builtin/pull.c:249
14119 msgid "set upstream for git pull/fetch"
14120 msgstr ""
14121
14122 -#: builtin/fetch.c:149 builtin/pull.c:188
14122 +#: builtin/fetch.c:149 builtin/pull.c:192
14123 msgid "append to .git/FETCH_HEAD instead of overwriting"
14124 msgstr ""
14125
@@ -14127,7 +14127,7 @@ msgstr ""
14127 msgid "use atomic transaction to update references"
14128 msgstr ""
14129
14130 -#: builtin/fetch.c:153 builtin/pull.c:191
14130 +#: builtin/fetch.c:153 builtin/pull.c:195
14131 msgid "path to upload pack on remote end"
14132 msgstr ""
14133
@@ -14139,7 +14139,7 @@ msgstr ""
14139 msgid "fetch from multiple remotes"
14140 msgstr ""
14141
14142 -#: builtin/fetch.c:158 builtin/pull.c:195
14142 +#: builtin/fetch.c:158 builtin/pull.c:199
14143 msgid "fetch all tags and associated objects"
14144 msgstr ""
14145
@@ -14155,7 +14155,7 @@ msgstr ""
14155 msgid "modify the refspec to place all refs within refs/prefetch/"
14156 msgstr ""
14157
14158 -#: builtin/fetch.c:166 builtin/pull.c:198
14158 +#: builtin/fetch.c:166 builtin/pull.c:202
14159 msgid "prune remote-tracking branches no longer on remote"
14160 msgstr ""
14161
@@ -14163,7 +14163,7 @@ msgstr ""
14163 msgid "prune local tags no longer on remote and clobber changed tags"
14164 msgstr ""
14165
14166 -#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
14166 +#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
14167 msgid "on-demand"
14168 msgstr ""
14169
@@ -14175,7 +14175,7 @@ msgstr ""
14175 msgid "write fetched references to the FETCH_HEAD file"
14176 msgstr ""
14177
14178 -#: builtin/fetch.c:176 builtin/pull.c:206
14178 +#: builtin/fetch.c:176 builtin/pull.c:210
14179 msgid "keep downloaded pack"
14180 msgstr ""
14181
@@ -14183,16 +14183,16 @@ msgstr ""
14183 msgid "allow updating of HEAD ref"
14184 msgstr ""
14185
14186 -#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
14187 -#: builtin/pull.c:218
14186 +#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
14187 +#: builtin/pull.c:222
14188 msgid "deepen history of shallow clone"
14189 msgstr ""
14190
14191 -#: builtin/fetch.c:183 builtin/pull.c:212
14191 +#: builtin/fetch.c:183 builtin/pull.c:216
14192 msgid "deepen history of shallow repository based on time"
14193 msgstr ""
14194
14195 -#: builtin/fetch.c:189 builtin/pull.c:221
14195 +#: builtin/fetch.c:189 builtin/pull.c:225
14196 msgid "convert to a complete repository"
14197 msgstr ""
14198
@@ -14206,19 +14206,19 @@ msgid ""
14206 "files)"
14207 msgstr ""
14208
14209 -#: builtin/fetch.c:199 builtin/pull.c:224
14209 +#: builtin/fetch.c:199 builtin/pull.c:228
14210 msgid "accept refs that update .git/shallow"
14211 msgstr ""
14212
14213 -#: builtin/fetch.c:200 builtin/pull.c:226
14213 +#: builtin/fetch.c:200 builtin/pull.c:230
14214 msgid "refmap"
14215 msgstr ""
14216
14217 -#: builtin/fetch.c:201 builtin/pull.c:227
14217 +#: builtin/fetch.c:201 builtin/pull.c:231
14218 msgid "specify fetch refmap"
14219 msgstr ""
14220
14221 -#: builtin/fetch.c:208 builtin/pull.c:240
14221 +#: builtin/fetch.c:208 builtin/pull.c:244
14222 msgid "report that we have only objects reachable from this object"
14223 msgstr ""
14224
@@ -14230,7 +14230,7 @@ msgstr ""
14230 msgid "run 'maintenance --auto' after fetching"
14231 msgstr ""
14232
14233 -#: builtin/fetch.c:217 builtin/pull.c:243
14233 +#: builtin/fetch.c:217 builtin/pull.c:247
14234 msgid "check for forced-updates on all updated branches"
14235 msgstr ""
14236
@@ -16834,31 +16834,31 @@ msgstr ""
16834 msgid "Available custom strategies are:"
16835 msgstr ""
16836
16837 -#: builtin/merge.c:257 builtin/pull.c:133
16837 +#: builtin/merge.c:257 builtin/pull.c:134
16838 msgid "do not show a diffstat at the end of the merge"
16839 msgstr ""
16840
16841 -#: builtin/merge.c:260 builtin/pull.c:136
16841 +#: builtin/merge.c:260 builtin/pull.c:137
16842 msgid "show a diffstat at the end of the merge"
16843 msgstr ""
16844
16845 -#: builtin/merge.c:261 builtin/pull.c:139
16845 +#: builtin/merge.c:261 builtin/pull.c:140
16846 msgid "(synonym to --stat)"
16847 msgstr ""
16848
16849 -#: builtin/merge.c:263 builtin/pull.c:142
16849 +#: builtin/merge.c:263 builtin/pull.c:143
16850 msgid "add (at most <n>) entries from shortlog to merge commit message"
16851 msgstr ""
16852
16853 -#: builtin/merge.c:266 builtin/pull.c:148
16853 +#: builtin/merge.c:266 builtin/pull.c:149
16854 msgid "create a single commit instead of doing a merge"
16855 msgstr ""
16856
16857 -#: builtin/merge.c:268 builtin/pull.c:151
16857 +#: builtin/merge.c:268 builtin/pull.c:152
16858 msgid "perform a commit if the merge succeeds (default)"
16859 msgstr ""
16860
16861 -#: builtin/merge.c:270 builtin/pull.c:154
16861 +#: builtin/merge.c:270 builtin/pull.c:155
16862 msgid "edit message before committing"
16863 msgstr ""
16864
@@ -16866,28 +16866,28 @@ msgstr ""
16866 msgid "allow fast-forward (default)"
16867 msgstr ""
16868
16869 -#: builtin/merge.c:274 builtin/pull.c:161
16869 +#: builtin/merge.c:274 builtin/pull.c:162
16870 msgid "abort if fast-forward is not possible"
16871 msgstr ""
16872
16873 -#: builtin/merge.c:278 builtin/pull.c:164
16873 +#: builtin/merge.c:278 builtin/pull.c:168
16874 msgid "verify that the named commit has a valid GPG signature"
16875 msgstr ""
16876
16877 -#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:168
16877 +#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
16878 #: builtin/rebase.c:1117 builtin/revert.c:114
16879 msgid "strategy"
16880 msgstr ""
16881
16882 -#: builtin/merge.c:280 builtin/pull.c:169
16882 +#: builtin/merge.c:280 builtin/pull.c:173
16883 msgid "merge strategy to use"
16884 msgstr ""
16885
16886 -#: builtin/merge.c:281 builtin/pull.c:172
16886 +#: builtin/merge.c:281 builtin/pull.c:176
16887 msgid "option=value"
16888 msgstr ""
16889
16890 -#: builtin/merge.c:282 builtin/pull.c:173
16890 +#: builtin/merge.c:282 builtin/pull.c:177
16891 msgid "option for selected merge strategy"
16892 msgstr ""
16893
@@ -16907,7 +16907,7 @@ msgstr ""
16907 msgid "continue the current in-progress merge"
16908 msgstr ""
16909
16910 -#: builtin/merge.c:297 builtin/pull.c:180
16910 +#: builtin/merge.c:297 builtin/pull.c:184
16911 msgid "allow merging unrelated histories"
16912 msgstr ""
16913
@@ -18257,61 +18257,65 @@ msgstr ""
18257 msgid "git pull [<options>] [<repository> [<refspec>...]]"
18258 msgstr ""
18259
18260 -#: builtin/pull.c:123
18260 +#: builtin/pull.c:124
18261 msgid "control for recursive fetching of submodules"
18262 msgstr ""
18263
18264 -#: builtin/pull.c:127
18264 +#: builtin/pull.c:128
18265 msgid "Options related to merging"
18266 msgstr ""
18267
18268 -#: builtin/pull.c:130
18268 +#: builtin/pull.c:131
18269 msgid "incorporate changes by rebasing rather than merging"
18270 msgstr ""
18271
18272 -#: builtin/pull.c:158 builtin/revert.c:126
18272 +#: builtin/pull.c:159 builtin/revert.c:126
18273 msgid "allow fast-forward"
18274 msgstr ""
18275
18276 -#: builtin/pull.c:167 parse-options.h:339
18276 +#: builtin/pull.c:165
18277 +msgid "control use of pre-merge-commit and commit-msg hooks"
18278 +msgstr ""
18279 +
18280 +#: builtin/pull.c:171 parse-options.h:338
18281 msgid "automatically stash/stash pop before and after"
18282 msgstr ""
18283
18280 -#: builtin/pull.c:183
18284 +#: builtin/pull.c:187
18285 msgid "Options related to fetching"
18286 msgstr ""
18287
18284 -#: builtin/pull.c:193
18288 +#: builtin/pull.c:197
18289 msgid "force overwrite of local branch"
18290 msgstr ""
18291
18288 -#: builtin/pull.c:201
18292 +#: builtin/pull.c:205
18293 msgid "number of submodules pulled in parallel"
18294 msgstr ""
18295
18292 -#: builtin/pull.c:317
18296 +#: builtin/pull.c:321
18297 #, c-format
18298 msgid "Invalid value for pull.ff: %s"
18299 msgstr ""
18300
18297 -#: builtin/pull.c:445
18301 +#: builtin/pull.c:449
18302 msgid ""
18303 "There is no candidate for rebasing against among the refs that you just "
18304 "fetched."
18305 msgstr ""
18306
18303 -#: builtin/pull.c:447
18307 +#: builtin/pull.c:451
18308 msgid ""
18309 "There are no candidates for merging among the refs that you just fetched."
18310 msgstr ""
18311
18308 -#: builtin/pull.c:448
18312 +#: builtin/pull.c:452
18313 msgid ""
18314 "Generally this means that you provided a wildcard refspec which had no\n"
18315 "matches on the remote end."
18316 msgstr ""
18317
18314 -#: builtin/pull.c:451
18318 +#: builtin/pull.c:455
18319 #, c-format
18320 msgid ""
18321 "You asked to pull from the remote '%s', but did not specify\n"
@@ -18319,57 +18323,57 @@ msgid ""
18323 "for your current branch, you must specify a branch on the command line."
18324 msgstr ""
18325
18322 -#: builtin/pull.c:456 builtin/rebase.c:951
18326 +#: builtin/pull.c:460 builtin/rebase.c:951
18327 msgid "You are not currently on a branch."
18328 msgstr ""
18329
18326 -#: builtin/pull.c:458 builtin/pull.c:473
18330 +#: builtin/pull.c:462 builtin/pull.c:477
18331 msgid "Please specify which branch you want to rebase against."
18332 msgstr ""
18333
18330 -#: builtin/pull.c:460 builtin/pull.c:475
18334 +#: builtin/pull.c:464 builtin/pull.c:479
18335 msgid "Please specify which branch you want to merge with."
18336 msgstr ""
18337
18334 -#: builtin/pull.c:461 builtin/pull.c:476
18338 +#: builtin/pull.c:465 builtin/pull.c:480
18339 msgid "See git-pull(1) for details."
18340 msgstr ""
18341
18338 -#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
18342 +#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
18343 #: builtin/rebase.c:957
18344 msgid "<remote>"
18345 msgstr ""
18346
18343 -#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
18347 +#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
18348 msgid "<branch>"
18349 msgstr ""
18350
18347 -#: builtin/pull.c:471 builtin/rebase.c:949
18351 +#: builtin/pull.c:475 builtin/rebase.c:949
18352 msgid "There is no tracking information for the current branch."
18353 msgstr ""
18354
18351 -#: builtin/pull.c:480
18355 +#: builtin/pull.c:484
18356 msgid ""
18357 "If you wish to set tracking information for this branch you can do so with:"
18358 msgstr ""
18359
18356 -#: builtin/pull.c:485
18360 +#: builtin/pull.c:489
18361 #, c-format
18362 msgid ""
18363 "Your configuration specifies to merge with the ref '%s'\n"
18364 "from the remote, but no such ref was fetched."
18365 msgstr ""
18366
18363 -#: builtin/pull.c:596
18367 +#: builtin/pull.c:600
18368 #, c-format
18369 msgid "unable to access commit %s"
18370 msgstr ""
18371
18368 -#: builtin/pull.c:902
18372 +#: builtin/pull.c:908
18373 msgid "ignoring --verify-signatures for rebase"
18374 msgstr ""
18375
18372 -#: builtin/pull.c:936
18376 +#: builtin/pull.c:942
18377 msgid ""
18378 "You have divergent branches and need to specify how to reconcile them.\n"
18379 "You can do so by running one of the following commands sometime before\n"
@@ -18386,19 +18390,19 @@ msgid ""
18390 "invocation.\n"
18391 msgstr ""
18392
18389 -#: builtin/pull.c:1010
18393 +#: builtin/pull.c:1016
18394 msgid "Updating an unborn branch with changes added to the index."
18395 msgstr ""
18396
18393 -#: builtin/pull.c:1014
18397 +#: builtin/pull.c:1020
18398 msgid "pull with rebase"
18399 msgstr ""
18400
18397 -#: builtin/pull.c:1015
18401 +#: builtin/pull.c:1021
18402 msgid "please commit or stash them."
18403 msgstr ""
18404
18401 -#: builtin/pull.c:1040
18405 +#: builtin/pull.c:1046
18406 #, c-format
18407 msgid ""
18408 "fetch updated the current branch head.\n"
@@ -18406,7 +18410,7 @@ msgid ""
18410 "commit %s."
18411 msgstr ""
18412
18409 -#: builtin/pull.c:1046
18413 +#: builtin/pull.c:1052
18414 #, c-format
18415 msgid ""
18416 "Cannot fast-forward your working tree.\n"
@@ -18417,23 +18421,23 @@ msgid ""
18421 "to recover."
18422 msgstr ""
18423
18420 -#: builtin/pull.c:1061
18424 +#: builtin/pull.c:1067
18425 msgid "Cannot merge multiple branches into empty head."
18426 msgstr ""
18427
18424 -#: builtin/pull.c:1066
18428 +#: builtin/pull.c:1072
18429 msgid "Cannot rebase onto multiple branches."
18430 msgstr ""
18431
18428 -#: builtin/pull.c:1068
18432 +#: builtin/pull.c:1074
18433 msgid "Cannot fast-forward to multiple branches."
18434 msgstr ""
18435
18432 -#: builtin/pull.c:1082
18436 +#: builtin/pull.c:1088
18437 msgid "Need to specify how to reconcile divergent branches."
18438 msgstr ""
18439
18436 -#: builtin/pull.c:1096
18440 +#: builtin/pull.c:1102
18441 msgid "cannot rebase with locally recorded submodule modifications"
18442 msgstr ""
18443
@@ -23239,27 +23243,27 @@ msgstr ""
23243 msgid "no-op (backward compatibility)"
23244 msgstr ""
23245
23242 -#: parse-options.h:309
23246 +#: parse-options.h:308
23247 msgid "be more verbose"
23248 msgstr ""
23249
23246 -#: parse-options.h:311
23250 +#: parse-options.h:310
23251 msgid "be more quiet"
23252 msgstr ""
23253
23250 -#: parse-options.h:317
23254 +#: parse-options.h:316
23255 msgid "use <n> digits to display object names"
23256 msgstr ""
23257
23254 -#: parse-options.h:336
23258 +#: parse-options.h:335
23259 msgid "how to strip spaces and #comments from message"
23260 msgstr ""
23261
23258 -#: parse-options.h:337
23262 +#: parse-options.h:336
23263 msgid "read pathspec from file"
23264 msgstr ""
23265
23262 -#: parse-options.h:338
23266 +#: parse-options.h:337
23267 msgid ""
23268 "with --pathspec-from-file, pathspec elements are separated with NUL character"
23269 msgstr ""