# # # patch "ChangeLog" # from [faf09d4f64efed3f54fb9bf2415833d191ce15a7] # to [8b4907da3d82fd46620e4dac390d2637f9d693fa] # # patch "po/de.po" # from [2bcc2419844611c80b7086caea5c8fb34242dd3c] # to [92988d66272e8b9a066043a15d211ea522d554dd] # # patch "po/fr.po" # from [bc6e687ce5f93b8b33bc823dc19d18a879b10dd7] # to [ba8591754e834e5116692184360e04dba26ae1b4] # # patch "po/it.po" # from [008d67cc9a07706ebfd8fe0e0672d21ae55f29cf] # to [93f2a2b3a78121687e53a2bf154273008b6eee3f] # # patch "po/ja.po" # from [5b2a2f79c1265b794a1ba553c279e1f687a2c443] # to [0a68d3ac08007a2eddf9b7aed9334f247358e719] # # patch "po/pt_BR.po" # from [5b4a07260e872253065c6f12b452b982b6985508] # to [49b8754c262e335905ff8d03f6da3be64d89a5c6] # ============================================================ --- ChangeLog faf09d4f64efed3f54fb9bf2415833d191ce15a7 +++ ChangeLog 8b4907da3d82fd46620e4dac390d2637f9d693fa @@ -1,3 +1,7 @@ +2006-07-10 Zack Weinberg + + * po/de.po, po/fr.po, po/it.po, po/ja.po, po/pt_BR.po: Re-msgmerge'd. + 2006-07-10 Richard Levitte * po/sv.po: A string got changed... @@ -20,7 +24,7 @@ 2006-07-08 Nathaniel Smith - * roster.cc (mark_roster_with_no_parents) + * roster.cc (mark_roster_with_no_parents) (mark_roster_with_one_parent): New functions. Plus tests, etc. @@ -197,7 +201,7 @@ 2006-07-05 Nathaniel Smith - * commands.cc (complete_command): + * commands.cc (complete_command): * monotone.cc (cpp_main): Minor code cleanups. 2006-07-05 Nathaniel Smith @@ -265,7 +269,7 @@ * charset.cc: Fix some missing initializers in unit tests. * randomfile.hh: Use randomizer, not rand(). * roster.cc: Likewise. - * refiner.{cc,hh}: Add random unit tester, + * refiner.{cc,hh}: Add random unit tester, and fix serious protocol-wedging bug. * unit_tests.{cc,hh}: Register refiner tests. @@ -337,7 +341,7 @@ 2006-06-24 Marcel van der Boom * roster.cc (update_current_roster_from_filesystem): Change - 'monotone' to 'mtn' in an error message. + 'monotone' to 'mtn' in an error message. 2006-06-24 Thomas Moschny @@ -385,7 +389,7 @@ 2006-06-20 Nathaniel Smith - * configure.ac: Remove autotest-related configury. + * configure.ac: Remove autotest-related configury. Add magic AM_INIT_AUTOMAKE options to make tar handle the long filenames in the new test suite (automake 1.9 is now required). @@ -403,7 +407,7 @@ 2006-06-19 Nathaniel Smith - * Makefile.am (EXTRA_DIST, BUILT_SOURCES_CLEAN): + * Makefile.am (EXTRA_DIST, BUILT_SOURCES_CLEAN): * database.hh, database.cc: Remove old dead views stuff. 2006-06-20 Richard Levitte @@ -417,14 +421,14 @@ gettext. Here's what xgettext said: cmd_automate.cc:68: warning: Empty msgid. It is reserved by GNU gettext: - gettext("") returns the header entry with - meta information, not the empty string. + gettext("") returns the header entry with + meta information, not the empty string. cmd_automate.cc:209: warning: Empty msgid. It is reserved by GNU gettext: - gettext("") returns the header entry with - meta information, not the empty string. + gettext("") returns the header entry with + meta information, not the empty string. cmd_list.cc:539: warning: Empty msgid. It is reserved by GNU gettext: - gettext("") returns the header entry with - meta information, not the empty string. + gettext("") returns the header entry with + meta information, not the empty string. I'm quite sure we don't want the header entry printed... @@ -455,7 +459,7 @@ validated against workspace paths ; the unit_tests currently create directories {x,y}/{x,y} wherever they run to pass workspace path validation and this should probably be cleaned up - * roster.{cc,hh} (make_restricted_csets, + * roster.{cc,hh} (make_restricted_csets, update_current_roster_from_filesystem, extract_path_set): use node_restrictions * work.{cc,hh} (find_missing): use node_restriction @@ -487,11 +491,11 @@ 2006-06-17 Derek Scherger * testsuite.lua: fix references to renamed tests - + 2006-06-17 Derek Scherger * tests/README: add a couple of notes on where to find test logs - + 2006-06-17 Derek Scherger * tests/'heads': @@ -501,12 +505,12 @@ * tests/trust_hooks_and_'trusted'_command: * tests/trust_hooks_and_trusted_command: rename tests to play nicer with find and xargs - + 2006-06-17 Derek Scherger * tests/ls_unknown_of_unknown_subdir: new xfail test * testsuite.lua: insert in tests table - + 2006-06-17 Timothy Brownawell * cmd.hh, commands.cc: Modify how command parameters description @@ -585,7 +589,7 @@ 2006-06-08 Matt Johnston - * inodeprint.cc: convert to basic_io format. + * inodeprint.cc: convert to basic_io format. Silently skips reading old format files, then writes out the new format as per usual. Old mtn versions have no format checking so will read the (nonsensical) @@ -698,7 +702,7 @@ 2006-06-02 Roberta Lazzeri * po/it.po: Translated a few more and fuzzy strings to Italian (90 to go). - + 2006-06-01 Matthew Gregan * visualc/monotone.vcproj: Add win32/os_strerror.cc to project. @@ -738,11 +742,11 @@ 2006-05-28 Graydon Hoare * AUTHORS: Minor touchups. - * ChangeLog: Fix capitalization. - * annotate.{cc,hh}: + * ChangeLog: Fix capitalization. + * annotate.{cc,hh}: * app_state.{cc,hh}: * automate.{cc,hh}: - * lcs.cc: + * lcs.cc: * basic_io.{cc,hh}: Cosmetic and copyright fixes. * configure.ac: Permit PCH for 4.* not 4.0*. * cert.cc: @@ -751,7 +755,7 @@ * cmd_merging.cc: * cmd_ws_commit.cc: * database.cc: - * ui.hh: + * ui.hh: * unix/get_system_flavour.cc: * xdelta.cc: Purge boost::format uses. * sanity.{cc,hh}: Hide boost::format in pimpl. @@ -901,7 +905,7 @@ * work.cc: * xdelta.cc: namespace fixups as described in the ROADMAP - + 2006-05-28 Richard Levitte * po/sv.po: Update two fuzzies. @@ -937,7 +941,7 @@ * roster.{cc,hh} (read_roster_and_marking, write_roster_and_marking, write_manifest_of_roster, calculate_ident, do_testing_on_one_roster, tests_on_two_rosters, - write_roster_test): + write_roster_test): * transforms.{cc,hh} (calculate_ident): use roster_data * vocab.cc: add dump template for roster_data * vocab.hh: add roster_data typedef @@ -1011,13 +1015,13 @@ * Makefile.am: Add uri.{cc,hh}. * app_state.{cc,hh} (use_transport_auth): New state variable. * cmd_netsync.cc (serve): Support use_transport_auth. - * constants.hh (netcmd_minsz): Remove dead byte count related to adler32. + * constants.hh (netcmd_minsz): Remove dead byte count related to adler32. * hmac.{cc,hh} (active): New state variable. * lua.{cc,hh} (lua_hooks::hook_get_netsync_connect_command): (lua_hooks::hook_use_transport_auth): New hooks. * monotone.cc: Support --no-transport-auth. * monotone.texi: Document all this stuff. - * netcmd.cc: Predicate hmac activity on hmac.is_active(). + * netcmd.cc: Predicate hmac activity on hmac.is_active(). * netsync.cc: Parse URIs via lua, optionally disable transport auth. * options.hh (OPT_NO_TRANSPORT_AUTH): New option. * std_hooks.lua (get_netsync_connect_command): @@ -1096,7 +1100,7 @@ * automate.cc: add basic_io symbols (hook_get_revision_cert_trust, automate_certs): push symbols - (automate_keys): push symbols and hexenc's + (automate_keys): push symbols and hexenc's * basic_io.{cc,hh} (is_xdigit, is_alpha, is_alnum, is_space): move to vocab.hh (push_hex_pair, push_hex_triple, push_str_pair, push_file_pair, @@ -1104,7 +1108,7 @@ hexenc in place of strings to avoid repeated/redundant validations which account for 4% of the client profile of a fresh pull of the monotone db - * cset.cc (print_cset): push symbols and hexenc's + * cset.cc (print_cset): push symbols and hexenc's * legacy.cc (read_dot_mt_attrs, extract_renames, get_manifest_and_renames_for_rev): parse symbols * revision.cc (print_edge, print_stanza): push symbols and hexenc's @@ -1112,7 +1116,7 @@ * vocab.cc (is_xdigit): move to vocab.hh (verify): new verification for symbol type * vocab.hh (is_xdigit, is_alpha, is_alnum, is_space): add functions - from basic_io.hh + from basic_io.hh * vocab_terms.hh (symbol): new ATOMIC type for basic_io symbols which allow only [a-zA-Z0-9_] @@ -1331,7 +1335,7 @@ * automate.cc (automate_get_base_revision_id, automate_get_current_revision_id): new functions - (automate_command): call them + (automate_command): call them * cmd_automate.cc (automate): fix indentation and add entries for new commands * monotone.texi: document new commands @@ -1350,7 +1354,7 @@ 2006-05-12 Matt Johnston - * merkle_tree.cc (bitset_to_prefix): use strings directly + * merkle_tree.cc (bitset_to_prefix): use strings directly rather than ostringstream for getting bitset blocks, ~10% cpu time improvement for empty pull. @@ -1374,7 +1378,7 @@ 2006-05-09 Graydon Hoare - * xdelta.cc (copied_extent::operator<): Fix ordering bug which + * xdelta.cc (copied_extent::operator<): Fix ordering bug which caused an unfortunate degradation in inverse delta quality, particularly on ChangeLogs. @@ -1388,7 +1392,7 @@ * automate.cc (automate_inventory): remove invalid assertion * cmd_diff_log.cc (log): check for null revision id rather than missing revision id - * commands.cc: remove unnecessary #include + * commands.cc: remove unnecessary #include (help): fix indentation * netsync.cc: remove stale comment @@ -1435,7 +1439,7 @@ 2006-05-06 Nathaniel Smith Patch contributed by 'zecke'. - * database.cc (check_integrity): + * database.cc (check_integrity): * database_check.cc (check_db_integrity_check): Add a call to PRAGMA integrity_check to 'db check'. @@ -1505,7 +1509,7 @@ * xdelta.{cc,hh} (invert_xdelta): New function. * database.{cc,hh} (database::get_arbitrary_file_delta): Add. (database::put_file_version): Use invert_xdelta. - * netsync.cc (session::note_file_delta): + * netsync.cc (session::note_file_delta): Use get_arbitrary_file_delta. 2006-04-29 Richard Levitte @@ -1518,7 +1522,7 @@ binary by >100kB (from Benoît Dejean) 2006-04-28 Matthew Nicholson - + * tests/t_escaped_selectors.at: Added. Tests escaped selectors. * testsuite.at: Added t_escaped_selectors.at. @@ -1602,10 +1606,10 @@ * cmd_*.cc: merge new restrictions changes in from commands.cc split - * tests/t_log_dir.at: remove stale comment - * work.{cc,hh}(find_missing, find_unknown_and_ignored): move + * tests/t_log_dir.at: remove stale comment + * work.{cc,hh}(find_missing, find_unknown_and_ignored): move these functions here from commands.cc split - + 2006-04-26 Nathaniel Smith * Makefile.am (package_full_revision_raw.txt): Pass --root to our @@ -1656,7 +1660,7 @@ * monotone.texi: Add Jeronimo to copyright holder list. * AUTHORS: And the contributor list. - + 2006-04-25 Jeronimo Pellegrini * monotone.texi (Using packets): New section, short tutorial @@ -1892,7 +1896,7 @@ * po/sv.po: "ls branches" changed to take a pattern. 2006-04-12 Matthew Nicholson - + * commands.cc (pid_file::pid_file): Move check for open pidfile until after we attempt to open the file :). @@ -1912,7 +1916,7 @@ 2006-04-12 Thomas Keller * po/README: Added small HOWTO for new translations - + 2006-04-11 Timothy Brownawell * merkle_tree.hh: make merkle_table be a hash_map instead of a map. @@ -1979,7 +1983,7 @@ 2006-04-08 Nathaniel Smith - * configure.ac, debian/changelog, win32/monotone.iss: + * configure.ac, debian/changelog, win32/monotone.iss: * monotone.spec: Bump version number to 0.26. * NEWS: Insert release time. @@ -2082,7 +2086,7 @@ * figures/README: Revise to describe a better .png generation method * figures/{manifest,file-id-manifest-id,revision-chaining,revision}.png: - Reregenerate accordingly + Reregenerate accordingly * figures/oo-figures.sxd: Source changes for the following: * figures/{local,general}-workflow: "working copy" to "workspace", MT to _MTN @@ -2103,7 +2107,7 @@ * figures/README: Add note on PNGs. * figures/{manifest,file-id-manifest-id,revision-chaining,revision}.png: Regenerate PNGs. - + 2006-04-07 Nathaniel Smith * figures/oo-figures.sxd: Sigh, accidentally discarded the changes @@ -2119,14 +2123,14 @@ * figures/{manifest,file-id-manifest-id,revision-chaining,revision}: Finally managed to get proper pdfs out of OpenOffice. Committing now before I have a chance to screw things up. - + 2006-04-06 Nathaniel Smith * figures/README: New file. * figures/oo-figures.sxd: Write into the file the filename that each figure should be exported to. I'll actually do the exports later... - + 2006-04-07 Benoît Dejean * ui.{cc,hh}: Use untranslated ticker name as key in ui.tickers @@ -2156,14 +2160,14 @@ package_full_revision.txt, not package_full_revision_dist.txt. 2006-04-06 Nathaniel Smith - + * monotone.texi: Fix up the ascii diagrams in the early sections to match current data formats. Fix up sample output similarly. Fix even more places where we say "monotone" to refer to the command. * figures/oo-figures.sxd: Update graphical figures to match current data formats. - + 2006-04-06 Nathaniel Smith * monotone.texi: Fix a bunch more places where we say "monotone" @@ -2317,7 +2321,7 @@ passphrases from 'confdir/passphrases'. 2006-04-02 Matthew Nicholson - + * contrib/ChangeLog.sh: Updated to reflect monotone name changes. 2006-04-02 Matthew Nicholson @@ -2398,7 +2402,7 @@ * monotone.spec, win32/monotone.iss: Untested mtn-related tweaks, and bump version to 0.26pre3. * debian/changelog: Bump version. - + 2006-03-29 Nathaniel Smith * NEWS: First pass at entry for 0.26pre3. @@ -2505,10 +2509,10 @@ * commands.cc (CMD_NO_MT): Rename to... (CMD_NO_WORKSPACE): ...this. * *.cc, *.hh: s/MT/_MTN/ (mostly in comments). - + 2006-03-28 Nathaniel Smith - * commands.cc (get_log_message_interactively): + * commands.cc (get_log_message_interactively): * std_hooks.lua (edit_comment): s/MT:/MTN:/ 2006-03-28 Nathaniel Smith @@ -2523,7 +2527,7 @@ * database.cc (check_format): Use .empty() instead of comparing .size() to zero, trivial style cleanup. (check_is_not_rosterified): New method. - * revision.cc (build_changesets_from_manifest_ancestry) + * revision.cc (build_changesets_from_manifest_ancestry) (build_roster_style_revs_from_manifest_style_revs): Call it. * tests/t_rosterify_on_rosterified_db.at, testsuite.at: New test. @@ -2566,7 +2570,7 @@ 2006-03-22 Nathaniel Smith - * key_store.cc (consume_key_pair, read_key_dir) + * key_store.cc (consume_key_pair, read_key_dir) (ensure_in_database, write_key): Add some logging. 2006-03-22 Matt Johnston @@ -2767,7 +2771,7 @@ * monotone.texi (Selectors): Remove line noise. Also, add an example for c:. - + * roster.cc (update_restricted_roster_from_filesystem): Put back hint about drop --missing, revert --missing that was lost in transition to rosters. @@ -3002,9 +3006,9 @@ * botan/gzip.h: Reduce gzip to level 1. * constants.cc (db_roster_cache_sz): Set to 7. * database.cc: Use lru cache for vcache; add roster cache. - * hmac.cc: Instantiate "SHA-160" not "SHA-1" + * hmac.cc: Instantiate "SHA-160" not "SHA-1" (corrects lookup miss in botan's algorithm table). - * transforms.cc ({encode,decode}_hexenc): Specialize for idlen. + * transforms.cc ({encode,decode}_hexenc): Specialize for idlen. 2006-03-05 Matthew Gregan @@ -3045,7 +3049,7 @@ (add_paths, add_nodes, map_paths, map_nodes): simplify after above cleanup and removal of implicit includes; * restrictions.hh: remove stale comments - + 2006-03-30 Derek Scherger * commands.cc (status, ls_changed, commit, diff, revert): call @@ -3055,14 +3059,14 @@ * roster.{cc,hh} (check_restricted_cset): new function to issue a nice message if required directories have been excluded * tests/t_log_dir.at: un-XFAIL - + 2006-03-03 Derek Scherger * restrictions.cc (check_for_missing_additions): new function - (remap_paths): make static + (remap_paths): make static (get_base_roster_and_working_cset): call check_for_missing_additions * tests/t_restriction_excludes_parent.at: un-XFAIL - + 2006-03-03 Patrick Mauritz * commands.cc: remove rdata, certs, fdata and fdelta commands @@ -3095,7 +3099,7 @@ add --unknown, when new files exist in new directories, would try to add files multiple times. - + * commands.cc (CMD(add)): Call perform_additions() with correct new boolean flag val to determine whether it recurses on the paths we hand it. @@ -3276,9 +3280,9 @@ 2006-02-25 Derek Scherger - * automate.cc (automate_inventory): + * automate.cc (automate_inventory): * commands.cc (status, ls_known, find_unknown_and_ignored, - find_missing, ls_changed, commit, diff, revert, log): + find_missing, ls_changed, commit, diff, revert, log): * roster.cc (update_current_roster_from_filesystem): add app_state to restriction constructors * restrictions.{cc,hh}: add support for --depth option and ignored @@ -3300,7 +3304,7 @@ 2006-02-20 Derek Scherger * restrictions.{cc,hh}: attempt to simplify and remove duplication - + 2006-02-20 Derek Scherger * commands.cc (status, ls_known, find_unknown_and_ignored, @@ -3310,7 +3314,7 @@ 2006-02-13 Derek Scherger - * app_state.{cc,hh}: + * app_state.{cc,hh}: * globis.{cc,hh}: make exclude_patterns a vector rather than a set so that restriction includes/excludes are of the same type @@ -3395,13 +3399,13 @@ * roster.cc (shallow_equal): Publically expose. * roster.cc, roster_merge.cc: Various compile fixes. - + 2006-02-19 Nathaniel Smith * roster_merge.{hh,cc}: Make terminology more consistent. "marking_map" type -> "markings" name, "marking_t" type -> "marking" name. - + 2006-02-19 Nathaniel Smith * roster.{hh,cc} (testing_node_id_source): Make this node source @@ -3416,7 +3420,7 @@ 2005-10-19 Matthew A. Nicholson * contrib/monotone.bash_completion: Update for 0.25. - + 2006-02-19 Matthew Gregan * cset.hh (struct editable_tree): Add commit() member function to @@ -3464,8 +3468,8 @@ 2006-02-13 Nathaniel Smith * roster_merge.cc (is_clean): Simplify. - (add_roster_merge_tests): - * unit_tests.cc (init_unit_test_suite): + (add_roster_merge_tests): + * unit_tests.cc (init_unit_test_suite): * unit_tests.hh (add_roster_merge_tests): Add unit test boilerplate. @@ -3599,7 +3603,7 @@ * tests/t_rename.at: * work.cc (visit_file): attempt to improve a couple of messages; remove some unrequired \n's - + 2006-02-10 Derek Scherger * netsync.cc (process_anonymous_cmd, process_auth_cmd): don't @@ -3725,12 +3729,12 @@ anywhere in them. Hopefully will help users running in a Windows shell when they do: monotone sync myserver 'mybranch*' and nothing happens because the ' characters are passed in to monotone. - + 2005-01-30 Emile Snyder * annotate.cc: (do_annotate) Add ticker for revisions processed to annotate command. - + 2006-01-29 Richard Levitte * po/sv.po: Update a few translations, leave a number of fuzzy @@ -3751,15 +3755,15 @@ 2006-01-26 Derek Scherger - * app_state.{cc,hh}: - * commands.cc (log): - * monotone.cc: + * app_state.{cc,hh}: + * commands.cc (log): + * monotone.cc: * options.hh: allow --next to view upcoming changes * tests/t_log_depth.at: rename to ... * tests/t_log_last_next.at: ... this since log now uses --last/--next and not --depth * testsuite.at: rename t_log_depth.at to t_log_last_next.at - + 2006-01-27 Matthew Gregan * monotone.texi: Clean up 'serve' syntax in a couple of places. @@ -3817,7 +3821,7 @@ variables, rely more on automatic conversion. 2006-01-24 Vinzenz Feenstra - + * query_args.hh: Introduced struct query_args and struct query_args_param. Used to typesafe arguments for database::execute and database::fetch @@ -3909,7 +3913,7 @@ * commands.cc (CMD(annotate)): Add --brief option to the annotate command and remove obsolete comment lines. - * annotate.cc (dump): Pass in app_state to allow access to db for + * annotate.cc (dump): Pass in app_state to allow access to db for cert lookups on revisions. Honor new --brief flag by printing .. by : as the annotation rather than the raw revision id, and only printing the @@ -3947,8 +3951,8 @@ that the user had not run 'db rosterify'. * database.cc (check_rosterified): Rename to... (check_format): ...this. Detect unchangesetified dbs too. - (sql, ensure_open_for_format_changes, get_roster_id_for_revision): - * revision.cc (build_roster_style_revs_from_manifest_style_revs) + (sql, ensure_open_for_format_changes, get_roster_id_for_revision): + * revision.cc (build_roster_style_revs_from_manifest_style_revs) (build_changesets_from_manifest_ancestry): Adjust accordingly. * tests/t_check_db_format.at, testsuite.at: New test. @@ -4011,7 +4015,7 @@ (unify_roster_oneway, unify_rosters): Remove unused new_ids argument. Add call to union_corpses. Add big comment explaining what's going on. - (test_unify_rosters_end_to_end_ids) + (test_unify_rosters_end_to_end_ids) (test_unify_rosters_end_to_end_attr_corpses): Split and improve tests. @@ -4033,16 +4037,16 @@ * roster.cc (test_unify_rosters_end_to_end): Add failing test for unify_roster's handling of attr corpses. - + 2006-01-15 Nathaniel Smith - * cert.cc (load_key_pair): + * cert.cc (load_key_pair): * keys.cc (require_password): Use accessor method, so as to actually compile... 2006-01-15 Matt Johnston - * ui.cc: make tickers saner (203 K vs 0.2 M). + * ui.cc: make tickers saner (203 K vs 0.2 M). Print full byte counts below 1 K. 2006-01-14 Nathaniel Smith @@ -4178,7 +4182,7 @@ 2006-01-10 Nathaniel Smith - * netsync.cc (session): + * netsync.cc (session): * commands.cc (read): Adjust to match previous change. 2006-01-10 Nathaniel Smith @@ -4194,8 +4198,8 @@ 2006-01-10 Nathaniel Smith - * std_hooks.lua: - * lua.cc (hook_merge2): + * std_hooks.lua: + * lua.cc (hook_merge2): * diff_patch.cc (try_to_merge_files): Remove merge2 code, since we no longer do merge2's. (We can always revive it if we add suture support.) @@ -4215,7 +4219,7 @@ 2006-01-10 Nathaniel Smith - * database.cc (manifest_cert_exists, put_manifest_cert): + * database.cc (manifest_cert_exists, put_manifest_cert): (get_manifest_cert, get_manifest_certs): Remove unused methods. 2006-01-10 Nathaniel Smith @@ -4230,7 +4234,7 @@ 2006-01-10 Nathaniel Smith - * packet.cc (consume_file_reverse_delta) + * packet.cc (consume_file_reverse_delta) (struct feed_packet_consumer): Remove support for nonexistent "frdelta" packet type. * database.{hh,cc} (put_reverse_version) @@ -4287,7 +4291,7 @@ * tests/t_restricted_commands_consistent.at: new test to give that bark some bite * testsuite.at: call it - + 2005-12-29 Nathaniel Smith * NEWS: Write up for 0.25. @@ -4599,9 +4603,9 @@ 2005-11-27 Grahame Bowland * configure.ac: expose --enable-ipv6 in config.h - * monotone.cc (cpp_main): parse IPv6 addresses correctly + * monotone.cc (cpp_main): parse IPv6 addresses correctly in --bind arguments - * netsync.cc (call_server,serve_connections): if USE_IPV6 defined, + * netsync.cc (call_server,serve_connections): if USE_IPV6 defined, create netxx Address instances with ipv6 enabled. * netxx/address.cxx (parse_uri): parse IPv6 addresses as hostnames * closes bug #14446 @@ -4613,13 +4617,13 @@ 2005-11-27 Grahame Bowland - * automate.cc (automate_certs,automate_keys): use non-exclusive + * automate.cc (automate_certs,automate_keys): use non-exclusive transaction guard - * commands.cc (ls_certs,ls_keys,cat): use non-exclusive + * commands.cc (ls_certs,ls_keys,cat): use non-exclusive transaction guard - * database.cc (begin_transaction): used BEGIN DEFERRED (only attempt + * database.cc (begin_transaction): used BEGIN DEFERRED (only attempt exclusive lock once a write is attempted on DB) when not exclusive - (transaction_guard::transaction_guard): new argument exclusive indicating + (transaction_guard::transaction_guard): new argument exclusive indicating whether an immediate exclusive lock is requested, defaults to true * database.hh: update prototype for transaction_guard @@ -4706,7 +4710,7 @@ 2005-11-23 Grahame Bowland - * automate.cc (automate_stdio): Fix partial reads cloberring + * automate.cc (automate_stdio): Fix partial reads cloberring start of buffer. 2005-11-22 Matthew Gregan @@ -4825,7 +4829,7 @@ setting. * monotone.cc (cpp_main): Set the explicit_option_map entries for select command line flag processing. - + 2005-10-26 Matt Johnston * INSTALL: mention that zlib is required @@ -4991,7 +4995,7 @@ it's actually doing. Likewise ls_unknown -> ls_unknown_or_ignored, and use find_unknown_and_ignored correctly. Fixes t_mt_ignore.at failures. - + 2005-10-14 Nathaniel Smith * key_store.{cc,hh} (get_key_dir): New method. @@ -5015,13 +5019,13 @@ * options.hh: add OPT_UNKNOWN. * monotone.texi: document it. * tests/t_add.at: test it. - + 2005-10-14 Emile Snyder * database.cc (complete): enhance h: and b: to mean "current branch" (as defined by your working copy) when given empty. * monotone.texi: document it. - + 2005-10-14 Matthew Gregan * database.cc: Exclusively lock the database when performing a 'db @@ -5054,7 +5058,7 @@ * commands.cc (CMD(revert)): use --missing for revert a'la drop. * monotone.texi: document it. * tests/t_revert_restrict.at: test it. - + 2005-10-13 Emile Snyder * app_state.{cc,hh}: new missing class member for --missing flag. @@ -5064,14 +5068,14 @@ * options.hh: add OPT_MISSING. * monotone.texi: document it. * tests/t_drop_missing.at: test it. - + 2005-10-13 Emile Snyder * database.cc (complete): implementation for h:branch selector to find heads of a branch. * selectors.{cc,hh}: add sel_head with selector character 'h'. * monotone.texi: document it. - + 2005-10-12 Nathaniel Smith * revision.hh: Oops, missed a bit. @@ -5091,7 +5095,7 @@ 2005-10-08 Nathaniel Smith * revision.cc (calculate_change_sets_recursive): - (find_subgraph_for_composite_search) + (find_subgraph_for_composite_search) (calculate_composite_change_set, calculate_arbitrary_change_set): Remove. (construct_revision_from_ancestry): Likewise. @@ -5111,7 +5115,7 @@ * monotone.texi: add njs's lucid definition of what the disapprove actually means in terms of the revision graph to it's section in the documentation. - + 2005-10-12 Matt Johnston * monotone.cc: return with exit code of 2 on usage output @@ -5136,7 +5140,7 @@ from passed in port argument. * testsuite.at, tests/t_netsync_single.at: use new --bind syntax for serve commands. - + 2005-10-11 Matthew Gregan * commands.cc (message_width, explain_usage): New function to @@ -5185,9 +5189,9 @@ * cert.{cc,hh} (get_user_key): New function, replacing guess_default_key. - * revision.cc (build_changesets_from_existing_revs) - (build_changesets_from_manifest_ancestry): - * rcs_import.cc (import_cvs_repo): + * revision.cc (build_changesets_from_existing_revs) + (build_changesets_from_manifest_ancestry): + * rcs_import.cc (import_cvs_repo): * commands.cc (internalize_cert_name, push, sync, serve): * cert.cc (make_simple_cert, cert_revision_author_default): Use it. @@ -5359,7 +5363,7 @@ parsing. * commands.cc: ls keys shows keystore-only pubkeys as well * packet.cc: fix unit tests - * testsuite.at: use keypair packet rather than privkey/pubkey + * testsuite.at: use keypair packet rather than privkey/pubkey packets. 2005-09-26 Matt Johnston @@ -5458,7 +5462,7 @@ 2005-09-30 Grahame Bowland - * paths.cc: remove unit tests for + * paths.cc: remove unit tests for file_path_internal_from_user 2005-09-30 Patrick Mauritz @@ -5494,17 +5498,17 @@ * UPGRADE, configure.ac, monotone.spec, win32/monotone.iss: * debian/changelog: Bump version number. - + 2005-09-30 Grahame Bowland - * paths.hh: update file_path documentation, + * paths.hh: update file_path documentation, remove file_path_internal_from_user * paths.cc: remove file_path_internal_from_user - * commands.cc CMD(cat): change file_path_internal_from_user + * commands.cc CMD(cat): change file_path_internal_from_user to file_path_external - * tests/t_diff_outside_working_dir.at: check diff works outside + * tests/t_diff_outside_working_dir.at: check diff works outside of a working dir (with a file specified) - * tests/t_log_outside_working_dir.at: check log works outside + * tests/t_log_outside_working_dir.at: check log works outside of a working dir (with a file specified) * tests/t_diff_changeset_bug.at: mysterious changeset bug * testsuite.at: add new tests @@ -5515,13 +5519,13 @@ * NEWS: Write 0.23 entry. * monotone.texi (Reserved Files): Mention in .mt-ignore docs that the patterns are regexes. - + 2005-09-30 Grahame Bowland * paths.cc (file_path::file_path): Allow external paths outside of - a working directory, so long as we don't enter a working directory + a working directory, so long as we don't enter a working directory later. - (access_tracker) add new very_uninitialized state which + (access_tracker) add new very_uninitialized state which prevents subsequent initialization (test_access_tracker) check the very_uninitialized state works * paths.hh: correct mention of monotone cat file to new syntax @@ -5573,7 +5577,7 @@ * commands.cc: add 'help' command * monotone.cc: add -h alias for --help - + 2005-09-25 Matt Johnston * netsync.cc: use lexical_cast on port numbers to avoid @@ -5593,7 +5597,7 @@ * lua.cc (monotone_guess_binary_file_contents_for_lua), (monotone_include_for_lua), (monotone_includedir_for_lua): * rcs_import.cc (import_cvs_repo): Merged some strings. - + 2005-09-25 Benoît Dejean * lua.cc (monotone_guess_binary_file_contents_for_lua): @@ -5618,16 +5622,16 @@ 2005-09-23 Benoît Dejean - * std_hooks.lua: More i18n strings. + * std_hooks.lua: More i18n strings. - I don't know how to handle lua - "multiline" .. - "strings" because gettext doesn't join them. + I don't know how to handle lua + "multiline" .. + "strings" because gettext doesn't join them. 2005-09-22 Benoît Dejean - * sanity.{cc,hh}: Uninlined F() and FP(). - This happily saves ~100KB of .text on my ppc. + * sanity.{cc,hh}: Uninlined F() and FP(). + This happily saves ~100KB of .text on my ppc. 2005-09-22 Benoît Dejean @@ -5691,7 +5695,7 @@ * po/ja.po: New translation from Satoru SATOH . * AUTHORS: Add Satoru SATOH. - + 2005-09-18 Matthew Gregan * testsuite.at: Tweak default 'eveything' netsync glob to @@ -5768,14 +5772,14 @@ * rcs_import.cc: More i18n strings. 2005-09-07 Jim Meyering - + * tests/t_rename_dir_cross_level.at: When invoking mv to rename a directory, do not include a trailing slash on the target -- that - is not portable. + is not portable. * Makefile.am (TESTS_ENVIRONMENT): Ensure that PATH starts with the current directory, so we test the just-built monotone binary, - not some older version. + not some older version. 2005-09-07 Benoît Dejean @@ -5872,30 +5876,30 @@ * po/Makevars (XGETTEXT_OPTIONS): N_ != ngettext. Add c-format flags on F() and FP() calls (only partially successful on latter, because of bug in xgettext). - + 2005-09-04 Grahame Bowland - * commands.cc: siplify the monotone cat command + * commands.cc: siplify the monotone cat command to "monotone cat [-r] FIELNAME" (as in bug #12597) * monotone.texi: update documentation of "monotone cat" - * tests/t_add_edge.at, tests/t_cat_file_by_name.at, - tests/t_change_empty_file.at, tests/t_cvsimport.at, - tests/t_cvsimport_deleted_invar.at, tests/t_cvsimport_drepper.at, - tests/t_cvsimport_drepper2.at, tests/t_cvsimport_manifest_cycle.at, - tests/t_cvsimport_samelog.at, tests/t_database_check.at, - tests/t_db_kill_rev_locally.at, tests/t_empty_id_completion.at, - tests/t_epoch.at, tests/t_epoch_server.at, tests/t_erename.at, - tests/t_i18n_file.at, tests/t_import.at, tests/t_merge_add_del.at, - tests/t_movedel.at, tests/t_movepatch.at, tests/t_netsync.at, - tests/t_netsync_exclude.at, tests/t_netsync_exclude_default.at, - tests/t_netsync_globs.at, tests/t_netsync_nocerts.at, - tests/t_netsync_permissions.at, tests/t_netsync_read_permissions.at, - tests/t_netsync_single.at, tests/t_normalized_filenames.at, - tests/t_persistent_server_revision.at, tests/t_remerge.at, - tests/t_rename.at, tests/t_renamed.at, tests/t_scan.at, - tests/t_set_default.at, tests/t_singlecvs.at, - tests/t_update_with_pending_add.at, tests/t_update_with_pending_drop.at, - tests/t_update_with_pending_rename.at, tests/t_versions.at: + * tests/t_add_edge.at, tests/t_cat_file_by_name.at, + tests/t_change_empty_file.at, tests/t_cvsimport.at, + tests/t_cvsimport_deleted_invar.at, tests/t_cvsimport_drepper.at, + tests/t_cvsimport_drepper2.at, tests/t_cvsimport_manifest_cycle.at, + tests/t_cvsimport_samelog.at, tests/t_database_check.at, + tests/t_db_kill_rev_locally.at, tests/t_empty_id_completion.at, + tests/t_epoch.at, tests/t_epoch_server.at, tests/t_erename.at, + tests/t_i18n_file.at, tests/t_import.at, tests/t_merge_add_del.at, + tests/t_movedel.at, tests/t_movepatch.at, tests/t_netsync.at, + tests/t_netsync_exclude.at, tests/t_netsync_exclude_default.at, + tests/t_netsync_globs.at, tests/t_netsync_nocerts.at, + tests/t_netsync_permissions.at, tests/t_netsync_read_permissions.at, + tests/t_netsync_single.at, tests/t_normalized_filenames.at, + tests/t_persistent_server_revision.at, tests/t_remerge.at, + tests/t_rename.at, tests/t_renamed.at, tests/t_scan.at, + tests/t_set_default.at, tests/t_singlecvs.at, + tests/t_update_with_pending_add.at, tests/t_update_with_pending_drop.at, + tests/t_update_with_pending_rename.at, tests/t_versions.at: use automation interface rather than "monotone cat" 2005-09-04 Grahame Bowland @@ -5904,13 +5908,13 @@ 2005-09-04 Grahame Bowland - * automate.cc, commands.cc: add "automate get_file", - "automate get_revision" and "automate get_manifest" to + * automate.cc, commands.cc: add "automate get_file", + "automate get_revision" and "automate get_manifest" to automation interface. * monotone.texi: document new automation commands - * tests/t_automate_get_file.at, tests/t_automate_get_revision_at, - tests/t_automate_get_manifest.at: trivial testing of new - automation commands for output as specified, make sure they + * tests/t_automate_get_file.at, tests/t_automate_get_revision_at, + tests/t_automate_get_manifest.at: trivial testing of new + automation commands for output as specified, make sure they do not complete IDs, make sure invalid IDs are caught. * testsuite.at: add new tests @@ -6101,7 +6105,7 @@ 2005-08-30 Matt Johnston - * botan/allocate.cpp: avoid string comparison when looking up the + * botan/allocate.cpp: avoid string comparison when looking up the default allocator * monotone.cc (cpp_main): set a default allocator @@ -6125,7 +6129,7 @@ * file_io.hh: Remove comment describing old path types. * paths.hh: Add comment describing new path types. - + 2005-08-26 Nathaniel Smith * app_state.cc (create_working_copy): Remove @@ -6171,9 +6175,9 @@ 2005-08-26 Nathaniel Smith * change_set.cc (move_files_from_tmp_top_down): Typo again. - + 2005-08-26 Nathaniel Smith - + * database.cc (open): Convert stray line to paths.cc. 2005-08-26 Nathaniel Smith @@ -6195,10 +6199,10 @@ 2005-08-26 Nathaniel Smith - * transforms.cc (length): - * database.cc (sql, load, open): - * commands.cc (rename, attr): - * change_set.cc (move_files_to_tmp_bottom_up) + * transforms.cc (length): + * database.cc (sql, load, open): + * commands.cc (rename, attr): + * change_set.cc (move_files_to_tmp_bottom_up) (move_files_from_tmp_top_down): Merge fixups. 2005-08-26 Nathaniel Smith @@ -6208,7 +6212,7 @@ * tests/t_database_check_normalized.at: Update to expect "not parseable" messages rather than "not normalized" messages. All tests pass. - + 2005-08-26 Nathaniel Smith * tests/t_unreadable_MT.at: This test was called "do not fail on @@ -6236,7 +6240,7 @@ * commands.cc (cat): Hack so that 'cat file REV PATH' works correctly both inside and outside of working copy, interpreting path slightly differently in each case. - + 2005-08-26 Nathaniel Smith * tests/t_normalized_filenames.at: Internal unnormalized pathnames @@ -6262,7 +6266,7 @@ * work.cc (build_additions): Remove redundant (and now wrong) code. Test 53 now passes. - + 2005-08-26 Nathaniel Smith * file_io.cc (make_dir_for): Oops, this doesn't need a @@ -6273,13 +6277,13 @@ * file_io.cc (mkdir): New function. Now with extra brain-eating power. - (mkdir_p, make_dir_for, delete_file, delete_dir_recursive) + (mkdir_p, make_dir_for, delete_file, delete_dir_recursive) (move_file, move_dir, write_data_impl): Use it, to make all fs::path's native and disable boost's random rejection of paths. 2005-08-26 Nathaniel Smith - * paths.cc (test_file_path_external_prefix_a_b) + * paths.cc (test_file_path_external_prefix_a_b) (test_file_path_external_no_prefix, test_file_path_internal): Test for validity of more strange characters (,address@hidden). @@ -6301,7 +6305,7 @@ 2005-08-25 Nathaniel Smith * file_io.cc (walk_tree): Return properly. - + 2005-08-25 Nathaniel Smith * paths.cc (test_file_path_internal): Add tests for @@ -6334,10 +6338,10 @@ * paths.cc: Fix all unit test failures, except for two mysterious boost::too_few_args exceptions. - + 2005-08-25 Nathaniel Smith - * paths.cc, unix/fs.cc: Many, many fixes and some new tests too. + * paths.cc, unix/fs.cc: Many, many fixes and some new tests too. 2005-08-25 Nathaniel Smith @@ -6375,8 +6379,8 @@ 2005-08-25 Nathaniel Smith - * rcs_import.cc (import_cvs_repo): - * lua.cc (default_rcfilename): + * rcs_import.cc (import_cvs_repo): + * lua.cc (default_rcfilename): * diff_patch.cc (get_version): Small compile fixes. 2005-08-25 Nathaniel Smith @@ -6384,12 +6388,12 @@ * paths.{cc,hh} (is_bookkeeping_path): New static method. * file_io.cc (walk_tree_recursive): Use it. Now compiles. paths.cc and file_io.cc now compile. - + 2005-08-25 Nathaniel Smith * file_io.cc (delete_dir_recursive): Implement. Misc. compile fixes. - + 2005-08-25 Nathaniel Smith * file_io.cc (test_book_keeping_file): Remove. @@ -6404,7 +6408,7 @@ 2005-08-25 Nathaniel Smith - * file_io.cc (read_localized_data, read_data_for_command_line) + * file_io.cc (read_localized_data, read_data_for_command_line) (write_localized_data, write_data, write_data_impl): Implement. 2005-08-25 Nathaniel Smith @@ -6418,10 +6422,10 @@ 2005-08-25 Nathaniel Smith - * file_io.cc (assert_path_is_nonexistent, assert_path_is_file) - (assert_path_is_directory, require_path_is_nonexistent) - (require_path_is_file, require_path_is_directory) - (ident_existing_file, mkdir_p, make_dir_for, delete_file) + * file_io.cc (assert_path_is_nonexistent, assert_path_is_file) + (assert_path_is_directory, require_path_is_nonexistent) + (require_path_is_file, require_path_is_directory) + (ident_existing_file, mkdir_p, make_dir_for, delete_file) (delete_dir_recursive): Implement. 2005-08-25 Nathaniel Smith @@ -6430,7 +6434,7 @@ it now checks to see if a path exists and is a regular file, rather than that it simply exists. A fair amount of code already thought it meant that... other places now use 'path_exists'. - + 2005-08-25 Nathaniel Smith * file_io.cc (path_exists, directory_exists, file_exists): @@ -6456,7 +6460,7 @@ 2005-08-25 Nathaniel Smith * Minor compile fixes. - + 2005-08-25 Nathaniel Smith * platform.hh (tilde_expand): New function. @@ -6466,7 +6470,7 @@ * paths.cc: Many more fixes. Now compiles with and without unit tests. - + 2005-08-25 Nathaniel Smith * paths.cc: Lots of compile fixes for unit tests. @@ -6486,7 +6490,7 @@ 2005-08-24 Nathaniel Smith - * paths.cc (find_and_go_to_working_copy, save_initial_path) + * paths.cc (find_and_go_to_working_copy, save_initial_path) (go_to_working_copy): Use new checked structure. (operator <<): Make sure we can log our access_tracked values without marking them as used. @@ -6514,7 +6518,7 @@ * paths.cc (file_path): Implement basic constructor. Misc compile fixes. Add single-character names to tests. - + 2005-08-24 Nathaniel Smith * paths.cc (go_to_working_copy): New function. Implement. @@ -6542,7 +6546,7 @@ 2005-08-24 Nathaniel Smith - * app_state.cc (allow_working_copy): + * app_state.cc (allow_working_copy): * change_set.cc (print_insane_change_set): Two more small compile fixes. All remaining compile errors are localized to unimplemented @@ -6558,8 +6562,8 @@ 2005-08-24 Nathaniel Smith - * change_set.cc (print_insane_path_rearrangement): - * database.cc (initialize): + * change_set.cc (print_insane_path_rearrangement): + * database.cc (initialize): * monotone.cc (cpp_main): More small compile fixes. 2005-08-24 Nathaniel Smith @@ -6579,7 +6583,7 @@ * paths.hh (system_path): Add a from-any_path constructor. * Makefile.am (MOST_SOURCES): Remove path_component.{cc,hh}. * basic_io.hh (push_file_pair): New method. - * change_set.cc (print_insane_change_set) + * change_set.cc (print_insane_change_set) (print_insane_path_rearrangement): Use it. 2005-08-24 Nathaniel Smith @@ -6588,12 +6592,12 @@ std::string, not a utf8 -- utf8 would be better, but should wait for some more general charset handling cleanup. * Adjust other files accordingly. - + 2005-08-24 Nathaniel Smith * More compile fixes. All remaing compile errors are real problems, yay. - + 2005-08-24 Nathaniel Smith * Lots and lots more compile fixes. @@ -6616,7 +6620,7 @@ * paths.cc: Update tests to use path_state_* and pass utf8 objects. - + 2005-08-24 Nathaniel Smith * paths.hh (file_path_external): Take a utf8() object, always. @@ -6629,11 +6633,11 @@ 2005-08-24 Nathaniel Smith * Switch rest of instances to using convenience functions. - + 2005-08-24 Nathaniel Smith - + * Switch many instances to using convenience functions. - + 2005-08-24 Nathaniel Smith * paths.hh (file_path_internal, file_path_external): Define @@ -6697,7 +6701,7 @@ 2005-08-23 Nathaniel Smith - * change_set.cc (move_files_to_tmp_bottom_up) + * change_set.cc (move_files_to_tmp_bottom_up) (move_files_from_tmp_top_down): Convert to paths.hh. Whole file: stop using path_component.hh. @@ -6806,10 +6810,10 @@ * paths.cc: Yet more tests. 2005-08-20 Nathaniel Smith - + * paths.cc (save_initial_path): Implement. Add more tests. - + 2005-08-20 Nathaniel Smith * paths.{cc,hh}: New files. @@ -6833,7 +6837,7 @@ 2005-08-26 Matt Johnston - * change_set.cc (check_depth, confirm_proper_tree): + * change_set.cc (check_depth, confirm_proper_tree): more efficient algorithm to check for no loops * constants.hh: new constant max_path_depth to limit recursion in check_depth. @@ -6898,7 +6902,7 @@ 2005-08-25 Matt Johnston - * transform.cc ({int,ext}ernalize_rsa_keypair_id): don't + * transform.cc ({int,ext}ernalize_rsa_keypair_id): don't convert the username portion of key ids to/from ACE. * tests/t_genkey.at: check that address@hidden works and address@hidden doesn't. @@ -6969,7 +6973,7 @@ * monotone.cc (cpp_main): Use it. Everything that writes user-intended output directly (i.e., via cout) must call outprep() on that data before printing it. - + 2005-08-23 Nathaniel Smith * monotone.cc (cpp_main): Trick popt into converting its generated @@ -7139,31 +7143,31 @@ 2005-08-22 Nathaniel Smith * commands.cc (update): Don't use F() to indent things. - + 2005-08-22 Nathaniel Smith * commands.cc (dump_diffs): Don't use F() to create diff headers. (commands::process): Put '' in the log message to make Benoît Dejean happy ;-). - + 2005-08-22 Nathaniel Smith * po/LINGUAS, po/ja.po: Add Japanese translation by Satoru SATOH. - + 2005-08-20 Benoît Dejean * po/monotone.pot: Remove from version control. * po/POTFILES.skip: New file. * po/fr.po: French translation (initial version). * po/LINGUAS: Add fr. - + 2005-08-22 Nathaniel Smith * commands.cc (read): Use FP (thanks to Benoît Dejean for catch). * mt_version.cc (print_version, print_full_version): Mark more strings for i18n (also thanks to Benoît Dejean). - + 2005-08-22 Nathaniel Smith * commands.cc (commands): Revert previous changes, xgettext is @@ -7308,7 +7312,7 @@ (get, get_fn, get_tab, get_str, get_num, get_bool, extract_str) (extract_int, extract_double, extract_bool, begin, next, pop): Use it, to give better logging. - + 2005-08-17 Nathaniel Smith * Makefile.am (lib3rdparty_a_CFLAGS): Build 3rd party C code with @@ -7345,7 +7349,7 @@ documented, tested, or maintained; it also doesn't avoid the use of temporary files (which was supposed to be its purpose). Has it ever actually been used...? - + 2005-08-15 Nathaniel Smith * lua.cc (hook_init_attributes): Do more logging; use begin() @@ -7474,7 +7478,7 @@ * constants.*: move values to .hh if used for array sizes * interner.hh, xdelta.cc: use hash_map.hh * merkle_tree.cc, unix/inodeprint.cc: make array size truly - constant + constant * sanity.hh: work-around for missing typeof() and __PRETTY_FUNCTIONS on non-gcc compilers * schema_migration.cc, transforms.cc: moved dynamically @@ -7493,11 +7497,11 @@ output into a nice tabular format 2005-08-09 Eric Anderson - + * Changes to significantly improve network pull performance * string_queue.hh: created to store pending data and allow for efficient removal from the front. The string queue automatically - reduces its buffer size if it is very empty. + reduces its buffer size if it is very empty. * hmac.{cc,hh}: Add in a version of chained_hmac::process that can operate on a string_queue for use during read. * netcmd.{cc,hh}: update netcmd::read to use a string_queue rather @@ -7507,7 +7511,7 @@ * netio.hh: introduce functions for operating on a string_queue. They are identical to the equivalent string functions except for the type of the argument. - * netsync.cc: Use a string_queue rather than a string for storing the + * netsync.cc: Use a string_queue rather than a string for storing the input and output buffers. * string_queue.cc: unit tests (Matt Johnston) @@ -7531,7 +7535,7 @@ * NEWS: Put a time in. * po/monotone.pot: Regenerate. - + 2005-08-08 Nathaniel Smith * configure.ac, monotone.spec, debian/changelog: @@ -7553,7 +7557,7 @@ * tests/t_merge_lca.at: New test. * testsuite.at: Add it. * monotone.texi (Tree): Document --lca. - + 2005-08-08 Nathaniel Smith * NEWS: First-pass for 0.22 release. @@ -7600,7 +7604,7 @@ _after_ making sure it's non-empty. * tests/t_commit_cancelled.at: New test. * testsuite.at: Add it. - + 2005-08-04 Nathaniel Smith * netsync.cc (rebuild_merkle_trees): Typo. @@ -7620,7 +7624,7 @@ * testsuite.at (NETSYNC_ADDRESS): New macro. (NETSYNC_SERVE_N_START, NETSYNC_SERVE_START) (NETSYNC_CLIENT_N_RUN): Use it. - + * tests/t_netsync_checks_server_key.at: Make sure can unset the known-servers entry. @@ -7701,7 +7705,7 @@ time. 2005-07-27 Nathaniel Smith - + * commands.cc: ALIAS(mv, rename). ALIAS(rm, drop). 2005-07-26 Nathaniel Smith @@ -7813,7 +7817,7 @@ * tests/t_annotate_no_rev.at: New test. * testsuite.at: Add it. - + 2005-07-24 Nathaniel Smith * sanity.{hh,cc} (sanity, dump_buffer, invariant_failure) @@ -7868,7 +7872,7 @@ * netsync.cc (get_branches): Likewise. * tests/t_ls_branches.at: New test. * testsuite.at: Add it. - + 2005-07-20 Nathaniel Smith * commands.cc (db): Rename kill_branch_locally to @@ -7920,10 +7924,10 @@ outstanding and fulfilled requests. (queue_send_data_cmd, queue_send_delta_cmd): Call it via new name. - + Hopefully this will eliminate cases where "revs in" is larger than "revs written". - + 2005-07-17 Nathaniel Smith * constants.cc (legal_key_name_bytes): Allow + and _ to appear in @@ -8027,7 +8031,7 @@ 2005-07-16 Nathaniel Smith * database.cc (assert_sqlite3_ok): Remove dead function. - + 2005-07-16 Nathaniel Smith * app_state.cc (require_working_copy): Oops, make it compile. @@ -8048,7 +8052,7 @@ * monotone.texi (Selectors): Document use of globs. * tests/t_selector_globbing.at: New test. * testsuite.at: Add it. - + 2005-07-16 Jordan Breeding * database.cc (selector_to_certname): Make 't:' selector match @@ -8059,7 +8063,7 @@ * database.cc (selector_to_certname, complete): Makes 'b:' selector be interpreted as a glob instead of as a partial string match. - + 2005-07-16 Nathaniel Smith * netsync.cc: Revert accidentally committed changes. @@ -8102,7 +8106,7 @@ * database.cc (debug): delete stale comment (delete_branch_named): - (delete_tag_named): + (delete_tag_named): (clear): replace vprintf stuff with query parameters 2005-07-13 Nathaniel Smith @@ -8187,8 +8191,8 @@ 2005-07-11 Nathaniel Smith * crypto_tests.cc: New SHA1 correctness tests from Kaushik Veeraraghavan. - * unit_tests.cc (init_unit_test_suite): - * unit_tests.hh (add_crypto_tests): + * unit_tests.cc (init_unit_test_suite): + * unit_tests.hh (add_crypto_tests): * Makefile.am (unit_tests_SOURCES): Call them. * AUTHORS: Add Kaushik Veeraraghavan. @@ -8206,8 +8210,8 @@ 2005-07-11 Nathaniel Smith - * app_state.{hh,cc} (exclude_patterns, add_exclude): - * options.hh (OPT_EXCLUDE): + * app_state.{hh,cc} (exclude_patterns, add_exclude): + * options.hh (OPT_EXCLUDE): * monotone.cc (coptions, cpp_main): New option --exclude. * commands.cc (pull, push, sync, serve): Accept it. (process_netsync_args): Implement it. @@ -8272,14 +8276,14 @@ revision_certs__name_value): New indexes. * database.cc (dump, dump_table_cb, dump_index_cb): Include indexes in dumps. - (database::database): - * schema_migration.cc (migrate_monotone_schema) - (migrate_client_to_add_indexes): + (database::database): + * schema_migration.cc (migrate_monotone_schema) + (migrate_client_to_add_indexes): * tests/t_migrate_schema.at: Corresponding migration gunk. 2005-07-09 Jordan Breeding - * Makefile.am (monotone_CPPFLAGS, unit_tests_CPPFLAGS): + * Makefile.am (monotone_CPPFLAGS, unit_tests_CPPFLAGS): * configure.ac (BOOST_FIX_VERSION): Restrict boost compile kluges to boost 1.32. @@ -8342,7 +8346,7 @@ 2005-07-07 Nathaniel Smith - * netsync.cc (process_hello_cmd, process_anonymous_cmd) + * netsync.cc (process_hello_cmd, process_anonymous_cmd) (process_auth_cmd): Change permission checking -- always build merkle tree (even when a pure sink), send permission denied and abort whenever client tries to read/write a branch they don't have @@ -8359,11 +8363,11 @@ 2005-07-06 Nathaniel Smith - * commands.cc (push, pull, sync): Fix --help description. - + * commands.cc (push, pull, sync): Fix --help description. + 2005-07-06 Nathaniel Smith - * options.hh (OPT_SET_DEFAULT): + * options.hh (OPT_SET_DEFAULT): * app_state.{hh,cc} (app_state::set_default): * monotone.cc (coptions, cpp_main): New option. * commands.cc (pull, push, sync): Accept it. @@ -8411,7 +8415,7 @@ * NEWS: Oops, 'automate select' was in 0.19 after all. 2005-07-05 Nathaniel Smith - + * contrib/ciabot_monotone.py: Fix multiple collection support. 2005-07-05 Richard Levitte @@ -8482,7 +8486,7 @@ * rcs_file.cc: Track file:line numbers, accept files which violate some lies in rcs file format. - * rcs_import.cc (cvs_tree_walker): + * rcs_import.cc (cvs_tree_walker): Warn rather than crash on parse errors. (cvs_history) (cvs_commit) @@ -8528,17 +8532,17 @@ 2005-06-25 Brian Campbell - * commands.cc (CMD(db)): Added db kill_branch_locally command. + * commands.cc (CMD(db)): Added db kill_branch_locally command. * database.cc, database.hh (delete_branch_named): New function to delete all branch certs with a given branch name. * monotone.texi (Database): Added documentation for db kill_branch_locally. * tests/t_db_kill_branch_locally.at: New test for db kill_branch_locally. - * testsuite.at: Add the test. + * testsuite.at: Add the test. * AUTHORS: Add myself. - * ChangeLog: Change my email address on an old contribution to - match my pubkey. + * ChangeLog: Change my email address on an old contribution to + match my pubkey. 2005-06-24 Nathaniel Smith @@ -8589,7 +8593,7 @@ * netcmd.cc: I() that it matches the length hard-coded into the netsync protocol. * vocab.cc (verify(netsync_hmac_value)): Fix error message. - + 2005-07-04 Nathaniel Smith * tests/t_netsync_defaults.at: Update for new var names. All @@ -8620,7 +8624,7 @@ * commands.cc (process_netsync_args, push, pull, sync, serve): 'serve' always requires arguments, rather than falling back on db defaults. - + 2005-07-04 Nathaniel Smith * commands.cc (process_netsync_args, push, pull, sync, serve): @@ -8643,8 +8647,8 @@ 2005-07-03 Nathaniel Smith * monotone.texi (Network Service, Hooks): - * testsuite.at: - * tests/t_netsync_permissions.at: + * testsuite.at: + * tests/t_netsync_permissions.at: * tests/t_netsync_single.at: Update to match new get_netsync_write_permitted definition. @@ -8701,7 +8705,7 @@ 2005-06-26 Matt Johnston - * netcmd.cc (netcmd::read, netcmd::write): change to using a HMACs + * netcmd.cc (netcmd::read, netcmd::write): change to using a HMACs chained by including the previous HMAC in the input data, rather than altering the key each time. * netcmd.cc ({read,write}_{data,delta}_cmd): use encode_gzip/decode_gzip @@ -8776,7 +8780,7 @@ * monotone.texi: include std_hooks.lua as an appendix and remove long lua excerpts from hook reference. * Makefile.am : make monotone.pdf/eps depend on monotone.info - + 2005-06-24 Matt Johnston * transforms.{cc,hh}: combine gzip and base64 in one @@ -8794,7 +8798,7 @@ * revision.cc (find_least_common_ancestor): Handle left == right case. * tests/t_diff_currev.at: Un-XFAIL. - + 2005-06-21 Nathaniel Smith * netsync.cc (rebuild_merkle_trees): Fix FIXME comments to match @@ -8827,11 +8831,11 @@ * monotone.texi: include std_hooks.lua as an appendix and remove long lua excerpts from hook reference. * Makefile.am : make monotone.pdf/eps depend on monotone.info - + 2005-06-17 Matt Johnston * database.cc (database::execute()): truncate long query log messages - before copying, saving memory. + before copying, saving memory. Patch from Eric Anderson 2005-06-17 Riccardo Ghetta @@ -8918,7 +8922,7 @@ 2005-06-09 Riccardo Ghetta * std_hooks.lua: make binary_file return nil on unreadable/empty files - + 2005-06-10 Joel Reed * commands.cc (CMD(cdiff)): Add OPT_DEPTH to command options. @@ -8927,7 +8931,7 @@ 2005-06-09 Joel Reed * commands.cc (CMD(diff)): Add OPT_DEPTH back in, as it is used. - * t_restrictions.at: Add to testcase to increase likelihood of + * t_restrictions.at: Add to testcase to increase likelihood of keeping it around :) 2005-06-10 Richard Levitte @@ -8999,8 +9003,8 @@ * commands.cc (update): update MT/work based on the changes between the chosen revision and the new merge revision - * tests/t_update_with_pending_drop.at: - * tests/t_update_with_pending_add.at: + * tests/t_update_with_pending_drop.at: + * tests/t_update_with_pending_add.at: * tests/t_update_with_pending_rename.at: un-XFAIL and clean up now that things work @@ -9022,22 +9026,22 @@ 2005-06-04 Derek Scherger - * tests/t_update_with_pending_drop.at: - * tests/t_update_with_pending_add.at: - * tests/t_update_with_pending_rename.at: + * tests/t_update_with_pending_drop.at: + * tests/t_update_with_pending_add.at: + * tests/t_update_with_pending_rename.at: * tests/t_restricted_commit_with_inodeprints.at: new bug reports * testsuite.at: call them 2005-06-04 Graydon Hoare - * rcs_import.cc + * rcs_import.cc (note_state_at_branch_beginning): Move time back when there are known commits on a branch. 2005-06-03 Joel Reed - * commands.cc, monotone.texi: provide --verbose option for - monotone complete revision which adds date and author + * commands.cc, monotone.texi: provide --verbose option for + monotone complete revision which adds date and author completion output * contrib/monotone.zsh_completion: use verbose output when completing revisions @@ -9048,11 +9052,11 @@ (cvs_key::is_synthetic_branch_founding_commit): New field. (cvs_key::operator==): Handle synthetic case specially. (cvs_key::operator<): Likewise. - (note_state_at_branch_beginning): Likewise. + (note_state_at_branch_beginning): Likewise. * tests/t_cvsimport_drepper.at: Converted bug testcase. * testsuite.at: Call it. - * monotone.cc, commands.cc, options.hh + * monotone.cc, commands.cc, options.hh (OPT_NO_MERGES, OPT_DIFFS): New options. * app_state.cc (app_state::no_merges, app_state::diffs): Likewise. * commands.cc (log): Honor no_merges, diffs. @@ -9073,7 +9077,7 @@ * monotone.texi: document new subcommand * contrib/monotone.zsh_completion: update for new complete key command, improve _monotone_existing_entries using new --depth=0 - option, add revision completion for cert command, and a bugfix + option, add revision completion for cert command, and a bugfix for cat command 2005-06-01 Matt Johnston @@ -9258,7 +9262,7 @@ 2005-05-24 Matt Johnston - * commands.cc (try_one_merge, CMD(merge), CMD(explicit_merge), + * commands.cc (try_one_merge, CMD(merge), CMD(explicit_merge), CMD(propagate): allow --author flag. 2005-05-24 Timothy Brownawell @@ -9302,7 +9306,7 @@ "earlier or equal than" and "later than". * lua.cc/.hh, std-hooks.lua: create a new "expand_date" hook * monotone.texi: document the changes - * testsuite.at, tests/t_selector_later_earlier.at: add specific tests + * testsuite.at, tests/t_selector_later_earlier.at: add specific tests for the new selectors 2005-05-21 Richard Levitte @@ -9351,14 +9355,14 @@ 2005-05-21 Grahame Bowland - * automate.cc: (automate_certs) change "status" field - to "signature". Check whether each cert is trusted, and + * automate.cc: (automate_certs) change "status" field + to "signature". Check whether each cert is trusted, and output in the "trusted" field. * testsuite.at: add t_automate_certs.at - * tests/t_automate_certs.at: Test that the output of + * tests/t_automate_certs.at: Test that the output of "automate certs" is consistent, and that we exit with error when rev is incomplete or missing. - * monotone.texi: update output documentation for + * monotone.texi: update output documentation for "automate certs" 2005-05-20 Emile Snyder @@ -9373,7 +9377,7 @@ * tests/t_annotate_lineage_dependent.at * tests/t_annotate_split_lines.at: New tests. * testsuite.at: Add them. - + 2005-05-20 Nathaniel Smith * monotone.texi (Network): Clarify that ports can be specified on @@ -9381,7 +9385,7 @@ 2005-05-21 Matt Johnston - * packet.cc (db_packet_writer::~impl, prerequisite.cleanup): + * packet.cc (db_packet_writer::~impl, prerequisite.cleanup): add code to remove up circular dependencies between prerequisite and delayed_packet shared_ptrs upon destruction, so that unsatisified dependency warnings are printed. @@ -9396,7 +9400,7 @@ 2005-05-19 Derek Scherger * commands.cc (checkout): rearrange to use --revision option - * monotone.1: + * monotone.1: * monotone.texi: document checkout --revision option * tests/t_attr.at: * tests/t_attributes.at: @@ -9441,9 +9445,9 @@ 2005-05-17 Grahame Bowland - * commands.cc: add "automate certs ID" to the help string + * commands.cc: add "automate certs ID" to the help string for the automate command - * automate.cc: implement "automate certs". Add to the list + * automate.cc: implement "automate certs". Add to the list of commands available through "automate stdio". * monotone.texi: document "automate certs" @@ -9459,7 +9463,7 @@ 2005-05-15 Graydon Hoare - * rcs_import.cc: rewrite most of the branch logic to + * rcs_import.cc: rewrite most of the branch logic to address issues raised in bugs 13032 and 13063. * tests/t_cvsimport_deleted_invar.at: un-XFAIL. @@ -9514,7 +9518,7 @@ 2005-05-13 Joel Reed - * diff_patch.cc, transforms.cc, testsuite.at: Patch from + * diff_patch.cc, transforms.cc, testsuite.at: Patch from address@hidden, who writes: "The attached patch should fix bug 13072. I have no idea why the code in transform.cc insists on adding an empty line in case the file is empty. Removing the code @@ -9549,7 +9553,7 @@ * monotone.texi: (Automation): update inventory docs * tests/t_automate_inventory.at: update for new format and add some more tests - + 2005-05-13 Matthew Gregan * HACKING: New file. First pass at a brief document to help @@ -9565,7 +9569,7 @@ * monotone.1, monotone.texi: Document it. * tests/t_commit_message_file.at: New test. * testsuite.at: Add it. - + 2005-05-12 Timothy Brownawell * (20 files): Do not indent with both tabs and spaces in the same file. @@ -9588,8 +9592,8 @@ 2005-05-12 Grahame Bowland - * commands.cc: Modify the "log" command to accept multiple - revisions on command line, and display the log for all + * commands.cc: Modify the "log" command to accept multiple + revisions on command line, and display the log for all of those revisions. 2005-05-11 Nathaniel Smith @@ -9633,7 +9637,7 @@ 2005-05-11 Matt Johnston - * rcs_import.cc (find_branchpoint): if a branch is derived from two + * rcs_import.cc (find_branchpoint): if a branch is derived from two differing parent branches, take the one closest to the trunk. * tests/t_cvsimport3.at: add a test for cvs_importing where branches come off a vendor import. @@ -9672,7 +9676,7 @@ * ChangeLog: Likewise. 2005-05-09 Riccardo Ghetta - + * std_hooks.lua: Support kdiff3. 2005-05-09 Matthew Gregan @@ -9757,7 +9761,7 @@ 2005-05-06 Nathaniel Smith - * monotone.1: + * monotone.1: * monotone.texi (Commands, Importing from CVS, RCS): Clarify cvs_import documentation on cvsroot vs. module issues. @@ -9807,7 +9811,7 @@ 2005-05-04 Matthew Gregan * configure.ac: Add TYPE_SOCKLEN_T function from the Autoconf - archive. + archive. * cryptopp/cryptlib.h (NameValuePairs): Change GetVoidValue from a pure virtual to an implemented (but never called) member function to work around build problem with GCC 4 on OS X 10.4 @@ -9857,12 +9861,12 @@ 2005-05-03 Jon Bright * win32/monotone.iss: Bump version to 0.19 - + 2005-05-03 Jon Bright * tests/t_automate_select.at: Use arithmetic comparison for checking output of wc, since wc pads its results with initial spaces on MinGW. - + 2005-05-03 Nathaniel Smith * tests/t_cvsimport2.at: Pass correct module directory. @@ -9939,8 +9943,8 @@ 2005-04-30 Derek Scherger - * Makefile.am (MOST_SOURCES): add restrictions.{cc,hh} - * commands.cc (extract_rearranged_paths): + * Makefile.am (MOST_SOURCES): add restrictions.{cc,hh} + * commands.cc (extract_rearranged_paths): (extract_delta_paths): (extract_changed_paths): (add_intermediate_paths): @@ -10012,20 +10016,20 @@ * annotate.cc (do_annotate_node): Stop doing expensive calculate_arbitrary_change_set when we already know we have parent and child revisions. Cuts annotate run time in half. - + 2005-04-29 Nathaniel Smith * commands.cc (update_inodeprints): Rename to... (refresh_inodeprints): ...this, so 'monotone up' continues to mean update. - + * monotone.texi (Inodeprints): Mention refresh_inodeprints in the Inodeprints section. - - * testsuite.at: - * tests/t_update_inodeprints.at: - * tests/t_refresh_inodeprints.at: - * monotone.texi (Working Copy, Commands): + + * testsuite.at: + * tests/t_update_inodeprints.at: + * tests/t_refresh_inodeprints.at: + * monotone.texi (Working Copy, Commands): * monotone.1: Update accordingly. 2005-04-29 Nathaniel Smith @@ -10034,7 +10038,7 @@ (invert_change_test): New unit test. (invert_change_set): Make it pass. This fixes (some?) isect.empty() invariant failures. - + * NEWS: Start updating for 0.19. * revision.cc (check_sane_history): Make comment more @@ -10042,17 +10046,17 @@ 2005-04-29 Grahame Bowland - * netxx/types.h: Add new NetworkException type network + * netxx/types.h: Add new NetworkException type network issue not caused by calling program - * netsync.cc: Catch Netxx::NetworkException and display + * netsync.cc: Catch Netxx::NetworkException and display as informative_error. * netxx/address.cxx: NetworkException for unparsable URIs. * netxx/datagram.cxx: NetworkException for connection failure. * netxx/resolve_getaddrinfo.cxx, resolve_gethostbyname.cxx: NetworkException when DNS resolution fails. - * netxx/serverbase.cxx: NetworkException if unable to bind + * netxx/serverbase.cxx: NetworkException if unable to bind to server port. - * netxx/streambase.cxx: NetworkException if unable to + * netxx/streambase.cxx: NetworkException if unable to connect. 2005-04-28 Nathaniel Smith @@ -10073,8 +10077,8 @@ 2005-04-28 Derek Scherger - * commands.cc (get_work_path): - (get_revision_path): + * commands.cc (get_work_path): + (get_revision_path): (get_revision_id): (put_revision_id): (get_path_rearrangement): @@ -10084,26 +10088,26 @@ (get_base_revision): (get_base_manifest): move to work.{cc,hh} (update): indicate optional revision with [ and ] - (explicit_merge): indicate optional ancestor with [ and ] + (explicit_merge): indicate optional ancestor with [ and ] * manifest.{cc,hh} (extract_path_set): move here from work.{cc,hh} * revision.{cc,hh} (revision_file_name): move to work.{cc,hh} * work.{cc,hh} (extract_path_set): move to manifest.{cc,hh} - (get_work_path): - (get_path_rearrangement): - (remove_path_rearrangement): - (put_path_rearrangement): - (get_revision_path): - (get_revision_id): - (put_revision_id): - (get_base_revision): - (get_base_manifest): + (get_work_path): + (get_path_rearrangement): + (remove_path_rearrangement): + (put_path_rearrangement): + (get_revision_path): + (get_revision_id): + (put_revision_id): + (get_base_revision): + (get_base_manifest): (update_any_attrs): move here from commands.cc - + 2005-04-28 Derek Scherger - * ChangeLog: + * ChangeLog: * Makefile.am * tests/t_automate_select.at: merge fixups @@ -10112,18 +10116,18 @@ * annotate.cc: Fix broken build after propagate from .annotate branch to mainline. The lcs stuff was changed to use quick_allocator, so our use of it had to change as well. - + 2005-04-28 Emile Snyder * commands.cc: New command "annotate" * annotate.{cc,hh}: New files implement it. * Makefile.am: Build it. - * monotone.texi: Document it. + * monotone.texi: Document it. * tests/t_annotate.at: * tests/t_annotate_add_collision.at: - * tests/t_annotate_branch_collision.at: + * tests/t_annotate_branch_collision.at: * testsuite.at: Test it. - + 2005-04-28 Matt Johnston * tests/t_merge_6.at: narrow the testcase down considerably. @@ -10168,7 +10172,7 @@ * commands.cc (ls_unknown): remove unneeded braces (struct inventory_item): new struct for tracking inventories - (print_inventory): removed old output functions + (print_inventory): removed old output functions (inventory_paths): new functions for paths, data and renames (inventory): rework to display two column status codes * monotone.texi (Informative): update for new status codes @@ -10217,7 +10221,7 @@ 2005-04-27 Matt Johnston * vocab.cc (verify(file_path)): don't find() twice. - * change_set.cc (extend_state): remove commented out line + * change_set.cc (extend_state): remove commented out line 2005-04-27 Matthew Gregan @@ -10291,7 +10295,7 @@ 2005-04-25 Nathaniel Smith - * automate.cc (automate_parents, automate_children) + * automate.cc (automate_parents, automate_children) (automate_graph): New automate commands. (automate_command): Add them. * commands.cc (automate): Synopsisfy them. @@ -10301,7 +10305,7 @@ * testsuite.at: Add the tests. * tests/t_automate_ancestors.at: Remove obsolete comment. - + 2005-04-24 Derek Scherger * tests/t_rename_file_to_dir.at: @@ -10338,7 +10342,7 @@ (build_restricted_manifest_map): adjust to use inodeprint_unchanged * manifest.hh (classify_paths): new public function - + * monotone.1: document new inventory command and associated --all-files option @@ -10352,7 +10356,7 @@ * tests/t_status_missing.at: remove bug priority flag * tests/t_inventory.at: new test * testsuite.at: include new test - + 2005-04-24 Nathaniel Smith * monotone.texi (Database): Document 'db kill_rev_locally'. @@ -10389,12 +10393,12 @@ (drop): (rename): (attr): call get_base_manifest - (ls_missing): + (ls_missing): (revert): call get_base_revision * manifest.{cc,hh} (build_restricted_manifest_map): don't return missing files and don't produce invalid manifests; do report on all missing files before failing - + 2005-04-23 Derek Scherger * app_state.cc: @@ -10491,7 +10495,7 @@ missing files * revision.hh: update comment on the format of a revision * tests/t_status_missing.at: un-XFAIL and add a few tests - + 2005-04-22 Nathaniel Smith * vocab.cc (verify(file_path), verify(local_path)): Normalize @@ -10513,14 +10517,14 @@ match. (walk_tree): Don't convert the (OS-supplied) current directory from UTF-8 to current locale. - + * transforms.{cc,hh} (charset_convert): Be more informative on error. (calculate_ident): Localize the filename, even on the fast-path. Also assert file exists and is not a directory, since Crypto++ will happily hash directories. (They are like empty files, apparently.) - + * manifest.cc (build_restricted_manifest_map): Use file_exists instead of fs::exists, to handle localized paths. * {win32,unix}/inodeprint.cc (inodeprint_file): Use localized @@ -10566,11 +10570,11 @@ 2005-04-21 Sebastian Spaeth * monotone.texi: add command reference docs about kill_rev_locally - + 2005-04-21 Nathaniel Smith - * change_set.cc (apply_path_rearrangement_can_fastpath) - (apply_path_rearrangement_fastpath) + * change_set.cc (apply_path_rearrangement_can_fastpath) + (apply_path_rearrangement_fastpath) (apply_path_rearrangement_slowpath, apply_path_rearrangement): Refactor into pieces, so all versions of apply_path_rearrangement can take a fast-path when possible. @@ -10617,17 +10621,17 @@ * t_automate_ancestors.at: new test; automate ancestors. This is still _failing_ as a) it outputs empty newlines when no ancestor exists and b) does not output all ancestors if multiple ids are supplied as input - + 2005-04-20 Sebastian Spaeth * commands.cc: * automate.cc: new command: automate ancestors * monotone.texi: adapt documentation - + 2005-04-20 Nathaniel Smith - * tests/t_log_depth_single.at: - * tests/t_add_stomp_file.at: + * tests/t_log_depth_single.at: + * tests/t_add_stomp_file.at: * tests/t_log_depth.at: Shorten blurbs. 2005-04-20 Nathaniel Smith @@ -10641,7 +10645,7 @@ * tests/t_sticky_branch.at: Canonicalise stdout before comparison * tests/t_setup_checkout_modify_new_dir.at: Ditto * tests/t_netsync_largish_file.at: Check the file out rather - than catting it, so that canonicalisation is unneeded. + than catting it, so that canonicalisation is unneeded. Canonicalisation is bad here, because the file is random binary data, not text with line-ending conventions @@ -10664,7 +10668,7 @@ * work.{cc,hh} (enable_inodeprints): New function. * app_state.cc (create_working_copy): Maybe call enable_inodeprints. - + * tests/t_inodeprints_hook.at: New test. * tests/t_bad_packets.at: New test. * testsuite.at: Add them. @@ -10676,7 +10680,7 @@ 2005-04-20 Nathaniel Smith Most of this patch from Joel Reed, with only small tweaks myself. - + * AUTHORS: Add Joel Reed. * platform.hh (is_executable): New function. @@ -10696,7 +10700,7 @@ * tests/t_attr_init.at: New test. * tests/t_add_executable.at: New test. * testsuite.at: Add them. - + 2005-04-19 Nathaniel Smith * file_io.cc (read_localized_data, write_localized_data): Remove @@ -10704,20 +10708,20 @@ * tests/t_lf_crlf.at: Remove --debugs, clean up, test more. 2005-04-19 Emile Snyder - + * file_io.cc: Fix bugs with read/write_localized_data when using CRLF line ending conversion. * transforms.cc: Fix line_end_convert to add correct end of line string if the split_into_lines() call causes us to lose one from the end. * tests/t_lf_crlf.at: Clean up and no longer XFAIL. - + 2005-04-19 Sebastian Spaeth * monotone.texi: modified documentation to match changes due to previous checking. * AUTHORS: Adding myself - + 2005-04-19 Sebastian Spaeth * automate.cc: make BRANCH optional in "automate heads BRANCH" @@ -10835,15 +10839,15 @@ * transforms.cc: fix glob_to_regexp assertions 2005-04-17 Sebastian Spaeth - - * tests/t_db_kill_rev_locally.at: new test; + + * tests/t_db_kill_rev_locally.at: new test; make sure that db kill_rev_locally works as intended 2005-04-17 Sebastian Spaeth * commands.cc,database.cc: add 'db kill_rev_locally ' command still missing: documentation and autotests. Otherwise seems ok. - + 2005-04-17 Richard Levitte * transforms.cc: Remove tabs and make sure emacs doesn't add @@ -10861,7 +10865,7 @@ * tests/t_database_check.at: Update accordingly. * tests/t_database_check_minor.at: New test. * testsuite.at: Add it. - + 2005-04-17 Richard Levitte * transforms.cc (glob_to_regexp): New function that takes a glob @@ -10888,13 +10892,13 @@ 2005-04-16 Emile Snyder - * tests/t_add_stomp_file.at: New test for failing case. - If you have a file foo in your working dir (not monotone - controlled) and someone else adds a file foo and commits, - update should at least warn you before stomping your - non-recoverable foo file. + * tests/t_add_stomp_file.at: New test for failing case. + If you have a file foo in your working dir (not monotone + controlled) and someone else adds a file foo and commits, + update should at least warn you before stomping your + non-recoverable foo file. * testsuite.at: Add it. - + 2005-04-16 Derek Scherger * work.cc (known_preimage_path): rename to... @@ -10903,7 +10907,7 @@ (build_rename): ensure rename source exists in current revision and rename target does not exist in current revision - * tests/t_no_rename_overwrite.at: un-XFAIL + * tests/t_no_rename_overwrite.at: un-XFAIL 2005-04-16 Nathaniel Smith @@ -10919,10 +10923,10 @@ * tests/t_override_author_date.at: New test. * testsuite.at: Add it. - + This commit heavily based on a patch by Markus Schiltknecht . - + 2005-04-16 Nathaniel Smith * ChangeLog: Fixup after merge. @@ -10931,7 +10935,7 @@ * tests/t_update_nonexistent.at: New test. * testsuite.at: Add it. - + * commands.cc (update): Verify that user's requested revision exists. @@ -10946,22 +10950,22 @@ and commits, then you do an update it messes up your working directory. * testsuite.at: Add it. - + 2005-04-16 Nathaniel Smith * commands.cc (checkout): Move check for existence of revision earlier. - + * tests/t_netsync_defaults.at, tests/t_netsync_single.at: Don't hard-code netsync port. 2005-04-16 Nathaniel Smith * testsuite.at: Use a random server port. - + * .mt-attrs, contrib/README: Update for Notify.pl -> monotone-notify.pl rename. - + * monotone.1: Warn people off rcs_import. * monotone.texi (Commands): Likewise. @@ -10980,12 +10984,12 @@ * ChangeLog: Small fixups. 2005-04-16 Sebastian Spaeth - + * tests/t_cvsimport2.at: new test; CVS Attic files fail test reported by: address@hidden 15.04.2005 02:45 2005-04-16 Sebastian Spaeth - + * tests/t_rcs_import.at: new test; problematic CVS import as reported in the list. However it works just fine here, so it really tests for a successful pass @@ -11011,17 +11015,17 @@ (CVS Phrasebook): Add "Importing a New Project". * AUTHORS: Add Martin Dvorak. - + 2005-04-16 Matt Johnston * change_set.cc (compose_rearrangement): remove logging statements that were using noticable CPU time. 2005-04-15 Martin Dvorak - + * tests/t_rename_dir_add_dir_with_old_name.at: New test. * testsuite.at: Add it. - + 2005-04-15 Olivier Andrieu * diff_patch.cc(guess_binary): do not use '\x00' as first @@ -11049,7 +11053,7 @@ * monotone.texi (Informative): update description of 'diff' with two revision arguments - + 2005-04-14 Matthew Gregan * win32/process.cc: Fix build on MingW 3.2.0-rc[123] by adding @@ -11088,7 +11092,7 @@ * monotone.texi (Informative): 'diff' with two revision arguments can now be filtered by file. - + * constants.cc (netcmd_payload_limit): Bump to 256 megs. 2005-04-13 Matthew Gregan @@ -11102,7 +11106,7 @@ * tests/t_setup_checkout_modify_new_dir.at: * tests/t_update_off_branch.at: New tests. * testsuite.at: Add them. - + * commands.cc (checkout): Tweak branch checking logic. (update): Make user explicitly switch branches. @@ -11111,7 +11115,7 @@ * rcs_import.cc (import_cvs_repo): Check that user isn't trying to import a whole CVS repo. * tests/t_cvsimport.at: Test new check. - + 2005-04-13 Richard Levitte * contrib/Notify.pl: Rename ... @@ -11131,8 +11135,8 @@ (approve, disapprove, fcommit, commit): Don't call app.set_branch on guess_branch's output. (checkout): Call guess_branch. - - * tests/t_sticky_branch.at: + + * tests/t_sticky_branch.at: * tests/t_checkout_id_sets_branch.at: New tests. * testsuite.at: Add them. @@ -11165,7 +11169,7 @@ really fixed. The rearrangement failure still exists, though. 2005-04-12 Jon Bright - * tests/t_cvsimport_samelog.at: Add test for the deltas.find + * tests/t_cvsimport_samelog.at: Add test for the deltas.find cvs import problem as sent to the ML by Emile Snyder. * testsuite.at: Call it * rcs_import.cc (cvs_key): Add an ID for debug output purposes, @@ -11183,7 +11187,7 @@ * win32/terminal.cc (terminal_width): Use GetConsoleScreenBufferInfo to request width information for terminals. - + 2005-04-12 Nathaniel Smith * ChangeLog: Fixup after merge. @@ -11195,7 +11199,7 @@ * {unix,win32}/terminal.cc: ...these. Implement terminal_width. * ui.cc (write_ticks): Call it. * Makefile.am: Update for renames. - + 2005-04-11 Matt Johnston * ui.{cc,hh}, netsync.cc: netsync progress ticker in kilobytes to @@ -11293,10 +11297,10 @@ 2005-04-08 Jon Bright * testsuite.at (NOT_ON_WIN32): Add a function to prevent tests from - running on Win32 (for cases where the functionality being tested + running on Win32 (for cases where the functionality being tested makes no sense on Win32. Not for cases where the functionality just isn't there yet on Win32.) - * tests/t_final_space.at: Use NOT_ON_WIN32. The filenames "a b" + * tests/t_final_space.at: Use NOT_ON_WIN32. The filenames "a b" and "a b " refer to the same file on Win32, obviating this test 2005-04-08 Jon Bright @@ -11308,7 +11312,7 @@ -PIPE to some signal that *does* kill monotone, so it seems like the easiest solution is just not to send the signal in the first place here. - * tests/t_automate_ancestry_difference.at: Remove old + * tests/t_automate_ancestry_difference.at: Remove old CHECK_SAME_STDOUT call which I'd left by accident. * tests/t_automate_leaves.at: Canonicalise monotone output before passing to CHECK_SAME_STDOUT @@ -11339,7 +11343,7 @@ (put_revision_id): constify argument. (maybe_update_inodeprints): New function. (commit, update, checkout): Call it. - + * manifest.{cc,hh} (build_manifest_map): Remove, since only caller was removed. (build_restricted_manifest_map): Go faster if the user is using @@ -11347,7 +11351,7 @@ * tests/t_inodeprints.at: * tests/t_inodeprints_update.at: Typoes. - + * work.cc (read_inodeprints): Typo. 2005-04-08 Nathaniel Smith @@ -11355,27 +11359,27 @@ * tests/t_inodeprints.at: * tests/t_inodeprints_update.at: New tests. * testsuite.at: Add them. - + * UPGRADE: Document 0.17 -> 0.18 upgrade path. 2005-04-08 Jon Bright * tests/t_cat_file_by_name.at: CHECK_SAME_STDOUT can only be used to check two 'cat' processes or two monotone processes on Win32, - not to check monotone and 'cat'. Change to go through an + not to check monotone and 'cat'. Change to go through an intermediate stdout * tests/t_automate_erase_ancestors.at: Ditto * tests/t_automate_toposort.at: Ditto * tests/t_automate_ancestry_difference.at: Ditto * tests/t_vars.at: Call CANONICALISE for stdout output. * tests/t_netsync_absorbs.at: Ditto. - * tests/t_empty_env.at: For Win32, copy libiconv-2.dll to the + * tests/t_empty_env.at: For Win32, copy libiconv-2.dll to the current dir before the test, otherwise Win32 will search the (empty) path for it and not find it. * tests/t_automate_descendents.at: Ditto * win32/inodeprint.cc: Implement inodeprint_file for Win32, based on mode, device, size, create time and write time. - - + + 2005-04-08 Jon Bright * win32/inodeprint.cc: Change the function name to match the one on Unix. @@ -11456,7 +11460,7 @@ always sort, instead of sometimes doing linear search. This makes insert O(1), while still preserving the invariant that keys must be unique. - + * commands.cc (commit): Explain why we're aborting, in the case that we detect that a file has changed under us in the middle of a commit. @@ -11488,14 +11492,14 @@ 2005-04-05 Matt Johnston * basic_io.hh: reserve() the string which we're appending to - frequently. Seems to give ~5% speedup in + frequently. Seems to give ~5% speedup in diff -r t:revision-0.16 -r t:revision-0.17 - can't hurt. 2005-04-04 Nathaniel Smith * monotone.spec, debian/control: We no longer need external popt. * INSTALL: Ditto, plus some general updating. - + 2005-04-04 Nathaniel Smith * tests/t_sql_unpack.at: New test. @@ -11597,13 +11601,13 @@ * file_io.cc (read_data_for_command_line): New function. (read_data_stdin): New function. * file_io.hh (read_data_for_command_line): Add prototype. - + * monotone.cc (my_poptStuffArgFile): Clean up a little. Use read_data_for_command_line. Don't free argv, but rather return it. (cpp_main): Keep a list of allocated argv's, and free them. (options): Tweak wording of help text on address@hidden - + 2005-04-01 Nathaniel Smith * file_io.hh: Remove tabs. @@ -11616,13 +11620,13 @@ * ChangeLog: Fixup after merge. * monotone.text (Making Changes): Fix typo. - + 2005-04-01 Nathaniel Smith * monotone.cc (cpp_main): Remove now-unneccessary newline. - + * commands.cc (commit): Fix typo. - + * monotone.texi (Making Changes): Don't claim that writing to MT/log prevents the editor from starting. Clarify later that having written to MT/log still means the editor will pop up @@ -11704,7 +11708,7 @@ * commands.cc (automate): Synopsify it. * monotone.1: Add it. * monotone.texi (Automation, Commands): Likewise. - + * tests/t_automate_leaves.at: New test. * testsuite.at: Add it. @@ -11719,7 +11723,7 @@ * tests/t_automate_ancestry_difference.at: New test. * tests/t_diff_first_rev.at: New test. * testsuite.at: Add them. - + * revision.cc (calculate_ancestors_from_graph): Do not keep an "interesting" set and return only ancestors from this set; instead, simply return all ancestors. Returning a limited set of @@ -11742,7 +11746,7 @@ * monotone.texi (Commands): Likewise. (Automation): Likewise. Also, clarify for each command whether its output is alphabetically or topologically sorted. - + 2005-03-29 Richard Levitte * commands.cc (CMD(ls)): Update with the same information as @@ -11772,7 +11776,7 @@ * tests/t_automate_descendents.at: New test. * testsuite.at: Add it. - + * monotone.texi (Automation, Commands): Document automate descendents. * monotone.1: Document automate descendents, and vars stuff. @@ -11826,13 +11830,13 @@ 2005-03-25 Matt Johnston - * {unix,win32}/platform_netsync.cc, platform.hh, Makefile.am: new - functions to disable and enable sigpipe. - * netsync.cc, main.cc: call the functions from netsync rather than - globally, so that sigpipe still works for piping output of commands - such as 'log'. - * tests/t_netsync_sigpipe.at: test it. - * testsuite.at: add it. + * {unix,win32}/platform_netsync.cc, platform.hh, Makefile.am: new + functions to disable and enable sigpipe. + * netsync.cc, main.cc: call the functions from netsync rather than + globally, so that sigpipe still works for piping output of commands + such as 'log'. + * tests/t_netsync_sigpipe.at: test it. + * testsuite.at: add it. 2005-03-25 Matt Johnston @@ -11860,7 +11864,7 @@ * tests/t_empty_env.at: New test. * testsuite.at: Add it. Absolutify path to monotone so it will work. - + * unix/have_smart_terminal.cc (have_smart_terminal): Handle the case where TERM is unset or empty. @@ -11880,10 +11884,10 @@ * tests/t_empty_id_completion.at: New test. * tests/t_empty_path.at: New test. * testsuite.at: Add them. - + * database.cc (complete): Always generate some sort of limit term, even a degenerate one. - + * app_state.cc (create_working_copy): Check for null directory. * work.cc (build_deletion, build_addition, build_rename): Check @@ -11896,9 +11900,9 @@ * platform.hh (have_smart_terminal): prototype * ui.cc (user_interface): set ticker to dot/count based on have_smart_terminal - * unix/have_smart_terminal.cc: + * unix/have_smart_terminal.cc: * win32/have_smart_terminal.cc: new file - + 2005-03-23 Derek Scherger * commands.cc (add): pass list of prefixed file_path's to @@ -11947,7 +11951,7 @@ (Vars): New section. * netsync.cc (process_hello_cmd): Touch more cleaning. * tests/t_merge_5.at: More commentary. - + 2005-03-23 Matt Johnston * tests/t_merge_5.at: new test for a merge which ends up with @@ -11982,12 +11986,12 @@ * netsync.cc (queue_hello_cmd): Adjust accordingly. (process_hello_cmd): More cleaning. Also, save new server keys to a var, and check old server keys against the var. - + * tests/t_netsync_checks_server_key.at: New test. * testsuite.at: Add it. Better docs for some netsync macros, while I'm here... * tests/t_netsync_absorbs.at: Add 'netsync' keyword. - + 2005-03-22 Nathaniel Smith * tests/t_netsync_absorbs.at: New test. @@ -12002,7 +12006,7 @@ formerly in dispatch_payload. Cleanup. No semantic changes. - + 2005-03-21 Nathaniel Smith * monotone.texi (Starting a New Project): Tweak phrasing. @@ -12028,7 +12032,7 @@ 2005-03-21 Matt Johnston - * change_set.cc: use std::map rather than smap for + * change_set.cc: use std::map rather than smap for confirm_unique_entries_in_directories() and confirm_proper_tree() since they perform a lot of insert()s. @@ -12048,7 +12052,7 @@ * commands.cc (set, unset): New commands. (ls): New "vars" subcommand. * tests/t_vars.at: Fix. Un-XFAIL. - + 2005-03-21 Nathaniel Smith * transforms.{cc,hh}: Remove tabs. @@ -12065,11 +12069,11 @@ * schema_migration.cc (migrate_client_to_vars): New function. (migrate_monotone_schema): Use it. * tests/t_migrate_schema.at: Another schema, another test... - + * vocab_terms.hh (var_domain, var_name, var_value): New types. * database.hh (get_vars, get_var, var_exists, set_var, clear_var): Prototype new functions. - + 2005-03-20 Derek Scherger * file_io.cc (book_keeping_file): return true only if first @@ -12094,7 +12098,7 @@ * debian/files: Auto-updated by dpkg-buildpackage. * This is the 0.17 release. - + 2005-03-18 Nathaniel Smith * Makefile.am (MOST_SOURCES): Add package_{full_,}revision.h. @@ -12117,11 +12121,11 @@ * path_component (split_path): Fix bug. Also, add unit tests for file. * unit_tests.{hh,cc}: Add path_component unit tests. - + 2005-03-18 Nathaniel Smith * Makefile.am: Fixup after merge. - + 2005-03-18 Nathaniel Smith * change_set.cc: Move path_component stuff to... @@ -12166,11 +12170,11 @@ wording. * NEWS: Small tweaks. * UPGRADE: More instructions, not done yet... - + 2005-03-15 Matt Johnston * commands.cc, monotone.texi, monotone.1: mention that agraph - output is in VCG format. + output is in VCG format. 2005-03-14 Nathaniel Smith @@ -12214,7 +12218,7 @@ * win32/monotone.iss: Monotone -> monotone 2005-03-09 Jon Bright - * win32/monotone.iss: Added an Inno Setup script for + * win32/monotone.iss: Added an Inno Setup script for generating a Windows installer. Inno Setup is GPLed, see http://www.jrsoftware.org for download @@ -12258,7 +12262,7 @@ work. * rcs_import.cc (import_cvs_repo): Update accordingly. * commands.cc (server): Likewise. - * revision.cc (build_changesets_from_existing_revs) + * revision.cc (build_changesets_from_existing_revs) (build_changesets_from_manifest_ancestry): Require passphrase early. @@ -12267,11 +12271,11 @@ * NEWS, INSTALL, README.changesets: Update in preparation for 0.17. * UPGRADE: New file. - + * tests/t_diff_restrict.at: Oops. XFAIL it. - + 2005-03-08 Jon Bright - + * win32/process.cc (process_spawn): Escape the parameters, surround them with quotes before adding them to the consolidated command line string @@ -12279,12 +12283,12 @@ returns the *native* form of the path in this. * mkstemp.hh: Now always use monotone_mkstemp (monotone_mkstemp): Update prototype - * lua.cc (monotone_mkstemp_for_lua): Use new-style + * lua.cc (monotone_mkstemp_for_lua): Use new-style monotone_mkstemp 2005-03-08 Jon Bright - - * win32/read_password.cc (read_password): Now correctly hides + + * win32/read_password.cc (read_password): Now correctly hides password when run in a Windows console. Does at least enough in a MinGW rxvt console to make sure that you can't see the password. * win32/process.cc: Change indentation. @@ -12320,7 +12324,7 @@ (rebuild_merkle_trees): Actually calculate hashes for epoch merkle trees. Also, only include epochs that meet the branch mask. (session): Remove unused id_to_epoch map. - + 2005-03-05 Nathaniel Smith * netcmd.cc (read_netcmd_item_type): Handle epoch_item. @@ -12357,8 +12361,8 @@ (rebuild_merkle_trees): Fill epoch merkle tree and id_to_epoch table. - * netsync.cc (queue_confirm_cmd, process_confirm_cmd) - (dispatch_payload, rebuild_merkle_trees): + * netsync.cc (queue_confirm_cmd, process_confirm_cmd) + (dispatch_payload, rebuild_merkle_trees): * netcmd.hh: * netcmd.cc (read_confirm_cmd_payload, write_confirm_cmd_payload): Remove epochs. @@ -12367,7 +12371,7 @@ * constants.cc: * revision.cc: - * testsuite.at: + * testsuite.at: * commands.cc: * ChangeLog: Fixup after merge. @@ -12394,7 +12398,7 @@ * tests/t_epoch.at: Even more paranoid. * tests/t_epoch_server.at: New test. * testsuite.at: Add it. - + 2005-02-21 Nathaniel Smith * tests/t_epoch.at: Check that netsync only sends relevant @@ -12408,7 +12412,7 @@ * database.cc (set_epoch): Fix SQL. * monotone.texi (Rebuilding ancestry): Reword a bit. - * netcmd.{cc,hh} + * netcmd.{cc,hh} ({read,write}_hello_cmd_payload): Transfer server key with hello. ({read,write}_confirm_cmd_payload): Transfer epoch list with confirm. * netsync.cc: Adapt to changes in netcmd. @@ -12444,9 +12448,9 @@ * merkle_tree.hh: Remove mcert_item and fcert_item, rename rcert_item to cert_item, renumber to remove gaps left. * merkle_tree.cc (netcmd_item_type_to_string): - * netcmd.cc (read_netcmd_item_type): + * netcmd.cc (read_netcmd_item_type): * netsync.cc: Adjust accordingly. - + 2005-02-05 Nathaniel Smith * constants.cc (constants): Bump netsync protocol version. @@ -12458,7 +12462,7 @@ * tests/t_can_execute.at: Run 'cp' instead of 'touch', because cp will actually notice if we pass arguments out of order. * testsuite.at: Remove mysterious blank line. - + 2005-03-07 Nathaniel Smith * unix/process.cc (process_spawn): Log command line before @@ -12477,13 +12481,13 @@ 2005-03-05 Nathaniel Smith * revision.cc (check_sane_history): Typo. - + 2005-03-05 Nathaniel Smith * revision.hh (check_sane_history): Take an app_state instead of a database as an argument. * database.cc: Pass an app_state instead of a database as its - argument. + argument. * revision.cc (check_sane_history): Update accordingly. Add a new check for merges, that they are creating consistent changesets (even when the common ancestor is outside of the usual @@ -12494,7 +12498,7 @@ * revision.cc (kluge_for_3_ancestor_nodes): Rename to... (kill_redundant_edges): ...this. Kill all redundant edges, not just ones on nodes with 3+ parents. Also, make it actually work. - + 2005-03-05 Nathaniel Smith * revision.cc (kluge_for_3_ancestor_nodes): New method. @@ -12507,16 +12511,16 @@ * netsync.cc: Remove a few tabs. 2005-03-04 Jon Bright - - * win32/process.cc (process_spawn): Now takes + + * win32/process.cc (process_spawn): Now takes const char * const argv[] * unix/process.cc (process_spawn): Ditto. Cast for call to execvp (existsonpath): Initialise args in a const way 2005-03-04 Jon Bright - - * win32/process.cc (process_spawn): Now takes + + * win32/process.cc (process_spawn): Now takes char * const argv[] * platform.hh (process_spawn): Ditto * unix/process.cc (process_spawn): Ditto @@ -12524,8 +12528,8 @@ * General: Beginning to hate C++'s const rules 2005-03-04 Jon Bright - - * win32/process.cc (process_spawn): Now takes + + * win32/process.cc (process_spawn): Now takes const char * const * * platform.hh (process_spawn): Ditto * unix/process.cc (process_spawn): Ditto @@ -12533,24 +12537,24 @@ forth between Linux and Win32 2005-03-04 Jon Bright - + * win32/process.cc (process_spawn): Now takes char * const * * platform.hh (process_spawn): Ditto * unix/process.cc (process_spawn): Ditto (existsonpath): argv now const char*[] 2005-03-04 Jon Bright - + * win32/process.cc: Added forgotten file * unix/process.cc: Include stat.h, (process_*) fix compilation errors 2005-03-04 Jon Bright - + * unix/process.cc: Added forgotten file 2005-03-03 Jon Bright - + * lposix.c: Deleted * win32/process.cc: Created, added Win32 versions of functions existsonpath, make_executable, process_spawn, process_wait, @@ -12558,7 +12562,7 @@ * unix/process.cc: Ditto, for the Unix versions. * lua.cc: Add LUA wrappers for the above functions, register them with LUA - * std_hooks.lua (execute, attr_functions->execute, + * std_hooks.lua (execute, attr_functions->execute, program_exists_in_path): Use the new functions instead of posix functions * t_can_execute.at (touchhook.lua): Ditto @@ -12574,7 +12578,7 @@ * tests/t_command_completion.at: new test * tests/t_merge_rename_file_and_rename_dir.at: new test * testsuite.at: include new tests - + 2005-02-28 Richard Levitte * Makefile.am (BUILT_SOURCES_CLEAN): Moved mt-stding.h from here... @@ -12587,34 +12591,34 @@ comparison (0 doesn't compare as false in lua it seems). 2005-02-27 Jon Bright - + * lposix.c (win32 Pspawn): Search the path (win32 Pexistsonpath): Added. 'which' isn't easily available, and not available at all from a normal Win32 command shell (Piswin32): Added a function for both Unix and Win32 to detect if running on Windows - * std_hooks.lua (program_exists_in_path): Now calls + * std_hooks.lua (program_exists_in_path): Now calls posix.iswin32. If win32, calls posix.existsonpath, otherwise calls which as it always did. 2005-02-27 Jon Bright - + * lposix.c (win32 Pspawn): Remove dumb strlen bug resulting in AVs on commit. 2005-02-27 Jon Bright - + * t_can_execute.at: Test to see if hooks can execute things * testsuite.at: Add t_can_execute 2005-02-27 Jon Bright - + * lposix.c (win32 Pspawn): Ensure the command string is always NUL-terminated. Also, allocate enough memory for the quotes around the command string. 2005-02-27 Jon Bright - + * xdelta.cc (unittests): Define BOOST_STDC_NO_NAMESPACE, needed to compile with the latest MinGW which uses gcc 3.4.2 * vocab.cc (verify(local_path)): Catch fs::filesystem_error too @@ -12622,9 +12626,9 @@ Win32 unit tests without disabling anything * idna/toutf8.c (stringprep_convert): Fix a potential segfault when memory allocation fails. Potentially security-relevant. - * tests/t_i18n_file.at: Add a SET_FUNNY_FILENAME macro, which - gets a platform-appropriate funny filename (with/without - colon). + * tests/t_i18n_file.at: Add a SET_FUNNY_FILENAME macro, which + gets a platform-appropriate funny filename (with/without + colon). Change references to utf8 to utf-8, iso88591 to iso-8859-1, and eucjp to euc-jp, on the grounds that MinGW's iconv knows all of the latter and none of the former, but Linux iconv knows all @@ -12642,7 +12646,7 @@ it with UNGZB64 * testsuite.at: Add a comment every 10 tests with the test number. Useful if you're trying to locate which test number - you're trying to run and only have the filename. If people + you're trying to run and only have the filename. If people hate this, though, please do delete. (UNB64_COMMAND) Do special handling for Win32 to avoid having to canonicalise the file. @@ -12650,7 +12654,7 @@ * lposix.c: (Pfork, Pexec) Removed, on the grounds that we only really want to support fork+exec as a single operation. fork() without exec() could be risky with a child process also having - our sqlite handles, etc. exec() could be risky since we + our sqlite handles, etc. exec() could be risky since we wouldn't be exiting gracefully, just dying in the middle of a hook. (Pspawn) Implemented for both Win32 and Unix. Does fork/exec @@ -12661,7 +12665,7 @@ * std_hooks.lua: (execute) Now uses spawn() 2005-02-25 Jon Bright - + * ChangeLog: Add all my previous changes. * tests/t_add_owndb.at: Add test for trying to add the db to itself. @@ -12670,16 +12674,16 @@ * tests/t_automate_version.at: Use arithmetic comparison against wc output instead of string comparison, to avoid problems with MinGW's wc, which outputs with initial space-padding - * tests/t_change_empty_file.at: Canonicalise stdout output + * tests/t_change_empty_file.at: Canonicalise stdout output and compare manually instead of letting autotest check it * tests/t_fmerge_normalize.at: Canonicalise stdout output. - * tests/t_netsync_single.at: Use NETSYNC_KILLHARD instead of + * tests/t_netsync_single.at: Use NETSYNC_KILLHARD instead of killall, as for the NETSYNC functions in testsuite.at 2005-02-27 Matt Johnston - * main.cc: ignore SIGPIPE so that monotone won't be killed - unexpectedly upon remote disconnection for netsync + * main.cc: ignore SIGPIPE so that monotone won't be killed + unexpectedly upon remote disconnection for netsync 2005-02-27 Nathaniel Smith @@ -12688,7 +12692,7 @@ 2005-02-27 Nathaniel Smith * AUTHORS: Add Corey Halpin. - + * idna/idn-int.h: New file (don't generate from configure anymore, but just ship). * configure.ac: Don't generate idna/idn-int.h. Do generate @@ -12699,16 +12703,16 @@ instead). * m4/ax_create_stdint_h.m4: * m4/acx_pthread.m4: Update from http://autoconf-archive.cryp.to/ - + * numeric_vocab.hh: Instead of dancing around which header to include, include mt-stdint.h. - + * app_state.cc (restriction_includes, set_restriction): Move global static 'dot' into these functions, because file_path depends on global book_keeping_dir being initialized already, and there is no guaranteed order of initialization of C++ statics. (Bug reported by Matt Johnston.) - + 2005-02-27 Corey Halpin * numeric_vocab.hh: Try both stdint.h and inttypes.h. @@ -12721,7 +12725,7 @@ doesn't contain ..'s 2005-02-25 Jon Bright - + * ChangeLog: Add all my previous changes. * tests/t_add_owndb.at: Add test for trying to add the db to itself. @@ -12730,10 +12734,10 @@ * tests/t_automate_version.at: Use arithmetic comparison against wc output instead of string comparison, to avoid problems with MinGW's wc, which outputs with initial space-padding - * tests/t_change_empty_file.at: Canonicalise stdout output + * tests/t_change_empty_file.at: Canonicalise stdout output and compare manually instead of letting autotest check it * tests/t_fmerge_normalize.at: Canonicalise stdout output. - * tests/t_netsync_single.at: Use NETSYNC_KILLHARD instead of + * tests/t_netsync_single.at: Use NETSYNC_KILLHARD instead of killall, as for the NETSYNC functions in testsuite.at 2005-02-25 Nathaniel Smith @@ -12753,10 +12757,10 @@ 2005-02-24 Jon Bright - * app_state.cc (prefix): Use string() instead of + * app_state.cc (prefix): Use string() instead of native_directory_string(). For Unix, these should be equivalent. - For Win32, I believe string()'s correct (since we compare - everywhere against normalized paths with / characters, but + For Win32, I believe string()'s correct (since we compare + everywhere against normalized paths with / characters, but native_directory_string produces paths with \ characters on Win32. * rcs_file.cc (file_source): Map the map, not the mapping. * tests/t_i18n_file.at: Remove colon from filename with symbols. @@ -12795,21 +12799,21 @@ * tests/t_restrictions.at: remove invalid paths from ls unknown and ls ignored * tests/t_restrictions_warn_on_unknown.at: un-XFAIL - + 2005-02-23 Derek Scherger * commands.cc (ls_missing): replace duplicated code with call to calculate_base_revision 2005-02-23 Jon Bright - + * vocab.cc (test_file_path_verification): Disable foo//nonsense test for Win32, add tests for UNC paths. This was the only failing unit test on Win32. 2005-02-23 Jon Bright - * txt2c.cc (main): Don't claim the file was generated from + * txt2c.cc (main): Don't claim the file was generated from --strip-trailing if that option's used. 2005-02-23 Jon Bright @@ -12819,7 +12823,7 @@ * lua/lposix.c, lua/modemuncher.c: Remove all references to functions and modes that don't exist on Win32. * monotone.cc: Include libintl.h on Win32 - + 2005-02-21 Nathaniel Smith * file_io.cc (get_homedir): Add more comments and logging to Win32 @@ -12828,7 +12832,7 @@ 2005-02-21 Derek Scherger * Makefile.am: merge fixup - + 2005-02-21 Derek Scherger * Makefile.am: add fsck.{cc,hh} @@ -12838,7 +12842,7 @@ (get_file_ids,get_manifest_ids,get_revision_ids): more new methods * tests/t_fsck.at: new test * testsuite.at: call it - + 2005-02-21 Nathaniel Smith * commands.cc (commit): Simplify chatter. @@ -12878,7 +12882,7 @@ 2005-02-19 Derek Scherger - * automate.cc (automate_heads): remove bogus call to + * automate.cc (automate_heads): remove bogus call to app.allow_working_copy() which is called in cpp_main * database.cc (check_sqlite_format_version): don't check database version when "file" is really a directory; add filename to error @@ -13337,7 +13341,7 @@ (import_states_by_branch): Add 'revisions' argument. (import_cvs_repo): Add a stage 3 that writes out the revisions accumulated in the 'revisions' vector. - + 2005-01-27 Matt Johnston (compile fixes for Linux/gcc 3.3.4) ============================================================ --- po/de.po 2bcc2419844611c80b7086caea5c8fb34242dd3c +++ po/de.po 92988d66272e8b9a066043a15d211ea522d554dd @@ -24,7 +24,7 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-06 15:30+0200\n" +"POT-Creation-Date: 2006-07-10 15:00-0700\n" "PO-Revision-Date: 2006-07-06 15:31+0100\n" "Last-Translator: Thomas Keller \n" "Language-Team: Deutsch \n" @@ -36,57 +36,57 @@ "X-Poedit-Country: GERMANY\n" "X-Poedit-Basepath: ..\n" -#: app_state.cc:139 +#: app_state.cc:140 #, c-format msgid "workspace required but not found%s%s" msgstr "es wurde kein Arbeitsverzeichnis gefunden%s%s" -#: app_state.cc:147 +#: app_state.cc:148 #, c-format msgid "invalid directory ''" msgstr "ungültiges Verzeichnis ''" -#: app_state.cc:155 +#: app_state.cc:156 #, c-format msgid "monotone bookkeeping directory '%s' already exists in '%s'" msgstr "Das monotone-Systemverzeichnis '%s' existiert bereits in '%s'" -#: app_state.cc:236 +#: app_state.cc:237 #, c-format msgid "search root '%s' does not exist" msgstr "Wurzel der Suche '%s' existiert nicht" -#: app_state.cc:237 +#: app_state.cc:238 #, c-format msgid "search root '%s' is not a directory\n" msgstr "Wurzel der Suche '%s' ist kein Verzeichnis\n" -#: app_state.cc:271 +#: app_state.cc:272 #, c-format msgid "failed to parse date string '%s': %s" msgstr "konnte Zeichenkette '%s' nicht parsen: %s" -#: app_state.cc:286 +#: app_state.cc:287 #, c-format msgid "negative depth not allowed\n" msgstr "negative Tiefe nicht erlaubt\n" -#: app_state.cc:294 +#: app_state.cc:295 #, c-format msgid "illegal argument to --last: cannot be zero or negative\n" msgstr "ungültiges Argument für --last: kann nicht null oder negativ sein\n" -#: app_state.cc:302 +#: app_state.cc:303 #, c-format msgid "illegal argument to --next: cannot be zero or negative\n" msgstr "ungültiges Argument für --next: kann nicht null oder negativ sein\n" -#: app_state.cc:438 +#: app_state.cc:439 #, c-format msgid "Failed to read options file %s" msgstr "Konnte Optionen-Datei %s nicht lesen" -#: app_state.cc:455 +#: app_state.cc:456 #, c-format msgid "Failed to write options file %s" msgstr "Konnte Optionen-Datei %s nicht schreiben" @@ -109,20 +109,23 @@ #: cert.cc:157 #, c-format msgid "trust function disliked %d signers of %s cert on manifest %s" -msgstr "Vertrauensfunktion lehnt %d Unterzeichner des Zertifikats %s auf Manifest %s ab" +msgstr "" +"Vertrauensfunktion lehnt %d Unterzeichner des Zertifikats %s auf Manifest %s " +"ab" #: cert.cc:214 #, c-format msgid "trust function disliked %d signers of %s cert on revision %s" -msgstr "Vertrauensfunktion lehnt %d Unterzeichner des Zertifikats %s auf Revision %s ab" +msgstr "" +"Vertrauensfunktion lehnt %d Unterzeichner des Zertifikats %s auf Revision %s " +"ab" #: cert.cc:303 #, c-format msgid "calculated cert hash '%s' does not match '%s'" msgstr "berechnete Zertifikatsprüfsumme '%s' stimmt nicht mit '%s' überein" -#: cert.cc:379 -#: keys.cc:554 +#: cert.cc:379 keys.cc:554 #, c-format msgid "no key pair '%s' found in key store '%s'" msgstr "kein Schlüsselpaar '%s' in Schlüsselbund '%s' gefunden" @@ -143,22 +146,29 @@ "pick one to use for signatures by adding '-k' to your command" msgstr "" "Sie haben mehrere geheime Schlüssel.\n" -"Um einen davon für die Erstellung von Signaturen auszuwählen, fügen Sie '-k' Ihrem Befehl hinzu." +"Um einen davon für die Erstellung von Signaturen auszuwählen, fügen Sie '-" +"k' Ihrem Befehl hinzu." #: cert.cc:478 #, c-format msgid "no branch found for empty revision, please provide a branch name" -msgstr "kein Zweig für leere Revision gefunden, bitte geben Sie einen Zweignamen an" +msgstr "" +"kein Zweig für leere Revision gefunden, bitte geben Sie einen Zweignamen an" #: cert.cc:487 #, c-format msgid "no branch certs found for revision %s, please provide a branch name" -msgstr "keine Zweigzertifikate für Revision %s gefunden, bitte geben Sie einen Zweignamen an" +msgstr "" +"keine Zweigzertifikate für Revision %s gefunden, bitte geben Sie einen " +"Zweignamen an" #: cert.cc:491 #, c-format -msgid "multiple branch certs found for revision %s, please provide a branch name" -msgstr "mehrere Zweigzertifikate für Revision %s gefunden, bitte geben Sie einen Zweignamen an" +msgid "" +"multiple branch certs found for revision %s, please provide a branch name" +msgstr "" +"mehrere Zweigzertifikate für Revision %s gefunden, bitte geben Sie einen " +"Zweignamen an" #: cmd_automate.cc:205 #, c-format @@ -178,15 +188,9 @@ msgid "automation interface" msgstr "Schnittstelle für die Automatisierung" -#: cmd_db.cc:35 -#: cmd_diff_log.cc:404 -#: cmd_diff_log.cc:435 -#: cmd_diff_log.cc:437 -#: cmd_files.cc:102 -#: cmd_files.cc:164 -#: cmd_merging.cc:124 -#: cmd_ws_commit.cc:446 -#: commands.cc:370 +#: cmd_db.cc:35 cmd_diff_log.cc:379 cmd_diff_log.cc:410 cmd_diff_log.cc:412 +#: cmd_files.cc:134 cmd_files.cc:196 cmd_merging.cc:124 cmd_merging.cc:633 +#: cmd_merging.cc:648 cmd_merging.cc:651 cmd_ws_commit.cc:446 commands.cc:374 #, c-format msgid "no such revision '%s'" msgstr "Revision nicht gefunden: '%s'" @@ -241,8 +245,7 @@ msgid "The epoch must be %s characters" msgstr "Der Zeitraum muss %s Zeichen sein" -#: cmd_db.cc:119 -#: cmd_db.cc:135 +#: cmd_db.cc:119 cmd_db.cc:135 msgid "vars" msgstr "Variablen" @@ -267,14 +270,8 @@ msgid "no var with name %s in domain %s" msgstr "keine Variable mit dem Namen %s in der Domäne %s" -#: cmd_db.cc:152 -#: cmd_diff_log.cc:348 -#: cmd_diff_log.cc:558 -#: cmd_files.cc:78 -#: cmd_files.cc:145 -#: cmd_list.cc:437 -#: cmd_merging.cc:570 -#: cmd_ws_commit.cc:322 +#: cmd_db.cc:152 cmd_diff_log.cc:323 cmd_diff_log.cc:533 cmd_files.cc:110 +#: cmd_files.cc:177 cmd_list.cc:437 cmd_merging.cc:570 cmd_ws_commit.cc:322 #: commands.cc:246 msgid "informative" msgstr "Informativ" @@ -292,17 +289,13 @@ msgid "non-hex digits in partial id" msgstr "nicht-hexadezimale Zeichen in Teil-ID" -#: cmd_diff_log.cc:348 -#: cmd_ws_commit.cc:53 -#: cmd_ws_commit.cc:224 -#: cmd_ws_commit.cc:251 -#: cmd_ws_commit.cc:322 -#: cmd_ws_commit.cc:613 +#: cmd_diff_log.cc:323 cmd_ws_commit.cc:53 cmd_ws_commit.cc:224 +#: cmd_ws_commit.cc:251 cmd_ws_commit.cc:322 cmd_ws_commit.cc:613 msgid "[PATH]..." msgstr "[PFAD]..." # -#: cmd_diff_log.cc:349 +#: cmd_diff_log.cc:324 msgid "" "show current diffs on stdout.\n" "If one revision is given, the diff between the workspace and\n" @@ -312,11 +305,12 @@ msgstr "" "Zeige derzeitige Unterschiede auf stdout.\n" "Wenn eine Revision angegeben wurde, werden die Unterschiede zwischen dieser\n" -"Revision und dem Arbeitsbereich angezeigt. Werden zwei Revisionen angegeben,\n" +"Revision und dem Arbeitsbereich angezeigt. Werden zwei Revisionen " +"angegeben,\n" "werden die Unterschiede zwischen beiden ausgegeben.\n" "Wenn kein Format angegeben wurde, wird standardmäßig 'unified' verwendet." -#: cmd_diff_log.cc:365 +#: cmd_diff_log.cc:340 #, c-format msgid "" "--diff-args requires --external\n" @@ -325,29 +319,31 @@ "--diff-args benötigt --external\n" "Fügen Sie --external hinzu oder entfernen Sie --diff-args." -#: cmd_diff_log.cc:494 +#: cmd_diff_log.cc:469 msgid "no changes" msgstr "keine Änderungen" -#: cmd_diff_log.cc:558 +#: cmd_diff_log.cc:533 msgid "[FILE] ..." msgstr "[DATEI] ..." # -#: cmd_diff_log.cc:559 -msgid "print history in reverse order (filtering by 'FILE'). If one or more revisions are given, use them as a starting point." -msgstr "gibt die Historie in umgekehrter Reihenfolge aus (gefiltert durch 'DATEI'). Wenn eine oder mehrere Revisionen übergeben wurden, werden diese als Ausgangspunkt genutzt." +#: cmd_diff_log.cc:534 +msgid "" +"print history in reverse order (filtering by 'FILE'). If one or more " +"revisions are given, use them as a starting point." +msgstr "" +"gibt die Historie in umgekehrter Reihenfolge aus (gefiltert durch 'DATEI'). " +"Wenn eine oder mehrere Revisionen übergeben wurden, werden diese als " +"Ausgangspunkt genutzt." -#: cmd_diff_log.cc:621 +#: cmd_diff_log.cc:596 #, c-format msgid "only one of --last/--next allowed" msgstr "'--last' und '--next' sind nur einmal erlaubt" -#: cmd_files.cc:28 -#: cmd_files.cc:41 -#: cmd_files.cc:121 -#: cmd_merging.cc:793 -#: cmd_othervcs.cc:15 +#: cmd_files.cc:28 cmd_files.cc:41 cmd_files.cc:78 cmd_files.cc:153 +#: cmd_merging.cc:818 cmd_othervcs.cc:15 msgid "debug" msgstr "Debugging" @@ -384,46 +380,64 @@ msgstr "zusammenführen fehlgeschlagen" #: cmd_files.cc:78 +msgid "SRCNAME DESTNAME SRCID DESTID" +msgstr "" + +#: cmd_files.cc:79 +#, fuzzy +msgid "diff 2 files and output result" +msgstr "führt drei Dateien zusammen und gibt das Ergebnis aus" + +#: cmd_files.cc:96 +#, fuzzy, c-format +msgid "source file id does not exist" +msgstr "Datei-ID des Vorfahren existiert nicht" + +#: cmd_files.cc:99 +#, fuzzy, c-format +msgid "destination file id does not exist" +msgstr "Datei-ID des Vorfahren existiert nicht" + +#: cmd_files.cc:110 msgid "PATH" msgstr "PFAD" -#: cmd_files.cc:79 +#: cmd_files.cc:111 msgid "print annotated copy of the file from REVISION" msgstr "gibt eine kommentierte Kopie der Datei aus der Revision REVISION aus" -#: cmd_files.cc:100 +#: cmd_files.cc:132 #, c-format msgid "no revision for file '%s' in database" msgstr "keine Revision für Datei '%s' in Datenbank gefunden" -#: cmd_files.cc:111 +#: cmd_files.cc:143 #, c-format msgid "no such file '%s' in revision '%s'" msgstr "keine Datei '%s' in Revision '%s' gefunden" -#: cmd_files.cc:114 +#: cmd_files.cc:146 #, c-format msgid "'%s' in revision '%s' is not a file" msgstr "'%s' in Revision '%s' ist keine Datei" -#: cmd_files.cc:121 +#: cmd_files.cc:153 msgid "[PATH]" msgstr "[PFAD]" -#: cmd_files.cc:122 +#: cmd_files.cc:154 msgid "calculate identity of PATH or stdin" msgstr "berechnet die Identitat (ID) von PFAD oder stdin" -#: cmd_files.cc:146 +#: cmd_files.cc:178 msgid "FILENAME" msgstr "DATEINAME" -#: cmd_files.cc:147 +#: cmd_files.cc:179 msgid "write file from database to stdout" msgstr "schreibt Dateiinhalte aus der Datenbank nach stdout" -#: cmd_files.cc:176 -#: cmd_files.cc:178 +#: cmd_files.cc:208 cmd_files.cc:210 #, c-format msgid "no file '%s' found in revision '%s'" msgstr "keine Datei '%s' in Revision '%s' gefunden" @@ -448,17 +462,12 @@ msgid "expanded partial id '%s' to '%s'" msgstr "Habe Teil-ID '%s' nach '%s' erweitert" -#: cmd_key_cert.cc:26 -#: cmd_key_cert.cc:52 -#: cmd_key_cert.cc:92 -#: cmd_key_cert.cc:113 -#: cmd_key_cert.cc:149 +#: cmd_key_cert.cc:26 cmd_key_cert.cc:52 cmd_key_cert.cc:92 +#: cmd_key_cert.cc:113 cmd_key_cert.cc:149 msgid "key and cert" msgstr "Schlüssel und Zertifikat" -#: cmd_key_cert.cc:26 -#: cmd_key_cert.cc:52 -#: cmd_key_cert.cc:92 +#: cmd_key_cert.cc:26 cmd_key_cert.cc:52 cmd_key_cert.cc:92 msgid "KEYID" msgstr "Schlüssel-ID" @@ -498,12 +507,18 @@ #: cmd_key_cert.cc:84 #, c-format msgid "public or private key '%s' does not exist in keystore or database" -msgstr "öffentlicher oder geheimer Schlüssel '%s' existiert nicht im Schlüsselbund oder der Datenbank" +msgstr "" +"öffentlicher oder geheimer Schlüssel '%s' existiert nicht im Schlüsselbund " +"oder der Datenbank" #: cmd_key_cert.cc:87 #, c-format -msgid "public or private key '%s' does not exist in keystore, and no database was specified" -msgstr "öffentlicher oder geheimer Schlüssel '%s' existiert nicht im Schlüsselbund, und es wurde keine Datenbank angegeben." +msgid "" +"public or private key '%s' does not exist in keystore, and no database was " +"specified" +msgstr "" +"öffentlicher oder geheimer Schlüssel '%s' existiert nicht im Schlüsselbund, " +"und es wurde keine Datenbank angegeben." #: cmd_key_cert.cc:93 msgid "change passphrase of a private RSA key" @@ -562,11 +577,8 @@ msgid "UNtrusted" msgstr "NICHT vertrauensvoll" -#: cmd_key_cert.cc:196 -#: cmd_key_cert.cc:209 -#: cmd_key_cert.cc:222 -#: cmd_key_cert.cc:238 -#: cmd_ws_commit.cc:171 +#: cmd_key_cert.cc:196 cmd_key_cert.cc:209 cmd_key_cert.cc:222 +#: cmd_key_cert.cc:238 cmd_ws_commit.cc:171 msgid "review" msgstr "Überprüfung" @@ -586,8 +598,7 @@ msgid "note the results of running a test on a revision" msgstr "beachten Sie die Ergebnisse " -#: cmd_key_cert.cc:222 -#: cmd_ws_commit.cc:171 +#: cmd_key_cert.cc:222 cmd_ws_commit.cc:171 msgid "REVISION" msgstr "REVISION" @@ -618,8 +629,7 @@ msgid "empty comment" msgstr "leerer Kommentar" -#: cmd_list.cc:64 -#: cmd_list.cc:655 +#: cmd_list.cc:64 cmd_list.cc:655 #, c-format msgid "no public key '%s' found in database" msgstr "Der öffentliche Schlüssel '%s' wurde nicht in der Datenbank gefunden." @@ -715,15 +725,9 @@ msgid "No such revision %s" msgstr "Revision %s nicht gefunden" -#: cmd_merging.cc:54 -#: cmd_merging.cc:611 -#: cmd_ws_commit.cc:53 -#: cmd_ws_commit.cc:224 -#: cmd_ws_commit.cc:251 -#: cmd_ws_commit.cc:278 -#: cmd_ws_commit.cc:303 -#: cmd_ws_commit.cc:515 -#: cmd_ws_commit.cc:613 +#: cmd_merging.cc:54 cmd_merging.cc:611 cmd_ws_commit.cc:53 +#: cmd_ws_commit.cc:224 cmd_ws_commit.cc:251 cmd_ws_commit.cc:278 +#: cmd_ws_commit.cc:303 cmd_ws_commit.cc:515 cmd_ws_commit.cc:613 msgid "workspace" msgstr "Arbeitsbereich" @@ -736,9 +740,11 @@ "If not, update the workspace to the head of the branch." msgstr "" "Aktualisiere Arbeitsbereich.\n" -"Dieses Kommando verändert Ihren Arbeitsbereich, sodass dieser auf einer anderen Revision basiert.\n" +"Dieses Kommando verändert Ihren Arbeitsbereich, sodass dieser auf einer " +"anderen Revision basiert.\n" "Noch nicht eingepflegte Änderungen bleiben dabei erhalten.\n" -"Wenn eine Revision angegeben wurde, erfolgt die Aktualisierung zu dieser Revision.\n" +"Wenn eine Revision angegeben wurde, erfolgt die Aktualisierung zu dieser " +"Revision.\n" "Wenn nicht, dient der Kopf des Zweiges als Grundlage für die Aktualisierung." #: cmd_merging.cc:98 @@ -827,13 +833,8 @@ msgid "updated to base revision %s" msgstr "aktualisiert auf gemeinsame Revision %s" -#: cmd_merging.cc:300 -#: cmd_merging.cc:353 -#: cmd_merging.cc:364 -#: cmd_merging.cc:524 -#: cmd_merging.cc:769 -#: cmd_ws_commit.cc:385 -#: cmd_ws_commit.cc:851 +#: cmd_merging.cc:300 cmd_merging.cc:353 cmd_merging.cc:364 cmd_merging.cc:524 +#: cmd_merging.cc:794 cmd_ws_commit.cc:385 cmd_ws_commit.cc:851 #: cmd_ws_commit.cc:872 msgid "tree" msgstr "Baum" @@ -842,16 +843,12 @@ msgid "merge unmerged heads of branch" msgstr "führe nicht-zusammengeführte Köpfe des Zweigs zusammen" -#: cmd_merging.cc:309 -#: cmd_merging.cc:777 +#: cmd_merging.cc:309 cmd_merging.cc:802 #, c-format msgid "please specify a branch, with --branch=BRANCH" msgstr "bitte geben Sie einen Zweig mit '--branch=ZWEIG' an" -#: cmd_merging.cc:313 -#: cmd_merging.cc:403 -#: cmd_merging.cc:406 -#: cmd_merging.cc:782 +#: cmd_merging.cc:313 cmd_merging.cc:403 cmd_merging.cc:406 cmd_merging.cc:807 #: cmd_ws_commit.cc:430 #, c-format msgid "branch '%s' is empty" @@ -872,18 +869,13 @@ msgid "merging with revision %d / %d" msgstr "führe zusammen mit Revision %d / %d" -#: cmd_merging.cc:329 -#: cmd_merging.cc:330 -#: cmd_merging.cc:413 -#: cmd_merging.cc:548 +#: cmd_merging.cc:329 cmd_merging.cc:330 cmd_merging.cc:413 cmd_merging.cc:548 #: cmd_merging.cc:549 #, c-format msgid "[source] %s" msgstr "[Quelle] %s" -#: cmd_merging.cc:347 -#: cmd_merging.cc:520 -#: cmd_merging.cc:567 +#: cmd_merging.cc:347 cmd_merging.cc:520 cmd_merging.cc:567 #, c-format msgid "[merged] %s" msgstr "[Zusammengeführt] %s" @@ -899,7 +891,8 @@ #: cmd_merging.cc:354 msgid "merge from one branch to another asymmetrically" -msgstr "asymmetrisches Zusammenführen von Änderungen eines Zweigs auf einem anderen" +msgstr "" +"asymmetrisches Zusammenführen von Änderungen eines Zweigs auf einem anderen" #: cmd_merging.cc:364 msgid "SOURCE-BRANCH DEST-BRANCH DIR" @@ -909,8 +902,7 @@ msgid "merge one branch into a subdirectory in another branch" msgstr "überführe einen Zweig in ein Unterverzeichnis eines anderen Zweigs" -#: cmd_merging.cc:404 -#: cmd_merging.cc:407 +#: cmd_merging.cc:404 cmd_merging.cc:407 #, c-format msgid "branch '%s' is not merged" msgstr "Zweig '%s' ist nicht zusammengeführt" @@ -951,15 +943,16 @@ #: cmd_merging.cc:526 msgid "merge two explicitly given revisions, placing result in given branch" -msgstr "führt zwei gegebene Revisionen zusammen und erzeugt eine neue Revision im gegebenen Zweig" +msgstr "" +"führt zwei gegebene Revisionen zusammen und erzeugt eine neue Revision im " +"gegebenen Zweig" #: cmd_merging.cc:541 #, c-format msgid "%s and %s are the same revision, aborting" msgstr "%s und %s sind dieselben Revisionen, breche ab" -#: cmd_merging.cc:543 -#: cmd_merging.cc:545 +#: cmd_merging.cc:543 cmd_merging.cc:545 #, c-format msgid "%s is already an ancestor of %s" msgstr "%s ist bereits ein Vorfahre von %s" @@ -969,11 +962,13 @@ msgstr "REVISION REVISION" #: cmd_merging.cc:571 -msgid "Show what conflicts would need to be resolved to merge the given revisions." -msgstr "Zeige, welche Konflikte beim Zusammenführen der gegebenen Revisionen behoben werden müssten." +msgid "" +"Show what conflicts would need to be resolved to merge the given revisions." +msgstr "" +"Zeige, welche Konflikte beim Zusammenführen der gegebenen Revisionen behoben " +"werden müssten." -#: cmd_merging.cc:581 -#: cmd_merging.cc:583 +#: cmd_merging.cc:581 cmd_merging.cc:583 #, c-format msgid "%s is an ancestor of %s; no merge is needed." msgstr "%s ist ein Vorgänger von %s; kein Zusammenführen notwendig." @@ -1009,7 +1004,8 @@ msgstr "Es gibt %s directory_loop_conflicts." #: cmd_merging.cc:611 -msgid "[-r FROM] -r TO" +#, fuzzy +msgid "[-r FROM] -r TO [PATH...]" msgstr "[-r VON] -r BIS" #: cmd_merging.cc:612 @@ -1051,38 +1047,39 @@ " %s pluck -r PARENT -r %s" msgstr "" "Revision %s ist eine Vereinigung\n" -"Um die Änderungen relativ auf eine der Elternrevisionen anzuwenden, benutzen Sie:\n" +"Um die Änderungen relativ auf eine der Elternrevisionen anzuwenden, benutzen " +"Sie:\n" " %s pluck -r ELTERNREVISION -r %s" -#: cmd_merging.cc:654 +#: cmd_merging.cc:658 #, c-format msgid "no changes to apply" msgstr "keine Änderungen anwendbar" -#: cmd_merging.cc:762 +#: cmd_merging.cc:770 #, c-format msgid "applied changes to workspace" msgstr "Änderungen auf Arbeitsbereich angewendet" -#: cmd_merging.cc:769 +#: cmd_merging.cc:794 msgid "show unmerged head revisions of branch" msgstr "zeige nicht zusammengeführte Revisionen des Zweigs" -#: cmd_merging.cc:784 +#: cmd_merging.cc:809 #, c-format msgid "branch '%s' is currently merged:" msgstr "Zweig '%s' ist derzeit zusammengeführt:" -#: cmd_merging.cc:786 +#: cmd_merging.cc:811 #, c-format msgid "branch '%s' is currently unmerged:" msgstr "Zweig '%s' ist derzeit nicht zusammengeführt:" -#: cmd_merging.cc:793 +#: cmd_merging.cc:818 msgid "REVID" msgstr "REVISIONS_ID" -#: cmd_merging.cc:794 +#: cmd_merging.cc:819 msgid "dump the roster associated with the given REVID" msgstr "Exportiere den Katalog, welcher mit der gegebenen REVID verknüpft ist" @@ -1101,8 +1098,7 @@ msgid "no server given and no default server set" msgstr "kein Server angegeben und kein Standardserver gesetzt" -#: cmd_netsync.cc:59 -#: cmd_netsync.cc:79 +#: cmd_netsync.cc:59 cmd_netsync.cc:79 #, c-format msgid "no branch pattern given" msgstr "kein Zweigmuster gegeben" @@ -1122,16 +1118,11 @@ msgid "no branch pattern given and no default pattern set" msgstr "kein Zweigmuster gegeben und kein Standardmuster gesetzt" -#: cmd_netsync.cc:97 -#: cmd_netsync.cc:112 -#: cmd_netsync.cc:126 -#: cmd_netsync.cc:173 +#: cmd_netsync.cc:97 cmd_netsync.cc:112 cmd_netsync.cc:126 cmd_netsync.cc:173 msgid "network" msgstr "Netzwerk" -#: cmd_netsync.cc:97 -#: cmd_netsync.cc:112 -#: cmd_netsync.cc:126 +#: cmd_netsync.cc:97 cmd_netsync.cc:112 cmd_netsync.cc:126 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]" msgstr "[ADRESSE[:PORTNUMMER] [MUSTER]]" @@ -1146,11 +1137,14 @@ #: cmd_netsync.cc:120 #, c-format msgid "doing anonymous pull; use -kKEYNAME if you need authentication" -msgstr "hole Daten anonym; benutzen Sie -kSCHLÜSSELNAME, falls eine Authentifizierung benötigt wird" +msgstr "" +"hole Daten anonym; benutzen Sie -kSCHLÜSSELNAME, falls eine " +"Authentifizierung benötigt wird" #: cmd_netsync.cc:127 msgid "sync branches matching PATTERN with netsync server at ADDRESS" -msgstr "synchronisiere Zweige, die auf MUSTER passen, mit netsync-Server auf ADRESSE" +msgstr "" +"synchronisiere Zweige, die auf MUSTER passen, mit netsync-Server auf ADRESSE" #: cmd_netsync.cc:149 #, c-format @@ -1172,13 +1166,19 @@ #: cmd_netsync.cc:189 #, c-format -msgid "need permission to store persistent passphrase (see hook persist_phrase_ok())" -msgstr "benötige Berechtigung, um Passwort persistent zu speichern (siehe Hook persist_phrase_ok())" +msgid "" +"need permission to store persistent passphrase (see hook persist_phrase_ok())" +msgstr "" +"benötige Berechtigung, um Passwort persistent zu speichern (siehe Hook " +"persist_phrase_ok())" #: cmd_netsync.cc:195 #, c-format -msgid "The --no-transport-auth option is only permitted in combination with --stdio" -msgstr "Die Option '--no-transport-auth' ist nur in Verbindung mit der Option '--stdio' erlaubt." +msgid "" +"The --no-transport-auth option is only permitted in combination with --stdio" +msgstr "" +"Die Option '--no-transport-auth' ist nur in Verbindung mit der Option '--" +"stdio' erlaubt." #: cmd_othervcs.cc:15 msgid "RCSFILE..." @@ -1187,10 +1187,12 @@ #: cmd_othervcs.cc:16 msgid "" "parse versions in RCS files\n" -"this command doesn't reconstruct or import revisions.you probably want cvs_import" +"this command doesn't reconstruct or import revisions.you probably want " +"cvs_import" msgstr "" "Analysiert Versionen in RCS-Dateien\n" -"Durch dieses Kommando werden keine Revision rekonstrustuiert oder importiert. Sie meinen eventuell 'cvs_import'." +"Durch dieses Kommando werden keine Revision rekonstrustuiert oder " +"importiert. Sie meinen eventuell 'cvs_import'." #: cmd_othervcs.cc:32 msgid "rcs" @@ -1204,14 +1206,11 @@ msgid "import all versions in CVS repository" msgstr "importierte alle Versionen des CVS-Depots" -#: cmd_packet.cc:21 -#: cmd_packet.cc:50 -#: cmd_packet.cc:69 +#: cmd_packet.cc:21 cmd_packet.cc:50 cmd_packet.cc:69 msgid "packet i/o" msgstr "Paket-I/O" -#: cmd_packet.cc:21 -#: cmd_packet.cc:50 +#: cmd_packet.cc:21 cmd_packet.cc:50 msgid "ID" msgstr "ID" @@ -1231,7 +1230,8 @@ #: cmd_packet.cc:59 #, c-format msgid "public and private key '%s' do not exist in keystore" -msgstr "öffentlicher und geheimer Schlüssel '%s' existieren nicht im Schlüsselbund" +msgstr "" +"öffentlicher und geheimer Schlüssel '%s' existieren nicht im Schlüsselbund" #: cmd_packet.cc:70 msgid "read packets from files or stdin" @@ -1271,7 +1271,8 @@ #: cmd_ws_commit.cc:54 msgid "revert file(s), dir(s) or entire workspace (\".\")" -msgstr "setzt Dateien, Verzeichnisse oder den gesamten Arbeitsbereich ('.') zurück" +msgstr "" +"setzt Dateien, Verzeichnisse oder den gesamten Arbeitsbereich ('.') zurück" #: cmd_ws_commit.cc:137 #, c-format @@ -1356,12 +1357,13 @@ "If no directory is given, the branch name will be used as directory" msgstr "" "Checkt eine Revision aus der Datenbank in ein Verzeichnis aus.\n" -"Wenn eine Revision angegeben wird, ist diese die einzige, die ausgecheckt wird.\n" +"Wenn eine Revision angegeben wird, ist diese die einzige, die ausgecheckt " +"wird.\n" "Andernfalls wird der Kopf des Zweigs (gegeben oder implizit) ausgecheckt.\n" -"Wenn kein Verzeichnis angegeben wird, wird der Zweigname als Verzeichnisname verwendet." +"Wenn kein Verzeichnis angegeben wird, wird der Zweigname als Verzeichnisname " +"verwendet." -#: cmd_ws_commit.cc:406 -#: cmd_ws_commit.cc:425 +#: cmd_ws_commit.cc:406 cmd_ws_commit.cc:425 #, c-format msgid "need --branch argument for branch-based checkout" msgstr "benötige '--branch'-Argument für zweig-basiertes auschecken" @@ -1451,9 +1453,11 @@ "perhaps move or delete _MTN/log,\n" "or remove --message/--message-file from the command line?" msgstr "" -"_MTN/log ist nicht leer und ein Kommentar wurde über die Kommandozeile spezifiziert.\n" +"_MTN/log ist nicht leer und ein Kommentar wurde über die Kommandozeile " +"spezifiziert.\n" "Verschieben oder löschen Sie _MTN/log oder\n" -"entfernen Sie das '--message'-/'--message-file'-Argument aus der Kommandozeile." +"entfernen Sie das '--message'-/'--message-file'-Argument aus der " +"Kommandozeile." #: cmd_ws_commit.cc:686 #, c-format @@ -1470,8 +1474,7 @@ msgid "revision %s already in database" msgstr "Revision %s ist bereits in der Datenbank" -#: cmd_ws_commit.cc:754 -#: cmd_ws_commit.cc:784 +#: cmd_ws_commit.cc:754 cmd_ws_commit.cc:784 #, c-format msgid "file '%s' modified during commit, aborting" msgstr "Datei '%s' wurde während des Einpflegens geändert, breche ab" @@ -1501,7 +1504,9 @@ #: cmd_ws_commit.cc:852 msgid "setup a new workspace directory, default to current" -msgstr "Setzt einen neuen Arbeitsbereich auf (standardmäßig im derzeitigen Verzeichnis)" +msgstr "" +"Setzt einen neuen Arbeitsbereich auf (standardmäßig im derzeitigen " +"Verzeichnis)" #: cmd_ws_commit.cc:858 #, c-format @@ -1512,8 +1517,7 @@ msgid "refresh the inodeprint cache" msgstr "aktualisiere den 'inodeprint'-Cache" -#: commands.cc:124 -#: commands.cc:225 +#: commands.cc:124 commands.cc:225 #, c-format msgid "unknown command '%s'" msgstr "unbekanntes Kommando '%s'" @@ -1535,31 +1539,31 @@ msgid "display command help" msgstr "zeige Hilfe für Kommando" -#: commands.cc:377 +#: commands.cc:381 #, c-format msgid "expanding selection '%s'" msgstr "expandiere Auswahl '%s'" -#: commands.cc:385 +#: commands.cc:389 #, c-format msgid "no match for selection '%s'" msgstr "kein Treffer für Auswahl '%s'" -#: commands.cc:391 +#: commands.cc:395 #, c-format msgid "expanded to '%s'" msgstr "erweitert zu '%s'" -#: commands.cc:408 +#: commands.cc:412 #, c-format msgid "selection '%s' has multiple ambiguous expansions: \n" msgstr "Die Auswahl '%s' kann auf mehrere Arten erweitert werden: \n" -#: commands.cc:425 +#: commands.cc:429 msgid "note: " msgstr "Hinweis: " -#: commands.cc:426 +#: commands.cc:430 #, c-format msgid "" "branch '%s' has multiple heads\n" @@ -1568,7 +1572,7 @@ "Der Zweig '%s' hat mehrere Köpfe.\n" "Eventuell möchten Sie '%s merge' ausführen." -#: commands.cc:444 +#: commands.cc:448 #, c-format msgid "--message and --message-file are mutually exclusive" msgstr "--message und --message-file können nicht zusammen verwendet werden" @@ -1590,9 +1594,7 @@ msgid "markings" msgstr "Kennzeichen" -#: database_check.cc:338 -#: netsync.cc:2980 -#: rcs_import.cc:1244 +#: database_check.cc:338 netsync.cc:2980 rcs_import.cc:1244 msgid "revisions" msgstr "Revisionen" @@ -1600,8 +1602,7 @@ msgid "ancestry" msgstr "Vorfahren" -#: database_check.cc:470 -#: netsync.cc:2984 +#: database_check.cc:470 netsync.cc:2984 msgid "keys" msgstr "Schlüssel" @@ -1646,8 +1647,12 @@ #: database_check.cc:613 #, c-format -msgid "revision %s missing (%d revision references; %d cert references; %d parent references; %d child references; %d roster references)" -msgstr "Revision %s fehlt (%d Revisions-Referenzen; %d Zertifikats-Referenzen; %d Eltern-Referenzen; %d Kind-Referenzen; %d Katalog-Referenzen)" +msgid "" +"revision %s missing (%d revision references; %d cert references; %d parent " +"references; %d child references; %d roster references)" +msgstr "" +"Revision %s fehlt (%d Revisions-Referenzen; %d Zertifikats-Referenzen; %d " +"Eltern-Referenzen; %d Kind-Referenzen; %d Katalog-Referenzen)" #: database_check.cc:621 #, c-format @@ -1682,12 +1687,15 @@ #: database_check.cc:659 #, c-format msgid "revision %s mismatched parents (%d ancestry parents; %d revision refs)" -msgstr "Revision %s hat falsch zugeordnete Eltern (%d abstammende Eltern; %d Revisions-Referenzen)" +msgstr "" +"Revision %s hat falsch zugeordnete Eltern (%d abstammende Eltern; %d " +"Revisions-Referenzen)" #: database_check.cc:668 #, c-format msgid "revision %s mismatched children (%d ancestry children; %d parents)" -msgstr "Revision %s hat falsch zugeordnete Kinder (%d abstammende Kinder; %d Eltern)" +msgstr "" +"Revision %s hat falsch zugeordnete Kinder (%d abstammende Kinder; %d Eltern)" #: database_check.cc:680 #, c-format @@ -1697,7 +1705,9 @@ #: database_check.cc:687 #, c-format msgid "revision %s is not parseable (perhaps with unnormalized paths?)" -msgstr "Revision %s ist nicht analysierbar (eventuell mit nicht-normalisierten Pfaden?)" +msgstr "" +"Revision %s ist nicht analysierbar (eventuell mit nicht-normalisierten " +"Pfaden?)" #: database_check.cc:694 #, c-format @@ -1712,7 +1722,8 @@ #: database_check.cc:751 #, c-format msgid "revision %s unchecked signature in %s cert from missing key %s" -msgstr "Revision %s ungeprüfte Signatur in %s Zertifikat von fehlendem Schlüssel %s" +msgstr "" +"Revision %s ungeprüfte Signatur in %s Zertifikat von fehlendem Schlüssel %s" #: database_check.cc:759 #, c-format @@ -1727,7 +1738,9 @@ #: database_check.cc:783 #, c-format msgid "revision %s mismatched certs (%d authors %d dates %d changelogs)" -msgstr "Revision %s falsch zugeordnete Zertifikate (%d Autoren %d Daten %d Log-Einträge)" +msgstr "" +"Revision %s falsch zugeordnete Zertifikate (%d Autoren %d Daten %d Log-" +"Einträge)" #: database_check.cc:870 #, c-format @@ -1832,7 +1845,9 @@ #: database_check.cc:944 #, c-format msgid "check complete: %d files; %d rosters; %d revisions; %d keys; %d certs" -msgstr "Überprüfung beendet: %d Dateien; %d Kataloge; %d Revisionen; %d Schlüssel; %d Zertifikate" +msgstr "" +"Überprüfung beendet: %d Dateien; %d Kataloge; %d Revisionen; %d Schlüssel; %" +"d Zertifikate" #: database_check.cc:950 #, c-format @@ -1865,7 +1880,8 @@ "Schema der Datenbank %s passt nicht zu dieser Version von monotone\n" "Erwarte Schema %s, existierendes Schema %s\n" "Versuchen Sie '%s db migrate' um das Schema zu erneuern\n" -"(Dieser Vorgang ist nicht umkehrbar; Sie sollten vorher eine Sicherung machen.)" +"(Dieser Vorgang ist nicht umkehrbar; Sie sollten vorher eine Sicherung " +"machen.)" #: database.cc:170 #, c-format @@ -1910,19 +1926,20 @@ #: database.cc:252 #, c-format msgid "database %s is not an sqlite version 3 file, try dump and reload" -msgstr "Datenbank %s ist keine SQLite-Version-3-Datei, versuchen Sie ein Export und anschliessenden Import" +msgstr "" +"Datenbank %s ist keine SQLite-Version-3-Datei, versuchen Sie ein Export und " +"anschliessenden Import" -#: database.cc:281 -#: schema_migration.cc:200 +#: database.cc:281 schema_migration.cc:200 msgid "" "make sure database and containing directory are writeable\n" "and you have not run out of disk space" msgstr "" -"Stellen Sie sicher, dass die Datenbank und das umgebende Verzeichnis schreibbar sind\n" +"Stellen Sie sicher, dass die Datenbank und das umgebende Verzeichnis " +"schreibbar sind\n" "und das noch genügend Speicherplatz verfügbar ist." -#: database.cc:287 -#: schema_migration.cc:205 +#: database.cc:287 schema_migration.cc:205 #, c-format msgid "" "sqlite error: %s\n" @@ -1939,10 +1956,12 @@ #: database.cc:337 #, c-format msgid "" -"existing (possibly stale) journal file '%s' has same stem as new database '%s'\n" +"existing (possibly stale) journal file '%s' has same stem as new database '%" +"s'\n" "cancelling database creation" msgstr "" -"Existierende Journal-Datei '%s' hat denselben Stamm wie die neue Datenbank '%s'\n" +"Existierende Journal-Datei '%s' hat denselben Stamm wie die neue Datenbank '%" +"s'\n" "Datenbankerstellung abgebrochen" #: database.cc:487 @@ -2079,8 +2098,7 @@ "[ rechts] %s\n" "[zusammengeführt] %s\n" -#: file_io.cc:175 -#: file_io.cc:182 +#: file_io.cc:175 file_io.cc:182 #, c-format msgid "" "could not create directory '%s'\n" @@ -2135,7 +2153,8 @@ #: file_io.cc:228 #, c-format msgid "directory to delete, '%s', is not a directory but a file" -msgstr "das zu löschende Verzeichnis '%s' ist kein Verzeichnis, sondern eine Datei" +msgstr "" +"das zu löschende Verzeichnis '%s' ist kein Verzeichnis, sondern eine Datei" #: file_io.cc:235 #, c-format @@ -2160,10 +2179,10 @@ #: file_io.cc:254 #, c-format msgid "rename source file '%s' is a directory -- bug in monotone?" -msgstr "Quelldatei für Umbenennung '%s ist ein Verzeichnis -- Fehler in monotone?" +msgstr "" +"Quelldatei für Umbenennung '%s ist ein Verzeichnis -- Fehler in monotone?" -#: file_io.cc:257 -#: file_io.cc:270 +#: file_io.cc:257 file_io.cc:270 #, c-format msgid "rename target '%s' already exists" msgstr "Zieldatei für Umbenennung '%s' existiert bereits" @@ -2176,7 +2195,8 @@ #: file_io.cc:267 #, c-format msgid "rename source dir '%s' is a file -- bug in monotone?" -msgstr "Quellverzeichnis für Umbenennung '%s ist eine Datei -- Fehler in monotone?" +msgstr "" +"Quellverzeichnis für Umbenennung '%s ist eine Datei -- Fehler in monotone?" #: file_io.cc:281 #, c-format @@ -2206,7 +2226,8 @@ #: file_io.cc:371 #, c-format msgid "file '%s' cannot be overwritten as data; it is a directory" -msgstr "Datei %s kann nicht mit Daten überschrieben werden; sie ist ein Verzeichnis" +msgstr "" +"Datei %s kann nicht mit Daten überschrieben werden; sie ist ein Verzeichnis" #: file_io.cc:379 #, c-format @@ -2243,8 +2264,7 @@ msgid "empty passphrases not allowed, try again" msgstr "leere Passwörter sind nicht erlaubt, versuchen Sie es noch einmal" -#: keys.cc:128 -#: keys.cc:135 +#: keys.cc:128 keys.cc:135 #, c-format msgid "too many failed passphrases" msgstr "Passwort zu oft falsch eingegeben" @@ -2264,9 +2284,7 @@ msgid "passphrase for '%s' is incorrect" msgstr "Passwort für '%s' ist nicht korrekt" -#: lua.cc:555 -#: lua.cc:584 -#: lua.cc:599 +#: lua.cc:555 lua.cc:584 lua.cc:599 #, c-format msgid "%s called with an invalid parameter" msgstr "%s wurde mit einem ungültigen Parameter aufgerufen" @@ -2276,9 +2294,7 @@ msgid "Directory '%s' does not exist" msgstr "Das Verzeichnis '%s' existiert nicht" -#: lua.cc:603 -#: rcs_import.cc:1235 -#: work.cc:488 +#: lua.cc:603 rcs_import.cc:1235 work.cc:488 #, c-format msgid "'%s' is not a directory" msgstr "'%s' ist kein Verzeichnis" @@ -2325,7 +2341,9 @@ #: monotone.cc:68 msgid "set filename containing commit changelog message" -msgstr "setze Dateinamen der Datei, die die Nachricht für die Änderungshistorie beinhaltet" +msgstr "" +"setze Dateinamen der Datei, die die Nachricht für die Änderungshistorie " +"beinhaltet" #: monotone.cc:69 msgid "override date/time for commit" @@ -2417,7 +2435,9 @@ #: monotone.cc:91 msgid "when rosterifying, drop attrs entries with the given key" -msgstr "während der Katalogisierung, entferne 'attrs'-Einträge mit dem gegebenen Schlüssel" +msgstr "" +"während der Katalogisierung, entferne 'attrs'-Einträge mit dem gegebenen " +"Schlüssel" #: monotone.cc:92 msgid "exclude files when printing logs" @@ -2445,7 +2465,8 @@ #: monotone.cc:106 msgid "suppress warning, verbose, informational and progress messages" -msgstr "unterdrücke Warnungen, wortreiche, informelle und Fortschrittsmeldungen" +msgstr "" +"unterdrücke Warnungen, wortreiche, informelle und Fortschrittsmeldungen" #: monotone.cc:107 msgid "display help message" @@ -2457,7 +2478,8 @@ #: monotone.cc:109 msgid "print detailed version number, then exit" -msgstr "zeige detailierte Versionsinformationen an und beende dann das Programm" +msgstr "" +"zeige detailierte Versionsinformationen an und beende dann das Programm" #: monotone.cc:110 msgid "insert command line arguments taken from the given file" @@ -2489,7 +2511,8 @@ #: monotone.cc:117 msgid "limit search for workspace to specified root" -msgstr "beschränke Suche nach der Arbeitsumgebung auf angegebene Verzeichniswurzel" +msgstr "" +"beschränke Suche nach der Arbeitsumgebung auf angegebene Verzeichniswurzel" #: monotone.cc:118 msgid "verbose completion output" @@ -2511,23 +2534,24 @@ #: monotone.cc:233 #, c-format msgid "weird error when stuffing arguments read from %s: %s\n" -msgstr "seltsamer Fehler beim Zusammenpacken der gelesen Argumente von %s: %s\n" +msgstr "" +"seltsamer Fehler beim Zusammenpacken der gelesen Argumente von %s: %s\n" -#: monotone.cc:330 +#: monotone.cc:329 msgid "[OPTION...] command [ARGS...]\n" msgstr "[OPTION...] Kommando [Argumente...]\n" -#: monotone.cc:593 +#: monotone.cc:594 #, c-format msgid "syntax error near the \"%s\" option: %s" msgstr "Syntaxfehler in der der Option \"%s\": %s" -#: monotone.cc:629 +#: monotone.cc:630 #, c-format msgid "%s %s doesn't use the option %s" msgstr "%s %s benutzt die Option %s nicht" -#: monotone.cc:663 +#: monotone.cc:664 #, c-format msgid "Options specific to '%s %s':" msgstr "Spezifische Optionen für '%s %s':" @@ -2575,11 +2599,13 @@ #: netcmd.cc:125 msgid "the remote side has a newer, incompatible version of monotone" -msgstr "der entfernte Rechner benutzt eine neuere, inkompatible Version von monotone" +msgstr "" +"der entfernte Rechner benutzt eine neuere, inkompatible Version von monotone" #: netcmd.cc:126 msgid "the remote side has an older, incompatible version of monotone" -msgstr "der entfernte Rechner benutzt eine ältere, inkompatible Version von monotone" +msgstr "" +"der entfernte Rechner benutzt eine ältere, inkompatible Version von monotone" #: netcmd.cc:136 #, c-format @@ -2595,20 +2621,17 @@ "falsche HMAC Prüfsumme (bekam %s, benötigte %s)\n" "das bedeutet, das Daten bei der Übertragung beschädigt wurden\n" -#: netcmd.cc:272 -#: netcmd.cc:318 +#: netcmd.cc:272 netcmd.cc:318 #, c-format msgid "unknown role specifier %d" msgstr "unbekannter Rollenspezifikation %d" -#: netio.hh:41 -#: netio.hh:59 +#: netio.hh:41 netio.hh:59 #, c-format msgid "need %d bytes to decode %s at %d, only have %d" msgstr "benötige %d Bytes zum Dekodieren von %s auf %d, habe nur %d" -#: netio.hh:87 -#: netio.hh:122 +#: netio.hh:87 netio.hh:122 #, c-format msgid "uleb128 decode for '%s' into %d-byte datum overflowed" msgstr "uelb128 Dekodierung für '%s' in %d-Byte Datum ist übergelaufen" @@ -2616,12 +2639,14 @@ #: netio.hh:142 #, c-format msgid "ran out of bytes reading uleb128 value for '%s' at pos %d" -msgstr "nicht genügend Bytes zum Lesen vom uelb128 Wert von '%s' an Position %d" +msgstr "" +"nicht genügend Bytes zum Lesen vom uelb128 Wert von '%s' an Position %d" #: netio.hh:278 #, c-format msgid "decoding variable length string of %d bytes for '%s', maximum is %d" -msgstr "dekodiere Zeichenkette variabler Länge von %d Bytes für '%s', Maximum ist %d" +msgstr "" +"dekodiere Zeichenkette variabler Länge von %d Bytes für '%s', Maximum ist %d" #: netio.hh:333 #, c-format @@ -2645,8 +2670,7 @@ msgid "certs in" msgstr "Zertifikate rein" -#: netsync.cc:732 -#: netsync.cc:745 +#: netsync.cc:732 netsync.cc:745 msgid "revs in" msgstr "Revisionen rein" @@ -2654,8 +2678,7 @@ msgid "certs out" msgstr "Zertifikate raus" -#: netsync.cc:739 -#: netsync.cc:747 +#: netsync.cc:739 netsync.cc:747 msgid "revs out" msgstr "Revisionen raus" @@ -2685,7 +2708,8 @@ "@ WARNUNG: SERVERIDENTIFIKATION HAT SICH GEÄNDERT @\n" "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" "ES IST MÖGLICH DAS JEMAND ETWAS BÖSES MACHT\n" -"Es ist auch möglich, daß sich einfach nur der Server-Schlüssel geändert hat.\n" +"Es ist auch möglich, daß sich einfach nur der Server-Schlüssel geändert " +"hat.\n" "Der entfernte Rechner hat den Schlüssel %s gesendet,\n" "ich habe %s erwartet\n" "'%s unset %s %s' übergeht diese Prüfung." @@ -2721,8 +2745,7 @@ msgid "rejected attempt at anonymous connection while running as sink" msgstr "verweigerte anonyme Verbindung im Datensenke-Modus" -#: netsync.cc:1374 -#: netsync.cc:1503 +#: netsync.cc:1374 netsync.cc:1503 #, c-format msgid "not serving branch '%s'" msgstr "bediene Anfrage für Zweig '%s' nicht" @@ -2754,12 +2777,17 @@ #: netsync.cc:1489 #, c-format -msgid "denied '%s' read permission for '%s' excluding '%s' while running as pure sink" -msgstr "verweigere '%s' Leseberechtigung für '%s' außer '%s' im reinen Datensenke-Modus" +msgid "" +"denied '%s' read permission for '%s' excluding '%s' while running as pure " +"sink" +msgstr "" +"verweigere '%s' Leseberechtigung für '%s' außer '%s' im reinen Datensenke-" +"Modus" #: netsync.cc:1509 #, c-format -msgid "denied '%s' read permission for '%s' excluding '%s' because of branch '%s'" +msgid "" +"denied '%s' read permission for '%s' excluding '%s' because of branch '%s'" msgstr "verweigerte '%s' Leseberechtigung für '%s' außer '%s' wegen Zweig '%s'" #: netsync.cc:1512 @@ -2774,8 +2802,12 @@ #: netsync.cc:1531 #, c-format -msgid "denied '%s' write permission for '%s' excluding '%s' while running as pure source" -msgstr "verweigere '%s' Schreibberechtigung für '%s' außer '%s' im reinen Datensenke-Modus" +msgid "" +"denied '%s' write permission for '%s' excluding '%s' while running as pure " +"source" +msgstr "" +"verweigere '%s' Schreibberechtigung für '%s' außer '%s' im reinen Datensenke-" +"Modus" #: netsync.cc:1539 #, c-format @@ -2815,12 +2847,15 @@ #: netsync.cc:1870 #, c-format msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'." -msgstr "Falsch zugeordneter Zeitraum in Zweig %s. Server hat '%s', Client hat '%s'." +msgstr "" +"Falsch zugeordneter Zeitraum in Zweig %s. Server hat '%s', Client hat '%s'." #: netsync.cc:1888 #, c-format msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'" -msgstr "Prüfsummen-Check für öffentlichen Schlüssel '%s' (%s) fehlgeschlagen; benötigte '%s', bekam '%s'" +msgstr "" +"Prüfsummen-Check für öffentlichen Schlüssel '%s' (%s) fehlgeschlagen; " +"benötigte '%s', bekam '%s'" #: netsync.cc:1902 #, c-format @@ -2832,18 +2867,15 @@ msgid "Received warning from usher: %s" msgstr "Erhielt Warnung von 'usher': %s" -#: netsync.cc:2051 -#: netsync.cc:2082 +#: netsync.cc:2051 netsync.cc:2082 msgid "source and sink" msgstr "Datenquelle und -senke" -#: netsync.cc:2052 -#: netsync.cc:2083 +#: netsync.cc:2052 netsync.cc:2083 msgid "source" msgstr "Datenquelle" -#: netsync.cc:2052 -#: netsync.cc:2083 +#: netsync.cc:2052 netsync.cc:2083 msgid "sink" msgstr "Datensenke" @@ -2852,8 +2884,7 @@ msgid "input buffer for peer %s is overfull after netcmd dispatch\n" msgstr "Eingabepuffer für Peer %s ist nach netcmd-Absendung übervoll\n" -#: netsync.cc:2251 -#: netsync.cc:2350 +#: netsync.cc:2251 netsync.cc:2350 #, c-format msgid "protocol error while processing peer %s: '%s'" msgstr "Protokoll-Fehler während der Bearbeitung von Peer %s: '%s'" @@ -2871,12 +2902,14 @@ #: netsync.cc:2365 #, c-format msgid "timed out waiting for I/O with peer %s, disconnecting\n" -msgstr "Zeitüberschreitung während Warten auf E/A mit Peer %s, trenne Verbindung\n" +msgstr "" +"Zeitüberschreitung während Warten auf E/A mit Peer %s, trenne Verbindung\n" #: netsync.cc:2388 #, c-format msgid "processing failure while talking to peer %s, disconnecting\n" -msgstr "Bearbeitungsfehler während Kommunikation mit Peer %s, trenne Verbindung\n" +msgstr "" +"Bearbeitungsfehler während Kommunikation mit Peer %s, trenne Verbindung\n" #: netsync.cc:2405 #, c-format @@ -2886,7 +2919,9 @@ #: netsync.cc:2411 #, c-format msgid "peer %s disconnected after we informed them of error" -msgstr "Peer %s hat Verbindung getrennt, nachdem wir ihn vom Fehler unterrichtet haben" +msgstr "" +"Peer %s hat Verbindung getrennt, nachdem wir ihn vom Fehler unterrichtet " +"haben" #: netsync.cc:2416 #, c-format @@ -2896,7 +2931,9 @@ #: netsync.cc:2482 #, c-format msgid "protocol error while processing peer %s: '%s', marking as bad" -msgstr "Protokoll-Fehler während Bearbeitung des Peers %s: '%s', als ungültig markiert" +msgstr "" +"Protokoll-Fehler während Bearbeitung des Peers %s: '%s', als ungültig " +"markiert" #: netsync.cc:2514 #, c-format @@ -2906,7 +2943,9 @@ #: netsync.cc:2551 #, c-format msgid "protocol error while processing peer %s: '%s', disconnecting" -msgstr "Protokoll-Fehler während der Bearbeitung des Peers %s: '%s', trenne Verbindung" +msgstr "" +"Protokoll-Fehler während der Bearbeitung des Peers %s: '%s', trenne " +"Verbindung" #: netsync.cc:2562 #, c-format @@ -2915,8 +2954,11 @@ #: netsync.cc:2567 #, c-format -msgid "peer %s read failed in shutdown state (possibly client misreported error)\n" -msgstr "Peer %s konnte nicht im 'shutdown state' gelesen werden (evtl. vom Client falsch berichteter Fehler)\n" +msgid "" +"peer %s read failed in shutdown state (possibly client misreported error)\n" +msgstr "" +"Peer %s konnte nicht im 'shutdown state' gelesen werden (evtl. vom Client " +"falsch berichteter Fehler)\n" #: netsync.cc:2573 #, c-format @@ -2930,8 +2972,11 @@ #: netsync.cc:2599 #, c-format -msgid "peer %s write failed in shutdown state (possibly client misreported error)\n" -msgstr "Peer %s konnte nicht im 'shutdown state' geschrieben werden (evtl. vom Client falsch berichteter Fehler)\n" +msgid "" +"peer %s write failed in shutdown state (possibly client misreported error)\n" +msgstr "" +"Peer %s konnte nicht im 'shutdown state' geschrieben werden (evtl. vom " +"Client falsch berichteter Fehler)\n" #: netsync.cc:2605 #, c-format @@ -2960,7 +3005,9 @@ #: netsync.cc:2737 #, c-format msgid "session limit %d reached, some connections will be refused\n" -msgstr "Maximale Anzahl an Sitzungen %d erreicht, einige Verbindungen werden abgelehnt werden\n" +msgstr "" +"Maximale Anzahl an Sitzungen %d erreicht, einige Verbindungen werden " +"abgelehnt werden\n" #: netsync.cc:2802 #, c-format @@ -3009,8 +3056,7 @@ "Das 'exclude branch'-Muster beinhaltet ein Quotierungszeichen:\n" "%s\n" -#: netsync.cc:3173 -#: netsync.cc:3177 +#: netsync.cc:3173 netsync.cc:3177 #, c-format msgid "network error: %s" msgstr "Netzwerk-Fehler: %s" @@ -3030,10 +3076,7 @@ msgid "missing prerequisite revision '%s'" msgstr "fehlende vorausgesetzte Revision '%s'" -#: packet.cc:140 -#: packet.cc:151 -#: packet.cc:167 -#: packet.cc:175 +#: packet.cc:140 packet.cc:151 packet.cc:167 packet.cc:175 #, c-format msgid "dropping revision '%s'" msgstr "entferne Revision '%s'" @@ -3066,7 +3109,8 @@ #: packet.cc:226 #, c-format msgid "key '%s' is not equal to key '%s' in database" -msgstr "Schlüssel '%s' stimmt nicht mit dem Schlüssel '%s' in der Datenbank überein" +msgstr "" +"Schlüssel '%s' stimmt nicht mit dem Schlüssel '%s' in der Datenbank überein" #: packet.cc:350 #, c-format @@ -3115,7 +3159,8 @@ "try importing a module instead, with 'cvs_import %s/" msgstr "" "%s scheint das Wurzelverzeichnis eines CVS-Repositories zu sein\n" -"versuchen Sie stattdessen, ein Modul zu importieren, mit 'cvs_import %s/" +"versuchen Sie stattdessen, ein Modul zu importieren, mit 'cvs_import %s/" +"" #: rcs_import.cc:1222 #, c-format @@ -3159,12 +3204,15 @@ #: revision.cc:1010 #, c-format msgid "Directory for path %s cannot be added, as there is a file in the way\n" -msgstr "Verzeichnis für Pfad %s kann nicht hinzugefügt werden, da eine Datei im Weg ist\n" +msgstr "" +"Verzeichnis für Pfad %s kann nicht hinzugefügt werden, da eine Datei im Weg " +"ist\n" #: revision.cc:1021 #, c-format msgid "Path %s cannot be added, as there is a directory in the way" -msgstr "Der Pfad %s kann nicht hinzugefügt werden, da ein Verzeichnis im Weg ist" +msgstr "" +"Der Pfad %s kann nicht hinzugefügt werden, da ein Verzeichnis im Weg ist" #: revision.cc:1024 #, c-format @@ -3180,14 +3228,19 @@ "seriously, if you'd like to keep it, we're happy to figure out how)" msgstr "" "unbekanntes Attribut '%s' an Pfad '%s'\n" -"bitte kontaktieren Sie %s, damit wir herausfinden können, wie dies migriert werden kann\n" -"(wenn Ihnen das Attribut nicht wichtig ist, können Sie es über --drop-attr entfernen,\n" -"nichtsdestotrotz würden wir gerne darüber bescheid wissen, um es dennoch migrierbar zu machen)" +"bitte kontaktieren Sie %s, damit wir herausfinden können, wie dies migriert " +"werden kann\n" +"(wenn Ihnen das Attribut nicht wichtig ist, können Sie es über --drop-attr " +"entfernen,\n" +"nichtsdestotrotz würden wir gerne darüber bescheid wissen, um es dennoch " +"migrierbar zu machen)" #: revision.cc:1423 #, c-format msgid "converting existing revision graph to new roster-style revisions" -msgstr "konvertiere existierenden Revisions-Graph für neue, katalogbasierte Revisionen" +msgstr "" +"konvertiere existierenden Revisions-Graph für neue, katalogbasierte " +"Revisionen" #: revision.cc:1478 #, c-format @@ -3203,7 +3256,8 @@ msgstr "" "Ich bin auf eine Revision mit einem mir unbekannten Format gestoßen ('%s').\n" "Ich kann lediglich das Format der Version '1' verstehen.\n" -"Eine neuere Version von monotone wird benötigt, um diese Operation durchzuführen." +"Eine neuere Version von monotone wird benötigt, um diese Operation " +"durchzuführen." #: sanity.cc:135 #, c-format @@ -3291,7 +3345,8 @@ #: schema_migration.cc:316 #, c-format msgid "no migration performed; database schema already up-to-date at %s" -msgstr "keine Migration durchgeführt; Datenbankschema ist bereits aktualisiert auf %s" +msgstr "" +"keine Migration durchgeführt; Datenbankschema ist bereits aktualisiert auf %s" #: schema_migration.cc:866 #, c-format @@ -3481,7 +3536,9 @@ #: work.cc:468 #, c-format msgid "proposed new root directory '%s' is not versioned or does not exist" -msgstr "das neu vorgeschlagene Wurzelverzeichnis '%s' ist nicht unter Versionkontrolle oder existiert nicht" +msgstr "" +"das neu vorgeschlagene Wurzelverzeichnis '%s' ist nicht unter " +"Versionkontrolle oder existiert nicht" #: work.cc:470 #, c-format @@ -3491,12 +3548,15 @@ #: work.cc:475 #, c-format msgid "proposed new root directory '%s' contains illegal path %s" -msgstr "das neu vorgeschlagene Wurzelverzeichnis '%s' beinhaltet den ungültigen Pfad %s" +msgstr "" +"das neu vorgeschlagene Wurzelverzeichnis '%s' beinhaltet den ungültigen Pfad " +"%s" #: work.cc:485 #, c-format msgid "directory '%s' is not versioned or does not exist" -msgstr "das Verzeichnis '%s' ist nicht unter Versionskontrolle oder existiert nicht" +msgstr "" +"das Verzeichnis '%s' ist nicht unter Versionskontrolle oder existiert nicht" #: work.cc:491 #, c-format @@ -3528,14 +3588,12 @@ msgid "dropping %s" msgstr "entferne %s" -#: work.cc:943 -#: work.cc:954 +#: work.cc:943 work.cc:954 #, c-format msgid "path %s already exists" msgstr "Pfad %s existiert bereits" -#: work.cc:976 -#: work.cc:1003 +#: work.cc:976 work.cc:1003 #, c-format msgid "adding %s" msgstr "füge %s hinzu" @@ -3563,10 +3621,10 @@ #: work.cc:1040 #, c-format msgid "content of file '%s' has changed, not overwriting" -msgstr "Inhalt der Datei '%s' hat sich geändert, Datei wird nicht überschrieben" +msgstr "" +"Inhalt der Datei '%s' hat sich geändert, Datei wird nicht überschrieben" #: work.cc:1041 #, c-format msgid "modifying %s" msgstr "verändere %s" - ============================================================ --- po/fr.po bc6e687ce5f93b8b33bc823dc19d18a879b10dd7 +++ po/fr.po ba8591754e834e5116692184360e04dba26ae1b4 @@ -243,7 +243,7 @@ msgstr "" "Project-Id-Version: monotone 0.22\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-05 22:56-0700\n" +"POT-Creation-Date: 2006-07-10 15:00-0700\n" "PO-Revision-Date: 2006-03-15 17:13+0100\n" "Last-Translator: Benoît Dejean \n" "Language-Team: Benoît Dejean \n" @@ -252,57 +252,57 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: app_state.cc:139 +#: app_state.cc:140 #, c-format msgid "workspace required but not found%s%s" msgstr "espace de travail requis mais pas trouvé%s%s" -#: app_state.cc:147 +#: app_state.cc:148 #, c-format msgid "invalid directory ''" msgstr "dossier pas valable «»" -#: app_state.cc:155 +#: app_state.cc:156 #, fuzzy, c-format msgid "monotone bookkeeping directory '%s' already exists in '%s'" msgstr "le dossier administratif « %s » existe déjà dans « %s »\n" -#: app_state.cc:236 +#: app_state.cc:237 #, c-format msgid "search root '%s' does not exist" msgstr "le racine de l'espace de travail « %s » n'existe pas" -#: app_state.cc:237 +#: app_state.cc:238 #, c-format msgid "search root '%s' is not a directory\n" msgstr "le racine de l'espace de travail « %s » n'est pas un dossier\n" -#: app_state.cc:271 +#: app_state.cc:272 #, c-format msgid "failed to parse date string '%s': %s" msgstr "échou de comprendre la date « %s » : %s" -#: app_state.cc:286 +#: app_state.cc:287 #, c-format msgid "negative depth not allowed\n" msgstr "profondeur négative interdite\n" -#: app_state.cc:294 +#: app_state.cc:295 #, c-format msgid "illegal argument to --last: cannot be zero or negative\n" msgstr "" -#: app_state.cc:302 +#: app_state.cc:303 #, c-format msgid "illegal argument to --next: cannot be zero or negative\n" msgstr "" -#: app_state.cc:438 +#: app_state.cc:439 #, c-format msgid "Failed to read options file %s" msgstr "La lecture du fichier d'options « %s » a échouée" -#: app_state.cc:455 +#: app_state.cc:456 #, c-format msgid "Failed to write options file %s" msgstr "L'écriture du fichier d'options « %s » a échouée" @@ -407,9 +407,9 @@ msgid "automation interface" msgstr "interface d'automatisation" -#: cmd_db.cc:35 cmd_diff_log.cc:404 cmd_diff_log.cc:435 cmd_diff_log.cc:437 -#: cmd_files.cc:102 cmd_files.cc:164 cmd_merging.cc:123 cmd_ws_commit.cc:446 -#: commands.cc:370 +#: cmd_db.cc:35 cmd_diff_log.cc:379 cmd_diff_log.cc:410 cmd_diff_log.cc:412 +#: cmd_files.cc:134 cmd_files.cc:196 cmd_merging.cc:124 cmd_merging.cc:633 +#: cmd_merging.cc:648 cmd_merging.cc:651 cmd_ws_commit.cc:446 commands.cc:374 #, c-format msgid "no such revision '%s'" msgstr "aucune révision « %s »" @@ -492,8 +492,8 @@ msgid "no var with name %s in domain %s" msgstr "aucune variable nommée %s dans le domaine %s" -#: cmd_db.cc:152 cmd_diff_log.cc:348 cmd_diff_log.cc:558 cmd_files.cc:78 -#: cmd_files.cc:145 cmd_list.cc:437 cmd_merging.cc:569 cmd_ws_commit.cc:322 +#: cmd_db.cc:152 cmd_diff_log.cc:323 cmd_diff_log.cc:533 cmd_files.cc:110 +#: cmd_files.cc:177 cmd_list.cc:437 cmd_merging.cc:570 cmd_ws_commit.cc:322 #: commands.cc:246 msgid "informative" msgstr "information" @@ -511,12 +511,12 @@ msgid "non-hex digits in partial id" msgstr "chiffres non-héxadécimaux dans l'id partielle" -#: cmd_diff_log.cc:348 cmd_ws_commit.cc:53 cmd_ws_commit.cc:224 +#: cmd_diff_log.cc:323 cmd_ws_commit.cc:53 cmd_ws_commit.cc:224 #: cmd_ws_commit.cc:251 cmd_ws_commit.cc:322 cmd_ws_commit.cc:613 msgid "[PATH]..." msgstr "[CHEMIN]..." -#: cmd_diff_log.cc:349 +#: cmd_diff_log.cc:324 #, fuzzy msgid "" "show current diffs on stdout.\n" @@ -531,7 +531,7 @@ "différence entre eux est affichée. Si aucun format n'est précisé,\n" "le format « unified » est employé par défaut." -#: cmd_diff_log.cc:365 +#: cmd_diff_log.cc:340 #, c-format msgid "" "--diff-args requires --external\n" @@ -540,15 +540,15 @@ "--diff-args requiet --external\n" "essayez d'ajouter --external ou de retirer --diff-args ?" -#: cmd_diff_log.cc:494 +#: cmd_diff_log.cc:469 msgid "no changes" msgstr "aucun changement" -#: cmd_diff_log.cc:558 +#: cmd_diff_log.cc:533 msgid "[FILE] ..." msgstr "[FICHIER] ..." -#: cmd_diff_log.cc:559 +#: cmd_diff_log.cc:534 #, fuzzy msgid "" "print history in reverse order (filtering by 'FILE'). If one or more " @@ -557,13 +557,13 @@ "Affiche l'histoire en sens inverse (filtré avec « FILE »). Si une\n" "révision ou plus sont données, emploie-les comme débuts." -#: cmd_diff_log.cc:621 +#: cmd_diff_log.cc:596 #, c-format msgid "only one of --last/--next allowed" msgstr "seul un de --last et --next est permit" -#: cmd_files.cc:28 cmd_files.cc:41 cmd_files.cc:121 cmd_merging.cc:771 -#: cmd_othervcs.cc:15 +#: cmd_files.cc:28 cmd_files.cc:41 cmd_files.cc:78 cmd_files.cc:153 +#: cmd_merging.cc:818 cmd_othervcs.cc:15 msgid "debug" msgstr "débogue" @@ -600,45 +600,64 @@ msgstr "la fusion a échouée" #: cmd_files.cc:78 +msgid "SRCNAME DESTNAME SRCID DESTID" +msgstr "" + +#: cmd_files.cc:79 +#, fuzzy +msgid "diff 2 files and output result" +msgstr "fusionne 3 fichiers et affiche le résultat" + +#: cmd_files.cc:96 +#, fuzzy, c-format +msgid "source file id does not exist" +msgstr "l'id du fichier de l'ancêtre n'existe pas" + +#: cmd_files.cc:99 +#, fuzzy, c-format +msgid "destination file id does not exist" +msgstr "l'id du fichier de l'ancêtre n'existe pas" + +#: cmd_files.cc:110 msgid "PATH" msgstr "CHEMIN" -#: cmd_files.cc:79 +#: cmd_files.cc:111 msgid "print annotated copy of the file from REVISION" msgstr "affiche une copie annotée du fichier venant de RÉVISION" -#: cmd_files.cc:100 +#: cmd_files.cc:132 #, c-format msgid "no revision for file '%s' in database" msgstr "aucune révision pour le fichier « %s » dans la base de données" -#: cmd_files.cc:111 +#: cmd_files.cc:143 #, fuzzy, c-format msgid "no such file '%s' in revision '%s'" msgstr "aucun fichier « %s » dans la révision « %s »\n" -#: cmd_files.cc:114 +#: cmd_files.cc:146 #, fuzzy, c-format msgid "'%s' in revision '%s' is not a file" msgstr "« %s » est un dossier, pas un fichier" -#: cmd_files.cc:121 +#: cmd_files.cc:153 msgid "[PATH]" msgstr "[CHEMIN]" -#: cmd_files.cc:122 +#: cmd_files.cc:154 msgid "calculate identity of PATH or stdin" msgstr "calculer l'identité du CHEMIN ou de l'entrée standard" -#: cmd_files.cc:146 +#: cmd_files.cc:178 msgid "FILENAME" msgstr "FICHIER" -#: cmd_files.cc:147 +#: cmd_files.cc:179 msgid "write file from database to stdout" msgstr "écrire un fichier de la base de donnée sur la sortie standard" -#: cmd_files.cc:176 cmd_files.cc:178 +#: cmd_files.cc:208 cmd_files.cc:210 #, fuzzy, c-format msgid "no file '%s' found in revision '%s'" msgstr "aucun fichier « %s » dans la révision « %s »\n" @@ -927,13 +946,13 @@ msgid "No such revision %s" msgstr "aucune révision « %s »" -#: cmd_merging.cc:53 cmd_merging.cc:610 cmd_ws_commit.cc:53 +#: cmd_merging.cc:54 cmd_merging.cc:611 cmd_ws_commit.cc:53 #: cmd_ws_commit.cc:224 cmd_ws_commit.cc:251 cmd_ws_commit.cc:278 #: cmd_ws_commit.cc:303 cmd_ws_commit.cc:515 cmd_ws_commit.cc:613 msgid "workspace" msgstr "espace de travail" -#: cmd_merging.cc:54 +#: cmd_merging.cc:55 msgid "" "update workspace.\n" "This command modifies your workspace to be based off of a\n" @@ -948,18 +967,18 @@ "cette révision. Sinon, met à jour basé sur la révision d'entré de\n" "la branche actuelle." -#: cmd_merging.cc:97 +#: cmd_merging.cc:98 #, c-format msgid "this workspace is a new project; cannot update" msgstr "" "cet espace de travail est un nouveau projet, impossible de mettre à jour" -#: cmd_merging.cc:101 +#: cmd_merging.cc:102 #, fuzzy, c-format msgid "updating along branch '%s'" msgstr "la branche « %s » n'est pas servie" -#: cmd_merging.cc:105 +#: cmd_merging.cc:106 #, c-format msgid "" "your request matches no descendents of the current revision\n" @@ -970,37 +989,37 @@ "actuelle. Elle ne correspond même pas à la révision actuelle.\n" "Peut-être voulez-vous employer --revision=?" -#: cmd_merging.cc:110 +#: cmd_merging.cc:111 #, fuzzy, c-format msgid "multiple update candidates:" msgstr "plusieurs candidats pour la mise à jour :\n" -#: cmd_merging.cc:114 +#: cmd_merging.cc:115 #, fuzzy, c-format msgid "choose one with '%s update -r'" msgstr "choisissez en un avec « %s update -r »\n" -#: cmd_merging.cc:115 +#: cmd_merging.cc:116 #, fuzzy, c-format msgid "multiple update candidates remain after selection" msgstr "il reste plusieurs candidats possible après la selection" -#: cmd_merging.cc:130 +#: cmd_merging.cc:131 #, fuzzy, c-format msgid "already up to date at %s" msgstr "déjà à jour en %s\n" -#: cmd_merging.cc:138 +#: cmd_merging.cc:139 #, fuzzy, c-format msgid "selected update target %s" msgstr "sélection de la cible %s pour la mise à jour\n" -#: cmd_merging.cc:162 +#: cmd_merging.cc:163 #, fuzzy, c-format msgid "target revision is not in current branch" msgstr "la révision actuelle n'existe pas" -#: cmd_merging.cc:170 +#: cmd_merging.cc:171 #, fuzzy, c-format msgid "" "target revision is in multiple branches:%s\n" @@ -1010,246 +1029,254 @@ "la révision %s n'est pas membre de la branche %s\n" "éssayez de nouveau avec un --branch explicit\n" -#: cmd_merging.cc:178 +#: cmd_merging.cc:179 #, fuzzy, c-format msgid "switching to branch %s" msgstr "commence à confier sur la branche « %s »\n" -#: cmd_merging.cc:183 +#: cmd_merging.cc:184 #, c-format msgid "" "target revision not in any branch\n" "next commit will use branch %s" msgstr "" -#: cmd_merging.cc:288 +#: cmd_merging.cc:289 #, c-format msgid "switched branch; next commit will use branch %s" msgstr "" -#: cmd_merging.cc:289 +#: cmd_merging.cc:290 #, fuzzy, c-format msgid "updated to base revision %s" msgstr "mise à jour vers la révision de base %s\n" -#: cmd_merging.cc:299 cmd_merging.cc:352 cmd_merging.cc:363 cmd_merging.cc:523 -#: cmd_merging.cc:747 cmd_ws_commit.cc:385 cmd_ws_commit.cc:851 +#: cmd_merging.cc:300 cmd_merging.cc:353 cmd_merging.cc:364 cmd_merging.cc:524 +#: cmd_merging.cc:794 cmd_ws_commit.cc:385 cmd_ws_commit.cc:851 #: cmd_ws_commit.cc:872 msgid "tree" msgstr "arborescence" -#: cmd_merging.cc:299 +#: cmd_merging.cc:300 msgid "merge unmerged heads of branch" msgstr "fusionne les entrées de la branche non fusionnées" -#: cmd_merging.cc:308 cmd_merging.cc:755 +#: cmd_merging.cc:309 cmd_merging.cc:802 #, c-format msgid "please specify a branch, with --branch=BRANCH" msgstr "veuillez préciser une branche avec --branch=BRANCHE" -#: cmd_merging.cc:312 cmd_merging.cc:402 cmd_merging.cc:405 cmd_merging.cc:760 +#: cmd_merging.cc:313 cmd_merging.cc:403 cmd_merging.cc:406 cmd_merging.cc:807 #: cmd_ws_commit.cc:430 #, c-format msgid "branch '%s' is empty" msgstr "la branche « %s » est vide" -#: cmd_merging.cc:315 +#: cmd_merging.cc:316 #, fuzzy, c-format msgid "branch '%s' is already merged" msgstr "la branche « %s » est fusionnée\n" -#: cmd_merging.cc:323 +#: cmd_merging.cc:324 #, fuzzy, c-format msgid "starting with revision 1 / %d" msgstr "en commencent avec la révision 1 / %d\n" -#: cmd_merging.cc:327 +#: cmd_merging.cc:328 #, fuzzy, c-format msgid "merging with revision %d / %d" msgstr "fusionnent avec la révision %d / %d\n" -#: cmd_merging.cc:328 cmd_merging.cc:329 cmd_merging.cc:412 cmd_merging.cc:547 -#: cmd_merging.cc:548 +#: cmd_merging.cc:329 cmd_merging.cc:330 cmd_merging.cc:413 cmd_merging.cc:548 +#: cmd_merging.cc:549 #, fuzzy, c-format msgid "[source] %s" msgstr "[source] %s\n" -#: cmd_merging.cc:346 cmd_merging.cc:519 cmd_merging.cc:566 +#: cmd_merging.cc:347 cmd_merging.cc:520 cmd_merging.cc:567 #, fuzzy, c-format msgid "[merged] %s" msgstr "[fusionné] %s\n" -#: cmd_merging.cc:349 +#: cmd_merging.cc:350 #, fuzzy, c-format msgid "note: your workspaces have not been updated" msgstr "note: vos espaces de travail ne sont pas à jour\n" -#: cmd_merging.cc:352 +#: cmd_merging.cc:353 msgid "SOURCE-BRANCH DEST-BRANCH" msgstr "BRANCHE-SOURCE BRANCHE-DESTINATION" -#: cmd_merging.cc:353 +#: cmd_merging.cc:354 msgid "merge from one branch to another asymmetrically" msgstr "fusionnez d'une branche à une autre asymétriquement" -#: cmd_merging.cc:363 +#: cmd_merging.cc:364 msgid "SOURCE-BRANCH DEST-BRANCH DIR" msgstr "BRANCHE-SOURCE BRANCHE-DESTINATION DOSSIER" -#: cmd_merging.cc:364 +#: cmd_merging.cc:365 msgid "merge one branch into a subdirectory in another branch" msgstr "fusionnez une branche dans un sous-dossier d'une autre branche" -#: cmd_merging.cc:403 cmd_merging.cc:406 +#: cmd_merging.cc:404 cmd_merging.cc:407 #, fuzzy, c-format msgid "branch '%s' is not merged" msgstr "la branche « %s » n'est pas fusionnée\n" -#: cmd_merging.cc:411 +#: cmd_merging.cc:412 #, fuzzy, c-format msgid "propagating %s -> %s" msgstr "propage %s -> %s\n" -#: cmd_merging.cc:413 +#: cmd_merging.cc:414 #, fuzzy, c-format msgid "[target] %s" msgstr "[cible] %s\n" -#: cmd_merging.cc:418 +#: cmd_merging.cc:419 #, fuzzy, c-format msgid "branch '%s' is up-to-date with respect to branch '%s'" msgstr "la branche « %s » est à jour par rapport à la branche « %s »\n" -#: cmd_merging.cc:420 +#: cmd_merging.cc:421 #, fuzzy, c-format msgid "no action taken" msgstr "rien n'est fait\n" -#: cmd_merging.cc:424 +#: cmd_merging.cc:425 #, fuzzy, c-format msgid "no merge necessary; putting %s in branch '%s'" msgstr "fusion pas nécessaire; met %s dans la branch « %s »\n" -#: cmd_merging.cc:462 +#: cmd_merging.cc:463 #, c-format msgid "Path %s not found in destination tree." msgstr "Chemin %s pas trouvé dans l'arborescence de destination" -#: cmd_merging.cc:524 +#: cmd_merging.cc:525 msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH" msgstr "RÉVISION-GAUCHE RÉVISION-DROITE BRANCHE-DESTINATION" -#: cmd_merging.cc:525 +#: cmd_merging.cc:526 msgid "merge two explicitly given revisions, placing result in given branch" msgstr "" "fusionne deux révisions données explicitement et met le résultat dans la " "branche donnée" -#: cmd_merging.cc:540 +#: cmd_merging.cc:541 #, c-format msgid "%s and %s are the same revision, aborting" msgstr "%s et %s sont la même révision, j'abandonne" -#: cmd_merging.cc:542 cmd_merging.cc:544 +#: cmd_merging.cc:543 cmd_merging.cc:545 #, c-format msgid "%s is already an ancestor of %s" msgstr "%s est déjà un ancêtre de %s" -#: cmd_merging.cc:569 +#: cmd_merging.cc:570 msgid "REV REV" msgstr "RÉV RÉV" -#: cmd_merging.cc:570 +#: cmd_merging.cc:571 msgid "" "Show what conflicts would need to be resolved to merge the given revisions." msgstr "" "Montre quels conflits auraient besoin d'être résolus l'ors d'une fusion des " "révisions données." -#: cmd_merging.cc:580 cmd_merging.cc:582 +#: cmd_merging.cc:581 cmd_merging.cc:583 #, fuzzy, c-format msgid "%s is an ancestor of %s; no merge is needed." msgstr "%s est un ancêtre de %s; aucune fusion est nécessaire" -#: cmd_merging.cc:596 +#: cmd_merging.cc:597 #, c-format msgid "There are %s node_name_conflicts." msgstr "Il y a %s node_name_conflicts." -#: cmd_merging.cc:598 +#: cmd_merging.cc:599 #, c-format msgid "There are %s file_content_conflicts." msgstr "Il y a %s file_content_conflicts." -#: cmd_merging.cc:600 +#: cmd_merging.cc:601 #, c-format msgid "There are %s node_attr_conflicts." msgstr "Il y a %s node_attr_conflicts." -#: cmd_merging.cc:602 +#: cmd_merging.cc:603 #, c-format msgid "There are %s orphaned_node_conflicts." msgstr "Il y a %s orphaned_node_conflicts." -#: cmd_merging.cc:604 +#: cmd_merging.cc:605 #, c-format msgid "There are %s rename_target_conflicts." msgstr "Il y a %s rename_target_conflicts." -#: cmd_merging.cc:606 +#: cmd_merging.cc:607 #, c-format msgid "There are %s directory_loop_conflicts." msgstr "Il y a %s directory_loop_conflicts." #: cmd_merging.cc:611 +msgid "[-r FROM] -r TO [PATH...]" +msgstr "" + +#: cmd_merging.cc:612 msgid "" -"cherrypick changes from other parts of history into workspace.\n" -"This command takes arbitrary changes made at any point in history,\n" -"and applies them to your current workspace, as if you had made the\n" -"edits by hand.\n" +"Apply changes made at arbitrary places in history to current workspace.\n" +"This command takes changes made at any point in history, and\n" +"edits your current workspace to include those changes. The end result\n" +"is identical to 'mtn diff -r FROM -r TO | patch -p0', except that\n" +"this command uses monotone's merger, and thus intelligently handles\n" +"renames, conflicts, and so on.\n" +"\n" "If one revision is given, applies the changes made in that revision\n" "compared to its parent.\n" +"\n" "If two revisions are given, applies the changes made to get from the\n" "first revision to the second." msgstr "" -#: cmd_merging.cc:632 +#: cmd_merging.cc:637 #, c-format msgid "" "revision %s is a merge\n" "to apply the changes relative to one of its parents, use:\n" -" %s cherrypatch -r PARENT -r %s" +" %s pluck -r PARENT -r %s" msgstr "" -#: cmd_merging.cc:649 +#: cmd_merging.cc:658 #, fuzzy, c-format msgid "no changes to apply" msgstr "aucun changement à confier\n" -#: cmd_merging.cc:740 +#: cmd_merging.cc:770 #, fuzzy, c-format msgid "applied changes to workspace" msgstr "ajouter des fichiers à l'espace de travail" -#: cmd_merging.cc:747 +#: cmd_merging.cc:794 msgid "show unmerged head revisions of branch" msgstr "affiche les entrées non fusionné de la branche" -#: cmd_merging.cc:762 +#: cmd_merging.cc:809 #, fuzzy, c-format msgid "branch '%s' is currently merged:" msgstr "la branche « %s » est actuellement fusionnée :\n" -#: cmd_merging.cc:764 +#: cmd_merging.cc:811 #, fuzzy, c-format msgid "branch '%s' is currently unmerged:" msgstr "la branche « %s » n'est actuellement pas fusionnée :\n" -#: cmd_merging.cc:771 +#: cmd_merging.cc:818 msgid "REVID" msgstr "ID_RÉVISION" -#: cmd_merging.cc:772 +#: cmd_merging.cc:819 msgid "dump the roster associated with the given REVID" msgstr "décharge la list associée avec l'ID_RÉV donnée" @@ -1711,31 +1738,31 @@ msgid "display command help" msgstr "afficher l'aide de la commande" -#: commands.cc:377 +#: commands.cc:381 #, fuzzy, c-format msgid "expanding selection '%s'" msgstr "expansion de la sélection « %s »\n" -#: commands.cc:385 +#: commands.cc:389 #, c-format msgid "no match for selection '%s'" msgstr "aucune correspondance pour la sélection « %s »" -#: commands.cc:391 +#: commands.cc:395 #, fuzzy, c-format msgid "expanded to '%s'" msgstr "expansion à « %s »\n" -#: commands.cc:408 +#: commands.cc:412 #, c-format msgid "selection '%s' has multiple ambiguous expansions: \n" msgstr "la sélection « %s » a plusieurs expansions ambigües : \n" -#: commands.cc:425 +#: commands.cc:429 msgid "note: " msgstr "note : " -#: commands.cc:426 +#: commands.cc:430 #, c-format msgid "" "branch '%s' has multiple heads\n" @@ -1744,7 +1771,7 @@ "la branche « %s » a plusieurs heads\n" "vous devriez peut-être lancer « %s merge »" -#: commands.cc:444 +#: commands.cc:448 #, c-format msgid "--message and --message-file are mutually exclusive" msgstr "--message et --message-file sont mutuellement exclusifs" @@ -2718,21 +2745,21 @@ msgid "weird error when stuffing arguments read from %s: %s\n" msgstr "erreur bizarre en employent des arguments lu de %s: %s\n" -#: monotone.cc:330 +#: monotone.cc:329 msgid "[OPTION...] command [ARGS...]\n" msgstr "[OPTION...] commande [ARGUMENTS...]\n" -#: monotone.cc:593 +#: monotone.cc:594 #, c-format msgid "syntax error near the \"%s\" option: %s" msgstr "erreur de syntaxe près de l'option « %s » : %s" -#: monotone.cc:629 +#: monotone.cc:630 #, fuzzy, c-format msgid "%s %s doesn't use the option %s" msgstr "monotone %s n'utilise pas l'option %s" -#: monotone.cc:663 +#: monotone.cc:664 #, c-format msgid "Options specific to '%s %s':" msgstr "Options spécifiques à « %s %s » :" @@ -3791,9 +3818,13 @@ #: work.cc:1041 #, fuzzy, c-format -msgid "updating %s" -msgstr "mise à jour de %s en %s" +msgid "modifying %s" +msgstr "ajout de %s" +#, fuzzy +#~ msgid "updating %s" +#~ msgstr "mise à jour de %s en %s" + #~ msgid "unknown path '%s'\n" #~ msgstr "chemin inconnu « %s »\n" ============================================================ --- po/it.po 008d67cc9a07706ebfd8fe0e0672d21ae55f29cf +++ po/it.po 93f2a2b3a78121687e53a2bf154273008b6eee3f @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: monotone\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-05 22:56-0700\n" +"POT-Creation-Date: 2006-07-10 15:00-0700\n" "PO-Revision-Date: 2006-06-24 12:35+0100\n" "Last-Translator: Lapo Luchini \n" "Language-Team: Lapo Luchini \n" @@ -14,59 +14,59 @@ "X-Poedit-Country: ITALY\n" "X-Poedit-Basepath: ..\\\n" -#: app_state.cc:139 +#: app_state.cc:140 #, c-format msgid "workspace required but not found%s%s" msgstr "spazio di lavoro richiesto ma non trovato%s%s" -#: app_state.cc:147 +#: app_state.cc:148 #, c-format msgid "invalid directory ''" msgstr "directory non valida ‘’" -#: app_state.cc:155 +#: app_state.cc:156 #, c-format msgid "monotone bookkeeping directory '%s' already exists in '%s'" msgstr "la directory di servizio di monotone ‘%s’ esiste già in ‘%s’" # TODO: radice di ricerca? -#: app_state.cc:236 +#: app_state.cc:237 #, c-format msgid "search root '%s' does not exist" msgstr "la radice di ricerca ‘%s’ non esiste" # TODO: radice di ricerca? -#: app_state.cc:237 +#: app_state.cc:238 #, c-format msgid "search root '%s' is not a directory\n" msgstr "la radice di ricerca ‘%s’ non è una directory\n" -#: app_state.cc:271 +#: app_state.cc:272 #, c-format msgid "failed to parse date string '%s': %s" msgstr "impossibile interpretare la stringa ‘%s’ come data: %s" -#: app_state.cc:286 +#: app_state.cc:287 #, c-format msgid "negative depth not allowed\n" msgstr "profondità negativa non permessa\n" -#: app_state.cc:294 +#: app_state.cc:295 #, c-format msgid "illegal argument to --last: cannot be zero or negative\n" msgstr "argomento illegale per --ultimo: non può essere zero o negativo\n" -#: app_state.cc:302 +#: app_state.cc:303 #, c-format msgid "illegal argument to --next: cannot be zero or negative\n" msgstr "argomento illegale per --prossimo: non può essere zero o negativo\n" -#: app_state.cc:438 +#: app_state.cc:439 #, c-format msgid "Failed to read options file %s" msgstr "Impossibile leggere il file di opzioni ‘%s’" -#: app_state.cc:455 +#: app_state.cc:456 #, c-format msgid "Failed to write options file %s" msgstr "Impossibile scrivere il file di opzioni ‘%s’" @@ -163,9 +163,9 @@ msgid "automation interface" msgstr "interfaccia di automazione" -#: cmd_db.cc:35 cmd_diff_log.cc:404 cmd_diff_log.cc:435 cmd_diff_log.cc:437 -#: cmd_files.cc:102 cmd_files.cc:164 cmd_merging.cc:123 cmd_ws_commit.cc:446 -#: commands.cc:370 +#: cmd_db.cc:35 cmd_diff_log.cc:379 cmd_diff_log.cc:410 cmd_diff_log.cc:412 +#: cmd_files.cc:134 cmd_files.cc:196 cmd_merging.cc:124 cmd_merging.cc:633 +#: cmd_merging.cc:648 cmd_merging.cc:651 cmd_ws_commit.cc:446 commands.cc:374 #, c-format msgid "no such revision '%s'" msgstr "la revisione %s non esiste" @@ -246,8 +246,8 @@ msgid "no var with name %s in domain %s" msgstr "nessuna variabile ha nome ‘%s’ nel dominio ‘%s’" -#: cmd_db.cc:152 cmd_diff_log.cc:348 cmd_diff_log.cc:558 cmd_files.cc:78 -#: cmd_files.cc:145 cmd_list.cc:437 cmd_merging.cc:569 cmd_ws_commit.cc:322 +#: cmd_db.cc:152 cmd_diff_log.cc:323 cmd_diff_log.cc:533 cmd_files.cc:110 +#: cmd_files.cc:177 cmd_list.cc:437 cmd_merging.cc:570 cmd_ws_commit.cc:322 #: commands.cc:246 msgid "informative" msgstr "informativo" @@ -265,12 +265,12 @@ msgid "non-hex digits in partial id" msgstr "cifre non decimali nell'ID parziale" -#: cmd_diff_log.cc:348 cmd_ws_commit.cc:53 cmd_ws_commit.cc:224 +#: cmd_diff_log.cc:323 cmd_ws_commit.cc:53 cmd_ws_commit.cc:224 #: cmd_ws_commit.cc:251 cmd_ws_commit.cc:322 cmd_ws_commit.cc:613 msgid "[PATH]..." msgstr "[PERCORSO…]" -#: cmd_diff_log.cc:349 +#: cmd_diff_log.cc:324 msgid "" "show current diffs on stdout.\n" "If one revision is given, the diff between the workspace and\n" @@ -284,7 +284,7 @@ "viene stampata la differenza tra loro. Se non è specificato nessun\n" "formato, viene usato per default quello unificato." -#: cmd_diff_log.cc:365 +#: cmd_diff_log.cc:340 #, c-format msgid "" "--diff-args requires --external\n" @@ -293,15 +293,15 @@ "‘--diff-args’ richiede ‘--external’\n" "prova ad aggiungere ‘--external’ o togliere ‘--diff-args’" -#: cmd_diff_log.cc:494 +#: cmd_diff_log.cc:469 msgid "no changes" msgstr "nessun cambiamento" -#: cmd_diff_log.cc:558 +#: cmd_diff_log.cc:533 msgid "[FILE] ..." msgstr "[FILE…]" -#: cmd_diff_log.cc:559 +#: cmd_diff_log.cc:534 msgid "" "print history in reverse order (filtering by 'FILE'). If one or more " "revisions are given, use them as a starting point." @@ -309,13 +309,13 @@ "stampa lo storico in ordine contrario (filtrando per ‘FILE’). Se sono " "specificate una o più revisioni, usa quelle come punto di partenza." -#: cmd_diff_log.cc:621 +#: cmd_diff_log.cc:596 #, c-format msgid "only one of --last/--next allowed" msgstr "solo un comando permesso tra ‘--last’ e ‘--next’" -#: cmd_files.cc:28 cmd_files.cc:41 cmd_files.cc:121 cmd_merging.cc:771 -#: cmd_othervcs.cc:15 +#: cmd_files.cc:28 cmd_files.cc:41 cmd_files.cc:78 cmd_files.cc:153 +#: cmd_merging.cc:818 cmd_othervcs.cc:15 msgid "debug" msgstr "debug" @@ -352,45 +352,64 @@ msgstr "‘merge’ fallito" #: cmd_files.cc:78 +msgid "SRCNAME DESTNAME SRCID DESTID" +msgstr "" + +#: cmd_files.cc:79 +#, fuzzy +msgid "diff 2 files and output result" +msgstr "unisce 3 file e stampa il risultato" + +#: cmd_files.cc:96 +#, fuzzy, c-format +msgid "source file id does not exist" +msgstr "id del file antenato inesistente" + +#: cmd_files.cc:99 +#, fuzzy, c-format +msgid "destination file id does not exist" +msgstr "id del file antenato inesistente" + +#: cmd_files.cc:110 msgid "PATH" msgstr "PERCORSO" -#: cmd_files.cc:79 +#: cmd_files.cc:111 msgid "print annotated copy of the file from REVISION" msgstr "stampa una copia annotata del file tratto da REVISIONE" -#: cmd_files.cc:100 +#: cmd_files.cc:132 #, c-format msgid "no revision for file '%s' in database" msgstr "nessuna revisione nel database per il file ‘%s’" -#: cmd_files.cc:111 +#: cmd_files.cc:143 #, c-format msgid "no such file '%s' in revision '%s'" msgstr "nessun file ‘%s’ trovato nella revisione %s" -#: cmd_files.cc:114 +#: cmd_files.cc:146 #, c-format msgid "'%s' in revision '%s' is not a file" msgstr "‘%s’ della revisione %s non è un file" -#: cmd_files.cc:121 +#: cmd_files.cc:153 msgid "[PATH]" msgstr "[PERCORSO]" -#: cmd_files.cc:122 +#: cmd_files.cc:154 msgid "calculate identity of PATH or stdin" msgstr "calcola l'identità di un percorso o di stdin" -#: cmd_files.cc:146 +#: cmd_files.cc:178 msgid "FILENAME" msgstr "NOMEFILE" -#: cmd_files.cc:147 +#: cmd_files.cc:179 msgid "write file from database to stdout" msgstr "copia un file dal database a stdout" -#: cmd_files.cc:176 cmd_files.cc:178 +#: cmd_files.cc:208 cmd_files.cc:210 #, c-format msgid "no file '%s' found in revision '%s'" msgstr "nessun file ‘%s’ trovato nella revisione %s" @@ -678,13 +697,13 @@ msgid "No such revision %s" msgstr "La revisione %s non esiste" -#: cmd_merging.cc:53 cmd_merging.cc:610 cmd_ws_commit.cc:53 +#: cmd_merging.cc:54 cmd_merging.cc:611 cmd_ws_commit.cc:53 #: cmd_ws_commit.cc:224 cmd_ws_commit.cc:251 cmd_ws_commit.cc:278 #: cmd_ws_commit.cc:303 cmd_ws_commit.cc:515 cmd_ws_commit.cc:613 msgid "workspace" msgstr "spazio di lavoro" -#: cmd_merging.cc:54 +#: cmd_merging.cc:55 msgid "" "update workspace.\n" "This command modifies your workspace to be based off of a\n" @@ -700,18 +719,18 @@ "revisione.\n" "Altrimenti aggiorna lo spazio di lavoro alla testa del ramo." -#: cmd_merging.cc:97 +#: cmd_merging.cc:98 #, c-format msgid "this workspace is a new project; cannot update" msgstr "" "questo spazio di lavoro è un nuovo progetto, non posso fare un ‘update’" -#: cmd_merging.cc:101 +#: cmd_merging.cc:102 #, c-format msgid "updating along branch '%s'" msgstr "aggiorno seguendo il ramo ‘%s’" -#: cmd_merging.cc:105 +#: cmd_merging.cc:106 #, c-format msgid "" "your request matches no descendents of the current revision\n" @@ -719,38 +738,38 @@ "maybe you want --revision=" msgstr "" -#: cmd_merging.cc:110 +#: cmd_merging.cc:111 #, c-format msgid "multiple update candidates:" msgstr "candidati multipli per l'update:" -#: cmd_merging.cc:114 +#: cmd_merging.cc:115 #, c-format msgid "choose one with '%s update -r'" msgstr "selezionane uno con ‘%s update -r’" -#: cmd_merging.cc:115 +#: cmd_merging.cc:116 #, c-format msgid "multiple update candidates remain after selection" msgstr "dopo la selezione restano candidati multipli per ‘update’" -#: cmd_merging.cc:130 +#: cmd_merging.cc:131 #, c-format msgid "already up to date at %s" msgstr "già aggiornato a ‘%s’" # TODO: qui "update" è senza apici -#: cmd_merging.cc:138 +#: cmd_merging.cc:139 #, c-format msgid "selected update target %s" msgstr "selezionata revisione ‘%s’ per l'update" -#: cmd_merging.cc:162 +#: cmd_merging.cc:163 #, c-format msgid "target revision is not in current branch" msgstr "la revisione selezionata non è sul ramo attuale" -#: cmd_merging.cc:170 +#: cmd_merging.cc:171 #, c-format msgid "" "target revision is in multiple branches:%s\n" @@ -761,12 +780,12 @@ "\n" "prova ancora con --ramo dichiarato" -#: cmd_merging.cc:178 +#: cmd_merging.cc:179 #, c-format msgid "switching to branch %s" msgstr "passaggio al ramo ‘%s’" -#: cmd_merging.cc:183 +#: cmd_merging.cc:184 #, c-format msgid "" "target revision not in any branch\n" @@ -775,234 +794,242 @@ "la revisione in oggetto non è in un ramo\n" "il prossimo commit userà il ramo ‘%s’" -#: cmd_merging.cc:288 +#: cmd_merging.cc:289 #, c-format msgid "switched branch; next commit will use branch %s" msgstr "ramo cambiato: il prossimo commit userà il ramo ‘%s’" -#: cmd_merging.cc:289 +#: cmd_merging.cc:290 #, c-format msgid "updated to base revision %s" msgstr "aggiorno alla revisione base %s" -#: cmd_merging.cc:299 cmd_merging.cc:352 cmd_merging.cc:363 cmd_merging.cc:523 -#: cmd_merging.cc:747 cmd_ws_commit.cc:385 cmd_ws_commit.cc:851 +#: cmd_merging.cc:300 cmd_merging.cc:353 cmd_merging.cc:364 cmd_merging.cc:524 +#: cmd_merging.cc:794 cmd_ws_commit.cc:385 cmd_ws_commit.cc:851 #: cmd_ws_commit.cc:872 msgid "tree" msgstr "albero" -#: cmd_merging.cc:299 +#: cmd_merging.cc:300 msgid "merge unmerged heads of branch" msgstr "fa il ‘merge’ delle teste di un ramo" -#: cmd_merging.cc:308 cmd_merging.cc:755 +#: cmd_merging.cc:309 cmd_merging.cc:802 #, c-format msgid "please specify a branch, with --branch=BRANCH" msgstr "specifica un ramo, con --branch=BRANCH" -#: cmd_merging.cc:312 cmd_merging.cc:402 cmd_merging.cc:405 cmd_merging.cc:760 +#: cmd_merging.cc:313 cmd_merging.cc:403 cmd_merging.cc:406 cmd_merging.cc:807 #: cmd_ws_commit.cc:430 #, c-format msgid "branch '%s' is empty" msgstr "il ramo ‘%s’ è vuoto" -#: cmd_merging.cc:315 +#: cmd_merging.cc:316 #, c-format msgid "branch '%s' is already merged" msgstr "il ramo ‘%s’ è già unito" -#: cmd_merging.cc:323 +#: cmd_merging.cc:324 #, c-format msgid "starting with revision 1 / %d" msgstr "inizio con la revisione 1 / %d" -#: cmd_merging.cc:327 +#: cmd_merging.cc:328 #, c-format msgid "merging with revision %d / %d" msgstr "‘merge’ con la revisione %d / %d" -#: cmd_merging.cc:328 cmd_merging.cc:329 cmd_merging.cc:412 cmd_merging.cc:547 -#: cmd_merging.cc:548 +#: cmd_merging.cc:329 cmd_merging.cc:330 cmd_merging.cc:413 cmd_merging.cc:548 +#: cmd_merging.cc:549 #, c-format msgid "[source] %s" msgstr "[sorgente] %s" -#: cmd_merging.cc:346 cmd_merging.cc:519 cmd_merging.cc:566 +#: cmd_merging.cc:347 cmd_merging.cc:520 cmd_merging.cc:567 #, c-format msgid "[merged] %s" msgstr "[unione] %s" -#: cmd_merging.cc:349 +#: cmd_merging.cc:350 #, c-format msgid "note: your workspaces have not been updated" msgstr "nota: lo spazio di lavoro non è stato aggiornato" -#: cmd_merging.cc:352 +#: cmd_merging.cc:353 msgid "SOURCE-BRANCH DEST-BRANCH" msgstr "RAMO-SORG RAMO-DEST" -#: cmd_merging.cc:353 +#: cmd_merging.cc:354 msgid "merge from one branch to another asymmetrically" msgstr "‘merge’ asimmetrico da un ramo ad un altro" -#: cmd_merging.cc:363 +#: cmd_merging.cc:364 msgid "SOURCE-BRANCH DEST-BRANCH DIR" msgstr "RAMO-SORG RAMO-DEST DIRECTORY" -#: cmd_merging.cc:364 +#: cmd_merging.cc:365 msgid "merge one branch into a subdirectory in another branch" msgstr "‘merge’ di un ramo in una sottodirectory di un altro ramo" -#: cmd_merging.cc:403 cmd_merging.cc:406 +#: cmd_merging.cc:404 cmd_merging.cc:407 #, c-format msgid "branch '%s' is not merged" msgstr "il ramo ‘%s’ è separato" -#: cmd_merging.cc:411 +#: cmd_merging.cc:412 #, c-format msgid "propagating %s -> %s" msgstr "propago ‘%s’ → ‘%s’" -#: cmd_merging.cc:413 +#: cmd_merging.cc:414 #, c-format msgid "[target] %s" msgstr "[obiettivo] %s" -#: cmd_merging.cc:418 +#: cmd_merging.cc:419 #, c-format msgid "branch '%s' is up-to-date with respect to branch '%s'" msgstr "il ramo ‘%s’ è aggiornato rispetto al ramo ‘%s’" -#: cmd_merging.cc:420 +#: cmd_merging.cc:421 #, c-format msgid "no action taken" msgstr "nessuna azione svolta" -#: cmd_merging.cc:424 +#: cmd_merging.cc:425 #, c-format msgid "no merge necessary; putting %s in branch '%s'" msgstr "‘merge’ non necessario; metto ‘%s’ nel ramo ‘%s’" -#: cmd_merging.cc:462 +#: cmd_merging.cc:463 #, c-format msgid "Path %s not found in destination tree." msgstr "Percorso ‘%s’ non trovato nell'albero di destinazione." -#: cmd_merging.cc:524 +#: cmd_merging.cc:525 msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH" msgstr "REV_SINISTRA REV_DESTRA RAMO_DESTINAZIONE" -#: cmd_merging.cc:525 +#: cmd_merging.cc:526 msgid "merge two explicitly given revisions, placing result in given branch" msgstr "" "unisce due revisioni specificate, mettendo il risultato in un ramo " "specificato" -#: cmd_merging.cc:540 +#: cmd_merging.cc:541 #, c-format msgid "%s and %s are the same revision, aborting" msgstr "%s e %s sono la stessa revisione, annullo" -#: cmd_merging.cc:542 cmd_merging.cc:544 +#: cmd_merging.cc:543 cmd_merging.cc:545 #, c-format msgid "%s is already an ancestor of %s" msgstr "%s è già antenato di %s" -#: cmd_merging.cc:569 +#: cmd_merging.cc:570 msgid "REV REV" msgstr "REV REV" -#: cmd_merging.cc:570 +#: cmd_merging.cc:571 msgid "" "Show what conflicts would need to be resolved to merge the given revisions." msgstr "" "Mostra quali conflitti andrebbero risolto per fare il ‘merge’ di due " "revisioni specificate." -#: cmd_merging.cc:580 cmd_merging.cc:582 +#: cmd_merging.cc:581 cmd_merging.cc:583 #, c-format msgid "%s is an ancestor of %s; no merge is needed." msgstr "‘%s’ è un antenato di ‘%s’: il merge non è necessario." -#: cmd_merging.cc:596 +#: cmd_merging.cc:597 #, c-format msgid "There are %s node_name_conflicts." msgstr "Ci sono %s conflitti di tipo node_name_conflicts." -#: cmd_merging.cc:598 +#: cmd_merging.cc:599 #, c-format msgid "There are %s file_content_conflicts." msgstr "Ci sono %s conflitti di tipo file_content_conflicts." -#: cmd_merging.cc:600 +#: cmd_merging.cc:601 #, c-format msgid "There are %s node_attr_conflicts." msgstr "Ci sono %s conflitti di tipo node_attr_conflicts." -#: cmd_merging.cc:602 +#: cmd_merging.cc:603 #, c-format msgid "There are %s orphaned_node_conflicts." msgstr "Ci sono %s conflitti di tipo orphaned_node_conflicts." -#: cmd_merging.cc:604 +#: cmd_merging.cc:605 #, c-format msgid "There are %s rename_target_conflicts." msgstr "Ci sono %s conflitti di tipo rename_target_conflicts." -#: cmd_merging.cc:606 +#: cmd_merging.cc:607 #, c-format msgid "There are %s directory_loop_conflicts." msgstr "Ci sono %s conflitti di tipo directory_loop_conflicts." #: cmd_merging.cc:611 +msgid "[-r FROM] -r TO [PATH...]" +msgstr "" + +#: cmd_merging.cc:612 msgid "" -"cherrypick changes from other parts of history into workspace.\n" -"This command takes arbitrary changes made at any point in history,\n" -"and applies them to your current workspace, as if you had made the\n" -"edits by hand.\n" +"Apply changes made at arbitrary places in history to current workspace.\n" +"This command takes changes made at any point in history, and\n" +"edits your current workspace to include those changes. The end result\n" +"is identical to 'mtn diff -r FROM -r TO | patch -p0', except that\n" +"this command uses monotone's merger, and thus intelligently handles\n" +"renames, conflicts, and so on.\n" +"\n" "If one revision is given, applies the changes made in that revision\n" "compared to its parent.\n" +"\n" "If two revisions are given, applies the changes made to get from the\n" "first revision to the second." msgstr "" -#: cmd_merging.cc:632 +#: cmd_merging.cc:637 #, c-format msgid "" "revision %s is a merge\n" "to apply the changes relative to one of its parents, use:\n" -" %s cherrypatch -r PARENT -r %s" +" %s pluck -r PARENT -r %s" msgstr "" -#: cmd_merging.cc:649 +#: cmd_merging.cc:658 #, fuzzy, c-format msgid "no changes to apply" msgstr "nessuna modifica da salvare" -#: cmd_merging.cc:740 +#: cmd_merging.cc:770 #, fuzzy, c-format msgid "applied changes to workspace" msgstr "aggiunge file allo spazio di lavoro" -#: cmd_merging.cc:747 +#: cmd_merging.cc:794 msgid "show unmerged head revisions of branch" msgstr "mostra le revisioni delle teste separate di un ramo" -#: cmd_merging.cc:762 +#: cmd_merging.cc:809 #, c-format msgid "branch '%s' is currently merged:" msgstr "il ramo ‘%s’ è attualmente unito:" -#: cmd_merging.cc:764 +#: cmd_merging.cc:811 #, c-format msgid "branch '%s' is currently unmerged:" msgstr "il ramo ‘%s’ è attualmente separato:" -#: cmd_merging.cc:771 +#: cmd_merging.cc:818 msgid "REVID" msgstr "ID_REV" -#: cmd_merging.cc:772 +#: cmd_merging.cc:819 msgid "dump the roster associated with the given REVID" msgstr "stampa il roster associato al REVID dato" @@ -1457,31 +1484,31 @@ msgid "display command help" msgstr "mostra l'aiuto sui comandi" -#: commands.cc:377 +#: commands.cc:381 #, c-format msgid "expanding selection '%s'" msgstr "espando la selezione ‘%s’" -#: commands.cc:385 +#: commands.cc:389 #, c-format msgid "no match for selection '%s'" msgstr "nessuna corrispondenza per la selezione ‘%s’" -#: commands.cc:391 +#: commands.cc:395 #, c-format msgid "expanded to '%s'" msgstr "espanso in ‘%s’" -#: commands.cc:408 +#: commands.cc:412 #, c-format msgid "selection '%s' has multiple ambiguous expansions: \n" msgstr "la selezione ‘%s’ ha espansioni multiple ambigue: \n" -#: commands.cc:425 +#: commands.cc:429 msgid "note: " msgstr "nota: " -#: commands.cc:426 +#: commands.cc:430 #, c-format msgid "" "branch '%s' has multiple heads\n" @@ -1490,7 +1517,7 @@ "il ramo ‘%s’ ha più teste\n" "valuta l'uso di ‘%s merge’" -#: commands.cc:444 +#: commands.cc:448 #, c-format msgid "--message and --message-file are mutually exclusive" msgstr "--message e --message-file sono mutuamente esclusivi" @@ -2433,21 +2460,21 @@ msgid "weird error when stuffing arguments read from %s: %s\n" msgstr "" -#: monotone.cc:330 +#: monotone.cc:329 msgid "[OPTION...] command [ARGS...]\n" msgstr "[OPZIONE…] comando [ARGOMENTI…]\n" -#: monotone.cc:593 +#: monotone.cc:594 #, c-format msgid "syntax error near the \"%s\" option: %s" msgstr "errore di sintassi vicino all'opzione ‘%s’: %s" -#: monotone.cc:629 +#: monotone.cc:630 #, fuzzy, c-format msgid "%s %s doesn't use the option %s" msgstr "monotone ‘%s’ non utilizza l'opzione ‘%s’" -#: monotone.cc:663 +#: monotone.cc:664 #, c-format msgid "Options specific to '%s %s':" msgstr "Opzioni specifiche per ‘%s %s’:" @@ -3487,9 +3514,12 @@ msgstr "i contenuti del file ‘%s’ sono cambiati, non lo sovrascrivo" #: work.cc:1041 -#, c-format -msgid "updating %s" -msgstr "aggiornamento di ‘%s’ in corso" +#, fuzzy, c-format +msgid "modifying %s" +msgstr "aggiungo ‘%s’" +#~ msgid "updating %s" +#~ msgstr "aggiornamento di ‘%s’ in corso" + #~ msgid "unknown command '%s'\n" #~ msgstr "comando ‘%s’ sconosciuto\n" ============================================================ --- po/ja.po 5b2a2f79c1265b794a1ba553c279e1f687a2c443 +++ po/ja.po 0a68d3ac08007a2eddf9b7aed9334f247358e719 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: monotone HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-05 22:56-0700\n" +"POT-Creation-Date: 2006-07-10 15:00-0700\n" "PO-Revision-Date: 2006-04-06 22:47+0900\n" "Last-Translator: Satoru SATOH \n" "Language-Team: Japanese \n" @@ -16,57 +16,57 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: app_state.cc:139 +#: app_state.cc:140 #, c-format msgid "workspace required but not found%s%s" msgstr "ワークスペースが必要ですがみつかりませんでした%s%s" -#: app_state.cc:147 +#: app_state.cc:148 #, c-format msgid "invalid directory ''" msgstr "無効なディレクトリ ''" -#: app_state.cc:155 +#: app_state.cc:156 #, fuzzy, c-format msgid "monotone bookkeeping directory '%s' already exists in '%s'" msgstr "monotone 記録簿用ディレクトリ '%s' は既に '%s' 内に存在しています\n" -#: app_state.cc:236 +#: app_state.cc:237 #, c-format msgid "search root '%s' does not exist" msgstr "検索ルート '%s' は存在しません" -#: app_state.cc:237 +#: app_state.cc:238 #, c-format msgid "search root '%s' is not a directory\n" msgstr "検索ルート '%s' はディレクトリではありません\n" -#: app_state.cc:271 +#: app_state.cc:272 #, c-format msgid "failed to parse date string '%s': %s" msgstr "データ文字列 '%s' の解析に失敗: %s" -#: app_state.cc:286 +#: app_state.cc:287 #, c-format msgid "negative depth not allowed\n" msgstr "深さの値を負にすることはできません\n" -#: app_state.cc:294 +#: app_state.cc:295 #, c-format msgid "illegal argument to --last: cannot be zero or negative\n" msgstr "" -#: app_state.cc:302 +#: app_state.cc:303 #, c-format msgid "illegal argument to --next: cannot be zero or negative\n" msgstr "" -#: app_state.cc:438 +#: app_state.cc:439 #, c-format msgid "Failed to read options file %s" msgstr "オプションファイル '%s' の解析に失敗" -#: app_state.cc:455 +#: app_state.cc:456 #, c-format msgid "Failed to write options file %s" msgstr "オプションファイル '%s' の書き込みに失敗" @@ -159,9 +159,9 @@ msgid "automation interface" msgstr "自動化インターフェース" -#: cmd_db.cc:35 cmd_diff_log.cc:404 cmd_diff_log.cc:435 cmd_diff_log.cc:437 -#: cmd_files.cc:102 cmd_files.cc:164 cmd_merging.cc:123 cmd_ws_commit.cc:446 -#: commands.cc:370 +#: cmd_db.cc:35 cmd_diff_log.cc:379 cmd_diff_log.cc:410 cmd_diff_log.cc:412 +#: cmd_files.cc:134 cmd_files.cc:196 cmd_merging.cc:124 cmd_merging.cc:633 +#: cmd_merging.cc:648 cmd_merging.cc:651 cmd_ws_commit.cc:446 commands.cc:374 #, c-format msgid "no such revision '%s'" msgstr "リビジョン '%s' は存在しません" @@ -241,8 +241,8 @@ msgid "no var with name %s in domain %s" msgstr "%s という変数はドメイン %s 内にはありません" -#: cmd_db.cc:152 cmd_diff_log.cc:348 cmd_diff_log.cc:558 cmd_files.cc:78 -#: cmd_files.cc:145 cmd_list.cc:437 cmd_merging.cc:569 cmd_ws_commit.cc:322 +#: cmd_db.cc:152 cmd_diff_log.cc:323 cmd_diff_log.cc:533 cmd_files.cc:110 +#: cmd_files.cc:177 cmd_list.cc:437 cmd_merging.cc:570 cmd_ws_commit.cc:322 #: commands.cc:246 msgid "informative" msgstr "情報" @@ -260,12 +260,12 @@ msgid "non-hex digits in partial id" msgstr "部分 ID に十六進数が含まれていません" -#: cmd_diff_log.cc:348 cmd_ws_commit.cc:53 cmd_ws_commit.cc:224 +#: cmd_diff_log.cc:323 cmd_ws_commit.cc:53 cmd_ws_commit.cc:224 #: cmd_ws_commit.cc:251 cmd_ws_commit.cc:322 cmd_ws_commit.cc:613 msgid "[PATH]..." msgstr "[PATH]..." -#: cmd_diff_log.cc:349 +#: cmd_diff_log.cc:324 #, fuzzy msgid "" "show current diffs on stdout.\n" @@ -279,7 +279,7 @@ "差分を、二つ指定されていればそれらリビジョン間の差分を表示します。\n" "形式が指定されていなければ、デフォルトでは unified 形式を使用します。" -#: cmd_diff_log.cc:365 +#: cmd_diff_log.cc:340 #, c-format msgid "" "--diff-args requires --external\n" @@ -288,15 +288,15 @@ "--diff-args は --external を必要とします。\n" "--external を追加するか、--diff-args を省いてみてはどうですか?" -#: cmd_diff_log.cc:494 +#: cmd_diff_log.cc:469 msgid "no changes" msgstr "変更なし" -#: cmd_diff_log.cc:558 +#: cmd_diff_log.cc:533 msgid "[FILE] ..." msgstr "[FILE] ..." -#: cmd_diff_log.cc:559 +#: cmd_diff_log.cc:534 #, fuzzy msgid "" "print history in reverse order (filtering by 'FILE'). If one or more " @@ -305,13 +305,13 @@ "降順で履歴を表示 ('FILE' でフィルタ)。一つ以上のリビジョンが指定されて\n" "いればそれを開始点として利用。" -#: cmd_diff_log.cc:621 +#: cmd_diff_log.cc:596 #, c-format msgid "only one of --last/--next allowed" msgstr "--last/--next のどちらかのみが許されています" -#: cmd_files.cc:28 cmd_files.cc:41 cmd_files.cc:121 cmd_merging.cc:771 -#: cmd_othervcs.cc:15 +#: cmd_files.cc:28 cmd_files.cc:41 cmd_files.cc:78 cmd_files.cc:153 +#: cmd_merging.cc:818 cmd_othervcs.cc:15 msgid "debug" msgstr "デバッグ" @@ -348,45 +348,64 @@ msgstr "統合失敗" #: cmd_files.cc:78 +msgid "SRCNAME DESTNAME SRCID DESTID" +msgstr "" + +#: cmd_files.cc:79 +#, fuzzy +msgid "diff 2 files and output result" +msgstr "三つのファイルを統合し結果を出力" + +#: cmd_files.cc:96 +#, fuzzy, c-format +msgid "source file id does not exist" +msgstr "祖先のファイル ID は存在しません" + +#: cmd_files.cc:99 +#, fuzzy, c-format +msgid "destination file id does not exist" +msgstr "祖先のファイル ID は存在しません" + +#: cmd_files.cc:110 msgid "PATH" msgstr "PATH" -#: cmd_files.cc:79 +#: cmd_files.cc:111 msgid "print annotated copy of the file from REVISION" msgstr "REVISION の注釈付きのファイルのコピーを表示" -#: cmd_files.cc:100 +#: cmd_files.cc:132 #, c-format msgid "no revision for file '%s' in database" msgstr "ファイル '%s' に対するリビジョンはデータベース内にみつかりませんでした" -#: cmd_files.cc:111 +#: cmd_files.cc:143 #, fuzzy, c-format msgid "no such file '%s' in revision '%s'" msgstr "ファイル '%s' はリビジョン '%s' にはありませんでした\n" -#: cmd_files.cc:114 +#: cmd_files.cc:146 #, fuzzy, c-format msgid "'%s' in revision '%s' is not a file" msgstr "ワークスペース内の '%s' はファイルではなくディレクトリです" -#: cmd_files.cc:121 +#: cmd_files.cc:153 msgid "[PATH]" msgstr "[PATH]" -#: cmd_files.cc:122 +#: cmd_files.cc:154 msgid "calculate identity of PATH or stdin" msgstr "PATH または標準入力を識別" -#: cmd_files.cc:146 +#: cmd_files.cc:178 msgid "FILENAME" msgstr "FILENAME" -#: cmd_files.cc:147 +#: cmd_files.cc:179 msgid "write file from database to stdout" msgstr "データベースのファイルを標準出力に書き出し" -#: cmd_files.cc:176 cmd_files.cc:178 +#: cmd_files.cc:208 cmd_files.cc:210 #, fuzzy, c-format msgid "no file '%s' found in revision '%s'" msgstr "ファイル '%s' はリビジョン '%s' にはありませんでした\n" @@ -671,13 +690,13 @@ msgid "No such revision %s" msgstr "リビジョン '%s' は存在しません" -#: cmd_merging.cc:53 cmd_merging.cc:610 cmd_ws_commit.cc:53 +#: cmd_merging.cc:54 cmd_merging.cc:611 cmd_ws_commit.cc:53 #: cmd_ws_commit.cc:224 cmd_ws_commit.cc:251 cmd_ws_commit.cc:278 #: cmd_ws_commit.cc:303 cmd_ws_commit.cc:515 cmd_ws_commit.cc:613 msgid "workspace" msgstr "ワークスペース" -#: cmd_merging.cc:54 +#: cmd_merging.cc:55 msgid "" "update workspace.\n" "This command modifies your workspace to be based off of a\n" @@ -690,17 +709,17 @@ "コミットされていない変更はそのままにされます。リビジョンを指定して\n" "いればそのリビジョンに、未指定なら最新版 (HEAD) に更新します。" -#: cmd_merging.cc:97 +#: cmd_merging.cc:98 #, c-format msgid "this workspace is a new project; cannot update" msgstr "このワークスペースは新規のプロジェクトです; 更新できません。" -#: cmd_merging.cc:101 +#: cmd_merging.cc:102 #, fuzzy, c-format msgid "updating along branch '%s'" msgstr "ブランチ '%s' に沿って更新しています..." -#: cmd_merging.cc:105 +#: cmd_merging.cc:106 #, c-format msgid "" "your request matches no descendents of the current revision\n" @@ -711,37 +730,37 @@ "もしかしたら --revision=<他のブランチのリビジョン> としたいのでは\n" "ありませんか?" -#: cmd_merging.cc:110 +#: cmd_merging.cc:111 #, c-format msgid "multiple update candidates:" msgstr "複数の更新候補:" -#: cmd_merging.cc:114 +#: cmd_merging.cc:115 #, c-format msgid "choose one with '%s update -r'" msgstr "'%s update -r' として一つ選択" -#: cmd_merging.cc:115 +#: cmd_merging.cc:116 #, c-format msgid "multiple update candidates remain after selection" msgstr "選択後も複数の候補が残っています" -#: cmd_merging.cc:130 +#: cmd_merging.cc:131 #, fuzzy, c-format msgid "already up to date at %s" msgstr "%s は既に最新です\n" -#: cmd_merging.cc:138 +#: cmd_merging.cc:139 #, fuzzy, c-format msgid "selected update target %s" msgstr "選択された更新ターゲット %s\n" -#: cmd_merging.cc:162 +#: cmd_merging.cc:163 #, fuzzy, c-format msgid "target revision is not in current branch" msgstr "現在のリビジョンには祖先がありません" -#: cmd_merging.cc:170 +#: cmd_merging.cc:171 #, fuzzy, c-format msgid "" "target revision is in multiple branches:%s\n" @@ -753,242 +772,250 @@ "\n" "明示的に --branch を指定して再試行して下さい。" -#: cmd_merging.cc:178 +#: cmd_merging.cc:179 #, fuzzy, c-format msgid "switching to branch %s" msgstr "ブランチ '%s' についてコミット開始\n" -#: cmd_merging.cc:183 +#: cmd_merging.cc:184 #, c-format msgid "" "target revision not in any branch\n" "next commit will use branch %s" msgstr "" -#: cmd_merging.cc:288 +#: cmd_merging.cc:289 #, c-format msgid "switched branch; next commit will use branch %s" msgstr "" -#: cmd_merging.cc:289 +#: cmd_merging.cc:290 #, fuzzy, c-format msgid "updated to base revision %s" msgstr "基準リビジョン %s に更新\n" -#: cmd_merging.cc:299 cmd_merging.cc:352 cmd_merging.cc:363 cmd_merging.cc:523 -#: cmd_merging.cc:747 cmd_ws_commit.cc:385 cmd_ws_commit.cc:851 +#: cmd_merging.cc:300 cmd_merging.cc:353 cmd_merging.cc:364 cmd_merging.cc:524 +#: cmd_merging.cc:794 cmd_ws_commit.cc:385 cmd_ws_commit.cc:851 #: cmd_ws_commit.cc:872 msgid "tree" msgstr "ツリー" -#: cmd_merging.cc:299 +#: cmd_merging.cc:300 msgid "merge unmerged heads of branch" msgstr "統合されていないブランチの複数の最新版を統合" -#: cmd_merging.cc:308 cmd_merging.cc:755 +#: cmd_merging.cc:309 cmd_merging.cc:802 #, c-format msgid "please specify a branch, with --branch=BRANCH" msgstr "--branch=BRANCH というようにブランチを指定して下さい" -#: cmd_merging.cc:312 cmd_merging.cc:402 cmd_merging.cc:405 cmd_merging.cc:760 +#: cmd_merging.cc:313 cmd_merging.cc:403 cmd_merging.cc:406 cmd_merging.cc:807 #: cmd_ws_commit.cc:430 #, c-format msgid "branch '%s' is empty" msgstr "ブランチ '%s' は空です" -#: cmd_merging.cc:315 +#: cmd_merging.cc:316 #, fuzzy, c-format msgid "branch '%s' is already merged" msgstr "ブランチ '%s' は既に統合済みです\n" -#: cmd_merging.cc:323 +#: cmd_merging.cc:324 #, fuzzy, c-format msgid "starting with revision 1 / %d" msgstr "リビジョン 1 / %d について作業開始\n" -#: cmd_merging.cc:327 +#: cmd_merging.cc:328 #, fuzzy, c-format msgid "merging with revision %d / %d" msgstr "リビジョン %d / %d について統合中\n" -#: cmd_merging.cc:328 cmd_merging.cc:329 cmd_merging.cc:412 cmd_merging.cc:547 -#: cmd_merging.cc:548 +#: cmd_merging.cc:329 cmd_merging.cc:330 cmd_merging.cc:413 cmd_merging.cc:548 +#: cmd_merging.cc:549 #, fuzzy, c-format msgid "[source] %s" msgstr "[元] %s\n" -#: cmd_merging.cc:346 cmd_merging.cc:519 cmd_merging.cc:566 +#: cmd_merging.cc:347 cmd_merging.cc:520 cmd_merging.cc:567 #, fuzzy, c-format msgid "[merged] %s" msgstr "[統合済み] %s\n" -#: cmd_merging.cc:349 +#: cmd_merging.cc:350 #, fuzzy, c-format msgid "note: your workspaces have not been updated" msgstr "注意: ワークスペースは更新されていません\n" -#: cmd_merging.cc:352 +#: cmd_merging.cc:353 msgid "SOURCE-BRANCH DEST-BRANCH" msgstr "SOURCE-BRANCH DEST-BRANCH" -#: cmd_merging.cc:353 +#: cmd_merging.cc:354 msgid "merge from one branch to another asymmetrically" msgstr "一方のブランチを他方に非同期に統合" -#: cmd_merging.cc:363 +#: cmd_merging.cc:364 msgid "SOURCE-BRANCH DEST-BRANCH DIR" msgstr "SOURCE-BRANCH DEST-BRANCH DIR" -#: cmd_merging.cc:364 +#: cmd_merging.cc:365 msgid "merge one branch into a subdirectory in another branch" msgstr "ブランチを他のブランチのサブディレクトリに統合" -#: cmd_merging.cc:403 cmd_merging.cc:406 +#: cmd_merging.cc:404 cmd_merging.cc:407 #, fuzzy, c-format msgid "branch '%s' is not merged" msgstr "ブランチ '%s' は統合されていません\n" -#: cmd_merging.cc:411 +#: cmd_merging.cc:412 #, fuzzy, c-format msgid "propagating %s -> %s" msgstr "伝播中 %s -> %s\n" -#: cmd_merging.cc:413 +#: cmd_merging.cc:414 #, fuzzy, c-format msgid "[target] %s" msgstr "[先] %s\n" -#: cmd_merging.cc:418 +#: cmd_merging.cc:419 #, fuzzy, c-format msgid "branch '%s' is up-to-date with respect to branch '%s'" msgstr "ブランチ '%s' はブランチ '%s' に対して最新です\n" -#: cmd_merging.cc:420 +#: cmd_merging.cc:421 #, fuzzy, c-format msgid "no action taken" msgstr "何もしません\n" -#: cmd_merging.cc:424 +#: cmd_merging.cc:425 #, fuzzy, c-format msgid "no merge necessary; putting %s in branch '%s'" msgstr "統合は必要ありません. %s をブランチ '%s' 内に取り込み中\n" -#: cmd_merging.cc:462 +#: cmd_merging.cc:463 #, c-format msgid "Path %s not found in destination tree." msgstr "パス %s は先のツリー内にみつかりません" -#: cmd_merging.cc:524 +#: cmd_merging.cc:525 msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH" msgstr "LEFT-REVISION RIGHT-REVISION DEST-BRANCH" -#: cmd_merging.cc:525 +#: cmd_merging.cc:526 msgid "merge two explicitly given revisions, placing result in given branch" msgstr "明示的に指定した二つのリビジョンを統合。結果は指定ブランチへ。" -#: cmd_merging.cc:540 +#: cmd_merging.cc:541 #, c-format msgid "%s and %s are the same revision, aborting" msgstr "%s と %s は同じリビジョンです. 中止します" -#: cmd_merging.cc:542 cmd_merging.cc:544 +#: cmd_merging.cc:543 cmd_merging.cc:545 #, c-format msgid "%s is already an ancestor of %s" msgstr "%s は既に %s の祖先となっています" -#: cmd_merging.cc:569 +#: cmd_merging.cc:570 msgid "REV REV" msgstr "REV REV" -#: cmd_merging.cc:570 +#: cmd_merging.cc:571 msgid "" "Show what conflicts would need to be resolved to merge the given revisions." msgstr "指定のリビジョンを統合するのに解決が必要な衝突を表示" -#: cmd_merging.cc:580 cmd_merging.cc:582 +#: cmd_merging.cc:581 cmd_merging.cc:583 #, fuzzy, c-format msgid "%s is an ancestor of %s; no merge is needed." msgstr "%s は %s の祖先; 統合は必要ありません" -#: cmd_merging.cc:596 +#: cmd_merging.cc:597 #, c-format msgid "There are %s node_name_conflicts." msgstr "%s node_name_conflicts があります" -#: cmd_merging.cc:598 +#: cmd_merging.cc:599 #, c-format msgid "There are %s file_content_conflicts." msgstr "%s file_content_conflicts があります" -#: cmd_merging.cc:600 +#: cmd_merging.cc:601 #, c-format msgid "There are %s node_attr_conflicts." msgstr "%s node_attr_conflicts があります" -#: cmd_merging.cc:602 +#: cmd_merging.cc:603 #, c-format msgid "There are %s orphaned_node_conflicts." msgstr "%s orphaned_node_conflicts があります" -#: cmd_merging.cc:604 +#: cmd_merging.cc:605 #, c-format msgid "There are %s rename_target_conflicts." msgstr "%s rename_target_conflicts があります" -#: cmd_merging.cc:606 +#: cmd_merging.cc:607 #, c-format msgid "There are %s directory_loop_conflicts." msgstr "%s directory_loop_conflicts があります" #: cmd_merging.cc:611 +msgid "[-r FROM] -r TO [PATH...]" +msgstr "" + +#: cmd_merging.cc:612 msgid "" -"cherrypick changes from other parts of history into workspace.\n" -"This command takes arbitrary changes made at any point in history,\n" -"and applies them to your current workspace, as if you had made the\n" -"edits by hand.\n" +"Apply changes made at arbitrary places in history to current workspace.\n" +"This command takes changes made at any point in history, and\n" +"edits your current workspace to include those changes. The end result\n" +"is identical to 'mtn diff -r FROM -r TO | patch -p0', except that\n" +"this command uses monotone's merger, and thus intelligently handles\n" +"renames, conflicts, and so on.\n" +"\n" "If one revision is given, applies the changes made in that revision\n" "compared to its parent.\n" +"\n" "If two revisions are given, applies the changes made to get from the\n" "first revision to the second." msgstr "" -#: cmd_merging.cc:632 +#: cmd_merging.cc:637 #, c-format msgid "" "revision %s is a merge\n" "to apply the changes relative to one of its parents, use:\n" -" %s cherrypatch -r PARENT -r %s" +" %s pluck -r PARENT -r %s" msgstr "" -#: cmd_merging.cc:649 +#: cmd_merging.cc:658 #, fuzzy, c-format msgid "no changes to apply" msgstr "コミットする変更がありません\n" -#: cmd_merging.cc:740 +#: cmd_merging.cc:770 #, fuzzy, c-format msgid "applied changes to workspace" msgstr "ファイルをワークスペースに追加" -#: cmd_merging.cc:747 +#: cmd_merging.cc:794 msgid "show unmerged head revisions of branch" msgstr "ブランチの統合されていない最新リビジョンを表示" -#: cmd_merging.cc:762 +#: cmd_merging.cc:809 #, fuzzy, c-format msgid "branch '%s' is currently merged:" msgstr "ブランチ '%s' は現在統合済みです:\n" -#: cmd_merging.cc:764 +#: cmd_merging.cc:811 #, fuzzy, c-format msgid "branch '%s' is currently unmerged:" msgstr "ブランチ '%s' は現在未統合です:\n" -#: cmd_merging.cc:771 +#: cmd_merging.cc:818 msgid "REVID" msgstr "REVID" -#: cmd_merging.cc:772 +#: cmd_merging.cc:819 msgid "dump the roster associated with the given REVID" msgstr "指定の REVID について関連づけられた名簿をダンプ" @@ -1435,31 +1462,31 @@ msgid "display command help" msgstr "コマンドヘルプを表示" -#: commands.cc:377 +#: commands.cc:381 #, fuzzy, c-format msgid "expanding selection '%s'" msgstr "セレクション '%s' を展開\n" -#: commands.cc:385 +#: commands.cc:389 #, c-format msgid "no match for selection '%s'" msgstr "セレクション '%s' に一致するものがありません" -#: commands.cc:391 +#: commands.cc:395 #, fuzzy, c-format msgid "expanded to '%s'" msgstr "'%s' に展開\n" -#: commands.cc:408 +#: commands.cc:412 #, c-format msgid "selection '%s' has multiple ambiguous expansions: \n" msgstr "'%s' だけでは曖昧で、展開できるセレクションの候補は複数あります: \n" -#: commands.cc:425 +#: commands.cc:429 msgid "note: " msgstr "ノート: " -#: commands.cc:426 +#: commands.cc:430 #, c-format msgid "" "branch '%s' has multiple heads\n" @@ -1468,7 +1495,7 @@ "ブランチ '%s' には複数の最新版 (HEAD) があります\n" "’%s merge' を実行した方がよいでしょう" -#: commands.cc:444 +#: commands.cc:448 #, c-format msgid "--message and --message-file are mutually exclusive" msgstr "--message と --message-file を同時に指定することはできません" @@ -2413,21 +2440,21 @@ msgid "weird error when stuffing arguments read from %s: %s\n" msgstr "%s から引数を読み取り中に予期せぬエラー発生: %s\n" -#: monotone.cc:330 +#: monotone.cc:329 msgid "[OPTION...] command [ARGS...]\n" msgstr "[OPTION...] command [ARGS...]\n" -#: monotone.cc:593 +#: monotone.cc:594 #, c-format msgid "syntax error near the \"%s\" option: %s" msgstr "\"%s\" オプションの近くに構文エラー: %s" -#: monotone.cc:629 +#: monotone.cc:630 #, fuzzy, c-format msgid "%s %s doesn't use the option %s" msgstr "monotone %s にはオプション %s は使えません" -#: monotone.cc:663 +#: monotone.cc:664 #, c-format msgid "Options specific to '%s %s':" msgstr "'%s %s' に特化したオプション:" @@ -3476,10 +3503,13 @@ msgstr "ファイル '%s' の内容は変更されているので上書きしません" #: work.cc:1041 -#, c-format -msgid "updating %s" -msgstr "%s を更新しています" +#, fuzzy, c-format +msgid "modifying %s" +msgstr "%s を追加しています" +#~ msgid "updating %s" +#~ msgstr "%s を更新しています" + #~ msgid "unknown path '%s'\n" #~ msgstr "不明なパス '%s'\n" ============================================================ --- po/pt_BR.po 5b4a07260e872253065c6f12b452b982b6985508 +++ po/pt_BR.po 49b8754c262e335905ff8d03f6da3be64d89a5c6 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Monotone 0.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-05 22:56-0700\n" +"POT-Creation-Date: 2006-07-10 15:00-0700\n" "PO-Revision-Date: 2006-07-06 17:56-0300\n" "Last-Translator: Alex Sandro Queiroz e Silva \n" "Language-Team: Alex Sandro Queiroz e Silva \n" @@ -16,57 +16,57 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: app_state.cc:139 +#: app_state.cc:140 #, c-format msgid "workspace required but not found%s%s" msgstr "área de trabalho necessária mas não encontrada%s%s" -#: app_state.cc:147 +#: app_state.cc:148 #, c-format msgid "invalid directory ''" msgstr "diretório inválido ''" -#: app_state.cc:155 +#: app_state.cc:156 #, c-format msgid "monotone bookkeeping directory '%s' already exists in '%s'" msgstr "diretório '%s' de manutenção do monotone já existe em '%s'" -#: app_state.cc:236 +#: app_state.cc:237 #, c-format msgid "search root '%s' does not exist" msgstr "raiz de procura '%s' não existe" -#: app_state.cc:237 +#: app_state.cc:238 #, c-format msgid "search root '%s' is not a directory\n" msgstr "raiz de procura '%s' não é um diretório\n" -#: app_state.cc:271 +#: app_state.cc:272 #, c-format msgid "failed to parse date string '%s': %s" msgstr "erro lendo string de data '%s': %s" -#: app_state.cc:286 +#: app_state.cc:287 #, c-format msgid "negative depth not allowed\n" msgstr "profundidade negativa não permitida\n" -#: app_state.cc:294 +#: app_state.cc:295 #, c-format msgid "illegal argument to --last: cannot be zero or negative\n" msgstr "argumento ilegal para --last: não pode ser zero ou negativo\n" -#: app_state.cc:302 +#: app_state.cc:303 #, c-format msgid "illegal argument to --next: cannot be zero or negative\n" msgstr "argumento ilegal para --next: não pode ser zero ou negativo\n" -#: app_state.cc:438 +#: app_state.cc:439 #, c-format msgid "Failed to read options file %s" msgstr "Impossível ler arquivo de opções %s" -#: app_state.cc:455 +#: app_state.cc:456 #, c-format msgid "Failed to write options file %s" msgstr "Impossível escrever arquivo de opções %s" @@ -169,9 +169,9 @@ msgid "automation interface" msgstr "interface de automação" -#: cmd_db.cc:35 cmd_diff_log.cc:404 cmd_diff_log.cc:435 cmd_diff_log.cc:437 -#: cmd_files.cc:102 cmd_files.cc:164 cmd_merging.cc:123 cmd_ws_commit.cc:446 -#: commands.cc:370 +#: cmd_db.cc:35 cmd_diff_log.cc:379 cmd_diff_log.cc:410 cmd_diff_log.cc:412 +#: cmd_files.cc:134 cmd_files.cc:196 cmd_merging.cc:124 cmd_merging.cc:633 +#: cmd_merging.cc:648 cmd_merging.cc:651 cmd_ws_commit.cc:446 commands.cc:374 #, c-format msgid "no such revision '%s'" msgstr "versão '%s' não existe" @@ -252,8 +252,8 @@ msgid "no var with name %s in domain %s" msgstr "nenhuma variável com nome %s no domínio %s" -#: cmd_db.cc:152 cmd_diff_log.cc:348 cmd_diff_log.cc:558 cmd_files.cc:78 -#: cmd_files.cc:145 cmd_list.cc:437 cmd_merging.cc:569 cmd_ws_commit.cc:322 +#: cmd_db.cc:152 cmd_diff_log.cc:323 cmd_diff_log.cc:533 cmd_files.cc:110 +#: cmd_files.cc:177 cmd_list.cc:437 cmd_merging.cc:570 cmd_ws_commit.cc:322 #: commands.cc:246 msgid "informative" msgstr "informativo" @@ -271,12 +271,12 @@ msgid "non-hex digits in partial id" msgstr "dígitos não-hexadecimais no id parcial" -#: cmd_diff_log.cc:348 cmd_ws_commit.cc:53 cmd_ws_commit.cc:224 +#: cmd_diff_log.cc:323 cmd_ws_commit.cc:53 cmd_ws_commit.cc:224 #: cmd_ws_commit.cc:251 cmd_ws_commit.cc:322 cmd_ws_commit.cc:613 msgid "[PATH]..." msgstr "[CAMINHO]..." -#: cmd_diff_log.cc:349 +#: cmd_diff_log.cc:324 msgid "" "show current diffs on stdout.\n" "If one revision is given, the diff between the workspace and\n" @@ -290,7 +290,7 @@ "elas é exibida. Se nenhum formato for especificado. o unificado é\n" "usado por padrão." -#: cmd_diff_log.cc:365 +#: cmd_diff_log.cc:340 #, c-format msgid "" "--diff-args requires --external\n" @@ -299,15 +299,15 @@ "--diff-args requer --external\n" "adicione --external ou remova --diff-args" -#: cmd_diff_log.cc:494 +#: cmd_diff_log.cc:469 msgid "no changes" msgstr "sem mudanças" -#: cmd_diff_log.cc:558 +#: cmd_diff_log.cc:533 msgid "[FILE] ..." msgstr "[ARQUIVO] ..." -#: cmd_diff_log.cc:559 +#: cmd_diff_log.cc:534 msgid "" "print history in reverse order (filtering by 'FILE'). If one or more " "revisions are given, use them as a starting point." @@ -315,13 +315,13 @@ "imprime histórico em ordem inversa (filtrado por 'ARQUIVO'). Se uma ou mais " "versões forem dadas, usa-as como ponto de partida." -#: cmd_diff_log.cc:621 +#: cmd_diff_log.cc:596 #, c-format msgid "only one of --last/--next allowed" msgstr "apenas ou --last ou --next é permitido" -#: cmd_files.cc:28 cmd_files.cc:41 cmd_files.cc:121 cmd_merging.cc:771 -#: cmd_othervcs.cc:15 +#: cmd_files.cc:28 cmd_files.cc:41 cmd_files.cc:78 cmd_files.cc:153 +#: cmd_merging.cc:818 cmd_othervcs.cc:15 msgid "debug" msgstr "depuração" @@ -358,45 +358,64 @@ msgstr "combinação falhou" #: cmd_files.cc:78 +msgid "SRCNAME DESTNAME SRCID DESTID" +msgstr "" + +#: cmd_files.cc:79 +#, fuzzy +msgid "diff 2 files and output result" +msgstr "combina 3 arquivos e retorna o resultado" + +#: cmd_files.cc:96 +#, fuzzy, c-format +msgid "source file id does not exist" +msgstr "id do arquivo ancestral não existe" + +#: cmd_files.cc:99 +#, fuzzy, c-format +msgid "destination file id does not exist" +msgstr "id do arquivo ancestral não existe" + +#: cmd_files.cc:110 msgid "PATH" msgstr "CAMINHO" -#: cmd_files.cc:79 +#: cmd_files.cc:111 msgid "print annotated copy of the file from REVISION" msgstr "imprime cópia anotada do arquivo da VERSÃO" -#: cmd_files.cc:100 +#: cmd_files.cc:132 #, c-format msgid "no revision for file '%s' in database" msgstr "nenhuma versão '%s' do arquivo em banco de dados" -#: cmd_files.cc:111 +#: cmd_files.cc:143 #, c-format msgid "no such file '%s' in revision '%s'" msgstr "nenhum arquivo '%s' encontrado na versão '%s'" -#: cmd_files.cc:114 +#: cmd_files.cc:146 #, c-format msgid "'%s' in revision '%s' is not a file" msgstr "'%s' na versão '%s' não é um arquivo" -#: cmd_files.cc:121 +#: cmd_files.cc:153 msgid "[PATH]" msgstr "[CAMINHO]" -#: cmd_files.cc:122 +#: cmd_files.cc:154 msgid "calculate identity of PATH or stdin" msgstr "calcula identidade do CAMINHO ou stdin" -#: cmd_files.cc:146 +#: cmd_files.cc:178 msgid "FILENAME" msgstr "ARQUIVO" -#: cmd_files.cc:147 +#: cmd_files.cc:179 msgid "write file from database to stdout" msgstr "escreve arquivo do banco de dados em stdout" -#: cmd_files.cc:176 cmd_files.cc:178 +#: cmd_files.cc:208 cmd_files.cc:210 #, c-format msgid "no file '%s' found in revision '%s'" msgstr "nenhum arquivo '%s' encontrado na versão '%s'" @@ -682,13 +701,13 @@ msgid "No such revision %s" msgstr "versão '%s' não existe" -#: cmd_merging.cc:53 cmd_merging.cc:610 cmd_ws_commit.cc:53 +#: cmd_merging.cc:54 cmd_merging.cc:611 cmd_ws_commit.cc:53 #: cmd_ws_commit.cc:224 cmd_ws_commit.cc:251 cmd_ws_commit.cc:278 #: cmd_ws_commit.cc:303 cmd_ws_commit.cc:515 cmd_ws_commit.cc:613 msgid "workspace" msgstr "área de trabalho" -#: cmd_merging.cc:54 +#: cmd_merging.cc:55 msgid "" "update workspace.\n" "This command modifies your workspace to be based off of a\n" @@ -702,17 +721,17 @@ "Se uma versão for dada atualiza a área de trabalho para essa versão.\n" "Se não, atualiza a área de trabalho para a frente do ramo." -#: cmd_merging.cc:97 +#: cmd_merging.cc:98 #, c-format msgid "this workspace is a new project; cannot update" msgstr "esta área de trabalho é um novo projeto; impossível atualizar" -#: cmd_merging.cc:101 +#: cmd_merging.cc:102 #, c-format msgid "updating along branch '%s'" msgstr "atualizando segundo ramo '%s'" -#: cmd_merging.cc:105 +#: cmd_merging.cc:106 #, c-format msgid "" "your request matches no descendents of the current revision\n" @@ -720,37 +739,37 @@ "maybe you want --revision=" msgstr "" -#: cmd_merging.cc:110 +#: cmd_merging.cc:111 #, c-format msgid "multiple update candidates:" msgstr "múltiplos candidatos para atualização:" -#: cmd_merging.cc:114 +#: cmd_merging.cc:115 #, c-format msgid "choose one with '%s update -r'" msgstr "escolha um com '%s update -r'" -#: cmd_merging.cc:115 +#: cmd_merging.cc:116 #, c-format msgid "multiple update candidates remain after selection" msgstr "ainda há múltiplos candidatos para atualização após seleção" -#: cmd_merging.cc:130 +#: cmd_merging.cc:131 #, c-format msgid "already up to date at %s" msgstr "já atualizado em %s" -#: cmd_merging.cc:138 +#: cmd_merging.cc:139 #, c-format msgid "selected update target %s" msgstr "selecionado alvo %s para atualização" -#: cmd_merging.cc:162 +#: cmd_merging.cc:163 #, c-format msgid "target revision is not in current branch" msgstr "versão alvo não está no ramo atual" -#: cmd_merging.cc:170 +#: cmd_merging.cc:171 #, c-format msgid "" "target revision is in multiple branches:%s\n" @@ -761,245 +780,253 @@ "\n" "tente de novo com --branch" -#: cmd_merging.cc:178 +#: cmd_merging.cc:179 #, c-format msgid "switching to branch %s" msgstr "atualizando segundo ramo %s" -#: cmd_merging.cc:183 +#: cmd_merging.cc:184 #, c-format msgid "" "target revision not in any branch\n" "next commit will use branch %s" msgstr "" -#: cmd_merging.cc:288 +#: cmd_merging.cc:289 #, c-format msgid "switched branch; next commit will use branch %s" msgstr "" -#: cmd_merging.cc:289 +#: cmd_merging.cc:290 #, c-format msgid "updated to base revision %s" msgstr "atualizado para versão-base %s" -#: cmd_merging.cc:299 cmd_merging.cc:352 cmd_merging.cc:363 cmd_merging.cc:523 -#: cmd_merging.cc:747 cmd_ws_commit.cc:385 cmd_ws_commit.cc:851 +#: cmd_merging.cc:300 cmd_merging.cc:353 cmd_merging.cc:364 cmd_merging.cc:524 +#: cmd_merging.cc:794 cmd_ws_commit.cc:385 cmd_ws_commit.cc:851 #: cmd_ws_commit.cc:872 msgid "tree" msgstr "árvore" -#: cmd_merging.cc:299 +#: cmd_merging.cc:300 msgid "merge unmerged heads of branch" msgstr "combina diferentes frentes do ramo" -#: cmd_merging.cc:308 cmd_merging.cc:755 +#: cmd_merging.cc:309 cmd_merging.cc:802 #, c-format msgid "please specify a branch, with --branch=BRANCH" msgstr "por favor especifique um ramo com --branch=RAMO" -#: cmd_merging.cc:312 cmd_merging.cc:402 cmd_merging.cc:405 cmd_merging.cc:760 +#: cmd_merging.cc:313 cmd_merging.cc:403 cmd_merging.cc:406 cmd_merging.cc:807 #: cmd_ws_commit.cc:430 #, c-format msgid "branch '%s' is empty" msgstr "ramo '%s' está vazio" -#: cmd_merging.cc:315 +#: cmd_merging.cc:316 #, c-format msgid "branch '%s' is already merged" msgstr "ramo '%s' já está combinado" -#: cmd_merging.cc:323 +#: cmd_merging.cc:324 #, c-format msgid "starting with revision 1 / %d" msgstr "iniciando com versão 1 / %d" -#: cmd_merging.cc:327 +#: cmd_merging.cc:328 #, c-format msgid "merging with revision %d / %d" msgstr "combinando com versão %d / %d" -#: cmd_merging.cc:328 cmd_merging.cc:329 cmd_merging.cc:412 cmd_merging.cc:547 -#: cmd_merging.cc:548 +#: cmd_merging.cc:329 cmd_merging.cc:330 cmd_merging.cc:413 cmd_merging.cc:548 +#: cmd_merging.cc:549 #, c-format msgid "[source] %s" msgstr "[fonte] %s" -#: cmd_merging.cc:346 cmd_merging.cc:519 cmd_merging.cc:566 +#: cmd_merging.cc:347 cmd_merging.cc:520 cmd_merging.cc:567 #, c-format msgid "[merged] %s" msgstr "[combinado] %s" -#: cmd_merging.cc:349 +#: cmd_merging.cc:350 #, c-format msgid "note: your workspaces have not been updated" msgstr "nota: suas áreas de trabalho não foram atualizadas" -#: cmd_merging.cc:352 +#: cmd_merging.cc:353 msgid "SOURCE-BRANCH DEST-BRANCH" msgstr "RAMO-FONTE RAMO-DESTINO" -#: cmd_merging.cc:353 +#: cmd_merging.cc:354 msgid "merge from one branch to another asymmetrically" msgstr "combina dois ramos de forma assimétrica" -#: cmd_merging.cc:363 +#: cmd_merging.cc:364 msgid "SOURCE-BRANCH DEST-BRANCH DIR" msgstr "RAMO-FONTE RAMO-DESTINO DIRETÓRIO" -#: cmd_merging.cc:364 +#: cmd_merging.cc:365 msgid "merge one branch into a subdirectory in another branch" msgstr "combina um ramo com um sibdiretório de outro ramo" -#: cmd_merging.cc:403 cmd_merging.cc:406 +#: cmd_merging.cc:404 cmd_merging.cc:407 #, c-format msgid "branch '%s' is not merged" msgstr "ramo '%s' não está combinado" -#: cmd_merging.cc:411 +#: cmd_merging.cc:412 #, c-format msgid "propagating %s -> %s" msgstr "propagando %s -> %s" -#: cmd_merging.cc:413 +#: cmd_merging.cc:414 #, c-format msgid "[target] %s" msgstr "[alvo] %s" -#: cmd_merging.cc:418 +#: cmd_merging.cc:419 #, c-format msgid "branch '%s' is up-to-date with respect to branch '%s'" msgstr "ramo '%s' está atualizado em relação ao ramo '%s'" -#: cmd_merging.cc:420 +#: cmd_merging.cc:421 #, c-format msgid "no action taken" msgstr "nenhuma ação tomada" -#: cmd_merging.cc:424 +#: cmd_merging.cc:425 #, c-format msgid "no merge necessary; putting %s in branch '%s'" msgstr "não há necessidade de combinação; colocando %s no ramo '%s'" -#: cmd_merging.cc:462 +#: cmd_merging.cc:463 #, c-format msgid "Path %s not found in destination tree." msgstr "Caminho %s não foi encontrado na árvore de destino." -#: cmd_merging.cc:524 +#: cmd_merging.cc:525 msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH" msgstr "VERSÃO-ESQUERDA VERSÃO-DIREITA RAMO-DESTINO" -#: cmd_merging.cc:525 +#: cmd_merging.cc:526 msgid "merge two explicitly given revisions, placing result in given branch" msgstr "" "combina duas versões dadas explicitamente colocando o resuldado no ramo dado" -#: cmd_merging.cc:540 +#: cmd_merging.cc:541 #, c-format msgid "%s and %s are the same revision, aborting" msgstr "%s e %s são a mesma versão, abortando" -#: cmd_merging.cc:542 cmd_merging.cc:544 +#: cmd_merging.cc:543 cmd_merging.cc:545 #, c-format msgid "%s is already an ancestor of %s" msgstr "%s já é um ancestral de %s" -#: cmd_merging.cc:569 +#: cmd_merging.cc:570 msgid "REV REV" msgstr "VERSÂO VERSÂO" -#: cmd_merging.cc:570 +#: cmd_merging.cc:571 msgid "" "Show what conflicts would need to be resolved to merge the given revisions." msgstr "" "Mostra que conflitos precisariam ser resolvidos para combinar as\n" "duas versões." -#: cmd_merging.cc:580 cmd_merging.cc:582 +#: cmd_merging.cc:581 cmd_merging.cc:583 #, c-format msgid "%s is an ancestor of %s; no merge is needed." msgstr "%s é um ancestral de %s; nenhuma combinação é necessária." -#: cmd_merging.cc:596 +#: cmd_merging.cc:597 #, c-format msgid "There are %s node_name_conflicts." msgstr "Há %s conflitos nos nomes dos nós." -#: cmd_merging.cc:598 +#: cmd_merging.cc:599 #, c-format msgid "There are %s file_content_conflicts." msgstr "Há %s conflitos nos conteúdos dos arquivos." -#: cmd_merging.cc:600 +#: cmd_merging.cc:601 #, c-format msgid "There are %s node_attr_conflicts." msgstr "Há %s conflitos nos atributos dos nós." -#: cmd_merging.cc:602 +#: cmd_merging.cc:603 #, c-format msgid "There are %s orphaned_node_conflicts." msgstr "Há %s conflitos de nós órfãos." -#: cmd_merging.cc:604 +#: cmd_merging.cc:605 #, c-format msgid "There are %s rename_target_conflicts." msgstr "Há %s conflitos de alvos de renomeação." -#: cmd_merging.cc:606 +#: cmd_merging.cc:607 #, c-format msgid "There are %s directory_loop_conflicts." msgstr "Há %s conflitos de laços de diretório." #: cmd_merging.cc:611 +msgid "[-r FROM] -r TO [PATH...]" +msgstr "" + +#: cmd_merging.cc:612 msgid "" -"cherrypick changes from other parts of history into workspace.\n" -"This command takes arbitrary changes made at any point in history,\n" -"and applies them to your current workspace, as if you had made the\n" -"edits by hand.\n" +"Apply changes made at arbitrary places in history to current workspace.\n" +"This command takes changes made at any point in history, and\n" +"edits your current workspace to include those changes. The end result\n" +"is identical to 'mtn diff -r FROM -r TO | patch -p0', except that\n" +"this command uses monotone's merger, and thus intelligently handles\n" +"renames, conflicts, and so on.\n" +"\n" "If one revision is given, applies the changes made in that revision\n" "compared to its parent.\n" +"\n" "If two revisions are given, applies the changes made to get from the\n" "first revision to the second." msgstr "" -#: cmd_merging.cc:632 +#: cmd_merging.cc:637 #, c-format msgid "" "revision %s is a merge\n" "to apply the changes relative to one of its parents, use:\n" -" %s cherrypatch -r PARENT -r %s" +" %s pluck -r PARENT -r %s" msgstr "" -#: cmd_merging.cc:649 +#: cmd_merging.cc:658 #, c-format msgid "no changes to apply" msgstr "nenhuma mudança a aplicar" -#: cmd_merging.cc:740 +#: cmd_merging.cc:770 #, c-format msgid "applied changes to workspace" msgstr "mudanças aplicadas à área de trabalho" -#: cmd_merging.cc:747 +#: cmd_merging.cc:794 msgid "show unmerged head revisions of branch" msgstr "mostra frentes não combinadas do ramo" -#: cmd_merging.cc:762 +#: cmd_merging.cc:809 #, c-format msgid "branch '%s' is currently merged:" msgstr "ramo '%s' está atualmente combinado:" -#: cmd_merging.cc:764 +#: cmd_merging.cc:811 #, c-format msgid "branch '%s' is currently unmerged:" msgstr "ramo '%s' não está combinado atualmente:" -#: cmd_merging.cc:771 +#: cmd_merging.cc:818 msgid "REVID" msgstr "VERSÂO" -#: cmd_merging.cc:772 +#: cmd_merging.cc:819 msgid "dump the roster associated with the given REVID" msgstr "exibe conteúdo do roster associado com VERSÃO" @@ -1452,31 +1479,31 @@ msgid "display command help" msgstr "exibe ajuda de comando" -#: commands.cc:377 +#: commands.cc:381 #, c-format msgid "expanding selection '%s'" msgstr "expandindo seleção '%s'" -#: commands.cc:385 +#: commands.cc:389 #, c-format msgid "no match for selection '%s'" msgstr "sem equivalente para seleção '%s'" -#: commands.cc:391 +#: commands.cc:395 #, c-format msgid "expanded to '%s'" msgstr "expandido para '%s'" -#: commands.cc:408 +#: commands.cc:412 #, c-format msgid "selection '%s' has multiple ambiguous expansions: \n" msgstr "seleção '%s' tem múltiplas expansões possíveis: \n" -#: commands.cc:425 +#: commands.cc:429 msgid "note: " msgstr "nota: " -#: commands.cc:426 +#: commands.cc:430 #, c-format msgid "" "branch '%s' has multiple heads\n" @@ -1485,7 +1512,7 @@ "ramo '%s' tem múltiplas frentes\n" "considere usar '%s merge'" -#: commands.cc:444 +#: commands.cc:448 #, c-format msgid "--message and --message-file are mutually exclusive" msgstr "--message e --message-file são mutuamente exclusivos" @@ -2391,21 +2418,21 @@ msgid "weird error when stuffing arguments read from %s: %s\n" msgstr "" -#: monotone.cc:330 +#: monotone.cc:329 msgid "[OPTION...] command [ARGS...]\n" msgstr "" -#: monotone.cc:593 +#: monotone.cc:594 #, c-format msgid "syntax error near the \"%s\" option: %s" msgstr "" -#: monotone.cc:629 +#: monotone.cc:630 #, c-format msgid "%s %s doesn't use the option %s" msgstr "" -#: monotone.cc:663 +#: monotone.cc:664 #, c-format msgid "Options specific to '%s %s':" msgstr "" @@ -3009,7 +3036,8 @@ #: revision.cc:1010 #, c-format msgid "Directory for path %s cannot be added, as there is a file in the way\n" -msgstr "Diretório com caminho %s não pode ser adicionado, porque há\n" +msgstr "" +"Diretório com caminho %s não pode ser adicionado, porque há\n" "um arquivo no caminho\n" #: revision.cc:1021 @@ -3415,10 +3443,13 @@ msgstr "conteúdo do arquivo '%s' mudou, arquivo não será sobrescrito" #: work.cc:1041 -#, c-format -msgid "updating %s" -msgstr "atualizando %s" +#, fuzzy, c-format +msgid "modifying %s" +msgstr "adicionando %s" +#~ msgid "updating %s" +#~ msgstr "atualizando %s" + #~ msgid "unknown command '%s'\n" #~ msgstr "comando desconhecido '%s'\n"