# # patch "ChangeLog" # from [21f358c4f2b88df24de2438add559bd6f2396e25] # to [bb4474cbd1e6866ae9320a7b77ddeabedbede2ba] # # patch "po/monotone.pot" # from [1de6d583ca9692c328783bffa98cdd91cb8d85cb] # to [05a052f738354bc65df04af3ac89d752eec2af28] # --- ChangeLog +++ ChangeLog @@ -1,5 +1,9 @@ 2005-07-05 Nathaniel Smith + * po/monotone.pot: Regenerate for release. + +2005-07-05 Nathaniel Smith + * configure.ac, debian/changelog, monotone.spec: Bump version number. * UPGRADE: Update for 0.20 release. --- po/monotone.pot +++ po/monotone.pot @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: address@hidden" -"POT-Creation-Date: 2005-05-03 14:22-0700\n" +"POT-Creation-Date: 2005-07-05 20:05-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,128 +16,142 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: app_state.cc:54 +#: app_state.cc:56 #, c-format msgid "initializing from directory %s\n" msgstr "" -#: app_state.cc:55 +#: app_state.cc:57 #, c-format msgid "found working copy directory %s\n" msgstr "" -#: app_state.cc:57 +#: app_state.cc:59 #, c-format msgid "cannot change to directory to %s\n" msgstr "" -#: app_state.cc:65 +#: app_state.cc:67 #, c-format msgid "branch name is '%s'\n" msgstr "" -#: app_state.cc:71 +#: app_state.cc:73 #, c-format msgid "relative directory is '%s'\n" msgstr "" -#: app_state.cc:78 +#: app_state.cc:80 #, c-format msgid "setting dump path to %s\n" msgstr "" -#: app_state.cc:88 +#: app_state.cc:90 msgid "working copy directory required but not found" msgstr "" -#: app_state.cc:95 +#: app_state.cc:97 msgid "invalid directory ''" msgstr "" -#: app_state.cc:99 +#: app_state.cc:101 #, c-format msgid "cannot change to initial directory %s\n" msgstr "" -#: app_state.cc:103 +#: app_state.cc:105 #, c-format msgid "create working copy in %s\n" msgstr "" -#: app_state.cc:114 +#: app_state.cc:116 #, c-format msgid "could not create directory: %s: %s\n" msgstr "" -#: app_state.cc:119 +#: app_state.cc:121 #, c-format msgid "cannot change to new directory %s\n" msgstr "" -#: app_state.cc:128 +#: app_state.cc:130 #, c-format msgid "monotone book-keeping directory '%s' already exists in '%s'\n" msgstr "" -#: app_state.cc:131 +#: app_state.cc:133 #, c-format msgid "creating book-keeping directory '%s' for working copy in '%s'\n" msgstr "" -#: app_state.cc:153 +#: app_state.cc:155 #, c-format msgid "'%s' prefixed to '%s'\n" msgstr "" -#: app_state.cc:170 +#: app_state.cc:174 #, c-format msgid "'%s' ignored by restricted path set\n" msgstr "" -#: app_state.cc:175 +#: app_state.cc:179 #, c-format msgid "unknown path '%s'\n" msgstr "" -#: app_state.cc:177 +#: app_state.cc:181 #, c-format msgid "'%s' added to restricted path set\n" msgstr "" -#: app_state.cc:207 +#: app_state.cc:222 #, c-format msgid "checking restricted path set for '%s'\n" msgstr "" -#: app_state.cc:214 +#: app_state.cc:229 #, c-format msgid "path '%s' found in restricted path set; '%s' included\n" msgstr "" -#: app_state.cc:220 +#: app_state.cc:235 #, c-format msgid "path '%s' not found in restricted path set; '%s' excluded\n" msgstr "" -#: app_state.cc:264 +#: app_state.cc:287 #, c-format msgid "search root '%s' does not exist\n" msgstr "" -#: app_state.cc:266 +#: app_state.cc:289 #, c-format msgid "search root '%s' is not a directory\n" msgstr "" -#: app_state.cc:267 +#: app_state.cc:290 #, c-format msgid "set search root to %s\n" msgstr "" -#: app_state.cc:292 -msgid "negative or zero depth not allowed\n" +#: app_state.cc:321 +msgid "negative depth not allowed\n" msgstr "" +#: app_state.cc:329 +msgid "negative or zero last not allowed\n" +msgstr "" + +#: app_state.cc:419 +#, c-format +msgid "Failed to read options file %s" +msgstr "" + +#: app_state.cc:436 +#, c-format +msgid "Failed to write options file %s" +msgstr "" + #: basic_io.cc:26 #, c-format msgid "error in %s:%d:%d:E: %s" @@ -148,1069 +162,1085 @@ msgid "%s:%d:%d:E: %s" msgstr "" -#: cert.cc:46 +#: cert.cc:49 msgid "cert ok\n" msgstr "" -#: cert.cc:53 +#: cert.cc:56 #, c-format msgid "ignoring bad signature by '%s' on '%s'\n" msgstr "" -#: cert.cc:61 +#: cert.cc:64 #, c-format msgid "ignoring unknown signature by '%s' on '%s'\n" msgstr "" -#: cert.cc:118 +#: cert.cc:121 #, c-format msgid "trust function liked %d signers of %s cert on manifest %s\n" msgstr "" -#: cert.cc:124 +#: cert.cc:127 #, c-format msgid "trust function disliked %d signers of %s cert on manifest %s\n" msgstr "" -#: cert.cc:171 +#: cert.cc:174 #, c-format msgid "trust function liked %d signers of %s cert on revision %s\n" msgstr "" -#: cert.cc:177 +#: cert.cc:180 #, c-format msgid "trust function disliked %d signers of %s cert on revision %s\n" msgstr "" -#: cert.cc:266 +#: cert.cc:269 #, c-format msgid "calculated cert hash '%s' does not match '%s'" msgstr "" -#: cert.cc:299 +#: cert.cc:302 #, c-format msgid "address@hidden:%s]" msgstr "" -#: cert.cc:300 +#: cert.cc:303 #, c-format msgid "cert: signable text %s\n" msgstr "" -#: cert.cc:361 keys.cc:447 +#: cert.cc:364 keys.cc:511 #, c-format msgid "no private key '%s' found in database or get_priv_key hook" msgstr "" -#: cert.cc:370 +#: cert.cc:373 #, c-format msgid "mismatch between private key '%s' in database and get_priv_key hook" msgstr "" -#: cert.cc:474 +#: cert.cc:477 msgid "no branch found for empty revision, please provide a branch name" msgstr "" -#: cert.cc:483 +#: cert.cc:486 #, c-format msgid "no branch certs found for revision %s, please provide a branch name" msgstr "" -#: cert.cc:487 +#: cert.cc:490 #, c-format msgid "" "multiple branch certs found for revision %s, please provide a branch name" msgstr "" -#: cert.cc:504 rcs_import.cc:1315 revision.cc:1554 revision.cc:1586 +#: cert.cc:507 rcs_import.cc:1122 revision.cc:1577 revision.cc:1609 msgid "no unique private key for cert construction" msgstr "" -#: cert.cc:619 +#: cert.cc:622 #, c-format msgid "no default author name for branch '%s'" msgstr "" -#: change_set.cc:1496 +#: change_set.cc:1495 msgid "concatenating change sets\n" msgstr "" -#: change_set.cc:1519 +#: change_set.cc:1518 #, c-format msgid "concatenating %d and %d deltas\n" msgstr "" -#: change_set.cc:1529 +#: change_set.cc:1528 #, c-format msgid "processing delta on %s\n" msgstr "" -#: change_set.cc:1533 +#: change_set.cc:1532 #, c-format msgid "delta on %s in first changeset renamed to %s\n" msgstr "" -#: change_set.cc:1538 +#: change_set.cc:1537 #, c-format msgid "discarding delta [%s]->[%s] for deleted file '%s'\n" msgstr "" -#: change_set.cc:1556 +#: change_set.cc:1555 #, c-format msgid "fusing deltas on %s : %s -> %s and %s -> %s\n" msgstr "" -#: change_set.cc:1570 +#: change_set.cc:1569 #, c-format msgid "delta on %s in second changeset copied forward\n" msgstr "" -#: change_set.cc:1584 +#: change_set.cc:1583 msgid "finished concatenation\n" msgstr "" -#: change_set.cc:1690 change_set.cc:1697 +#: change_set.cc:1689 change_set.cc:1696 #, c-format msgid "delete of %s dominates rename to %s\n" msgstr "" -#: change_set.cc:1707 +#: change_set.cc:1706 #, c-format msgid "unable to resolve file conflict '%s' -> '%s' vs. '%s'" msgstr "" -#: change_set.cc:1711 +#: change_set.cc:1710 #, c-format msgid "unable to resolve dir conflict '%s' -> '%s' vs. '%s'" msgstr "" -#: change_set.cc:1716 +#: change_set.cc:1715 #, c-format msgid "illegal conflict resolution '%s', wanted '%s' or '%s'\n" msgstr "" -#: change_set.cc:1772 +#: change_set.cc:1771 #, c-format msgid "tid %d (%s) clobbered tid %d (%s)\n" msgstr "" -#: change_set.cc:1808 +#: change_set.cc:1807 #, c-format msgid "skipping common change on %s (tid %d)\n" msgstr "" -#: change_set.cc:1813 +#: change_set.cc:1812 #, c-format msgid "skipping neutral change of %s -> %s (tid %d)\n" msgstr "" -#: change_set.cc:1820 +#: change_set.cc:1819 #, c-format msgid "propagating change on %s -> %s (tid %d)\n" msgstr "" -#: change_set.cc:1836 +#: change_set.cc:1835 msgid "conflict detected, resolved in A's favour\n" msgstr "" -#: change_set.cc:1842 +#: change_set.cc:1841 msgid "conflict detected, resolved in B's favour\n" msgstr "" -#: change_set.cc:2008 +#: change_set.cc:2007 #, c-format msgid "reusing merge resolution '%s' : '%s' -> '%s'\n" msgstr "" -#: change_set.cc:2017 +#: change_set.cc:2016 #, c-format msgid "merge of '%s' : '%s' vs. '%s' (no common ancestor) failed" msgstr "" -#: change_set.cc:2024 +#: change_set.cc:2023 #, c-format msgid "merge of '%s' : '%s' -> '%s' vs '%s' failed" msgstr "" -#: change_set.cc:2028 +#: change_set.cc:2027 #, c-format msgid "merge of '%s' : '%s' -> '%s' vs '%s' resolved to '%s'\n" msgstr "" #: change_set.cc:2085 #, c-format -msgid "merge is copying delta '%s' : '%s' -> '%s'\n" +msgid "skipping delta '%s'->'%s' on deleted file '%s'\n" msgstr "" -#: change_set.cc:2091 +#: change_set.cc:2093 #, c-format -msgid "skipping delta '%s'->'%s' on deleted file '%s'\n" +msgid "merge is copying delta '%s' : '%s' -> '%s'\n" msgstr "" -#: change_set.cc:2115 +#: change_set.cc:2117 #, c-format msgid "propagating new file addition delta on '%s' : '%s' -> '%s'\n" msgstr "" -#: change_set.cc:2127 +#: change_set.cc:2129 #, c-format msgid "skipping new file addition delta on '%s' : '' -> '%s'\n" msgstr "" -#: change_set.cc:2135 +#: change_set.cc:2137 #, c-format msgid "skipping common delta '%s' : '%s' -> '%s'\n" msgstr "" -#: change_set.cc:2141 +#: change_set.cc:2143 #, c-format msgid "skipping neutral delta on '%s' : %s -> %s\n" msgstr "" -#: change_set.cc:2149 +#: change_set.cc:2151 #, c-format msgid "propagating unperturbed delta on '%s' : '%s' -> '%s'\n" msgstr "" -#: change_set.cc:2159 +#: change_set.cc:2161 #, c-format msgid "merging delta '%s' : '%s' -> '%s' vs. '%s'\n" msgstr "" -#: change_set.cc:2172 +#: change_set.cc:2174 #, c-format msgid "resolved merge to '%s' : '%s' -> '%s'\n" msgstr "" -#: change_set.cc:2197 +#: change_set.cc:2199 msgid "merging change sets\n" msgstr "" -#: change_set.cc:2253 +#: change_set.cc:2255 msgid "finished merge\n" msgstr "" -#: change_set.cc:2269 +#: change_set.cc:2271 msgid "inverting change set\n" msgstr "" -#: change_set.cc:2299 +#: change_set.cc:2301 #, c-format msgid "converted 'delete %s' to 'add as %s' in inverse\n" msgstr "" -#: change_set.cc:2308 +#: change_set.cc:2310 #, c-format msgid "converted add %s to delete in inverse\n" msgstr "" -#: change_set.cc:2318 +#: change_set.cc:2320 #, c-format msgid "converting delta %s -> %s on %s\n" msgstr "" -#: change_set.cc:2320 +#: change_set.cc:2322 #, c-format msgid "inverse is delta %s -> %s on %s\n" msgstr "" -#: change_set.cc:2382 +#: change_set.cc:2384 #, c-format msgid "moving %s -> %s\n" msgstr "" -#: change_set.cc:2431 +#: change_set.cc:2433 #, c-format msgid "moving file %s -> %s\n" msgstr "" -#: change_set.cc:2439 +#: change_set.cc:2441 #, c-format msgid "moving dir %s -> %s\n" msgstr "" -#: change_set.cc:2909 +#: change_set.cc:2911 #, c-format msgid "[begin changeset %s]\n" msgstr "" -#: change_set.cc:2914 +#: change_set.cc:2916 #, c-format msgid "%s" msgstr "" -#: change_set.cc:2915 +#: change_set.cc:2917 #, c-format msgid "[end changeset %s]\n" msgstr "" -#: change_set.cc:2947 +#: change_set.cc:2949 msgid "beginning disjoint_merge_test\n" msgstr "" -#: change_set.cc:2965 +#: change_set.cc:2967 msgid "finished disjoint_merge_test\n" msgstr "" -#: change_set.cc:3037 change_set.cc:3122 change_set.cc:3167 +#: change_set.cc:3039 change_set.cc:3124 change_set.cc:3169 #, c-format msgid "informative failure: %s\n" msgstr "" -#: change_set.cc:3041 change_set.cc:3126 change_set.cc:3171 +#: change_set.cc:3043 change_set.cc:3128 change_set.cc:3173 #, c-format msgid "runtime error: %s\n" msgstr "" -#: change_set.cc:3048 +#: change_set.cc:3050 msgid "STARTING invert_change_test\n" msgstr "" -#: change_set.cc:3082 +#: change_set.cc:3084 msgid "ENDING invert_change_test\n" msgstr "" -#: change_set.cc:3191 +#: change_set.cc:3193 #, c-format msgid "%s:%d" msgstr "" -#: change_set.cc:3193 +#: change_set.cc:3195 #, c-format msgid "BEGINNING concatenation test %s\n" msgstr "" -#: change_set.cc:3198 +#: change_set.cc:3200 #, c-format msgid "FINISHING concatenation test %s\n" msgstr "" -#: change_set.cc:3253 +#: change_set.cc:3255 #, c-format msgid "RUNNING bad_concatenate_change_test %s\n" msgstr "" -#: change_set.cc:3261 +#: change_set.cc:3263 msgid "skipping change_set printing, one or both are not sane\n" msgstr "" -#: change_set.cc:3266 +#: change_set.cc:3268 msgid "concat change_set is insane\n" msgstr "" -#: change_set.cc:3269 +#: change_set.cc:3271 msgid "Checking combined change set\n" msgstr "" -#: change_set.cc:3276 +#: change_set.cc:3278 msgid "combined_concat is insane\n" msgstr "" -#: change_set.cc:3282 +#: change_set.cc:3284 #, c-format msgid "RUNNING bad_concatenate_change_test %s again backwards\n" msgstr "" -#: commands.cc:131 +#: commands.cc:133 #, c-format msgid "expanding command '%s'\n" msgstr "" -#: commands.cc:148 +#: commands.cc:150 #, c-format msgid "expanded command to '%s'\n" msgstr "" -#: commands.cc:153 +#: commands.cc:155 #, c-format msgid "command '%s' has multiple ambiguous expansions: \n" msgstr "" -#: commands.cc:232 +#: commands.cc:234 #, c-format msgid "executing %s command\n" msgstr "" -#: commands.cc:238 +#: commands.cc:240 #, c-format msgid "unknown command '%s'\n" msgstr "" -#: commands.cc:330 +#: commands.cc:287 +#, c-format +msgid "pid file '%s' already exists" +msgstr "" + +#: commands.cc:362 msgid "edit of log message failed" msgstr "" -#: commands.cc:338 +#: commands.cc:370 #, c-format msgid "" "note: branch '%s' has multiple heads\n" "note: perhaps consider 'monotone merge'" msgstr "" -#: commands.cc:399 +#: commands.cc:428 #, c-format +msgid "no such revision '%s'" +msgstr "" + +#: commands.cc:435 +#, c-format msgid "expanding selection '%s'\n" msgstr "" -#: commands.cc:407 +#: commands.cc:443 #, c-format msgid "no match for selection '%s'" msgstr "" -#: commands.cc:410 +#: commands.cc:446 #, c-format msgid "selection '%s' has multiple ambiguous expansions: \n" msgstr "" -#: commands.cc:417 commands.cc:446 commands.cc:475 +#: commands.cc:453 commands.cc:482 commands.cc:511 #, c-format msgid "expanded to '%s'\n" msgstr "" -#: commands.cc:426 commands.cc:455 +#: commands.cc:462 commands.cc:491 msgid "non-hex digits in id" msgstr "" -#: commands.cc:435 commands.cc:464 +#: commands.cc:471 commands.cc:500 #, c-format msgid "partial id '%s' does not have a unique expansion" msgstr "" -#: commands.cc:438 commands.cc:467 +#: commands.cc:474 commands.cc:503 #, c-format msgid "partial id '%s' has multiple ambiguous expansions: \n" msgstr "" -#: commands.cc:445 commands.cc:474 +#: commands.cc:481 commands.cc:510 #, c-format msgid "expanding partial id '%s'\n" msgstr "" -#: commands.cc:501 +#: commands.cc:537 #, c-format msgid "warning: no public key '%s' found in database\n" msgstr "" -#: commands.cc:610 +#: commands.cc:646 msgid "no keys found\n" msgstr "" -#: commands.cc:612 +#: commands.cc:648 #, c-format msgid "no keys found matching '%s'\n" msgstr "" -#: commands.cc:624 commands.cc:1354 commands.cc:1402 commands.cc:2821 +#: commands.cc:660 commands.cc:1436 commands.cc:1490 commands.cc:2917 #, c-format msgid "no revision %s found in database" msgstr "" -#: commands.cc:630 +#: commands.cc:666 #, c-format msgid "revision %s already has children. We cannot kill it." msgstr "" -#: commands.cc:767 +#: commands.cc:806 #, c-format msgid "key '%s' already exists in database" msgstr "" -#: commands.cc:771 +#: commands.cc:810 #, c-format msgid "generating key-pair '%s'\n" msgstr "" -#: commands.cc:773 +#: commands.cc:812 #, c-format msgid "storing key-pair '%s' in database\n" msgstr "" -#: commands.cc:790 +#: commands.cc:829 #, c-format msgid "dropping public key '%s' from database\n" msgstr "" -#: commands.cc:797 +#: commands.cc:836 #, c-format msgid "" "dropping private key '%s' from database\n" "\n" msgstr "" -#: commands.cc:798 +#: commands.cc:837 msgid "the private key data may not have been erased from the" msgstr "" -#: commands.cc:799 +#: commands.cc:838 msgid "database. it is recommended that you use 'db dump' and" msgstr "" -#: commands.cc:800 +#: commands.cc:839 msgid "'db load' to be sure." msgstr "" -#: commands.cc:806 +#: commands.cc:845 #, c-format msgid "public or private key '%s' does not exist in database" msgstr "" -#: commands.cc:822 +#: commands.cc:861 #, c-format msgid "key '%s' does not exist in database" msgstr "" -#: commands.cc:829 +#: commands.cc:868 msgid "passphrase changed\n" msgstr "" -#: commands.cc:855 +#: commands.cc:894 msgid "no unique private key found, and no key specified" msgstr "" -#: commands.cc:949 +#: commands.cc:988 msgid "need --branch argument for approval" msgstr "" -#: commands.cc:968 +#: commands.cc:1007 #, c-format msgid "revision %s has %d changesets, cannot invert\n" msgstr "" -#: commands.cc:972 +#: commands.cc:1011 msgid "need --branch argument for disapproval" msgstr "" -#: commands.cc:995 +#: commands.cc:1034 #, c-format msgid "disapproval of revision %s" msgstr "" -#: commands.cc:1011 +#: commands.cc:1050 msgid "edit comment failed" msgstr "" -#: commands.cc:1014 +#: commands.cc:1053 msgid "empty comment" msgstr "" -#: commands.cc:1129 +#: commands.cc:1168 #, c-format msgid "cannot find file %s revision %s" msgstr "" -#: commands.cc:1170 commands.cc:2246 +#: commands.cc:1209 commands.cc:2359 msgid "empty log message" msgstr "" -#: commands.cc:1205 +#: commands.cc:1244 msgid "ancestor file id does not exist" msgstr "" -#: commands.cc:1208 +#: commands.cc:1247 msgid "left file id does not exist" msgstr "" -#: commands.cc:1211 +#: commands.cc:1250 msgid "right file id does not exist" msgstr "" -#: commands.cc:1222 +#: commands.cc:1261 msgid "merge failed" msgstr "" -#: commands.cc:1286 +#: commands.cc:1368 #, c-format msgid "no file version %s found in database" msgstr "" -#: commands.cc:1298 +#: commands.cc:1380 #, c-format msgid "no file '%s' found in revision '%s'\n" msgstr "" -#: commands.cc:1303 +#: commands.cc:1385 #, c-format msgid "dumping file %s\n" msgstr "" -#: commands.cc:1327 +#: commands.cc:1409 #, c-format msgid "no manifest version %s found in database" msgstr "" -#: commands.cc:1331 +#: commands.cc:1413 #, c-format msgid "dumping manifest %s\n" msgstr "" -#: commands.cc:1358 +#: commands.cc:1440 #, c-format msgid "dumping revision %s\n" msgstr "" -#: commands.cc:1381 +#: commands.cc:1466 commands.cc:1478 msgid "need --branch argument for branch-based checkout" msgstr "" -#: commands.cc:1390 +#: commands.cc:1481 #, c-format msgid "branch %s is empty" msgstr "" -#: commands.cc:1391 +#: commands.cc:1482 #, c-format msgid "branch %s has multiple heads" msgstr "" -#: commands.cc:1417 +#: commands.cc:1503 #, c-format msgid "found %d %s branch certs on revision %s\n" msgstr "" -#: commands.cc:1422 +#: commands.cc:1508 #, c-format msgid "revision %s is not a member of branch %s\n" msgstr "" -#: commands.cc:1439 +#: commands.cc:1524 #, c-format msgid "no manifest %s found in database" msgstr "" -#: commands.cc:1441 +#: commands.cc:1526 #, c-format msgid "checking out revision %s to directory %s\n" msgstr "" -#: commands.cc:1447 +#: commands.cc:1532 #, c-format msgid "no file %s found in database for %s" msgstr "" -#: commands.cc:1451 commands.cc:3307 +#: commands.cc:1536 commands.cc:3440 #, c-format msgid "writing file %s to %s\n" msgstr "" -#: commands.cc:1472 commands.cc:3028 +#: commands.cc:1557 commands.cc:3146 msgid "please specify a branch, with --branch=BRANCH" msgstr "" -#: commands.cc:1477 commands.cc:3032 commands.cc:3102 commands.cc:3105 +#: commands.cc:1562 commands.cc:3150 commands.cc:3220 commands.cc:3223 #, c-format msgid "branch '%s' is empty\n" msgstr "" -#: commands.cc:1479 +#: commands.cc:1564 #, c-format msgid "branch '%s' is currently merged:\n" msgstr "" -#: commands.cc:1481 +#: commands.cc:1566 #, c-format msgid "branch '%s' is currently unmerged:\n" msgstr "" -#: commands.cc:1529 +#: commands.cc:1614 #, c-format msgid "no epoch for branch %s\n" msgstr "" -#: commands.cc:1726 commands.cc:1728 commands.cc:1791 +#: commands.cc:1811 commands.cc:1813 commands.cc:1876 #, c-format msgid "no such manifest %s" msgstr "" -#: commands.cc:1751 commands.cc:1753 commands.cc:1810 +#: commands.cc:1836 commands.cc:1838 commands.cc:1895 #, c-format msgid "no such file %s" msgstr "" -#: commands.cc:1773 +#: commands.cc:1858 #, c-format msgid "no such revision %s" msgstr "" -#: commands.cc:1842 +#: commands.cc:1927 #, c-format msgid "public key '%s' does not exist in database" msgstr "" -#: commands.cc:1858 +#: commands.cc:1943 #, c-format msgid "private key '%s' does not exist in database" msgstr "" -#: commands.cc:1872 +#: commands.cc:1957 msgid "no packets found on stdin" msgstr "" -#: commands.cc:1874 +#: commands.cc:1959 msgid "read 1 packet\n" msgstr "" -#: commands.cc:1876 +#: commands.cc:1961 #, c-format msgid "read %d packets\n" msgstr "" -#: commands.cc:1912 +#: commands.cc:1998 #, c-format msgid "setting default server to %s\n" msgstr "" -#: commands.cc:1919 +#: commands.cc:2004 +msgid "no hostname given" +msgstr "" + +#: commands.cc:2006 msgid "no server given and no default server set" msgstr "" -#: commands.cc:1923 +#: commands.cc:2010 #, c-format msgid "using default server address: %s\n" msgstr "" -#: commands.cc:1934 +#: commands.cc:2018 #, c-format -msgid "setting default collection to %s\n" +msgid "setting default branch pattern to %s\n" msgstr "" -#: commands.cc:1941 -msgid "no collection given and no default collection set" +#: commands.cc:2024 +msgid "no branch pattern given" msgstr "" -#: commands.cc:1945 +#: commands.cc:2026 +msgid "no branch pattern given and no default pattern set" +msgstr "" + +#: commands.cc:2030 #, c-format -msgid "using default collection: %s\n" +msgid "using default branch pattern: %s\n" msgstr "" -#: commands.cc:1958 commands.cc:1985 commands.cc:1998 +#: commands.cc:2044 commands.cc:2071 commands.cc:2087 msgid "could not guess default signing key" msgstr "" -#: commands.cc:1972 +#: commands.cc:2058 msgid "doing anonymous pull\n" msgstr "" -#: commands.cc:2002 +#: commands.cc:2091 msgid "" "need permission to store persistent passphrase (see hook persist_phrase_ok())" msgstr "" -#: commands.cc:2094 +#: commands.cc:2187 #, c-format msgid "file '%s' not found" msgstr "" -#: commands.cc:2162 work.cc:111 +#: commands.cc:2255 work.cc:115 #, c-format msgid "registering %s file in working copy\n" msgstr "" -#: commands.cc:2191 +#: commands.cc:2284 #, c-format msgid "failed to parse date string '%s': %s" msgstr "" -#: commands.cc:2195 +#: commands.cc:2288 #, c-format msgid "failed to parse date string '%s'" msgstr "" -#: commands.cc:2219 +#: commands.cc:2312 msgid "no changes to commit\n" msgstr "" -#: commands.cc:2230 +#: commands.cc:2323 #, c-format msgid "beginning commit on branch '%s'\n" msgstr "" -#: commands.cc:2231 +#: commands.cc:2324 #, c-format msgid "new manifest %s\n" msgstr "" -#: commands.cc:2232 +#: commands.cc:2325 #, c-format msgid "new revision %s\n" msgstr "" -#: commands.cc:2236 +#: commands.cc:2329 +msgid "--message and --message-file are mutually exclusive" +msgstr "" + +#: commands.cc:2332 msgid "" "MT/log is non-empty and --message supplied\n" "perhaps move or delete MT/log,\n" "or remove --message from the command line?" msgstr "" -#: commands.cc:2254 +#: commands.cc:2337 +msgid "" +"MT/log is non-empty and --message-file supplied\n" +"perhaps move or delete MT/log,\n" +"or remove --message-file from the command line?" +msgstr "" + +#: commands.cc:2367 #, c-format msgid "revision %s already in database\n" msgstr "" -#: commands.cc:2259 +#: commands.cc:2372 #, c-format msgid "inserting new revision %s\n" msgstr "" -#: commands.cc:2268 +#: commands.cc:2381 #, c-format msgid "skipping manifest %s, already in database\n" msgstr "" -#: commands.cc:2272 +#: commands.cc:2385 #, c-format msgid "inserting manifest delta %s -> %s\n" msgstr "" -#: commands.cc:2283 +#: commands.cc:2396 #, c-format msgid "inserting full manifest %s\n" msgstr "" -#: commands.cc:2296 +#: commands.cc:2409 #, c-format msgid "skipping file delta %s, already in database\n" msgstr "" -#: commands.cc:2302 +#: commands.cc:2415 #, c-format msgid "inserting delta %s -> %s\n" msgstr "" -#: commands.cc:2312 commands.cc:2329 +#: commands.cc:2425 commands.cc:2442 #, c-format msgid "file '%s' modified during commit, aborting" msgstr "" -#: commands.cc:2322 +#: commands.cc:2435 #, c-format msgid "inserting full version %s\n" msgstr "" -#: commands.cc:2357 +#: commands.cc:2469 #, c-format msgid "committed revision %s\n" msgstr "" -#: commands.cc:2363 +#: commands.cc:2475 msgid "" "note: this revision creates divergence\n" "note: you may (or may not) wish to run 'monotone merge'" msgstr "" -#: commands.cc:2426 +#: commands.cc:2538 #, c-format msgid "--- %s\n" msgstr "" -#: commands.cc:2427 +#: commands.cc:2539 #, c-format msgid "+++ %s\n" msgstr "" -#: commands.cc:2428 +#: commands.cc:2540 #, c-format msgid "@@ -0,0 +1,%d @@\n" msgstr "" -#: commands.cc:2507 commands.cc:2523 commands.cc:2527 +#: commands.cc:2619 commands.cc:2635 commands.cc:2639 #, c-format msgid "revision %s does not exist" msgstr "" -#: commands.cc:2511 +#: commands.cc:2623 msgid "current revision has no ancestor" msgstr "" -#: commands.cc:2554 +#: commands.cc:2666 #, c-format msgid "no common ancestor for %s and %s" msgstr "" -#: commands.cc:2559 -msgid "calculated diff via direct analysis\n" -msgstr "" - -#: commands.cc:2566 -msgid "calculated diff via inverted direct analysis\n" -msgstr "" - -#: commands.cc:2583 -#, c-format -msgid "calculated diff via common ancestor %s\n" -msgstr "" - -#: commands.cc:2588 +#: commands.cc:2672 msgid "concatenating un-committed changeset to composite\n" msgstr "" -#: commands.cc:2614 +#: commands.cc:2698 msgid "# no changes" msgstr "" -#: commands.cc:2753 +#: commands.cc:2843 #, c-format msgid "updating %s to %s\n" msgstr "" -#: commands.cc:2798 +#: commands.cc:2894 msgid "this working directory is a new project; cannot update" msgstr "" -#: commands.cc:2805 +#: commands.cc:2901 msgid "no candidates remain after selection" msgstr "" -#: commands.cc:2808 +#: commands.cc:2904 msgid "multiple update candidates:\n" msgstr "" -#: commands.cc:2811 +#: commands.cc:2907 #, c-format msgid " %s\n" msgstr "" -#: commands.cc:2812 +#: commands.cc:2908 msgid "choose one with 'monotone update '\n" msgstr "" -#: commands.cc:2813 +#: commands.cc:2909 msgid "multiple candidates remain after selection" msgstr "" -#: commands.cc:2828 +#: commands.cc:2924 #, c-format msgid "already up to date at %s\n" msgstr "" -#: commands.cc:2832 +#: commands.cc:2928 #, c-format msgid "selected update target %s\n" msgstr "" -#: commands.cc:2844 +#: commands.cc:2940 #, c-format msgid "" "revision %s is not a member of branch %s\n" "try again with explicit --branch\n" msgstr "" -#: commands.cc:2859 +#: commands.cc:2955 #, c-format msgid "updating along chosen edge %s -> %s\n" msgstr "" -#: commands.cc:2870 +#: commands.cc:2966 #, c-format msgid "merging working copy with chosen edge %s -> %s\n" msgstr "" -#: commands.cc:2899 +#: commands.cc:3010 #, c-format msgid "updated to base revision %s\n" msgstr "" -#: commands.cc:2964 +#: commands.cc:3076 #, c-format msgid "common ancestor %s found\n" msgstr "" -#: commands.cc:2965 +#: commands.cc:3077 msgid "trying 3-way merge\n" msgstr "" -#: commands.cc:2975 +#: commands.cc:3087 msgid "no common ancestor found, synthesizing edges\n" msgstr "" -#: commands.cc:3033 +#: commands.cc:3151 #, c-format msgid "branch '%s' is merged\n" msgstr "" -#: commands.cc:3039 +#: commands.cc:3157 #, c-format msgid "starting with revision 1 / %d\n" msgstr "" -#: commands.cc:3043 +#: commands.cc:3161 #, c-format msgid "merging with revision %d / %d\n" msgstr "" -#: commands.cc:3044 commands.cc:3045 commands.cc:3112 commands.cc:3195 -#: commands.cc:3196 +#: commands.cc:3162 commands.cc:3163 commands.cc:3230 commands.cc:3313 +#: commands.cc:3314 #, c-format msgid "[source] %s\n" msgstr "" -#: commands.cc:3057 +#: commands.cc:3175 #, c-format msgid "" "merge of %s\n" " and %s\n" msgstr "" -#: commands.cc:3062 commands.cc:3215 +#: commands.cc:3180 commands.cc:3333 #, c-format msgid "[merged] %s\n" msgstr "" -#: commands.cc:3065 +#: commands.cc:3183 msgid "note: your working copies have not been updated\n" msgstr "" -#: commands.cc:3103 commands.cc:3106 +#: commands.cc:3221 commands.cc:3224 #, c-format msgid "branch '%s' is not merged\n" msgstr "" -#: commands.cc:3111 +#: commands.cc:3229 #, c-format msgid "propagating %s -> %s\n" msgstr "" -#: commands.cc:3113 +#: commands.cc:3231 #, c-format msgid "[target] %s\n" msgstr "" -#: commands.cc:3118 +#: commands.cc:3236 #, c-format msgid "branch '%s' is up-to-date with respect to branch '%s'\n" msgstr "" -#: commands.cc:3120 +#: commands.cc:3238 msgid "no action taken\n" msgstr "" -#: commands.cc:3124 +#: commands.cc:3242 #, c-format msgid "no merge necessary; putting %s in branch '%s'\n" msgstr "" -#: commands.cc:3141 +#: commands.cc:3259 #, c-format msgid "" "propagate from branch '%s' (head %s)\n" " to branch '%s' (head %s)\n" msgstr "" -#: commands.cc:3177 commands.cc:3179 +#: commands.cc:3295 commands.cc:3297 #, c-format msgid "%s is not an ancestor of %s" msgstr "" -#: commands.cc:3188 +#: commands.cc:3306 #, c-format msgid "%s and %s are the same revision, aborting" msgstr "" -#: commands.cc:3190 commands.cc:3192 +#: commands.cc:3308 commands.cc:3310 #, c-format msgid "%s is already an ancestor of %s" msgstr "" -#: commands.cc:3206 +#: commands.cc:3324 #, c-format msgid "" "explicit_merge of %s\n" @@ -1219,294 +1249,314 @@ " to branch '%s'\n" msgstr "" -#: commands.cc:3228 commands.cc:3238 commands.cc:3248 +#: commands.cc:3346 msgid "non-hex digits in partial id" msgstr "" -#: commands.cc:3299 +#: commands.cc:3432 #, c-format msgid "reverting %s from %s to %s\n" msgstr "" -#: commands.cc:3303 +#: commands.cc:3436 #, c-format msgid "no file version %s found in database for %s" msgstr "" -#: commands.cc:3388 +#: commands.cc:3551 #, c-format msgid "annotate file file_path '%s'\n" msgstr "" -#: commands.cc:3397 +#: commands.cc:3560 #, c-format msgid "No such file '%s' in revision %s\n" msgstr "" -#: commands.cc:3399 +#: commands.cc:3562 #, c-format msgid "annotate for file_id %s\n" msgstr "" -#: commands.cc:3455 +#: commands.cc:3628 #, c-format msgid "revision %s does not exist in db, skipping\n" msgstr "" -#: commands.cc:3488 +#: commands.cc:3661 #, c-format msgid "revision '%s' in '%s' maps to '%s' in %s\n" msgstr "" -#: commands.cc:3608 +#: commands.cc:3809 #, c-format msgid "no var with name %s in domain %s" msgstr "" -#: database.cc:131 +#: database.cc:132 #, c-format msgid "" "database schemas do not match: wanted %s, got %s. try migrating database" msgstr "" -#: database.cc:182 +#: database.cc:183 #, c-format msgid "database %s is a directory\n" msgstr "" -#: database.cc:189 +#: database.cc:190 #, c-format msgid "unable to probe database version in file %s" msgstr "" -#: database.cc:196 +#: database.cc:197 #, c-format msgid "database %s is not an sqlite version 3 file, try dump and reload" msgstr "" -#: database.cc:208 +#: database.cc:209 msgid "no database specified" msgstr "" -#: database.cc:213 +#: database.cc:214 #, c-format msgid "database %s does not exist" msgstr "" -#: database.cc:215 +#: database.cc:216 #, c-format msgid "database %s is a directory" msgstr "" -#: database.cc:241 +#: database.cc:242 #, c-format msgid "could not initialize database: %s: already exists" msgstr "" -#: database.cc:246 +#: database.cc:247 #, c-format msgid "" "existing (possibly stale) journal file '%s' has same stem as new database '%" "s'" msgstr "" -#: database.cc:271 +#: database.cc:272 #, c-format msgid "INSERT INTO %s VALUES(" msgstr "" -#: database.cc:340 database.cc:434 database.cc:451 +#: database.cc:341 database.cc:443 database.cc:460 msgid "need database name" msgstr "" -#: database.cc:342 +#: database.cc:343 #, c-format msgid "cannot create %s; it already exists\n" msgstr "" -#: database.cc:656 +#: database.cc:671 #, c-format msgid "db.execute(\"%s\")\n" msgstr "" -#: database.cc:696 +#: database.cc:709 #, c-format msgid "db.fetch(\"%s\")\n" msgstr "" -#: database.cc:723 +#: database.cc:736 #, c-format msgid "%s wanted %d columns, got %s" msgstr "" -#: database.cc:728 +#: database.cc:741 #, c-format msgid "%s wanted %d rows, got %s" msgstr "" -#: database.cc:952 +#: database.cc:965 #, c-format msgid "%08.8x%08.8x%08.8x%08.8x%08.8x" msgstr "" -#: database.cc:964 +#: database.cc:977 #, c-format msgid "version cache expiring %s\n" msgstr "" -#: database.cc:986 +#: database.cc:999 #, c-format msgid "version cache hit on %s\n" msgstr "" -#: database.cc:1031 +#: database.cc:1044 #, c-format msgid "reconstructing %s in %s\n" msgstr "" -#: database.cc:1081 +#: database.cc:1094 #, c-format msgid "inserting edge: %s <- %s\n" msgstr "" -#: database.cc:1085 +#: database.cc:1098 #, c-format msgid "skipping merge edge %s <- %s\n" msgstr "" -#: database.cc:1131 +#: database.cc:1144 #, c-format msgid "following delta %s -> %s\n" msgstr "" -#: database.cc:1496 +#: database.cc:1509 #, c-format msgid "Killing revision %s locally\n" msgstr "" -#: database.cc:1647 database.cc:1659 +#: database.cc:1522 #, c-format +msgid "Deleting all references to branch %s\n" +msgstr "" + +#: database.cc:1673 database.cc:1685 +#, c-format msgid "another key with name '%s' already exists" msgstr "" -#: database.cc:2198 +#: database.cc:2249 #, c-format msgid "WHERE id GLOB '%s*'" msgstr "" -#: database.cc:2216 +#: database.cc:2267 #, c-format msgid "WHERE name='%s' AND unbase64(value) glob '%s'" msgstr "" -#: database.cc:2222 +#: database.cc:2273 #, c-format msgid "WHERE name='%s'" msgstr "" -#: database.cc:2231 +#: database.cc:2282 #, c-format msgid " WHERE (name='%s' OR name='%s' OR name='%s')" msgstr "" -#: database.cc:2235 +#: database.cc:2286 #, c-format msgid " AND unbase64(value) glob '*%s*'" msgstr "" -#: database.cc:2243 +#: database.cc:2293 #, c-format -msgid "WHERE name='%s' AND unbase64(value) glob '*%s*'" +msgid "SELECT id FROM revision_certs WHERE name='%s' AND " msgstr "" -#: database.cc:2257 +#: database.cc:2297 #, c-format +msgid "unbase64(value) <= X'%s'" +msgstr "" + +#: database.cc:2300 +#, c-format +msgid "unbase64(value) > X'%s'" +msgstr "" + +#: database.cc:2303 +#, c-format +msgid "unbase64(value) glob '*%s*'" +msgstr "" + +#: database.cc:2318 +#, c-format msgid "SELECT id FROM %s" msgstr "" -#: database.cc:2265 +#: database.cc:2326 #, c-format msgid " (name='%s' OR name='%s' OR name='%s')" msgstr "" -#: database.cc:2275 +#: database.cc:2336 #, c-format msgid " (name='%s')" msgstr "" -#: database.cc:2278 +#: database.cc:2339 #, c-format msgid " AND (unbase64(value) GLOB '*%s*')" msgstr "" -#: database.cc:2279 +#: database.cc:2340 #, c-format msgid " AND (id IN %s)" msgstr "" -#: diff_patch.cc:221 +#: diff_patch.cc:209 #, c-format msgid "exchanging preserved extent [%d+%d] with changed extent [%d+%d]\n" msgstr "" -#: diff_patch.cc:312 +#: diff_patch.cc:300 #, c-format msgid "conflicting edits: %s %d[%d] '%s' vs. %s %d[%d] '%s'\n" msgstr "" -#: diff_patch.cc:340 +#: diff_patch.cc:328 #, c-format msgid "conflicting edits: [%s %d %d] vs. [%s %d %d]\n" msgstr "" -#: diff_patch.cc:388 +#: diff_patch.cc:376 #, c-format msgid "calculating left edit script on %d -> %d lines\n" msgstr "" -#: diff_patch.cc:396 +#: diff_patch.cc:384 #, c-format msgid "calculating right edit script on %d -> %d lines\n" msgstr "" -#: diff_patch.cc:404 +#: diff_patch.cc:392 #, c-format msgid "calculating left extents on %d edits\n" msgstr "" -#: diff_patch.cc:409 +#: diff_patch.cc:397 #, c-format msgid "calculating right extents on %d edits\n" msgstr "" -#: diff_patch.cc:414 +#: diff_patch.cc:402 #, c-format msgid "normalizing %d right extents\n" msgstr "" -#: diff_patch.cc:417 +#: diff_patch.cc:405 #, c-format msgid "normalizing %d left extents\n" msgstr "" -#: diff_patch.cc:423 +#: diff_patch.cc:411 msgid "conflicting prefixes\n" msgstr "" -#: diff_patch.cc:429 +#: diff_patch.cc:417 msgid "conflicting suffixes\n" msgstr "" -#: diff_patch.cc:433 +#: diff_patch.cc:421 #, c-format msgid "merging %d left, %d right extents\n" msgstr "" -#: diff_patch.cc:464 +#: diff_patch.cc:452 msgid "conflict detected. no merge.\n" msgstr "" -#: diff_patch.cc:484 +#: diff_patch.cc:472 #, c-format msgid "recording successful merge of %s <-> %s into %s\n" msgstr "" @@ -1516,196 +1566,196 @@ msgid "trying to merge %s <-> %s (ancestor: %s)\n" msgstr "" -#: diff_patch.cc:533 diff_patch.cc:626 +#: diff_patch.cc:533 diff_patch.cc:634 msgid "files are identical\n" msgstr "" -#: diff_patch.cc:568 +#: diff_patch.cc:575 msgid "internal 3-way merged ok\n" msgstr "" -#: diff_patch.cc:581 +#: diff_patch.cc:589 msgid "help required for 3-way merge\n" msgstr "" -#: diff_patch.cc:582 +#: diff_patch.cc:590 #, c-format msgid "[ancestor] %s\n" msgstr "" -#: diff_patch.cc:583 diff_patch.cc:638 +#: diff_patch.cc:591 diff_patch.cc:646 #, c-format msgid "[ left] %s\n" msgstr "" -#: diff_patch.cc:584 diff_patch.cc:639 +#: diff_patch.cc:592 diff_patch.cc:647 #, c-format msgid "[ right] %s\n" msgstr "" -#: diff_patch.cc:585 diff_patch.cc:640 +#: diff_patch.cc:593 diff_patch.cc:648 #, c-format msgid "[ merged] %s\n" msgstr "" -#: diff_patch.cc:594 +#: diff_patch.cc:602 msgid "lua merge3 hook merged ok\n" msgstr "" -#: diff_patch.cc:621 +#: diff_patch.cc:629 #, c-format msgid "trying to merge %s <-> %s\n" msgstr "" -#: diff_patch.cc:637 +#: diff_patch.cc:645 msgid "help required for 2-way merge\n" msgstr "" -#: diff_patch.cc:648 +#: diff_patch.cc:656 msgid "lua merge2 hook merged ok\n" msgstr "" -#: diff_patch.cc:679 +#: diff_patch.cc:687 #, c-format msgid "temporarily recording merge of %s <-> %s into %s\n" msgstr "" -#: diff_patch.cc:696 +#: diff_patch.cc:704 #, c-format msgid "file %s does not exist in working copy" msgstr "" -#: diff_patch.cc:700 +#: diff_patch.cc:708 #, c-format msgid "file %s in working copy has id %s, wanted %s" msgstr "" -#: file_io.cc:39 +#: file_io.cc:37 #, c-format msgid "initial path is %s\n" msgstr "" -#: file_io.cc:52 +#: file_io.cc:50 #, c-format msgid "searching for '%s' directory with root '%s'\n" msgstr "" -#: file_io.cc:66 +#: file_io.cc:64 #, c-format msgid "'%s' not found in '%s' with '%s' removed\n" msgstr "" -#: file_io.cc:73 +#: file_io.cc:71 #, c-format msgid "search for '%s' ended at '%s' with '%s' removed\n" msgstr "" -#: file_io.cc:78 +#: file_io.cc:76 #, c-format msgid "'%s' does not exist\n" msgstr "" -#: file_io.cc:84 +#: file_io.cc:82 #, c-format msgid "'%s' is not a directory\n" msgstr "" -#: file_io.cc:91 +#: file_io.cc:89 #, c-format msgid "problems with '%s' (missing '.' or '..')\n" msgstr "" -#: file_io.cc:117 +#: file_io.cc:115 msgid "Searching for home directory\n" msgstr "" -#: file_io.cc:123 +#: file_io.cc:121 msgid "Home directory from MONOTONE_HOME\n" msgstr "" -#: file_io.cc:133 +#: file_io.cc:131 msgid "Home directory from HOME\n" msgstr "" -#: file_io.cc:140 +#: file_io.cc:138 msgid "Home directory from USERPROFILE\n" msgstr "" -#: file_io.cc:149 +#: file_io.cc:147 msgid "Home directory from HOMEDRIVE+HOMEPATH\n" msgstr "" -#: file_io.cc:153 +#: file_io.cc:151 msgid "" "could not find home directory (tried MONOTONE_HOME, HOME (if cygwin/mingw), " "USERPROFILE, HOMEDRIVE/HOMEPATH" msgstr "" -#: file_io.cc:161 +#: file_io.cc:159 #, c-format msgid "could not find home directory for uid %d" msgstr "" -#: file_io.cc:199 +#: file_io.cc:204 #, c-format msgid "could not find home directory for user %s" msgstr "" -#: file_io.cc:256 file_io.cc:264 +#: file_io.cc:273 file_io.cc:281 #, c-format msgid "file to delete '%s' does not exist" msgstr "" -#: file_io.cc:272 file_io.cc:280 +#: file_io.cc:289 file_io.cc:297 #, c-format msgid "directory to delete '%s' does not exist" msgstr "" -#: file_io.cc:289 file_io.cc:301 +#: file_io.cc:306 file_io.cc:318 #, c-format msgid "rename source file '%s' does not exist" msgstr "" -#: file_io.cc:291 file_io.cc:303 +#: file_io.cc:308 file_io.cc:320 #, c-format msgid "rename target file '%s' already exists" msgstr "" -#: file_io.cc:313 file_io.cc:325 +#: file_io.cc:330 file_io.cc:342 #, c-format msgid "rename source dir '%s' does not exist" msgstr "" -#: file_io.cc:315 file_io.cc:327 +#: file_io.cc:332 file_io.cc:344 #, c-format msgid "rename target dir '%s' already exists" msgstr "" -#: file_io.cc:378 +#: file_io.cc:395 msgid "Cannot read standard input multiple times" msgstr "" -#: file_io.cc:505 +#: file_io.cc:484 #, c-format -msgid "unlinking %s failed" +msgid "file '%s' does not exist" msgstr "" -#: file_io.cc:507 +#: file_io.cc:524 #, c-format -msgid "rename of %s to %s failed" +msgid "removing %s failed" msgstr "" -#: file_io.cc:597 +#: file_io.cc:615 #, c-format msgid "ignoring book keeping entry %s\n" msgstr "" -#: file_io.cc:616 +#: file_io.cc:634 #, c-format msgid "caught runtime error %s constructing file path for %s\n" msgstr "" -#: file_io.cc:648 +#: file_io.cc:666 #, c-format msgid "no such file or directory: %s" msgstr "" @@ -1740,148 +1790,175 @@ msgid "wrote %d bytes of DER-encoded data\n" msgstr "" -#: keys.cc:216 +#: keys.cc:220 #, c-format msgid "generated %d-byte public key\n" msgstr "" -#: keys.cc:217 +#: keys.cc:221 #, c-format msgid "generated %d-byte (encrypted) private key\n" msgstr "" -#: keys.cc:237 keys.cc:307 +#: keys.cc:241 keys.cc:302 #, c-format msgid "building signer from %d-byte decrypted private key\n" msgstr "" -#: keys.cc:298 +#: keys.cc:293 #, c-format msgid "base64-decoding %d-byte private key\n" msgstr "" -#: keys.cc:333 +#: keys.cc:328 #, c-format msgid "produced %d-byte signature\n" msgstr "" -#: keys.cc:361 +#: keys.cc:356 #, c-format msgid "building verifier for %d-byte pub key\n" msgstr "" -#: keys.cc:376 +#: keys.cc:371 #, c-format msgid "checking %d-byte (%d decoded) signature\n" msgstr "" -#: keys.cc:449 +#: keys.cc:513 #, c-format msgid "no public key '%s' found in database" msgstr "" -#: keys.cc:460 +#: keys.cc:524 #, c-format msgid "passphrase for '%s' is incorrect" msgstr "" -#: keys.cc:508 +#: keys.cc:572 #, c-format msgid "%d bytes blank input -> tests as %f randomness\n" msgstr "" -#: keys.cc:518 +#: keys.cc:582 #, c-format msgid "%d bytes urandom-seeded input -> tests as %f randomness\n" msgstr "" -#: keys.cc:529 +#: keys.cc:593 #, c-format msgid "%d bytes random-seeded input -> tests as %f randomness\n" msgstr "" -#: lua.cc:227 +#: lua.cc:79 +#, c-format +msgid "%s\n" +msgstr "" + +#: lua.cc:91 msgid "lua istable() failed\n" msgstr "" -#: lua.cc:233 +#: lua.cc:97 msgid "lua stack top > 0 failed\n" msgstr "" -#: lua.cc:247 +#: lua.cc:111 msgid "lua isfunction() failed in get_fn\n" msgstr "" -#: lua.cc:259 +#: lua.cc:123 msgid "lua istable() failed in get_tab\n" msgstr "" -#: lua.cc:271 +#: lua.cc:135 msgid "lua isstring() failed in get_str\n" msgstr "" -#: lua.cc:283 +#: lua.cc:147 msgid "lua isnumber() failed in get_num\n" msgstr "" -#: lua.cc:295 +#: lua.cc:159 msgid "lua isboolean() failed in get_bool\n" msgstr "" -#: lua.cc:308 +#: lua.cc:172 msgid "lua isstring() failed in extract_str\n" msgstr "" -#: lua.cc:321 +#: lua.cc:185 msgid "lua isnumber() failed in extract_int\n" msgstr "" -#: lua.cc:334 +#: lua.cc:198 msgid "lua isnumber() failed in extract_double\n" msgstr "" -#: lua.cc:348 +#: lua.cc:212 msgid "lua isboolean() failed in extract_bool\n" msgstr "" -#: lua.cc:364 +#: lua.cc:228 msgid "lua istable() failed in begin\n" msgstr "" -#: lua.cc:378 +#: lua.cc:242 msgid "lua istable() failed in next\n" msgstr "" -#: lua.cc:458 +#: lua.cc:329 +msgid "lua stack top >= count failed\n" +msgstr "" + +#: lua.cc:501 +msgid "guess_binary called with an invalid parameter" +msgstr "" + +#: lua.cc:510 +msgid "Include called with an invalid parameter" +msgstr "" + +#: lua.cc:525 +msgid "IncludeDir called with an invalid parameter" +msgstr "" + +#: lua.cc:528 #, c-format -msgid "lua pcall() failed: %s\n" +msgid "Directory '%s' does not exists" msgstr "" -#: lua.cc:470 -msgid "lua stack top >= count failed\n" +#: lua.cc:529 +#, c-format +msgid "'%s' is not a directory" msgstr "" -#: lua.cc:561 +#: lua.cc:548 lua.cc:675 #, c-format -msgid "opening rcfile '%s' ...\n" +msgid "lua error while loading rcfile '%s'" msgstr "" -#: lua.cc:563 +#: lua.cc:672 lua.cc:685 #, c-format -msgid "lua error while loading '%s'" +msgid "opening rcfile '%s' ...\n" msgstr "" -#: lua.cc:564 +#: lua.cc:676 lua.cc:688 #, c-format msgid "'%s' is ok\n" msgstr "" -#: lua.cc:568 +#: lua.cc:687 #, c-format +msgid "lua error while loading '%s'" +msgstr "" + +#: lua.cc:692 +#, c-format msgid "rcfile '%s' does not exist" msgstr "" -#: lua.cc:569 +#: lua.cc:693 #, c-format msgid "skipping nonexistent rcfile '%s'\n" msgstr "" @@ -1891,12 +1968,12 @@ msgid "scanning file %s\n" msgstr "" -#: manifest.cc:198 +#: manifest.cc:190 #, c-format msgid "missing %s" msgstr "" -#: manifest.cc:211 +#: manifest.cc:203 #, c-format msgid "%d missing files\n" msgstr "" @@ -1911,52 +1988,52 @@ msgid "mismatched node hash value %s, expected %s" msgstr "" -#: monotone.cc:175 +#: monotone.cc:186 #, c-format msgid "problem parsing arguments from file %s: %s" msgstr "" -#: monotone.cc:184 +#: monotone.cc:195 #, c-format msgid "weird error when stuffing arguments read from %s: %s\n" msgstr "" -#: monotone.cc:228 +#: monotone.cc:246 #, c-format msgid "command line: %s\n" msgstr "" -#: monotone.cc:231 +#: monotone.cc:249 #, c-format msgid "set locale: LC_CTYPE=%s, LC_MESSAGES=%s\n" msgstr "" -#: monotone.cc:365 +#: monotone.cc:410 #, c-format msgid "syntax error near the \"%s\" option: %s" msgstr "" -#: monotone.cc:404 +#: monotone.cc:449 #, c-format msgid "monotone %s doesn't use the option %s" msgstr "" -#: monotone.cc:426 +#: monotone.cc:471 #, c-format msgid "Removed 'hidden' from option # %d\n" msgstr "" -#: monotone.cc:432 monotone.cc:443 +#: monotone.cc:477 monotone.cc:488 #, c-format msgid "Added 'hidden' to option # %d\n" msgstr "" -#: netcmd.cc:44 +#: netcmd.cc:42 #, c-format msgid "unknown item type 0x%x for '%s'" msgstr "" -#: netcmd.cc:90 +#: netcmd.cc:89 #, c-format msgid "protocol version mismatch: wanted '%d' got '%d'" msgstr "" @@ -1966,139 +2043,139 @@ msgid "unknown netcmd code 0x%x" msgstr "" -#: netcmd.cc:123 +#: netcmd.cc:124 #, c-format msgid "oversized payload of '%d' bytes" msgstr "" -#: netcmd.cc:136 +#: netcmd.cc:153 #, c-format -msgid "bad checksum 0x%x vs. 0x%x" +msgid "bad HMAC %s vs. %s" msgstr "" -#: netcmd.cc:206 netcmd.cc:243 +#: netcmd.cc:228 netcmd.cc:274 #, c-format msgid "unknown role specifier %d" msgstr "" -#: netcmd.cc:515 +#: netcmd.cc:633 msgid "checking i/o round trip on error_cmd\n" msgstr "" -#: netcmd.cc:526 +#: netcmd.cc:641 #, c-format msgid "errmsg_cmd test done, buffer was %d bytes\n" msgstr "" -#: netcmd.cc:531 +#: netcmd.cc:646 msgid "checking i/o round trip on bye_cmd\n" msgstr "" -#: netcmd.cc:538 +#: netcmd.cc:650 #, c-format msgid "bye_cmd test done, buffer was %d bytes\n" msgstr "" -#: netcmd.cc:543 +#: netcmd.cc:655 msgid "checking i/o round trip on hello_cmd\n" msgstr "" -#: netcmd.cc:558 +#: netcmd.cc:667 #, c-format msgid "hello_cmd test done, buffer was %d bytes\n" msgstr "" -#: netcmd.cc:563 +#: netcmd.cc:672 msgid "checking i/o round trip on anonymous_cmd\n" msgstr "" -#: netcmd.cc:578 +#: netcmd.cc:689 #, c-format msgid "anonymous_cmd test done, buffer was %d bytes\n" msgstr "" -#: netcmd.cc:583 +#: netcmd.cc:694 msgid "checking i/o round trip on auth_cmd\n" msgstr "" -#: netcmd.cc:606 +#: netcmd.cc:719 #, c-format msgid "auth_cmd test done, buffer was %d bytes\n" msgstr "" -#: netcmd.cc:611 +#: netcmd.cc:724 msgid "checking i/o round trip on confirm_cmd\n" msgstr "" -#: netcmd.cc:623 +#: netcmd.cc:730 #, c-format msgid "confirm_cmd test done, buffer was %d bytes\n" msgstr "" -#: netcmd.cc:628 +#: netcmd.cc:735 msgid "checking i/o round trip on refine_cmd\n" msgstr "" -#: netcmd.cc:649 +#: netcmd.cc:753 #, c-format msgid "refine_cmd test done, buffer was %d bytes\n" msgstr "" -#: netcmd.cc:654 +#: netcmd.cc:758 msgid "checking i/o round trip on done_cmd\n" msgstr "" -#: netcmd.cc:667 +#: netcmd.cc:769 #, c-format msgid "done_cmd test done, buffer was %d bytes\n" msgstr "" -#: netcmd.cc:672 +#: netcmd.cc:774 msgid "checking i/o round trip on send_data_cmd\n" msgstr "" -#: netcmd.cc:685 +#: netcmd.cc:785 #, c-format msgid "send_data_cmd test done, buffer was %d bytes\n" msgstr "" -#: netcmd.cc:690 +#: netcmd.cc:790 msgid "checking i/o round trip on send_delta_cmd\n" msgstr "" -#: netcmd.cc:705 +#: netcmd.cc:803 #, c-format msgid "send_delta_cmd test done, buffer was %d bytes\n" msgstr "" -#: netcmd.cc:710 +#: netcmd.cc:808 msgid "checking i/o round trip on data_cmd\n" msgstr "" -#: netcmd.cc:723 +#: netcmd.cc:819 #, c-format msgid "data_cmd test done, buffer was %d bytes\n" msgstr "" -#: netcmd.cc:728 +#: netcmd.cc:824 msgid "checking i/o round trip on delta_cmd\n" msgstr "" -#: netcmd.cc:745 +#: netcmd.cc:839 #, c-format msgid "delta_cmd test done, buffer was %d bytes\n" msgstr "" -#: netcmd.cc:750 +#: netcmd.cc:844 msgid "checking i/o round trip on nonexistant_cmd\n" msgstr "" -#: netcmd.cc:763 +#: netcmd.cc:855 #, c-format msgid "nonexistant_cmd test done, buffer was %d bytes\n" msgstr "" -#: netcmd.cc:769 +#: netcmd.cc:861 #, c-format msgid "bad decode exception: '%s'\n" msgstr "" @@ -2128,1692 +2205,1659 @@ msgid "expected %s to end at %d, have %d bytes" msgstr "" -#: netsync.cc:191 +#: netsync.cc:223 #, c-format msgid "check of '%s' failed" msgstr "" -#: netsync.cc:448 -msgid "client can only sync one collection at a time" -msgstr "" - -#: netsync.cc:554 +#: netsync.cc:710 msgid "all epochs processed, opening database valve\n" msgstr "" -#: netsync.cc:626 +#: netsync.cc:787 msgid "dropping outgoing netcmd (because we're in error unwind mode)\n" msgstr "" -#: netsync.cc:650 +#: netsync.cc:811 #, c-format msgid "error: %s\n" msgstr "" -#: netsync.cc:658 +#: netsync.cc:819 #, c-format msgid "analyzing %d entries in manifest\n" msgstr "" -#: netsync.cc:702 +#: netsync.cc:863 #, c-format msgid "revision %s is attached via database\n" msgstr "" -#: netsync.cc:707 +#: netsync.cc:868 #, c-format msgid "checking attachment of %s in ancestry\n" msgstr "" -#: netsync.cc:714 +#: netsync.cc:875 #, c-format msgid "checking attachment of %s in parent %s\n" msgstr "" -#: netsync.cc:718 +#: netsync.cc:879 #, c-format msgid "revision %s is attached via parent %s\n" msgstr "" -#: netsync.cc:724 +#: netsync.cc:885 #, c-format msgid "decided that revision %s %s attached\n" msgstr "" -#: netsync.cc:791 +#: netsync.cc:952 #, c-format msgid "not requesting (in reverse) initial manifest %s as we already have it\n" msgstr "" -#: netsync.cc:794 +#: netsync.cc:955 #, c-format msgid "requesting (in reverse) initial manifest data %s\n" msgstr "" -#: netsync.cc:804 +#: netsync.cc:965 #, c-format msgid "" "not requesting (in reverse) manifest delta to %s as we already have it\n" msgstr "" -#: netsync.cc:807 +#: netsync.cc:968 #, c-format msgid "requesting (in reverse) manifest delta %s -> %s\n" msgstr "" -#: netsync.cc:834 +#: netsync.cc:995 #, c-format msgid "not requesting (in reverse) initial file %s as we already have it\n" msgstr "" -#: netsync.cc:837 +#: netsync.cc:998 #, c-format msgid "requesting (in reverse) initial file data %s\n" msgstr "" -#: netsync.cc:847 +#: netsync.cc:1008 #, c-format msgid "not requesting (in reverse) file delta to %s as we already have it\n" msgstr "" -#: netsync.cc:850 +#: netsync.cc:1011 #, c-format msgid "requesting (in reverse) file delta %s -> %s on %s\n" msgstr "" -#: netsync.cc:882 +#: netsync.cc:1043 #, c-format msgid "visiting revision '%s' for forward deltas\n" msgstr "" -#: netsync.cc:910 +#: netsync.cc:1071 #, c-format msgid "not requesting forward manifest delta to '%s' as we already have it\n" msgstr "" -#: netsync.cc:916 +#: netsync.cc:1077 #, c-format msgid "requesting full manifest data %s\n" msgstr "" -#: netsync.cc:921 +#: netsync.cc:1082 #, c-format msgid "requesting forward manifest delta %s -> %s\n" msgstr "" -#: netsync.cc:935 +#: netsync.cc:1096 #, c-format msgid "" "not requesting forward delta %s -> %s on file %s as we already have it\n" msgstr "" -#: netsync.cc:941 +#: netsync.cc:1102 #, c-format msgid "requesting full file data %s\n" msgstr "" -#: netsync.cc:947 +#: netsync.cc:1108 #, c-format msgid "requesting forward delta %s -> %s on file %s\n" msgstr "" -#: netsync.cc:975 +#: netsync.cc:1138 #, c-format msgid "analyzing %d ancestry edges\n" msgstr "" -#: netsync.cc:992 +#: netsync.cc:1194 #, c-format +msgid "Dropping branch certs for unwanted branch %s" +msgstr "" + +#: netsync.cc:1249 +#, c-format msgid "isolated %d heads\n" msgstr "" -#: netsync.cc:1017 +#: netsync.cc:1276 #, c-format msgid "requesting attached ancestry of revision '%s'\n" msgstr "" -#: netsync.cc:1022 +#: netsync.cc:1281 #, c-format msgid "requesting detached ancestry of revision '%s'\n" msgstr "" -#: netsync.cc:1056 +#: netsync.cc:1315 #, c-format msgid "read %d bytes from fd %d (peer %s)\n" msgstr "" -#: netsync.cc:1059 +#: netsync.cc:1318 msgid "in error unwind mode, so throwing them into the bit bucket\n" msgstr "" -#: netsync.cc:1081 +#: netsync.cc:1350 #, c-format -msgid "wrote %d bytes to fd %d (peer %s), %d remain in output buffer\n" +msgid "wrote %d bytes to fd %d (peer %s)\n" msgstr "" -#: netsync.cc:1089 +#: netsync.cc:1358 msgid "finished flushing output queue in error unwind mode, disconnecting\n" msgstr "" -#: netsync.cc:1103 +#: netsync.cc:1372 msgid "queueing 'bye' command\n" msgstr "" -#: netsync.cc:1113 +#: netsync.cc:1382 msgid "queueing 'error' command\n" msgstr "" -#: netsync.cc:1127 +#: netsync.cc:1395 #, c-format msgid "queueing 'done' command for %s level %s\n" msgstr "" -#: netsync.cc:1196 +#: netsync.cc:1471 #, c-format msgid "queueing request for refinement of %s node '%s', level %d\n" msgstr "" -#: netsync.cc:1215 +#: netsync.cc:1489 #, c-format msgid "not queueing request for %s '%s' as we are in pure source role\n" msgstr "" -#: netsync.cc:1222 +#: netsync.cc:1496 #, c-format msgid "not queueing request for %s '%s' as we already requested it\n" msgstr "" -#: netsync.cc:1227 +#: netsync.cc:1501 #, c-format msgid "queueing request for data of %s item '%s'\n" msgstr "" -#: netsync.cc:1252 +#: netsync.cc:1525 #, c-format msgid "" "not queueing request for %s delta '%s' -> '%s' as we are in pure source " "role\n" msgstr "" -#: netsync.cc:1259 +#: netsync.cc:1532 #, c-format msgid "" "not queueing request for %s delta '%s' -> '%s' as we already requested the " "target\n" msgstr "" -#: netsync.cc:1264 +#: netsync.cc:1537 #, c-format msgid "queueing request for contents of %s delta '%s' -> '%s'\n" msgstr "" -#: netsync.cc:1285 +#: netsync.cc:1557 #, c-format msgid "not queueing %s data for '%s' as we are in pure sink role\n" msgstr "" -#: netsync.cc:1290 +#: netsync.cc:1562 #, c-format msgid "queueing %d bytes of data for %s item '%s'\n" msgstr "" -#: netsync.cc:1316 +#: netsync.cc:1587 #, c-format msgid "not queueing %s delta '%s' -> '%s' as we are in pure sink role\n" msgstr "" -#: netsync.cc:1321 +#: netsync.cc:1592 #, c-format msgid "queueing %s delta '%s' -> '%s'\n" msgstr "" -#: netsync.cc:1340 +#: netsync.cc:1610 #, c-format msgid "" "not queueing note of nonexistence of %s item '%s' as we are in pure sink " "role\n" msgstr "" -#: netsync.cc:1345 +#: netsync.cc:1615 #, c-format msgid "queueing note of nonexistance of %s item '%s'\n" msgstr "" -#: netsync.cc:1358 +#: netsync.cc:1627 msgid "received 'bye' netcmd\n" msgstr "" -#: netsync.cc:1366 +#: netsync.cc:1635 #, c-format msgid "received network error: %s\n" msgstr "" -#: netsync.cc:1383 +#: netsync.cc:1652 #, c-format msgid "received 'done' for empty %s level %d, marking as complete\n" msgstr "" -#: netsync.cc:1405 +#: netsync.cc:1674 #, c-format msgid "" "received 'done' for %s level %d, which had refinements; sending echo of done " "for level %d\n" msgstr "" -#: netsync.cc:1431 +#: netsync.cc:1700 +msgid "No branches found." +msgstr "" + +#: netsync.cc:1717 #, c-format msgid "server key has name %s, hash %s\n" msgstr "" -#: netsync.cc:1439 netsync.cc:1441 +#: netsync.cc:1725 netsync.cc:1727 msgid "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" msgstr "" -#: netsync.cc:1440 +#: netsync.cc:1726 msgid "@ WARNING: SERVER IDENTIFICATION HAS CHANGED @\n" msgstr "" -#: netsync.cc:1442 +#: netsync.cc:1728 msgid "IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY\n" msgstr "" -#: netsync.cc:1443 +#: netsync.cc:1729 msgid "it is also possible that the server key has just been changed\n" msgstr "" -#: netsync.cc:1444 +#: netsync.cc:1730 #, c-format msgid "remote host sent key %s\n" msgstr "" -#: netsync.cc:1445 +#: netsync.cc:1731 #, c-format msgid "I expected %s\n" msgstr "" -#: netsync.cc:1446 +#: netsync.cc:1732 #, c-format msgid "'monotone unset %s %s' overrides this check\n" msgstr "" -#: netsync.cc:1448 +#: netsync.cc:1734 msgid "server key changed" msgstr "" -#: netsync.cc:1453 +#: netsync.cc:1739 #, c-format msgid "first time connecting to server %s\n" msgstr "" -#: netsync.cc:1454 -msgid "I'll assume it's really them, but you might want to\n" +#: netsync.cc:1740 +msgid "I'll assume it's really them, but you might want to double-check\n" msgstr "" -#: netsync.cc:1455 +#: netsync.cc:1741 #, c-format -msgid "double-check their key's fingerprint: %s\n" +msgid "their key's fingerprint: %s\n" msgstr "" -#: netsync.cc:1460 +#: netsync.cc:1746 #, c-format msgid "saving public key for %s to database\n" msgstr "" -#: netsync.cc:1467 +#: netsync.cc:1753 #, c-format msgid "received 'hello' netcmd from server '%s' with nonce '%s'\n" msgstr "" -#: netsync.cc:1517 -#, c-format -msgid "" -"received 'anonymous' netcmd from client for collection '%s' in %s mode with " -"nonce2 '%s'\n" +#: netsync.cc:1832 +msgid "rejected attempt at anonymous connection for write\n" msgstr "" -#: netsync.cc:1536 netsync.cc:1628 +#: netsync.cc:1839 +msgid "rejected attempt at anonymous connection while running as sink\n" +msgstr "" + +#: netsync.cc:1857 #, c-format -msgid "not currently serving requested collection '%s'\n" +msgid "denied anonymous read permission for '%s' excluding '%s'\n" msgstr "" -#: netsync.cc:1556 -msgid "rejected attempt at anonymous connection for write\n" +#: netsync.cc:1863 +#, c-format +msgid "allowed anonymous read permission for '%s' excluding '%s'\n" msgstr "" -#: netsync.cc:1564 -#, c-format -msgid "anonymous read permission denied for '%s'\n" +#: netsync.cc:1895 +msgid "detected replay attack in auth netcmd\n" msgstr "" -#: netsync.cc:1570 -msgid "anonymous read permitted, signing back nonce\n" +#: netsync.cc:1916 +#, c-format +msgid "remote public key hash '%s' is unknown\n" msgstr "" -#: netsync.cc:1601 +#: netsync.cc:1932 #, c-format msgid "" -"received 'auth' netcmd from client '%s' for collection '%s' in %s mode with " -"nonce1 '%s' and nonce2 '%s'\n" +"denied '%s' read permission for '%s' excluding '%s' while running as pure " +"sink\n" msgstr "" -#: netsync.cc:1610 -msgid "detected replay attack in auth netcmd\n" +#: netsync.cc:1949 +#, c-format +msgid "denied '%s' read permission for '%s' excluding '%s'\n" msgstr "" -#: netsync.cc:1648 +#: netsync.cc:1955 #, c-format -msgid "remote public key hash '%s' is unknown\n" +msgid "allowed '%s' read permission for '%s' excluding '%s'\n" msgstr "" -#: netsync.cc:1664 +#: netsync.cc:1965 netsync.cc:1973 #, c-format -msgid "read permission denied for '%s'\n" +msgid "" +"denied '%s' write permission for '%s' excluding '%s' while running as pure " +"source\n" msgstr "" -#: netsync.cc:1676 +#: netsync.cc:1979 #, c-format -msgid "write permission denied for '%s'\n" +msgid "allowed '%s' write permission for '%s' excluding '%s'\n" msgstr "" -#: netsync.cc:1691 +#: netsync.cc:1994 msgid "client signature OK, accepting authentication\n" msgstr "" -#: netsync.cc:1720 +#: netsync.cc:2016 msgid "bad client signature\n" msgstr "" -#: netsync.cc:1735 +#: netsync.cc:2024 +msgid "Writing HMAC confirm command" +msgstr "" + +#: netsync.cc:2043 #, c-format msgid "" -"received 'confirm' netcmd from server '%s' for collection '%s' in %s mode\n" +"received 'confirm' netcmd from server '%s' for pattern '%s' exclude '%s' in %" +"s mode\n" msgstr "" -#: netsync.cc:1750 +#: netsync.cc:2059 msgid "server signature OK, accepting authentication\n" msgstr "" -#: netsync.cc:1769 +#: netsync.cc:2064 msgid "bad server signature\n" msgstr "" -#: netsync.cc:1774 +#: netsync.cc:2069 msgid "unknown server key\n" msgstr "" -#: netsync.cc:1826 +#: netsync.cc:2138 #, c-format msgid "epoch with hash '%s' does not exist in our database" msgstr "" -#: netsync.cc:1836 +#: netsync.cc:2148 #, c-format msgid "public key '%s' is also called '%s'\n" msgstr "" -#: netsync.cc:1841 +#: netsync.cc:2153 #, c-format msgid "public key '%s' does not exist in our database" msgstr "" -#: netsync.cc:1855 +#: netsync.cc:2167 #, c-format msgid "revision '%s' does not exist in our database" msgstr "" -#: netsync.cc:1869 +#: netsync.cc:2181 #, c-format msgid "manifest '%s' does not exist in our database" msgstr "" -#: netsync.cc:1883 +#: netsync.cc:2195 #, c-format msgid "file '%s' does not exist in our database" msgstr "" -#: netsync.cc:1897 +#: netsync.cc:2209 #, c-format msgid "cert '%s' does not exist in our database" msgstr "" -#: netsync.cc:1916 +#: netsync.cc:2228 #, c-format msgid "received 'refine' netcmd on %s node '%s', level %d\n" msgstr "" -#: netsync.cc:1922 +#: netsync.cc:2233 #, c-format msgid "no corresponding %s merkle node for prefix '%s', level %d\n" msgstr "" -#: netsync.cc:1932 +#: netsync.cc:2243 #, c-format msgid "" "(#0) they have an empty slot %d (in a %s node '%s', level %d, we do not " "have)\n" msgstr "" -#: netsync.cc:1944 +#: netsync.cc:2255 #, c-format msgid "" "(#0) they have a live leaf at slot %d (in a %s node '%s', level %d, we do " "not have)\n" msgstr "" -#: netsync.cc:1946 +#: netsync.cc:2257 #, c-format msgid "(#0) requesting their %s leaf %s\n" msgstr "" -#: netsync.cc:1953 +#: netsync.cc:2264 #, c-format msgid "" "(#0) they have a dead leaf at slot %d (in a %s node '%s', level %d, we do " "not have)\n" msgstr "" -#: netsync.cc:1961 +#: netsync.cc:2272 #, c-format msgid "" "(#0) they have a subtree at slot %d (in a %s node '%s', level %d, we do not " "have)\n" msgstr "" -#: netsync.cc:1977 +#: netsync.cc:2288 #, c-format msgid "found corresponding %s merkle node for prefix '%s', level %d\n" msgstr "" -#: netsync.cc:1992 +#: netsync.cc:2302 #, c-format msgid "" "(#1) they have an empty slot %d in %s node '%s', level %d, and so do we\n" msgstr "" -#: netsync.cc:1999 +#: netsync.cc:2309 #, c-format msgid "" "(#2) they have an empty slot %d in %s node '%s', level %d, we have a live " "leaf\n" msgstr "" -#: netsync.cc:2013 +#: netsync.cc:2323 #, c-format msgid "" "(#3) they have an empty slot %d in %s node '%s', level %d, we have a dead " "leaf\n" msgstr "" -#: netsync.cc:2020 +#: netsync.cc:2330 #, c-format msgid "" "(#4) they have an empty slot %d in %s node '%s', level %d, we have a " "subtree\n" msgstr "" -#: netsync.cc:2044 +#: netsync.cc:2354 #, c-format msgid "" "(#5) they have a live leaf at slot %d in %s node '%s', level %d, we have " "nothing\n" msgstr "" -#: netsync.cc:2055 +#: netsync.cc:2365 #, c-format msgid "(#6) they have a live leaf at slot %d in %s node '%s', and so do we\n" msgstr "" -#: netsync.cc:2065 +#: netsync.cc:2375 #, c-format msgid "(#6) we both have live %s leaf '%s'\n" msgstr "" -#: netsync.cc:2081 +#: netsync.cc:2391 #, c-format msgid "" "(#7) they have a live leaf at slot %d in %s node %s, level %d, we have a " "dead one\n" msgstr "" -#: netsync.cc:2091 +#: netsync.cc:2401 #, c-format msgid "(#7) it's the same %s leaf '%s', but ours is dead\n" msgstr "" -#: netsync.cc:2104 +#: netsync.cc:2414 #, c-format msgid "" "(#8) they have a live leaf in slot %d of %s node '%s', level %d, we have a " "subtree\n" msgstr "" -#: netsync.cc:2113 +#: netsync.cc:2423 #, c-format msgid "" "(#8) we have a copy of their live leaf '%s' in slot %d of %s node '%s', " "level %d\n" msgstr "" -#: netsync.cc:2117 +#: netsync.cc:2427 #, c-format msgid "" "(#8) requesting a copy of their live leaf '%s' in slot %d of %s node '%s', " "level %d\n" msgstr "" -#: netsync.cc:2122 +#: netsync.cc:2432 #, c-format msgid "" "(#8) sending our subtree for refinement, in slot %d of %s node '%s', level %" "d\n" msgstr "" -#: netsync.cc:2141 +#: netsync.cc:2451 #, c-format msgid "" "(#9) they have a dead leaf at slot %d in %s node '%s', level %d, we have " "nothing\n" msgstr "" -#: netsync.cc:2148 +#: netsync.cc:2458 #, c-format msgid "" "(#10) they have a dead leaf at slot %d in %s node '%s', level %d, we have a " "live one\n" msgstr "" -#: netsync.cc:2158 +#: netsync.cc:2468 #, c-format msgid "(#10) we both have %s leaf %s, theirs is dead\n" msgstr "" -#: netsync.cc:2174 +#: netsync.cc:2484 #, c-format msgid "" "(#11) they have a dead leaf at slot %d in %s node '%s', level %d, so do we\n" msgstr "" -#: netsync.cc:2181 +#: netsync.cc:2491 #, c-format msgid "" "(#12) they have a dead leaf in slot %d of %s node '%s', we have a subtree\n" msgstr "" -#: netsync.cc:2201 +#: netsync.cc:2511 #, c-format msgid "" "(#13) they have a subtree at slot %d in %s node '%s', level %d, we have " "nothing\n" msgstr "" -#: netsync.cc:2214 +#: netsync.cc:2524 #, c-format msgid "" "(#14) they have a subtree at slot %d in %s node '%s', level %d, we have a " "live leaf\n" msgstr "" -#: netsync.cc:2226 +#: netsync.cc:2536 #, c-format msgid "(#14) pushed our leaf '%s' into fake subtree slot %d, level %d\n" msgstr "" -#: netsync.cc:2238 +#: netsync.cc:2548 #, c-format msgid "" "(#15) they have a subtree at slot %d in %s node '%s', level %d, we have a " "dead leaf\n" msgstr "" -#: netsync.cc:2257 +#: netsync.cc:2567 #, c-format msgid "" "(#16) they have a subtree at slot %d in %s node '%s', level %d, and so do " "we\n" msgstr "" -#: netsync.cc:2267 +#: netsync.cc:2577 #, c-format msgid "(#16) we both have %s subtree '%s'\n" msgstr "" -#: netsync.cc:2272 +#: netsync.cc:2582 #, c-format msgid "(#16) %s subtrees at slot %d differ, refining ours\n" msgstr "" -#: netsync.cc:2299 +#: netsync.cc:2609 #, c-format msgid "received 'send_data' netcmd requesting %s '%s'\n" msgstr "" -#: netsync.cc:2327 +#: netsync.cc:2637 #, c-format msgid "received 'send_delta' netcmd requesting %s edge '%s' -> '%s'\n" msgstr "" -#: netsync.cc:2381 +#: netsync.cc:2691 #, c-format msgid "delta requested for item type %s\n" msgstr "" -#: netsync.cc:2404 +#: netsync.cc:2714 #, c-format msgid "epoch '%s' already exists in our database\n" msgstr "" -#: netsync.cc:2411 +#: netsync.cc:2721 #, c-format msgid "received epoch %s for branch %s\n" msgstr "" -#: netsync.cc:2418 +#: netsync.cc:2728 #, c-format msgid "branch %s has no epoch; setting epoch to %s\n" msgstr "" -#: netsync.cc:2424 +#: netsync.cc:2734 #, c-format msgid "branch %s already has an epoch; checking\n" msgstr "" -#: netsync.cc:2435 +#: netsync.cc:2745 #, c-format msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'." msgstr "" -#: netsync.cc:2446 +#: netsync.cc:2756 #, c-format msgid "public key '%s' already exists in our database\n" msgstr "" -#: netsync.cc:2455 +#: netsync.cc:2765 #, c-format msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'" msgstr "" -#: netsync.cc:2464 +#: netsync.cc:2774 #, c-format msgid "cert '%s' already exists in our database\n" msgstr "" -#: netsync.cc:2472 +#: netsync.cc:2782 #, c-format msgid "hash check failed for revision cert '%s'" msgstr "" -#: netsync.cc:2487 +#: netsync.cc:2798 #, c-format msgid "revision '%s' already exists in our database\n" msgstr "" -#: netsync.cc:2490 +#: netsync.cc:2801 #, c-format msgid "received revision '%s' \n" msgstr "" -#: netsync.cc:2509 +#: netsync.cc:2820 #, c-format msgid "manifest version '%s' already exists in our database\n" msgstr "" -#: netsync.cc:2524 +#: netsync.cc:2835 #, c-format msgid "file version '%s' already exists in our database\n" msgstr "" -#: netsync.cc:2596 +#: netsync.cc:2907 #, c-format msgid "ignoring delta received for item type %s\n" msgstr "" -#: netsync.cc:2610 +#: netsync.cc:2921 #, c-format msgid "received 'nonexistant' netcmd for %s '%s'\n" msgstr "" -#: netsync.cc:2853 +#: netsync.cc:2998 #, c-format -msgid "processing %d byte input buffer from peer %s\n" +msgid "" +"received 'anonymous' netcmd from client for pattern '%s' excluding '%s' in %" +"s mode\n" msgstr "" -#: netsync.cc:2856 +#: netsync.cc:3028 #, c-format -msgid "input buffer for peer %s is overfull after netcmd dispatch\n" +msgid "" +"received 'auth(hmac)' netcmd from client '%s' for pattern '%s' exclude '%s' " +"in %s mode with nonce1 '%s'\n" msgstr "" -#: netsync.cc:2863 +#: netsync.cc:3193 #, c-format -msgid "caught bad_decode exception processing peer %s: '%s'\n" +msgid "processing %d byte input buffer from peer %s\n" msgstr "" -#: netsync.cc:2883 +#: netsync.cc:3196 #, c-format -msgid "connecting to %s\n" +msgid "input buffer for peer %s is overfull after netcmd dispatch\n" msgstr "" -#: netsync.cc:2916 netsync.cc:2943 +#: netsync.cc:3203 netsync.cc:3237 netsync.cc:3264 #, c-format -msgid "caught bad_decode exception decoding input from peer %s: '%s'\n" +msgid "protocol error while processing peer %s: '%s'\n" msgstr "" -#: netsync.cc:2929 +#: netsync.cc:3223 #, c-format +msgid "connecting to %s\n" +msgstr "" + +#: netsync.cc:3250 +#, c-format msgid "timed out waiting for I/O with peer %s, disconnecting\n" msgstr "" -#: netsync.cc:2951 +#: netsync.cc:3272 #, c-format msgid "read from fd %d (peer %s) closed OK after goodbye\n" msgstr "" -#: netsync.cc:2953 +#: netsync.cc:3274 #, c-format msgid "read from fd %d (peer %s) failed, disconnecting\n" msgstr "" -#: netsync.cc:2963 +#: netsync.cc:3284 #, c-format msgid "write on fd %d (peer %s) closed OK after goodbye\n" msgstr "" -#: netsync.cc:2965 +#: netsync.cc:3286 #, c-format msgid "write on fd %d (peer %s) failed, disconnecting\n" msgstr "" -#: netsync.cc:2972 +#: netsync.cc:3293 #, c-format msgid "got OOB data on fd %d (peer %s), disconnecting\n" msgstr "" -#: netsync.cc:2981 +#: netsync.cc:3302 #, c-format msgid "terminated exchange with %s\n" msgstr "" -#: netsync.cc:2989 +#: netsync.cc:3310 #, c-format msgid "successful exchange with %s\n" msgstr "" -#: netsync.cc:3010 +#: netsync.cc:3331 #, c-format msgid "fd %d is armed\n" msgstr "" -#: netsync.cc:3017 +#: netsync.cc:3338 #, c-format -msgid "" -"caught bad_decode exception decoding input from peer %s: '%s', marking as " -"bad\n" +msgid "protocol error while processing peer %s: '%s', marking as bad\n" msgstr "" -#: netsync.cc:3039 +#: netsync.cc:3360 #, c-format msgid "accepting new connection on %s : %d\n" msgstr "" -#: netsync.cc:3045 +#: netsync.cc:3366 msgid "accept() returned a dead client\n" msgstr "" -#: netsync.cc:3049 +#: netsync.cc:3370 #, c-format msgid "accepted new client connection from %s\n" msgstr "" -#: netsync.cc:3075 +#: netsync.cc:3397 #, c-format -msgid "" -"caught bad_decode exception decoding input from peer %s: '%s', " -"disconnecting\n" +msgid "protocol error while processing peer %s: '%s', disconnecting\n" msgstr "" -#: netsync.cc:3083 +#: netsync.cc:3405 #, c-format msgid "fd %d (peer %s) read failed, disconnecting\n" msgstr "" -#: netsync.cc:3099 +#: netsync.cc:3421 #, c-format msgid "fd %d (peer %s) write failed, disconnecting\n" msgstr "" -#: netsync.cc:3123 +#: netsync.cc:3445 #, c-format msgid "fd %d (peer %s) processing finished, disconnecting\n" msgstr "" -#: netsync.cc:3145 +#: netsync.cc:3467 #, c-format msgid "fd %d (peer %s) has been idle too long, disconnecting\n" msgstr "" -#: netsync.cc:3151 +#: netsync.cc:3473 #, c-format msgid "fd %d (peer %s) exchanged goodbyes and flushed output, disconnecting\n" msgstr "" -#: netsync.cc:3182 +#: netsync.cc:3504 #, c-format msgid "beginning service on %s : %d\n" msgstr "" -#: netsync.cc:3196 +#: netsync.cc:3518 #, c-format msgid "session limit %d reached, some connections will be refused\n" msgstr "" -#: netsync.cc:3202 +#: netsync.cc:3524 #, c-format msgid "i/o probe with %d armed\n" msgstr "" -#: netsync.cc:3212 +#: netsync.cc:3534 #, c-format msgid "timed out waiting for I/O (listening on %s : %d)\n" msgstr "" -#: netsync.cc:3228 +#: netsync.cc:3550 #, c-format msgid "got woken up for action on unknown fd %d\n" msgstr "" -#: netsync.cc:3243 +#: netsync.cc:3565 #, c-format msgid "got some OOB data on fd %d (peer %s), disconnecting\n" msgstr "" -#: netsync.cc:3300 -#, c-format -msgid "rebuilding merkle trees for collection %s\n" +#: netsync.cc:3632 +msgid "rebuilding merkle trees ...\n" msgstr "" -#: netsync.cc:3324 +#: netsync.cc:3635 #, c-format -msgid "including branch %s\n" +msgid "including branch %s" msgstr "" -#: netsync.cc:3344 +#: netsync.cc:3679 #, c-format msgid "setting epoch on %s to zero\n" msgstr "" -#: netsync.cc:3430 +#: netsync.cc:3767 #, c-format -msgid "%s included in collection %s\n" +msgid "network error: %s" msgstr "" -#: netsync.cc:3459 +#: netsync.cc:3772 #, c-format -msgid "network exception: %s" +msgid "network error: %s\n" msgstr "" -#: netsync.cc:3464 +#: packet.cc:324 #, c-format -msgid "trapped network exception: %s\n" -msgstr "" - -#: packet.cc:317 -#, c-format msgid "writing delayed revision data packet for %s\n" msgstr "" -#: packet.cc:324 -msgid "discarding revision data packet with unmet dependencies\n" +#: packet.cc:331 +#, c-format +msgid "discarding revision data packet %s with unmet dependencies\n" msgstr "" -#: packet.cc:330 +#: packet.cc:337 #, c-format msgid "writing delayed manifest data packet for %s\n" msgstr "" -#: packet.cc:337 -msgid "discarding manifest data packet with unmet dependencies\n" +#: packet.cc:344 +#, c-format +msgid "discarding manifest data packet %s with unmet dependencies\n" msgstr "" -#: packet.cc:343 +#: packet.cc:350 #, c-format msgid "writing delayed file data packet for %s\n" msgstr "" -#: packet.cc:356 +#: packet.cc:363 #, c-format msgid "writing delayed manifest %s packet for %s -> %s\n" msgstr "" -#: packet.cc:369 -msgid "discarding manifest delta packet with unmet dependencies\n" +#: packet.cc:376 +#, c-format +msgid "discarding manifest delta packet %s -> %s with unmet dependencies\n" msgstr "" -#: packet.cc:375 +#: packet.cc:383 #, c-format msgid "writing delayed file %s packet for %s -> %s\n" msgstr "" -#: packet.cc:388 -msgid "discarding file delta packet with unmet dependencies\n" +#: packet.cc:396 +#, c-format +msgid "discarding file delta packet %s -> %s with unmet dependencies\n" msgstr "" -#: packet.cc:394 +#: packet.cc:403 #, c-format msgid "writing delayed revision cert on %s\n" msgstr "" -#: packet.cc:401 +#: packet.cc:410 #, c-format msgid "discarding revision cert packet %s with unmet dependencies\n" msgstr "" -#: packet.cc:408 +#: packet.cc:417 #, c-format msgid "writing delayed public key %s\n" msgstr "" -#: packet.cc:421 +#: packet.cc:430 #, c-format msgid "writing delayed private key %s\n" msgstr "" -#: packet.cc:539 +#: packet.cc:600 #, c-format msgid "noting acceptence of revision %s\n" msgstr "" -#: packet.cc:552 +#: packet.cc:613 #, c-format msgid "noting acceptence of manifest %s\n" msgstr "" -#: packet.cc:565 +#: packet.cc:626 #, c-format msgid "noting acceptence of file %s\n" msgstr "" -#: packet.cc:587 +#: packet.cc:648 #, c-format msgid "skipping existing file version %s\n" msgstr "" -#: packet.cc:615 +#: packet.cc:676 #, c-format msgid "reconstructed file from delta '%s' -> '%s' has wrong id '%s'\n" msgstr "" -#: packet.cc:621 +#: packet.cc:682 #, c-format msgid "delaying file delta %s -> %s for preimage\n" msgstr "" -#: packet.cc:631 +#: packet.cc:692 #, c-format msgid "skipping delta to existing file version %s\n" msgstr "" -#: packet.cc:659 +#: packet.cc:720 #, c-format msgid "reconstructed file from reverse delta '%s' -> '%s' has wrong id '%s'\n" msgstr "" -#: packet.cc:665 +#: packet.cc:726 #, c-format msgid "delaying reverse file delta %s -> %s for preimage\n" msgstr "" -#: packet.cc:675 +#: packet.cc:736 #, c-format msgid "skipping reverse delta to existing file version %s\n" msgstr "" -#: packet.cc:692 +#: packet.cc:753 #, c-format msgid "skipping existing manifest version %s\n" msgstr "" -#: packet.cc:720 +#: packet.cc:781 #, c-format msgid "reconstructed manifest from delta '%s' -> '%s' has wrong id '%s'\n" msgstr "" -#: packet.cc:726 +#: packet.cc:787 #, c-format msgid "delaying manifest delta %s -> %s for preimage\n" msgstr "" -#: packet.cc:736 +#: packet.cc:797 #, c-format msgid "skipping delta to existing manifest version %s\n" msgstr "" -#: packet.cc:764 +#: packet.cc:825 #, c-format msgid "" "reconstructed manifest from reverse delta '%s' -> '%s' has wrong id '%s'\n" msgstr "" -#: packet.cc:770 +#: packet.cc:831 #, c-format msgid "delaying manifest reverse delta %s -> %s for preimage\n" msgstr "" -#: packet.cc:780 +#: packet.cc:841 #, c-format msgid "skipping reverse delta to existing manifest version %s\n" msgstr "" -#: packet.cc:802 +#: packet.cc:863 #, c-format msgid "delaying revision %s for new manifest %s\n" msgstr "" -#: packet.cc:816 +#: packet.cc:877 #, c-format msgid "delaying revision %s for old manifest %s\n" msgstr "" -#: packet.cc:826 +#: packet.cc:887 #, c-format msgid "delaying revision %s for old revision %s\n" msgstr "" -#: packet.cc:839 +#: packet.cc:900 #, c-format msgid "delaying revision %s for old file %s\n" msgstr "" -#: packet.cc:849 +#: packet.cc:910 #, c-format msgid "delaying revision %s for new file %s\n" msgstr "" -#: packet.cc:866 +#: packet.cc:928 #, c-format msgid "skipping existing revision %s\n" msgstr "" -#: packet.cc:883 +#: packet.cc:946 #, c-format msgid "delaying revision cert on %s\n" msgstr "" -#: packet.cc:896 +#: packet.cc:959 #, c-format msgid "skipping existing revision cert %s\n" msgstr "" -#: packet.cc:910 +#: packet.cc:973 #, c-format msgid "skipping prohibited public key %s\n" msgstr "" -#: packet.cc:920 +#: packet.cc:986 #, c-format msgid "key '%s' is not equal to key '%s' in database\n" msgstr "" -#: packet.cc:921 +#: packet.cc:987 #, c-format msgid "skipping existing public key %s\n" msgstr "" -#: packet.cc:934 +#: packet.cc:1000 #, c-format msgid "skipping prohibited private key %s\n" msgstr "" -#: packet.cc:940 +#: packet.cc:1009 #, c-format msgid "skipping existing private key %s\n" msgstr "" -#: packet.cc:976 +#: packet.cc:1045 msgid "packet valve opened\n" msgstr "" -#: packet.cc:988 +#: packet.cc:1057 #, c-format msgid "wrote %i queued packets\n" msgstr "" -#: packet.cc:1205 +#: packet.cc:1306 msgid "read data packet\n" msgstr "" -#: packet.cc:1227 +#: packet.cc:1328 msgid "read delta packet\n" msgstr "" -#: packet.cc:1258 +#: packet.cc:1359 msgid "read cert packet\n" msgstr "" -#: packet.cc:1284 +#: packet.cc:1385 msgid "read key data packet\n" msgstr "" -#: rcs_import.cc:67 +#: rcs_file.cc:343 #, c-format -msgid "Checking similarity of %d and %d\n" +msgid "parse failure %d:%d: expecting %s, got %s with value '%s'\n" msgstr "" -#: rcs_import.cc:78 +#: rcs_file.cc:362 #, c-format -msgid "checking %s %s\n" +msgid "parse failure %d:%d: expecting word '%s'\n" msgstr "" -#: rcs_import.cc:82 +#: rcs_file.cc:377 #, c-format -msgid "!similar_enough: %d/%d\n" +msgid "parse failure %d:%d: expecting word\n" msgstr "" -#: rcs_import.cc:87 +#: rcs_import.cc:204 #, c-format -msgid "Same file, different version: %s and %s\n" +msgid "Calculating time of %s\n" msgstr "" -#: rcs_import.cc:90 +#: rcs_import.cc:218 #, c-format -msgid "similar_enough: %d/%d\n" +msgid "= %i\n" msgstr "" -#: rcs_import.cc:96 +#: rcs_import.cc:232 #, c-format -msgid "Checking equality of %d and %d\n" +msgid "version %s -> tag %s\n" msgstr "" -#: rcs_import.cc:123 -#, c-format -msgid "Adding file %s version %s to %d\n" -msgstr "" - -#: rcs_import.cc:401 +#: rcs_import.cc:399 msgid "skipping identity file edge\n" msgstr "" -#: rcs_import.cc:409 rcs_import.cc:435 +#: rcs_import.cc:407 rcs_import.cc:433 #, c-format msgid "existing path to %s found, skipping\n" msgstr "" -#: rcs_import.cc:427 +#: rcs_import.cc:425 msgid "skipping identity manifest edge\n" msgstr "" -#: rcs_import.cc:487 +#: rcs_import.cc:543 #, c-format msgid "version %s has %d lines\n" msgstr "" -#: rcs_import.cc:492 +#: rcs_import.cc:553 #, c-format msgid "following RCS edge %s -> %s\n" msgstr "" -#: rcs_import.cc:495 +#: rcs_import.cc:556 #, c-format msgid "constructed RCS version %s, inserting into database\n" msgstr "" -#: rcs_import.cc:505 +#: rcs_import.cc:599 #, c-format -msgid "revision %s has no successor\n" +msgid "following RCS branch %s = '%s'\n" msgstr "" -#: rcs_import.cc:511 +#: rcs_import.cc:609 #, c-format -msgid "marking %s as not present in older manifests\n" +msgid "finished RCS branch %s = '%s'\n" msgstr "" -#: rcs_import.cc:529 +#: rcs_import.cc:630 rcs_import.cc:679 #, c-format -msgid "following RCS branch %s\n" -msgstr "" - -#: rcs_import.cc:544 -#, c-format -msgid "finished RCS branch %s\n" -msgstr "" - -#: rcs_import.cc:564 -#, c-format msgid "parsing RCS file %s\n" msgstr "" -#: rcs_import.cc:566 +#: rcs_import.cc:632 rcs_import.cc:682 #, c-format msgid "parsed RCS file %s OK\n" msgstr "" -#: rcs_import.cc:589 +#: rcs_import.cc:722 #, c-format -msgid "noting head version %s : %s\n" +msgid "importing file '%s'\n" msgstr "" -#: rcs_import.cc:674 +#: rcs_import.cc:759 #, c-format -msgid "looking up branch name for %s\n" +msgid "first version in branch %s would be %s\n" msgstr "" -#: rcs_import.cc:683 +#: rcs_import.cc:767 #, c-format -msgid "version %s has too few components, using branch %s\n" +msgid "file branchpoint for %s at %s\n" msgstr "" -#: rcs_import.cc:701 +#: rcs_import.cc:837 #, c-format -msgid "no branch %s found, using base '%s'\n" +msgid "error reading RCS file %s: %s\n" msgstr "" -#: rcs_import.cc:715 +#: rcs_import.cc:841 #, c-format -msgid "multiple entries (%d) for branch %s found, using: '%s'\n" +msgid "skipping non-RCS file %s\n" msgstr "" -#: rcs_import.cc:718 +#: rcs_import.cc:1020 #, c-format -msgid "unique entry for branch %s found: '%s'\n" +msgid "examining next commit [t:%d] [a:%d] [c:%d]\n" msgstr "" -#: rcs_import.cc:742 -#, c-format -msgid "Calculating time of %s\n" +#: rcs_import.cc:1030 +msgid "expiring cluster\n" msgstr "" -#: rcs_import.cc:756 +#: rcs_import.cc:1049 #, c-format -msgid "= %i\n" +msgid "last modification time is %d\n" msgstr "" -#: rcs_import.cc:780 -#, c-format -msgid "importing file '%s'\n" +#: rcs_import.cc:1064 +msgid "picked existing cluster target\n" msgstr "" -#: rcs_import.cc:865 +#: rcs_import.cc:1074 #, c-format -msgid "beginning branch %s at %s : %s\n" +msgid "building new cluster [t:%d] [a:%d] [c:%d]\n" msgstr "" -#: rcs_import.cc:875 -#, c-format -msgid "moving branch %s back to %s : %s\n" +#: rcs_import.cc:1096 +msgid "finished branch commits, writing all pending clusters\n" msgstr "" -#: rcs_import.cc:897 -#, c-format -msgid "using existing branchpoint for %s at %s : %s\n" +#: rcs_import.cc:1102 +msgid "finished writing pending clusters\n" msgstr "" -#: rcs_import.cc:939 +#: rcs_import.cc:1114 #, c-format -msgid "note_file_edge %s %d -> %s %d\n" +msgid "" +"%s appears to be a CVS repository root directory\n" +"try importing a module instead, with 'cvs_import %s/" msgstr "" -#: rcs_import.cc:947 -#, c-format -msgid "noting trunk edge %s : %s -> %s\n" +#: rcs_import.cc:1127 +msgid "need base --branch argument for importing" msgstr "" -#: rcs_import.cc:960 +#: rcs_import.cc:1139 #, c-format -msgid "noting branch edge %s : %s -> %s\n" +msgid "path %s does not exist" msgstr "" -#: rcs_import.cc:1000 +#: rcs_import.cc:1141 #, c-format -msgid "skipping non-RCS file %s\n" +msgid "path %s is not a directory" msgstr "" -#: rcs_import.cc:1018 +#: rcs_import.cc:1144 #, c-format -msgid "storing trunk manifest %s (base %s)\n" +msgid "could not change directory to %s" msgstr "" -#: rcs_import.cc:1020 +#: rcs_import.cc:1160 #, c-format -msgid "storing branch manifest %s (base %s)\n" +msgid "branch %s has %d entries\n" msgstr "" -#: rcs_import.cc:1024 +#: rcs_import.cc:1170 #, c-format -msgid "storing trunk head %s\n" +msgid "trunk has %d entries\n" msgstr "" -#: rcs_import.cc:1038 -msgid "skipping null manifest\n" -msgstr "" - -#: rcs_import.cc:1051 +#: rcs_import.cc:1223 #, c-format -msgid "skipping cyclical trunk manifest delta %s -> %s\n" +msgid "initial cluster on branch %s has %d live entries\n" msgstr "" -#: rcs_import.cc:1057 rcs_import.cc:1071 +#: rcs_import.cc:1230 #, c-format -msgid "writing full manifest %s\n" +msgid "initial cluster contains %s at %s\n" msgstr "" -#: rcs_import.cc:1065 +#: rcs_import.cc:1281 #, c-format -msgid "skipping cyclical branch manifest delta %s -> %s\n" +msgid "storing manifest '%s' (base %s)\n" msgstr "" -#: rcs_import.cc:1083 +#: rcs_import.cc:1286 #, c-format -msgid "storing trunk manifest delta %s -> %s\n" +msgid "storing head %s\n" msgstr "" -#: rcs_import.cc:1100 -#, c-format -msgid "storing branch manifest delta %s -> %s\n" +#: rcs_import.cc:1301 +msgid "skipping delta to null manifest\n" msgstr "" -#: rcs_import.cc:1151 +#: rcs_import.cc:1313 #, c-format -msgid "deleting entry state '%s' on '%s'\n" +msgid "skipping cyclical manifest delta %s -> %s\n" msgstr "" -#: rcs_import.cc:1169 +#: rcs_import.cc:1319 #, c-format -msgid "adding entry state '%s' on '%s'\n" +msgid "writing full manifest %s\n" msgstr "" -#: rcs_import.cc:1174 +#: rcs_import.cc:1329 #, c-format -msgid "skipping preserved entry state '%s' on '%s'\n" +msgid "storing manifest delta %s -> %s\n" msgstr "" -#: rcs_import.cc:1179 +#: rcs_import.cc:1391 #, c-format -msgid "applying state delta on '%s' : '%s' -> '%s'\n" +msgid "adding entry state '%s' on '%s'\n" msgstr "" -#: rcs_import.cc:1185 +#: rcs_import.cc:1398 #, c-format -msgid "logical changeset from parent -> child has %d file state changes\n" +msgid "applying state delta on '%s' : '%s' -> '%s'\n" msgstr "" -#: rcs_import.cc:1307 +#: rcs_import.cc:1409 #, c-format -msgid "" -"%s appears to be a CVS repository root directory\n" -"try importing a module instead, with 'cvs_import %s/" +msgid "deleting entry state '%s' on '%s'\n" msgstr "" -#: rcs_import.cc:1320 -msgid "need base --branch argument for importing" -msgstr "" - -#: rcs_import.cc:1327 +#: rcs_import.cc:1434 #, c-format -msgid "path %s does not exist" +msgid "consumed cluster %s (parent '%s')\n" msgstr "" -#: rcs_import.cc:1329 -#, c-format -msgid "path %s is not a directory" -msgstr "" - -#: rcs_import.cc:1332 -#, c-format -msgid "could not change directory to %s" -msgstr "" - -#: rcs_import.cc:1337 -msgid "phase 1 (version import) complete\n" -msgstr "" - -#: rcs_import.cc:1354 -msgid "phase 2 (ancestry reconstruction) complete\n" -msgstr "" - -#: rcs_import.cc:1372 -msgid "phase 3 (writing revisions) complete\n" -msgstr "" - -#: revision.cc:116 +#: revision.cc:123 msgid "verifying new revisions (this may take a while)\n" msgstr "" -#: revision.cc:118 +#: revision.cc:125 #, c-format msgid "Verifying revision %s has sane history (to depth %i)\n" msgstr "" -#: revision.cc:158 +#: revision.cc:163 #, c-format msgid "Examining %s -> %s\n" msgstr "" -#: revision.cc:231 +#: revision.cc:236 #, c-format msgid "%s and %s have no common ancestor, so done\n" msgstr "" -#: revision.cc:237 +#: revision.cc:242 msgid "already checked common ancestor, so done\n" msgstr "" -#: revision.cc:240 +#: revision.cc:245 #, c-format msgid "%s is a merge; verifying paths to common ancestor %s are sane\n" msgstr "" -#: revision.cc:294 +#: revision.cc:299 #, c-format msgid "loading parents for node %d\n" msgstr "" -#: revision.cc:314 +#: revision.cc:319 #, c-format msgid "parent %s -> node %d\n" msgstr "" -#: revision.cc:459 +#: revision.cc:469 #, c-format msgid "found %d intersecting nodes\n" msgstr "" -#: revision.cc:507 +#: revision.cc:517 #, c-format msgid "searching for common ancestor, left=%s right=%s\n" msgstr "" -#: revision.cc:512 +#: revision.cc:522 #, c-format msgid "common ancestor scan [par=%d,anc=%d,dom=%d]\n" msgstr "" -#: revision.cc:517 +#: revision.cc:527 #, c-format msgid "found node %d, ancestor of left %s and dominating right %s\n" msgstr "" -#: revision.cc:524 +#: revision.cc:534 #, c-format msgid "found node %d, ancestor of right %s and dominating left %s\n" msgstr "" -#: revision.cc:555 +#: revision.cc:571 #, c-format msgid "searching for least common ancestor, left=%s right=%s\n" msgstr "" -#: revision.cc:559 +#: revision.cc:575 #, c-format msgid "least common ancestor scan [par=%d,anc=%d]\n" msgstr "" -#: revision.cc:564 +#: revision.cc:580 #, c-format msgid "found node %d, ancestor of left %s and right %s\n" msgstr "" -#: revision.cc:618 +#: revision.cc:634 #, c-format msgid "checking whether %s is an ancestor of %s\n" msgstr "" -#: revision.cc:728 +#: revision.cc:746 #, c-format msgid "new root: %s\n" msgstr "" -#: revision.cc:738 +#: revision.cc:761 #, c-format msgid "new leaf: %s\n" msgstr "" -#: revision.cc:880 +#: revision.cc:903 #, c-format msgid "exploring changesets from parents of %s, seeking towards %s\n" msgstr "" -#: revision.cc:893 +#: revision.cc:916 #, c-format msgid "considering parent %s of %s\n" msgstr "" -#: revision.cc:919 +#: revision.cc:942 #, c-format msgid "revision %s is relevant, composing with edge to %s\n" msgstr "" -#: revision.cc:926 +#: revision.cc:949 #, c-format msgid "parent %s of %s is not relevant\n" msgstr "" -#: revision.cc:962 +#: revision.cc:985 #, c-format msgid "adding parents of %s to subgraph\n" msgstr "" -#: revision.cc:972 +#: revision.cc:995 #, c-format msgid "found parent %s of %s\n" msgstr "" -#: revision.cc:976 +#: revision.cc:999 #, c-format msgid "adding parent %s to next frontier\n" msgstr "" -#: revision.cc:991 +#: revision.cc:1014 #, c-format msgid "calculating composite changeset between %s and %s\n" msgstr "" -#: revision.cc:1009 +#: revision.cc:1032 #, c-format msgid "calculating changeset from %s to %s\n" msgstr "" -#: revision.cc:1013 +#: revision.cc:1036 #, c-format msgid "no common ancestor for %s and %s\n" msgstr "" -#: revision.cc:1014 +#: revision.cc:1037 #, c-format msgid "common ancestor is %s\n" msgstr "" -#: revision.cc:1045 +#: revision.cc:1068 #, c-format msgid "analyzing manifest changes from '%s' -> '%s'\n" msgstr "" -#: revision.cc:1058 +#: revision.cc:1081 #, c-format msgid "splitting ancestry for file %s\n" msgstr "" -#: revision.cc:1125 +#: revision.cc:1148 #, c-format msgid "noting ancestry from child %d -> parent %d\n" msgstr "" -#: revision.cc:1159 +#: revision.cc:1182 #, c-format msgid "setting epoch for %s to %s\n" msgstr "" -#: revision.cc:1215 +#: revision.cc:1238 msgid "scanning for nodes with 3+ parents\n" msgstr "" -#: revision.cc:1256 +#: revision.cc:1279 #, c-format msgid "optimizing out redundant edge %i -> %i\n" msgstr "" -#: revision.cc:1283 +#: revision.cc:1306 #, c-format msgid "rebuilding %d nodes\n" msgstr "" -#: revision.cc:1320 +#: revision.cc:1343 #, c-format msgid "node %d = manifest %s\n" msgstr "" -#: revision.cc:1331 +#: revision.cc:1354 #, c-format msgid "loaded '%s' manifest cert for node %s\n" msgstr "" -#: revision.cc:1359 +#: revision.cc:1382 #, c-format msgid "node %d = revision %s = manifest %s\n" msgstr "" -#: revision.cc:1371 +#: revision.cc:1394 #, c-format msgid "loaded '%s' revision cert for node %s\n" msgstr "" -#: revision.cc:1395 +#: revision.cc:1418 #, c-format msgid "processing node %d\n" msgstr "" -#: revision.cc:1399 +#: revision.cc:1422 #, c-format msgid "node %d already processed, skipping\n" msgstr "" -#: revision.cc:1413 +#: revision.cc:1436 #, c-format msgid "node %d is a root node\n" msgstr "" -#: revision.cc:1429 revision.cc:1512 +#: revision.cc:1452 revision.cc:1535 #, c-format msgid "parent node %d = revision %s\n" msgstr "" -#: revision.cc:1491 +#: revision.cc:1514 #, c-format msgid "processing edge from child %d -> parent %d\n" msgstr "" -#: revision.cc:1529 +#: revision.cc:1552 #, c-format msgid "mapped node %d to revision %s\n" msgstr "" -#: revision.cc:1535 +#: revision.cc:1558 #, c-format msgid "skipping already existing revision %s\n" msgstr "" -#: revision.cc:1547 +#: revision.cc:1570 msgid "rebuilding revision graph from existing graph\n" msgstr "" -#: revision.cc:1580 +#: revision.cc:1603 msgid "rebuilding revision graph from manifest certs\n" msgstr "" @@ -3822,51 +3866,49 @@ msgid "started up on %s\n" msgstr "" -#: transforms.cc:511 +#: transforms.cc:542 #, c-format msgid "converting %d bytes from %s to %s\n" msgstr "" -#: transforms.cc:517 +#: transforms.cc:548 #, c-format msgid "failed to convert string from %s to %s: '%s'" msgstr "" -#: transforms.cc:565 +#: transforms.cc:596 #, c-format msgid "converting %d bytes from IDNA ACE to UTF-8\n" msgstr "" -#: transforms.cc:568 transforms.cc:582 +#: transforms.cc:599 transforms.cc:613 #, c-format msgid "error converting %d UTF-8 bytes to IDNA ACE: %s" msgstr "" -#: transforms.cc:579 +#: transforms.cc:610 #, c-format msgid "converting %d bytes from UTF-8 to IDNA ACE\n" msgstr "" -#: transforms.cc:833 +#: transforms.cc:864 #, c-format msgid "doing linesep conversion to %s\n" msgstr "" -#: transforms.cc:937 -msgid "trying to end a brace expression in a glob when none is started" +#: transforms.cc:1140 +#, c-format +msgid "ACE-encoded %s: '%s'\n" msgstr "" -#: transforms.cc:966 -msgid "run-away bracket expression in glob" +#: ui.cc:125 +#, c-format +msgid "%.1f%s" msgstr "" -#: transforms.cc:968 -msgid "run-away brace expression in glob" -msgstr "" - -#: transforms.cc:1243 +#: ui.cc:129 #, c-format -msgid "ACE-encoded %s: '%s'\n" +msgid "%d" msgstr "" #: update.cc:66 @@ -3923,197 +3965,211 @@ msgid "bad character '%c' in key name '%s'" msgstr "" -#: vocab.cc:130 +#: vocab.cc:118 #, c-format +msgid "Invalid key length of %d bytes" +msgstr "" + +#: vocab.cc:136 +#, c-format +msgid "Invalid hmac length of %d bytes" +msgstr "" + +#: vocab.cc:166 +#, c-format msgid "prohibited absolute path '%s'" msgstr "" -#: vocab.cc:135 +#: vocab.cc:171 #, c-format msgid "empty path component in '%s'" msgstr "" -#: vocab.cc:138 +#: vocab.cc:174 #, c-format msgid "prohibited path component '%s' in '%s'" msgstr "" -#: vocab.cc:142 +#: vocab.cc:178 #, c-format msgid "bad character '%d' in path component '%s' of '%s'" msgstr "" -#: vocab.cc:148 +#: vocab.cc:184 #, c-format msgid "null byte in path component '%s' of '%s'" msgstr "" -#: vocab.cc:203 +#: vocab.cc:239 #, c-format msgid "prohibited book-keeping path in '%s'" msgstr "" -#: work.cc:57 +#: work.cc:61 #, c-format msgid "skipping ignorable file %s\n" msgstr "" -#: work.cc:63 +#: work.cc:67 #, c-format msgid "skipping %s, already accounted for in working copy\n" msgstr "" -#: work.cc:67 +#: work.cc:71 #, c-format msgid "adding %s to working copy add set\n" msgstr "" -#: work.cc:95 work.cc:201 +#: work.cc:99 work.cc:205 msgid "invalid path ''" msgstr "" -#: work.cc:97 +#: work.cc:101 #, c-format msgid "path %s does not exist\n" msgstr "" -#: work.cc:134 +#: work.cc:138 #, c-format -msgid "adding attribute '%s' to file %s to .mt-attrs\n" +msgid "adding attribute '%s' to file %s to %s\n" msgstr "" -#: work.cc:205 +#: work.cc:209 #, c-format msgid "skipping %s, not currently tracked\n" msgstr "" -#: work.cc:209 +#: work.cc:213 #, c-format msgid "adding %s to working copy delete set\n" msgstr "" -#: work.cc:213 -msgid "SORRY -- 'drop somedir' is not going to work.\n" +#: work.cc:217 +#, c-format +msgid "" +"sorry -- 'drop ' is currently broken.\n" +"try 'find %s -type f | monotone drop address@hidden'\n" msgstr "" -#: work.cc:214 -msgid "Revert and try 'find somedir -type f | xargs monotone drop'\n" -msgstr "" - -#: work.cc:225 +#: work.cc:229 #, c-format -msgid "dropped attributes for file %s from .mt-attrs\n" +msgid "dropped attributes for file %s from %s\n" msgstr "" -#: work.cc:248 +#: work.cc:252 msgid "invalid source path ''" msgstr "" -#: work.cc:249 +#: work.cc:253 msgid "invalid destination path ''" msgstr "" -#: work.cc:260 +#: work.cc:264 #, c-format msgid "%s does not exist in current revision\n" msgstr "" -#: work.cc:263 +#: work.cc:267 #, c-format msgid "%s already exists in current revision\n" msgstr "" -#: work.cc:265 +#: work.cc:269 #, c-format msgid "adding %s -> %s to working copy rename set\n" msgstr "" -#: work.cc:285 +#: work.cc:289 #, c-format -msgid "%s has existing attributes in .mt-attrs; clean them up first" +msgid "%s has existing attributes in %s; clean them up first" msgstr "" -#: work.cc:294 +#: work.cc:298 #, c-format msgid "moving attributes for %s to %s\n" msgstr "" -#: work.cc:313 +#: work.cc:317 #, c-format msgid "work path is %s\n" msgstr "" -#: work.cc:322 +#: work.cc:326 #, c-format msgid "checking for un-committed work file %s\n" msgstr "" -#: work.cc:326 +#: work.cc:330 #, c-format msgid "read rearrangement from %s\n" msgstr "" -#: work.cc:330 +#: work.cc:334 #, c-format msgid "no un-committed work file %s\n" msgstr "" -#: work.cc:367 +#: work.cc:371 #, c-format msgid "revision path is %s\n" msgstr "" -#: work.cc:377 +#: work.cc:381 #, c-format msgid "working copy is corrupt: %s does not exist\n" msgstr "" -#: work.cc:380 +#: work.cc:384 #, c-format msgid "loading revision id from %s\n" msgstr "" -#: work.cc:389 +#: work.cc:391 #, c-format +msgid "Problem with working directory: %s is unreadable" +msgstr "" + +#: work.cc:400 +#, c-format msgid "writing revision id to %s\n" msgstr "" -#: work.cc:408 +#: work.cc:419 #, c-format msgid "base revision %s does not exist in database\n" msgstr "" -#: work.cc:411 +#: work.cc:422 #, c-format msgid "old manifest is %s\n" msgstr "" -#: work.cc:414 +#: work.cc:425 #, c-format msgid "base manifest %s does not exist in database\n" msgstr "" -#: work.cc:419 +#: work.cc:430 #, c-format msgid "old manifest has %d entries\n" msgstr "" -#: work.cc:440 +#: work.cc:451 #, c-format msgid "user log path is %s\n" msgstr "" -#: work.cc:480 +#: work.cc:500 #, c-format msgid "options path is %s\n" msgstr "" -#: work.cc:527 +#: work.cc:547 #, c-format msgid "local dump path is %s\n" msgstr "" -#: work.cc:583 +#: work.cc:599 #, c-format msgid "attribute map path is %s\n" msgstr ""