kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
Browse Source

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>
maint
Jiang Xin 3 years ago
parent
3a6160031b
commit
d83443820f
1 changed files with 96 additions and 92 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 188
      po/git.pot

188
po/git.pot
Unescape View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2021-11-04 08:34+0800\n" "POT-Creation-Date: 2021-11-10 08:55+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -211,7 +211,7 @@ msgstr ""


#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311 #: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128 #: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:190 #: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857 #: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503 #: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573 #: 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"
msgstr "" msgstr ""


#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124 #: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550 #: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194 #: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run" msgid "dry run"
msgstr "" msgstr ""
@ -10118,11 +10118,11 @@ msgstr ""


#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17 #: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262 #: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 #: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655 #: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172 #: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175 #: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
#: parse-options.h:316 #: parse-options.h:315
msgid "n" msgid "n"
msgstr "" msgstr ""


@ -10173,7 +10173,7 @@ msgid "use current timestamp for author date"
msgstr "" msgstr ""


#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642 #: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
#: builtin/merge.c:299 builtin/pull.c:175 builtin/rebase.c:1099 #: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
#: builtin/revert.c:117 builtin/tag.c:460 #: builtin/revert.c:117 builtin/tag.c:460
msgid "key-id" msgid "key-id"
msgstr "" msgstr ""
@ -10655,7 +10655,7 @@ msgstr ""
#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179 #: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
#: builtin/merge.c:298 builtin/multi-pack-index.c:103 #: builtin/merge.c:298 builtin/multi-pack-index.c:103
#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178 #: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
#: builtin/multi-pack-index.c:204 builtin/pull.c:119 builtin/push.c:566 #: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
#: builtin/send-pack.c:202 #: builtin/send-pack.c:202
msgid "force progress reporting" msgid "force progress reporting"
msgstr "" msgstr ""
@ -11845,7 +11845,7 @@ msgstr ""
msgid "perform a 3-way merge with the new branch" msgid "perform a 3-way merge with the new branch"
msgstr "" msgstr ""


#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:322 #: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
msgid "style" msgid "style"
msgstr "" msgstr ""


@ -12244,7 +12244,7 @@ msgid "path to git-upload-pack on the remote"
msgstr "" msgstr ""


#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876 #: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
#: builtin/pull.c:208 #: builtin/pull.c:212
msgid "depth" msgid "depth"
msgstr "" msgstr ""


@ -12253,7 +12253,7 @@ msgid "create a shallow clone of that depth"
msgstr "" msgstr ""


#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933 #: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
#: builtin/pull.c:211 #: builtin/pull.c:215
msgid "time" msgid "time"
msgstr "" msgstr ""


@ -12262,11 +12262,11 @@ msgid "create a shallow clone since a specific time"
msgstr "" msgstr ""


#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207 #: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1022 #: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
msgid "revision" msgid "revision"
msgstr "" msgstr ""


#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215 #: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev" msgid "deepen history of shallow clone, excluding rev"
msgstr "" msgstr ""


@ -12300,21 +12300,21 @@ msgid "set config inside the new repository"
msgstr "" msgstr ""


#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:200 #: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific" msgid "server-specific"
msgstr "" msgstr ""


#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:201 #: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit" msgid "option to transmit"
msgstr "" msgstr ""


#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234 #: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
#: builtin/push.c:576 #: builtin/push.c:576
msgid "use IPv4 addresses only" msgid "use IPv4 addresses only"
msgstr "" msgstr ""


#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237 #: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
#: builtin/push.c:578 #: builtin/push.c:578
msgid "use IPv6 addresses only" msgid "use IPv6 addresses only"
msgstr "" msgstr ""
@ -12692,7 +12692,7 @@ msgid "read commit log message from file"
msgstr "" msgstr ""


#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300 #: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
#: builtin/pull.c:176 builtin/revert.c:118 #: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit" msgid "GPG sign commit"
msgstr "" msgstr ""


@ -13059,7 +13059,7 @@ msgstr ""


#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668 #: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 #: builtin/fast-export.c:1199 builtin/fast-export.c:1202
#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:336 #: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
msgid "mode" msgid "mode"
msgstr "" msgstr ""


@ -13132,7 +13132,7 @@ msgid "override date for commit"
msgstr "" msgstr ""


#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634 #: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
#: parse-options.h:328 ref-filter.h:92 #: parse-options.h:327 ref-filter.h:92
msgid "commit" msgid "commit"
msgstr "" msgstr ""


@ -13173,7 +13173,7 @@ msgid "add custom trailer(s)"
msgstr "" msgstr ""


#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303 #: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
#: builtin/pull.c:145 builtin/revert.c:110 #: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer" msgid "add a Signed-off-by trailer"
msgstr "" msgstr ""


@ -14111,15 +14111,15 @@ msgstr ""
msgid "fetch.parallel cannot be negative" msgid "fetch.parallel cannot be negative"
msgstr "" msgstr ""


#: builtin/fetch.c:145 builtin/pull.c:185 #: builtin/fetch.c:145 builtin/pull.c:189
msgid "fetch from all remotes" msgid "fetch from all remotes"
msgstr "" msgstr ""


#: builtin/fetch.c:147 builtin/pull.c:245 #: builtin/fetch.c:147 builtin/pull.c:249
msgid "set upstream for git pull/fetch" msgid "set upstream for git pull/fetch"
msgstr "" msgstr ""


#: builtin/fetch.c:149 builtin/pull.c:188 #: builtin/fetch.c:149 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting" msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "" msgstr ""


@ -14127,7 +14127,7 @@ msgstr ""
msgid "use atomic transaction to update references" msgid "use atomic transaction to update references"
msgstr "" msgstr ""


#: builtin/fetch.c:153 builtin/pull.c:191 #: builtin/fetch.c:153 builtin/pull.c:195
msgid "path to upload pack on remote end" msgid "path to upload pack on remote end"
msgstr "" msgstr ""


@ -14139,7 +14139,7 @@ msgstr ""
msgid "fetch from multiple remotes" msgid "fetch from multiple remotes"
msgstr "" msgstr ""


#: builtin/fetch.c:158 builtin/pull.c:195 #: builtin/fetch.c:158 builtin/pull.c:199
msgid "fetch all tags and associated objects" msgid "fetch all tags and associated objects"
msgstr "" msgstr ""


@ -14155,7 +14155,7 @@ msgstr ""
msgid "modify the refspec to place all refs within refs/prefetch/" msgid "modify the refspec to place all refs within refs/prefetch/"
msgstr "" msgstr ""


#: builtin/fetch.c:166 builtin/pull.c:198 #: builtin/fetch.c:166 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote" msgid "prune remote-tracking branches no longer on remote"
msgstr "" msgstr ""


@ -14163,7 +14163,7 @@ msgstr ""
msgid "prune local tags no longer on remote and clobber changed tags" msgid "prune local tags no longer on remote and clobber changed tags"
msgstr "" msgstr ""


#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122 #: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
msgid "on-demand" msgid "on-demand"
msgstr "" msgstr ""


@ -14175,7 +14175,7 @@ msgstr ""
msgid "write fetched references to the FETCH_HEAD file" msgid "write fetched references to the FETCH_HEAD file"
msgstr "" msgstr ""


#: builtin/fetch.c:176 builtin/pull.c:206 #: builtin/fetch.c:176 builtin/pull.c:210
msgid "keep downloaded pack" msgid "keep downloaded pack"
msgstr "" msgstr ""


@ -14183,16 +14183,16 @@ msgstr ""
msgid "allow updating of HEAD ref" msgid "allow updating of HEAD ref"
msgstr "" msgstr ""


#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209 #: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
#: builtin/pull.c:218 #: builtin/pull.c:222
msgid "deepen history of shallow clone" msgid "deepen history of shallow clone"
msgstr "" msgstr ""


#: builtin/fetch.c:183 builtin/pull.c:212 #: builtin/fetch.c:183 builtin/pull.c:216
msgid "deepen history of shallow repository based on time" msgid "deepen history of shallow repository based on time"
msgstr "" msgstr ""


#: builtin/fetch.c:189 builtin/pull.c:221 #: builtin/fetch.c:189 builtin/pull.c:225
msgid "convert to a complete repository" msgid "convert to a complete repository"
msgstr "" msgstr ""


@ -14206,19 +14206,19 @@ msgid ""
"files)" "files)"
msgstr "" msgstr ""


#: builtin/fetch.c:199 builtin/pull.c:224 #: builtin/fetch.c:199 builtin/pull.c:228
msgid "accept refs that update .git/shallow" msgid "accept refs that update .git/shallow"
msgstr "" msgstr ""


#: builtin/fetch.c:200 builtin/pull.c:226 #: builtin/fetch.c:200 builtin/pull.c:230
msgid "refmap" msgid "refmap"
msgstr "" msgstr ""


#: builtin/fetch.c:201 builtin/pull.c:227 #: builtin/fetch.c:201 builtin/pull.c:231
msgid "specify fetch refmap" msgid "specify fetch refmap"
msgstr "" msgstr ""


#: builtin/fetch.c:208 builtin/pull.c:240 #: builtin/fetch.c:208 builtin/pull.c:244
msgid "report that we have only objects reachable from this object" msgid "report that we have only objects reachable from this object"
msgstr "" msgstr ""


@ -14230,7 +14230,7 @@ msgstr ""
msgid "run 'maintenance --auto' after fetching" msgid "run 'maintenance --auto' after fetching"
msgstr "" msgstr ""


#: builtin/fetch.c:217 builtin/pull.c:243 #: builtin/fetch.c:217 builtin/pull.c:247
msgid "check for forced-updates on all updated branches" msgid "check for forced-updates on all updated branches"
msgstr "" msgstr ""


@ -16834,31 +16834,31 @@ msgstr ""
msgid "Available custom strategies are:" msgid "Available custom strategies are:"
msgstr "" msgstr ""


#: builtin/merge.c:257 builtin/pull.c:133 #: builtin/merge.c:257 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge" msgid "do not show a diffstat at the end of the merge"
msgstr "" msgstr ""


#: builtin/merge.c:260 builtin/pull.c:136 #: builtin/merge.c:260 builtin/pull.c:137
msgid "show a diffstat at the end of the merge" msgid "show a diffstat at the end of the merge"
msgstr "" msgstr ""


#: builtin/merge.c:261 builtin/pull.c:139 #: builtin/merge.c:261 builtin/pull.c:140
msgid "(synonym to --stat)" msgid "(synonym to --stat)"
msgstr "" msgstr ""


#: builtin/merge.c:263 builtin/pull.c:142 #: builtin/merge.c:263 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message" msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "" msgstr ""


#: builtin/merge.c:266 builtin/pull.c:148 #: builtin/merge.c:266 builtin/pull.c:149
msgid "create a single commit instead of doing a merge" msgid "create a single commit instead of doing a merge"
msgstr "" msgstr ""


#: builtin/merge.c:268 builtin/pull.c:151 #: builtin/merge.c:268 builtin/pull.c:152
msgid "perform a commit if the merge succeeds (default)" msgid "perform a commit if the merge succeeds (default)"
msgstr "" msgstr ""


#: builtin/merge.c:270 builtin/pull.c:154 #: builtin/merge.c:270 builtin/pull.c:155
msgid "edit message before committing" msgid "edit message before committing"
msgstr "" msgstr ""


@ -16866,28 +16866,28 @@ msgstr ""
msgid "allow fast-forward (default)" msgid "allow fast-forward (default)"
msgstr "" msgstr ""


#: builtin/merge.c:274 builtin/pull.c:161 #: builtin/merge.c:274 builtin/pull.c:162
msgid "abort if fast-forward is not possible" msgid "abort if fast-forward is not possible"
msgstr "" msgstr ""


#: builtin/merge.c:278 builtin/pull.c:164 #: builtin/merge.c:278 builtin/pull.c:168
msgid "verify that the named commit has a valid GPG signature" msgid "verify that the named commit has a valid GPG signature"
msgstr "" msgstr ""


#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:168 #: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
#: builtin/rebase.c:1117 builtin/revert.c:114 #: builtin/rebase.c:1117 builtin/revert.c:114
msgid "strategy" msgid "strategy"
msgstr "" msgstr ""


#: builtin/merge.c:280 builtin/pull.c:169 #: builtin/merge.c:280 builtin/pull.c:173
msgid "merge strategy to use" msgid "merge strategy to use"
msgstr "" msgstr ""


#: builtin/merge.c:281 builtin/pull.c:172 #: builtin/merge.c:281 builtin/pull.c:176
msgid "option=value" msgid "option=value"
msgstr "" msgstr ""


#: builtin/merge.c:282 builtin/pull.c:173 #: builtin/merge.c:282 builtin/pull.c:177
msgid "option for selected merge strategy" msgid "option for selected merge strategy"
msgstr "" msgstr ""


@ -16907,7 +16907,7 @@ msgstr ""
msgid "continue the current in-progress merge" msgid "continue the current in-progress merge"
msgstr "" msgstr ""


#: builtin/merge.c:297 builtin/pull.c:180 #: builtin/merge.c:297 builtin/pull.c:184
msgid "allow merging unrelated histories" msgid "allow merging unrelated histories"
msgstr "" msgstr ""


@ -18257,61 +18257,65 @@ msgstr ""
msgid "git pull [<options>] [<repository> [<refspec>...]]" msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "" msgstr ""


#: builtin/pull.c:123 #: builtin/pull.c:124
msgid "control for recursive fetching of submodules" msgid "control for recursive fetching of submodules"
msgstr "" msgstr ""


#: builtin/pull.c:127 #: builtin/pull.c:128
msgid "Options related to merging" msgid "Options related to merging"
msgstr "" msgstr ""


#: builtin/pull.c:130 #: builtin/pull.c:131
msgid "incorporate changes by rebasing rather than merging" msgid "incorporate changes by rebasing rather than merging"
msgstr "" msgstr ""


#: builtin/pull.c:158 builtin/revert.c:126 #: builtin/pull.c:159 builtin/revert.c:126
msgid "allow fast-forward" msgid "allow fast-forward"
msgstr "" msgstr ""


#: builtin/pull.c:167 parse-options.h:339 #: builtin/pull.c:165
msgid "control use of pre-merge-commit and commit-msg hooks"
msgstr ""

#: builtin/pull.c:171 parse-options.h:338
msgid "automatically stash/stash pop before and after" msgid "automatically stash/stash pop before and after"
msgstr "" msgstr ""


#: builtin/pull.c:183 #: builtin/pull.c:187
msgid "Options related to fetching" msgid "Options related to fetching"
msgstr "" msgstr ""


#: builtin/pull.c:193 #: builtin/pull.c:197
msgid "force overwrite of local branch" msgid "force overwrite of local branch"
msgstr "" msgstr ""


#: builtin/pull.c:201 #: builtin/pull.c:205
msgid "number of submodules pulled in parallel" msgid "number of submodules pulled in parallel"
msgstr "" msgstr ""


#: builtin/pull.c:317 #: builtin/pull.c:321
#, c-format #, c-format
msgid "Invalid value for pull.ff: %s" msgid "Invalid value for pull.ff: %s"
msgstr "" msgstr ""


#: builtin/pull.c:445 #: builtin/pull.c:449
msgid "" msgid ""
"There is no candidate for rebasing against among the refs that you just " "There is no candidate for rebasing against among the refs that you just "
"fetched." "fetched."
msgstr "" msgstr ""


#: builtin/pull.c:447 #: builtin/pull.c:451
msgid "" msgid ""
"There are no candidates for merging among the refs that you just fetched." "There are no candidates for merging among the refs that you just fetched."
msgstr "" msgstr ""


#: builtin/pull.c:448 #: builtin/pull.c:452
msgid "" msgid ""
"Generally this means that you provided a wildcard refspec which had no\n" "Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end." "matches on the remote end."
msgstr "" msgstr ""


#: builtin/pull.c:451 #: builtin/pull.c:455
#, c-format #, c-format
msgid "" msgid ""
"You asked to pull from the remote '%s', but did not specify\n" "You asked to pull from the remote '%s', but did not specify\n"
@ -18319,57 +18323,57 @@ msgid ""
"for your current branch, you must specify a branch on the command line." "for your current branch, you must specify a branch on the command line."
msgstr "" msgstr ""


#: builtin/pull.c:456 builtin/rebase.c:951 #: builtin/pull.c:460 builtin/rebase.c:951
msgid "You are not currently on a branch." msgid "You are not currently on a branch."
msgstr "" msgstr ""


#: builtin/pull.c:458 builtin/pull.c:473 #: builtin/pull.c:462 builtin/pull.c:477
msgid "Please specify which branch you want to rebase against." msgid "Please specify which branch you want to rebase against."
msgstr "" msgstr ""


#: builtin/pull.c:460 builtin/pull.c:475 #: builtin/pull.c:464 builtin/pull.c:479
msgid "Please specify which branch you want to merge with." msgid "Please specify which branch you want to merge with."
msgstr "" msgstr ""


#: builtin/pull.c:461 builtin/pull.c:476 #: builtin/pull.c:465 builtin/pull.c:480
msgid "See git-pull(1) for details." msgid "See git-pull(1) for details."
msgstr "" msgstr ""


#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478 #: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
#: builtin/rebase.c:957 #: builtin/rebase.c:957
msgid "<remote>" msgid "<remote>"
msgstr "" msgstr ""


#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483 #: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
msgid "<branch>" msgid "<branch>"
msgstr "" msgstr ""


#: builtin/pull.c:471 builtin/rebase.c:949 #: builtin/pull.c:475 builtin/rebase.c:949
msgid "There is no tracking information for the current branch." msgid "There is no tracking information for the current branch."
msgstr "" msgstr ""


#: builtin/pull.c:480 #: builtin/pull.c:484
msgid "" msgid ""
"If you wish to set tracking information for this branch you can do so with:" "If you wish to set tracking information for this branch you can do so with:"
msgstr "" msgstr ""


#: builtin/pull.c:485 #: builtin/pull.c:489
#, c-format #, c-format
msgid "" msgid ""
"Your configuration specifies to merge with the ref '%s'\n" "Your configuration specifies to merge with the ref '%s'\n"
"from the remote, but no such ref was fetched." "from the remote, but no such ref was fetched."
msgstr "" msgstr ""


#: builtin/pull.c:596 #: builtin/pull.c:600
#, c-format #, c-format
msgid "unable to access commit %s" msgid "unable to access commit %s"
msgstr "" msgstr ""


#: builtin/pull.c:902 #: builtin/pull.c:908
msgid "ignoring --verify-signatures for rebase" msgid "ignoring --verify-signatures for rebase"
msgstr "" msgstr ""


#: builtin/pull.c:936 #: builtin/pull.c:942
msgid "" msgid ""
"You have divergent branches and need to specify how to reconcile them.\n" "You have divergent branches and need to specify how to reconcile them.\n"
"You can do so by running one of the following commands sometime before\n" "You can do so by running one of the following commands sometime before\n"
@ -18386,19 +18390,19 @@ msgid ""
"invocation.\n" "invocation.\n"
msgstr "" msgstr ""


#: builtin/pull.c:1010 #: builtin/pull.c:1016
msgid "Updating an unborn branch with changes added to the index." msgid "Updating an unborn branch with changes added to the index."
msgstr "" msgstr ""


#: builtin/pull.c:1014 #: builtin/pull.c:1020
msgid "pull with rebase" msgid "pull with rebase"
msgstr "" msgstr ""


#: builtin/pull.c:1015 #: builtin/pull.c:1021
msgid "please commit or stash them." msgid "please commit or stash them."
msgstr "" msgstr ""


#: builtin/pull.c:1040 #: builtin/pull.c:1046
#, c-format #, c-format
msgid "" msgid ""
"fetch updated the current branch head.\n" "fetch updated the current branch head.\n"
@ -18406,7 +18410,7 @@ msgid ""
"commit %s." "commit %s."
msgstr "" msgstr ""


#: builtin/pull.c:1046 #: builtin/pull.c:1052
#, c-format #, c-format
msgid "" msgid ""
"Cannot fast-forward your working tree.\n" "Cannot fast-forward your working tree.\n"
@ -18417,23 +18421,23 @@ msgid ""
"to recover." "to recover."
msgstr "" msgstr ""


#: builtin/pull.c:1061 #: builtin/pull.c:1067
msgid "Cannot merge multiple branches into empty head." msgid "Cannot merge multiple branches into empty head."
msgstr "" msgstr ""


#: builtin/pull.c:1066 #: builtin/pull.c:1072
msgid "Cannot rebase onto multiple branches." msgid "Cannot rebase onto multiple branches."
msgstr "" msgstr ""


#: builtin/pull.c:1068 #: builtin/pull.c:1074
msgid "Cannot fast-forward to multiple branches." msgid "Cannot fast-forward to multiple branches."
msgstr "" msgstr ""


#: builtin/pull.c:1082 #: builtin/pull.c:1088
msgid "Need to specify how to reconcile divergent branches." msgid "Need to specify how to reconcile divergent branches."
msgstr "" msgstr ""


#: builtin/pull.c:1096 #: builtin/pull.c:1102
msgid "cannot rebase with locally recorded submodule modifications" msgid "cannot rebase with locally recorded submodule modifications"
msgstr "" msgstr ""


@ -23239,27 +23243,27 @@ msgstr ""
msgid "no-op (backward compatibility)" msgid "no-op (backward compatibility)"
msgstr "" msgstr ""


#: parse-options.h:309 #: parse-options.h:308
msgid "be more verbose" msgid "be more verbose"
msgstr "" msgstr ""


#: parse-options.h:311 #: parse-options.h:310
msgid "be more quiet" msgid "be more quiet"
msgstr "" msgstr ""


#: parse-options.h:317 #: parse-options.h:316
msgid "use <n> digits to display object names" msgid "use <n> digits to display object names"
msgstr "" msgstr ""


#: parse-options.h:336 #: parse-options.h:335
msgid "how to strip spaces and #comments from message" msgid "how to strip spaces and #comments from message"
msgstr "" msgstr ""


#: parse-options.h:337 #: parse-options.h:336
msgid "read pathspec from file" msgid "read pathspec from file"
msgstr "" msgstr ""


#: parse-options.h:338 #: parse-options.h:337
msgid "" msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character" "with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr "" msgstr ""

Write Preview
Loading…
Cancel
Save