Commits

Katsunori FUJIWARA  committed b8c8236

UPDATE: by 0188ddfa844e@SRC

  • Participants
  • Parent commits e0da2e5
  • Branches downstream-line

Comments (0)

Files changed (3)

File BASE_REVISION

-a9a971671e12068f1bc007fc663942ec289a87b6
+0188ddfa844ed5f9cf2eed46765dcaa7dcad89f6
 msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2012-10-30 17:39+0900\n"
+"POT-Creation-Date: 2012-10-31 18: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/histedit.py:411 hgext/patchbomb.py:278 mercurial/commands.py:1806
-#: mercurial/commands.py:3937 mercurial/commands.py:4401 mercurial/hg.py:478
-#: mercurial/hg.py:530
+#: mercurial/commands.py:3937 mercurial/commands.py:4401 mercurial/hg.py:495
+#: mercurial/hg.py:547
 #, python-format
 msgid "comparing with %s\n"
 msgstr ""
 
 #: hgext/largefiles/overrides.py:158 hgext/largefiles/overrides.py:170
 #: hgext/largefiles/overrides.py:938 mercurial/cmdutil.py:1574
-#: mercurial/cmdutil.py:1865 mercurial/commands.py:4879 mercurial/merge.py:355
+#: mercurial/cmdutil.py:1869 mercurial/commands.py:4879 mercurial/merge.py:355
 #: mercurial/scmutil.py:737
 #, python-format
 msgid "removing %s\n"
 msgid "error removing undo: %s\n"
 msgstr ""
 
-#: hgext/mq.py:577 mercurial/cmdutil.py:1893
+#: hgext/mq.py:577 mercurial/cmdutil.py:1897
 #, python-format
 msgid "saving current version of %s as %s\n"
 msgstr ""
 
 #: hgext/patchbomb.py:202
 msgid ""
-"    With the -d/--diffstat or -c/--confirm options, you will be presented\n"
+"    With the -d/--diffstat or --confirm options, you will be presented\n"
 "    with a final summary of all messages and asked for confirmation before\n"
 "    the messages are sent."
 msgstr ""
 "    "
 msgstr ""
 
-#: hgext/patchbomb.py:285 mercurial/hg.py:487 mercurial/localrepo.py:1748
+#: hgext/patchbomb.py:285 mercurial/hg.py:504 mercurial/localrepo.py:1748
 #: mercurial/scmutil.py:28
 msgid "no changes found\n"
 msgstr ""
 msgid "patchbomb canceled"
 msgstr ""
 
-#: hgext/patchbomb.py:529
+#: hgext/patchbomb.py:526
 msgid "displaying "
 msgstr ""
 
-#: hgext/patchbomb.py:547
+#: hgext/patchbomb.py:544
 msgid "sending "
 msgstr ""
 
-#: hgext/patchbomb.py:548 hgext/patchbomb.py:558
+#: hgext/patchbomb.py:545 hgext/patchbomb.py:555
 #: mercurial/httpconnection.py:47 mercurial/httpconnection.py:54
 msgid "sending"
 msgstr ""
 
-#: hgext/patchbomb.py:557
+#: hgext/patchbomb.py:554
 msgid "writing"
 msgstr ""
 
 
 #: hgext/rebase.py:252 mercurial/localrepo.py:2098 mercurial/localrepo.py:2210
 #: mercurial/localrepo.py:2314 mercurial/localrepo.py:2334
-#: mercurial/verify.py:128
+#: mercurial/verify.py:135
 msgid "changesets"
 msgstr ""
 
 #: 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/subrepo.py:370 mercurial/subrepo.py:1229
-#: mercurial/subrepo.py:1242
+#: mercurial/subrepo.py:370 mercurial/subrepo.py:1233
+#: mercurial/subrepo.py:1246
 msgid "files"
 msgstr ""
 
 msgid "-G/--graph option is incompatible with --%s"
 msgstr ""
 
-#: mercurial/cmdutil.py:1518 mercurial/cmdutil.py:1868
+#: mercurial/cmdutil.py:1518 mercurial/cmdutil.py:1872
 #: mercurial/scmutil.py:731
 #, python-format
 msgid "adding %s\n"
 msgid "amending changeset %s\n"
 msgstr ""
 
-#: mercurial/cmdutil.py:1647 mercurial/cmdutil.py:1686
+#: mercurial/cmdutil.py:1651 mercurial/cmdutil.py:1690
 #, python-format
 msgid "copying changeset %s to %s\n"
 msgstr ""
 
-#: mercurial/cmdutil.py:1757
+#: mercurial/cmdutil.py:1761
 #, python-format
 msgid "stripping intermediate changeset %s\n"
 msgstr ""
 
-#: mercurial/cmdutil.py:1758
+#: mercurial/cmdutil.py:1762
 #, python-format
 msgid "stripping amended changeset %s\n"
 msgstr ""
 
-#: mercurial/cmdutil.py:1776
+#: mercurial/cmdutil.py:1780
 msgid "HG: Enter commit message.  Lines beginning with 'HG:' are removed."
 msgstr ""
 
-#: mercurial/cmdutil.py:1778
+#: mercurial/cmdutil.py:1782
 msgid "HG: Leave message empty to abort commit."
 msgstr ""
 
-#: mercurial/cmdutil.py:1780
+#: mercurial/cmdutil.py:1784
 #, python-format
 msgid "HG: user: %s"
 msgstr ""
 
-#: mercurial/cmdutil.py:1782
+#: mercurial/cmdutil.py:1786
 msgid "HG: branch merge"
 msgstr ""
 
-#: mercurial/cmdutil.py:1784
+#: mercurial/cmdutil.py:1788
 #, python-format
 msgid "HG: branch '%s'"
 msgstr ""
 
-#: mercurial/cmdutil.py:1785
+#: mercurial/cmdutil.py:1789
 #, python-format
 msgid "HG: subrepo %s"
 msgstr ""
 
-#: mercurial/cmdutil.py:1786
+#: mercurial/cmdutil.py:1790
 #, python-format
 msgid "HG: added %s"
 msgstr ""
 
-#: mercurial/cmdutil.py:1787
+#: mercurial/cmdutil.py:1791
 #, python-format
 msgid "HG: changed %s"
 msgstr ""
 
-#: mercurial/cmdutil.py:1788
+#: mercurial/cmdutil.py:1792
 #, python-format
 msgid "HG: removed %s"
 msgstr ""
 
-#: mercurial/cmdutil.py:1790
+#: mercurial/cmdutil.py:1794
 msgid "HG: no files changed"
 msgstr ""
 
-#: mercurial/cmdutil.py:1800
+#: mercurial/cmdutil.py:1804
 msgid "empty commit message"
 msgstr ""
 
-#: mercurial/cmdutil.py:1864
+#: mercurial/cmdutil.py:1868
 #, python-format
 msgid "forgetting %s\n"
 msgstr ""
 
-#: mercurial/cmdutil.py:1867
+#: mercurial/cmdutil.py:1871
 #, python-format
 msgid "reverting %s\n"
 msgstr ""
 
-#: mercurial/cmdutil.py:1870
+#: mercurial/cmdutil.py:1874
 #, python-format
 msgid "undeleting %s\n"
 msgstr ""
 
-#: mercurial/cmdutil.py:1916
+#: mercurial/cmdutil.py:1920
 #, python-format
 msgid "file not managed: %s\n"
 msgstr ""
 
-#: mercurial/cmdutil.py:1921
+#: mercurial/cmdutil.py:1925
 #, python-format
 msgid "no changes needed to %s\n"
 msgstr ""
 msgid "empty destination path is not valid"
 msgstr ""
 
-#: mercurial/hg.py:280 mercurial/hg.py:333 mercurial/hg.py:360
+#: mercurial/hg.py:280 mercurial/hg.py:333 mercurial/hg.py:361
 #, python-format
 msgid "destination '%s' already exists"
 msgstr ""
 msgid "destination '%s' is not empty"
 msgstr ""
 
-#: mercurial/hg.py:367
+#: mercurial/hg.py:368
 msgid ""
 "src repository does not support revision lookup and so doesn't support clone"
 " by revision"
 msgstr ""
 
-#: mercurial/hg.py:377
+#: mercurial/hg.py:378
 msgid "clone from remote to remote not supported"
 msgstr ""
 
-#: mercurial/hg.py:421
+#: mercurial/hg.py:426
+msgid "updating to bookmark @\n"
+msgstr ""
+
+#: mercurial/hg.py:428
+#, python-format
+msgid "updating to bookmark @ on branch %s\n"
+msgstr ""
+
+#: mercurial/hg.py:437
 #, python-format
 msgid "updating to branch %s\n"
 msgstr ""
 
-#: mercurial/hg.py:435
+#: mercurial/hg.py:452
 #, python-format
 msgid ""
 "%d files updated, %d files merged, %d files removed, %d files unresolved\n"
 msgstr ""
 
-#: mercurial/hg.py:443
+#: mercurial/hg.py:460
 msgid "use 'hg resolve' to retry unresolved file merges\n"
 msgstr ""
 
-#: mercurial/hg.py:462
+#: mercurial/hg.py:479
 msgid ""
 "use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to "
 "abandon\n"
 msgstr ""
 
-#: mercurial/hg.py:465
+#: mercurial/hg.py:482
 msgid "(branch merge, don't forget to commit)\n"
 msgstr ""
 
 
 #: mercurial/localrepo.py:2099 mercurial/localrepo.py:2211
 #: mercurial/localrepo.py:2338 mercurial/localrepo.py:2347
-#: mercurial/verify.py:152
+#: mercurial/verify.py:159
 msgid "manifests"
 msgstr ""
 
 msgstr ""
 
 #: mercurial/subrepo.py:361 mercurial/subrepo.py:369 mercurial/subrepo.py:371
-#: mercurial/subrepo.py:1229 mercurial/subrepo.py:1241
-#: mercurial/subrepo.py:1243
+#: mercurial/subrepo.py:1233 mercurial/subrepo.py:1245
+#: mercurial/subrepo.py:1247
 #, python-format
 msgid "archiving (%s)"
 msgstr ""
 
-#: mercurial/subrepo.py:432 mercurial/subrepo.py:448
+#: mercurial/subrepo.py:436 mercurial/subrepo.py:452
 #, python-format
 msgid "warning: error \"%s\" in subrepository \"%s\"\n"
 msgstr ""
 
-#: mercurial/subrepo.py:492 mercurial/subrepo.py:782 mercurial/subrepo.py:1206
+#: mercurial/subrepo.py:496 mercurial/subrepo.py:786 mercurial/subrepo.py:1210
 #, python-format
 msgid "removing subrepo %s\n"
 msgstr ""
 
-#: mercurial/subrepo.py:502 mercurial/subrepo.py:1007
+#: mercurial/subrepo.py:506 mercurial/subrepo.py:1011
 #, python-format
 msgid "cloning subrepo %s from %s\n"
 msgstr ""
 
-#: mercurial/subrepo.py:512 mercurial/subrepo.py:1012
+#: mercurial/subrepo.py:516 mercurial/subrepo.py:1016
 #, python-format
 msgid "pulling subrepo %s from %s\n"
 msgstr ""
 
-#: mercurial/subrepo.py:563
+#: mercurial/subrepo.py:567
 #, python-format
 msgid "pushing subrepo %s to %s\n"
 msgstr ""
 
-#: mercurial/subrepo.py:602
+#: mercurial/subrepo.py:606
 #, python-format
 msgid "reverting subrepo %s\n"
 msgstr ""
 
-#: mercurial/subrepo.py:636
+#: mercurial/subrepo.py:640
 #, python-format
 msgid "'svn' executable not found for subrepo '%s'"
 msgstr ""
 
-#: mercurial/subrepo.py:680
+#: mercurial/subrepo.py:684
 msgid "cannot retrieve svn tool version"
 msgstr ""
 
-#: mercurial/subrepo.py:757
+#: mercurial/subrepo.py:761
 msgid "cannot commit svn externals"
 msgstr ""
 
-#: mercurial/subrepo.py:761
+#: mercurial/subrepo.py:765
 msgid "cannot commit missing svn entries"
 msgstr ""
 
-#: mercurial/subrepo.py:771
+#: mercurial/subrepo.py:775
 msgid "failed to commit svn changes"
 msgstr ""
 
-#: mercurial/subrepo.py:779 mercurial/subrepo.py:1201
+#: mercurial/subrepo.py:783 mercurial/subrepo.py:1205
 #, python-format
 msgid "not removing repo %s because it has changes.\n"
 msgstr ""
 
-#: mercurial/subrepo.py:874
+#: mercurial/subrepo.py:878
 msgid "cannot retrieve git version"
 msgstr ""
 
-#: mercurial/subrepo.py:881 mercurial/subrepo.py:883
+#: mercurial/subrepo.py:885 mercurial/subrepo.py:887
 msgid "git subrepo requires at least 1.6.0 or later"
 msgstr ""
 
-#: mercurial/subrepo.py:1017
+#: mercurial/subrepo.py:1021
 #, python-format
 msgid "revision %s does not exist in subrepo %s\n"
 msgstr ""
 
-#: mercurial/subrepo.py:1070
+#: mercurial/subrepo.py:1074
 #, python-format
 msgid "checking out detached HEAD in subrepo %s\n"
 msgstr ""
 
-#: mercurial/subrepo.py:1072
+#: mercurial/subrepo.py:1076
 msgid "check out a git branch if you intend to make changes\n"
 msgstr ""
 
-#: mercurial/subrepo.py:1121 mercurial/subrepo.py:1164
+#: mercurial/subrepo.py:1125 mercurial/subrepo.py:1168
 #, python-format
 msgid "subrepo %s is missing"
 msgstr ""
 
-#: mercurial/subrepo.py:1184
+#: mercurial/subrepo.py:1188
 #, python-format
 msgid "unrelated git branch checked out in subrepo %s\n"
 msgstr ""
 
-#: mercurial/subrepo.py:1187
+#: mercurial/subrepo.py:1191
 #, python-format
 msgid "pushing branch %s of subrepo %s\n"
 msgstr ""
 
-#: mercurial/subrepo.py:1192
+#: mercurial/subrepo.py:1196
 #, python-format
 msgid ""
 "no branch checked out in subrepo %s\n"
 msgid "file:// URLs can only refer to localhost"
 msgstr ""
 
-#: mercurial/verify.py:34
+#: mercurial/verify.py:41
 msgid "cannot verify bundle or remote repos"
 msgstr ""
 
-#: mercurial/verify.py:49
+#: mercurial/verify.py:56
 msgid "interrupted"
 msgstr ""
 
-#: mercurial/verify.py:61
+#: mercurial/verify.py:68
 #, python-format
 msgid "empty or missing %s"
 msgstr ""
 
-#: mercurial/verify.py:66
+#: mercurial/verify.py:73
 #, python-format
 msgid "data length off by %d bytes"
 msgstr ""
 
-#: mercurial/verify.py:68
+#: mercurial/verify.py:75
 #, python-format
 msgid "index contains %d extra bytes"
 msgstr ""
 
-#: mercurial/verify.py:72
+#: mercurial/verify.py:79
 #, python-format
 msgid "warning: `%s' uses revlog format 1"
 msgstr ""
 
-#: mercurial/verify.py:74
+#: mercurial/verify.py:81
 #, python-format
 msgid "warning: `%s' uses revlog format 0"
 msgstr ""
 
-#: mercurial/verify.py:80
+#: mercurial/verify.py:87
 #, python-format
 msgid "rev %d points to nonexistent changeset %d"
 msgstr ""
 
-#: mercurial/verify.py:82
+#: mercurial/verify.py:89
 #, python-format
 msgid "rev %d points to unexpected changeset %d"
 msgstr ""
 
-#: mercurial/verify.py:92
+#: mercurial/verify.py:99
 #, python-format
 msgid " (expected %s)"
 msgstr ""
 
-#: mercurial/verify.py:98
+#: mercurial/verify.py:105
 #, python-format
 msgid "unknown parent 1 %s of %s"
 msgstr ""
 
-#: mercurial/verify.py:101
+#: mercurial/verify.py:108
 #, python-format
 msgid "unknown parent 2 %s of %s"
 msgstr ""
 
-#: mercurial/verify.py:104
+#: mercurial/verify.py:111
 #, python-format
 msgid "checking parents of %s"
 msgstr ""
 
-#: mercurial/verify.py:107
+#: mercurial/verify.py:114
 #, python-format
 msgid "duplicate revision %d (%d)"
 msgstr ""
 
-#: mercurial/verify.py:112
+#: mercurial/verify.py:119
 msgid "abandoned transaction found - run hg recover\n"
 msgstr ""
 
-#: mercurial/verify.py:116
+#: mercurial/verify.py:123
 #, python-format
 msgid "repository uses revlog format %d\n"
 msgstr ""
 
-#: mercurial/verify.py:122
+#: mercurial/verify.py:129
 msgid "checking changesets\n"
 msgstr ""
 
-#: mercurial/verify.py:128 mercurial/verify.py:142 mercurial/verify.py:152
-#: mercurial/verify.py:168 mercurial/verify.py:217 mercurial/verify.py:296
+#: mercurial/verify.py:135 mercurial/verify.py:149 mercurial/verify.py:159
+#: mercurial/verify.py:175 mercurial/verify.py:224 mercurial/verify.py:303
 msgid "checking"
 msgstr ""
 
-#: mercurial/verify.py:141
+#: mercurial/verify.py:148
 #, python-format
 msgid "unpacking changeset %s"
 msgstr ""
 
-#: mercurial/verify.py:144
+#: mercurial/verify.py:151
 msgid "checking manifests\n"
 msgstr ""
 
-#: mercurial/verify.py:158
+#: mercurial/verify.py:165
 #, python-format
 msgid "%s not in changesets"
 msgstr ""
 
-#: mercurial/verify.py:163
+#: mercurial/verify.py:170
 msgid "file without name in manifest"
 msgstr ""
 
-#: mercurial/verify.py:167
+#: mercurial/verify.py:174
 #, python-format
 msgid "reading manifest delta %s"
 msgstr ""
 
-#: mercurial/verify.py:170
+#: mercurial/verify.py:177
 msgid "crosschecking files in changesets and manifests\n"
 msgstr ""
 
-#: mercurial/verify.py:180 mercurial/verify.py:186 mercurial/verify.py:194
-#: mercurial/verify.py:203
+#: mercurial/verify.py:187 mercurial/verify.py:193 mercurial/verify.py:201
+#: mercurial/verify.py:210
 msgid "crosschecking"
 msgstr ""
 
-#: mercurial/verify.py:181
+#: mercurial/verify.py:188
 #, python-format
 msgid "changeset refers to unknown manifest %s"
 msgstr ""
 
-#: mercurial/verify.py:189
+#: mercurial/verify.py:196
 msgid "in changeset but not in manifest"
 msgstr ""
 
-#: mercurial/verify.py:201
+#: mercurial/verify.py:208
 msgid "in manifest but not in changeset"
 msgstr ""
 
-#: mercurial/verify.py:205
+#: mercurial/verify.py:212
 msgid "checking files\n"
 msgstr ""
 
-#: mercurial/verify.py:210
+#: mercurial/verify.py:217
 #, python-format
 msgid "cannot decode filename '%s'"
 msgstr ""
 
-#: mercurial/verify.py:232
+#: mercurial/verify.py:239
 #, python-format
 msgid "broken revlog! (%s)"
 msgstr ""
 
-#: mercurial/verify.py:239
+#: mercurial/verify.py:246
 msgid "missing revlog!"
 msgstr ""
 
-#: mercurial/verify.py:250
+#: mercurial/verify.py:257
 #, python-format
 msgid "%s not in manifests"
 msgstr ""
 
-#: mercurial/verify.py:260
+#: mercurial/verify.py:267
 #, python-format
 msgid "unpacked size is %s, %s expected"
 msgstr ""
 
-#: mercurial/verify.py:263
+#: mercurial/verify.py:270
 #, python-format
 msgid "unpacking %s"
 msgstr ""
 
-#: mercurial/verify.py:276
+#: mercurial/verify.py:283
 #, python-format
 msgid "warning: copy source of '%s' not in parents of %s"
 msgstr ""
 
-#: mercurial/verify.py:280
+#: mercurial/verify.py:287
 #, python-format
 msgid "empty or missing copy source revlog %s:%s"
 msgstr ""
 
-#: mercurial/verify.py:283
+#: mercurial/verify.py:290
 #, python-format
 msgid "warning: %s@%s: copy source revision is nullid %s:%s\n"
 msgstr ""
 
-#: mercurial/verify.py:289
+#: mercurial/verify.py:296
 #, python-format
 msgid "checking rename of %s"
 msgstr ""
 
-#: mercurial/verify.py:295
+#: mercurial/verify.py:302
 #, python-format
 msgid "%s in manifests not found"
 msgstr ""
 
-#: mercurial/verify.py:299
+#: mercurial/verify.py:306
 #, python-format
 msgid "warning: orphan revlog '%s'"
 msgstr ""
 
-#: mercurial/verify.py:301
+#: mercurial/verify.py:308
 #, python-format
 msgid "%d files, %d changesets, %d total revisions\n"
 msgstr ""
 
-#: mercurial/verify.py:304
+#: mercurial/verify.py:311
 #, python-format
 msgid "%d warnings encountered!\n"
 msgstr ""
 
-#: mercurial/verify.py:306
+#: mercurial/verify.py:313
 #, python-format
 msgid "%d integrity errors encountered!\n"
 msgstr ""
 
-#: mercurial/verify.py:308
+#: mercurial/verify.py:315
 #, python-format
 msgid "(first damaged changeset appears to be %d)\n"
 msgstr ""
 msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2012-10-30 17:39+0900\n"
+"POT-Creation-Date: 2012-10-31 18:16+0900\n"
 "PO-Revision-Date: 2009-11-16 21:24+0100\n"
 "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n"
 "Language-Team: Japanese\n"
 msgid "    Finally, the patch itself, as generated by :hg:`export`."
 msgstr "    最後の部位には :hg:`export` が生成する差分が配置されます。"
 
-msgid ""
-"    With the -d/--diffstat or -c/--confirm options, you will be presented\n"
+#, fuzzy
+msgid ""
+"    With the -d/--diffstat or --confirm options, you will be presented\n"
 "    with a final summary of all messages and asked for confirmation before\n"
 "    the messages are sent."
 msgstr ""
 msgid "clone from remote to remote not supported"
 msgstr "リモートからリモートの複製は未サポートです"
 
+#, fuzzy
+msgid "updating to bookmark @\n"
+msgstr "ブックマーク %s の更新中\n"
+
+#, fuzzy, python-format
+msgid "updating to bookmark @ on branch %s\n"
+msgstr "ブランチ %s へ更新中\n"
+
 #, python-format
 msgid "updating to branch %s\n"
 msgstr "ブランチ %s へ更新中\n"