l10n: git.pot: v2.6.0 round 2 (3 improvements)

Introduce three i18n improvements from the following commits:

* tag, update-ref: improve description of option "create-reflog"
* pull: don't mark values for option "rebase" for translation
* show-ref: place angle brackets around variables in usage string

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

diff --git a/po/git.pot b/po/git.pot
index f77faf4fdb5e180d70074cf5aff4f587f33f8010..d275f4042945bb5f5e3a04af37c5a240f277bc4b 100644 (file)
--- a/po/git.pot
+++ b/po/git.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

-"POT-Creation-Date: 2015-09-05 09:16+0800\n"
+"POT-Creation-Date: 2015-09-15 06:45+0800\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -327,8 +327,8 @@ msgstr ""
 msgid "invalid color value: %.*s"
 msgstr ""
 
 msgid "invalid color value: %.*s"
 msgstr ""
 

-#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1489
-#: builtin/am.c:2101
+#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1516
+#: builtin/am.c:2128

 #, c-format
 msgid "could not parse %s"
 msgstr ""
 #, c-format
 msgid "could not parse %s"
 msgstr ""


@@ -634,7 +634,7 @@ msgstr ""
 msgid "failed to read the cache"
 msgstr ""
 
 msgid "failed to read the cache"
 msgstr ""
 

-#: merge.c:94 builtin/am.c:1974 builtin/am.c:2009 builtin/checkout.c:375
+#: merge.c:94 builtin/am.c:2001 builtin/am.c:2036 builtin/checkout.c:375

 #: builtin/checkout.c:586 builtin/clone.c:715
 msgid "unable to write new index file"
 msgstr ""
 #: builtin/checkout.c:586 builtin/clone.c:715
 msgid "unable to write new index file"
 msgstr ""


@@ -2183,7 +2183,7 @@ msgstr ""
 msgid "could not stat %s"
 msgstr ""
 
 msgid "could not stat %s"
 msgstr ""
 

-#: builtin/am.c:270 builtin/am.c:1318 builtin/commit.c:737
+#: builtin/am.c:270 builtin/am.c:1345 builtin/commit.c:737

 #: builtin/merge.c:1079
 #, c-format
 msgid "could not read '%s'"
 #: builtin/merge.c:1079
 #, c-format
 msgid "could not read '%s'"


@@ -2275,65 +2275,65 @@ msgstr ""
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 

-#: builtin/am.c:1312
+#: builtin/am.c:1339

 msgid "Patch is empty. Was it split wrong?"
 msgstr ""
 
 msgid "Patch is empty. Was it split wrong?"
 msgstr ""
 

-#: builtin/am.c:1386 builtin/log.c:1345
+#: builtin/am.c:1413 builtin/log.c:1345

 #, c-format
 msgid "invalid ident line: %s"
 msgstr ""
 
 #, c-format
 msgid "invalid ident line: %s"
 msgstr ""
 

-#: builtin/am.c:1413
+#: builtin/am.c:1440

 #, c-format
 msgid "unable to parse commit %s"
 msgstr ""
 
 #, c-format
 msgid "unable to parse commit %s"
 msgstr ""
 

-#: builtin/am.c:1587
+#: builtin/am.c:1614

 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 

-#: builtin/am.c:1589
+#: builtin/am.c:1616

 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 

-#: builtin/am.c:1608
+#: builtin/am.c:1635

 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
 msgstr ""
 
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
 msgstr ""
 

-#: builtin/am.c:1614
+#: builtin/am.c:1641

 msgid "Falling back to patching base and 3-way merge..."
 msgstr ""
 
 msgid "Falling back to patching base and 3-way merge..."
 msgstr ""
 

-#: builtin/am.c:1639
+#: builtin/am.c:1666

 msgid "Failed to merge in the changes."
 msgstr ""
 
 msgid "Failed to merge in the changes."
 msgstr ""
 

-#: builtin/am.c:1664 builtin/merge.c:632
+#: builtin/am.c:1691 builtin/merge.c:632

 msgid "git write-tree failed to write a tree"
 msgstr ""
 
 msgid "git write-tree failed to write a tree"
 msgstr ""
 

-#: builtin/am.c:1671
+#: builtin/am.c:1698

 msgid "applying to an empty history"
 msgstr ""
 
 msgid "applying to an empty history"
 msgstr ""
 

-#: builtin/am.c:1684 builtin/commit.c:1752 builtin/merge.c:829
+#: builtin/am.c:1711 builtin/commit.c:1752 builtin/merge.c:829

 #: builtin/merge.c:854
 msgid "failed to write commit object"
 msgstr ""
 
 #: builtin/merge.c:854
 msgid "failed to write commit object"
 msgstr ""
 

-#: builtin/am.c:1716 builtin/am.c:1720
+#: builtin/am.c:1743 builtin/am.c:1747

 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr ""
 
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr ""
 

-#: builtin/am.c:1736
+#: builtin/am.c:1763

 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr ""
 
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr ""
 

-#: builtin/am.c:1741
+#: builtin/am.c:1768

 msgid "Commit Body is:"
 msgstr ""
 
 msgid "Commit Body is:"
 msgstr ""
 


@@ -2341,146 +2341,146 @@ msgstr ""
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
 #. in your translation. The program will only accept English
 #. input at this point.
 #.

-#: builtin/am.c:1751
+#: builtin/am.c:1778

 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr ""
 
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr ""
 

-#: builtin/am.c:1801
+#: builtin/am.c:1828

 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr ""
 
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr ""
 

-#: builtin/am.c:1836 builtin/am.c:1907
+#: builtin/am.c:1863 builtin/am.c:1934

 #, c-format
 msgid "Applying: %.*s"
 msgstr ""
 
 #, c-format
 msgid "Applying: %.*s"
 msgstr ""
 

-#: builtin/am.c:1852
+#: builtin/am.c:1879

 msgid "No changes -- Patch already applied."
 msgstr ""
 
 msgid "No changes -- Patch already applied."
 msgstr ""
 

-#: builtin/am.c:1860
+#: builtin/am.c:1887

 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr ""
 
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr ""
 

-#: builtin/am.c:1866
+#: builtin/am.c:1893

 #, c-format
 msgid "The copy of the patch that failed is found in: %s"
 msgstr ""
 
 #, c-format
 msgid "The copy of the patch that failed is found in: %s"
 msgstr ""
 

-#: builtin/am.c:1910
+#: builtin/am.c:1937

 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
 "already introduced the same changes; you might want to skip this patch."
 msgstr ""
 
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
 "already introduced the same changes; you might want to skip this patch."
 msgstr ""
 

-#: builtin/am.c:1917
+#: builtin/am.c:1944

 msgid ""
 "You still have unmerged paths in your index.\n"
 "Did you forget to use 'git add'?"
 msgstr ""
 
 msgid ""
 "You still have unmerged paths in your index.\n"
 "Did you forget to use 'git add'?"
 msgstr ""
 

-#: builtin/am.c:2025 builtin/am.c:2029 builtin/am.c:2041 builtin/reset.c:308
+#: builtin/am.c:2052 builtin/am.c:2056 builtin/am.c:2068 builtin/reset.c:308

 #: builtin/reset.c:316
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr ""
 
 #: builtin/reset.c:316
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr ""
 

-#: builtin/am.c:2077
+#: builtin/am.c:2104

 msgid "failed to clean index"
 msgstr ""
 
 msgid "failed to clean index"
 msgstr ""
 

-#: builtin/am.c:2111
+#: builtin/am.c:2138

 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
 msgstr ""
 
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
 msgstr ""
 

-#: builtin/am.c:2172
+#: builtin/am.c:2199

 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr ""
 

-#: builtin/am.c:2194
+#: builtin/am.c:2221

 msgid "git am [options] [(<mbox>|<Maildir>)...]"
 msgstr ""
 
 msgid "git am [options] [(<mbox>|<Maildir>)...]"
 msgstr ""
 

-#: builtin/am.c:2195
+#: builtin/am.c:2222

 msgid "git am [options] (--continue | --skip | --abort)"
 msgstr ""
 
 msgid "git am [options] (--continue | --skip | --abort)"
 msgstr ""
 

-#: builtin/am.c:2201
+#: builtin/am.c:2228

 msgid "run interactively"
 msgstr ""
 
 msgid "run interactively"
 msgstr ""
 

-#: builtin/am.c:2203
+#: builtin/am.c:2230

 msgid "historical option -- no-op"
 msgstr ""
 
 msgid "historical option -- no-op"
 msgstr ""
 

-#: builtin/am.c:2205
+#: builtin/am.c:2232

 msgid "allow fall back on 3way merging if needed"
 msgstr ""
 
 msgid "allow fall back on 3way merging if needed"
 msgstr ""
 

-#: builtin/am.c:2206 builtin/init-db.c:509 builtin/prune-packed.c:57
+#: builtin/am.c:2233 builtin/init-db.c:509 builtin/prune-packed.c:57

 #: builtin/repack.c:171
 msgid "be quiet"
 msgstr ""
 
 #: builtin/repack.c:171
 msgid "be quiet"
 msgstr ""
 

-#: builtin/am.c:2208
+#: builtin/am.c:2235

 msgid "add a Signed-off-by line to the commit message"
 msgstr ""
 
 msgid "add a Signed-off-by line to the commit message"
 msgstr ""
 

-#: builtin/am.c:2211
+#: builtin/am.c:2238

 msgid "recode into utf8 (default)"
 msgstr ""
 
 msgid "recode into utf8 (default)"
 msgstr ""
 

-#: builtin/am.c:2213
+#: builtin/am.c:2240

 msgid "pass -k flag to git-mailinfo"
 msgstr ""
 
 msgid "pass -k flag to git-mailinfo"
 msgstr ""
 

-#: builtin/am.c:2215
+#: builtin/am.c:2242

 msgid "pass -b flag to git-mailinfo"
 msgstr ""
 
 msgid "pass -b flag to git-mailinfo"
 msgstr ""
 

-#: builtin/am.c:2217
+#: builtin/am.c:2244

 msgid "pass -m flag to git-mailinfo"
 msgstr ""
 
 msgid "pass -m flag to git-mailinfo"
 msgstr ""
 

-#: builtin/am.c:2219
+#: builtin/am.c:2246

 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr ""
 
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr ""
 

-#: builtin/am.c:2222
+#: builtin/am.c:2249

 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 

-#: builtin/am.c:2225
+#: builtin/am.c:2252

 msgid "strip everything before a scissors line"
 msgstr ""
 
 msgid "strip everything before a scissors line"
 msgstr ""
 

-#: builtin/am.c:2226 builtin/apply.c:4563
+#: builtin/am.c:2253 builtin/apply.c:4563

 msgid "action"
 msgstr ""
 
 msgid "action"
 msgstr ""
 

-#: builtin/am.c:2227 builtin/am.c:2230 builtin/am.c:2233 builtin/am.c:2236
-#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248
-#: builtin/am.c:2254
+#: builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263
+#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
+#: builtin/am.c:2281

 msgid "pass it through git-apply"
 msgstr ""
 
 msgid "pass it through git-apply"
 msgstr ""
 

-#: builtin/am.c:2235 builtin/apply.c:4587
+#: builtin/am.c:2262 builtin/apply.c:4587

 msgid "root"
 msgstr ""
 
 msgid "root"
 msgstr ""
 

-#: builtin/am.c:2238 builtin/am.c:2241 builtin/apply.c:4525
+#: builtin/am.c:2265 builtin/am.c:2268 builtin/apply.c:4525

 #: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93
 #: builtin/pull.c:167
 msgid "path"
 msgstr ""
 
 #: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93
 #: builtin/pull.c:167
 msgid "path"
 msgstr ""
 

-#: builtin/am.c:2244 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672
+#: builtin/am.c:2271 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672

 #: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127
 #: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664
 #: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132
 #: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127
 #: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664
 #: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132


@@ -2488,82 +2488,82 @@ msgstr ""
 msgid "n"
 msgstr ""
 
 msgid "n"
 msgstr ""
 

-#: builtin/am.c:2247 builtin/apply.c:4531
+#: builtin/am.c:2274 builtin/apply.c:4531

 msgid "num"
 msgstr ""
 
 msgid "num"
 msgstr ""
 

-#: builtin/am.c:2250 builtin/for-each-ref.c:34 builtin/replace.c:438
+#: builtin/am.c:2277 builtin/for-each-ref.c:34 builtin/replace.c:438

 msgid "format"
 msgstr ""
 
 msgid "format"
 msgstr ""
 

-#: builtin/am.c:2251
+#: builtin/am.c:2278

 msgid "format the patch(es) are in"
 msgstr ""
 
 msgid "format the patch(es) are in"
 msgstr ""
 

-#: builtin/am.c:2257
+#: builtin/am.c:2284

 msgid "override error message when patch failure occurs"
 msgstr ""
 
 msgid "override error message when patch failure occurs"
 msgstr ""
 

-#: builtin/am.c:2259
+#: builtin/am.c:2286

 msgid "continue applying patches after resolving a conflict"
 msgstr ""
 
 msgid "continue applying patches after resolving a conflict"
 msgstr ""
 

-#: builtin/am.c:2262
+#: builtin/am.c:2289

 msgid "synonyms for --continue"
 msgstr ""
 
 msgid "synonyms for --continue"
 msgstr ""
 

-#: builtin/am.c:2265
+#: builtin/am.c:2292

 msgid "skip the current patch"
 msgstr ""
 
 msgid "skip the current patch"
 msgstr ""
 

-#: builtin/am.c:2268
+#: builtin/am.c:2295

 msgid "restore the original branch and abort the patching operation."
 msgstr ""
 
 msgid "restore the original branch and abort the patching operation."
 msgstr ""
 

-#: builtin/am.c:2272
+#: builtin/am.c:2299

 msgid "lie about committer date"
 msgstr ""
 
 msgid "lie about committer date"
 msgstr ""
 

-#: builtin/am.c:2274
+#: builtin/am.c:2301

 msgid "use current timestamp for author date"
 msgstr ""
 
 msgid "use current timestamp for author date"
 msgstr ""
 

-#: builtin/am.c:2276 builtin/commit.c:1590 builtin/merge.c:225
+#: builtin/am.c:2303 builtin/commit.c:1590 builtin/merge.c:225

 #: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606
 msgid "key-id"
 msgstr ""
 
 #: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606
 msgid "key-id"
 msgstr ""
 

-#: builtin/am.c:2277
+#: builtin/am.c:2304

 msgid "GPG-sign commits"
 msgstr ""
 
 msgid "GPG-sign commits"
 msgstr ""
 

-#: builtin/am.c:2280
+#: builtin/am.c:2307

 msgid "(internal use for git-rebase)"
 msgstr ""
 
 msgid "(internal use for git-rebase)"
 msgstr ""
 

-#: builtin/am.c:2295
+#: builtin/am.c:2322

 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
 msgstr ""
 
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
 msgstr ""
 

-#: builtin/am.c:2302
+#: builtin/am.c:2329

 msgid "failed to read the index"
 msgstr ""
 
 msgid "failed to read the index"
 msgstr ""
 

-#: builtin/am.c:2317
+#: builtin/am.c:2344

 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 

-#: builtin/am.c:2341
+#: builtin/am.c:2368

 #, c-format
 msgid ""
 "Stray %s directory found.\n"
 "Use \"git am --abort\" to remove it."
 msgstr ""
 
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
 "Use \"git am --abort\" to remove it."
 msgstr ""
 

-#: builtin/am.c:2347
+#: builtin/am.c:2374

 msgid "Resolve operation not in progress, we are not resuming."
 msgstr ""
 
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr ""
 


@@ -8213,10 +8213,6 @@ msgstr ""
 msgid "Options related to merging"
 msgstr ""
 
 msgid "Options related to merging"
 msgstr ""
 

-#: builtin/pull.c:115
-msgid "false|true|preserve"
-msgstr ""
-

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


@@ -9778,7 +9774,7 @@ msgid ""
 msgstr ""
 
 #: builtin/show-ref.c:11
 msgstr ""
 
 #: builtin/show-ref.c:11

-msgid "git show-ref --exclude-existing[=pattern] < ref-list"
+msgid "git show-ref --exclude-existing[=<pattern>] < <ref-list>"

 msgstr ""
 
 #: builtin/show-ref.c:170
 msgstr ""
 
 #: builtin/show-ref.c:170


@@ -9990,7 +9986,7 @@ msgid "replace the tag if exists"
 msgstr ""
 
 #: builtin/tag.c:609 builtin/update-ref.c:368
 msgstr ""
 
 #: builtin/tag.c:609 builtin/update-ref.c:368

-msgid "create_reflog"
+msgid "create a reflog"

 msgstr ""
 
 #: builtin/tag.c:611
 msgstr ""
 
 #: builtin/tag.c:611