Commits

Katsunori FUJIWARA  committed 8b5db41 Merge

CATCHUP: merge downstream-line => default

  • Participants
  • Parent commits 7818b7c, 9d79863

Comments (0)

Files changed (4)

 bba9473ef5ac938fca0496dbe27461e4a1b12b6f official_2.3.2
 21b0edd525b867500e1fe1119a589e52a14b01ee official_2.4
 264f861c07ccdc8fb68888722aafaf1985232ac7 official_2.4.2
+42533f1be2562e81080829610819677e882185c7 official_2.5

File BASE_REVISION

-2a1fac3650a5b4d650198604c82ab59969500374
+61c8327ced503bf7a1996337af711e0f4a58d4c0
 msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2013-01-31 18:04+0900\n"
+"POT-Creation-Date: 2013-02-28 16:20+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:3520
+#: doc/gendoc.py:86 doc/gendoc.py:120 mercurial/commands.py:3522
 msgid "Commands"
 msgstr ""
 
-#: doc/gendoc.py:104 mercurial/commands.py:3521
+#: doc/gendoc.py:104 mercurial/commands.py:3523
 msgid "Extensions"
 msgstr ""
 
 #: mercurial/commands.py:764 mercurial/commands.py:1008
 #: mercurial/commands.py:1013 mercurial/commands.py:1085
 #: mercurial/commands.py:1123 mercurial/commands.py:1124
-#: mercurial/commands.py:1882 mercurial/commands.py:2194
-#: mercurial/commands.py:2206 mercurial/commands.py:2465
-#: mercurial/commands.py:2567 mercurial/commands.py:2568
-#: mercurial/commands.py:2654 mercurial/commands.py:2764
-#: mercurial/commands.py:2975 mercurial/commands.py:3565
-#: mercurial/commands.py:3973 mercurial/commands.py:4041
-#: mercurial/commands.py:4092 mercurial/commands.py:4102
-#: mercurial/commands.py:4265 mercurial/commands.py:4328
-#: mercurial/commands.py:4445 mercurial/commands.py:4493
-#: mercurial/commands.py:4585 mercurial/commands.py:4693
-#: mercurial/commands.py:4767 mercurial/commands.py:5107
-#: mercurial/commands.py:5421 mercurial/commands.py:5422
-#: mercurial/commands.py:5719 mercurial/commands.py:5911
+#: mercurial/commands.py:1882 mercurial/commands.py:2196
+#: mercurial/commands.py:2208 mercurial/commands.py:2467
+#: mercurial/commands.py:2569 mercurial/commands.py:2570
+#: mercurial/commands.py:2656 mercurial/commands.py:2766
+#: mercurial/commands.py:2977 mercurial/commands.py:3567
+#: mercurial/commands.py:3975 mercurial/commands.py:4043
+#: mercurial/commands.py:4094 mercurial/commands.py:4104
+#: mercurial/commands.py:4267 mercurial/commands.py:4330
+#: mercurial/commands.py:4447 mercurial/commands.py:4495
+#: mercurial/commands.py:4587 mercurial/commands.py:4695
+#: mercurial/commands.py:4769 mercurial/commands.py:5109
+#: mercurial/commands.py:5423 mercurial/commands.py:5424
+#: mercurial/commands.py:5721 mercurial/commands.py:5913
 msgid "REV"
 msgstr ""
 
 msgstr ""
 
 #: hgext/churn.py:189 hgext/graphlog.py:27 hgext/mq.py:2393 hgext/mq.py:2447
-#: mercurial/commands.py:83 mercurial/commands.py:2771
-#: mercurial/commands.py:4088 mercurial/commands.py:5106
-#: mercurial/commands.py:5910
+#: mercurial/commands.py:83 mercurial/commands.py:2773
+#: mercurial/commands.py:4090 mercurial/commands.py:5108
+#: mercurial/commands.py:5912
 msgid "DATE"
 msgstr ""
 
 msgid "count rate for revisions matching date spec"
 msgstr ""
 
-#: hgext/churn.py:191 mercurial/commands.py:92 mercurial/commands.py:5251
+#: hgext/churn.py:191 mercurial/commands.py:92 mercurial/commands.py:5253
 msgid "TEMPLATE"
 msgstr ""
 
 msgstr ""
 
 #: hgext/churn.py:193 mercurial/commands.py:1084 mercurial/commands.py:1945
-#: mercurial/commands.py:2652
+#: mercurial/commands.py:2654
 msgid "FORMAT"
 msgstr ""
 
 #: hgext/convert/__init__.py:316 hgext/convert/__init__.py:318
 #: hgext/inotify/__init__.py:91 hgext/keyword.py:364 hgext/rebase.py:49
 #: mercurial/commands.py:78 mercurial/commands.py:1606
-#: mercurial/commands.py:1988 mercurial/commands.py:3972
-#: mercurial/commands.py:5232 mercurial/commands.py:5235
-#: mercurial/commands.py:5245 mercurial/commands.py:5247
-#: mercurial/commands.py:5248 mercurial/commands.py:5254
+#: mercurial/commands.py:1988 mercurial/commands.py:3974
+#: mercurial/commands.py:5234 mercurial/commands.py:5237
+#: mercurial/commands.py:5247 mercurial/commands.py:5249
+#: mercurial/commands.py:5250 mercurial/commands.py:5256
 msgid "FILE"
 msgstr ""
 
 msgid "making snapshot of %d files from working directory\n"
 msgstr ""
 
-#: hgext/extdiff.py:126 mercurial/commands.py:2634 mercurial/commands.py:5484
+#: hgext/extdiff.py:126 mercurial/commands.py:2636 mercurial/commands.py:5486
 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:2583
+#: hgext/extdiff.py:253 hgext/extdiff.py:313 mercurial/commands.py:2585
 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:764
-#: mercurial/commands.py:2567 mercurial/commands.py:5911
+#: mercurial/commands.py:2569 mercurial/commands.py:5913
 msgid "revision"
 msgstr ""
 
-#: hgext/extdiff.py:275 mercurial/commands.py:2568
+#: hgext/extdiff.py:275 mercurial/commands.py:2570
 msgid "change made by revision"
 msgstr ""
 
 msgstr ""
 
 #: hgext/fetch.py:32 hgext/record.py:429 mercurial/commands.py:414
-#: mercurial/commands.py:1278 mercurial/commands.py:4177
-#: mercurial/commands.py:5137 mercurial/commands.py:5751
-#: mercurial/commands.py:5959
+#: mercurial/commands.py:1278 mercurial/commands.py:4179
+#: mercurial/commands.py:5139 mercurial/commands.py:5753
+#: mercurial/commands.py:5961
 msgid "    See :hg:`help dates` for a list of formats valid for -d/--date."
 msgstr ""
 
 #: mercurial/commands.py:355 mercurial/commands.py:416
 #: mercurial/commands.py:589 mercurial/commands.py:917
 #: mercurial/commands.py:1104 mercurial/commands.py:1224
-#: mercurial/commands.py:2011 mercurial/commands.py:2419
-#: mercurial/commands.py:2625 mercurial/commands.py:2713
-#: mercurial/commands.py:2752 mercurial/commands.py:3777
-#: mercurial/commands.py:4036 mercurial/commands.py:4185
-#: mercurial/commands.py:4281 mercurial/commands.py:4505
-#: mercurial/commands.py:4563 mercurial/commands.py:5139
-#: mercurial/commands.py:5226 mercurial/commands.py:5278
-#: mercurial/commands.py:5380 mercurial/commands.py:5477
-#: mercurial/commands.py:5537 mercurial/commands.py:5756
-#: mercurial/commands.py:5832 mercurial/commands.py:5874
+#: mercurial/commands.py:2011 mercurial/commands.py:2421
+#: mercurial/commands.py:2627 mercurial/commands.py:2715
+#: mercurial/commands.py:2754 mercurial/commands.py:3779
+#: mercurial/commands.py:4038 mercurial/commands.py:4187
+#: mercurial/commands.py:4283 mercurial/commands.py:4507
+#: mercurial/commands.py:4565 mercurial/commands.py:5141
+#: mercurial/commands.py:5228 mercurial/commands.py:5280
+#: mercurial/commands.py:5382 mercurial/commands.py:5479
+#: mercurial/commands.py:5539 mercurial/commands.py:5758
+#: mercurial/commands.py:5834 mercurial/commands.py:5876
 msgid ""
 "    Returns 0 on success.\n"
 "    "
 msgid "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
 msgstr ""
 
-#: hgext/fetch.py:71 mercurial/commands.py:4721
+#: hgext/fetch.py:71 mercurial/commands.py:4723
 #, python-format
 msgid "pulling from %s\n"
 msgstr ""
 
-#: hgext/fetch.py:78 mercurial/commands.py:4737
+#: hgext/fetch.py:78 mercurial/commands.py:4739
 msgid ""
 "other repository doesn't support revision lookup, so a rev cannot be "
 "specified."
 msgstr ""
 
 #: hgext/fetch.py:153 hgext/mq.py:2385 hgext/mq.py:2436
-#: mercurial/commands.py:5722
+#: mercurial/commands.py:5724
 msgid "edit commit message"
 msgstr ""
 
 msgstr ""
 
 #: hgext/gpg.py:207 hgext/graphlog.py:30 hgext/rebase.py:46
-#: mercurial/commands.py:76 mercurial/commands.py:4091
-#: mercurial/commands.py:5723
+#: mercurial/commands.py:76 mercurial/commands.py:4093
+#: mercurial/commands.py:5725
 msgid "TEXT"
 msgstr ""
 
 "revision graph is also shown.\n"
 msgstr ""
 
-#: hgext/graphlog.py:24 mercurial/commands.py:2968 mercurial/commands.py:4085
+#: hgext/graphlog.py:24 mercurial/commands.py:2970 mercurial/commands.py:4087
 msgid "follow changeset history, or file history across copies and renames"
 msgstr ""
 
-#: hgext/graphlog.py:26 mercurial/commands.py:4087
+#: hgext/graphlog.py:26 mercurial/commands.py:4089
 msgid "only follow the first parent of merge changesets (DEPRECATED)"
 msgstr ""
 
-#: hgext/graphlog.py:27 mercurial/commands.py:4088
+#: hgext/graphlog.py:27 mercurial/commands.py:4090
 msgid "show revisions matching date spec"
 msgstr ""
 
-#: hgext/graphlog.py:28 mercurial/commands.py:4089
+#: hgext/graphlog.py:28 mercurial/commands.py:4091
 msgid "show copied files"
 msgstr ""
 
-#: hgext/graphlog.py:30 mercurial/commands.py:4091
+#: hgext/graphlog.py:30 mercurial/commands.py:4093
 msgid "do case-insensitive search for a given text"
 msgstr ""
 
-#: hgext/graphlog.py:31 mercurial/commands.py:4092
+#: hgext/graphlog.py:31 mercurial/commands.py:4094
 msgid "show the specified revision or range"
 msgstr ""
 
-#: hgext/graphlog.py:32 mercurial/commands.py:4093
+#: hgext/graphlog.py:32 mercurial/commands.py:4095
 msgid "include revisions where files were removed"
 msgstr ""
 
-#: hgext/graphlog.py:33 mercurial/commands.py:4094
+#: hgext/graphlog.py:33 mercurial/commands.py:4096
 msgid "show only merges (DEPRECATED)"
 msgstr ""
 
 #: hgext/graphlog.py:34 hgext/mq.py:2390 hgext/mq.py:2443
-#: mercurial/commands.py:85 mercurial/commands.py:4095
+#: mercurial/commands.py:85 mercurial/commands.py:4097
 msgid "USER"
 msgstr ""
 
-#: hgext/graphlog.py:34 mercurial/commands.py:4095
+#: hgext/graphlog.py:34 mercurial/commands.py:4097
 msgid "revisions committed by user"
 msgstr ""
 
-#: hgext/graphlog.py:36 mercurial/commands.py:4097
+#: hgext/graphlog.py:36 mercurial/commands.py:4099
 msgid "show only changesets within the given named branch (DEPRECATED)"
 msgstr ""
 
 #: hgext/graphlog.py:37 hgext/graphlog.py:39 hgext/transplant.py:497
 #: mercurial/commands.py:1010 mercurial/commands.py:1125
-#: mercurial/commands.py:3976 mercurial/commands.py:4098
-#: mercurial/commands.py:4100 mercurial/commands.py:4449
-#: mercurial/commands.py:4696 mercurial/commands.py:4770
+#: mercurial/commands.py:3978 mercurial/commands.py:4100
+#: mercurial/commands.py:4102 mercurial/commands.py:4451
+#: mercurial/commands.py:4698 mercurial/commands.py:4772
 msgid "BRANCH"
 msgstr ""
 
-#: hgext/graphlog.py:39 mercurial/commands.py:4100
+#: hgext/graphlog.py:39 mercurial/commands.py:4102
 msgid "show changesets within the given named branch"
 msgstr ""
 
-#: hgext/graphlog.py:41 mercurial/commands.py:4102
+#: hgext/graphlog.py:41 mercurial/commands.py:4104
 msgid "do not display revision or any of its ancestors"
 msgstr ""
 
-#: hgext/graphlog.py:43 mercurial/commands.py:4104
+#: hgext/graphlog.py:43 mercurial/commands.py:4106
 msgid "[OPTION]... [FILE]"
 msgstr ""
 
 
 #: hgext/hgk.py:323 hgext/inotify/__init__.py:87 hgext/inotify/__init__.py:89
 #: mercurial/commands.py:99 mercurial/commands.py:125
-#: mercurial/commands.py:3703 mercurial/commands.py:5234
+#: mercurial/commands.py:3705 mercurial/commands.py:5236
 msgid "NUM"
 msgstr ""
 
 msgstr ""
 
 #: hgext/histedit.py:449 hgext/patchbomb.py:278 mercurial/commands.py:1822
-#: mercurial/commands.py:4014 mercurial/commands.py:4483 mercurial/hg.py:500
+#: mercurial/commands.py:4016 mercurial/commands.py:4485 mercurial/hg.py:500
 #: mercurial/hg.py:552
 #, python-format
 msgid "comparing with %s\n"
 msgid "directories being watched:\n"
 msgstr ""
 
-#: hgext/inotify/__init__.py:85 mercurial/commands.py:5233
+#: hgext/inotify/__init__.py:85 mercurial/commands.py:5235
 msgid "run server in background"
 msgstr ""
 
-#: hgext/inotify/__init__.py:87 mercurial/commands.py:5234
+#: hgext/inotify/__init__.py:87 mercurial/commands.py:5236
 msgid "used internally by daemon mode"
 msgstr ""
 
 msgid "minutes to sit idle before exiting"
 msgstr ""
 
-#: hgext/inotify/__init__.py:91 mercurial/commands.py:5248
+#: hgext/inotify/__init__.py:91 mercurial/commands.py:5250
 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:2756
-#: mercurial/commands.py:4926
+#: hgext/largefiles/overrides.py:128 mercurial/commands.py:2758
+#: mercurial/commands.py:4928
 msgid "no files specified"
 msgstr ""
 
-#: hgext/largefiles/overrides.py:150 mercurial/commands.py:4950
+#: hgext/largefiles/overrides.py:150 mercurial/commands.py:4952
 #, python-format
 msgid "not removing %s: file still exists\n"
 msgstr ""
 
-#: hgext/largefiles/overrides.py:153 mercurial/commands.py:4955
+#: hgext/largefiles/overrides.py:153 mercurial/commands.py:4957
 #, python-format
 msgid "not removing %s: file is modified (use -f to force removal)\n"
 msgstr ""
 
-#: hgext/largefiles/overrides.py:155 mercurial/commands.py:4959
+#: hgext/largefiles/overrides.py:155 mercurial/commands.py:4961
 #, python-format
 msgid "not removing %s: file has been marked for add (use forget to undo)\n"
 msgstr ""
 
 #: hgext/largefiles/overrides.py:160 hgext/largefiles/overrides.py:172
 #: hgext/largefiles/overrides.py:970 mercurial/cmdutil.py:1572
-#: mercurial/cmdutil.py:1876 mercurial/commands.py:4965 mercurial/merge.py:374
-#: mercurial/scmutil.py:754
+#: mercurial/cmdutil.py:1876 mercurial/commands.py:4967 mercurial/merge.py:374
+#: mercurial/scmutil.py:758
 #, python-format
 msgid "removing %s\n"
 msgstr ""
 msgid "--normal cannot be used with --large"
 msgstr ""
 
-#: hgext/largefiles/overrides.py:313 mercurial/commands.py:5994
+#: hgext/largefiles/overrides.py:313 mercurial/commands.py:5996
 msgid "uncommitted local changes"
 msgstr ""
 
 msgid "patch failed, unable to continue (try -v)\n"
 msgstr ""
 
-#: hgext/mq.py:748 hgext/transplant.py:258 mercurial/commands.py:3935
+#: hgext/mq.py:748 hgext/transplant.py:258 mercurial/commands.py:3937
 #, python-format
 msgid "applying %s\n"
 msgstr ""
 msgstr ""
 
 #: hgext/mq.py:2125 hgext/mq.py:2737 hgext/mq.py:2775 hgext/mq.py:2885
-#: hgext/patchbomb.py:176 mercurial/commands.py:766 mercurial/commands.py:5243
+#: hgext/patchbomb.py:176 mercurial/commands.py:766 mercurial/commands.py:5245
 msgid "NAME"
 msgstr ""
 
 
 #: hgext/mq.py:2129 hgext/mq.py:2387 hgext/mq.py:2437 hgext/patchbomb.py:170
 #: mercurial/commands.py:97 mercurial/commands.py:107
-#: mercurial/commands.py:5859
+#: mercurial/commands.py:5861
 msgid "use git extended diff format"
 msgstr ""
 
 msgstr ""
 
 #: hgext/mq.py:2591 hgext/mq.py:2740 hgext/mq.py:2779
-#: mercurial/commands.py:5108
+#: mercurial/commands.py:5110
 msgid "do not save backup copies of files"
 msgstr ""
 
 msgid "bookmark '%s' deleted\n"
 msgstr ""
 
-#: hgext/mq.py:3002 mercurial/commands.py:4632 mercurial/scmutil.py:606
+#: hgext/mq.py:3002 mercurial/commands.py:4634 mercurial/scmutil.py:610
 msgid "empty revision set"
 msgstr ""
 
 "    to upstream."
 msgstr ""
 
-#: hgext/mq.py:3189 mercurial/commands.py:2851 mercurial/commands.py:4616
+#: hgext/mq.py:3189 mercurial/commands.py:2853 mercurial/commands.py:4618
 msgid "no revisions specified"
 msgstr ""
 
 msgid "only a local queue repository may be initialized"
 msgstr ""
 
-#: hgext/mq.py:3496 mercurial/commands.py:1445 mercurial/commands.py:3608
-#: mercurial/commands.py:5286 mercurial/commands.py:5317
+#: hgext/mq.py:3496 mercurial/commands.py:1445 mercurial/commands.py:3610
+#: mercurial/commands.py:5288 mercurial/commands.py:5319
 msgid "there is no Mercurial repository here (.hg not found)"
 msgstr ""
 
 msgstr ""
 
 #: hgext/patchbomb.py:285 mercurial/hg.py:509 mercurial/localrepo.py:1669
-#: mercurial/scmutil.py:29
+#: mercurial/scmutil.py:33
 msgid "no changes found\n"
 msgstr ""
 
 msgid "%s cannot be removed"
 msgstr ""
 
-#: hgext/purge.py:83 mercurial/scmutil.py:53 mercurial/scmutil.py:87
+#: hgext/purge.py:83 mercurial/scmutil.py:57 mercurial/scmutil.py:91
 #: mercurial/simplemerge.py:411
 #, python-format
 msgid "warning: %s\n"
 msgid "use text as collapse commit message"
 msgstr ""
 
-#: hgext/rebase.py:47 hgext/transplant.py:503 mercurial/commands.py:2766
-#: mercurial/commands.py:3705
+#: hgext/rebase.py:47 hgext/transplant.py:503 mercurial/commands.py:2768
+#: mercurial/commands.py:3707
 msgid "invoke editor on commit messages"
 msgstr ""
 
 
 #: hgext/rebase.py:71
 msgid ""
+"    In its default configuration, Mercurial will prevent you from\n"
+"    rebasing published changes. See :hg:`help phases` for details."
+msgstr ""
+
+#: hgext/rebase.py:74
+msgid ""
 "    If you don't specify a destination changeset (``-d/--dest``),\n"
 "    rebase uses the tipmost head of the current named branch as the\n"
 "    destination. (The destination changeset is not modified by\n"
 "    rebasing, but new changesets are added as its descendants.)"
 msgstr ""
 
-#: hgext/rebase.py:76
+#: hgext/rebase.py:79
 msgid ""
 "    You can specify which changesets to rebase in two ways: as a\n"
 "    \"source\" changeset or as a \"base\" changeset. Both are shorthand\n"
 "    uses the parent of the working directory as the base."
 msgstr ""
 
-#: hgext/rebase.py:88
+#: hgext/rebase.py:91
+msgid ""
+"    For advanced usage, a third way is available through the ``--rev``\n"
+"    option. It allows you to specify an arbitrary set of changesets to\n"
+"    rebase. Descendants of revs you specify with this option are not\n"
+"    automatically included in the rebase."
+msgstr ""
+
+#: hgext/rebase.py:96
 msgid ""
 "    By default, rebase recreates the changesets in the source branch\n"
 "    as descendants of dest and then destroys the originals. Use\n"
 "    branch) may be dropped if they no longer contribute any change."
 msgstr ""
 
-#: hgext/rebase.py:94
+#: hgext/rebase.py:102
 msgid ""
 "    One result of the rules for selecting the destination changeset\n"
 "    and source branch is that, unlike ``merge``, rebase will do\n"
 "    the intended source branch)."
 msgstr ""
 
-#: hgext/rebase.py:101
+#: hgext/rebase.py:109
 msgid ""
 "    If a rebase is interrupted to manually resolve a merge, it can be\n"
 "    continued with --continue/-c or aborted with --abort/-a."
 msgstr ""
 
-#: hgext/rebase.py:104
+#: hgext/rebase.py:112
 msgid ""
 "    Returns 0 on success, 1 if nothing to rebase.\n"
 "    "
 msgstr ""
 
-#: hgext/rebase.py:139
+#: hgext/rebase.py:147
 msgid "message can only be specified with collapse"
 msgstr ""
 
-#: hgext/rebase.py:143
+#: hgext/rebase.py:151
 msgid "cannot use both abort and continue"
 msgstr ""
 
-#: hgext/rebase.py:146
+#: hgext/rebase.py:154
 msgid "cannot use collapse with continue or abort"
 msgstr ""
 
-#: hgext/rebase.py:149
+#: hgext/rebase.py:157
 msgid "abort and continue do not allow specifying revisions"
 msgstr ""
 
-#: hgext/rebase.py:151
+#: hgext/rebase.py:159
 msgid "tool option will be ignored\n"
 msgstr ""
 
-#: hgext/rebase.py:159
+#: hgext/rebase.py:167
 msgid "cannot specify both a source and a base"
 msgstr ""
 
-#: hgext/rebase.py:162
+#: hgext/rebase.py:170
 msgid "cannot specify both a revision and a base"
 msgstr ""
 
-#: hgext/rebase.py:165
+#: hgext/rebase.py:173
 msgid "cannot specify both a revision and a source"
 msgstr ""
 
-#: hgext/rebase.py:200
+#: hgext/rebase.py:208
 msgid "can't remove original changesets with unrebased descendants"
 msgstr ""
 
-#: hgext/rebase.py:202
+#: hgext/rebase.py:210
 msgid "use --keep to keep original changesets"
 msgstr ""
 
-#: hgext/rebase.py:204
+#: hgext/rebase.py:212
 #, python-format
 msgid "can't rebase immutable changeset %s"
 msgstr ""
 
-#: hgext/rebase.py:206 hgext/rebase.py:583
+#: hgext/rebase.py:214 hgext/rebase.py:593
 msgid "see hg help phases for details"
 msgstr ""
 
-#: hgext/rebase.py:212
+#: hgext/rebase.py:220
 msgid "nothing to rebase\n"
 msgstr ""
 
-#: hgext/rebase.py:230
+#: hgext/rebase.py:238
 msgid "cannot collapse multiple named branches"
 msgstr ""
 
-#: hgext/rebase.py:250 hgext/rebase.py:285
+#: hgext/rebase.py:258 hgext/rebase.py:293
 msgid "rebasing"
 msgstr ""
 
-#: hgext/rebase.py:251 mercurial/localrepo.py:2029 mercurial/localrepo.py:2142
-#: mercurial/localrepo.py:2247 mercurial/localrepo.py:2267
+#: hgext/rebase.py:259 mercurial/localrepo.py:2043 mercurial/localrepo.py:2156
+#: mercurial/localrepo.py:2261 mercurial/localrepo.py:2281
 #: mercurial/verify.py:136
 msgid "changesets"
 msgstr ""
 
-#: hgext/rebase.py:263
+#: hgext/rebase.py:271
 msgid "unresolved conflicts (see hg resolve, then hg rebase --continue)"
 msgstr ""
 
-#: hgext/rebase.py:280
+#: hgext/rebase.py:288
 #, python-format
 msgid "no changes, revision %d skipped\n"
 msgstr ""
 
-#: hgext/rebase.py:286
+#: hgext/rebase.py:294
 msgid "rebase merging completed\n"
 msgstr ""
 
-#: hgext/rebase.py:322
+#: hgext/rebase.py:333
 msgid "rebase completed\n"
 msgstr ""
 
-#: hgext/rebase.py:325
+#: hgext/rebase.py:336
 #, python-format
 msgid "%d revisions have been skipped\n"
 msgstr ""
 
-#: hgext/rebase.py:348
+#: hgext/rebase.py:359
 msgid "unable to collapse, there is more than one external parent"
 msgstr ""
 
-#: hgext/rebase.py:441
+#: hgext/rebase.py:452
 #, python-format
 msgid "cannot use revision %d as base, result would have 3 parents"
 msgstr ""
 
-#: hgext/rebase.py:574
+#: hgext/rebase.py:584
 msgid "no rebase in progress"
 msgstr ""
 
-#: hgext/rebase.py:581
+#: hgext/rebase.py:591
 #, python-format
 msgid "can't abort rebase due to immutable changesets %s"
 msgstr ""
 
-#: hgext/rebase.py:589
+#: hgext/rebase.py:599
 msgid "warning: new changesets detected on target branch, can't abort\n"
 msgstr ""
 
-#: hgext/rebase.py:601
+#: hgext/rebase.py:611
 msgid "rebase aborted\n"
 msgstr ""
 
-#: hgext/rebase.py:617
+#: hgext/rebase.py:627
 msgid "cannot rebase onto an applied mq patch"
 msgstr ""
 
-#: hgext/rebase.py:621
+#: hgext/rebase.py:631
 msgid "no matching revisions"
 msgstr ""
 
-#: hgext/rebase.py:628
+#: hgext/rebase.py:638
 msgid "source is ancestor of destination"
 msgstr ""
 
-#: hgext/rebase.py:716
+#: hgext/rebase.py:726
 msgid "warning: new changesets detected on source branch, not stripping\n"
 msgstr ""
 
-#: hgext/rebase.py:757 mercurial/bookmarks.py:240 mercurial/commands.py:4675
-#: mercurial/commands.py:6006 mercurial/localrepo.py:1933
+#: hgext/rebase.py:767 mercurial/bookmarks.py:240 mercurial/commands.py:4677
+#: mercurial/commands.py:6008 mercurial/localrepo.py:1947
 #, python-format
 msgid "updating bookmark %s\n"
 msgstr ""
 
-#: hgext/rebase.py:761
+#: hgext/rebase.py:771
 msgid "--tool can only be used with --rebase"
 msgstr ""
 
-#: hgext/rebase.py:768
+#: hgext/rebase.py:778
 msgid "rebase working directory to branch head"
 msgstr ""
 
-#: hgext/rebase.py:770
+#: hgext/rebase.py:780
 msgid "specify merge tool for rebase"
 msgstr ""
 
 
 #: hgext/relink.py:89 hgext/relink.py:124 hgext/relink.py:167
 #: mercurial/archival.py:293 mercurial/archival.py:298
-#: mercurial/localrepo.py:2031 mercurial/localrepo.py:2144
-#: mercurial/localrepo.py:2294 mercurial/localrepo.py:2323
+#: mercurial/localrepo.py:2045 mercurial/localrepo.py:2158
+#: mercurial/localrepo.py:2308 mercurial/localrepo.py:2337
 #: mercurial/merge.py:372 mercurial/merge.py:435 mercurial/subrepo.py:385
-#: mercurial/subrepo.py:393 mercurial/subrepo.py:1283
-#: mercurial/subrepo.py:1296
+#: mercurial/subrepo.py:393 mercurial/subrepo.py:1284
+#: mercurial/subrepo.py:1297
 msgid "files"
 msgstr ""
 
 "    unpublished changesets."
 msgstr ""
 
-#: hgext/transplant.py:520 mercurial/commands.py:2786
+#: hgext/transplant.py:520 mercurial/commands.py:2788
 msgid ""
 "    If --log is specified, log messages will have a comment appended\n"
 "    of the form::"
 msgid "username %s contains a newline"
 msgstr ""
 
-#: mercurial/changelog.py:335 mercurial/scmutil.py:33
+#: mercurial/changelog.py:335 mercurial/scmutil.py:37
 #, python-format
 msgid "the name '%s' is reserved"
 msgstr ""
 msgstr ""
 
 #: mercurial/cmdutil.py:1516 mercurial/cmdutil.py:1879
-#: mercurial/scmutil.py:748
+#: mercurial/scmutil.py:752
 #, python-format
 msgid "adding %s\n"
 msgstr ""
 msgid "ENCODE"
 msgstr ""
 
-#: mercurial/commands.py:46 mercurial/commands.py:5250
+#: mercurial/commands.py:46 mercurial/commands.py:5252
 msgid "MODE"
 msgstr ""
 
 msgid "record the specified user as committer"
 msgstr ""
 
-#: mercurial/commands.py:90 mercurial/commands.py:5252
+#: mercurial/commands.py:90 mercurial/commands.py:5254
 msgid "STYLE"
 msgstr ""
 
 msgid "display with template"
 msgstr ""
 
-#: mercurial/commands.py:96 mercurial/commands.py:5858
+#: mercurial/commands.py:96 mercurial/commands.py:5860
 msgid "show patch"
 msgstr ""
 
 msgstr ""
 
 #: mercurial/commands.py:106 mercurial/commands.py:219
-#: mercurial/commands.py:2966
+#: mercurial/commands.py:2968
 msgid "treat all files as text"
 msgstr ""
 
 msgstr ""
 
 #: mercurial/commands.py:147 mercurial/commands.py:183
-#: mercurial/commands.py:1245 mercurial/commands.py:2528
-#: mercurial/commands.py:5014 mercurial/commands.py:5424
+#: mercurial/commands.py:1245 mercurial/commands.py:2530
+#: mercurial/commands.py:5016 mercurial/commands.py:5426
 msgid "[OPTION]... [FILE]..."
 msgstr ""
 
 
 #: mercurial/commands.py:159 mercurial/commands.py:326
 #: mercurial/commands.py:402 mercurial/commands.py:532
-#: mercurial/commands.py:1159 mercurial/commands.py:2599
-#: mercurial/commands.py:2694 mercurial/commands.py:2740
-#: mercurial/commands.py:2799 mercurial/commands.py:3588
-#: mercurial/commands.py:3756 mercurial/commands.py:4137
-#: mercurial/commands.py:4895 mercurial/commands.py:5193
-#: mercurial/commands.py:5460 mercurial/commands.py:5930
+#: mercurial/commands.py:1159 mercurial/commands.py:2601
+#: mercurial/commands.py:2696 mercurial/commands.py:2742
+#: mercurial/commands.py:2801 mercurial/commands.py:3590
+#: mercurial/commands.py:3758 mercurial/commands.py:4139
+#: mercurial/commands.py:4897 mercurial/commands.py:5195
+#: mercurial/commands.py:5462 mercurial/commands.py:5932
 msgid "    .. container:: verbose"
 msgstr ""
 
 "    identical files are detected."
 msgstr ""
 
-#: mercurial/commands.py:209 mercurial/commands.py:3799
+#: mercurial/commands.py:209 mercurial/commands.py:3801
 msgid "similarity must be a number"
 msgstr ""
 
-#: mercurial/commands.py:211 mercurial/commands.py:3801
+#: mercurial/commands.py:211 mercurial/commands.py:3803
 msgid "similarity must be between 0 and 100"
 msgstr ""
 
 msgid "don't follow copies and renames"
 msgstr ""
 
-#: mercurial/commands.py:220 mercurial/commands.py:2976
+#: mercurial/commands.py:220 mercurial/commands.py:2978
 msgid "list the author (long with -v)"
 msgstr ""
 
 msgid "list the filename"
 msgstr ""
 
-#: mercurial/commands.py:222 mercurial/commands.py:2977
+#: mercurial/commands.py:222 mercurial/commands.py:2979
 msgid "list the date (short with -q)"
 msgstr ""
 
 msgid "directory prefix for files in archive"
 msgstr ""
 
-#: mercurial/commands.py:312 mercurial/commands.py:5241
+#: mercurial/commands.py:312 mercurial/commands.py:5243
 msgid "PREFIX"
 msgstr ""
 
 msgstr ""
 
 #: mercurial/commands.py:328 mercurial/commands.py:1195
-#: mercurial/commands.py:2601 mercurial/commands.py:2696
-#: mercurial/commands.py:2742 mercurial/commands.py:2801
-#: mercurial/commands.py:3590 mercurial/commands.py:3758
-#: mercurial/commands.py:5462
+#: mercurial/commands.py:2603 mercurial/commands.py:2698
+#: mercurial/commands.py:2744 mercurial/commands.py:2803
+#: mercurial/commands.py:3592 mercurial/commands.py:3760
+#: mercurial/commands.py:5464
 msgid "      Examples:"
 msgstr ""
 
 "      merged separately."
 msgstr ""
 
-#: mercurial/commands.py:419 mercurial/commands.py:4309
-#: mercurial/commands.py:4363 mercurial/commands.py:5964
+#: mercurial/commands.py:419 mercurial/commands.py:4311
+#: mercurial/commands.py:4365 mercurial/commands.py:5966
 msgid "please specify just one revision"
 msgstr ""
 
 "    is bad."
 msgstr ""
 
-#: mercurial/commands.py:534 mercurial/commands.py:4139
+#: mercurial/commands.py:534 mercurial/commands.py:4141
 msgid "      Some examples:"
 msgstr ""
 
 msgid " (inactive)"
 msgstr ""
 
-#: mercurial/commands.py:1006 mercurial/commands.py:4443
+#: mercurial/commands.py:1006 mercurial/commands.py:4445
 msgid "run even when the destination is unrelated"
 msgstr ""
 
 msgid "--base is incompatible with specifying a destination"
 msgstr ""
 
-#: mercurial/commands.py:1084 mercurial/commands.py:2652
+#: mercurial/commands.py:1084 mercurial/commands.py:2654
 msgid "print output to file with formatted name"
 msgstr ""
 
 msgid "apply any matching decode filter"
 msgstr ""
 
-#: mercurial/commands.py:1088 mercurial/commands.py:2727
-#: mercurial/commands.py:4885
+#: mercurial/commands.py:1088 mercurial/commands.py:2729
+#: mercurial/commands.py:4887
 msgid "[OPTION]... FILE..."
 msgstr ""
 
 msgid "record a copy that has already occurred"
 msgstr ""
 
-#: mercurial/commands.py:1411 mercurial/commands.py:4982
+#: mercurial/commands.py:1411 mercurial/commands.py:4984
 msgid "forcibly copy over an existing managed file"
 msgstr ""
 
 "    the source must be a single file."
 msgstr ""
 
-#: mercurial/commands.py:1421 mercurial/commands.py:4992
+#: mercurial/commands.py:1421 mercurial/commands.py:4994
 msgid ""
 "    By default, this command copies the contents of files as they\n"
 "    exist in the working directory. If invoked with -A/--after, the\n"
 "    before that, see :hg:`revert`."
 msgstr ""
 
-#: mercurial/commands.py:1428 mercurial/commands.py:4999
-#: mercurial/commands.py:6029
+#: mercurial/commands.py:1428 mercurial/commands.py:5001
+#: mercurial/commands.py:6031
 msgid ""
 "    Returns 0 on success, 1 if errors are encountered.\n"
 "    "
 msgstr ""
 
 #: mercurial/commands.py:1781 mercurial/commands.py:1943
-#: mercurial/commands.py:2223
+#: mercurial/commands.py:2225
 msgid "open changelog"
 msgstr ""
 
 #: mercurial/commands.py:1782 mercurial/commands.py:1944
-#: mercurial/commands.py:2224
+#: mercurial/commands.py:2226
 msgid "open manifest"
 msgstr ""
 
 msgid "create arbitrary obsolete marker"
 msgstr ""
 
-#: mercurial/commands.py:2151
+#: mercurial/commands.py:2111
+msgid "    With no arguments it it display the list obsolescence marker."
+msgstr ""
+
+#: mercurial/commands.py:2153
 msgid "REPO NAMESPACE [KEY OLD NEW]"
 msgstr ""
 
-#: mercurial/commands.py:2153
+#: mercurial/commands.py:2155
 msgid "access the pushkey key/value protocol"
 msgstr ""
 
-#: mercurial/commands.py:2155
+#: mercurial/commands.py:2157
 msgid "    With two args, list the keys in the given namespace."
 msgstr ""
 
-#: mercurial/commands.py:2157
+#: mercurial/commands.py:2159
 msgid ""
 "    With five args, set a key to new if it currently is set to old.\n"
 "    Reports success or failure.\n"
 "    "
 msgstr ""
 
-#: mercurial/commands.py:2172
+#: mercurial/commands.py:2174
 msgid "A B"
 msgstr ""
 
-#: mercurial/commands.py:2186
+#: mercurial/commands.py:2188
 #, python-format
 msgid "a: %s\n"
 msgstr ""
 
-#: mercurial/commands.py:2187
+#: mercurial/commands.py:2189
 #, python-format
 msgid "b: %s\n"
 msgstr ""
 
-#: mercurial/commands.py:2188
+#: mercurial/commands.py:2190
 #, python-format
 msgid "depth(a): %d depth(b): %d\n"
 msgstr ""
 
-#: mercurial/commands.py:2189
+#: mercurial/commands.py:2191
 #, python-format
 msgid "delta: %d hdist: %d distance: %d relation: %s\n"
 msgstr ""
 
-#: mercurial/commands.py:2194
+#: mercurial/commands.py:2196
 msgid "revision to rebuild to"
 msgstr ""
 
-#: mercurial/commands.py:2195 mercurial/commands.py:2466
+#: mercurial/commands.py:2197 mercurial/commands.py:2468
 msgid "[-r REV] [REV]"
 msgstr ""
 
-#: mercurial/commands.py:2197
+#: mercurial/commands.py:2199
 msgid "rebuild the dirstate as it would look like for the given revision"
 msgstr ""
 
-#: mercurial/commands.py:2206
+#: mercurial/commands.py:2208
 msgid "revision to debug"
 msgstr ""
 
-#: mercurial/commands.py:2207
+#: mercurial/commands.py:2209
 msgid "[-r REV] FILE"
 msgstr ""
 
-#: mercurial/commands.py:2209
+#: mercurial/commands.py:2211
 msgid "dump rename information"
 msgstr ""
 
-#: mercurial/commands.py:2218
+#: mercurial/commands.py:2220
 #, python-format
 msgid "%s renamed from %s:%s\n"
 msgstr ""
 
-#: mercurial/commands.py:2220
+#: mercurial/commands.py:2222
 #, python-format
 msgid "%s not renamed\n"
 msgstr ""
 
-#: mercurial/commands.py:2225
+#: mercurial/commands.py:2227
 msgid "dump index data"
 msgstr ""
 
-#: mercurial/commands.py:2226
+#: mercurial/commands.py:2228
 msgid "-c|-m|FILE"
 msgstr ""
 
-#: mercurial/commands.py:2228
+#: mercurial/commands.py:2230
 msgid "show data and statistics about a revlog"
 msgstr ""
 
-#: mercurial/commands.py:2397
+#: mercurial/commands.py:2399
 msgid "parse and apply a revision specification"
 msgstr ""
 
-#: mercurial/commands.py:2399
+#: mercurial/commands.py:2401
 msgid ""
 "    Use --verbose to print the parsed tree before and after aliases\n"
 "    expansion.\n"
 "    "
 msgstr ""
 
-#: mercurial/commands.py:2412
+#: mercurial/commands.py:2414
 msgid "REV1 [REV2]"
 msgstr ""
 
-#: mercurial/commands.py:2414
+#: mercurial/commands.py:2416
 msgid "manually set the parents of the current working directory"
 msgstr ""
 
-#: mercurial/commands.py:2416
+#: mercurial/commands.py:2418
 msgid ""
 "    This is useful for writing repository conversion tools, but should\n"
 "    be used with care."
 msgstr ""
 
-#: mercurial/commands.py:2432
+#: mercurial/commands.py:2434
 msgid "do not display the saved mtime"
 msgstr ""
 
-#: mercurial/commands.py:2433
+#: mercurial/commands.py:2435
 msgid "sort by saved mtime"
 msgstr ""
 
-#: mercurial/commands.py:2434 mercurial/commands.py:5255
+#: mercurial/commands.py:2436 mercurial/commands.py:5257
 msgid "[OPTION]..."
 msgstr ""
 
-#: mercurial/commands.py:2436
+#: mercurial/commands.py:2438
 msgid "show the contents of the current dirstate"
 msgstr ""
 
-#: mercurial/commands.py:2461
+#: mercurial/commands.py:2463
 #, python-format
 msgid "copy: %s -> %s\n"
 msgstr ""
 
-#: mercurial/commands.py:2465
+#: mercurial/commands.py:2467
 msgid "revision to check"
 msgstr ""
 
-#: mercurial/commands.py:2476
+#: mercurial/commands.py:2478
 msgid "[REV]"
 msgstr ""
 
-#: mercurial/commands.py:2478
+#: mercurial/commands.py:2480
 msgid "show set of successors for revision"
 msgstr ""
 
-#: mercurial/commands.py:2480
+#: mercurial/commands.py:2482
 msgid ""
 "    A successors set of changeset A is a consistent group of revisions that\n"
 "    succeed A. It contains non-obsolete changesets only."
 msgstr ""
 
-#: mercurial/commands.py:2483
+#: mercurial/commands.py:2485
 msgid ""
 "    In most cases a changeset A has a single successors set containing a single\n"
 "    successor (changeset A replaced by A')."
 msgstr ""
 
-#: mercurial/commands.py:2486
+#: mercurial/commands.py:2488
 msgid ""
 "    A changeset that is made obsolete with no successors are called \"pruned\".\n"
 "    Such changesets have no successors sets at all."
 msgstr ""
 
-#: mercurial/commands.py:2489
+#: mercurial/commands.py:2491
 msgid ""
 "    A changeset that has been \"split\" will have a successors set containing\n"
 "    more than one successor."
 msgstr ""
 
-#: mercurial/commands.py:2492
+#: mercurial/commands.py:2494
 msgid ""
 "    A changeset that has been rewritten in multiple different ways is called\n"
 "    \"divergent\". Such changesets have multiple successor sets (each of which\n"
 "    may also be split, i.e. have multiple successors)."
 msgstr ""
 
-#: mercurial/commands.py:2496
+#: mercurial/commands.py:2498
 msgid "    Results are displayed as follows::"
 msgstr ""
 
-#: mercurial/commands.py:2498
+#: mercurial/commands.py:2500
 msgid ""
 "        <rev1>\n"
 "            <successors-1A>\n"
 "            <successors-2B1> <successors-2B2> <successors-2B3>"
 msgstr ""
 
-#: mercurial/commands.py:2504
+#: mercurial/commands.py:2506
 msgid ""
 "    Here rev2 has two possible (i.e. divergent) successors sets. The first\n"
 "    holds one element, whereas the second holds three (i.e. the changeset has\n"
 "    "
 msgstr ""
 
-#: mercurial/commands.py:2530
+#: mercurial/commands.py:2532
 msgid "show how files match on given patterns"
 msgstr ""
 
-#: mercurial/commands.py:2550
+#: mercurial/commands.py:2552
 msgid "REPO [OPTIONS]... [ONE [TWO]]"
 msgstr ""
 
-#: mercurial/commands.py:2570
+#: mercurial/commands.py:2572
 msgid "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..."
 msgstr ""
 
-#: mercurial/commands.py:2572
+#: mercurial/commands.py:2574
 msgid "diff repository (or selected files)"
 msgstr ""
 
-#: mercurial/commands.py:2574
+#: mercurial/commands.py:2576
 msgid "    Show differences between revisions for the specified files."
 msgstr ""
 
-#: mercurial/commands.py:2576
+#: mercurial/commands.py:2578
 msgid "    Differences between files are shown using the unified diff format."
 msgstr ""
 
-#: mercurial/commands.py:2578
+#: mercurial/commands.py:2580
 msgid ""
 "    .. note::\n"
 "       diff may generate unexpected results for merges, as it will\n"
 "       parent changeset if no revisions are specified."
 msgstr ""
 
-#: mercurial/commands.py:2589
+#: mercurial/commands.py:2591
 msgid ""
 "    Alternatively you can specify -c/--change with a revision to see\n"
 "    the changes in that changeset relative to its first parent."
 msgstr ""
 
-#: mercurial/commands.py:2592
+#: mercurial/commands.py:2594
 msgid ""
 "    Without the -a/--text option, diff will avoid generating diffs of\n"
 "    files it detects as binary. With -a, diff will generate a diff\n"
 "    anyway, probably with undesirable results."
 msgstr ""
 
-#: mercurial/commands.py:2596
+#: mercurial/commands.py:2598
 msgid ""
 "    Use the -g/--git option to generate diffs in the git extended diff\n"
 "    format. For more information, read :hg:`help diffs`."
 msgstr ""
 
-#: mercurial/commands.py:2603
+#: mercurial/commands.py:2605
 msgid ""
 "      - compare a file in the current working directory to its parent::"
 msgstr ""
 
-#: mercurial/commands.py:2605
+#: mercurial/commands.py:2607
 msgid "          hg diff foo.c"
 msgstr ""
 
-#: mercurial/commands.py:2607
+#: mercurial/commands.py:2609
 msgid ""
 "      - compare two historical versions of a directory, with rename info::"
 msgstr ""
 
-#: mercurial/commands.py:2609
+#: mercurial/commands.py:2611
 msgid "          hg diff --git -r 1.0:1.2 lib/"
 msgstr ""
 
-#: mercurial/commands.py:2611
+#: mercurial/commands.py:2613
 msgid "      - get change stats relative to the last change on some date::"
 msgstr ""
 
-#: mercurial/commands.py:2613
+#: mercurial/commands.py:2615
 msgid "          hg diff --stat -r \"date('may 2')\""
 msgstr ""
 
-#: mercurial/commands.py:2615
+#: mercurial/commands.py:2617
 msgid "      - diff all newly-added files that contain a keyword::"
 msgstr ""
 
-#: mercurial/commands.py:2617
+#: mercurial/commands.py:2619
 msgid "          hg diff \"set:added() and grep(GNU)\""
 msgstr ""
 
-#: mercurial/commands.py:2619
+#: mercurial/commands.py:2621
 msgid "      - compare a revision and its parents::"
 msgstr ""
 
-#: mercurial/commands.py:2621
+#: mercurial/commands.py:2623
 msgid ""
 "          hg diff -c 9353         # compare against first parent\n"
 "          hg diff -r 9353^:9353   # same using revset syntax\n"
 "          hg diff -r 9353^2:9353  # compare against the second parent"
 msgstr ""
 
-#: mercurial/commands.py:2653
+#: mercurial/commands.py:2655
 msgid "diff against the second parent"
 msgstr ""
 
-#: mercurial/commands.py:2654
+#: mercurial/commands.py:2656
 msgid "revisions to export"
 msgstr ""
 
-#: mercurial/commands.py:2656
+#: mercurial/commands.py:2658
 msgid "[OPTION]... [-o OUTFILESPEC] [-r] REV..."
 msgstr ""
 
-#: mercurial/commands.py:2658
+#: mercurial/commands.py:2660
 msgid "dump the header and diffs for one or more changesets"
 msgstr ""
 
-#: mercurial/commands.py:2660
+#: mercurial/commands.py:2662
 msgid "    Print the changeset header and diffs for one or more revisions."
 msgstr ""
 
-#: mercurial/commands.py:2662
+#: mercurial/commands.py:2664
 msgid ""
 "    The information shown in the changeset header is: author, date,\n"
 "    branch name (if non-default), changeset hash, parent(s) and commit\n"
 "    comment."
 msgstr ""
 
-#: mercurial/commands.py:2666
+#: mercurial/commands.py:2668
 msgid ""
 "    .. note::\n"
 "       export may generate unexpected diff output for merge\n"
 "       first parent only."
 msgstr ""
 
-#: mercurial/commands.py:2671
+#: mercurial/commands.py:2673
 msgid ""
 "    Output may be to a file, in which case the name of the file is\n"
 "    given using a format string. The formatting rules are as follows:"
 msgstr ""
 
-#: mercurial/commands.py:2674
+#: mercurial/commands.py:2676
 msgid ""
 "    :``%%``: literal \"%\" character\n"
 "    :``%H``: changeset hash (40 hexadecimal digits)\n"
 "    :``%r``: zero-padded changeset revision number"
 msgstr ""
 
-#: mercurial/commands.py:2684
+#: mercurial/commands.py:2686
 msgid ""
 "    Without the -a/--text option, export will avoid generating diffs\n"
 "    of files it detects as binary. With -a, export will generate a\n"
 "    diff anyway, probably with undesirable results."
 msgstr ""
 
-#: mercurial/commands.py:2688
+#: mercurial/commands.py:2690
 msgid ""
 "    Use the -g/--git option to generate diffs in the git extended diff\n"
 "    format. See :hg:`help diffs` for more information."
 msgstr ""
 
-#: mercurial/commands.py:2691
+#: mercurial/commands.py:2693
 msgid ""
 "    With the --switch-parent option, the diff will be against the\n"
 "    second parent. It can be useful to review a merge."
 msgstr ""
 
-#: mercurial/commands.py:2698
+#: mercurial/commands.py:2700
 msgid ""
 "      - use export and import to transplant a bugfix to the current\n"
 "        branch::"
 msgstr ""
 
-#: mercurial/commands.py:2701
+#: mercurial/commands.py:2703
 msgid "          hg export -r 9353 | hg import -"
 msgstr ""
 
-#: mercurial/commands.py:2703
+#: mercurial/commands.py:2705
 msgid ""
 "      - export all the changesets between two revisions to a file with\n"
 "        rename information::"
 msgstr ""
 
-#: mercurial/commands.py:2706
+#: mercurial/commands.py:2708
 msgid "          hg export --git -r 123:150 > changes.txt"
 msgstr ""
 
-#: mercurial/commands.py:2708
+#: mercurial/commands.py:2710
 msgid ""
 "      - split outgoing changes into a series of patches with\n"
 "        descriptive names::"
 msgstr ""
 
-#: mercurial/commands.py:2711
+#: mercurial/commands.py:2713
 msgid "          hg export -r \"outgoing()\" -o \"%n-%m.patch\""
 msgstr ""
 
-#: mercurial/commands.py:2718
+#: mercurial/commands.py:2720
 msgid "export requires at least one changeset"
 msgstr ""
 
-#: mercurial/commands.py:2720
+#: mercurial/commands.py:2722
 msgid "exporting patches:\n"
 msgstr ""
 
-#: mercurial/commands.py:2722
+#: mercurial/commands.py:2724
 msgid "exporting patch:\n"
 msgstr ""
 
-#: mercurial/commands.py:2729
+#: mercurial/commands.py:2731
 msgid "forget the specified files on the next commit"
 msgstr ""
 
-#: mercurial/commands.py:2731
+#: mercurial/commands.py:2733
 msgid ""
 "    Mark the specified files so they will no longer be tracked\n"
 "    after the next commit."
 msgstr ""
 
-#: mercurial/commands.py:2734
+#: mercurial/commands.py:2736
 msgid ""
 "    This only removes files from the current branch, not from the\n"
 "    entire project history, and it does not delete them from the\n"
 "    working directory."
 msgstr ""
 
-#: mercurial/commands.py:2738
+#: mercurial/commands.py:2740
 msgid "    To undo a forget before the next commit, see :hg:`add`."
 msgstr ""
 
-#: mercurial/commands.py:2744
+#: mercurial/commands.py:2746
 msgid "      - forget newly-added binary files::"
 msgstr ""
 
-#: mercurial/commands.py:2746
+#: mercurial/commands.py:2748
 msgid "          hg forget \"set:added() and binary()\""
 msgstr ""
 
-#: mercurial/commands.py:2748
+#: mercurial/commands.py:2750
 msgid "      - forget files that would be excluded by .hgignore::"
 msgstr ""
 
-#: mercurial/commands.py:2750
+#: mercurial/commands.py:2752
 msgid "          hg forget \"set:hgignore()\""
 msgstr ""
 
-#: mercurial/commands.py:2764
+#: mercurial/commands.py:2766
 msgid "revisions to graft"
 msgstr ""
 
-#: mercurial/commands.py:2765
+#: mercurial/commands.py:2767
 msgid "resume interrupted graft"
 msgstr ""
 
-#: mercurial/commands.py:2767
+#: mercurial/commands.py:2769
 msgid "append graft info to log message"
 msgstr ""
 
-#: mercurial/commands.py:2769
+#: mercurial/commands.py:2771
 msgid "record the current date as commit date"
 msgstr ""
 
-#: mercurial/commands.py:2771
+#: mercurial/commands.py:2773
 msgid "record the current user as committer"
 msgstr ""
 
-#: mercurial/commands.py:2773
+#: mercurial/commands.py:2775
 msgid "[OPTION]... [-r] REV..."
 msgstr ""
 
-#: mercurial/commands.py:2775
+#: mercurial/commands.py:2777
 msgid "copy changes from other branches onto the current branch"
 msgstr ""
 
-#: mercurial/commands.py:2777
+#: mercurial/commands.py:2779
 msgid ""
 "    This command uses Mercurial's merge logic to copy individual\n"
 "    changes from other branches without merging branches in the\n"
 "    description from the source changesets."
 msgstr ""
 
-#: mercurial/commands.py:2783
+#: mercurial/commands.py:2785
 msgid ""
 "    Changesets that are ancestors of the current revision, that have\n"
 "    already been grafted, or that are merges will be skipped."
 msgstr ""
 
-#: mercurial/commands.py:2789
+#: mercurial/commands.py:2791
 msgid "      (grafted from CHANGESETHASH)"
 msgstr ""
 
-#: mercurial/commands.py:2791
+#: mercurial/commands.py:2793
 msgid ""
 "    If a graft merge results in conflicts, the graft process is\n"
 "    interrupted so that the current merge can be manually resolved.\n"
 "    continued with the -c/--continue option."
 msgstr ""
 
-#: mercurial/commands.py:2796
+#: mercurial/commands.py:2798
 msgid ""
 "    .. note::\n"
 "      The -c/--continue option does not reapply earlier options."
 msgstr ""
 
-#: mercurial/commands.py:2803
+#: mercurial/commands.py:2805
 msgid ""
 "      - copy a single change to the stable branch and edit its description::"
 msgstr ""
 
-#: mercurial/commands.py:2805
+#: mercurial/commands.py:2807
 msgid ""
 "          hg update stable\n"
 "          hg graft --edit 9393"
 msgstr ""
 
-#: mercurial/commands.py:2808
+#: mercurial/commands.py:2810
 msgid ""
 "      - graft a range of changesets with one exception, updating dates::"
 msgstr ""
 
-#: mercurial/commands.py:2810
+#: mercurial/commands.py:2812
 msgid "          hg graft -D \"2085::2093 and not 2091\""
 msgstr ""
 
-#: mercurial/commands.py:2812
+#: mercurial/commands.py:2814
 msgid "      - continue a graft after resolving conflicts::"
 msgstr ""
 
-#: mercurial/commands.py:2814
+#: mercurial/commands.py:2816
 msgid "          hg graft -c"
 msgstr ""
 
-#: mercurial/commands.py:2816
+#: mercurial/commands.py:2818
 msgid "      - show the source of a grafted changeset::"
 msgstr ""
 
-#: mercurial/commands.py:2818
+#: mercurial/commands.py:2820
 msgid "          hg log --debug -r tip"
 msgstr ""
 
-#: mercurial/commands.py:2820
+#: mercurial/commands.py:2822
 msgid ""
 "    Returns 0 on successful completion.\n"
 "    "
 msgstr ""
 
-#: mercurial/commands.py:2839
+#: mercurial/commands.py:2841
 msgid "can't specify --continue and revisions"
 msgstr ""
 
-#: mercurial/commands.py:2847
+#: mercurial/commands.py:2849
 msgid "no graft state found, can't continue"
 msgstr ""
 
-#: mercurial/commands.py:2856
+#: mercurial/commands.py:2858
 #, python-format
 msgid "skipping ungraftable merge revision %s\n"
 msgstr ""
 
-#: mercurial/commands.py:2863
+#: mercurial/commands.py:2865
 #, python-format
 msgid "skipping ancestor revision %s\n"
 msgstr ""
 
-#: mercurial/commands.py:2883
+#: mercurial/commands.py:2885
 #, python-format
 msgid "skipping already grafted revision %s\n"
 msgstr ""
 
-#: mercurial/commands.py:2886
+#: mercurial/commands.py:2888
 #, python-format
 msgid "skipping already grafted revision %s (same origin %d)\n"
 msgstr ""
 
-#: mercurial/commands.py:2891
+#: mercurial/commands.py:2893
 #, python-format
 msgid "skipping already grafted revision %s (was grafted from %d)\n"
 msgstr ""
 
-#: mercurial/commands.py:2902
+#: mercurial/commands.py:2904
 #, python-format
 msgid "grafting revision %s\n"
 msgstr ""
 
-#: mercurial/commands.py:2936
+#: mercurial/commands.py:2938
 msgid "unresolved conflicts, can't continue"
 msgstr ""
 
-#: mercurial/commands.py:2937
+#: mercurial/commands.py:2939
 msgid "use hg resolve and hg graft --continue"
 msgstr ""
 
-#: mercurial/commands.py:2951
+#: mercurial/commands.py:2953
 #, python-format
 msgid "graft for revision %s is empty\n"
 msgstr ""
 
-#: mercurial/commands.py:2964
+#: mercurial/commands.py:2966
 msgid "end fields with NUL"
 msgstr ""
 
-#: mercurial/commands.py:2965
+#: mercurial/commands.py:2967
 msgid "print all revisions that match"
 msgstr ""
 
-#: mercurial/commands.py:2970
+#: mercurial/commands.py:2972
 msgid "ignore case when matching"
 msgstr ""
 
-#: mercurial/commands.py:2972
+#: mercurial/commands.py:2974
 msgid "print only filenames and revisions that match"
 msgstr ""
 
-#: mercurial/commands.py:2973
+#: mercurial/commands.py:2975
 msgid "print matching line numbers"
 msgstr ""
 
-#: mercurial/commands.py:2975
+#: mercurial/commands.py:2977
 msgid "only search files changed within revision range"
 msgstr ""
 
-#: mercurial/commands.py:2979
+#: mercurial/commands.py:2981
 msgid "[OPTION]... PATTERN [FILE]..."
 msgstr ""
 
-#: mercurial/commands.py:2981
+#: mercurial/commands.py:2983
 msgid "search for a pattern in specified files and revisions"
 msgstr ""
 
-#: mercurial/commands.py:2983
+#: mercurial/commands.py:2985
 msgid "    Search revisions of files for a regular expression."
 msgstr ""
 
-#: mercurial/commands.py:2985
+#: mercurial/commands.py:2987
 msgid ""
 "    This command behaves differently than Unix grep. It only accepts\n"
 "    Python/Perl regexps. It searches repository history, not the\n"
 "    match appears."
 msgstr ""
 
-#: mercurial/commands.py:2990
+#: mercurial/commands.py:2992
 msgid ""
 "    By default, grep only prints output for the first revision of a\n"
 "    file in which it finds a match. To get it to print every revision\n"
 "    use the --all flag."
 msgstr ""
 
-#: mercurial/commands.py:2996 mercurial/commands.py:4064
+#: mercurial/commands.py:2998 mercurial/commands.py:4066
 msgid ""
 "    Returns 0 if a match is found, 1 otherwise.\n"
 "    "
 msgstr ""
 
-#: mercurial/commands.py:3004
+#: mercurial/commands.py:3006
 #, python-format
 msgid "grep: invalid match pattern: %s\n"
 msgstr ""
 
-#: mercurial/commands.py:3179
+#: mercurial/commands.py:3181
 msgid "STARTREV"
 msgstr ""
 
-#: mercurial/commands.py:3179
+#: mercurial/commands.py:3181
 msgid "show only heads which are descendants of STARTREV"
 msgstr ""
 
-#: mercurial/commands.py:3180
+#: mercurial/commands.py:3182
 msgid "show topological heads only"
 msgstr ""
 
-#: mercurial/commands.py:3181
+#: mercurial/commands.py:3183
 msgid "show active branchheads only (DEPRECATED)"
 msgstr ""
 
-#: mercurial/commands.py:3182
+#: mercurial/commands.py:3184
 msgid "show normal and closed branch heads"
 msgstr ""
 
-#: mercurial/commands.py:3184
+#: mercurial/commands.py:3186
 msgid "[-ct] [-r STARTREV] [REV]..."
 msgstr ""
 
-#: mercurial/commands.py:3186
+#: mercurial/commands.py:3188
 msgid "show current repository heads or show branch heads"
 msgstr ""
 
-#: mercurial/commands.py:3188
+#: mercurial/commands.py:3190
 msgid "    With no arguments, show all repository branch heads."
 msgstr ""
 
-#: mercurial/commands.py:3190
+#: mercurial/commands.py:3192
 msgid ""
 "    Repository \"heads\" are changesets with no child changesets. They are\n"
 "    where development generally takes place and are the usual targets\n"
 "    no child changeset on the same branch."
 msgstr ""
 
-#: mercurial/commands.py:3195
+#: mercurial/commands.py:3197
 msgid ""
 "    If one or more REVs are given, only branch heads on the branches\n"
 "    associated with the specified changesets are shown. This means\n"
 "    named ``foo``."
 msgstr ""
 
-#: mercurial/commands.py:3200
+#: mercurial/commands.py:3202
 msgid ""
 "    If -c/--closed is specified, also show branch heads marked closed\n"
 "    (see :hg:`commit --close-branch`)."
 msgstr ""
 
-#: mercurial/commands.py:3203
+#: mercurial/commands.py:3205
 msgid ""
 "    If STARTREV is specified, only those heads that are descendants of\n"
 "    STARTREV will be displayed."
 msgstr ""
 
-#: mercurial/commands.py:3206
+#: mercurial/commands.py:3208
 msgid ""
 "    If -t/--topo is specified, named branch mechanics will be ignored and only\n"
 "    changesets without children will be shown."
 msgstr ""
 
-#: mercurial/commands.py:3209
+#: mercurial/commands.py:3211
 msgid ""
 "    Returns 0 if matching heads are found, 1 if not.\n"
 "    "
 msgstr ""
 
-#: mercurial/commands.py:3236
+#: mercurial/commands.py:3238
 #, python-format
 msgid "no open branch heads found on branches %s"
 msgstr ""
 
-#: mercurial/commands.py:3238
+#: mercurial/commands.py:3240
 #, python-format
 msgid " (started at %s)"
 msgstr ""
 
-#: mercurial/commands.py:3251
+#: mercurial/commands.py:3253
 msgid "show only help for extensions"
 msgstr ""
 
-#: mercurial/commands.py:3252
+#: mercurial/commands.py:3254
 msgid "show only help for commands"
 msgstr ""
 
-#: mercurial/commands.py:3253
+#: mercurial/commands.py:3255
 msgid "show topics matching keyword"
 msgstr ""
 
-#: mercurial/commands.py:3255
+#: mercurial/commands.py:3257
 msgid "[-ec] [TOPIC]"
 msgstr ""
 
-#: mercurial/commands.py:3257
+#: mercurial/commands.py:3259
 msgid "show help for a given topic or a help overview"
 msgstr ""
 
-#: mercurial/commands.py:3259
+#: mercurial/commands.py:3261
 msgid ""
 "    With no arguments, print a list of commands with short help messages."
 msgstr ""
 
-#: mercurial/commands.py:3261
+#: mercurial/commands.py:3263
 msgid ""
 "    Given a topic, extension, or command name, print help for that\n"
 "    topic."
 msgstr ""
 
-#: mercurial/commands.py:3264 mercurial/commands.py:3604
+#: mercurial/commands.py:3266 mercurial/commands.py:3606
 msgid ""
 "    Returns 0 if successful.\n"
 "    "
 msgstr ""
 
-#: mercurial/commands.py:3300
+#: mercurial/commands.py:3302
 #, python-format
 msgid ""
 "\n"
 "aliases: %s\n"
 msgstr ""
 
-#: mercurial/commands.py:3306 mercurial/commands.py:3380
-#: mercurial/commands.py:3449 mercurial/extensions.py:268
+#: mercurial/commands.py:3308 mercurial/commands.py:3382
+#: mercurial/commands.py:3451 mercurial/extensions.py:268
 #: mercurial/extensions.py:357 mercurial/help.py:118
-#: mercurial/hgweb/webcommands.py:943
+#: mercurial/hgweb/webcommands.py:946
 msgid "(no help text available)"
 msgstr ""
 
-#: mercurial/commands.py:3309
+#: mercurial/commands.py:3311
 #, python-format
 msgid "shell alias for::"
 msgstr ""
 
-#: mercurial/commands.py:3311
+#: mercurial/commands.py:3313
 #, python-format
 msgid "    %s"
 msgstr ""
 
-#: mercurial/commands.py:3311
+#: mercurial/commands.py:3313
 #, python-format
 msgid "alias for: hg %s"
 msgstr ""
 
-#: mercurial/commands.py:3313
+#: mercurial/commands.py:3315
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: mercurial/commands.py:3325
+#: mercurial/commands.py:3327
 #, python-format
 msgid "use \"hg help -e %s\" to show help for the %s extension"
 msgstr ""
 
-#: mercurial/commands.py:3333
+#: mercurial/commands.py:3335
 msgid "options:"
 msgstr ""
 
-#: mercurial/commands.py:3337 mercurial/commands.py:3416
+#: mercurial/commands.py:3339 mercurial/commands.py:3418
 msgid "global options:"
 msgstr ""
 
-#: mercurial/commands.py:3342
+#: mercurial/commands.py:3344
 #, python-format
 msgid ""
 "\n"
 "use \"hg help %s\" to show the full help text\n"
 msgstr ""
 
-#: mercurial/commands.py:3345
+#: mercurial/commands.py:3347
 #, python-format
 msgid "use \"hg -v help %s\" to show more complete help and the global options"
 msgstr ""
 
-#: mercurial/commands.py:3347
+#: mercurial/commands.py:3349
 #, python-format
 msgid "use \"hg -v help %s\" to show the global options"
 msgstr ""
 
-#: mercurial/commands.py:3357
+#: mercurial/commands.py:3359
 msgid "basic commands:"
 msgstr ""
 
-#: mercurial/commands.py:3359
+#: mercurial/commands.py:3361
 msgid "list of commands:"
 msgstr ""
 
-#: mercurial/commands.py:3387
+#: mercurial/commands.py:3389
 msgid "no commands defined\n"
 msgstr ""
 
-#: mercurial/commands.py:3401 mercurial/help.py:24
+#: mercurial/commands.py:3403 mercurial/help.py:24
 msgid "enabled extensions:"
 msgstr ""
 
-#: mercurial/commands.py:3406
+#: mercurial/commands.py:3408
 msgid ""
 "\n"
 "additional help topics:"
 msgstr ""
 
-#: mercurial/commands.py:3418
+#: mercurial/commands.py:3420
 msgid "use \"hg help\" for the full list of commands"
 msgstr ""
 
-#: mercurial/commands.py:3422
+#: mercurial/commands.py:3424
 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
 msgstr ""
 
-#: mercurial/commands.py:3425
+#: mercurial/commands.py:3427
 #, python-format
 msgid "use \"hg help %s\" to show the full help text"
 msgstr ""
 
-#: mercurial/commands.py:3428
+#: mercurial/commands.py:3430
 #, python-format
 msgid "use \"hg -v help%s\" to show builtin aliases and global options"
 msgstr ""
 
-#: mercurial/commands.py:3454 mercurial/commands.py:3486
+#: mercurial/commands.py:3456 mercurial/commands.py:3488
 #, python-format
 msgid "use \"hg help -v %s\" to show more complete help"
 msgstr ""
 
-#: mercurial/commands.py:3460
+#: mercurial/commands.py:3462
 #, python-format
 msgid ""
 "\n"
 "use \"hg help -c %s\" to see help for the %s command\n"
 msgstr ""
 
-#: mercurial/commands.py:3469
+#: mercurial/commands.py:3471
 msgid "no help text available"
 msgstr ""
 
-#: mercurial/commands.py:3480
+#: mercurial/commands.py:3482
 #, python-format
 msgid "%s extension - %s"
 msgstr ""
 
-#: mercurial/commands.py:3498 mercurial/commands.py:3510
+#: mercurial/commands.py:3500 mercurial/commands.py:3512
 msgid "use \"hg help extensions\" for information on enabling extensions\n"
 msgstr ""
 
-#: mercurial/commands.py:3507
+#: mercurial/commands.py:3509
 #, python-format
 msgid "'%s' is provided by the following extension:"
 msgstr ""
 
-#: mercurial/commands.py:3519
+#: mercurial/commands.py:3521
 msgid "Topics"
 msgstr ""
 
-#: mercurial/commands.py:3522
+#: mercurial/commands.py:3524
 msgid "Extension Commands"
 msgstr ""
 
-#: mercurial/commands.py:3549
+#: mercurial/commands.py:3551
 msgid "Mercurial Distributed SCM\n"
 msgstr ""
 
-#: mercurial/commands.py:3565
+#: mercurial/commands.py:3567
 msgid "identify the specified revision"
 msgstr ""
 
-#: mercurial/commands.py:3566
+#: mercurial/commands.py:3568
 msgid "show local revision number"
 msgstr ""
 
-#: mercurial/commands.py:3567
+#: mercurial/commands.py:3569
 msgid "show global revision id"
 msgstr ""
 
-#: mercurial/commands.py:3568
+#: mercurial/commands.py:3570
 msgid "show branch"
 msgstr ""
 
-#: mercurial/commands.py:3569
+#: mercurial/commands.py:3571
 msgid "show tags"
 msgstr ""
 
-#: mercurial/commands.py:3570
+#: mercurial/commands.py:3572
 msgid "show bookmarks"
 msgstr ""
 
-#: mercurial/commands.py:3572
+#: mercurial/commands.py:3574
 msgid "[-nibtB] [-r REV] [SOURCE]"
 msgstr ""
 
-#: mercurial/commands.py:3575
+#: mercurial/commands.py:3577
 msgid "identify the working copy or specified revision"
 msgstr ""
 
-#: mercurial/commands.py:3577
+#: mercurial/commands.py:3579
 msgid ""
 "    Print a summary identifying the repository state at REV using one or\n"
 "    two parent hash identifiers, followed by a \"+\" if the working\n"
 "    a list of tags, and a list of bookmarks."
 msgstr ""
 
-#: mercurial/commands.py:3582
+#: mercurial/commands.py:3584
 msgid ""
 "    When REV is not given, print a summary of the current state of the\n"
 "    repository."
 msgstr ""
 
-#: mercurial/commands.py:3585
+#: mercurial/commands.py:3587
 msgid ""
 "    Specifying a path to a repository root or Mercurial bundle will\n"
 "    cause lookup to operate on that repository/bundle."
 msgstr ""
 
-#: mercurial/commands.py:3592
+#: mercurial/commands.py:3594
 msgid "      - generate a build identifier for the working directory::"
 msgstr ""
 
-#: mercurial/commands.py:3594
+#: mercurial/commands.py:3596
 msgid "          hg id --id > build-id.dat"
 msgstr ""
 
-#: mercurial/commands.py:3596
+#: mercurial/commands.py:3598
 msgid "      - find the revision corresponding to a tag::"
 msgstr ""
 
-#: mercurial/commands.py:3598
+#: mercurial/commands.py:3600
 msgid "          hg id -n -r 1.3"
 msgstr ""
 
-#: mercurial/commands.py:3600
+#: mercurial/commands.py:3602
 msgid "      - check the most recent revision of a remote repository::"
 msgstr ""
 
-#: mercurial/commands.py:3602
+#: mercurial/commands.py:3604
 msgid "          hg id -r tip http://selenic.com/hg/"
 msgstr ""
 
-#: mercurial/commands.py:3625
+#: mercurial/commands.py:3627
 msgid "can't query remote revision number, branch, or tags"
 msgstr ""