Commits

Katsunori FUJIWARA committed da7792e Merge

CATCHUP: merge downstream-line => default

  • Participants
  • Parent commits a23ce8c, 7363071

Comments (0)

Files changed (5)

 cdb274766b42ff40ecf87923a8d434fe6df5d6a8 official_2.6.3
 b05558a6362de502b18f51064637b7051ce4dd0b official_2.7
 8b90af2ae7d93302ba7176790fd3ab54a6bfef9c official_2.8
+427319af6a30eeebb1981328e0a3386e4a12ae6f official_2.8.1
-5246fd4781d873179c5abdb9787be578f7921832
+d4be314b20711b6ecfa7a6f8b46970231134004a
 msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2013-11-28 16:18+0900\n"
+"POT-Creation-Date: 2013-12-30 21:16+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"
 msgstr ""
 
 #: hgext/churn.py:190 hgext/graphlog.py:27 hgext/mq.py:2390 hgext/mq.py:2444
-#: hgext/shelve.py:627 mercurial/commands.py:84 mercurial/commands.py:2911
+#: hgext/shelve.py:623 mercurial/commands.py:84 mercurial/commands.py:2911
 #: mercurial/commands.py:3951 mercurial/commands.py:4980
 #: mercurial/commands.py:5793
 msgid "DATE"
 msgstr ""
 
 #: hgext/gpg.py:206 hgext/graphlog.py:30 hgext/rebase.py:65
-#: hgext/shelve.py:633 mercurial/commands.py:77 mercurial/commands.py:3954
+#: hgext/shelve.py:629 mercurial/commands.py:77 mercurial/commands.py:3954
 #: mercurial/commands.py:5604
 msgid "TEXT"
 msgstr ""
 msgstr ""
 
 #: hgext/mq.py:2121 hgext/mq.py:2735 hgext/mq.py:2773 hgext/mq.py:2883
-#: hgext/patchbomb.py:180 hgext/shelve.py:635 mercurial/commands.py:773
+#: hgext/patchbomb.py:180 hgext/shelve.py:631 mercurial/commands.py:773
 #: mercurial/commands.py:5120
 msgid "NAME"
 msgstr ""
 msgid "message can only be specified with collapse"
 msgstr ""
 
-#: hgext/rebase.py:175 hgext/shelve.py:494
+#: hgext/rebase.py:175 hgext/shelve.py:491
 msgid "cannot use both abort and continue"
 msgstr ""
 
 "shelve\".\n"
 msgstr ""
 
-#: hgext/shelve.py:69 hgext/shelve.py:283 hgext/shelve.py:522
+#: hgext/shelve.py:69 hgext/shelve.py:279 hgext/shelve.py:519
 #, python-format
 msgid "shelved change '%s' not found"
 msgstr ""
 "this version of shelve is incompatible with the version used in this repo"
 msgstr ""
 
-#: hgext/shelve.py:149
+#: hgext/shelve.py:145
 msgid "cannot shelve while merging"
 msgstr ""
 
-#: hgext/shelve.py:201
+#: hgext/shelve.py:197
 #, python-format
 msgid "a shelved change named '%s' already exists"
 msgstr ""
 
-#: hgext/shelve.py:209
+#: hgext/shelve.py:205
 #, python-format
 msgid "too many shelved changes named '%s'"
 msgstr ""
 
-#: hgext/shelve.py:214
+#: hgext/shelve.py:210
 msgid "shelved change names may not contain slashes"
 msgstr ""
 
-#: hgext/shelve.py:216
+#: hgext/shelve.py:212
 msgid "shelved change names may not start with '.'"
 msgstr ""
 
-#: hgext/shelve.py:223 mercurial/commands.py:1432
+#: hgext/shelve.py:219 mercurial/commands.py:1432
 #, python-format
 msgid "nothing changed (%d missing files, see 'hg status')\n"
 msgstr ""
 
-#: hgext/shelve.py:226 mercurial/commands.py:1400 mercurial/commands.py:1435
+#: hgext/shelve.py:222 mercurial/commands.py:1400 mercurial/commands.py:1435
 msgid "nothing changed\n"
 msgstr ""
 
-#: hgext/shelve.py:245
+#: hgext/shelve.py:241
 #, python-format
 msgid "shelved as %s\n"
 msgstr ""
 
-#: hgext/shelve.py:272
+#: hgext/shelve.py:268
 msgid "no shelved changes specified!"
 msgstr ""
 
-#: hgext/shelve.py:355
+#: hgext/shelve.py:351
 msgid "working directory parents do not match unshelve state"
 msgstr ""
 
-#: hgext/shelve.py:386
+#: hgext/shelve.py:382
 #, python-format
 msgid "unshelve of '%s' aborted\n"
 msgstr ""
 
-#: hgext/shelve.py:428 mercurial/commands.py:3085
+#: hgext/shelve.py:425 mercurial/commands.py:3085
 msgid "unresolved conflicts, can't continue"
 msgstr ""
 
-#: hgext/shelve.py:429
+#: hgext/shelve.py:426
 msgid "see 'hg resolve', then 'hg unshelve --continue'"
 msgstr ""
 
-#: hgext/shelve.py:455
+#: hgext/shelve.py:452
 #, python-format
 msgid "unshelve of '%s' complete\n"
 msgstr ""
 
-#: hgext/shelve.py:461
+#: hgext/shelve.py:458
 msgid "abort an incomplete unshelve operation"
 msgstr ""
 
+#: hgext/shelve.py:460
+msgid "continue an incomplete unshelve operation"
+msgstr ""
+
+#: hgext/shelve.py:462
+msgid "keep shelve after unshelving"
+msgstr ""
+
 #: hgext/shelve.py:463
-msgid "continue an incomplete unshelve operation"
+msgid "hg unshelve [SHELVED]"
 msgstr ""
 
 #: hgext/shelve.py:465
-msgid "keep shelve after unshelving"
-msgstr ""
-
-#: hgext/shelve.py:466
-msgid "hg unshelve [SHELVED]"
-msgstr ""
-
-#: hgext/shelve.py:468
 msgid "restore a shelved change to the working directory"
 msgstr ""
 
-#: hgext/shelve.py:470
+#: hgext/shelve.py:467
 msgid ""
 "    This command accepts an optional name of a shelved change to\n"
 "    restore. If none is given, the most recent shelved change is used."
 msgstr ""
 
-#: hgext/shelve.py:473
+#: hgext/shelve.py:470
 msgid ""
 "    If a shelved change is applied successfully, the bundle that\n"
 "    contains the shelved changes is deleted afterwards."
 msgstr ""
 
-#: hgext/shelve.py:476
+#: hgext/shelve.py:473
 msgid ""
 "    Since you can restore a shelved change on top of an arbitrary\n"
 "    commit, it is possible that unshelving will result in a conflict\n"
 "    will not be deleted until you successfully complete the unshelve.)"
 msgstr ""
 
-#: hgext/shelve.py:483
+#: hgext/shelve.py:480
 msgid ""
 "    (Alternatively, you can use ``--abort`` to abandon an unshelve\n"
 "    that causes a conflict. This reverts the unshelved changes, and\n"
 "    "
 msgstr ""
 
-#: hgext/shelve.py:496
+#: hgext/shelve.py:493
 msgid "cannot combine abort/continue with naming a shelved change"
 msgstr ""
 
-#: hgext/shelve.py:504
+#: hgext/shelve.py:501
 msgid "no unshelve operation underway"
 msgstr ""
 
-#: hgext/shelve.py:511
+#: hgext/shelve.py:508
 msgid "can only unshelve one change at a time"
 msgstr ""
 
-#: hgext/shelve.py:515
+#: hgext/shelve.py:512
 msgid "no shelved changes to apply!"
 msgstr ""
 
-#: hgext/shelve.py:517
+#: hgext/shelve.py:514
 #, python-format
 msgid "unshelving change '%s'\n"
 msgstr ""
 
-#: hgext/shelve.py:596
+#: hgext/shelve.py:592
 msgid "unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')"
 msgstr ""
 
+#: hgext/shelve.py:619
+msgid "mark new/missing files as added/removed before shelving"
+msgstr ""
+
+#: hgext/shelve.py:621
+msgid "delete all shelved changes"
+msgstr ""
+
 #: hgext/shelve.py:623
-msgid "mark new/missing files as added/removed before shelving"
+msgid "shelve with the specified commit date"
 msgstr ""
 
 #: hgext/shelve.py:625
-msgid "delete all shelved changes"
+msgid "delete the named shelved change(s)"
 msgstr ""
 
 #: hgext/shelve.py:627
-msgid "shelve with the specified commit date"
+msgid "list current shelves"
 msgstr ""
 
 #: hgext/shelve.py:629
-msgid "delete the named shelved change(s)"
+msgid "use text as shelve message"
 msgstr ""
 
 #: hgext/shelve.py:631
-msgid "list current shelves"
-msgstr ""
-
-#: hgext/shelve.py:633
-msgid "use text as shelve message"
-msgstr ""
-
-#: hgext/shelve.py:635
 msgid "use the given name for the shelved commit"
 msgstr ""
 
-#: hgext/shelve.py:637 mercurial/commands.py:97 mercurial/commands.py:5739
+#: hgext/shelve.py:633 mercurial/commands.py:97 mercurial/commands.py:5739
 msgid "show patch"
 msgstr ""
 
-#: hgext/shelve.py:639 mercurial/commands.py:102 mercurial/commands.py:127
+#: hgext/shelve.py:635 mercurial/commands.py:102 mercurial/commands.py:127
 msgid "output diffstat-style summary of changes"
 msgstr ""
 
+#: hgext/shelve.py:636
+msgid "hg shelve"
+msgstr ""
+
+#: hgext/shelve.py:638
+msgid "save and set aside changes from the working directory"
+msgstr ""
+
 #: hgext/shelve.py:640
-msgid "hg shelve"
-msgstr ""
-
-#: hgext/shelve.py:642
-msgid "save and set aside changes from the working directory"
-msgstr ""
-
-#: hgext/shelve.py:644
 msgid ""
 "    Shelving takes files that \"hg status\" reports as not clean, saves\n"
 "    the modifications to a bundle (a shelved change), and reverts the\n"
 "    files so that their state in the working directory becomes clean."
 msgstr ""
 
-#: hgext/shelve.py:648
+#: hgext/shelve.py:644
 msgid ""
 "    To restore these changes to the working directory, using \"hg\n"
 "    unshelve\"; this will work even if you switch to a different\n"
 "    commit."
 msgstr ""
 
-#: hgext/shelve.py:652
+#: hgext/shelve.py:648
 msgid ""
 "    When no files are specified, \"hg shelve\" saves all not-clean\n"
 "    files. If specific files or directories are named, only changes to\n"
 "    those files are shelved."
 msgstr ""
 
-#: hgext/shelve.py:656
+#: hgext/shelve.py:652
 msgid ""
 "    Each shelved change has a name that makes it easier to find later.\n"
 "    The name of a shelved change defaults to being based on the active\n"
 "    branch.  To specify a different name, use ``--name``."
 msgstr ""
 
-#: hgext/shelve.py:661
+#: hgext/shelve.py:657
 msgid ""
 "    To see a list of existing shelved changes, use the ``--list``\n"
 "    option. For each shelved change, this will print its name, age,\n"
 "    and description; use ``--patch`` or ``--stat`` for more details."
 msgstr ""
 
-#: hgext/shelve.py:665
+#: hgext/shelve.py:661
 msgid ""
 "    To delete specific shelved changes, use ``--delete``. To delete\n"
 "    all shelved changes, use ``--cleanup``.\n"
 "    "
 msgstr ""
 
-#: hgext/shelve.py:674
+#: hgext/shelve.py:670
 #, python-format
 msgid "options '--%s' and '--%s' may not be used together"
 msgstr ""
 
-#: hgext/shelve.py:679
+#: hgext/shelve.py:675
 msgid "cannot specify names when using '--cleanup'"
 msgstr ""
 
-#: hgext/shelve.py:688
+#: hgext/shelve.py:684
 #, python-format
 msgid "option '--%s' may not be used when shelving a change"
 msgstr ""
 
-#: hgext/shelve.py:695
+#: hgext/shelve.py:691
 msgid "unshelve already in progress"
 msgstr ""
 
-#: hgext/shelve.py:696
+#: hgext/shelve.py:692
 msgid "use 'hg unshelve --continue' or 'hg unshelve --abort'"
 msgstr ""
 
 
 #: mercurial/commands.py:541
 msgid ""
-"      - start a bisection with known bad revision 12, and good revision 34::"
+"      - start a bisection with known bad revision 34, and good revision 12::"
 msgstr ""
 
 #: mercurial/commands.py:543
 msgstr ""
 
 #: mercurial/commands.py:588
-msgid "      - with the graphlog extension, you can even get a nice graph::"
+msgid "      - you can even get a nice graph::"
 msgstr ""
 
 #: mercurial/commands.py:590
 #: mercurial/help/config.txt:497
 msgid ""
 "  [extensions]\n"
-"  # (the mq extension will get loaded from Mercurial's path)\n"
-"  mq =\n"
+"  # (the progress extension will get loaded from Mercurial's path)\n"
+"  progress =\n"
 "  # (this extension will get loaded from the file specified)\n"
 "  myfeature = ~/.hgext/myfeature.py"
 msgstr ""
 "    system (DVCS) can be described as a directed acyclic graph (DAG),\n"
 "    consisting of nodes and edges, where nodes correspond to\n"
 "    changesets and edges imply a parent -> child relation. This graph\n"
-"    can be visualized by graphical tools such as :hg:`glog`\n"
-"    (graphlog). In Mercurial, the DAG is limited by the requirement\n"
-"    for children to have at most two parents."
+"    can be visualized by graphical tools such as :hg:`log --graph`. In\n"
+"    Mercurial, the DAG is limited by the requirement for children to\n"
+"    have at most two parents."
 msgstr ""
 
 #: mercurial/help/glossary.txt:180
 #: mercurial/help/glossary.txt:220
 msgid ""
 "Graph\n"
-"    See DAG and :hg:`help graphlog`."
+"    See DAG and :hg:`log --graph`."
 msgstr ""
 
 #: mercurial/help/glossary.txt:223
 msgid "(branch merge, don't forget to commit)\n"
 msgstr ""
 
-#: mercurial/hgweb/hgweb_mod.py:286
+#: mercurial/hgweb/hgweb_mod.py:288
 #, python-format
 msgid "websub: invalid pattern for %s: %s\n"
 msgstr ""
 
-#: mercurial/hgweb/hgweb_mod.py:306
+#: mercurial/hgweb/hgweb_mod.py:308
 #, python-format
 msgid "websub: invalid regexp for %s: %s\n"
 msgstr ""
 msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2013-11-28 16:18+0900\n"
+"POT-Creation-Date: 2013-12-30 21:16+0900\n"
 "PO-Revision-Date: 2013-11-28 20:03+0900\n"
 "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n"
 "Language-Team: Japanese\n"
 "    はリビジョンのスキップ、 127 (コマンド不在) は探索の中止、\n"
 "    その他の非 0 終了コードは bad とみなされます。"
 
-msgid ""
-"      - start a bisection with known bad revision 12, and good revision 34::"
+#, fuzzy
+msgid ""
+"      - start a bisection with known bad revision 34, and good revision 12::"
 msgstr ""
 "      - 既知の bad なリビジョン 12 と good なリビジョン 34 から探索開始::"
 
 msgid "          hg log -r \"bisect(range)\""
 msgstr "          hg log -r \"bisect(range)\""
 
-msgid "      - with the graphlog extension, you can even get a nice graph::"
+#, fuzzy
+msgid "      - you can even get a nice graph::"
 msgstr "      - graphlog エクステンション有効時は、履歴ツリー表示も可能::"
 
 msgid "          hg log --graph -r \"bisect(range)\""
 msgid "Example for ``~/.hgrc``::"
 msgstr "``~/.hgrc`` 記述例を以下に示します::"
 
+#, fuzzy
 msgid ""
 "  [extensions]\n"
-"  # (the mq extension will get loaded from Mercurial's path)\n"
-"  mq =\n"
+"  # (the progress extension will get loaded from Mercurial's path)\n"
+"  progress =\n"
 "  # (this extension will get loaded from the file specified)\n"
 "  myfeature = ~/.hgext/myfeature.py"
 msgstr ""
 "Cset\n"
 "    「チェンジセット」の略記。"
 
+#, fuzzy
 msgid ""
 "DAG\n"
 "    The repository of changesets of a distributed version control\n"
 "    system (DVCS) can be described as a directed acyclic graph (DAG),\n"
 "    consisting of nodes and edges, where nodes correspond to\n"
 "    changesets and edges imply a parent -> child relation. This graph\n"
-"    can be visualized by graphical tools such as :hg:`glog`\n"
-"    (graphlog). In Mercurial, the DAG is limited by the requirement\n"
-"    for children to have at most two parents."
+"    can be visualized by graphical tools such as :hg:`log --graph`. In\n"
+"    Mercurial, the DAG is limited by the requirement for children to\n"
+"    have at most two parents."
 msgstr ""
 "DAG\n"
 "    分散構成管理システム (DVCS) のリポジトリにおけるリビジョン群は、\n"
 "    共有されないことから、 履歴改変エクステンションを適用可能です。\n"
 "    :hg:`help phases` を参照してください。"
 
+#, fuzzy
 msgid ""
 "Graph\n"
-"    See DAG and :hg:`help graphlog`."
+"    See DAG and :hg:`log --graph`."
 msgstr ""
 "Graph\n"
 "    DAG および :hg:`help graphlog` を参照してください。"

pickup.py

File contents unchanged.