Commits

Katsunori FUJIWARA committed 264f861 Merge

EXPORT: merge default => sync-line

Comments (0)

Files changed (3)

-0188ddfa844ed5f9cf2eed46765dcaa7dcad89f6
+f94ead93406764ffd0c3febfc2ea70d36a2a28bb
 msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2012-10-31 18:16+0900\n"
+"POT-Creation-Date: 2012-11-30 17:45+0900\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"
 msgid "Options"
 msgstr ""
 
-#: doc/gendoc.py:86 doc/gendoc.py:120 mercurial/commands.py:3443
+#: doc/gendoc.py:86 doc/gendoc.py:120 mercurial/commands.py:3444
 msgid "Commands"
 msgstr ""
 
-#: doc/gendoc.py:104 mercurial/commands.py:3444
+#: doc/gendoc.py:104 mercurial/commands.py:3445
 msgid "Extensions"
 msgstr ""
 
 
 #: hgext/children.py:47 hgext/churn.py:185 hgext/convert/__init__.py:302
 #: hgext/extdiff.py:273 hgext/extdiff.py:275 hgext/fetch.py:152
-#: hgext/graphlog.py:31 hgext/graphlog.py:41 hgext/mq.py:2041 hgext/mq.py:2121
-#: hgext/mq.py:2917 hgext/patchbomb.py:177 hgext/patchbomb.py:181
+#: hgext/graphlog.py:31 hgext/graphlog.py:41 hgext/mq.py:2052 hgext/mq.py:2132
+#: hgext/mq.py:2928 hgext/patchbomb.py:177 hgext/patchbomb.py:181
 #: hgext/rebase.py:33 hgext/rebase.py:37 hgext/rebase.py:40 hgext/rebase.py:42
 #: hgext/transplant.py:497 hgext/transplant.py:498 hgext/transplant.py:500
 #: mercurial/commands.py:214 mercurial/commands.py:312
 #: mercurial/commands.py:383 mercurial/commands.py:384
-#: mercurial/commands.py:759 mercurial/commands.py:998
-#: mercurial/commands.py:1003 mercurial/commands.py:1075
-#: mercurial/commands.py:1113 mercurial/commands.py:1114
-#: mercurial/commands.py:1865 mercurial/commands.py:2176
-#: mercurial/commands.py:2188 mercurial/commands.py:2445
-#: mercurial/commands.py:2493 mercurial/commands.py:2494
-#: mercurial/commands.py:2580 mercurial/commands.py:2690
-#: mercurial/commands.py:2898 mercurial/commands.py:3488
-#: mercurial/commands.py:3896 mercurial/commands.py:3964
-#: mercurial/commands.py:4015 mercurial/commands.py:4025
-#: mercurial/commands.py:4191 mercurial/commands.py:4246
-#: mercurial/commands.py:4363 mercurial/commands.py:4411
-#: mercurial/commands.py:4503 mercurial/commands.py:4607
-#: mercurial/commands.py:4680 mercurial/commands.py:5025
-#: mercurial/commands.py:5339 mercurial/commands.py:5340
-#: mercurial/commands.py:5628 mercurial/commands.py:5820
+#: mercurial/commands.py:759 mercurial/commands.py:999
+#: mercurial/commands.py:1004 mercurial/commands.py:1076
+#: mercurial/commands.py:1114 mercurial/commands.py:1115
+#: mercurial/commands.py:1866 mercurial/commands.py:2177
+#: mercurial/commands.py:2189 mercurial/commands.py:2446
+#: mercurial/commands.py:2494 mercurial/commands.py:2495
+#: mercurial/commands.py:2581 mercurial/commands.py:2691
+#: mercurial/commands.py:2899 mercurial/commands.py:3489
+#: mercurial/commands.py:3897 mercurial/commands.py:3965
+#: mercurial/commands.py:4016 mercurial/commands.py:4026
+#: mercurial/commands.py:4192 mercurial/commands.py:4247
+#: mercurial/commands.py:4364 mercurial/commands.py:4412
+#: mercurial/commands.py:4504 mercurial/commands.py:4608
+#: mercurial/commands.py:4681 mercurial/commands.py:5026
+#: mercurial/commands.py:5340 mercurial/commands.py:5341
+#: mercurial/commands.py:5639 mercurial/commands.py:5831
 msgid "REV"
 msgstr ""
 
 msgid "count rate for the specified revision or range"
 msgstr ""
 
-#: hgext/churn.py:187 hgext/graphlog.py:27 hgext/mq.py:2386 hgext/mq.py:2440
-#: mercurial/commands.py:82 mercurial/commands.py:2697
-#: mercurial/commands.py:4011 mercurial/commands.py:5024
-#: mercurial/commands.py:5819
+#: hgext/churn.py:187 hgext/graphlog.py:27 hgext/mq.py:2397 hgext/mq.py:2451
+#: mercurial/commands.py:82 mercurial/commands.py:2698
+#: mercurial/commands.py:4012 mercurial/commands.py:5025
+#: mercurial/commands.py:5830
 msgid "DATE"
 msgstr ""
 
 msgid "count rate for revisions matching date spec"
 msgstr ""
 
-#: hgext/churn.py:189 mercurial/commands.py:91 mercurial/commands.py:5169
+#: hgext/churn.py:189 mercurial/commands.py:91 mercurial/commands.py:5170
 msgid "TEMPLATE"
 msgstr ""
 
 msgid "template to group changesets"
 msgstr ""
 
-#: hgext/churn.py:191 mercurial/commands.py:1074 mercurial/commands.py:1928
-#: mercurial/commands.py:2578
+#: hgext/churn.py:191 mercurial/commands.py:1075 mercurial/commands.py:1929
+#: mercurial/commands.py:2579
 msgid "FORMAT"
 msgstr ""
 
 #: hgext/convert/__init__.py:304 hgext/convert/__init__.py:306
 #: hgext/convert/__init__.py:308 hgext/convert/__init__.py:310
 #: hgext/inotify/__init__.py:91 hgext/keyword.py:364 hgext/rebase.py:48
-#: mercurial/commands.py:77 mercurial/commands.py:1590
-#: mercurial/commands.py:1971 mercurial/commands.py:3895
-#: mercurial/commands.py:5150 mercurial/commands.py:5153
-#: mercurial/commands.py:5163 mercurial/commands.py:5165
-#: mercurial/commands.py:5166 mercurial/commands.py:5172
+#: mercurial/commands.py:77 mercurial/commands.py:1591
+#: mercurial/commands.py:1972 mercurial/commands.py:3896
+#: mercurial/commands.py:5151 mercurial/commands.py:5154
+#: mercurial/commands.py:5164 mercurial/commands.py:5166
+#: mercurial/commands.py:5167 mercurial/commands.py:5173
 msgid "FILE"
 msgstr ""
 
 
 #: hgext/color.py:380 hgext/convert/__init__.py:298
 #: hgext/convert/__init__.py:300 hgext/pager.py:138 mercurial/commands.py:313
-#: mercurial/commands.py:1005 mercurial/commands.py:1890
+#: mercurial/commands.py:1006 mercurial/commands.py:1891
 msgid "TYPE"
 msgstr ""
 
 msgstr ""
 
 #: hgext/convert/convcmd.py:135 hgext/convert/convcmd.py:383
-#: mercurial/commands.py:1512 mercurial/commands.py:1581
+#: mercurial/commands.py:1513 mercurial/commands.py:1582
 msgid "revisions"
 msgstr ""
 
 msgid "making snapshot of %d files from working directory\n"
 msgstr ""
 
-#: hgext/extdiff.py:126 mercurial/commands.py:2560 mercurial/commands.py:5402
+#: hgext/extdiff.py:126 mercurial/commands.py:2561 mercurial/commands.py:5403
 msgid "cannot specify --rev and --change at the same time"
 msgstr ""
 
 "    will be passed before the names of the directories to compare."
 msgstr ""
 
-#: hgext/extdiff.py:253 hgext/extdiff.py:313 mercurial/commands.py:2509
+#: hgext/extdiff.py:253 hgext/extdiff.py:313 mercurial/commands.py:2510
 msgid ""
 "    When two revision arguments are given, then changes are shown\n"
 "    between those revisions. If only one revision is specified then\n"
 
 #: hgext/extdiff.py:273 hgext/largefiles/lfcommands.py:87
 #: hgext/largefiles/lfcommands.py:111 mercurial/commands.py:759
-#: mercurial/commands.py:2493 mercurial/commands.py:5820
+#: mercurial/commands.py:2494 mercurial/commands.py:5831
 msgid "revision"
 msgstr ""
 
-#: hgext/extdiff.py:275 mercurial/commands.py:2494
+#: hgext/extdiff.py:275 mercurial/commands.py:2495
 msgid "change made by revision"
 msgstr ""
 
 msgstr ""
 
 #: hgext/fetch.py:32 hgext/record.py:429 mercurial/commands.py:413
-#: mercurial/commands.py:1264 mercurial/commands.py:4101
-#: mercurial/commands.py:5055 mercurial/commands.py:5660
-#: mercurial/commands.py:5868
+#: mercurial/commands.py:1265 mercurial/commands.py:4102
+#: mercurial/commands.py:5056 mercurial/commands.py:5671
+#: mercurial/commands.py:5879
 msgid "    See :hg:`help dates` for a list of formats valid for -d/--date."
 msgstr ""
 
-#: hgext/fetch.py:34 hgext/mq.py:2462 hgext/mq.py:2502 hgext/mq.py:2627
-#: hgext/mq.py:3179 hgext/mq.py:3233 mercurial/commands.py:241
+#: hgext/fetch.py:34 hgext/mq.py:2473 hgext/mq.py:2513 hgext/mq.py:2638
+#: hgext/mq.py:3190 hgext/mq.py:3244 mercurial/commands.py:241
 #: mercurial/commands.py:354 mercurial/commands.py:415
 #: mercurial/commands.py:584 mercurial/commands.py:908
-#: mercurial/commands.py:1094 mercurial/commands.py:1210
-#: mercurial/commands.py:1994 mercurial/commands.py:2399
-#: mercurial/commands.py:2551 mercurial/commands.py:2639
-#: mercurial/commands.py:2678 mercurial/commands.py:3700
-#: mercurial/commands.py:3959 mercurial/commands.py:4109
-#: mercurial/commands.py:4207 mercurial/commands.py:4423
-#: mercurial/commands.py:4481 mercurial/commands.py:5057
-#: mercurial/commands.py:5144 mercurial/commands.py:5196
-#: mercurial/commands.py:5298 mercurial/commands.py:5395
-#: mercurial/commands.py:5456 mercurial/commands.py:5665
-#: mercurial/commands.py:5741 mercurial/commands.py:5783
+#: mercurial/commands.py:1095 mercurial/commands.py:1211
+#: mercurial/commands.py:1995 mercurial/commands.py:2400
+#: mercurial/commands.py:2552 mercurial/commands.py:2640
+#: mercurial/commands.py:2679 mercurial/commands.py:3701
+#: mercurial/commands.py:3960 mercurial/commands.py:4110
+#: mercurial/commands.py:4208 mercurial/commands.py:4424
+#: mercurial/commands.py:4482 mercurial/commands.py:5058
+#: mercurial/commands.py:5145 mercurial/commands.py:5197
+#: mercurial/commands.py:5299 mercurial/commands.py:5396
+#: mercurial/commands.py:5457 mercurial/commands.py:5676
+#: mercurial/commands.py:5752 mercurial/commands.py:5794
 msgid ""
 "    Returns 0 on success.\n"
 "    "
 
 #: hgext/fetch.py:61 hgext/keyword.py:356 hgext/largefiles/overrides.py:904
 #: hgext/largefiles/overrides.py:912 mercurial/cmdutil.py:86
-#: mercurial/merge.py:569
+#: mercurial/merge.py:591
 msgid "outstanding uncommitted changes"
 msgstr ""
 
 msgid "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
 msgstr ""
 
-#: hgext/fetch.py:71 mercurial/commands.py:4635
+#: hgext/fetch.py:71 mercurial/commands.py:4636
 #, python-format
 msgid "pulling from %s\n"
 msgstr ""
 
-#: hgext/fetch.py:78 mercurial/commands.py:4651
+#: hgext/fetch.py:78 mercurial/commands.py:4652
 msgid ""
 "other repository doesn't support revision lookup, so a rev cannot be "
 "specified."
 msgid "a specific revision you would like to pull"
 msgstr ""
 
-#: hgext/fetch.py:153 hgext/mq.py:2378 hgext/mq.py:2429
-#: mercurial/commands.py:5631
+#: hgext/fetch.py:153 hgext/mq.py:2389 hgext/mq.py:2440
+#: mercurial/commands.py:5642
 msgid "edit commit message"
 msgstr ""
 
 msgid "do not commit the sigfile after signing"
 msgstr ""
 
-#: hgext/gpg.py:205 mercurial/commands.py:1888 mercurial/commands.py:1889
+#: hgext/gpg.py:205 mercurial/commands.py:1889 mercurial/commands.py:1890
 msgid "ID"
 msgstr ""
 
 msgstr ""
 
 #: hgext/gpg.py:207 hgext/graphlog.py:30 hgext/rebase.py:45
-#: mercurial/commands.py:75 mercurial/commands.py:4014
-#: mercurial/commands.py:5632
+#: mercurial/commands.py:75 mercurial/commands.py:4015
+#: mercurial/commands.py:5643
 msgid "TEXT"
 msgstr ""
 
 "revision graph is also shown.\n"
 msgstr ""
 
-#: hgext/graphlog.py:24 mercurial/commands.py:2891 mercurial/commands.py:4008
+#: hgext/graphlog.py:24 mercurial/commands.py:2892 mercurial/commands.py:4009
 msgid "follow changeset history, or file history across copies and renames"
 msgstr ""
 
-#: hgext/graphlog.py:26 mercurial/commands.py:4010
+#: hgext/graphlog.py:26 mercurial/commands.py:4011
 msgid "only follow the first parent of merge changesets (DEPRECATED)"
 msgstr ""
 
-#: hgext/graphlog.py:27 mercurial/commands.py:4011
+#: hgext/graphlog.py:27 mercurial/commands.py:4012
 msgid "show revisions matching date spec"
 msgstr ""
 
-#: hgext/graphlog.py:28 mercurial/commands.py:4012
+#: hgext/graphlog.py:28 mercurial/commands.py:4013
 msgid "show copied files"
 msgstr ""
 
-#: hgext/graphlog.py:30 mercurial/commands.py:4014
+#: hgext/graphlog.py:30 mercurial/commands.py:4015
 msgid "do case-insensitive search for a given text"
 msgstr ""
 
-#: hgext/graphlog.py:31 mercurial/commands.py:4015
+#: hgext/graphlog.py:31 mercurial/commands.py:4016
 msgid "show the specified revision or range"
 msgstr ""
 
-#: hgext/graphlog.py:32 mercurial/commands.py:4016
+#: hgext/graphlog.py:32 mercurial/commands.py:4017
 msgid "include revisions where files were removed"
 msgstr ""
 
-#: hgext/graphlog.py:33 mercurial/commands.py:4017
+#: hgext/graphlog.py:33 mercurial/commands.py:4018
 msgid "show only merges (DEPRECATED)"
 msgstr ""
 
-#: hgext/graphlog.py:34 hgext/mq.py:2383 hgext/mq.py:2436
-#: mercurial/commands.py:84 mercurial/commands.py:4018
+#: hgext/graphlog.py:34 hgext/mq.py:2394 hgext/mq.py:2447
+#: mercurial/commands.py:84 mercurial/commands.py:4019
 msgid "USER"
 msgstr ""
 
-#: hgext/graphlog.py:34 mercurial/commands.py:4018
+#: hgext/graphlog.py:34 mercurial/commands.py:4019
 msgid "revisions committed by user"
 msgstr ""
 
-#: hgext/graphlog.py:36 mercurial/commands.py:4020
+#: hgext/graphlog.py:36 mercurial/commands.py:4021
 msgid "show only changesets within the given named branch (DEPRECATED)"
 msgstr ""
 
 #: hgext/graphlog.py:37 hgext/graphlog.py:39 hgext/transplant.py:495
-#: mercurial/commands.py:1000 mercurial/commands.py:1115
-#: mercurial/commands.py:3899 mercurial/commands.py:4021
-#: mercurial/commands.py:4023 mercurial/commands.py:4367
-#: mercurial/commands.py:4610 mercurial/commands.py:4683
+#: mercurial/commands.py:1001 mercurial/commands.py:1116
+#: mercurial/commands.py:3900 mercurial/commands.py:4022
+#: mercurial/commands.py:4024 mercurial/commands.py:4368
+#: mercurial/commands.py:4611 mercurial/commands.py:4684
 msgid "BRANCH"
 msgstr ""
 
-#: hgext/graphlog.py:39 mercurial/commands.py:4023
+#: hgext/graphlog.py:39 mercurial/commands.py:4024
 msgid "show changesets within the given named branch"
 msgstr ""
 
-#: hgext/graphlog.py:41 mercurial/commands.py:4025
+#: hgext/graphlog.py:41 mercurial/commands.py:4026
 msgid "do not display revision or any of its ancestors"
 msgstr ""
 
-#: hgext/graphlog.py:42 mercurial/commands.py:4026
+#: hgext/graphlog.py:42 mercurial/commands.py:4027
 msgid "show hidden changesets (DEPRECATED)"
 msgstr ""
 
-#: hgext/graphlog.py:44 mercurial/commands.py:4028
+#: hgext/graphlog.py:44 mercurial/commands.py:4029
 msgid "[OPTION]... [FILE]"
 msgstr ""
 
 
 #: hgext/hgk.py:322 hgext/inotify/__init__.py:87 hgext/inotify/__init__.py:89
 #: mercurial/commands.py:98 mercurial/commands.py:124
-#: mercurial/commands.py:3626 mercurial/commands.py:5152
+#: mercurial/commands.py:3627 mercurial/commands.py:5153
 msgid "NUM"
 msgstr ""
 
 "    "
 msgstr ""
 
-#: hgext/histedit.py:399 hgext/mq.py:3428
+#: hgext/histedit.py:399 hgext/mq.py:3439
 msgid "source has mq patches applied"
 msgstr ""
 
 msgid "only one repo argument allowed with --outgoing"
 msgstr ""
 
-#: hgext/histedit.py:411 hgext/patchbomb.py:278 mercurial/commands.py:1806
-#: mercurial/commands.py:3937 mercurial/commands.py:4401 mercurial/hg.py:495
-#: mercurial/hg.py:547
+#: hgext/histedit.py:411 hgext/patchbomb.py:278 mercurial/commands.py:1807
+#: mercurial/commands.py:3938 mercurial/commands.py:4402 mercurial/hg.py:510
+#: mercurial/hg.py:562
 #, python-format
 msgid "comparing with %s\n"
 msgstr ""
 msgid "directories being watched:\n"
 msgstr ""
 
-#: hgext/inotify/__init__.py:85 mercurial/commands.py:5151
+#: hgext/inotify/__init__.py:85 mercurial/commands.py:5152
 msgid "run server in background"
 msgstr ""
 
-#: hgext/inotify/__init__.py:87 mercurial/commands.py:5152
+#: hgext/inotify/__init__.py:87 mercurial/commands.py:5153
 msgid "used internally by daemon mode"
 msgstr ""
 
 msgid "minutes to sit idle before exiting"
 msgstr ""
 
-#: hgext/inotify/__init__.py:91 mercurial/commands.py:5166
+#: hgext/inotify/__init__.py:91 mercurial/commands.py:5167
 msgid "name of file to write process ID to"
 msgstr ""
 
 msgid "adding %s as a largefile\n"
 msgstr ""
 
-#: hgext/largefiles/overrides.py:128 mercurial/commands.py:2682
-#: mercurial/commands.py:4839
+#: hgext/largefiles/overrides.py:128 mercurial/commands.py:2683
+#: mercurial/commands.py:4840
 msgid "no files specified"
 msgstr ""
 
 msgstr ""
 
 #: hgext/largefiles/overrides.py:158 hgext/largefiles/overrides.py:170
-#: hgext/largefiles/overrides.py:938 mercurial/cmdutil.py:1574
-#: mercurial/cmdutil.py:1869 mercurial/commands.py:4879 mercurial/merge.py:355
+#: hgext/largefiles/overrides.py:938 mercurial/cmdutil.py:1591
+#: mercurial/cmdutil.py:1889 mercurial/commands.py:4880 mercurial/merge.py:377
 #: mercurial/scmutil.py:737
 #, python-format
 msgid "removing %s\n"
 msgid "--normal cannot be used with --large"
 msgstr ""
 
-#: hgext/largefiles/overrides.py:282 mercurial/commands.py:5898
+#: hgext/largefiles/overrides.py:282 mercurial/commands.py:5909
 msgid "uncommitted local changes"
 msgstr ""
 
 msgid "largefile %s not found in repo store or system cache"
 msgstr ""
 
-#: hgext/largefiles/overrides.py:932 mercurial/cmdutil.py:1567
+#: hgext/largefiles/overrides.py:932 mercurial/cmdutil.py:1584
 #, python-format
 msgid "not removing %s: file is already untracked\n"
 msgstr ""
 
-#: hgext/largefiles/overrides.py:1004 hgext/largefiles/overrides.py:1025
+#: hgext/largefiles/overrides.py:1004
 msgid "largefiles: No remote repo\n"
 msgstr ""
 
 msgid "largefiles to upload:\n"
 msgstr ""
 
-#: hgext/largefiles/overrides.py:1027
+#. i18n: column positioning for "hg summary"
+#: hgext/largefiles/overrides.py:1026
+msgid "largefiles: (no remote repo)\n"
+msgstr ""
+
+#. i18n: column positioning for "hg summary"
+#: hgext/largefiles/overrides.py:1029
 msgid "largefiles: (no files to upload)\n"
 msgstr ""
 
-#: hgext/largefiles/overrides.py:1029
+#. i18n: column positioning for "hg summary"
+#: hgext/largefiles/overrides.py:1032
 #, python-format
 msgid "largefiles: %d to upload\n"
 msgstr ""
 msgid "error removing undo: %s\n"
 msgstr ""
 
-#: hgext/mq.py:577 mercurial/cmdutil.py:1897
+#: hgext/mq.py:577 mercurial/cmdutil.py:1917
 #, python-format
 msgid "saving current version of %s as %s\n"
 msgstr ""
 msgid "patch failed, unable to continue (try -v)\n"
 msgstr ""
 
-#: hgext/mq.py:747 hgext/transplant.py:256 mercurial/commands.py:3858
+#: hgext/mq.py:747 hgext/transplant.py:256 mercurial/commands.py:3859
 #, python-format
 msgid "applying %s\n"
 msgstr ""
 msgid "patch %s not in series file"
 msgstr ""
 
-#: hgext/mq.py:916 hgext/mq.py:2530 hgext/mq.py:2663
+#: hgext/mq.py:916 hgext/mq.py:2541 hgext/mq.py:2674
 msgid "no patches applied"
 msgstr ""
 
 msgid "patch %s is not applied"
 msgstr ""
 
-#: hgext/mq.py:1365 hgext/mq.py:1465 hgext/mq.py:1477 hgext/mq.py:2076
-#: hgext/mq.py:2339 hgext/mq.py:2365 hgext/mq.py:2468 hgext/mq.py:2689
-#: hgext/mq.py:2819 hgext/mq.py:3188
+#: hgext/mq.py:1365 hgext/mq.py:1465 hgext/mq.py:1477 hgext/mq.py:2087
+#: hgext/mq.py:2350 hgext/mq.py:2376 hgext/mq.py:2479 hgext/mq.py:2700
+#: hgext/mq.py:2830 hgext/mq.py:3199
 msgid "no patches applied\n"
 msgstr ""
 
 msgid "popping would remove an immutable revision"
 msgstr ""
 
-#: hgext/mq.py:1423 hgext/mq.py:1493 hgext/mq.py:1945
+#: hgext/mq.py:1423 hgext/mq.py:1493 hgext/mq.py:1956
 msgid "see \"hg help phases\" for details"
 msgstr ""
 
 msgid "cannot refresh immutable revision"
 msgstr ""
 
-#: hgext/mq.py:1676
+#: hgext/mq.py:1687
 msgid ""
 "refresh interrupted while patch was popped! (revert --all, qpush to "
 "recover)\n"
 msgstr ""
 
-#: hgext/mq.py:1685
+#: hgext/mq.py:1696
 msgid "patch queue directory already exists"
 msgstr ""
 
-#: hgext/mq.py:1696 hgext/mq.py:2070 hgext/mq.py:2102
+#: hgext/mq.py:1707 hgext/mq.py:2081 hgext/mq.py:2113
 #, python-format
 msgid "patch %s is not in series file"
 msgstr ""
 
-#: hgext/mq.py:1799
+#: hgext/mq.py:1810
 msgid "no saved patch data found\n"
 msgstr ""
 
-#: hgext/mq.py:1801
+#: hgext/mq.py:1812
 #, python-format
 msgid "restoring status: %s\n"
 msgstr ""
 
-#: hgext/mq.py:1810
+#: hgext/mq.py:1821
 msgid "save entry has children, leaving it alone\n"
 msgstr ""
 
-#: hgext/mq.py:1812
+#: hgext/mq.py:1823
 #, python-format
 msgid "removing save entry %s\n"
 msgstr ""
 
-#: hgext/mq.py:1820
+#: hgext/mq.py:1831
 #, python-format
 msgid "saved queue repository parents: %s %s\n"
 msgstr ""
 
-#: hgext/mq.py:1823
+#: hgext/mq.py:1834
 msgid "updating queue directory\n"
 msgstr ""
 
-#: hgext/mq.py:1826
+#: hgext/mq.py:1837
 msgid "unable to load queue repository\n"
 msgstr ""
 
-#: hgext/mq.py:1832
+#: hgext/mq.py:1843
 msgid "save: no patches applied, exiting\n"
 msgstr ""
 
-#: hgext/mq.py:1835
+#: hgext/mq.py:1846
 msgid "status is already saved\n"
 msgstr ""
 
-#: hgext/mq.py:1839
+#: hgext/mq.py:1850
 msgid "hg patches saved state"
 msgstr ""
 
-#: hgext/mq.py:1851
+#: hgext/mq.py:1862
 msgid "repo commit failed\n"
 msgstr ""
 
-#: hgext/mq.py:1902
+#: hgext/mq.py:1913
 #, python-format
 msgid "patch %s is already in the series file"
 msgstr ""
 
-#: hgext/mq.py:1907
+#: hgext/mq.py:1918
 msgid "option \"-r\" not valid when importing files"
 msgstr ""
 
-#: hgext/mq.py:1912
+#: hgext/mq.py:1923
 msgid "no files or revisions specified"
 msgstr ""
 
-#: hgext/mq.py:1914
+#: hgext/mq.py:1925
 msgid "option \"-n\" not valid when importing multiple patches"
 msgstr ""
 
-#: hgext/mq.py:1923
+#: hgext/mq.py:1934
 #, python-format
 msgid "revision %d is the root of more than one branch"
 msgstr ""
 
-#: hgext/mq.py:1928
+#: hgext/mq.py:1939
 #, python-format
 msgid "revision %d is already managed"
 msgstr ""
 
-#: hgext/mq.py:1931
+#: hgext/mq.py:1942
 #, python-format
 msgid "revision %d is not the parent of the queue"
 msgstr ""
 
-#: hgext/mq.py:1937
+#: hgext/mq.py:1948
 #, python-format
 msgid "revision %d has unmanaged children"
 msgstr ""
 
-#: hgext/mq.py:1944
+#: hgext/mq.py:1955
 #, python-format
 msgid "revision %d is not mutable"
 msgstr ""
 
-#: hgext/mq.py:1949
+#: hgext/mq.py:1960
 #, python-format
 msgid "cannot import merge revision %d"
 msgstr ""
 
-#: hgext/mq.py:1951
+#: hgext/mq.py:1962
 #, python-format
 msgid "revision %d is not the parent of %d"
 msgstr ""
 
-#: hgext/mq.py:1981
+#: hgext/mq.py:1992
 msgid "-e is incompatible with import from -"
 msgstr ""
 
-#: hgext/mq.py:1986
+#: hgext/mq.py:1997
 #, python-format
 msgid "patch %s does not exist"
 msgstr ""
 
-#: hgext/mq.py:1991 hgext/mq.py:2828
+#: hgext/mq.py:2002 hgext/mq.py:2839
 #, python-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: hgext/mq.py:1999
+#: hgext/mq.py:2010
 msgid "need --name to import a patch from -"
 msgstr ""
 
-#: hgext/mq.py:2011
+#: hgext/mq.py:2022
 #, python-format
 msgid "unable to read file %s"
 msgstr ""
 
-#: hgext/mq.py:2022
+#: hgext/mq.py:2033
 #, python-format
 msgid "adding %s to series file\n"
 msgstr ""
 
-#: hgext/mq.py:2039
+#: hgext/mq.py:2050
 msgid "keep patch file"
 msgstr ""
 
-#: hgext/mq.py:2041
+#: hgext/mq.py:2052
 msgid "stop managing a revision (DEPRECATED)"
 msgstr ""
 
-#: hgext/mq.py:2042
+#: hgext/mq.py:2053
 msgid "hg qdelete [-k] [PATCH]..."
 msgstr ""
 
-#: hgext/mq.py:2044
+#: hgext/mq.py:2055
 msgid "remove patches from queue"
 msgstr ""
 
-#: hgext/mq.py:2046
+#: hgext/mq.py:2057
 msgid ""
 "    The patches must not be applied, and at least one patch is required. Exact\n"
 "    patch identifiers must be given. With -k/--keep, the patch files are\n"
 "    preserved in the patch directory."
 msgstr ""
 
-#: hgext/mq.py:2050
+#: hgext/mq.py:2061
 msgid ""
 "    To stop managing a patch and move it into permanent history,\n"
 "    use the :hg:`qfinish` command."
 msgstr ""
 
-#: hgext/mq.py:2058
+#: hgext/mq.py:2069
 msgid "show only the preceding applied patch"
 msgstr ""
 
-#: hgext/mq.py:2060
+#: hgext/mq.py:2071
 msgid "hg qapplied [-1] [-s] [PATCH]"
 msgstr ""
 
-#: hgext/mq.py:2062
+#: hgext/mq.py:2073
 msgid "print the patches already applied"
 msgstr ""
 
-#: hgext/mq.py:2064 hgext/mq.py:2097 hgext/mq.py:2323 hgext/mq.py:2332
-#: hgext/mq.py:2346 hgext/mq.py:2358 hgext/mq.py:2525 hgext/mq.py:2589
-#: hgext/mq.py:2682 hgext/mq.py:2809 hgext/mq.py:3088
+#: hgext/mq.py:2075 hgext/mq.py:2108 hgext/mq.py:2334 hgext/mq.py:2343
+#: hgext/mq.py:2357 hgext/mq.py:2369 hgext/mq.py:2536 hgext/mq.py:2600
+#: hgext/mq.py:2693 hgext/mq.py:2820 hgext/mq.py:3099
 msgid "    Returns 0 on success."
 msgstr ""
 
-#: hgext/mq.py:2079 hgext/mq.py:2362
+#: hgext/mq.py:2090 hgext/mq.py:2373
 msgid "only one patch applied\n"
 msgstr ""
 
-#: hgext/mq.py:2092
+#: hgext/mq.py:2103
 msgid "show only the first patch"
 msgstr ""
 
-#: hgext/mq.py:2093
+#: hgext/mq.py:2104
 msgid "hg qunapplied [-1] [-s] [PATCH]"
 msgstr ""
 
-#: hgext/mq.py:2095
+#: hgext/mq.py:2106
 msgid "print the patches not yet applied"
 msgstr ""
 
-#: hgext/mq.py:2108 hgext/mq.py:2350
+#: hgext/mq.py:2119 hgext/mq.py:2361
 msgid "all patches applied\n"
 msgstr ""
 
-#: hgext/mq.py:2116
+#: hgext/mq.py:2127
 msgid "import file in patch directory"
 msgstr ""
 
-#: hgext/mq.py:2118 hgext/mq.py:2730 hgext/mq.py:2768 hgext/mq.py:2878
-#: hgext/patchbomb.py:176 mercurial/commands.py:761 mercurial/commands.py:5161
+#: hgext/mq.py:2129 hgext/mq.py:2741 hgext/mq.py:2779 hgext/mq.py:2889
+#: hgext/patchbomb.py:176 mercurial/commands.py:761 mercurial/commands.py:5162
 msgid "NAME"
 msgstr ""
 
-#: hgext/mq.py:2118
+#: hgext/mq.py:2129
 msgid "name of patch file"
 msgstr ""
 
-#: hgext/mq.py:2119
+#: hgext/mq.py:2130
 msgid "overwrite existing files"
 msgstr ""
 
-#: hgext/mq.py:2121
+#: hgext/mq.py:2132
 msgid "place existing revisions under mq control"
 msgstr ""
 
-#: hgext/mq.py:2122 hgext/mq.py:2380 hgext/mq.py:2430 hgext/patchbomb.py:170
+#: hgext/mq.py:2133 hgext/mq.py:2391 hgext/mq.py:2441 hgext/patchbomb.py:170
 #: mercurial/commands.py:96 mercurial/commands.py:106
-#: mercurial/commands.py:5768
+#: mercurial/commands.py:5779
 msgid "use git extended diff format"
 msgstr ""
 
-#: hgext/mq.py:2123
+#: hgext/mq.py:2134
 msgid "qpush after importing"
 msgstr ""
 
-#: hgext/mq.py:2124
+#: hgext/mq.py:2135
 msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... [FILE]..."
 msgstr ""
 
-#: hgext/mq.py:2126
+#: hgext/mq.py:2137
 msgid "import a patch or existing changeset"
 msgstr ""
 
-#: hgext/mq.py:2128
+#: hgext/mq.py:2139
 msgid ""
 "    The patch is inserted into the series after the last applied\n"
 "    patch. If no patches have been applied, qimport prepends the patch\n"
 "    to the series."
 msgstr ""
 
-#: hgext/mq.py:2132
+#: hgext/mq.py:2143
 msgid ""
 "    The patch will have the same name as its source file unless you\n"
 "    give it a new one with -n/--name."
 msgstr ""
 
-#: hgext/mq.py:2135
+#: hgext/mq.py:2146
 msgid ""
 "    You can register an existing patch inside the patch directory with\n"
 "    the -e/--existing flag."
 msgstr ""
 
-#: hgext/mq.py:2138
+#: hgext/mq.py:2149
 msgid ""
 "    With -f/--force, an existing patch of the same name will be\n"
 "    overwritten."
 msgstr ""
 
-#: hgext/mq.py:2141
+#: hgext/mq.py:2152
 msgid ""
 "    An existing changeset may be placed under mq control with -r/--rev\n"
 "    (e.g. qimport --rev tip -n patch will place tip under mq control).\n"
 "    changes. Use :hg:`qfinish` to remove changesets from mq control."
 msgstr ""
 
-#: hgext/mq.py:2148
+#: hgext/mq.py:2159
 msgid ""
 "    To import a patch from standard input, pass - as the patch file.\n"
 "    When importing from standard input, a patch name must be specified\n"
 "    using the --name flag."
 msgstr ""
 
-#: hgext/mq.py:2152
+#: hgext/mq.py:2163
 msgid "    To import an existing patch while renaming it::"
 msgstr ""
 
-#: hgext/mq.py:2154
+#: hgext/mq.py:2165
 msgid "      hg qimport -e existing-patch -n new-name"
 msgstr ""
 
-#: hgext/mq.py:2156
+#: hgext/mq.py:2167
 msgid ""
 "    Returns 0 if import succeeded.\n"
 "    "
 msgstr ""
 
-#: hgext/mq.py:2202
+#: hgext/mq.py:2213
 msgid "create queue repository"
 msgstr ""
 
-#: hgext/mq.py:2203
+#: hgext/mq.py:2214
 msgid "hg qinit [-c]"
 msgstr ""
 
-#: hgext/mq.py:2205
+#: hgext/mq.py:2216
 msgid "init a new queue repository (DEPRECATED)"
 msgstr ""
 
-#: hgext/mq.py:2207
+#: hgext/mq.py:2218
 msgid ""
 "    The queue repository is unversioned by default. If\n"
 "    -c/--create-repo is specified, qinit will create a separate nested\n"
 "    qcommit to commit changes to this queue repository."
 msgstr ""
 
-#: hgext/mq.py:2213
+#: hgext/mq.py:2224
 msgid ""
 "    This command is deprecated. Without -c, it's implied by other relevant\n"
 "    commands. With -c, use :hg:`init --mq` instead."
 msgstr ""
 
-#: hgext/mq.py:2218 mercurial/commands.py:1116
+#: hgext/mq.py:2229 mercurial/commands.py:1117
 msgid "use pull protocol to copy metadata"
 msgstr ""
 
-#: hgext/mq.py:2220
+#: hgext/mq.py:2231
 msgid "do not update the new working directories"
 msgstr ""
 
-#: hgext/mq.py:2222 mercurial/commands.py:1117
+#: hgext/mq.py:2233 mercurial/commands.py:1118
 msgid "use uncompressed transfer (fast over LAN)"
 msgstr ""
 
-#: hgext/mq.py:2224 hgext/transplant.py:493 mercurial/commands.py:31
+#: hgext/mq.py:2235 hgext/transplant.py:493 mercurial/commands.py:31
 msgid "REPO"
 msgstr ""
 
-#: hgext/mq.py:2224
+#: hgext/mq.py:2235
 msgid "location of source patch repository"
 msgstr ""
 
-#: hgext/mq.py:2226
+#: hgext/mq.py:2237
 msgid "hg qclone [OPTION]... SOURCE [DEST]"
 msgstr ""
 
-#: hgext/mq.py:2228
+#: hgext/mq.py:2239
 msgid "clone main and patch repository at same time"
 msgstr ""
 
-#: hgext/mq.py:2230
+#: hgext/mq.py:2241
 msgid ""
 "    If source is local, destination will have no patches applied. If\n"
 "    source is remote, this command can not check if patches are\n"
 "    before that it has no patches applied."
 msgstr ""
 
-#: hgext/mq.py:2236
+#: hgext/mq.py:2247
 msgid ""
 "    Source patch repository is looked for in <src>/.hg/patches by\n"
 "    default. Use -p <url> to change."
 msgstr ""
 
-#: hgext/mq.py:2239
+#: hgext/mq.py:2250
 msgid ""
 "    The patch directory must be a nested Mercurial repository, as\n"
 "    would be created by :hg:`init --mq`."
 msgstr ""
 
-#: hgext/mq.py:2242 hgext/mq.py:2743 hgext/mq.py:2786 hgext/mq.py:2957
+#: hgext/mq.py:2253 hgext/mq.py:2754 hgext/mq.py:2797 hgext/mq.py:2968
 msgid ""
 "    Return 0 on success.\n"
 "    "
 msgstr ""
 
-#: hgext/mq.py:2264
+#: hgext/mq.py:2275
 msgid "versioned patch repository not found (see init --mq)"
 msgstr ""
 
-#: hgext/mq.py:2281
+#: hgext/mq.py:2292
 msgid "cloning main repository\n"
 msgstr ""
 
-#: hgext/mq.py:2288
+#: hgext/mq.py:2299
 msgid "cloning patch repository\n"
 msgstr ""
 
-#: hgext/mq.py:2296
+#: hgext/mq.py:2307
 msgid "stripping applied patches from destination repository\n"
 msgstr ""
 
-#: hgext/mq.py:2300
+#: hgext/mq.py:2311
 msgid "updating destination repository\n"
 msgstr ""
 
-#: hgext/mq.py:2305
+#: hgext/mq.py:2316
 msgid "hg qcommit [OPTION]... [FILE]..."
 msgstr ""
 
-#: hgext/mq.py:2307
+#: hgext/mq.py:2318
 msgid "commit changes in the queue repository (DEPRECATED)"
 msgstr ""
 
-#: hgext/mq.py:2309
+#: hgext/mq.py:2320
 msgid "    This command is deprecated; use :hg:`commit --mq` instead."
 msgstr ""
 
-#: hgext/mq.py:2317
+#: hgext/mq.py:2328
 msgid "print patches not in series"
 msgstr ""
 
-#: hgext/mq.py:2319
+#: hgext/mq.py:2330
 msgid "hg qseries [-ms]"
 msgstr ""
 
-#: hgext/mq.py:2321
+#: hgext/mq.py:2332
 msgid "print the entire series file"
 msgstr ""
 
-#: hgext/mq.py:2328
+#: hgext/mq.py:2339
 msgid "hg qtop [-s]"
 msgstr ""
 
-#: hgext/mq.py:2330
+#: hgext/mq.py:2341
 msgid "print the name of the current patch"
 msgstr ""
 
-#: hgext/mq.py:2342
+#: hgext/mq.py:2353
 msgid "hg qnext [-s]"
 msgstr ""
 
-#: hgext/mq.py:2344
+#: hgext/mq.py:2355
 msgid "print the name of the next pushable patch"
 msgstr ""
 
-#: hgext/mq.py:2354
+#: hgext/mq.py:2365
 msgid "hg qprev [-s]"
 msgstr ""
 
-#: hgext/mq.py:2356
+#: hgext/mq.py:2367
 msgid "print the name of the preceding applied patch"
 msgstr ""
 
-#: hgext/mq.py:2379
+#: hgext/mq.py:2390
 msgid "import uncommitted changes (DEPRECATED)"
 msgstr ""
 
-#: hgext/mq.py:2381
+#: hgext/mq.py:2392
 msgid "add \"From: <current user>\" to patch"
 msgstr ""
 
-#: hgext/mq.py:2383
+#: hgext/mq.py:2394
 msgid "add \"From: <USER>\" to patch"
 msgstr ""
 
-#: hgext/mq.py:2384
+#: hgext/mq.py:2395
 msgid "add \"Date: <current date>\" to patch"
 msgstr ""
 
-#: hgext/mq.py:2386
+#: hgext/mq.py:2397
 msgid "add \"Date: <DATE>\" to patch"
 msgstr ""
 
-#: hgext/mq.py:2388
+#: hgext/mq.py:2399
 msgid "hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]..."
 msgstr ""
 
-#: hgext/mq.py:2390
+#: hgext/mq.py:2401
 msgid "create a new patch"
 msgstr ""
 
-#: hgext/mq.py:2392
+#: hgext/mq.py:2403
 msgid ""
 "    qnew creates a new patch on top of the currently-applied patch (if\n"
 "    any). The patch will be initialized with any outstanding changes\n"
 "    as uncommitted modifications."
 msgstr ""
 
-#: hgext/mq.py:2399
+#: hgext/mq.py:2410
 msgid ""
 "    -u/--user and -d/--date can be used to set the (given) user and\n"
 "    date, respectively. -U/--currentuser and -D/--currentdate set user\n"
 "    to current user and date to current date."
 msgstr ""
 
-#: hgext/mq.py:2403
+#: hgext/mq.py:2414
 msgid ""
 "    -e/--edit, -m/--message or -l/--logfile set the patch header as\n"
 "    well as the commit message. If none is specified, the header is\n"
 "    empty and the commit message is '[mq]: PATCH'."
 msgstr ""
 
-#: hgext/mq.py:2407
+#: hgext/mq.py:2418
 msgid ""
 "    Use the -g/--git option to keep the patch in the git extended diff\n"
 "    format. Read the diffs help topic for more information on why this\n"
 "    information."
 msgstr ""
 
-#: hgext/mq.py:2412
+#: hgext/mq.py:2423
 msgid ""
 "    Returns 0 on successful creation of a new patch.\n"
 "    "
 msgstr ""
 
-#: hgext/mq.py:2432
+#: hgext/mq.py:2443
 msgid "refresh only files already in the patch and specified files"
 msgstr ""
 
-#: hgext/mq.py:2434
+#: hgext/mq.py:2445
 msgid "add/update author field in patch with current user"
 msgstr ""
 
-#: hgext/mq.py:2436
+#: hgext/mq.py:2447
 msgid "add/update author field in patch with given user"
 msgstr ""
 
-#: hgext/mq.py:2438
+#: hgext/mq.py:2449
 msgid "add/update date field in patch with current date"
 msgstr ""
 
-#: hgext/mq.py:2440
+#: hgext/mq.py:2451
 msgid "add/update date field in patch with given date"
 msgstr ""
 
-#: hgext/mq.py:2442
+#: hgext/mq.py:2453
 msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
 msgstr ""
 
-#: hgext/mq.py:2444
+#: hgext/mq.py:2455
 msgid "update the current patch"
 msgstr ""
 
-#: hgext/mq.py:2446
+#: hgext/mq.py:2457
 msgid ""
 "    If any file patterns are provided, the refreshed patch will\n"
 "    contain only the modifications that match those patterns; the\n"
 "    remaining modifications will remain in the working directory."
 msgstr ""
 
-#: hgext/mq.py:2450
+#: hgext/mq.py:2461
 msgid ""
 "    If -s/--short is specified, files currently included in the patch\n"
 "    will be refreshed just like matched files and remain in the patch."
 msgstr ""
 
-#: hgext/mq.py:2453
+#: hgext/mq.py:2464
 msgid ""
 "    If -e/--edit is specified, Mercurial will start your configured editor for\n"
 "    you to enter a message. In case qrefresh fails, you will find a backup of\n"
 "    your message in ``.hg/last-message.txt``."
 msgstr ""
 
-#: hgext/mq.py:2457
+#: hgext/mq.py:2468
 msgid ""
 "    hg add/remove/copy/rename work as usual, though you might want to\n"
 "    use git-style patches (-g/--git or [diff] git=1) to track copies\n"
 "    git diff format."
 msgstr ""
 
-#: hgext/mq.py:2471 hgext/mq.py:2536
+#: hgext/mq.py:2482 hgext/mq.py:2547
 msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
 msgstr ""
 
-#: hgext/mq.py:2488
+#: hgext/mq.py:2499
 msgid "hg qdiff [OPTION]... [FILE]..."
 msgstr ""
 
-#: hgext/mq.py:2490
+#: hgext/mq.py:2501
 msgid "diff of the current patch and subsequent modifications"
 msgstr ""
 
-#: hgext/mq.py:2492
+#: hgext/mq.py:2503
 msgid ""
 "    Shows a diff which includes the current patch as well as any\n"
 "    changes which have been made in the working directory since the\n"
 "    after a qrefresh)."
 msgstr ""
 
-#: hgext/mq.py:2497
+#: hgext/mq.py:2508
 msgid ""
 "    Use :hg:`diff` if you only want to see the changes made since the\n"
 "    last qrefresh, or :hg:`export qtip` if you want to see changes\n"
 "    qrefresh."
 msgstr ""
 
-#: hgext/mq.py:2508
+#: hgext/mq.py:2519
 msgid "edit patch header"
 msgstr ""
 
-#: hgext/mq.py:2509
+#: hgext/mq.py:2520
 msgid "keep folded patch files"
 msgstr ""
 
-#: hgext/mq.py:2511
+#: hgext/mq.py:2522
 msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
 msgstr ""
 
-#: hgext/mq.py:2513
+#: hgext/mq.py:2524
 msgid "fold the named patches into the current patch"
 msgstr ""
 
-#: hgext/mq.py:2515
+#: hgext/mq.py:2526
 msgid ""
 "    Patches must not yet be applied. Each patch will be successively\n"
 "    applied to the current patch in the order given. If all the\n"
 "    removed afterwards."
 msgstr ""
 
-#: hgext/mq.py:2522
+#: hgext/mq.py:2533
 msgid ""
 "    The header for each folded patch will be concatenated with the\n"
 "    current patch header, separated by a line of ``* * *``."
 msgstr ""
 
-#: hgext/mq.py:2528
+#: hgext/mq.py:2539
 msgid "qfold requires at least one patch name"
 msgstr ""
 
-#: hgext/mq.py:2544
+#: hgext/mq.py:2555
 #, python-format
 msgid "skipping already folded patch %s\n"
 msgstr ""
 
-#: hgext/mq.py:2546
+#: hgext/mq.py:2557
 #, python-format
 msgid "qfold cannot fold already applied patch %s"
 msgstr ""
 
-#: hgext/mq.py:2558
+#: hgext/mq.py:2569
 #, python-format
 msgid "error folding patch %s"
 msgstr ""
 
-#: hgext/mq.py:2582 hgext/mq.py:2722 hgext/mq.py:2770
+#: hgext/mq.py:2593 hgext/mq.py:2733 hgext/mq.py:2781
 msgid "tolerate non-conflicting local changes"
 msgstr ""
 
-#: hgext/mq.py:2583
+#: hgext/mq.py:2594
 msgid "overwrite any local changes"
 msgstr ""
 
-#: hgext/mq.py:2584 hgext/mq.py:2733 hgext/mq.py:2772
-#: mercurial/commands.py:5026
+#: hgext/mq.py:2595 hgext/mq.py:2744 hgext/mq.py:2783
+#: mercurial/commands.py:5027
 msgid "do not save backup copies of files"
 msgstr ""
 
-#: hgext/mq.py:2585
+#: hgext/mq.py:2596
 msgid "hg qgoto [OPTION]... PATCH"
 msgstr ""
 
-#: hgext/mq.py:2587
+#: hgext/mq.py:2598
 msgid "push or pop patches until named patch is at top of stack"
 msgstr ""
 
-#: hgext/mq.py:2605
+#: hgext/mq.py:2616
 msgid "list all patches and guards"
 msgstr ""
 
-#: hgext/mq.py:2606
+#: hgext/mq.py:2617
 msgid "drop all guards"
 msgstr ""
 
-#: hgext/mq.py:2607
+#: hgext/mq.py:2618
 msgid "hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]"
 msgstr ""
 
-#: hgext/mq.py:2609
+#: hgext/mq.py:2620
 msgid "set or print guards for a patch"
 msgstr ""
 
-#: hgext/mq.py:2611
+#: hgext/mq.py:2622
 msgid ""
 "    Guards control whether a patch can be pushed. A patch with no\n"
 "    guards is always pushed. A patch with a positive guard (\"+foo\") is\n"
 "    has activated it."
 msgstr ""
 
-#: hgext/mq.py:2617
+#: hgext/mq.py:2628
 msgid ""
 "    With no arguments, print the currently active guards.\n"
 "    With arguments, set guards for the named patch."
 msgstr ""
 
-#: hgext/mq.py:2620
+#: hgext/mq.py:2631
 msgid ""
 "    .. note::\n"
 "       Specifying negative guards now requires '--'."
 msgstr ""
 
-#: hgext/mq.py:2623
+#: hgext/mq.py:2634
 msgid "    To set guards on another patch::"
 msgstr ""
 
-#: hgext/mq.py:2625
+#: hgext/mq.py:2636
 msgid "      hg qguard other.patch -- +2.6.17 -stable"
 msgstr ""
 
-#: hgext/mq.py:2656
+#: hgext/mq.py:2667
 msgid "cannot mix -l/--list with options or arguments"
 msgstr ""
 
-#: hgext/mq.py:2668
+#: hgext/mq.py:2679
 msgid "no patch to work with"
 msgstr ""
 
-#: hgext/mq.py:2672
+#: hgext/mq.py:2683
 #, python-format
 msgid "no patch named %s"
 msgstr ""
 
-#: hgext/mq.py:2678
+#: hgext/mq.py:2689
 msgid "hg qheader [PATCH]"
 msgstr ""
 
-#: hgext/mq.py:2680
+#: hgext/mq.py:2691
 msgid "print the header of the topmost or specified patch"
 msgstr ""
 
-#: hgext/mq.py:2723
+#: hgext/mq.py:2734
 msgid "apply on top of local changes"
 msgstr ""
 
-#: hgext/mq.py:2725
+#: hgext/mq.py:2736
 msgid "apply the target patch to its recorded parent"
 msgstr ""
 
-#: hgext/mq.py:2726
+#: hgext/mq.py:2737
 msgid "list patch name in commit text"
 msgstr ""
 
-#: hgext/mq.py:2727
+#: hgext/mq.py:2738
 msgid "apply all patches"
 msgstr ""
 
-#: hgext/mq.py:2728
+#: hgext/mq.py:2739
 msgid "merge from another queue (DEPRECATED)"
 msgstr ""
 
-#: hgext/mq.py:2730
+#: hgext/mq.py:2741
 msgid "merge queue name (DEPRECATED)"
 msgstr ""
 
-#: hgext/mq.py:2732
+#: hgext/mq.py:2743
 msgid "reorder patch series and apply only the patch"
 msgstr ""
 
-#: hgext/mq.py:2734
+#: hgext/mq.py:2745
 msgid "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]"
 msgstr ""
 
-#: hgext/mq.py:2736
+#: hgext/mq.py:2747
 msgid "push the next patch onto the stack"
 msgstr ""
 
-#: hgext/mq.py:2738
+#: hgext/mq.py:2749
 msgid ""
 "    By default, abort if the working directory contains uncommitted\n"
 "    changes. With --keep-changes, abort only if the uncommitted files\n"
 "    uncommitted changes."
 msgstr ""
 
-#: hgext/mq.py:2755
+#: hgext/mq.py:2766
 msgid "no saved queues found, please use -n\n"
 msgstr ""
 
-#: hgext/mq.py:2758
+#: hgext/mq.py:2769
 #, python-format
 msgid "merging with queue at: %s\n"
 msgstr ""
 
-#: hgext/mq.py:2766
+#: hgext/mq.py:2777
 msgid "pop all patches"
 msgstr ""
 
-#: hgext/mq.py:2768
+#: hgext/mq.py:2779
 msgid "queue name to pop (DEPRECATED)"
 msgstr ""
 
-#: hgext/mq.py:2771
+#: hgext/mq.py:2782
 msgid "forget any local changes to patched files"
 msgstr ""
 
-#: hgext/mq.py:2773
+#: hgext/mq.py:2784
 msgid "hg qpop [-a] [-f] [PATCH | INDEX]"
 msgstr ""
 
-#: hgext/mq.py:2775
+#: hgext/mq.py:2786
 msgid "pop the current patch off the stack"
 msgstr ""
 
-#: hgext/mq.py:2777
+#: hgext/mq.py:2788
 msgid ""
 "    Without argument, pops off the top of the patch stack. If given a\n"
 "    patch name, keeps popping off patches until the named patch is at\n"
 "    the top of the stack."
 msgstr ""
 
-#: hgext/mq.py:2781
+#: hgext/mq.py:2792
 msgid ""
 "    By default, abort if the working directory contains uncommitted\n"
 "    changes. With --keep-changes, abort only if the uncommitted files\n"
 "    changes made to such files."
 msgstr ""
 
-#: hgext/mq.py:2792
+#: hgext/mq.py:2803
 #, python-format
 msgid "using patch queue: %s\n"
 msgstr ""
 
-#: hgext/mq.py:2802
+#: hgext/mq.py:2813
 msgid "hg qrename PATCH1 [PATCH2]"
 msgstr ""
 
-#: hgext/mq.py:2804
+#: hgext/mq.py:2815
 msgid "rename a patch"
 msgstr ""
 
-#: hgext/mq.py:2806
+#: hgext/mq.py:2817
 msgid ""
 "    With one argument, renames the current patch to PATCH1.\n"
 "    With two arguments, renames PATCH1 to PATCH2."
 msgstr ""
 
-#: hgext/mq.py:2861
+#: hgext/mq.py:2872
 msgid "delete save entry"
 msgstr ""
 
-#: hgext/mq.py:2862
+#: hgext/mq.py:2873
 msgid "update queue working directory"
 msgstr ""
 
-#: hgext/mq.py:2863
+#: hgext/mq.py:2874
 msgid "hg qrestore [-d] [-u] REV"
 msgstr ""
 
-#: hgext/mq.py:2865
+#: hgext/mq.py:2876
 msgid "restore the queue state saved by a revision (DEPRECATED)"
 msgstr ""
 
-#: hgext/mq.py:2867 hgext/mq.py:2885
+#: hgext/mq.py:2878 hgext/mq.py:2896
 msgid "    This command is deprecated, use :hg:`rebase` instead."
 msgstr ""
 
-#: hgext/mq.py:2876
+#: hgext/mq.py:2887
 msgid "copy patch directory"
 msgstr ""
 
-#: hgext/mq.py:2878
+#: hgext/mq.py:2889
 msgid "copy directory name"
 msgstr ""
 
-#: hgext/mq.py:2879
+#: hgext/mq.py:2890
 msgid "clear queue status file"
 msgstr ""
 
-#: hgext/mq.py:2880
+#: hgext/mq.py:2891
 msgid "force copy"
 msgstr ""
 
-#: hgext/mq.py:2881
+#: hgext/mq.py:2892
 msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
 msgstr ""
 
-#: hgext/mq.py:2883
+#: hgext/mq.py:2894
 msgid "save current queue state (DEPRECATED)"
 msgstr ""
 
-#: hgext/mq.py:2898
+#: hgext/mq.py:2909
 #, python-format
 msgid "destination %s exists and is not a directory"
 msgstr ""
 
-#: hgext/mq.py:2901
+#: hgext/mq.py:2912
 #, python-format
 msgid "destination %s exists, use -f to force"
 msgstr ""
 
-#: hgext/mq.py:2905
+#: hgext/mq.py:2916
 #, python-format
 msgid "copy %s to %s\n"
 msgstr ""
 
-#: hgext/mq.py:2915
+#: hgext/mq.py:2926
 msgid ""
 "strip specified revision (optional, can specify revisions without this "
 "option)"
 msgstr ""
 
-#: hgext/mq.py:2918
+#: hgext/mq.py:2929
 msgid "force removal of changesets, discard uncommitted changes (no backup)"
 msgstr ""
 
-#: hgext/mq.py:2920
+#: hgext/mq.py:2931
 msgid ""
 "bundle only changesets with local revision number greater than REV which are"
 " not descendants of REV (DEPRECATED)"
 msgstr ""
 
-#: hgext/mq.py:2923
+#: hgext/mq.py:2934
 msgid "no backups"
 msgstr ""
 
-#: hgext/mq.py:2924
+#: hgext/mq.py:2935
 msgid "no backups (DEPRECATED)"
 msgstr ""
 
-#: hgext/mq.py:2925
+#: hgext/mq.py:2936
 msgid "ignored  (DEPRECATED)"
 msgstr ""
 
-#: hgext/mq.py:2926
+#: hgext/mq.py:2937
 msgid "do not modify working copy during strip"
 msgstr ""
 
-#: hgext/mq.py:2927
+#: hgext/mq.py:2938
 msgid "remove revs only reachable from given bookmark"
 msgstr ""
 
-#: hgext/mq.py:2929
+#: hgext/mq.py:2940
 msgid "hg strip [-k] [-f] [-n] [-B bookmark] [-r] REV..."
 msgstr ""
 
-#: hgext/mq.py:2931
+#: hgext/mq.py:2942
 msgid "strip changesets and all their descendants from the repository"
 msgstr ""
 
-#: hgext/mq.py:2933
+#: hgext/mq.py:2944
 msgid ""
 "    The strip command removes the specified changesets and all their\n"
 "    descendants. If the working directory has uncommitted changes, the\n"
 "    case changes will be discarded."
 msgstr ""
 
-#: hgext/mq.py:2938
+#: hgext/mq.py:2949
 msgid ""
 "    If a parent of the working directory is stripped, then the working\n"
 "    directory will automatically be updated to the most recent\n"
 "    completes."
 msgstr ""
 
-#: hgext/mq.py:2943
+#: hgext/mq.py:2954
 msgid ""
 "    Any stripped changesets are stored in ``.hg/strip-backup`` as a\n"
 "    bundle (see :hg:`help bundle` and :hg:`help unbundle`). They can\n"
 "    restore."
 msgstr ""
 
-#: hgext/mq.py:2950
+#: hgext/mq.py:2961
 msgid ""
 "    Use the --no-backup option to discard the backup bundle once the\n"
 "    operation completes."
 msgstr ""
 
-#: hgext/mq.py:2953
+#: hgext/mq.py:2964
 msgid ""
 "    Strip is not a history-rewriting operation and can be used on\n"
 "    changesets in the public phase. But if the stripped changesets have\n"
 "    been pushed to a remote repository you will likely pull them again."
 msgstr ""
 
-#: hgext/mq.py:2973
+#: hgext/mq.py:2984
 #, python-format
 msgid "bookmark '%s' not found"
 msgstr ""
 
-#: hgext/mq.py:2992 hgext/mq.py:3042
+#: hgext/mq.py:3003 hgext/mq.py:3053
 #, python-format
 msgid "bookmark '%s' deleted\n"
 msgstr ""
 
-#: hgext/mq.py:2995 mercurial/commands.py:4550 mercurial/scmutil.py:591
+#: hgext/mq.py:3006 mercurial/commands.py:4551 mercurial/scmutil.py:591
 msgid "empty revision set"
 msgstr ""
 
-#: hgext/mq.py:3050
+#: hgext/mq.py:3061
 msgid "disable all guards"
 msgstr ""
 
-#: hgext/mq.py:3051
+#: hgext/mq.py:3062
 msgid "list all guards in series file"
 msgstr ""
 
-#: hgext/mq.py:3052
+#: hgext/mq.py:3063
 msgid "pop to before first guarded applied patch"
 msgstr ""
 
-#: hgext/mq.py:3053
+#: hgext/mq.py:3064
 msgid "pop, then reapply patches"
 msgstr ""
 
-#: hgext/mq.py:3054
+#: hgext/mq.py:3065
 msgid "hg qselect [OPTION]... [GUARD]..."
 msgstr ""
 
-#: hgext/mq.py:3056
+#: hgext/mq.py:3067
 msgid "set or print guarded patches to push"
 msgstr ""
 
-#: hgext/mq.py:3058
+#: hgext/mq.py:3069
 msgid ""
 "    Use the :hg:`qguard` command to set or print guards on patch, then use\n"
 "    qselect to tell mq which guards to use. A patch will be pushed if\n"
 "    match the current guard. For example::"
 msgstr ""
 
-#: hgext/mq.py:3064
+#: hgext/mq.py:3075
 msgid ""
 "        qguard foo.patch -- -stable    (negative guard)\n"
 "        qguard bar.patch    +stable    (positive guard)\n"
 "        qselect stable"
 msgstr ""
 
-#: hgext/mq.py:3068
+#: hgext/mq.py:3079
 msgid ""
 "    This activates the \"stable\" guard. mq will skip foo.patch (because\n"
 "    it has a negative match) but push bar.patch (because it has a\n"
 "    positive match)."
 msgstr ""
 
-#: hgext/mq.py:3072
+#: hgext/mq.py:3083
 msgid ""
 "    With no arguments, prints the currently active guards.\n"
 "    With one argument, sets the active guard."
 msgstr ""
 
-#: hgext/mq.py:3075
+#: hgext/mq.py:3086
 msgid ""
 "    Use -n/--none to deactivate guards (no other arguments needed).\n"
 "    When no guards are active, patches with positive guards are\n"
 "    skipped and patches with negative guards are pushed."
 msgstr ""
 
-#: hgext/mq.py:3079
+#: hgext/mq.py:3090
 msgid ""
 "    qselect can change the guards on applied patches. It does not pop\n"
 "    guarded patches by default. Use --pop to pop back to the last\n"
 "    guarded patches."
 msgstr ""
 
-#: hgext/mq.py:3085
+#: hgext/mq.py:3096
 msgid ""
 "    Use -s/--series to print a list of all guards in the series file\n"
 "    (no other arguments needed). Use -v for more information."
 msgstr ""
 
-#: hgext/mq.py:3099
+#: hgext/mq.py:3110
 msgid "guards deactivated\n"
 msgstr ""
 
-#: hgext/mq.py:3105
+#: hgext/mq.py:3116
 #, python-format
 msgid "number of unguarded, unapplied patches has changed from %d to %d\n"
 msgstr ""
 
-#: hgext/mq.py:3109
+#: hgext/mq.py:3120
 #, python-format
 msgid "number of guarded, applied patches has changed from %d to %d\n"
 msgstr ""
 
-#: hgext/mq.py:3126
+#: hgext/mq.py:3137
 msgid "guards in series file:\n"
 msgstr ""
 
-#: hgext/mq.py:3131
+#: hgext/mq.py:3142
 msgid "no guards in series file\n"
 msgstr ""
 
-#: hgext/mq.py:3134
+#: hgext/mq.py:3145
 msgid "active guards:\n"
 msgstr ""
 
-#: hgext/mq.py:3138
+#: hgext/mq.py:3149
 msgid "no active guards\n"
 msgstr ""
 
-#: hgext/mq.py:3145
+#: hgext/mq.py:3156
 msgid "popping guarded patches\n"
 msgstr ""
 
-#: hgext/mq.py:3155
+#: hgext/mq.py:3166
 msgid "reapplying unguarded patches\n"
 msgstr ""
 
-#: hgext/mq.py:3161
+#: hgext/mq.py:3172
 msgid "finish all applied changesets"
 msgstr ""
 
-#: hgext/mq.py:3162
+#: hgext/mq.py:3173
 msgid "hg qfinish [-a] [REV]..."
 msgstr ""
 
-#: hgext/mq.py:3164
+#: hgext/mq.py:3175
 msgid "move applied patches into repository history"
 msgstr ""
 
-#: hgext/mq.py:3166
+#: hgext/mq.py:3177
 msgid ""
 "    Finishes the specified revisions (corresponding to applied\n"
 "    patches) by moving them out of mq control into regular repository\n"
 "    history."
 msgstr ""
 
-#: hgext/mq.py:3170
+#: hgext/mq.py:3181
 msgid ""
 "    Accepts a revision range or the -a/--applied option. If --applied\n"
 "    is specified, all applied mq revisions are removed from mq\n"
 "    stack of applied patches."
 msgstr ""
 
-#: hgext/mq.py:3175
+#: hgext/mq.py:3186
 msgid ""
 "    This can be especially useful if your changes have been applied to\n"
 "    an upstream repository, or if you are about to push your changes\n"
 "    to upstream."
 msgstr ""
 
-#: hgext/mq.py:3182 mercurial/commands.py:2777 mercurial/commands.py:4534
+#: hgext/mq.py:3193 mercurial/commands.py:2778 mercurial/commands.py:4535
 msgid "no revisions specified"
 msgstr ""
 
-#: hgext/mq.py:3193
+#: hgext/mq.py:3204
 msgid "warning: uncommitted changes in the working directory\n"
 msgstr ""
 
-#: hgext/mq.py:3206
+#: hgext/mq.py:3217
 msgid "list all available queues"
 msgstr ""
 
-#: hgext/mq.py:3207
+#: hgext/mq.py:3218
 msgid "print name of active queue"
 msgstr ""
 
-#: hgext/mq.py:3208
+#: hgext/mq.py:3219
 msgid "create new queue"
 msgstr ""
 
-#: hgext/mq.py:3209
+#: hgext/mq.py:3220
 msgid "rename active queue"
 msgstr ""
 
-#: hgext/mq.py:3210
+#: hgext/mq.py:3221
 msgid "delete reference to queue"
 msgstr ""
 
-#: hgext/mq.py:3211
+#: hgext/mq.py:3222
 msgid "delete queue, and remove patch dir"
 msgstr ""
 
-#: hgext/mq.py:3213
+#: hgext/mq.py:3224
 msgid "[OPTION] [QUEUE]"
 msgstr ""
 
-#: hgext/mq.py:3215
+#: hgext/mq.py:3226
 msgid "manage multiple patch queues"
 msgstr ""
 
-#: hgext/mq.py:3217
+#: hgext/mq.py:3228
 msgid ""
 "    Supports switching between different patch queues, as well as creating\n"
 "    new patch queues and deleting existing ones."
 msgstr ""
 
-#: hgext/mq.py:3220
+#: hgext/mq.py:3231
 msgid ""
 "    Omitting a queue name or specifying -l/--list will show you the registered\n"
 "    queues - by default the \"normal\" patches queue is registered. The currently\n"
 "    only the name of the active queue."
 msgstr ""
 
-#: hgext/mq.py:3225
+#: hgext/mq.py:3236
 msgid ""
 "    To create a new queue, use -c/--create. The queue is automatically made\n"
 "    active, except in the case where there are applied patches from the\n"
 "    created and switching will fail."
 msgstr ""
 
-#: hgext/mq.py:3230
+#: hgext/mq.py:3241
 msgid ""
 "    To delete an existing queue, use --delete. You cannot delete the currently\n"
 "    active queue."
 msgstr ""
 
-#: hgext/mq.py:3271
+#: hgext/mq.py:3282
 msgid "new queue created, but cannot make active as patches are applied"
 msgstr ""
 
-#: hgext/mq.py:3300
+#: hgext/mq.py:3311
 msgid "cannot delete queue that does not exist"
 msgstr ""
 
-#: hgext/mq.py:3305
+#: hgext/mq.py:3316
 msgid "cannot delete currently active queue"
 msgstr ""
 
-#: hgext/mq.py:3323
+#: hgext/mq.py:3334
 msgid " (active)\n"
 msgstr ""
 
-#: hgext/mq.py:3330
+#: hgext/mq.py:3341
 msgid "invalid queue name, may not contain the characters \":\\/.\""
 msgstr ""
 
-#: hgext/mq.py:3336 hgext/mq.py:3346
+#: hgext/mq.py:3347 hgext/mq.py:3357
 #, python-format
 msgid "queue \"%s\" already exists"
 msgstr ""
 
-#: hgext/mq.py:3344
+#: hgext/mq.py:3355
 #, python-format
 msgid "can't rename \"%s\" to its current name"
 msgstr ""
 
-#: hgext/mq.py:3352
+#: hgext/mq.py:3363
 #, python-format
 msgid "non-queue directory \"%s\" already exists"
 msgstr ""
 
-#: hgext/mq.py:3376
+#: hgext/mq.py:3387
 msgid "use --create to create a new queue"
 msgstr ""
 
-#: hgext/mq.py:3406
+#: hgext/mq.py:3417
 msgid "cannot commit over an applied mq patch"
 msgstr ""
 
-#: hgext/mq.py:3445 hgext/mq.py:3475
+#: hgext/mq.py:3456 hgext/mq.py:3486
 #, python-format
 msgid "mq status file refers to unknown node %s\n"
 msgstr ""
 
-#: hgext/mq.py:3455
+#: hgext/mq.py:3466
 #, python-format
 msgid "tag %s overrides mq patch of the same name\n"
 msgstr ""
 
-#: hgext/mq.py:3505
+#: hgext/mq.py:3516
 msgid "cannot import over an applied patch"
 msgstr ""
 
-#: hgext/mq.py:3518
+#: hgext/mq.py:3529
 msgid "only a local queue repository may be initialized"
 msgstr ""
 
-#: hgext/mq.py:3523 mercurial/commands.py:1430 mercurial/commands.py:3531
-#: mercurial/commands.py:5204 mercurial/commands.py:5235
+#: hgext/mq.py:3534 mercurial/commands.py:1431 mercurial/commands.py:3532
+#: mercurial/commands.py:5205 mercurial/commands.py:5236
 msgid "there is no Mercurial repository here (.hg not found)"
 msgstr ""
 
-#: hgext/mq.py:3540
+#: hgext/mq.py:3551
 msgid "no queue repository"
 msgstr ""
 
-#: hgext/mq.py:3549
+#: hgext/mq.py:3560
 #, python-format
 msgid "%d applied"
 msgstr ""
 
-#: hgext/mq.py:3551
+#: hgext/mq.py:3562
 #, python-format
 msgid "%d unapplied"
 msgstr ""
 
-#: hgext/mq.py:3555
+#. i18n: column positioning for "hg summary"
+#: hgext/mq.py:3565
+#, python-format
+msgid "mq:     %s\n"
+msgstr ""
+
+#. i18n: column positioning for "hg summary"
+#: hgext/mq.py:3568
 msgid "mq:     (empty queue)\n"
 msgstr ""
 
-#: hgext/mq.py:3559
+#: hgext/mq.py:3572
 msgid ""
 "``mq()``\n"
 "    Changesets managed by MQ."
 msgstr ""
 
-#: hgext/mq.py:3562
+#: hgext/mq.py:3575
 msgid "mq takes no arguments"
 msgstr ""
 
-#: hgext/mq.py:3572
+#: hgext/mq.py:3585
 msgid "operate on patch repository"
 msgstr ""
 
 "    "
 msgstr ""
 
-#: hgext/patchbomb.py:285 mercurial/hg.py:504 mercurial/localrepo.py:1748
+#: hgext/patchbomb.py:285 mercurial/hg.py:519 mercurial/localrepo.py:1748
 #: mercurial/scmutil.py:28
 msgid "no changes found\n"
 msgstr ""
 msgid "use text as collapse commit message"
 msgstr ""
 
-#: hgext/rebase.py:46 hgext/transplant.py:501 mercurial/commands.py:2692
-#: mercurial/commands.py:3628
+#: hgext/rebase.py:46 hgext/transplant.py:501 mercurial/commands.py:2693
+#: mercurial/commands.py:3629
 msgid "invoke editor on commit messages"
 msgstr ""
 
 msgid "warning: new changesets detected on source branch, not stripping\n"
 msgstr ""
 
-#: hgext/rebase.py:716 mercurial/bookmarks.py:202 mercurial/commands.py:4589
-#: mercurial/commands.py:5910 mercurial/localrepo.py:2003
+#: hgext/rebase.py:716 mercurial/bookmarks.py:202 mercurial/commands.py:4590
+#: mercurial/commands.py:5921 mercurial/localrepo.py:2003
 #, python-format
 msgid "updating bookmark %s\n"
 msgstr ""
 #: mercurial/archival.py:291 mercurial/archival.py:296
 #: mercurial/localrepo.py:2100 mercurial/localrepo.py:2212
 #: mercurial/localrepo.py:2361 mercurial/localrepo.py:2387
-#: mercurial/merge.py:351 mercurial/merge.py:425 mercurial/subrepo.py:362
+#: mercurial/merge.py:373 mercurial/merge.py:447 mercurial/subrepo.py:362
 #: mercurial/subrepo.py:370 mercurial/subrepo.py:1233
 #: mercurial/subrepo.py:1246
 msgid "files"
 "    unpublished changesets."
 msgstr ""
 
-#: hgext/transplant.py:518 mercurial/commands.py:2712
+#: hgext/transplant.py:518 mercurial/commands.py:2713
 msgid ""
 "    If --log is specified, log messages will have a comment appended\n"
 "    of the form::"
 msgid "no revision checked out"
 msgstr ""
 
-#: hgext/transplant.py:601 mercurial/merge.py:558
+#: hgext/transplant.py:601 mercurial/merge.py:580
 msgid "outstanding uncommitted merges"
 msgstr ""
 
 msgid "malformed line in .hg/bookmarks: %r\n"
 msgstr ""
 
-#: mercurial/bookmarks.py:135 mercurial/merge.py:545
+#: mercurial/bookmarks.py:135 mercurial/merge.py:567
 #, python-format
 msgid "branch %s not found"
 msgstr ""
 msgid "no changed bookmarks found\n"
 msgstr ""
 
-#: mercurial/bundlerepo.py:59 mercurial/revlog.py:1219
+#: mercurial/bundlerepo.py:59 mercurial/revlog.py:1218
 msgid "unknown parent"
 msgstr ""
 
-#: mercurial/bundlerepo.py:132 mercurial/revlog.py:925
+#: mercurial/bundlerepo.py:132 mercurial/revlog.py:924
 #, python-format
 msgid "integrity check failed on %s:%d"
 msgstr ""
 msgid "%s: unknown bundle version %s"
 msgstr ""
 
-#: mercurial/changelog.py:177 mercurial/revlog.py:291 mercurial/revlog.py:305
+#: mercurial/changelog.py:183 mercurial/revlog.py:290 mercurial/revlog.py:304
 msgid "no node"
 msgstr ""
 
-#: mercurial/changelog.py:310
+#: mercurial/changelog.py:316
 msgid "empty username"
 msgstr ""
 
-#: mercurial/changelog.py:312
+#: mercurial/changelog.py:318
 #, python-format
 msgid "username %s contains a newline"
 msgstr ""
 
-#: mercurial/changelog.py:326 mercurial/scmutil.py:32
+#: mercurial/changelog.py:332 mercurial/scmutil.py:32
 #, python-format
 msgid "the name '%s' is reserved"
 msgstr ""
 msgid "cannot specify --changelog or --manifest without a repository"
 msgstr ""
 
-#: mercurial/cmdutil.py:230 mercurial/commands.py:1773
+#: mercurial/cmdutil.py:230 mercurial/commands.py:1774
 #: mercurial/dispatch.py:804
 msgid "invalid arguments"
 msgstr ""
 msgid "%s: cannot copy - %s\n"
 msgstr ""
 
-#: mercurial/cmdutil.py:345 mercurial/merge.py:398
+#: mercurial/cmdutil.py:345 mercurial/merge.py:420
 #, python-format
 msgid "moving %s to %s\n"
 msgstr ""
 msgid "child process failed to start"
 msgstr ""
 
-#: mercurial/cmdutil.py:690
+#. i18n: column positioning for "hg log"
+#: mercurial/cmdutil.py:691
 #, python-format
 msgid "changeset:   %d:%s\n"
 msgstr ""
 
-#: mercurial/cmdutil.py:696
+#. i18n: column positioning for "hg log"
+#: mercurial/cmdutil.py:698
 #, python-format
 msgid "branch:      %s\n"
 msgstr ""
 
-#: mercurial/cmdutil.py:699
+#. i18n: column positioning for "hg log"
+#: mercurial/cmdutil.py:702
 #, python-format
 msgid "bookmark:    %s\n"
 msgstr ""
 
-#: mercurial/cmdutil.py:702
+#. i18n: column positioning for "hg log"
+#: mercurial/cmdutil.py:706
 #, python-format
 msgid "tag:         %s\n"
 msgstr ""
 
-#: mercurial/cmdutil.py:705
+#. i18n: column positioning for "hg log"
+#: mercurial/cmdutil.py:710
 #, python-format
 msgid "phase:       %s\n"
 msgstr ""
 
-#: mercurial/cmdutil.py:708
+#. i18n: column positioning for "hg log"
+#: mercurial/cmdutil.py:714
 #, python-format
 msgid "parent:      %d:%s\n"
 msgstr ""
 
-#: mercurial/cmdutil.py:713
+#. i18n: column positioning for "hg log"
+#: mercurial/cmdutil.py:720
 #, python-format
 msgid "manifest:    %d:%s\n"
 msgstr ""
 
-#: mercurial/cmdutil.py:716
+#. i18n: column positioning for "hg log"
+#: mercurial/cmdutil.py:724
 #, python-format
 msgid "user:        %s\n"
 msgstr ""
 
-#: mercurial/cmdutil.py:718
+#. i18n: column positioning for "hg log"
+#: mercurial/cmdutil.py:727
 #, python-format
 msgid "date:        %s\n"
 msgstr ""
 
-#: mercurial/cmdutil.py:723
+#. i18n: column positioning for "hg log"
+#: mercurial/cmdutil.py:733