# # patch "ChangeLog" # from [8194c190b87144820afa7dc7e5e75bb5545ee95a] # to [aa5a009f8107aa66483c9f57ba0202793d6fbf8a] # # patch "commands.cc" # from [78c0c903fd171b1ae353044d67bfb5d671d0dca4] # to [61bc624bf8e91cd02be6ab79ddec09d25be50c07] # ======================================================================== --- ChangeLog 8194c190b87144820afa7dc7e5e75bb5545ee95a +++ ChangeLog aa5a009f8107aa66483c9f57ba0202793d6fbf8a @@ -1,5 +1,9 @@ 2005-08-23 Nathaniel Smith + * commands.cc: N_("") -> "". + +2005-08-23 Nathaniel Smith + * commands.cc: Make all CMD() calls use N_() instead of _(). (commands): Insert _() everywhere usage strings are used. This is icky. ======================================================================== --- commands.cc 78c0c903fd171b1ae353044d67bfb5d671d0dca4 +++ commands.cc 61bc624bf8e91cd02be6ab79ddec09d25be50c07 @@ -1153,7 +1153,7 @@ // fload and fmerge are simple commands for debugging the line // merger. -CMD(fload, N_("debug"), N_(""), N_("load file contents into db"), OPT_NONE) +CMD(fload, N_("debug"), "", N_("load file contents into db"), OPT_NONE) { string s = get_stdin(); @@ -1483,7 +1483,7 @@ ALIAS(co, checkout) -CMD(heads, N_("tree"), N_(""), N_("show unmerged head revisions of branch"), +CMD(heads, N_("tree"), "", N_("show unmerged head revisions of branch"), OPT_BRANCH_NAME) { set heads; @@ -1885,7 +1885,7 @@ } -CMD(read, N_("packet i/o"), N_(""), N_("read packets from stdin"), +CMD(read, N_("packet i/o"), "", N_("read packets from stdin"), OPT_NONE) { packet_db_writer dbw(app, true); @@ -1895,7 +1895,7 @@ } -CMD(reindex, N_("network"), N_(""), +CMD(reindex, N_("network"), "", N_("rebuild the indices used to sync over the network"), OPT_NONE) { @@ -2795,7 +2795,7 @@ // cout << "change set '" << name << "'\n" << dat << endl; // } -CMD(update, N_("working copy"), N_(""), +CMD(update, N_("working copy"), "", N_("update working copy.\n" "If a revision is given, base the update on that revision. If not,\n" "base the update on the head of the branch (given or implicit)."), @@ -3071,7 +3071,7 @@ } -CMD(merge, N_("tree"), N_(""), N_("merge unmerged heads of branch"), +CMD(merge, N_("tree"), "", N_("merge unmerged heads of branch"), OPT_BRANCH_NAME % OPT_DATE % OPT_AUTHOR % OPT_LCA) { set heads; @@ -3205,7 +3205,7 @@ } } -CMD(refresh_inodeprints, N_("tree"), N_(""), N_("refresh the inodeprint cache"), +CMD(refresh_inodeprints, N_("tree"), "", N_("refresh the inodeprint cache"), OPT_NONE) { enable_inodeprints();