1.1 --- a/i18n/ja.po
     1.2 +++ b/i18n/ja.po
     1.3 @@ -53,7 +53,8 @@
     1.4  msgid ""
     1.5  msgstr ""
     1.6  "Project-Id-Version: Mercurial\n"
     1.7 -"POT-Creation-Date: 2009-02-08 00:29+JST\n"
     1.8 +"Report-Msgid-Bugs-To: \n"
     1.9 +"POT-Creation-Date: 2009-02-14 01:01+0100\n"
    1.10  "PO-Revision-Date: 2009-02-14 00:51+0100\n"
    1.11  "Last-Translator: FUJIWARA Katsunori <foozy@lares.dti.ne.jp>\n"
    1.12  "Language-Team: Japanese\n"
    1.13 @@ -63,6 +64,7 @@
    1.14  "Generated-By: pygettext.py 1.5\n"
    1.15  "Plural-Forms: nplurals=1; plural=0;\n"
    1.16  
    1.17 +#, python-format
    1.18  msgid " (default: %s)"
    1.19  msgstr " (規定値: %s)"
    1.20  
    1.21 @@ -75,6 +77,7 @@
    1.22  msgid "    options:\n"
    1.23  msgstr ""
    1.24  
    1.25 +#, python-format
    1.26  msgid ""
    1.27  "    aliases: %s\n"
    1.28  "\n"
    1.29 @@ -83,27 +86,35 @@
    1.30  msgid "return tuple of (match function, list enabled)."
    1.31  msgstr ""
    1.32  
    1.33 +#, python-format
    1.34  msgid "acl: %s not enabled\n"
    1.35  msgstr ""
    1.36  
    1.37 +#, python-format
    1.38  msgid "acl: %s enabled, %d entries for user %s\n"
    1.39  msgstr ""
    1.40  
    1.41 +#, python-format
    1.42  msgid "config error - hook type \"%s\" cannot stop incoming changesets"
    1.43  msgstr ""
    1.44  
    1.45 +#, python-format
    1.46  msgid "acl: changes have source \"%s\" - skipping\n"
    1.47  msgstr ""
    1.48  
    1.49 +#, python-format
    1.50  msgid "acl: user %s denied on %s\n"
    1.51  msgstr ""
    1.52  
    1.53 +#, python-format
    1.54  msgid "acl: access denied for changeset %s"
    1.55  msgstr ""
    1.56  
    1.57 +#, python-format
    1.58  msgid "acl: user %s not allowed on %s\n"
    1.59  msgstr ""
    1.60  
    1.61 +#, python-format
    1.62  msgid "acl: allowing changeset %s\n"
    1.63  msgstr ""
    1.64  
    1.65 @@ -121,15 +132,19 @@
    1.66  "    after alias can be aliased"
    1.67  msgstr ""
    1.68  
    1.69 +#, python-format
    1.70  msgid "*** [alias] %s: command %s is unknown"
    1.71  msgstr ""
    1.72  
    1.73 +#, python-format
    1.74  msgid "*** [alias] %s: command %s is ambiguous"
    1.75  msgstr ""
    1.76  
    1.77 +#, python-format
    1.78  msgid "*** [alias] %s: circular dependency on %s"
    1.79  msgstr ""
    1.80  
    1.81 +#, python-format
    1.82  msgid "*** [alias] %s: no definition\n"
    1.83  msgstr ""
    1.84  
    1.85 @@ -391,15 +406,18 @@
    1.86  msgid "support for bugzilla version 2.16."
    1.87  msgstr ""
    1.88  
    1.89 +#, python-format
    1.90  msgid "connecting to %s:%s as %s, password %s\n"
    1.91  msgstr ""
    1.92  
    1.93  msgid "run a query."
    1.94  msgstr ""
    1.95  
    1.96 +#, python-format
    1.97  msgid "query: %s %s\n"
    1.98  msgstr ""
    1.99  
   1.100 +#, python-format
   1.101  msgid "failed query: %s %s\n"
   1.102  msgstr ""
   1.103  
   1.104 @@ -415,6 +433,7 @@
   1.105  msgid "filter bug ids from list that already refer to this changeset."
   1.106  msgstr ""
   1.107  
   1.108 +#, python-format
   1.109  msgid "bug %d already knows about changeset %s\n"
   1.110  msgstr ""
   1.111  
   1.112 @@ -424,12 +443,15 @@
   1.113  msgid "telling bugzilla to send mail:\n"
   1.114  msgstr ""
   1.115  
   1.116 +#, python-format
   1.117  msgid "  bug %s\n"
   1.118  msgstr ""
   1.119  
   1.120 +#, python-format
   1.121  msgid "running notify command %s\n"
   1.122  msgstr ""
   1.123  
   1.124 +#, python-format
   1.125  msgid "bugzilla notify command %s"
   1.126  msgstr ""
   1.127  
   1.128 @@ -439,6 +461,7 @@
   1.129  msgid "look up numeric bugzilla user id."
   1.130  msgstr ""
   1.131  
   1.132 +#, python-format
   1.133  msgid "looking up user %s\n"
   1.134  msgstr ""
   1.135  
   1.136 @@ -451,9 +474,11 @@
   1.137  "        bugzilla username and userid."
   1.138  msgstr ""
   1.139  
   1.140 +#, python-format
   1.141  msgid "cannot find bugzilla user id for %s"
   1.142  msgstr ""
   1.143  
   1.144 +#, python-format
   1.145  msgid "cannot find bugzilla user id for %s or %s"
   1.146  msgstr ""
   1.147  
   1.148 @@ -473,6 +498,7 @@
   1.149  "        use."
   1.150  msgstr ""
   1.151  
   1.152 +#, python-format
   1.153  msgid "bugzilla version %s not supported"
   1.154  msgstr ""
   1.155  
   1.156 @@ -502,12 +528,15 @@
   1.157  "    seen multiple times does not fill bug with duplicate data."
   1.158  msgstr ""
   1.159  
   1.160 +#, python-format
   1.161  msgid "python mysql support not available: %s"
   1.162  msgstr ""
   1.163  
   1.164 +#, python-format
   1.165  msgid "hook type %s does not pass a changeset id"
   1.166  msgstr ""
   1.167  
   1.168 +#, python-format
   1.169  msgid "database error: %s"
   1.170  msgstr ""
   1.171  
   1.172 @@ -534,9 +563,11 @@
   1.173  msgid "Calculate stats"
   1.174  msgstr ""
   1.175  
   1.176 +#, python-format
   1.177  msgid "Revision %d is a merge, ignoring...\n"
   1.178  msgstr ""
   1.179  
   1.180 +#, python-format
   1.181  msgid "\rgenerating stats: %d%%"
   1.182  msgstr ""
   1.183  
   1.184 @@ -569,6 +600,7 @@
   1.185  "    <alias email> <actual email>"
   1.186  msgstr ""
   1.187  
   1.188 +#, python-format
   1.189  msgid "assuming %i character terminal\n"
   1.190  msgstr ""
   1.191  
   1.192 @@ -910,54 +942,76 @@
   1.193  msgid "show current changeset in ancestor branches"
   1.194  msgstr ""
   1.195  
   1.196 +msgid "ignored for compatibility"
   1.197 +msgstr ""
   1.198 +
   1.199 +msgid "hg debugcvsps [OPTION]... [PATH]..."
   1.200 +msgstr ""
   1.201 +
   1.202 +#, python-format
   1.203  msgid "%s is not a valid revision in current branch"
   1.204  msgstr ""
   1.205  
   1.206 +#, python-format
   1.207  msgid "%s is not available in %s anymore"
   1.208  msgstr ""
   1.209  
   1.210 +#, python-format
   1.211  msgid "cannot find required \"%s\" tool"
   1.212  msgstr ""
   1.213  
   1.214 +#, python-format
   1.215  msgid "running: %s\n"
   1.216  msgstr ""
   1.217  
   1.218 +#, python-format
   1.219  msgid "%s error:\n"
   1.220  msgstr ""
   1.221  
   1.222 +#, python-format
   1.223  msgid "%s %s"
   1.224  msgstr ""
   1.225  
   1.226 +#, python-format
   1.227  msgid "could not open map file %r: %s"
   1.228  msgstr ""
   1.229  
   1.230 +#, python-format
   1.231  msgid "%s: missing or unsupported repository"
   1.232  msgstr ""
   1.233  
   1.234 +#, python-format
   1.235  msgid "convert: %s\n"
   1.236  msgstr ""
   1.237  
   1.238 +#, python-format
   1.239  msgid "%s: unknown repository type"
   1.240  msgstr ""
   1.241  
   1.242 +#, python-format
   1.243  msgid "cycle detected between %s and %s"
   1.244  msgstr ""
   1.245  
   1.246  msgid "not all revisions were sorted"
   1.247  msgstr ""
   1.248  
   1.249 +#, python-format
   1.250  msgid "Writing author map file %s\n"
   1.251  msgstr ""
   1.252  
   1.253 +#, python-format
   1.254  msgid "Overriding mapping for author %s, was %s, will be %s\n"
   1.255  msgstr ""
   1.256  
   1.257 +#, python-format
   1.258  msgid "mapping author %s to %s\n"
   1.259  msgstr ""
   1.260  
   1.261 +#, python-format
   1.262  msgid "Ignoring bad line in author map file %s: %s\n"
   1.263  msgstr ""
   1.264  
   1.265 +#, python-format
   1.266  msgid "spliced in %s as parents of %s\n"
   1.267  msgstr ""
   1.268  
   1.269 @@ -970,18 +1024,22 @@
   1.270  msgid "converting...\n"
   1.271  msgstr ""
   1.272  
   1.273 +#, python-format
   1.274  msgid "source: %s\n"
   1.275  msgstr ""
   1.276  
   1.277 +#, python-format
   1.278  msgid "assuming destination %s\n"
   1.279  msgstr ""
   1.280  
   1.281 +#, python-format
   1.282  msgid "revision %s is not a patchset number or date"
   1.283  msgstr ""
   1.284  
   1.285  msgid "using builtin cvsps\n"
   1.286  msgstr ""
   1.287  
   1.288 +#, python-format
   1.289  msgid "connecting to %s\n"
   1.290  msgstr ""
   1.291  
   1.292 @@ -991,30 +1049,38 @@
   1.293  msgid "server sucks"
   1.294  msgstr ""
   1.295  
   1.296 +#, python-format
   1.297  msgid "%d bytes missing from remote file"
   1.298  msgstr ""
   1.299  
   1.300 +#, python-format
   1.301  msgid "cvs server: %s\n"
   1.302  msgstr ""
   1.303  
   1.304 +#, python-format
   1.305  msgid "unknown CVS response: %s"
   1.306  msgstr ""
   1.307  
   1.308  msgid "collecting CVS rlog\n"
   1.309  msgstr ""
   1.310  
   1.311 +#, python-format
   1.312  msgid "reading cvs log cache %s\n"
   1.313  msgstr ""
   1.314  
   1.315 +#, python-format
   1.316  msgid "cache has %d log entries\n"
   1.317  msgstr ""
   1.318  
   1.319 +#, python-format
   1.320  msgid "error reading cache: %r\n"
   1.321  msgstr ""
   1.322  
   1.323 +#, python-format
   1.324  msgid "running %s\n"
   1.325  msgstr ""
   1.326  
   1.327 +#, python-format
   1.328  msgid "prefix=%r directory=%r root=%r\n"
   1.329  msgstr ""
   1.330  
   1.331 @@ -1030,21 +1096,25 @@
   1.332  msgid "revision must be followed by date line"
   1.333  msgstr ""
   1.334  
   1.335 +#, python-format
   1.336  msgid "writing cvs log cache %s\n"
   1.337  msgstr ""
   1.338  
   1.339 +#, python-format
   1.340  msgid "%d log entries\n"
   1.341  msgstr ""
   1.342  
   1.343  msgid "creating changesets\n"
   1.344  msgstr ""
   1.345  
   1.346 +#, python-format
   1.347  msgid "%d changeset entries\n"
   1.348  msgstr ""
   1.349  
   1.350  msgid "Python ElementTree module is not available"
   1.351  msgstr ""
   1.352  
   1.353 +#, python-format
   1.354  msgid "cleaning up %s\n"
   1.355  msgstr ""
   1.356  
   1.357 @@ -1054,46 +1124,58 @@
   1.358  msgid "errors in filemap"
   1.359  msgstr ""
   1.360  
   1.361 +#, python-format
   1.362  msgid "%s:%d: %r already in %s list\n"
   1.363  msgstr ""
   1.364  
   1.365 +#, python-format
   1.366  msgid "%s:%d: unknown directive %r\n"
   1.367  msgstr ""
   1.368  
   1.369  msgid "source repository doesn't support --filemap"
   1.370  msgstr ""
   1.371  
   1.372 +#, python-format
   1.373  msgid "%s does not look like a GNU Arch repo"
   1.374  msgstr ""
   1.375  
   1.376  msgid "cannot find a GNU Arch tool"
   1.377  msgstr ""
   1.378  
   1.379 +#, python-format
   1.380  msgid "analyzing tree version %s...\n"
   1.381  msgstr ""
   1.382  
   1.383 +#, python-format
   1.384  msgid ""
   1.385  "tree analysis stopped because it points to an unregistered archive %s...\n"
   1.386  msgstr ""
   1.387  
   1.388 +#, python-format
   1.389  msgid "applying revision %s...\n"
   1.390  msgstr ""
   1.391  
   1.392 +#, python-format
   1.393  msgid "computing changeset between %s and %s...\n"
   1.394  msgstr ""
   1.395  
   1.396 +#, python-format
   1.397  msgid "obtaining revision %s...\n"
   1.398  msgstr ""
   1.399  
   1.400 +#, python-format
   1.401  msgid "analysing revision %s...\n"
   1.402  msgstr ""
   1.403  
   1.404 +#, python-format
   1.405  msgid "could not parse cat-log of %s"
   1.406  msgstr ""
   1.407  
   1.408 +#, python-format
   1.409  msgid "%s is not a local Mercurial repo"
   1.410  msgstr ""
   1.411  
   1.412 +#, python-format
   1.413  msgid "initializing destination %s repository\n"
   1.414  msgstr ""
   1.415  
   1.416 @@ -1103,15 +1185,18 @@
   1.417  msgid "run hg sink post-conversion action\n"
   1.418  msgstr ""
   1.419  
   1.420 +#, python-format
   1.421  msgid "pulling from %s into %s\n"
   1.422  msgstr ""
   1.423  
   1.424  msgid "updating tags\n"
   1.425  msgstr ""
   1.426  
   1.427 +#, python-format
   1.428  msgid "%s is not a valid start revision"
   1.429  msgstr ""
   1.430  
   1.431 +#, python-format
   1.432  msgid "ignoring: %s\n"
   1.433  msgstr ""
   1.434  
   1.435 @@ -1121,114 +1206,146 @@
   1.436  msgid "run hg source post-conversion action\n"
   1.437  msgstr ""
   1.438  
   1.439 +#, python-format
   1.440  msgid "%s does not look like a monotone repo"
   1.441  msgstr ""
   1.442  
   1.443 +#, python-format
   1.444  msgid "copying file in renamed dir from '%s' to '%s'"
   1.445  msgstr ""
   1.446  
   1.447  msgid "Subversion python bindings could not be loaded"
   1.448  msgstr ""
   1.449  
   1.450 +#, python-format
   1.451  msgid "Subversion python bindings %d.%d found, 1.4 or later required"
   1.452  msgstr ""
   1.453  
   1.454  msgid "Subversion python bindings are too old, 1.4 or later required"
   1.455  msgstr ""
   1.456  
   1.457 +#, python-format
   1.458  msgid "svn: revision %s is not an integer"
   1.459  msgstr ""
   1.460  
   1.461 +#, python-format
   1.462  msgid "svn: start revision %s is not an integer"
   1.463  msgstr ""
   1.464  
   1.465 +#, python-format
   1.466  msgid "no revision found in module %s"
   1.467  msgstr ""
   1.468  
   1.469 +#, python-format
   1.470  msgid "expected %s to be at %r, but not found"
   1.471  msgstr ""
   1.472  
   1.473 +#, python-format
   1.474  msgid "found %s at %r\n"
   1.475  msgstr ""
   1.476  
   1.477 +#, python-format
   1.478  msgid "ignoring empty branch %s\n"
   1.479  msgstr ""
   1.480  
   1.481 +#, python-format
   1.482  msgid "found branch %s at %d\n"
   1.483  msgstr ""
   1.484  
   1.485  msgid "svn: start revision is not supported with with more than one branch"
   1.486  msgstr ""
   1.487  
   1.488 +#, python-format
   1.489  msgid "svn: no revision found after start revision %d"
   1.490  msgstr ""
   1.491  
   1.492 +#, python-format
   1.493  msgid "no tags found at revision %d\n"
   1.494  msgstr ""
   1.495  
   1.496 +#, python-format
   1.497  msgid "ignoring foreign branch %r\n"
   1.498  msgstr ""
   1.499  
   1.500 +#, python-format
   1.501  msgid "%s not found up to revision %d"
   1.502  msgstr ""
   1.503  
   1.504 +#, python-format
   1.505  msgid "branch renamed from %s to %s at %d\n"
   1.506  msgstr ""
   1.507  
   1.508 +#, python-format
   1.509  msgid "reparent to %s\n"
   1.510  msgstr ""
   1.511  
   1.512 +#, python-format
   1.513  msgid "copied to %s from %s@%s\n"
   1.514  msgstr ""
   1.515  
   1.516 +#, python-format
   1.517  msgid "gone from %s\n"
   1.518  msgstr ""
   1.519  
   1.520 +#, python-format
   1.521  msgid "found parent directory %s\n"
   1.522  msgstr ""
   1.523  
   1.524 +#, python-format
   1.525  msgid "base, entry %s %s\n"
   1.526  msgstr ""
   1.527  
   1.528  msgid "munge-o-matic\n"
   1.529  msgstr ""
   1.530  
   1.531 +#, python-format
   1.532  msgid "info: %s %s %s %s\n"
   1.533  msgstr ""
   1.534  
   1.535 +#, python-format
   1.536  msgid "unknown path in revision %d: %s\n"
   1.537  msgstr ""
   1.538  
   1.539 +#, python-format
   1.540  msgid "mark %s came from %s:%d\n"
   1.541  msgstr ""
   1.542  
   1.543 +#, python-format
   1.544  msgid "parsing revision %d (%d changes)\n"
   1.545  msgstr ""
   1.546  
   1.547 +#, python-format
   1.548  msgid "found parent of branch %s at %d: %s\n"
   1.549  msgstr ""
   1.550  
   1.551  msgid "no copyfrom path, don't know what to do.\n"
   1.552  msgstr ""
   1.553  
   1.554 +#, python-format
   1.555  msgid "fetching revision log for \"%s\" from %d to %d\n"
   1.556  msgstr ""
   1.557  
   1.558 +#, python-format
   1.559  msgid "skipping blacklisted revision %d\n"
   1.560  msgstr ""
   1.561  
   1.562 +#, python-format
   1.563  msgid "revision %d has no entries\n"
   1.564  msgstr ""
   1.565  
   1.566 +#, python-format
   1.567  msgid "svn: branch has no revision %s"
   1.568  msgstr ""
   1.569  
   1.570 +#, python-format
   1.571  msgid "%r is not under %r, ignoring\n"
   1.572  msgstr ""
   1.573  
   1.574 +#, python-format
   1.575  msgid "initializing svn repo %r\n"
   1.576  msgstr ""
   1.577  
   1.578 +#, python-format
   1.579  msgid "initializing svn wc %r\n"
   1.580  msgstr ""
   1.581  
   1.582 @@ -1286,6 +1403,7 @@
   1.583  msgid "snapshot files as of some revision"
   1.584  msgstr ""
   1.585  
   1.586 +#, python-format
   1.587  msgid "making snapshot of %d files from rev %s\n"
   1.588  msgstr ""
   1.589  
   1.590 @@ -1295,6 +1413,7 @@
   1.591  "    in tools like kdiff3 and meld displays too many files."
   1.592  msgstr ""
   1.593  
   1.594 +#, python-format
   1.595  msgid "making snapshot of %d files from working dir\n"
   1.596  msgstr ""
   1.597  
   1.598 @@ -1308,9 +1427,14 @@
   1.599  "    "
   1.600  msgstr ""
   1.601  
   1.602 +msgid "cannot specify --rev and --change at the same time"
   1.603 +msgstr ""
   1.604 +
   1.605 +#, python-format
   1.606  msgid "running %r in %s\n"
   1.607  msgstr ""
   1.608  
   1.609 +#, python-format
   1.610  msgid "file changed while diffing. Overwriting: %s (src: %s)\n"
   1.611  msgstr ""
   1.612  
   1.613 @@ -1342,12 +1466,16 @@
   1.614  msgid "pass option to comparison program"
   1.615  msgstr ""
   1.616  
   1.617 +msgid "change made by revision"
   1.618 +msgstr ""
   1.619 +
   1.620  msgid "hg extdiff [OPT]... [FILE]..."
   1.621  msgstr ""
   1.622  
   1.623  msgid "use closure to save diff command to use"
   1.624  msgstr ""
   1.625  
   1.626 +#, python-format
   1.627  msgid "hg %s [OPTION]... [FILE]..."
   1.628  msgstr ""
   1.629  
   1.630 @@ -1390,26 +1518,32 @@
   1.631  "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
   1.632  msgstr ""
   1.633  
   1.634 +#, python-format
   1.635  msgid "pulling from %s\n"
   1.636  msgstr "%s から取り込み中\n"
   1.637  
   1.638  msgid "fetch -r doesn't work for remote repositories yet"
   1.639  msgstr ""
   1.640  
   1.641 +#, python-format
   1.642  msgid ""
   1.643  "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge"
   1.644  "\" to merge them)\n"
   1.645  msgstr ""
   1.646  
   1.647 +#, python-format
   1.648  msgid "updating to %d:%s\n"
   1.649  msgstr ""
   1.650  
   1.651 +#, python-format
   1.652  msgid "merging with %d:%s\n"
   1.653  msgstr ""
   1.654  
   1.655 +#, python-format
   1.656  msgid "Automated merge with %s"
   1.657  msgstr ""
   1.658  
   1.659 +#, python-format
   1.660  msgid "new changeset %d:%s merges remote changes with local\n"
   1.661  msgstr ""
   1.662  
   1.663 @@ -1447,24 +1581,29 @@
   1.664  msgid "get the keys who signed a data"
   1.665  msgstr ""
   1.666  
   1.667 +#, python-format
   1.668  msgid "%s Bad signature from \"%s\"\n"
   1.669  msgstr ""
   1.670  
   1.671 +#, python-format
   1.672  msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
   1.673  msgstr ""
   1.674  
   1.675 +#, python-format
   1.676  msgid "%s Note: This key has expired (signed by: \"%s\")\n"
   1.677  msgstr ""
   1.678  
   1.679  msgid "list signed changesets"
   1.680  msgstr ""
   1.681  
   1.682 +#, python-format
   1.683  msgid "%s:%d node does not exist\n"
   1.684  msgstr ""
   1.685  
   1.686  msgid "verify all the signatures there may be for a particular revision"
   1.687  msgstr ""
   1.688  
   1.689 +#, python-format
   1.690  msgid "No valid signature for %s\n"
   1.691  msgstr ""
   1.692  
   1.693 @@ -1492,6 +1631,7 @@
   1.694  "force)"
   1.695  msgstr ""
   1.696  
   1.697 +#, python-format
   1.698  msgid "Added signature for changeset %s"
   1.699  msgstr ""
   1.700  
   1.701 @@ -1580,12 +1720,7 @@
   1.702  "    "
   1.703  msgstr ""
   1.704  
   1.705 -msgid "limit must be a positive integer"
   1.706 -msgstr ""
   1.707 -
   1.708 -msgid "limit must be positive"
   1.709 -msgstr ""
   1.710 -
   1.711 +#, python-format
   1.712  msgid "--graph option is incompatible with --%s"
   1.713  msgstr ""
   1.714  
   1.715 @@ -1601,13 +1736,17 @@
   1.716  msgstr ""
   1.717  
   1.718  msgid ""
   1.719 -"cset DAG generator yielding (node, [parents]) tuples\n"
   1.720 -"\n"
   1.721 -"    This generator function walks through the revisions not found\n"
   1.722 -"    in the destination\n"
   1.723 -"    "
   1.724 -msgstr ""
   1.725 -
   1.726 +"show the outgoing changesets alongside an ASCII revision graph\n"
   1.727 +"\n"
   1.728 +"    Print the outgoing changesets alongside a revision graph drawn with\n"
   1.729 +"    ASCII characters.\n"
   1.730 +"\n"
   1.731 +"    Nodes printed as an @ character are parents of the working\n"
   1.732 +"    directory.\n"
   1.733 +"    "
   1.734 +msgstr ""
   1.735 +
   1.736 +#, python-format
   1.737  msgid "comparing with %s\n"
   1.738  msgstr "%s と比較中\n"
   1.739  
   1.740 @@ -1615,25 +1754,6 @@
   1.741  msgstr "新たなチェンジセットはありません\n"
   1.742  
   1.743  msgid ""
   1.744 -"show the outgoing changesets alongside an ASCII revision graph\n"
   1.745 -"\n"
   1.746 -"    Print the outgoing changesets alongside a revision graph drawn with\n"
   1.747 -"    ASCII characters.\n"
   1.748 -"\n"
   1.749 -"    Nodes printed as an @ character are parents of the working\n"
   1.750 -"    directory.\n"
   1.751 -"    "
   1.752 -msgstr ""
   1.753 -
   1.754 -msgid ""
   1.755 -"cset DAG generator yielding (node, [parents]) tuples\n"
   1.756 -"\n"
   1.757 -"    This generator function walks through the revisions of the destination\n"
   1.758 -"    not found in repo\n"
   1.759 -"    "
   1.760 -msgstr ""
   1.761 -
   1.762 -msgid ""
   1.763  "show the incoming changesets alongside an ASCII revision graph\n"
   1.764  "\n"
   1.765  "    Print the incoming changesets alongside a revision graph drawn with\n"
   1.766 @@ -1706,6 +1826,7 @@
   1.767  msgid " CIA notification class "
   1.768  msgstr ""
   1.769  
   1.770 +#, python-format
   1.771  msgid "hgcia: sending update to %s\n"
   1.772  msgstr ""
   1.773  
   1.774 @@ -1877,15 +1998,18 @@
   1.775  msgid "(starting inotify server)\n"
   1.776  msgstr ""
   1.777  
   1.778 +#, python-format
   1.779  msgid "could not start inotify server: %s\n"
   1.780  msgstr ""
   1.781  
   1.782 +#, python-format
   1.783  msgid "could not talk to new inotify server: %s\n"
   1.784  msgstr ""
   1.785  
   1.786  msgid "(inotify server not running)\n"
   1.787  msgstr ""
   1.788  
   1.789 +#, python-format
   1.790  msgid "failed to contact inotify server: %s\n"
   1.791  msgstr ""
   1.792  
   1.793 @@ -1904,12 +2028,14 @@
   1.794  msgid "hg inserve [OPT]..."
   1.795  msgstr ""
   1.796  
   1.797 +#, python-format
   1.798  msgid "(inotify: received response from incompatible server version %d)\n"
   1.799  msgstr ""
   1.800  
   1.801  msgid "this system does not seem to support inotify"
   1.802  msgstr ""
   1.803  
   1.804 +#, python-format
   1.805  msgid "*** the current per-user limit on the number of inotify watches is %s\n"
   1.806  msgstr ""
   1.807  
   1.808 @@ -1919,75 +2045,98 @@
   1.809  msgid "*** counting directories: "
   1.810  msgstr ""
   1.811  
   1.812 +#, python-format
   1.813  msgid "found %d\n"
   1.814  msgstr ""
   1.815  
   1.816 +#, python-format
   1.817  msgid "*** to raise the limit from %d to %d (run as root):\n"
   1.818  msgstr ""
   1.819  
   1.820 +#, python-format
   1.821  msgid "***  echo %d > %s\n"
   1.822  msgstr ""
   1.823  
   1.824 +#, python-format
   1.825  msgid "cannot watch %s until inotify watch limit is raised"
   1.826  msgstr ""
   1.827  
   1.828 +#, python-format
   1.829  msgid "inotify service not available: %s"
   1.830  msgstr ""
   1.831  
   1.832 +#, python-format
   1.833  msgid "watching %r\n"
   1.834  msgstr ""
   1.835  
   1.836 +#, python-format
   1.837  msgid "watching directories under %r\n"
   1.838  msgstr ""
   1.839  
   1.840 +#, python-format
   1.841  msgid "status: %r dir(%d) -> %s\n"
   1.842  msgstr ""
   1.843  
   1.844 +#, python-format
   1.845  msgid "status: %r %s -> %s\n"
   1.846  msgstr ""
   1.847  
   1.848 +#, python-format
   1.849  msgid "%s dirstate reload\n"
   1.850  msgstr ""
   1.851  
   1.852 +#, python-format
   1.853  msgid "%s end dirstate reload\n"
   1.854  msgstr ""
   1.855  
   1.856  msgid "rescanning due to .hgignore change\n"
   1.857  msgstr ""
   1.858  
   1.859 +#, python-format
   1.860  msgid "%s event: created %s\n"
   1.861  msgstr ""
   1.862  
   1.863 +#, python-format
   1.864  msgid "%s event: deleted %s\n"
   1.865  msgstr ""
   1.866  
   1.867 +#, python-format
   1.868  msgid "%s event: modified %s\n"
   1.869  msgstr ""
   1.870  
   1.871 +#, python-format
   1.872  msgid "filesystem containing %s was unmounted\n"
   1.873  msgstr ""
   1.874  
   1.875 +#, python-format
   1.876  msgid "%s readable: %d bytes\n"
   1.877  msgstr ""
   1.878  
   1.879 +#, python-format
   1.880  msgid "%s below threshold - unhooking\n"
   1.881  msgstr ""
   1.882  
   1.883 +#, python-format
   1.884  msgid "%s reading %d events\n"
   1.885  msgstr ""
   1.886  
   1.887 +#, python-format
   1.888  msgid "%s hooking back up with %d bytes readable\n"
   1.889  msgstr ""
   1.890  
   1.891 +#, python-format
   1.892  msgid "%s processing %d deferred events as %d\n"
   1.893  msgstr ""
   1.894  
   1.895 +#, python-format
   1.896  msgid "could not start server: %s"
   1.897  msgstr ""
   1.898  
   1.899 +#, python-format
   1.900  msgid "received query from incompatible client version %d\n"
   1.901  msgstr ""
   1.902  
   1.903 +#, python-format
   1.904  msgid "answering query for %r\n"
   1.905  msgstr ""
   1.906  
   1.907 @@ -1997,12 +2146,15 @@
   1.908  msgid "polling: no timeout\n"
   1.909  msgstr ""
   1.910  
   1.911 +#, python-format
   1.912  msgid "polling: %sms timeout\n"
   1.913  msgstr ""
   1.914  
   1.915 +#, python-format
   1.916  msgid "interhg: invalid pattern for %s: %s\n"
   1.917  msgstr ""
   1.918  
   1.919 +#, python-format
   1.920  msgid "interhg: invalid regexp for %s: %s\n"
   1.921  msgstr ""
   1.922  
   1.923 @@ -2080,6 +2232,7 @@
   1.924  msgid "Overwrites selected files expanding/shrinking keywords."
   1.925  msgstr ""
   1.926  
   1.927 +#, python-format
   1.928  msgid "overwriting %s %s keywords\n"
   1.929  msgstr ""
   1.930  
   1.931 @@ -2140,14 +2293,17 @@
   1.932  "    "
   1.933  msgstr ""
   1.934  
   1.935 +#, python-format
   1.936  msgid ""
   1.937  "\n"
   1.938  "\t%s\n"
   1.939  msgstr ""
   1.940  
   1.941 +#, python-format
   1.942  msgid "creating temporary repo at %s\n"
   1.943  msgstr ""
   1.944  
   1.945 +#, python-format
   1.946  msgid ""
   1.947  "\n"
   1.948  "%s keywords written to %s:\n"
   1.949 @@ -2156,6 +2312,7 @@
   1.950  msgid "unhooked all commit hooks\n"
   1.951  msgstr ""
   1.952  
   1.953 +#, python-format
   1.954  msgid ""
   1.955  "\n"
   1.956  "removing temporary repo %s\n"
   1.957 @@ -2282,63 +2439,81 @@
   1.958  "        the field and a blank line."
   1.959  msgstr ""
   1.960  
   1.961 +#, python-format
   1.962  msgid "%s appears more than once in %s"
   1.963  msgstr ""
   1.964  
   1.965  msgid "guard cannot be an empty string"
   1.966  msgstr ""
   1.967  
   1.968 +#, python-format
   1.969  msgid "guard %r starts with invalid character: %r"
   1.970  msgstr ""
   1.971  
   1.972 +#, python-format
   1.973  msgid "invalid character in guard %r: %r"
   1.974  msgstr ""
   1.975  
   1.976 +#, python-format
   1.977  msgid "active guards: %s\n"
   1.978  msgstr ""
   1.979  
   1.980 +#, python-format
   1.981  msgid "guard %r too short"
   1.982  msgstr ""
   1.983  
   1.984 +#, python-format
   1.985  msgid "guard %r starts with invalid char"
   1.986  msgstr ""
   1.987  
   1.988 +#, python-format
   1.989  msgid "allowing %s - no guards in effect\n"
   1.990  msgstr ""
   1.991  
   1.992 +#, python-format
   1.993  msgid "allowing %s - no matching negative guards\n"
   1.994  msgstr ""
   1.995  
   1.996 +#, python-format
   1.997  msgid "allowing %s - guarded by %r\n"
   1.998  msgstr ""
   1.999  
  1.1000 +#, python-format
  1.1001  msgid "skipping %s - guarded by %r\n"
  1.1002  msgstr ""
  1.1003  
  1.1004 +#, python-format
  1.1005  msgid "skipping %s - no matching guards\n"
  1.1006  msgstr ""
  1.1007  
  1.1008 +#, python-format
  1.1009  msgid "error removing undo: %s\n"
  1.1010  msgstr ""
  1.1011  
  1.1012 +#, python-format
  1.1013  msgid "apply failed for patch %s"
  1.1014  msgstr ""
  1.1015  
  1.1016 +#, python-format
  1.1017  msgid "patch didn't work out, merging %s\n"
  1.1018  msgstr ""
  1.1019  
  1.1020 +#, python-format
  1.1021  msgid "update returned %d"
  1.1022  msgstr ""
  1.1023  
  1.1024  msgid "repo commit failed"
  1.1025  msgstr ""
  1.1026  
  1.1027 +#, python-format
  1.1028  msgid "unable to read %s"
  1.1029  msgstr ""
  1.1030  
  1.1031 +#, python-format
  1.1032  msgid "patch %s does not exist\n"
  1.1033  msgstr ""
  1.1034  
  1.1035 +#, python-format
  1.1036  msgid "patch %s is not applied\n"
  1.1037  msgstr ""
  1.1038  
  1.1039 @@ -2350,20 +2525,25 @@
  1.1040  msgid "patch failed, unable to continue (try -v)\n"
  1.1041  msgstr ""
  1.1042  
  1.1043 +#, python-format
  1.1044  msgid "applying %s\n"
  1.1045  msgstr "%s を適用中\n"
  1.1046  
  1.1047 +#, python-format
  1.1048  msgid "Unable to read %s\n"
  1.1049  msgstr ""
  1.1050  
  1.1051 +#, python-format
  1.1052  msgid "imported patch %s\n"
  1.1053  msgstr ""
  1.1054  
  1.1055 +#, python-format
  1.1056  msgid ""
  1.1057  "\n"
  1.1058  "imported patch %s"
  1.1059  msgstr ""
  1.1060  
  1.1061 +#, python-format
  1.1062  msgid "patch %s is empty\n"
  1.1063  msgstr ""
  1.1064  
  1.1065 @@ -2373,18 +2553,22 @@
  1.1066  msgid "fuzz found when applying patch, stopping\n"
  1.1067  msgstr ""
  1.1068  
  1.1069 +#, python-format
  1.1070  msgid "revision %d is not managed"
  1.1071  msgstr ""
  1.1072  
  1.1073 +#, python-format
  1.1074  msgid "cannot delete revision %d above applied patches"
  1.1075  msgstr ""
  1.1076  
  1.1077  msgid "qdelete requires at least one revision or patch name"
  1.1078  msgstr ""
  1.1079  
  1.1080 +#, python-format
  1.1081  msgid "cannot delete applied patch %s"
  1.1082  msgstr ""
  1.1083  
  1.1084 +#, python-format
  1.1085  msgid "patch %s not in series file"
  1.1086  msgstr ""
  1.1087  
  1.1088 @@ -2400,6 +2584,7 @@
  1.1089  msgid "local changes found"
  1.1090  msgstr ""
  1.1091  
  1.1092 +#, python-format
  1.1093  msgid "\"%s\" cannot be used as the name of a patch"
  1.1094  msgstr ""
  1.1095  
  1.1096 @@ -2409,18 +2594,22 @@
  1.1097  "        "
  1.1098  msgstr ""
  1.1099  
  1.1100 +#, python-format
  1.1101  msgid "patch \"%s\" already exists"
  1.1102  msgstr ""
  1.1103  
  1.1104 +#, python-format
  1.1105  msgid "error unlinking %s\n"
  1.1106  msgstr ""
  1.1107  
  1.1108  msgid "returns (index, rev, patch)"
  1.1109  msgstr ""
  1.1110  
  1.1111 +#, python-format
  1.1112  msgid "patch name \"%s\" is ambiguous:\n"
  1.1113  msgstr ""
  1.1114  
  1.1115 +#, python-format
  1.1116  msgid "patch %s not in series"
  1.1117  msgstr ""
  1.1118  
  1.1119 @@ -2430,18 +2619,22 @@
  1.1120  msgid "no patches in series\n"
  1.1121  msgstr ""
  1.1122  
  1.1123 +#, python-format
  1.1124  msgid "cannot push to a previous patch: %s"
  1.1125  msgstr ""
  1.1126  
  1.1127 +#, python-format
  1.1128  msgid "qpush: %s is already at the top\n"
  1.1129  msgstr ""
  1.1130  
  1.1131 +#, python-format
  1.1132  msgid "guarded by %r"
  1.1133  msgstr ""
  1.1134  
  1.1135  msgid "no matching guards"
  1.1136  msgstr ""
  1.1137  
  1.1138 +#, python-format
  1.1139  msgid "cannot push '%s' - %s\n"
  1.1140  msgstr ""
  1.1141  
  1.1142 @@ -2454,24 +2647,29 @@
  1.1143  msgid "cleaning up working directory..."
  1.1144  msgstr ""
  1.1145  
  1.1146 +#, python-format
  1.1147  msgid "errors during apply, please fix and refresh %s\n"
  1.1148  msgstr ""
  1.1149  
  1.1150 +#, python-format
  1.1151  msgid "now at: %s\n"
  1.1152  msgstr ""
  1.1153  
  1.1154 +#, python-format
  1.1155  msgid "patch %s is not applied"
  1.1156  msgstr ""
  1.1157  
  1.1158  msgid "no patches applied\n"
  1.1159  msgstr ""
  1.1160  
  1.1161 +#, python-format
  1.1162  msgid "qpop: %s is already at the top\n"
  1.1163  msgstr ""
  1.1164  
  1.1165  msgid "qpop: forcing dirstate update\n"
  1.1166  msgstr ""
  1.1167  
  1.1168 +#, python-format
  1.1169  msgid "trying to pop unknown node %s"
  1.1170  msgstr ""
  1.1171  
  1.1172 @@ -2495,21 +2693,25 @@
  1.1173  msgid "patch queue directory already exists"
  1.1174  msgstr ""
  1.1175  
  1.1176 +#, python-format
  1.1177  msgid "patch %s is not in series file"
  1.1178  msgstr ""
  1.1179  
  1.1180  msgid "No saved patch data found\n"
  1.1181  msgstr ""
  1.1182  
  1.1183 +#, python-format
  1.1184  msgid "restoring status: %s\n"
  1.1185  msgstr ""
  1.1186  
  1.1187  msgid "save entry has children, leaving it alone\n"
  1.1188  msgstr ""
  1.1189  
  1.1190 +#, python-format
  1.1191  msgid "removing save entry %s\n"
  1.1192  msgstr ""
  1.1193  
  1.1194 +#, python-format
  1.1195  msgid "saved queue repository parents: %s %s\n"
  1.1196  msgstr ""
  1.1197  
  1.1198 @@ -2539,6 +2741,7 @@
  1.1199  "        "
  1.1200  msgstr ""
  1.1201  
  1.1202 +#, python-format
  1.1203  msgid "patch %s is already in the series file"
  1.1204  msgstr ""
  1.1205  
  1.1206 @@ -2548,33 +2751,41 @@
  1.1207  msgid "option \"-n\" not valid when importing multiple patches"
  1.1208  msgstr ""
  1.1209  
  1.1210 +#, python-format
  1.1211  msgid "revision %d is the root of more than one branch"
  1.1212  msgstr ""
  1.1213  
  1.1214 +#, python-format
  1.1215  msgid "revision %d is already managed"
  1.1216  msgstr ""
  1.1217  
  1.1218 +#, python-format
  1.1219  msgid "revision %d is not the parent of the queue"
  1.1220  msgstr ""
  1.1221  
  1.1222 +#, python-format
  1.1223  msgid "revision %d has unmanaged children"
  1.1224  msgstr ""
  1.1225  
  1.1226 +#, python-format
  1.1227  msgid "cannot import merge revision %d"
  1.1228  msgstr ""
  1.1229  
  1.1230 +#, python-format
  1.1231  msgid "revision %d is not the parent of %d"
  1.1232  msgstr ""
  1.1233  
  1.1234  msgid "-e is incompatible with import from -"
  1.1235  msgstr ""
  1.1236  
  1.1237 +#, python-format
  1.1238  msgid "patch %s does not exist"
  1.1239  msgstr ""
  1.1240  
  1.1241  msgid "need --name to import a patch from -"
  1.1242  msgstr ""
  1.1243  
  1.1244 +#, python-format
  1.1245  msgid "adding %s to series file\n"
  1.1246  msgstr ""
  1.1247  
  1.1248 @@ -2765,12 +2976,15 @@
  1.1249  msgid "No patches applied"
  1.1250  msgstr ""
  1.1251  
  1.1252 +#, python-format
  1.1253  msgid "Skipping already folded patch %s"
  1.1254  msgstr ""
  1.1255  
  1.1256 +#, python-format
  1.1257  msgid "qfold cannot fold already applied patch %s"
  1.1258  msgstr ""
  1.1259  
  1.1260 +#, python-format
  1.1261  msgid "Error folding patch %s"
  1.1262  msgstr ""
  1.1263  
  1.1264 @@ -2804,6 +3018,7 @@
  1.1265  msgid "no patch to work with"
  1.1266  msgstr ""
  1.1267  
  1.1268 +#, python-format
  1.1269  msgid "no patch named %s"
  1.1270  msgstr ""
  1.1271  
  1.1272 @@ -2821,6 +3036,7 @@
  1.1273  msgid "no saved queues found, please use -n\n"
  1.1274  msgstr ""
  1.1275  
  1.1276 +#, python-format
  1.1277  msgid "merging with queue at: %s\n"
  1.1278  msgstr ""
  1.1279  
  1.1280 @@ -2833,6 +3049,7 @@
  1.1281  "    "
  1.1282  msgstr ""
  1.1283  
  1.1284 +#, python-format
  1.1285  msgid "using patch queue: %s\n"
  1.1286  msgstr ""
  1.1287  
  1.1288 @@ -2843,9 +3060,11 @@
  1.1289  "    With two arguments, renames PATCH1 to PATCH2."
  1.1290  msgstr ""
  1.1291  
  1.1292 +#, python-format
  1.1293  msgid "%s already exists"
  1.1294  msgstr ""
  1.1295  
  1.1296 +#, python-format
  1.1297  msgid "A patch named %s already exists in the series file"
  1.1298  msgstr ""
  1.1299  
  1.1300 @@ -2855,12 +3074,15 @@
  1.1301  msgid "save current queue state"
  1.1302  msgstr ""
  1.1303  
  1.1304 +#, python-format
  1.1305  msgid "destination %s exists and is not a directory"
  1.1306  msgstr ""
  1.1307  
  1.1308 +#, python-format
  1.1309  msgid "destination %s exists, use -f to force"
  1.1310  msgstr ""
  1.1311  
  1.1312 +#, python-format
  1.1313  msgid "copy %s to %s\n"
  1.1314  msgstr ""
  1.1315  
  1.1316 @@ -2909,9 +3131,11 @@
  1.1317  msgid "guards deactivated\n"
  1.1318  msgstr ""
  1.1319  
  1.1320 +#, python-format
  1.1321  msgid "number of unguarded, unapplied patches has changed from %d to %d\n"
  1.1322  msgstr ""
  1.1323  
  1.1324 +#, python-format
  1.1325  msgid "number of guarded, applied patches has changed from %d to %d\n"
  1.1326  msgstr ""
  1.1327  
  1.1328 @@ -2959,9 +3183,11 @@
  1.1329  msgid "source has mq patches applied"
  1.1330  msgstr ""
  1.1331  
  1.1332 +#, python-format
  1.1333  msgid "mq status file refers to unknown node %s\n"
  1.1334  msgstr ""
  1.1335  
  1.1336 +#, python-format
  1.1337  msgid "Tag %s overrides mq patch of the same name\n"
  1.1338  msgstr ""
  1.1339  
  1.1340 @@ -3284,18 +3510,22 @@
  1.1341  msgid "send message."
  1.1342  msgstr ""
  1.1343  
  1.1344 +#, python-format
  1.1345  msgid "%s: %d new changesets"
  1.1346  msgstr ""
  1.1347  
  1.1348 +#, python-format
  1.1349  msgid "notify: sending %d subscribers %d changes\n"
  1.1350  msgstr ""
  1.1351  
  1.1352 +#, python-format
  1.1353  msgid ""
  1.1354  "\n"
  1.1355  "diffs (truncated from %d to %d lines):\n"
  1.1356  "\n"
  1.1357  msgstr ""
  1.1358  
  1.1359 +#, python-format
  1.1360  msgid ""
  1.1361  "\n"
  1.1362  "diffs (%d lines):\n"
  1.1363 @@ -3309,9 +3539,11 @@
  1.1364  "    changegroup. else send one email per changeset."
  1.1365  msgstr ""
  1.1366  
  1.1367 +#, python-format
  1.1368  msgid "notify: no subscribers to repo %s\n"
  1.1369  msgstr ""
  1.1370  
  1.1371 +#, python-format
  1.1372  msgid "notify: changes have source \"%s\" - skipping\n"
  1.1373  msgstr ""
  1.1374  
  1.1375 @@ -3517,6 +3749,7 @@
  1.1376  "\n"
  1.1377  msgstr ""
  1.1378  
  1.1379 +#, python-format
  1.1380  msgid ""
  1.1381  "This patch series consists of %d patches.\n"
  1.1382  "\n"
  1.1383 @@ -3618,15 +3851,19 @@
  1.1384  "    "
  1.1385  msgstr ""
  1.1386  
  1.1387 +#, python-format
  1.1388  msgid "%s cannot be removed"
  1.1389  msgstr ""
  1.1390  
  1.1391 +#, python-format
  1.1392  msgid "warning: %s\n"
  1.1393  msgstr ""
  1.1394  
  1.1395 +#, python-format
  1.1396  msgid "Removing file %s\n"
  1.1397  msgstr ""
  1.1398  
  1.1399 +#, python-format
  1.1400  msgid "Removing directory %s\n"
  1.1401  msgstr ""
  1.1402  
  1.1403 @@ -3703,6 +3940,7 @@
  1.1404  msgid "rebase completed\n"
  1.1405  msgstr ""
  1.1406  
  1.1407 +#, python-format
  1.1408  msgid "%d revisions have been skipped\n"
  1.1409  msgstr ""
  1.1410  
  1.1411 @@ -3718,18 +3956,22 @@
  1.1412  msgid "Rebase a single revision"
  1.1413  msgstr ""
  1.1414  
  1.1415 +#, python-format
  1.1416  msgid "rebasing %d:%s\n"
  1.1417  msgstr ""
  1.1418  
  1.1419 +#, python-format
  1.1420  msgid " future parents are %d and %d\n"
  1.1421  msgstr ""
  1.1422  
  1.1423 +#, python-format
  1.1424  msgid " update to %d:%s\n"
  1.1425  msgstr ""
  1.1426  
  1.1427  msgid " already in target\n"
  1.1428  msgstr ""
  1.1429  
  1.1430 +#, python-format
  1.1431  msgid " merge against %d:%s\n"
  1.1432  msgstr ""
  1.1433  
  1.1434 @@ -3739,24 +3981,29 @@
  1.1435  msgid "resuming interrupted rebase\n"
  1.1436  msgstr ""
  1.1437  
  1.1438 +#, python-format
  1.1439  msgid "no changes, revision %d skipped\n"
  1.1440  msgstr ""
  1.1441  
  1.1442 +#, python-format
  1.1443  msgid "next revision set to %s\n"
  1.1444  msgstr ""
  1.1445  
  1.1446  msgid "Return the new parent relationship of the revision that will be rebased"
  1.1447  msgstr ""
  1.1448  
  1.1449 +#, python-format
  1.1450  msgid "cannot use revision %d as base, result would have 3 parents"
  1.1451  msgstr ""
  1.1452  
  1.1453  msgid "Update rebased mq patches - finalize and then import them"
  1.1454  msgstr ""
  1.1455  
  1.1456 +#, python-format
  1.1457  msgid "revision %d is an mq patch (%s), finalize it.\n"
  1.1458  msgstr ""
  1.1459  
  1.1460 +#, python-format
  1.1461  msgid "import mq patch %d (%s)\n"
  1.1462  msgstr ""
  1.1463  
  1.1464 @@ -3805,6 +4052,7 @@
  1.1465  msgid "already working on the current branch\n"
  1.1466  msgstr ""
  1.1467  
  1.1468 +#, python-format
  1.1469  msgid "rebase onto %d starting from %d\n"
  1.1470  msgstr ""
  1.1471  
  1.1472 @@ -3880,6 +4128,7 @@
  1.1473  msgid "this is a binary file\n"
  1.1474  msgstr ""
  1.1475  
  1.1476 +#, python-format
  1.1477  msgid "%d hunks, %d lines changed\n"
  1.1478  msgstr ""
  1.1479  
  1.1480 @@ -3950,12 +4199,14 @@
  1.1481  msgid "user quit"
  1.1482  msgstr ""
  1.1483  
  1.1484 +#, python-format
  1.1485  msgid "examine changes to %s?"
  1.1486  msgstr ""
  1.1487  
  1.1488  msgid " and "
  1.1489  msgstr ""
  1.1490  
  1.1491 +#, python-format
  1.1492  msgid "record this change to %r?"
  1.1493  msgstr ""
  1.1494  
  1.1495 @@ -4018,6 +4269,7 @@
  1.1496  msgid "no changes to record\n"
  1.1497  msgstr ""
  1.1498  
  1.1499 +#, python-format
  1.1500  msgid "backup %r as %r\n"
  1.1501  msgstr ""
  1.1502  
  1.1503 @@ -4027,6 +4279,7 @@
  1.1504  msgid "patch failed to apply"
  1.1505  msgstr ""
  1.1506  
  1.1507 +#, python-format
  1.1508  msgid "restoring %r to %r\n"
  1.1509  msgstr ""
  1.1510  
  1.1511 @@ -4053,21 +4306,26 @@
  1.1512  msgid "apply the revisions in revmap one by one in revision order"
  1.1513  msgstr ""
  1.1514  
  1.1515 +#, python-format
  1.1516  msgid "skipping already applied revision %s\n"
  1.1517  msgstr ""
  1.1518  
  1.1519 +#, python-format
  1.1520  msgid "skipping merge changeset %s:%s\n"
  1.1521  msgstr ""
  1.1522  
  1.1523 +#, python-format
  1.1524  msgid "%s merged at %s\n"
  1.1525  msgstr ""
  1.1526  
  1.1527 +#, python-format
  1.1528  msgid "%s transplanted to %s\n"
  1.1529  msgstr ""
  1.1530  
  1.1531  msgid "arbitrarily rewrite changeset before applying it"
  1.1532  msgstr ""
  1.1533  
  1.1534 +#, python-format
  1.1535  msgid "filtering %s\n"
  1.1536  msgstr ""
  1.1537  
  1.1538 @@ -4080,6 +4338,7 @@
  1.1539  msgid "can only omit patchfile if merging"
  1.1540  msgstr ""
  1.1541  
  1.1542 +#, python-format
  1.1543  msgid "%s: empty changeset"
  1.1544  msgstr ""
  1.1545  
  1.1546 @@ -4089,6 +4348,7 @@
  1.1547  msgid "recover last transaction and apply remaining changesets"
  1.1548  msgstr ""
  1.1549  
  1.1550 +#, python-format
  1.1551  msgid "%s transplanted as %s\n"
  1.1552  msgstr ""
  1.1553  
  1.1554 @@ -4098,6 +4358,7 @@
  1.1555  msgid "transplant log file is corrupt"
  1.1556  msgstr ""
  1.1557  
  1.1558 +#, python-format
  1.1559  msgid "working dir not at transplant parent %s"
  1.1560  msgstr ""
  1.1561  
  1.1562 @@ -4234,15 +4495,18 @@
  1.1563  "\n"
  1.1564  msgstr ""
  1.1565  
  1.1566 +#, python-format
  1.1567  msgid "[win32mbcs] filename conversion fail with %s encoding\n"
  1.1568  msgstr ""
  1.1569  
  1.1570  msgid "[win32mbcs] cannot activate on this platform.\n"
  1.1571  msgstr ""
  1.1572  
  1.1573 +#, python-format
  1.1574  msgid "[win32mbcs] activated with encoding: %s\n"
  1.1575  msgstr ""
  1.1576  
  1.1577 +#, python-format
  1.1578  msgid ""
  1.1579  "WARNING: %s already has %s line endings\n"
  1.1580  "and does not need EOL conversion by the win32text plugin.\n"
  1.1581 @@ -4250,12 +4514,15 @@
  1.1582  "Mercurial.ini or %s.\n"
  1.1583  msgstr ""
  1.1584  
  1.1585 +#, python-format
  1.1586  msgid "Attempt to commit or push text file(s) using %s line endings\n"
  1.1587  msgstr ""
  1.1588  
  1.1589 +#, python-format
  1.1590  msgid "in %s: %s\n"
  1.1591  msgstr ""
  1.1592  
  1.1593 +#, python-format
  1.1594  msgid ""
  1.1595  "\n"
  1.1596  "To prevent this mistake in your local repository,\n"
  1.1597 @@ -4306,6 +4573,7 @@
  1.1598  msgid "cannot give prefix when archiving to files"
  1.1599  msgstr ""
  1.1600  
  1.1601 +#, python-format
  1.1602  msgid "unknown archive type '%s'"
  1.1603  msgstr ""
  1.1604  
  1.1605 @@ -4315,69 +4583,94 @@
  1.1606  msgid "unknown parent"
  1.1607  msgstr ""
  1.1608  
  1.1609 +#, python-format
  1.1610  msgid "integrity check failed on %s:%d"
  1.1611  msgstr ""
  1.1612  
  1.1613 +#, python-format
  1.1614  msgid "%s: not a Mercurial bundle file"
  1.1615  msgstr ""
  1.1616  
  1.1617 +#, python-format
  1.1618  msgid "%s: unknown bundle version"
  1.1619  msgstr ""
  1.1620  
  1.1621 +#, python-format
  1.1622  msgid "%s: unknown bundle compression type"
  1.1623  msgstr ""
  1.1624  
  1.1625  msgid "cannot create new bundle repository"
  1.1626  msgstr ""
  1.1627  
  1.1628 +#, python-format
  1.1629  msgid "premature EOF reading chunk (got %d bytes, expected %d)"
  1.1630  msgstr ""
  1.1631  
  1.1632 +#, python-format
  1.1633  msgid "username %s contains a newline"
  1.1634  msgstr ""
  1.1635  
  1.1636  msgid "options --message and --logfile are mutually exclusive"
  1.1637  msgstr ""
  1.1638  
  1.1639 +#, python-format
  1.1640  msgid "can't read commit message '%s': %s"
  1.1641  msgstr ""
  1.1642  
  1.1643 +msgid "limit must be a positive integer"
  1.1644 +msgstr ""
  1.1645 +
  1.1646 +msgid "limit must be positive"
  1.1647 +msgstr ""
  1.1648 +
  1.1649  msgid "too many revisions specified"
  1.1650  msgstr ""
  1.1651  
  1.1652 +#, python-format
  1.1653  msgid "invalid format spec '%%%s' in output file name"
  1.1654  msgstr ""
  1.1655  
  1.1656 +#, python-format
  1.1657  msgid "adding %s\n"
  1.1658  msgstr "%s を追加登録中\n"
  1.1659  
  1.1660 +#, python-format
  1.1661  msgid "removing %s\n"
  1.1662  msgstr "%s を登録解除中\n"
  1.1663  
  1.1664 +#, python-format
  1.1665  msgid "recording removal of %s as rename to %s (%d%% similar)\n"
  1.1666  msgstr ""
  1.1667  
  1.1668 +#, python-format
  1.1669  msgid "%s: not copying - file is not managed\n"
  1.1670  msgstr ""
  1.1671  
  1.1672 +#, python-format
  1.1673  msgid "%s: not copying - file has been marked for remove\n"
  1.1674  msgstr ""
  1.1675  
  1.1676 +#, python-format
  1.1677  msgid "%s: not overwriting - %s collides with %s\n"
  1.1678  msgstr ""
  1.1679  
  1.1680 +#, python-format
  1.1681  msgid "%s: not overwriting - file exists\n"
  1.1682  msgstr ""
  1.1683  
  1.1684 +#, python-format
  1.1685  msgid "%s: deleted in working copy\n"
  1.1686  msgstr ""
  1.1687  
  1.1688 +#, python-format
  1.1689  msgid "%s: cannot copy - %s\n"
  1.1690  msgstr ""
  1.1691  
  1.1692 +#, python-format
  1.1693  msgid "%s %s to %s\n"
  1.1694  msgstr ""
  1.1695  
  1.1696 +#, python-format
  1.1697  msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
  1.1698  msgstr ""
  1.1699  
  1.1700 @@ -4390,6 +4683,7 @@
  1.1701  msgid "with multiple sources, destination must be an existing directory"
  1.1702  msgstr ""
  1.1703  
  1.1704 +#, python-format
  1.1705  msgid "destination %s is not a directory"
  1.1706  msgstr ""
  1.1707  
  1.1708 @@ -4399,24 +4693,31 @@
  1.1709  msgid "(consider using --after)\n"
  1.1710  msgstr ""
  1.1711  
  1.1712 +#, python-format
  1.1713  msgid "changeset:   %d:%s\n"
  1.1714  msgstr ""
  1.1715  
  1.1716 +#, python-format
  1.1717  msgid "branch:      %s\n"
  1.1718  msgstr ""
  1.1719  
  1.1720 +#, python-format
  1.1721  msgid "tag:         %s\n"
  1.1722  msgstr ""
  1.1723  
  1.1724 +#, python-format
  1.1725  msgid "parent:      %d:%s\n"
  1.1726  msgstr ""
  1.1727  
  1.1728 +#, python-format
  1.1729  msgid "manifest:    %d:%s\n"
  1.1730  msgstr ""
  1.1731  
  1.1732 +#, python-format
  1.1733  msgid "user:        %s\n"
  1.1734  msgstr ""
  1.1735  
  1.1736 +#, python-format
  1.1737  msgid "date:        %s\n"
  1.1738  msgstr ""
  1.1739  
  1.1740 @@ -4429,51 +4730,64 @@
  1.1741  msgid "files:"
  1.1742  msgstr ""
  1.1743  
  1.1744 +#, python-format
  1.1745  msgid "files:       %s\n"
  1.1746  msgstr ""
  1.1747  
  1.1748 +#, python-format
  1.1749  msgid "copies:      %s\n"
  1.1750  msgstr ""
  1.1751  
  1.1752 +#, python-format
  1.1753  msgid "extra:       %s=%s\n"
  1.1754  msgstr ""
  1.1755  
  1.1756  msgid "description:\n"
  1.1757  msgstr ""
  1.1758  
  1.1759 +#, python-format
  1.1760  msgid "summary:     %s\n"
  1.1761  msgstr ""
  1.1762  
  1.1763 +#, python-format
  1.1764  msgid "%s: no key named '%s'"
  1.1765  msgstr ""
  1.1766  
  1.1767 +#, python-format
  1.1768  msgid "%s: %s"
  1.1769  msgstr ""
  1.1770  
  1.1771 +#, python-format
  1.1772  msgid "Found revision %s from %s\n"
  1.1773  msgstr ""
  1.1774  
  1.1775  msgid "revision matching date not found"
  1.1776  msgstr ""
  1.1777  
  1.1778 +#, python-format
  1.1779  msgid "cannot follow nonexistent file: \"%s\""
  1.1780  msgstr ""
  1.1781  
  1.1782 +#, python-format
  1.1783  msgid "%s:%s copy source revision cannot be found!\n"
  1.1784  msgstr ""
  1.1785  
  1.1786  msgid "can only follow copies/renames for explicit file names"
  1.1787  msgstr ""
  1.1788  
  1.1789 +#, python-format
  1.1790  msgid "file %s not found!"
  1.1791  msgstr ""
  1.1792  
  1.1793 +#, python-format
  1.1794  msgid "no match under directory %s!"
  1.1795  msgstr ""
  1.1796  
  1.1797 +#, python-format
  1.1798  msgid "can't commit %s: unsupported file type!"
  1.1799  msgstr ""
  1.1800  
  1.1801 +#, python-format
  1.1802  msgid "file %s not tracked!"
  1.1803  msgstr ""
  1.1804  
  1.1805 @@ -4568,6 +4882,7 @@
  1.1806  msgid "at least one of -n/-c is required for -l"
  1.1807  msgstr "-l 指定時には -n/-c のうち最低でもいずれか1つの指定が必要です"
  1.1808  
  1.1809 +#, python-format
  1.1810  msgid "%s: binary file\n"
  1.1811  msgstr "%s: バイナリファイルです\n"
  1.1812  
  1.1813 @@ -4681,18 +4996,22 @@
  1.1814  msgid "cannot back out a merge changeset without --parent"
  1.1815  msgstr "--parent 指定が無いとマージチェンジセットは打ち消せません"
  1.1816  
  1.1817 +#, python-format
  1.1818  msgid "%s is not a parent of %s"
  1.1819  msgstr "%s は %s の親チェンジセットではありません"
  1.1820  
  1.1821  msgid "cannot use --parent on non-merge changeset"
  1.1822  msgstr "非マージチェンジセットには --parent を指定できません"
  1.1823  
  1.1824 +#, python-format
  1.1825  msgid "Backed out changeset %s"
  1.1826  msgstr "チェンジセット %s の打ち消し"
  1.1827  
  1.1828 +#, python-format
  1.1829  msgid "changeset %s backs out changeset %s\n"
  1.1830  msgstr "チェンジセット %s はチェンジセット %s を打ち消します\n"
  1.1831  
  1.1832 +#, python-format
  1.1833  msgid "merging with changeset %s\n"
  1.1834  msgstr "チェンジセット %s とマージ中\n"
  1.1835  
  1.1836 @@ -4749,9 +5068,11 @@
  1.1837  "    bad のマーク付けとみなされます。\n"
  1.1838  "    "
  1.1839  
  1.1840 +#, python-format
  1.1841  msgid "The first %s revision is:\n"
  1.1842  msgstr ""
  1.1843  
  1.1844 +#, python-format
  1.1845  msgid "Due to skipped revisions, the first %s revision could be any of:\n"
  1.1846  msgstr ""
  1.1847  
  1.1848 @@ -4767,15 +5088,19 @@
  1.1849  msgid "incompatible arguments"
  1.1850  msgstr ""
  1.1851  
  1.1852 +#, python-format
  1.1853  msgid "failed to execute %s"
  1.1854  msgstr ""
  1.1855  
  1.1856 +#, python-format
  1.1857  msgid "%s killed"
  1.1858  msgstr ""
  1.1859  
  1.1860 +#, python-format
  1.1861  msgid "Changeset %s: %s\n"
  1.1862  msgstr ""
  1.1863  
  1.1864 +#, python-format
  1.1865  msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n"
  1.1866  msgstr ""
  1.1867  
  1.1868 @@ -4809,12 +5134,14 @@
  1.1869  "    使用してください。\n"
  1.1870  "    "
  1.1871  
  1.1872 +#, python-format
  1.1873  msgid "reset working directory to branch %s\n"
  1.1874  msgstr ""
  1.1875  
  1.1876  msgid "a branch of the same name already exists (use --force to override)"
  1.1877  msgstr ""
  1.1878  
  1.1879 +#, python-format
  1.1880  msgid "marked working directory as branch %s\n"
  1.1881  msgstr ""
  1.1882  
  1.1883 @@ -5042,6 +5369,7 @@
  1.1884  msgid "created new head\n"
  1.1885  msgstr ""
  1.1886  
  1.1887 +#, python-format
  1.1888  msgid "committed changeset %d:%s\n"
  1.1889  msgstr ""
  1.1890  
  1.1891 @@ -5092,15 +5420,19 @@
  1.1892  msgid "validate the correctness of the current dirstate"
  1.1893  msgstr ""
  1.1894  
  1.1895 +#, python-format
  1.1896  msgid "%s in state %s, but not in manifest1\n"
  1.1897  msgstr ""
  1.1898  
  1.1899 +#, python-format
  1.1900  msgid "%s in state %s, but also in manifest1\n"
  1.1901  msgstr ""
  1.1902  
  1.1903 +#, python-format
  1.1904  msgid "%s in state %s, but not in either manifest\n"
  1.1905  msgstr ""
  1.1906  
  1.1907 +#, python-format
  1.1908  msgid "%s in manifest1, but listed as state %s"
  1.1909  msgstr ""
  1.1910  
  1.1911 @@ -5133,12 +5465,14 @@
  1.1912  msgid "show the contents of the current dirstate"
  1.1913  msgstr ""
  1.1914  
  1.1915 +#, python-format
  1.1916  msgid "copy: %s -> %s\n"
  1.1917  msgstr ""
  1.1918  
  1.1919  msgid "dump the contents of a data file revision"
  1.1920  msgstr ""
  1.1921  
  1.1922 +#, python-format
  1.1923  msgid "invalid revision identifier %s"
  1.1924  msgstr ""
  1.1925  
  1.1926 @@ -5154,6 +5488,7 @@
  1.1927  msgid "test Mercurial installation"
  1.1928  msgstr ""
  1.1929  
  1.1930 +#, python-format
  1.1931  msgid "Checking encoding (%s)...\n"
  1.1932  msgstr ""
  1.1933  
  1.1934 @@ -5206,6 +5541,7 @@
  1.1935  msgid " (specify a commit editor in your .hgrc file)\n"
  1.1936  msgstr ""
  1.1937  
  1.1938 +#, python-format
  1.1939  msgid " Can't find editor '%s' in PATH\n"
  1.1940  msgstr ""
  1.1941  
  1.1942 @@ -5218,15 +5554,18 @@
  1.1943  msgid "No problems detected\n"
  1.1944  msgstr ""
  1.1945  
  1.1946 +#, python-format
  1.1947  msgid "%s problems detected, please check your install!\n"
  1.1948  msgstr ""
  1.1949  
  1.1950  msgid "dump rename information"
  1.1951  msgstr ""
  1.1952  
  1.1953 +#, python-format
  1.1954  msgid "%s renamed from %s:%s\n"
  1.1955  msgstr ""
  1.1956  
  1.1957 +#, python-format
  1.1958  msgid "%s not renamed\n"
  1.1959  msgstr ""
  1.1960  
  1.1961 @@ -5280,9 +5619,6 @@
  1.1962  "    詳細は \"hg help diffs\" を参照してください。\n"
  1.1963  "    "
  1.1964  
  1.1965 -msgid "cannot specify --rev and --change at the same time"
  1.1966 -msgstr ""
  1.1967 -
  1.1968  msgid ""
  1.1969  "dump the header and diffs for one or more changesets\n"
  1.1970  "\n"
  1.1971 @@ -5391,6 +5727,7 @@
  1.1972  "    (パターン合致部分の削除は \"-\"、登場は \"+\" を表示することで区別)。\n"
  1.1973  "    "
  1.1974  
  1.1975 +#, python-format
  1.1976  msgid "grep: invalid match pattern: %s\n"
  1.1977  msgstr ""
  1.1978  
  1.1979 @@ -5428,9 +5765,11 @@
  1.1980  "    当該ブランチでの作業はこのチェンジセットを対象とするのが一般的です。\n"
  1.1981  "    "
  1.1982  
  1.1983 +#, python-format
  1.1984  msgid "no changes on branch %s containing %s are reachable from %s\n"
  1.1985  msgstr ""
  1.1986  
  1.1987 +#, python-format
  1.1988  msgid "no changes on branch %s are reachable from %s\n"
  1.1989  msgstr ""
  1.1990  
  1.1991 @@ -5457,9 +5796,11 @@
  1.1992  msgstr ""
  1.1993  "全コマンドの一覧は \"hg help\" で、コマンド詳細は \"hg -v\" で表示されます"
  1.1994  
  1.1995 +#, python-format
  1.1996  msgid "use \"hg -v help%s\" to show aliases and global options"
  1.1997  msgstr "別名およびグローバルオプションは \"hg -v help%s\" で表示されます"
  1.1998  
  1.1999 +#, python-format
  1.2000  msgid "use \"hg -v help %s\" to show global options"
  1.2001  msgstr "グローバルオプションは \"hg -v help %s\" で表示されます"
  1.2002  
  1.2003 @@ -5470,6 +5811,7 @@
  1.2004  "コマンド一覧:\n"
  1.2005  "\n"
  1.2006  
  1.2007 +#, python-format
  1.2008  msgid ""
  1.2009  "\n"
  1.2010  "aliases: %s\n"
  1.2011 @@ -5495,12 +5837,14 @@
  1.2012  "利用可能な拡張機能:\n"
  1.2013  "\n"
  1.2014  
  1.2015 +#, python-format
  1.2016  msgid " %s   %s\n"
  1.2017  msgstr ""
  1.2018  
  1.2019  msgid "no help text available"
  1.2020  msgstr ""
  1.2021  
  1.2022 +#, python-format
  1.2023  msgid "%s extension - %s\n"
  1.2024  msgstr ""
  1.2025  
  1.2026 @@ -5618,6 +5962,7 @@
  1.2027  msgid "no diffs found"
  1.2028  msgstr ""
  1.2029  
  1.2030 +#, python-format
  1.2031  msgid ""
  1.2032  "message:\n"
  1.2033  "%s\n"
  1.2034 @@ -5815,15 +6160,18 @@
  1.2035  "    "
  1.2036  msgstr ""
  1.2037  
  1.2038 +#, python-format
  1.2039  msgid "branch '%s' has %d heads - please merge with an explicit rev"
  1.2040  msgstr ""
  1.2041  
  1.2042 +#, python-format
  1.2043  msgid "branch '%s' has one head - please merge with an explicit rev"
  1.2044  msgstr ""
  1.2045  
  1.2046  msgid "there is nothing to merge"
  1.2047  msgstr ""
  1.2048  
  1.2049 +#, python-format
  1.2050  msgid "%s - use \"hg update\" instead"
  1.2051  msgstr ""
  1.2052  
  1.2053 @@ -5858,14 +6206,16 @@
  1.2054  msgid "can only specify an explicit file name"
  1.2055  msgstr ""
  1.2056  
  1.2057 +#, python-format
  1.2058  msgid "'%s' not found in manifest!"
  1.2059  msgstr ""
  1.2060  
  1.2061  msgid ""
  1.2062  "show aliases for remote repositories\n"
  1.2063  "\n"
  1.2064 -"     Show definition of symbolic path name NAME. If no name is given, show\n"
  1.2065 -"     definition of available names.\n"
  1.2066 +"    Show definition of symbolic path name NAME. If no name is given, show\n"
  1.2067 +"    definition of available names.\n"
  1.2068 +"\n"
  1.2069  "    Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
  1.2070  "    and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n"
  1.2071  "\n"
  1.2072 @@ -5927,6 +6277,7 @@
  1.2073  "    "
  1.2074  msgstr ""
  1.2075  
  1.2076 +#, python-format
  1.2077  msgid "pushing to %s\n"
  1.2078  msgstr ""
  1.2079  
  1.2080 @@ -5986,6 +6337,7 @@
  1.2081  msgid "no files specified"
  1.2082  msgstr ""
  1.2083  
  1.2084 +#, python-format
  1.2085  msgid "not removing %s: file %s (use -f to force removal)\n"
  1.2086  msgstr ""
  1.2087  
  1.2088 @@ -6080,21 +6432,27 @@
  1.2089  msgid "no files or directories specified; use --all to revert the whole repo"
  1.2090  msgstr ""
  1.2091  
  1.2092 +#, python-format
  1.2093  msgid "forgetting %s\n"
  1.2094  msgstr ""
  1.2095  
  1.2096 +#, python-format
  1.2097  msgid "reverting %s\n"
  1.2098  msgstr ""
  1.2099  
  1.2100 +#, python-format
  1.2101  msgid "undeleting %s\n"
  1.2102  msgstr ""
  1.2103  
  1.2104 +#, python-format
  1.2105  msgid "saving current version of %s as %s\n"
  1.2106  msgstr ""
  1.2107  
  1.2108 +#, python-format
  1.2109  msgid "file not managed: %s\n"
  1.2110  msgstr ""
  1.2111  
  1.2112 +#, python-format
  1.2113  msgid "no changes needed to %s\n"
  1.2114  msgstr ""
  1.2115  
  1.2116 @@ -6143,6 +6501,7 @@
  1.2117  "    "
  1.2118  msgstr ""
  1.2119  
  1.2120 +#, python-format
  1.2121  msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
  1.2122  msgstr ""
  1.2123  
  1.2124 @@ -6203,24 +6562,30 @@
  1.2125  msgid "tag names must be unique"
  1.2126  msgstr ""
  1.2127  
  1.2128 +#, python-format
  1.2129  msgid "the name '%s' is reserved"
  1.2130  msgstr ""
  1.2131  
  1.2132  msgid "--rev and --remove are incompatible"
  1.2133  msgstr ""
  1.2134  
  1.2135 +#, python-format
  1.2136  msgid "tag '%s' does not exist"
  1.2137  msgstr ""
  1.2138  
  1.2139 +#, python-format
  1.2140  msgid "tag '%s' is not a %s tag"
  1.2141  msgstr ""
  1.2142  
  1.2143 +#, python-format
  1.2144  msgid "Removed tag %s"
  1.2145  msgstr ""
  1.2146  
  1.2147 +#, python-format
  1.2148  msgid "tag '%s' already exists (use -f to force)"
  1.2149  msgstr ""
  1.2150  
  1.2151 +#, python-format
  1.2152  msgid "Added tag %s for changeset %s"
  1.2153  msgstr ""
  1.2154  
  1.2155 @@ -6298,6 +6663,7 @@
  1.2156  msgid "output version and copyright information"
  1.2157  msgstr ""
  1.2158  
  1.2159 +#, python-format
  1.2160  msgid "Mercurial Distributed SCM (version %s)\n"
  1.2161  msgstr "Mercurial - 分散構成管理ツール(バージョン %s)\n"
  1.2162  
  1.2163 @@ -6611,9 +6977,6 @@
  1.2164  msgid "[OPTION]..."
  1.2165  msgstr ""
  1.2166  
  1.2167 -msgid "change made by revision"
  1.2168 -msgstr ""
  1.2169 -
  1.2170  msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
  1.2171  msgstr ""
  1.2172  
  1.2173 @@ -6949,14 +7312,17 @@
  1.2174  msgid "branch name not in UTF-8!"
  1.2175  msgstr ""
  1.2176  
  1.2177 +#, python-format
  1.2178  msgid "  searching for copies back to rev %d\n"
  1.2179  msgstr ""
  1.2180  
  1.2181 +#, python-format
  1.2182  msgid ""
  1.2183  "  unmatched files in local:\n"
  1.2184  "   %s\n"
  1.2185  msgstr ""
  1.2186  
  1.2187 +#, python-format
  1.2188  msgid ""
  1.2189  "  unmatched files in other:\n"
  1.2190  "   %s\n"
  1.2191 @@ -6965,27 +7331,34 @@
  1.2192  msgid "  all copies found (* = to merge, ! = divergent):\n"
  1.2193  msgstr ""
  1.2194  
  1.2195 +#, python-format
  1.2196  msgid "   %s -> %s %s\n"
  1.2197  msgstr ""
  1.2198  
  1.2199  msgid "  checking for directory renames\n"
  1.2200  msgstr ""
  1.2201  
  1.2202 +#, python-format
  1.2203  msgid "  dir %s -> %s\n"
  1.2204  msgstr ""
  1.2205  
  1.2206 +#, python-format
  1.2207  msgid "  file %s -> %s\n"
  1.2208  msgstr ""
  1.2209  
  1.2210 +#, python-format
  1.2211  msgid "'\\n' and '\\r' disallowed in filenames: %r"
  1.2212  msgstr ""
  1.2213  
  1.2214 +#, python-format
  1.2215  msgid "directory %r already in dirstate"
  1.2216  msgstr ""
  1.2217  
  1.2218 +#, python-format
  1.2219  msgid "file %r in dirstate clashes with %r"
  1.2220  msgstr ""
  1.2221  
  1.2222 +#, python-format
  1.2223  msgid "not in dirstate: %s\n"
  1.2224  msgstr ""
  1.2225  
  1.2226 @@ -7004,38 +7377,49 @@
  1.2227  msgid "directory"
  1.2228  msgstr ""
  1.2229  
  1.2230 +#, python-format
  1.2231  msgid "%s: unsupported file type (type is %s)\n"
  1.2232  msgstr ""
  1.2233  
  1.2234 +#, python-format
  1.2235  msgid "abort: %s\n"
  1.2236  msgstr ""
  1.2237  
  1.2238 +#, python-format
  1.2239  msgid ""
  1.2240  "hg: command '%s' is ambiguous:\n"
  1.2241  "    %s\n"
  1.2242  msgstr ""
  1.2243  
  1.2244 +#, python-format
  1.2245  msgid "timed out waiting for lock held by %s"
  1.2246  msgstr ""
  1.2247  
  1.2248 +#, python-format
  1.2249  msgid "lock held by %s"
  1.2250  msgstr ""
  1.2251  
  1.2252 +#, python-format
  1.2253  msgid "abort: %s: %s\n"
  1.2254  msgstr ""
  1.2255  
  1.2256 +#, python-format
  1.2257  msgid "abort: could not lock %s: %s\n"
  1.2258  msgstr ""
  1.2259  
  1.2260 +#, python-format
  1.2261  msgid "hg %s: %s\n"
  1.2262  msgstr ""
  1.2263  
  1.2264 +#, python-format
  1.2265  msgid "hg: %s\n"
  1.2266  msgstr ""
  1.2267  
  1.2268 +#, python-format
  1.2269  msgid "abort: %s!\n"
  1.2270  msgstr ""
  1.2271  
  1.2272 +#, python-format
  1.2273  msgid "abort: %s"
  1.2274  msgstr ""
  1.2275  
  1.2276 @@ -7045,9 +7429,11 @@
  1.2277  msgid "killed!\n"
  1.2278  msgstr ""
  1.2279  
  1.2280 +#, python-format
  1.2281  msgid "hg: unknown command '%s'\n"
  1.2282  msgstr ""
  1.2283  
  1.2284 +#, python-format
  1.2285  msgid "abort: could not import module %s!\n"
  1.2286  msgstr ""
  1.2287  
  1.2288 @@ -7057,6 +7443,7 @@
  1.2289  msgid "(is your Python install correct?)\n"
  1.2290  msgstr ""
  1.2291  
  1.2292 +#, python-format
  1.2293  msgid "abort: error: %s\n"
  1.2294  msgstr ""
  1.2295  
  1.2296 @@ -7083,15 +7470,19 @@
  1.2297  msgid "** or mercurial@selenic.com\n"
  1.2298  msgstr ""
  1.2299  
  1.2300 +#, python-format
  1.2301  msgid "** Mercurial Distributed SCM (version %s)\n"
  1.2302  msgstr "** Mercurial - 分散構成管理(バージョン %s)\n"
  1.2303  
  1.2304 +#, python-format
  1.2305  msgid "** Extensions loaded: %s\n"
  1.2306  msgstr ""
  1.2307  
  1.2308 +#, python-format
  1.2309  msgid "malformed --config option: %s"
  1.2310  msgstr ""
  1.2311  
  1.2312 +#, python-format
  1.2313  msgid "extension '%s' overrides commands: %s\n"
  1.2314  msgstr ""
  1.2315  
  1.2316 @@ -7106,9 +7497,11 @@
  1.2317  "repository may only be abbreviated as --repo!"
  1.2318  msgstr ""
  1.2319  
  1.2320 +#, python-format
  1.2321  msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
  1.2322  msgstr ""
  1.2323  
  1.2324 +#, python-format
  1.2325  msgid "repository '%s' is not local"
  1.2326  msgstr ""
  1.2327  
  1.2328 @@ -7123,27 +7516,35 @@
  1.2329  "misc/lsprof/"
  1.2330  msgstr ""
  1.2331  
  1.2332 +#, python-format
  1.2333  msgid "*** failed to import extension %s from %s: %s\n"
  1.2334  msgstr ""
  1.2335  
  1.2336 +#, python-format
  1.2337  msgid "*** failed to import extension %s: %s\n"
  1.2338  msgstr ""
  1.2339  
  1.2340 +#, python-format
  1.2341  msgid "couldn't find merge tool %s\n"
  1.2342  msgstr ""
  1.2343  
  1.2344 +#, python-format
  1.2345  msgid "tool %s can't handle symlinks\n"
  1.2346  msgstr ""
  1.2347  
  1.2348 +#, python-format
  1.2349  msgid "tool %s can't handle binary\n"
  1.2350  msgstr ""
  1.2351  
  1.2352 +#, python-format
  1.2353  msgid "tool %s requires a GUI\n"
  1.2354  msgstr ""
  1.2355  
  1.2356 +#, python-format
  1.2357  msgid "picked tool '%s' for %s (binary %s symlink %s)\n"
  1.2358  msgstr ""
  1.2359  
  1.2360 +#, python-format
  1.2361  msgid ""
  1.2362  " no tool found to merge %s\n"
  1.2363  "keep (l)ocal or take (o)ther?"
  1.2364 @@ -7155,18 +7556,22 @@
  1.2365  msgid "l"
  1.2366  msgstr ""
  1.2367  
  1.2368 +#, python-format
  1.2369  msgid "merging %s and %s to %s\n"
  1.2370  msgstr ""
  1.2371  
  1.2372 +#, python-format
  1.2373  msgid "merging %s\n"
  1.2374  msgstr ""
  1.2375  
  1.2376 +#, python-format
  1.2377  msgid "my %s other %s ancestor %s\n"
  1.2378  msgstr ""
  1.2379  
  1.2380  msgid " premerge successful\n"
  1.2381  msgstr ""
  1.2382  
  1.2383 +#, python-format
  1.2384  msgid ""
  1.2385  " output file %s appears unchanged\n"
  1.2386  "was merge successful (yn)?"
  1.2387 @@ -7178,12 +7583,15 @@
  1.2388  msgid "n"
  1.2389  msgstr ""
  1.2390  
  1.2391 +#, python-format
  1.2392  msgid "merging %s failed!\n"
  1.2393  msgstr ""
  1.2394  
  1.2395 +#, python-format
  1.2396  msgid "Inconsistent state, %s:%s is good and bad"
  1.2397  msgstr ""
  1.2398  
  1.2399 +#, python-format
  1.2400  msgid "unknown bisect kind %s"
  1.2401  msgstr ""
  1.2402  
  1.2403 @@ -7606,9 +8014,11 @@
  1.2404  "    "
  1.2405  msgstr ""
  1.2406  
  1.2407 +#, python-format
  1.2408  msgid "destination directory: %s\n"
  1.2409  msgstr ""
  1.2410  
  1.2411 +#, python-format
  1.2412  msgid "destination '%s' already exists"
  1.2413  msgstr ""
  1.2414  
  1.2415 @@ -7635,6 +8045,7 @@
  1.2416  msgid "unresolved"
  1.2417  msgstr ""
  1.2418  
  1.2419 +#, python-format
  1.2420  msgid "%d files %s"
  1.2421  msgstr ""
  1.2422  
  1.2423 @@ -7644,6 +8055,7 @@
  1.2424  msgid "(branch merge, don't forget to commit)\n"
  1.2425  msgstr ""
  1.2426  
  1.2427 +#, python-format
  1.2428  msgid "error reading %s/.hg/hgrc: %s\n"
  1.2429  msgstr ""
  1.2430  
  1.2431 @@ -7653,87 +8065,111 @@
  1.2432  msgid "IPv6 not available on this system"
  1.2433  msgstr ""
  1.2434  
  1.2435 +#, python-format
  1.2436  msgid "cannot start server at '%s:%d': %s"
  1.2437  msgstr ""
  1.2438  
  1.2439 +#, python-format
  1.2440  msgid "calling hook %s: %s\n"
  1.2441  msgstr ""
  1.2442  
  1.2443 +#, python-format
  1.2444  msgid "%s hook is invalid (\"%s\" not in a module)"
  1.2445  msgstr ""
  1.2446  
  1.2447 +#, python-format
  1.2448  msgid "%s hook is invalid (import of \"%s\" failed)"
  1.2449  msgstr ""
  1.2450  
  1.2451 +#, python-format
  1.2452  msgid "%s hook is invalid (\"%s\" is not defined)"
  1.2453  msgstr ""
  1.2454  
  1.2455 +#, python-format
  1.2456  msgid "%s hook is invalid (\"%s\" is not callable)"
  1.2457  msgstr ""
  1.2458  
  1.2459 +#, python-format
  1.2460  msgid "error: %s hook failed: %s\n"
  1.2461  msgstr ""
  1.2462  
  1.2463 +#, python-format
  1.2464  msgid "error: %s hook raised an exception: %s\n"
  1.2465  msgstr ""
  1.2466  
  1.2467 +#, python-format
  1.2468  msgid "%s hook failed"
  1.2469  msgstr ""
  1.2470  
  1.2471 +#, python-format
  1.2472  msgid "warning: %s hook failed\n"
  1.2473  msgstr ""
  1.2474  
  1.2475 +#, python-format
  1.2476  msgid "running hook %s: %s\n"
  1.2477  msgstr ""
  1.2478  
  1.2479 +#, python-format
  1.2480  msgid "%s hook %s"
  1.2481  msgstr ""
  1.2482  
  1.2483 +#, python-format
  1.2484  msgid "warning: %s hook %s\n"
  1.2485  msgstr ""
  1.2486  
  1.2487  msgid "connection ended unexpectedly"
  1.2488  msgstr ""
  1.2489  
  1.2490 +#, python-format
  1.2491  msgid "unsupported URL component: \"%s\""
  1.2492  msgstr ""
  1.2493  
  1.2494 +#, python-format
  1.2495  msgid "using %s\n"
  1.2496  msgstr ""
  1.2497  
  1.2498 +#, python-format
  1.2499  msgid "capabilities: %s\n"
  1.2500  msgstr ""
  1.2501  
  1.2502  msgid "operation not supported over http"
  1.2503  msgstr ""
  1.2504  
  1.2505 +#, python-format
  1.2506  msgid "sending %s command\n"
  1.2507  msgstr ""
  1.2508  
  1.2509 +#, python-format
  1.2510  msgid "sending %s bytes\n"
  1.2511  msgstr ""
  1.2512  
  1.2513  msgid "authorization failed"
  1.2514  msgstr ""
  1.2515  
  1.2516 +#, python-format
  1.2517  msgid "http error while sending %s command\n"
  1.2518  msgstr ""
  1.2519  
  1.2520  msgid "http error, possibly caused by proxy setting"
  1.2521  msgstr ""
  1.2522  
  1.2523 +#, python-format
  1.2524  msgid "real URL is %s\n"
  1.2525  msgstr ""
  1.2526  
  1.2527 +#, python-format
  1.2528  msgid "Requested URL: '%s'\n"
  1.2529  msgstr ""
  1.2530  
  1.2531 +#, python-format
  1.2532  msgid "'%s' does not appear to be an hg repository"
  1.2533  msgstr ""
  1.2534  
  1.2535 +#, python-format
  1.2536  msgid "'%s' sent a broken Content-Type header (%s)"
  1.2537  msgstr ""
  1.2538  
  1.2539 +#, python-format
  1.2540  msgid "'%s' uses newer protocol %s"
  1.2541  msgstr ""
  1.2542  
  1.2543 @@ -7749,6 +8185,7 @@
  1.2544  msgid "push failed (unexpected response):"
  1.2545  msgstr ""
  1.2546  
  1.2547 +#, python-format
  1.2548  msgid "push failed: %s"
  1.2549  msgstr ""
  1.2550  
  1.2551 @@ -7758,42 +8195,53 @@
  1.2552  msgid "cannot create new http repository"
  1.2553  msgstr ""
  1.2554  
  1.2555 +#, python-format
  1.2556  msgid "%s: ignoring invalid syntax '%s'\n"
  1.2557  msgstr ""
  1.2558  
  1.2559 +#, python-format
  1.2560  msgid "skipping unreadable ignore file '%s': %s\n"
  1.2561  msgstr ""
  1.2562  
  1.2563 +#, python-format
  1.2564  msgid "repository %s not found"
  1.2565  msgstr ""
  1.2566  
  1.2567 +#, python-format
  1.2568  msgid "repository %s already exists"
  1.2569  msgstr ""
  1.2570  
  1.2571 +#, python-format
  1.2572  msgid "requirement '%s' not supported"
  1.2573  msgstr ""
  1.2574  
  1.2575 +#, python-format
  1.2576  msgid "%r cannot be used in a tag name"
  1.2577  msgstr ""
  1.2578  
  1.2579  msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
  1.2580  msgstr ""
  1.2581  
  1.2582 +#, python-format
  1.2583  msgid "%s, line %s: %s\n"
  1.2584  msgstr ""
  1.2585  
  1.2586  msgid "cannot parse entry"
  1.2587  msgstr ""
  1.2588  
  1.2589 +#, python-format
  1.2590  msgid "node '%s' is not well formed"
  1.2591  msgstr ""
  1.2592  
  1.2593 +#, python-format
  1.2594  msgid "tag '%s' refers to unknown node"
  1.2595  msgstr ""
  1.2596  
  1.2597 +#, python-format
  1.2598  msgid "unknown revision '%s'"
  1.2599  msgstr ""
  1.2600  
  1.2601 +#, python-format
  1.2602  msgid "filtering %s through %s\n"
  1.2603  msgstr ""
  1.2604  
  1.2605 @@ -7809,42 +8257,47 @@
  1.2606  msgid "rolling back last transaction\n"
  1.2607  msgstr ""
  1.2608  
  1.2609 +#, python-format
  1.2610  msgid "Named branch could not be reset, current branch still is: %s\n"
  1.2611  msgstr ""
  1.2612  
  1.2613  msgid "no rollback information available\n"
  1.2614  msgstr ""
  1.2615  
  1.2616 +#, python-format
  1.2617  msgid "waiting for lock on %s held by %r\n"
  1.2618  msgstr ""
  1.2619  
  1.2620 +#, python-format
  1.2621  msgid "repository %s"
  1.2622  msgstr ""
  1.2623  
  1.2624 +#, python-format
  1.2625  msgid "working directory of %s"
  1.2626  msgstr ""
  1.2627  
  1.2628 +#, python-format
  1.2629  msgid " %s: searching for copy revision for %s\n"
  1.2630  msgstr ""
  1.2631  
  1.2632 +#, python-format
  1.2633  msgid " %s: copy %s:%s\n"
  1.2634  msgstr ""
  1.2635  
  1.2636  msgid "cannot partially commit a merge (do not specify files or patterns)"
  1.2637  msgstr ""
  1.2638  
  1.2639 +#, python-format
  1.2640  msgid "%s not tracked!\n"
  1.2641  msgstr ""
  1.2642  
  1.2643  msgid "unresolved merge conflicts (see hg resolve)"
  1.2644  msgstr ""
  1.2645  
  1.2646 -msgid "closing the default branch is invalid"
  1.2647 -msgstr ""
  1.2648 -
  1.2649  msgid "nothing changed\n"
  1.2650  msgstr ""
  1.2651  
  1.2652 +#, python-format
  1.2653  msgid "trouble committing %s!\n"
  1.2654  msgstr ""
  1.2655  
  1.2656 @@ -7854,59 +8307,75 @@
  1.2657  msgid "empty commit message"
  1.2658  msgstr ""
  1.2659  
  1.2660 +#, python-format
  1.2661  msgid "%s does not exist!\n"
  1.2662  msgstr ""
  1.2663  
  1.2664 +#, python-format
  1.2665  msgid ""
  1.2666  "%s: files over 10MB may cause memory and performance problems\n"
  1.2667  "(use 'hg revert %s' to unadd the file)\n"
  1.2668  msgstr ""
  1.2669  
  1.2670 +#, python-format
  1.2671  msgid "%s not added: only files and symlinks supported currently\n"
  1.2672  msgstr ""
  1.2673  
  1.2674 +#, python-format
  1.2675  msgid "%s already tracked!\n"
  1.2676  msgstr ""
  1.2677  
  1.2678 +#, python-format
  1.2679  msgid "%s not added!\n"
  1.2680  msgstr ""
  1.2681  
  1.2682 +#, python-format
  1.2683  msgid "%s still exists!\n"
  1.2684  msgstr ""
  1.2685  
  1.2686 +#, python-format
  1.2687  msgid "%s not removed!\n"
  1.2688  msgstr ""
  1.2689  
  1.2690 +#, python-format
  1.2691  msgid "copy failed: %s is not a file or a symbolic link\n"
  1.2692  msgstr ""
  1.2693  
  1.2694  msgid "searching for changes\n"
  1.2695  msgstr ""
  1.2696  
  1.2697 +#, python-format
  1.2698  msgid "examining %s:%s\n"
  1.2699  msgstr ""
  1.2700  
  1.2701  msgid "branch already found\n"
  1.2702  msgstr ""
  1.2703  
  1.2704 +#, python-format
  1.2705  msgid "found incomplete branch %s:%s\n"
  1.2706  msgstr ""
  1.2707  
  1.2708 +#, python-format
  1.2709  msgid "found new changeset %s\n"
  1.2710  msgstr ""
  1.2711  
  1.2712 +#, python-format
  1.2713  msgid "request %d: %s\n"
  1.2714  msgstr ""
  1.2715  
  1.2716 +#, python-format
  1.2717  msgid "received %s:%s\n"
  1.2718  msgstr ""
  1.2719  
  1.2720 +#, python-format
  1.2721  msgid "narrowing %d:%d %s\n"
  1.2722  msgstr ""
  1.2723  
  1.2724 +#, python-format
  1.2725  msgid "found new branch changeset %s\n"
  1.2726  msgstr ""
  1.2727  
  1.2728 +#, python-format
  1.2729  msgid "narrowed branch search to %s:%s\n"
  1.2730  msgstr ""
  1.2731  
  1.2732 @@ -7922,6 +8391,7 @@
  1.2733  msgid "found new changesets starting at "
  1.2734  msgstr ""
  1.2735  
  1.2736 +#, python-format
  1.2737  msgid "%d total queries\n"
  1.2738  msgstr ""
  1.2739  
  1.2740 @@ -7945,15 +8415,18 @@
  1.2741  msgid "note: unsynced remote changes!\n"
  1.2742  msgstr ""
  1.2743  
  1.2744 +#, python-format
  1.2745  msgid "%d changesets found\n"
  1.2746  msgstr ""
  1.2747  
  1.2748  msgid "list of changesets:\n"
  1.2749  msgstr ""
  1.2750  
  1.2751 +#, python-format
  1.2752  msgid "empty or missing revlog for %s"
  1.2753  msgstr ""
  1.2754  
  1.2755 +#, python-format
  1.2756  msgid "add changeset %s\n"
  1.2757  msgstr ""
  1.2758  
  1.2759 @@ -7969,15 +8442,18 @@
  1.2760  msgid "adding file changes\n"
  1.2761  msgstr ""
  1.2762  
  1.2763 +#, python-format
  1.2764  msgid "adding %s revisions\n"
  1.2765  msgstr ""
  1.2766  
  1.2767  msgid "received file revlog group is empty"
  1.2768  msgstr ""
  1.2769  
  1.2770 +#, python-format
  1.2771  msgid " (%+d heads)"
  1.2772  msgstr ""
  1.2773  
  1.2774 +#, python-format
  1.2775  msgid "added %d changesets with %d changes to %d files%s\n"
  1.2776  msgstr ""
  1.2777  
  1.2778 @@ -7999,18 +8475,22 @@
  1.2779  msgid "streaming all changes\n"
  1.2780  msgstr ""
  1.2781  
  1.2782 +#, python-format
  1.2783  msgid "%d files to transfer, %s of data\n"
  1.2784  msgstr ""
  1.2785  
  1.2786 +#, python-format
  1.2787  msgid "adding %s (%s)\n"
  1.2788  msgstr ""
  1.2789  
  1.2790 +#, python-format
  1.2791  msgid "transferred %s in %.1f seconds (%s/sec)\n"
  1.2792  msgstr ""
  1.2793  
  1.2794  msgid "no [smtp]host in hgrc - cannot send mail"
  1.2795  msgstr ""
  1.2796  
  1.2797 +#, python-format
  1.2798  msgid "sending mail: smtp host %s, port %s\n"
  1.2799  msgstr ""
  1.2800  
  1.2801 @@ -8020,58 +8500,72 @@
  1.2802  msgid "(using tls)\n"
  1.2803  msgstr ""
  1.2804  
  1.2805 +#, python-format
  1.2806  msgid "(authenticating to mail server as %s)\n"
  1.2807  msgstr ""
  1.2808  
  1.2809 +#, python-format
  1.2810  msgid "sending mail: %s\n"
  1.2811  msgstr ""
  1.2812  
  1.2813  msgid "smtp specified as email transport, but no smtp host configured"
  1.2814  msgstr ""
  1.2815  
  1.2816 +#, python-format
  1.2817  msgid "%r specified as email transport, but not in PATH"
  1.2818  msgstr ""
  1.2819  
  1.2820 +#, python-format
  1.2821  msgid "ignoring invalid sendcharset: %s\n"
  1.2822  msgstr ""
  1.2823  
  1.2824 +#, python-format
  1.2825  msgid "invalid email address: %s"
  1.2826  msgstr ""
  1.2827  
  1.2828 +#, python-format
  1.2829  msgid "invalid local address: %s"
  1.2830  msgstr ""
  1.2831  
  1.2832  msgid "'\\n' and '\\r' disallowed in filenames"
  1.2833  msgstr ""
  1.2834  
  1.2835 +#, python-format
  1.2836  msgid "failed to remove %s from manifest"
  1.2837  msgstr ""
  1.2838  
  1.2839 +#, python-format
  1.2840  msgid "diff context lines count must be an integer, not %r"
  1.2841  msgstr ""
  1.2842  
  1.2843 +#, python-format
  1.2844  msgid ""
  1.2845  "untracked file in working directory differs from file in requested revision: "
  1.2846  "'%s'"
  1.2847  msgstr ""
  1.2848  
  1.2849 +#, python-format
  1.2850  msgid "case-folding collision between %s and %s"
  1.2851  msgstr ""
  1.2852  
  1.2853  msgid "resolving manifests\n"
  1.2854  msgstr ""
  1.2855  
  1.2856 +#, python-format
  1.2857  msgid " overwrite %s partial %s\n"
  1.2858  msgstr ""
  1.2859  
  1.2860 +#, python-format
  1.2861  msgid " ancestor %s local %s remote %s\n"
  1.2862  msgstr ""
  1.2863  
  1.2864 +#, python-format
  1.2865  msgid ""
  1.2866  " conflicting flags for %s\n"
  1.2867  "(n)one, e(x)ec or sym(l)ink?"
  1.2868  msgstr ""
  1.2869  
  1.2870 +#, python-format
  1.2871  msgid ""
  1.2872  " local changed %s which remote deleted\n"
  1.2873  "use (c)hanged version or (d)elete?"
  1.2874 @@ -8083,29 +8577,37 @@
  1.2875  msgid "c"
  1.2876  msgstr ""
  1.2877  
  1.2878 +#, python-format
  1.2879  msgid ""
  1.2880  "remote changed %s which local deleted\n"
  1.2881  "use (c)hanged version or leave (d)eleted?"
  1.2882  msgstr ""
  1.2883  
  1.2884 +#, python-format
  1.2885  msgid "preserving %s for resolve of %s\n"
  1.2886  msgstr ""
  1.2887  
  1.2888 +#, python-format
  1.2889  msgid "update failed to remove %s: %s!\n"
  1.2890  msgstr ""
  1.2891  
  1.2892 +#, python-format
  1.2893  msgid "getting %s\n"
  1.2894  msgstr ""
  1.2895  
  1.2896 +#, python-format
  1.2897  msgid "moving %s to %s\n"
  1.2898  msgstr ""
  1.2899  
  1.2900 +#, python-format
  1.2901  msgid "getting %s to %s\n"
  1.2902  msgstr ""
  1.2903  
  1.2904 +#, python-format
  1.2905  msgid "warning: detected divergent renames of %s to:\n"
  1.2906  msgstr ""
  1.2907  
  1.2908 +#, python-format
  1.2909  msgid "branch %s not found"
  1.2910  msgstr ""
  1.2911  
  1.2912 @@ -8124,87 +8626,111 @@
  1.2913  msgid "crosses named branches (use 'hg update -C' to discard changes)"
  1.2914  msgstr ""
  1.2915  
  1.2916 +#, python-format
  1.2917  msgid "cannot create %s: destination already exists"
  1.2918  msgstr ""
  1.2919  
  1.2920 +#, python-format
  1.2921  msgid "cannot create %s: unable to create destination directory"
  1.2922  msgstr ""
  1.2923  
  1.2924 +#, python-format
  1.2925  msgid "found patch at byte %d\n"
  1.2926  msgstr ""
  1.2927  
  1.2928  msgid "patch generated by hg export\n"
  1.2929  msgstr ""
  1.2930  
  1.2931 +#, python-format
  1.2932  msgid "unable to find '%s' for patching\n"
  1.2933  msgstr ""
  1.2934  
  1.2935 +#, python-format
  1.2936  msgid "patching file %s\n"
  1.2937  msgstr ""
  1.2938  
  1.2939 +#, python-format
  1.2940  msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
  1.2941  msgstr ""
  1.2942  
  1.2943 +#, python-format
  1.2944  msgid "bad hunk #%d %s (%d %d %d %d)"
  1.2945  msgstr ""
  1.2946  
  1.2947 +#, python-format
  1.2948  msgid "file %s already exists\n"
  1.2949  msgstr ""
  1.2950  
  1.2951 +#, python-format
  1.2952  msgid "Hunk #%d succeeded at %d %s(offset %d %s).\n"
  1.2953  msgstr ""
  1.2954  
  1.2955 +#, python-format
  1.2956  msgid "Hunk #%d FAILED at %d\n"
  1.2957  msgstr ""
  1.2958  
  1.2959 +#, python-format
  1.2960  msgid "bad hunk #%d"
  1.2961  msgstr ""
  1.2962  
  1.2963 +#, python-format
  1.2964  msgid "bad hunk #%d old text line %d"
  1.2965  msgstr ""
  1.2966  
  1.2967  msgid "could not extract binary patch"
  1.2968  msgstr ""
  1.2969  
  1.2970 +#, python-format
  1.2971  msgid "binary patch is %d bytes, not %d"
  1.2972  msgstr ""
  1.2973  
  1.2974 +#, python-format
  1.2975  msgid "unable to strip away %d dirs from %s"
  1.2976  msgstr ""
  1.2977  
  1.2978  msgid "undefined source and destination files"
  1.2979  msgstr ""
  1.2980  
  1.2981 +#, python-format
  1.2982  msgid "malformed patch %s %s"
  1.2983  msgstr ""
  1.2984  
  1.2985 +#, python-format
  1.2986  msgid "unsupported parser state: %s"
  1.2987  msgstr ""
  1.2988  
  1.2989 +#, python-format
  1.2990  msgid "patch command failed: %s"
  1.2991  msgstr ""
  1.2992  
  1.2993 +#, python-format
  1.2994  msgid "no valid hunks found; trying with %r instead\n"
  1.2995  msgstr ""
  1.2996  
  1.2997 +#, python-format
  1.2998  msgid "saving bundle to %s\n"
  1.2999  msgstr ""
  1.3000  
  1.3001  msgid "adding branch\n"
  1.3002  msgstr ""
  1.3003  
  1.3004 +#, python-format
  1.3005  msgid "cannot %s; remote repository does not support the %r capability"
  1.3006  msgstr ""
  1.3007  
  1.3008 +#, python-format
  1.3009  msgid "unknown compression type %r"
  1.3010  msgstr ""
  1.3011  
  1.3012 +#, python-format
  1.3013  msgid "index %s unknown flags %#04x for format v0"
  1.3014  msgstr ""
  1.3015  
  1.3016 +#, python-format
  1.3017  msgid "index %s unknown flags %#04x for revlogng"
  1.3018  msgstr ""
  1.3019  
  1.3020 +#, python-format
  1.3021  msgid "index %s unknown format %d"
  1.3022  msgstr ""
  1.3023  
  1.3024 @@ -8217,9 +8743,11 @@
  1.3025  msgid "no match found"
  1.3026  msgstr ""
  1.3027  
  1.3028 +#, python-format
  1.3029  msgid "incompatible revision flag %x"
  1.3030  msgstr ""
  1.3031  
  1.3032 +#, python-format
  1.3033  msgid "%s not found in the transaction"
  1.3034  msgstr ""
  1.3035  
  1.3036 @@ -8229,6 +8757,7 @@
  1.3037  msgid "consistency error adding group"
  1.3038  msgstr ""
  1.3039  
  1.3040 +#, python-format
  1.3041  msgid "%s looks like a binary file."
  1.3042  msgstr ""
  1.3043  
  1.3044 @@ -8238,6 +8767,7 @@
  1.3045  msgid "warning: conflicts during merge.\n"
  1.3046  msgstr ""
  1.3047  
  1.3048 +#, python-format
  1.3049  msgid "couldn't parse location %s"
  1.3050  msgstr ""
  1.3051  
  1.3052 @@ -8250,6 +8780,7 @@
  1.3053  msgid "no suitable response from remote hg"
  1.3054  msgstr ""
  1.3055  
  1.3056 +#, python-format
  1.3057  msgid "push refused: %s"
  1.3058  msgstr ""
  1.3059  
  1.3060 @@ -8262,69 +8793,85 @@
  1.3061  msgid "cannot create new static-http repository"
  1.3062  msgstr ""
  1.3063  
  1.3064 +#, python-format
  1.3065  msgid "invalid entry in fncache, line %s"
  1.3066  msgstr ""
  1.3067  
  1.3068  msgid "scanning\n"
  1.3069  msgstr ""
  1.3070  
  1.3071 +#, python-format
  1.3072  msgid "%d files, %d bytes to transfer\n"
  1.3073  msgstr ""
  1.3074  
  1.3075 +#, python-format
  1.3076  msgid "sending %s (%d bytes)\n"
  1.3077  msgstr ""
  1.3078  
  1.3079  msgid "unmatched quotes"
  1.3080  msgstr ""
  1.3081  
  1.3082 +#, python-format
  1.3083  msgid "style not found: %s"
  1.3084  msgstr ""
  1.3085  
  1.3086 +#, python-format
  1.3087  msgid "%s:%s: parse error"
  1.3088  msgstr ""
  1.3089  
  1.3090 +#, python-format
  1.3091  msgid "template file %s: %s"
  1.3092  msgstr ""
  1.3093  
  1.3094 +#, python-format
  1.3095  msgid "Error expanding '%s%%%s'"
  1.3096  msgstr ""
  1.3097  
  1.3098  msgid "transaction abort!\n"
  1.3099  msgstr ""
  1.3100  
  1.3101 +#, python-format
  1.3102  msgid "failed to truncate %s\n"
  1.3103  msgstr ""
  1.3104  
  1.3105  msgid "rollback completed\n"
  1.3106  msgstr ""
  1.3107  
  1.3108 +#, python-format
  1.3109  msgid "Not trusting file %s from untrusted user %s, group %s\n"
  1.3110  msgstr ""
  1.3111  
  1.3112 +#, python-format
  1.3113  msgid ""
  1.3114  "Failed to parse %s\n"
  1.3115  "%s"
  1.3116  msgstr ""
  1.3117  
  1.3118 +#, python-format
  1.3119  msgid "Ignored: %s\n"
  1.3120  msgstr ""
  1.3121  
  1.3122 +#, python-format
  1.3123  msgid "unable to open %s: %s"
  1.3124  msgstr ""
  1.3125  
  1.3126 +#, python-format
  1.3127  msgid ""
  1.3128  "failed to parse %s\n"
  1.3129  "%s"
  1.3130  msgstr ""
  1.3131  
  1.3132 +#, python-format
  1.3133  msgid ""
  1.3134  "Error in configuration section [%s] parameter '%s':\n"
  1.3135  "%s"
  1.3136  msgstr ""
  1.3137  
  1.3138 +#, python-format
  1.3139  msgid "Ignoring untrusted configuration option %s.%s = %s\n"
  1.3140  msgstr ""
  1.3141  
  1.3142 +#, python-format
  1.3143  msgid ""
  1.3144  "Error in configuration section [%s]:\n"
  1.3145  "%s"
  1.3146 @@ -8333,12 +8880,14 @@
  1.3147  msgid "enter a commit username:"
  1.3148  msgstr ""
  1.3149  
  1.3150 +#, python-format
  1.3151  msgid "No username found, using '%s' instead\n"
  1.3152  msgstr ""
  1.3153  
  1.3154  msgid "Please specify a username."
  1.3155  msgstr ""
  1.3156  
  1.3157 +#, python-format
  1.3158  msgid "username %s contains a newline\n"
  1.3159  msgstr ""
  1.3160  
  1.3161 @@ -8360,33 +8909,42 @@
  1.3162  msgid "http authorization required\n"
  1.3163  msgstr ""
  1.3164  
  1.3165 +#, python-format
  1.3166  msgid "realm: %s\n"
  1.3167  msgstr ""
  1.3168  
  1.3169 +#, python-format
  1.3170  msgid "user: %s\n"
  1.3171  msgstr ""
  1.3172  
  1.3173  msgid "user:"
  1.3174  msgstr ""
  1.3175  
  1.3176 +#, python-format
  1.3177  msgid "proxying through http://%s:%s\n"
  1.3178  msgstr ""
  1.3179  
  1.3180 +#, python-format
  1.3181  msgid "http auth: user %s, password %s\n"
  1.3182  msgstr ""
  1.3183  
  1.3184 +#, python-format
  1.3185  msgid "%s, please check your locale settings"
  1.3186  msgstr ""
  1.3187  
  1.3188 +#, python-format
  1.3189  msgid "command '%s' failed: %s"
  1.3190  msgstr ""
  1.3191  
  1.3192 +#, python-format
  1.3193  msgid "path contains illegal component: %s"
  1.3194  msgstr ""
  1.3195  
  1.3196 +#, python-format
  1.3197  msgid "path %r is inside repo %r"
  1.3198  msgstr ""
  1.3199  
  1.3200 +#, python-format
  1.3201  msgid "path %r traverses symbolic link %r"
  1.3202  msgstr ""
  1.3203  
  1.3204 @@ -8396,60 +8954,78 @@
  1.3205  msgid "user name not available - set USERNAME environment variable"
  1.3206  msgstr ""
  1.3207  
  1.3208 +#, python-format
  1.3209  msgid "exited with status %d"
  1.3210  msgstr ""
  1.3211  
  1.3212 +#, python-format
  1.3213  msgid "killed by signal %d"
  1.3214  msgstr ""
  1.3215  
  1.3216 +#, python-format
  1.3217  msgid "stopped by signal %d"
  1.3218  msgstr ""
  1.3219  
  1.3220  msgid "invalid exit code"
  1.3221  msgstr ""
  1.3222  
  1.3223 +#, python-format
  1.3224  msgid "could not symlink to %r: %s"
  1.3225  msgstr ""
  1.3226  
  1.3227 +#, python-format
  1.3228  msgid "invalid date: %r "
  1.3229  msgstr ""
  1.3230  
  1.3231 +#, python-format
  1.3232  msgid "date exceeds 32 bits: %d"
  1.3233  msgstr ""
  1.3234  
  1.3235 +#, python-format
  1.3236  msgid "impossible time zone offset: %d"
  1.3237  msgstr ""
  1.3238  
  1.3239 +#, python-format
  1.3240  msgid "invalid day spec: %s"
  1.3241  msgstr ""
  1.3242  
  1.3243 +#, python-format
  1.3244  msgid "%.0f GB"
  1.3245  msgstr ""
  1.3246  
  1.3247 +#, python-format
  1.3248  msgid "%.1f GB"
  1.3249  msgstr ""
  1.3250  
  1.3251 +#, python-format
  1.3252  msgid "%.2f GB"
  1.3253  msgstr ""
  1.3254  
  1.3255 +#, python-format
  1.3256  msgid "%.0f MB"
  1.3257  msgstr ""
  1.3258  
  1.3259 +#, python-format
  1.3260  msgid "%.1f MB"
  1.3261  msgstr ""
  1.3262  
  1.3263 +#, python-format
  1.3264  msgid "%.2f MB"
  1.3265  msgstr ""
  1.3266  
  1.3267 +#, python-format
  1.3268  msgid "%.0f KB"
  1.3269  msgstr ""
  1.3270  
  1.3271 +#, python-format
  1.3272  msgid "%.1f KB"
  1.3273  msgstr ""
  1.3274  
  1.3275 +#, python-format
  1.3276  msgid "%.2f KB"
  1.3277  msgstr ""
  1.3278  
  1.3279 +#, python-format
  1.3280  msgid "%.0f bytes"
  1.3281  msgstr ""
  1.3282  
  1.3283 @@ -8459,45 +9035,58 @@
  1.3284  msgid "interrupted"
  1.3285  msgstr ""
  1.3286  
  1.3287 +#, python-format
  1.3288  msgid "empty or missing %s"
  1.3289  msgstr ""
  1.3290  
  1.3291 +#, python-format
  1.3292  msgid "data length off by %d bytes"
  1.3293  msgstr ""
  1.3294  
  1.3295 +#, python-format
  1.3296  msgid "index contains %d extra bytes"
  1.3297  msgstr ""
  1.3298  
  1.3299 +#, python-format
  1.3300  msgid "warning: `%s' uses revlog format 1"
  1.3301  msgstr ""
  1.3302  
  1.3303 +#, python-format
  1.3304  msgid "warning: `%s' uses revlog format 0"
  1.3305  msgstr ""
  1.3306  
  1.3307 +#, python-format
  1.3308  msgid "rev %d point to %s changeset %d"
  1.3309  msgstr ""
  1.3310  
  1.3311 +#, python-format
  1.3312  msgid " (expected %s)"
  1.3313  msgstr ""
  1.3314  
  1.3315 +#, python-format
  1.3316  msgid "unknown parent 1 %s of %s"
  1.3317  msgstr ""
  1.3318  
  1.3319 +#, python-format
  1.3320  msgid "unknown parent 2 %s of %s"
  1.3321  msgstr ""
  1.3322  
  1.3323 +#, python-format
  1.3324  msgid "checking parents of %s"
  1.3325  msgstr ""
  1.3326  
  1.3327 +#, python-format
  1.3328  msgid "duplicate revision %d (%d)"
  1.3329  msgstr ""
  1.3330  
  1.3331 +#, python-format
  1.3332  msgid "repository uses revlog format %d\n"
  1.3333  msgstr ""
  1.3334  
  1.3335  msgid "checking changesets\n"
  1.3336  msgstr ""
  1.3337  
  1.3338 +#, python-format
  1.3339  msgid "unpacking changeset %s"
  1.3340  msgstr ""
  1.3341  
  1.3342 @@ -8507,12 +9096,14 @@
  1.3343  msgid "file without name in manifest"
  1.3344  msgstr ""
  1.3345  
  1.3346 +#, python-format
  1.3347  msgid "reading manifest delta %s"
  1.3348  msgstr ""
  1.3349  
  1.3350  msgid "crosschecking files in changesets and manifests\n"
  1.3351  msgstr ""
  1.3352  
  1.3353 +#, python-format
  1.3354  msgid "changeset refers to unknown manifest %s"
  1.3355  msgstr ""
  1.3356  
  1.3357 @@ -8525,44 +9116,57 @@
  1.3358  msgid "checking files\n"
  1.3359  msgstr ""
  1.3360  
  1.3361 +#, python-format
  1.3362  msgid "cannot decode filename '%s'"
  1.3363  msgstr ""
  1.3364  
  1.3365  msgid "missing revlog!"
  1.3366  msgstr ""
  1.3367  
  1.3368 +#, python-format
  1.3369  msgid "%s not in manifests"
  1.3370  msgstr ""
  1.3371  
  1.3372 +#, python-format
  1.3373  msgid "unpacked size is %s, %s expected"
  1.3374  msgstr ""
  1.3375  
  1.3376 +#, python-format
  1.3377  msgid "unpacking %s"
  1.3378  msgstr ""
  1.3379  
  1.3380 +#, python-format
  1.3381  msgid "empty or missing copy source revlog %s:%s"
  1.3382  msgstr ""
  1.3383  
  1.3384 +#, python-format
  1.3385  msgid "warning: %s@%s: copy source revision is nullid %s:%s"
  1.3386  msgstr ""
  1.3387  
  1.3388 +#, python-format
  1.3389  msgid "checking rename of %s"
  1.3390  msgstr ""
  1.3391  
  1.3392 +#, python-format
  1.3393  msgid "%s in manifests not found"
  1.3394  msgstr ""
  1.3395  
  1.3396 +#, python-format
  1.3397  msgid "warning: orphan revlog '%s'"
  1.3398  msgstr ""
  1.3399  
  1.3400 +#, python-format
  1.3401  msgid "%d files, %d changesets, %d total revisions\n"
  1.3402  msgstr ""
  1.3403  
  1.3404 +#, python-format
  1.3405  msgid "%d warnings encountered!\n"
  1.3406  msgstr ""
  1.3407  
  1.3408 +#, python-format
  1.3409  msgid "%d integrity errors encountered!\n"
  1.3410  msgstr ""
  1.3411  
  1.3412 +#, python-format
  1.3413  msgid "(first damaged changeset appears to be %d)\n"
  1.3414  msgstr ""