#
#
# patch "asciik.cc"
#  from [abb39b3b7d80e667bdf6159233ab2cd531d986f7]
#    to [26ea78a6485ea8e5f99e4f419da6954d213ca6ff]
# 
# patch "automate.cc"
#  from [85f2386724c1b4389c23d300d646762e3b44ab94]
#    to [7f9e5ead627f71b092a15b9919bd3f2f721dfb85]
# 
# patch "cmd_automate.cc"
#  from [4e8645339369e70afcec8fc220010b395fc7a9fc]
#    to [a8202aed4b5200453cfd3a4fc14845ccef0c183d]
# 
# patch "cmd_db.cc"
#  from [289e16716dee7ba5e02eb87ba6608cc5fa379e3a]
#    to [283db85d788aa766b9fafd40be93a57b6623bb7c]
# 
# patch "cmd_diff_log.cc"
#  from [467e9504cd1bc53517208182f6a82e0b0450f892]
#    to [197c4f6f8a28fb1d57026c715693a936ccba2c98]
# 
# patch "cmd_files.cc"
#  from [eca6cc66ca485382fefd564e898cb9599c1ca18f]
#    to [5c754bd725507628a28b4e526d6a7b5cc6c455e6]
# 
# patch "cmd_key_cert.cc"
#  from [4a4fe6142a7432f3de54c8497c01f2dce7168429]
#    to [f08ca3adea1285dcd4c734a84b26a2d16f9f3a87]
# 
# patch "cmd_list.cc"
#  from [fb6a8c3d5c1aad1775f35cf7b314fffc5372a50d]
#    to [5a77fcef93d2661ed9899bc9f1a641c0e47178ad]
# 
# patch "cmd_merging.cc"
#  from [45290b180396c477923e8b55fcf72b01cdeb6da1]
#    to [8ffdc93fea885aef53e7208d9220a60bd17cee03]
# 
# patch "cmd_netsync.cc"
#  from [abf85cf8105f97e7f68eae1370e00bb8e1cefba7]
#    to [345e30417c0e5d464118f011933d0fa576541821]
# 
# patch "cmd_othervcs.cc"
#  from [816941fb30990435c2c79b26a9916ebf633c6a94]
#    to [a645d9d2fd6c0c738dbbfaafddd1c622a8751bc0]
# 
# patch "cmd_packet.cc"
#  from [fddb5ffaa9ce5478cdcdd18e94d5a2d4f7008766]
#    to [207c42e08dc0accce2740d090c484d706a00d9cc]
# 
# patch "cmd_ws_commit.cc"
#  from [4734eeb08e7e9c209ea99c35f66024cd76230a27]
#    to [12e8559a3b9605157fe0252a140edd1ae971a773]
# 
# patch "commands.cc"
#  from [d8eb728253d2abcd8c9ca02c7433acb9a1458780]
#    to [fd6e94498ce70716326673cf532db2ae63945ef5]
# 
# patch "mt_version.cc"
#  from [dbf4efd1b6984b533ea72e4a247adb1f0862bb3f]
#    to [41449ae39ddbeb3c8b689d91e345289f84044707]
# 
# patch "revision.cc"
#  from [46722ef105a4eb90571853a014c02752ca3dd044]
#    to [fbc92e485f3d52c4fdce11cfd0d4fa2d1ab61052]
# 
# patch "sha1.cc"
#  from [19586d394326fcd517f08de8e8f4362da1895aa0]
#    to [ecdaa4a3c79dbb948c0dfc1178bd859b61fd58ed]
#
============================================================
--- asciik.cc	abb39b3b7d80e667bdf6159233ab2cd531d986f7
+++ asciik.cc	26ea78a6485ea8e5f99e4f419da6954d213ca6ff
@@ -367,7 +367,7 @@ CMD(asciik, "asciik", "", CMD_REF(debug)
 
 CMD(asciik, "asciik", "", CMD_REF(debug), N_("SELECTOR"),
     N_("Prints an ASCII representation of the revisions' graph"),
-    N_(""),
+    "",
     options::opts::none)
 {
   N(args.size() == 1,
============================================================
--- automate.cc	85f2386724c1b4389c23d300d646762e3b44ab94
+++ automate.cc	7f9e5ead627f71b092a15b9919bd3f2f721dfb85
@@ -63,7 +63,7 @@ CMD_AUTOMATE(heads, N_("[BRANCH]"),
 //   no heads.)
 CMD_AUTOMATE(heads, N_("[BRANCH]"),
              N_("Prints the heads of the given branch"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() < 2,
@@ -90,7 +90,7 @@ CMD_AUTOMATE(ancestors, N_("REV1 [REV2 [
 //   stdout, prints an error message to stderr, and exits with status 1.
 CMD_AUTOMATE(ancestors, N_("REV1 [REV2 [REV3 [...]]]"),
              N_("Prints the ancestors of the given revisions"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() > 0,
@@ -140,7 +140,7 @@ CMD_AUTOMATE(descendents, N_("REV1 [REV2
 //   stdout, prints an error message to stderr, and exits with status 1.
 CMD_AUTOMATE(descendents, N_("REV1 [REV2 [REV3 [...]]]"),
              N_("Prints the descendents of the given revisions"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() > 0,
@@ -191,7 +191,7 @@ CMD_AUTOMATE(erase_ancestors, N_("[REV1 
 //   stdout, prints an error message to stderr, and exits with status 1.
 CMD_AUTOMATE(erase_ancestors, N_("[REV1 [REV2 [REV3 [...]]]]"),
              N_("Erases the ancestors in a list of revisions"),
-             N_(""),
+             "",
              options::opts::none)
 {
   set<revision_id> revs;
@@ -218,7 +218,7 @@ CMD_AUTOMATE(toposort, N_("[REV1 [REV2 [
 //   stdout, prints an error message to stderr, and exits with status 1.
 CMD_AUTOMATE(toposort, N_("[REV1 [REV2 [REV3 [...]]]]"),
              N_("Topologically sorts a list of revisions"),
-             N_(""),
+             "",
              options::opts::none)
 {
   set<revision_id> revs;
@@ -254,7 +254,7 @@ CMD_AUTOMATE(ancestry_difference, N_("NE
 CMD_AUTOMATE(ancestry_difference, N_("NEW_REV [OLD_REV1 [OLD_REV2 [...]]]"),
              N_("Lists the ancestors of the first revision given, not in "
                 "the others"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() > 0,
@@ -296,7 +296,7 @@ CMD_AUTOMATE(leaves, "",
 // Error conditions: None.
 CMD_AUTOMATE(leaves, "",
              N_("Lists the leaves of the revision graph"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() == 0,
@@ -326,7 +326,7 @@ CMD_AUTOMATE(roots, "",
 // Error conditions: None.
 CMD_AUTOMATE(roots, "",
              N_("Lists the roots of the revision graph"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() == 0,
@@ -354,7 +354,7 @@ CMD_AUTOMATE(parents, N_("REV"),
 //   prints an error message to stderr, and exits with status 1.
 CMD_AUTOMATE(parents, N_("REV"),
              N_("Prints the parents of a revision"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() == 1,
@@ -382,7 +382,7 @@ CMD_AUTOMATE(children, N_("REV"),
 //   prints an error message to stderr, and exits with status 1.
 CMD_AUTOMATE(children, N_("REV"),
              N_("Prints the children of a revision"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() == 1,
@@ -420,7 +420,7 @@ CMD_AUTOMATE(graph, "",
 // Error conditions: None.
 CMD_AUTOMATE(graph, "",
              N_("Prints the complete ancestry graph"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() == 0,
@@ -466,7 +466,7 @@ CMD_AUTOMATE(select, N_("SELECTOR"),
 // Error conditions: None.
 CMD_AUTOMATE(select, N_("SELECTOR"),
              N_("Lists the revisions that match a selector"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() == 1,
@@ -651,7 +651,7 @@ CMD_AUTOMATE(inventory, "",
 
 CMD_AUTOMATE(inventory, "",
              N_("Prints a summary of files found in the workspace"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() == 0,
@@ -854,7 +854,7 @@ CMD_AUTOMATE(get_revision, N_("[REVID]")
 // prints an error message to stderr and exits with status 1.
 CMD_AUTOMATE(get_revision, N_("[REVID]"),
              N_("Shows change information for a revision"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() < 2,
@@ -900,7 +900,7 @@ CMD_AUTOMATE(get_base_revision_id, "",
 //   prints an error message to stderr, and exits with status 1.
 CMD_AUTOMATE(get_base_revision_id, "",
              N_("Shows the revision on which the workspace is based"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() == 0,
@@ -927,7 +927,7 @@ CMD_AUTOMATE(get_current_revision_id, ""
 //   prints an error message to stderr, and exits with status 1.
 CMD_AUTOMATE(get_current_revision_id, "",
              N_("Shows the revision of the current workspace"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() == 0,
@@ -996,7 +996,7 @@ CMD_AUTOMATE(get_manifest_of, N_("[REVID
 // invalid prints an error message to stderr and exits with status 1.
 CMD_AUTOMATE(get_manifest_of, N_("[REVID]"),
              N_("Shows the manifest associated with a revision"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() < 2,
@@ -1042,7 +1042,7 @@ CMD_AUTOMATE(packet_for_rdata, N_("REVID
 // invalid prints an error message to stderr and exits with status 1.
 CMD_AUTOMATE(packet_for_rdata, N_("REVID"),
              N_("Prints the revision data in packet format"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() == 1,
@@ -1072,7 +1072,7 @@ CMD_AUTOMATE(packets_for_certs, N_("REVI
 CMD_AUTOMATE(packets_for_certs, N_("REVID"),
              N_("Prints the certs associated with a revision in "
                 "packet format"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() == 1,
@@ -1102,7 +1102,7 @@ CMD_AUTOMATE(packet_for_fdata, N_("FILEI
 // prints an error message to stderr and exits with status 1.
 CMD_AUTOMATE(packet_for_fdata, N_("FILEID"),
              N_("Prints the file data in packet format"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() == 1,
@@ -1132,7 +1132,7 @@ CMD_AUTOMATE(packet_for_fdelta, N_("OLD_
 // invalid prints an error message to stderr and exits with status 1.
 CMD_AUTOMATE(packet_for_fdelta, N_("OLD_FILE NEW_FILE"),
              N_("Prints the file delta in packet format"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() == 2,
@@ -1170,7 +1170,7 @@ CMD_AUTOMATE(common_ancestors, N_("REV1 
 CMD_AUTOMATE(common_ancestors, N_("REV1 [REV2 [REV3 [...]]]"),
              N_("Prints revisions that are common ancestors of a list "
                 "of revisions"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() > 0,
@@ -1236,7 +1236,7 @@ CMD_AUTOMATE(branches, "",
 //   None.
 CMD_AUTOMATE(branches, "",
              N_("Prints all branch certs in the revision graph"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() == 0,
@@ -1288,7 +1288,7 @@ CMD_AUTOMATE(tags, N_("[BRANCH_PATTERN]"
 //   A run-time exception is thrown for illegal patterns.
 CMD_AUTOMATE(tags, N_("[BRANCH_PATTERN]"),
              N_("Prints all tags attached to a set of branches"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() < 2,
@@ -1381,7 +1381,7 @@ CMD_AUTOMATE(genkey, N_("KEYID PASSPHRAS
 // prints an error message to stderr and exits with status 1.
 CMD_AUTOMATE(genkey, N_("KEYID PASSPHRASE"),
              N_("Generates a key"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() == 2,
@@ -1443,7 +1443,7 @@ CMD_AUTOMATE(get_option, N_("OPTION"),
 //
 CMD_AUTOMATE(get_option, N_("OPTION"),
              N_("Shows the value of an option"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() == 1,
@@ -1496,7 +1496,7 @@ CMD_AUTOMATE(get_content_changed, N_("RE
 CMD_AUTOMATE(get_content_changed, N_("REV FILE"),
              N_("Lists the revisions that changed the content relative "
                 "to another revision"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() == 2,
@@ -1559,7 +1559,7 @@ CMD_AUTOMATE(get_corresponding_path, N_(
 CMD_AUTOMATE(get_corresponding_path, N_("REV1 FILE REV2"),
              N_("Prints the name of a file in a target revision relative "
                 "to a given revision"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() == 3,
@@ -1611,7 +1611,7 @@ CMD_AUTOMATE(put_file, N_("[FILEID] CONT
 //   a runtime exception is thrown if base revision is not available
 CMD_AUTOMATE(put_file, N_("[FILEID] CONTENTS"),
              N_("Stores a file in the database"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() == 1 || args.size() == 2,
@@ -1664,7 +1664,7 @@ CMD_AUTOMATE(put_revision, N_("REVISION-
 //   none
 CMD_AUTOMATE(put_revision, N_("REVISION-DATA"),
              N_("Stores a revision into the database"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() == 1,
@@ -1721,7 +1721,7 @@ CMD_AUTOMATE(cert, N_("REVISION-ID NAME 
 //   none
 CMD_AUTOMATE(cert, N_("REVISION-ID NAME VALUE"),
              N_("Adds a revision certificate"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() == 3,
@@ -1754,7 +1754,7 @@ CMD_AUTOMATE(db_set, N_("DOMAIN NAME VAL
 //   none
 CMD_AUTOMATE(db_set, N_("DOMAIN NAME VALUE"),
              N_("Sets a database variable"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() == 3,
@@ -1780,7 +1780,7 @@ CMD_AUTOMATE(db_get, N_("DOMAIN NAME"),
 //   a runtime exception is thrown if the variable is not set
 CMD_AUTOMATE(db_get, N_("DOMAIN NAME"),
              N_("Gets a database variable"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() == 2,
============================================================
--- cmd_automate.cc	4e8645339369e70afcec8fc220010b395fc7a9fc
+++ cmd_automate.cc	a8202aed4b5200453cfd3a4fc14845ccef0c183d
@@ -24,7 +24,7 @@ CMD_GROUP(automate, "automate", "", CMD_
 
 CMD_GROUP(automate, "automate", "", CMD_REF(automation),
           N_("Interface for scripted execution"),
-          N_(""));
+          "");
 
 namespace commands {
   automate::automate(string const & name,
@@ -60,7 +60,7 @@ CMD_AUTOMATE(interface_version, "",
 // Error conditions: None.
 CMD_AUTOMATE(interface_version, "",
              N_("Prints the automation interface's version"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() == 0,
@@ -317,7 +317,7 @@ CMD_AUTOMATE(stdio, "",
 
 CMD_AUTOMATE(stdio, "",
              N_("Automates several commands in one run"),
-             N_(""),
+             "",
              options::opts::automate_stdio_size)
 {
   N(args.size() == 0,
============================================================
--- cmd_db.cc	289e16716dee7ba5e02eb87ba6608cc5fa379e3a
+++ cmd_db.cc	283db85d788aa766b9fafd40be93a57b6623bb7c
@@ -26,7 +26,7 @@ CMD_GROUP(db, "db", "", CMD_REF(database
 
 CMD_GROUP(db, "db", "", CMD_REF(database),
           N_("Deals with the database"),
-          N_(""));
+          "");
 
 // Deletes a revision from the local database.  This can be used to
 // 'undo' a changed revision from a local database without leaving
@@ -62,7 +62,7 @@ CMD(db_info, "info", "", CMD_REF(db), ""
 
 CMD(db_info, "info", "", CMD_REF(db), "",
     N_("Shows information about the database"),
-    N_(""),
+    "",
     options::opts::none)
 {
   N(args.size() == 0,
@@ -73,7 +73,7 @@ CMD(db_version, "version", "", CMD_REF(d
 
 CMD(db_version, "version", "", CMD_REF(db), "",
     N_("Shows the database's version"),
-    N_(""),
+    "",
     options::opts::none)
 {
   N(args.size() == 0,
@@ -134,7 +134,7 @@ CMD(db_kill_rev_locally, "kill_rev_local
 
 CMD(db_kill_rev_locally, "kill_rev_locally", "", CMD_REF(db), "ID",
     N_("Kills a revision from the local database"),
-    N_(""),
+    "",
     options::opts::none)
 {
   if (args.size() != 1)
@@ -146,7 +146,7 @@ CMD(db_kill_branch_certs_locally, "kill_
 CMD(db_kill_branch_certs_locally, "kill_branch_certs_locally", "", CMD_REF(db),
     "BRANCH",
     N_("Kills branch certificates from the local database"),
-    N_(""),
+    "",
     options::opts::none)
 {
   if (args.size() != 1)
@@ -157,7 +157,7 @@ CMD(db_kill_tag_locally, "kill_tag_local
 
 CMD(db_kill_tag_locally, "kill_tag_locally", "", CMD_REF(db), "TAG",
     N_("Kills a tag from the local database"),
-    N_(""),
+    "",
     options::opts::none)
 {
   if (args.size() != 1)
@@ -180,7 +180,7 @@ CMD(db_changesetify, "changesetify", "",
 
 CMD(db_changesetify, "changesetify", "", CMD_REF(db), "",
     N_("Converts the database to the changeset format"),
-    N_(""),
+    "",
     options::opts::none)
 {
   N(args.size() == 0,
@@ -191,7 +191,7 @@ CMD(db_rosterify, "rosterify", "", CMD_R
 
 CMD(db_rosterify, "rosterify", "", CMD_REF(db), "",
     N_("Converst the database to the rosters format"),
-    N_(""),
+    "",
     options::opts::drop_attr)
 {
   N(args.size() == 0,
@@ -202,7 +202,7 @@ CMD(db_regenerate_caches, "regenerate_ca
 
 CMD(db_regenerate_caches, "regenerate_caches", "", CMD_REF(db), "",
     N_("Regenerates the caches stored in the database"),
-    N_(""),
+    "",
     options::opts::none)
 {
   N(args.size() == 0,
@@ -213,7 +213,7 @@ CMD_HIDDEN(clear_epoch, "clear_epoch", "
 
 CMD_HIDDEN(clear_epoch, "clear_epoch", "", CMD_REF(db), "BRANCH",
     N_("Clears the database's epoch"),
-    N_(""),
+    "",
     options::opts::none)
 {
   if (args.size() != 1)
@@ -224,7 +224,7 @@ CMD(db_set_epoch, "set_epoch", "", CMD_R
 
 CMD(db_set_epoch, "set_epoch", "", CMD_REF(db), "BRANCH EPOCH",
     N_("Sets the database's epoch"),
-    N_(""),
+    "",
     options::opts::none)
 {
   if (args.size() != 2)
@@ -277,7 +277,7 @@ CMD(complete, "complete", "", CMD_REF(in
 CMD(complete, "complete", "", CMD_REF(informative),
     N_("(revision|file|key) PARTIAL-ID"),
     N_("Completes a partial identifier"),
-    N_(""),
+    "",
     options::opts::verbose)
 {
   if (args.size() != 2)
============================================================
--- cmd_diff_log.cc	467e9504cd1bc53517208182f6a82e0b0450f892
+++ cmd_diff_log.cc	197c4f6f8a28fb1d57026c715693a936ccba2c98
@@ -528,7 +528,7 @@ CMD_AUTOMATE(content_diff, N_("[FILE [..
 // as they don't change the content of the file.
 CMD_AUTOMATE(content_diff, N_("[FILE [...]]"),
              N_("Calculates diffs of files"),
-             N_(""),
+             "",
              options::opts::revision | options::opts::depth |
              options::opts::exclude)
 {
============================================================
--- cmd_files.cc	eca6cc66ca485382fefd564e898cb9599c1ca18f
+++ cmd_files.cc	5c754bd725507628a28b4e526d6a7b5cc6c455e6
@@ -28,7 +28,7 @@ CMD(fload, "fload", "", CMD_REF(debug), 
 
 CMD(fload, "fload", "", CMD_REF(debug), "",
     N_("Loads a file's contents into the database"),
-    N_(""),
+    "",
     options::opts::none)
 {
   data dat;
@@ -46,7 +46,7 @@ CMD(fmerge, "fmerge", "", CMD_REF(debug)
 
 CMD(fmerge, "fmerge", "", CMD_REF(debug), N_("<parent> <left> <right>"),
     N_("Merges 3 files and outputs the result"),
-    N_(""),
+    "",
     options::opts::none)
 {
   if (args.size() != 3)
@@ -84,7 +84,7 @@ CMD(fdiff, "fdiff", "", CMD_REF(debug), 
 
 CMD(fdiff, "fdiff", "", CMD_REF(debug), N_("SRCNAME DESTNAME SRCID DESTID"),
     N_("Differences 2 files and outputs the result"),
-    N_(""),
+    "",
     options::opts::diff_options)
 {
   if (args.size() != 4)
@@ -226,7 +226,7 @@ CMD_AUTOMATE(identify, N_("PATH"),
 // an error message to stderr and exits with status 1.
 CMD_AUTOMATE(identify, N_("PATH"),
              N_("Prints the file identifier of a file"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() == 1,
@@ -324,7 +324,7 @@ CMD_AUTOMATE(get_file, N_("FILEID"),
 // an error message to stderr and exits with status 1.
 CMD_AUTOMATE(get_file, N_("FILEID"),
              N_("Prints the contents of a file (given an identifier)"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() == 1,
@@ -350,7 +350,7 @@ CMD_AUTOMATE(get_file_of, N_("FILENAME")
 // an error message to stderr and exits with status 1.
 CMD_AUTOMATE(get_file_of, N_("FILENAME"),
              N_("Prints the contents of a file (given a name)"),
-             N_(""),
+             "",
              options::opts::revision)
 {
   N(args.size() == 1,
============================================================
--- cmd_key_cert.cc	4a4fe6142a7432f3de54c8497c01f2dce7168429
+++ cmd_key_cert.cc	f08ca3adea1285dcd4c734a84b26a2d16f9f3a87
@@ -31,7 +31,7 @@ CMD(genkey, "genkey", "", CMD_REF(key_an
 
 CMD(genkey, "genkey", "", CMD_REF(key_and_cert), N_("KEYID"),
     N_("Generates an RSA key-pair"),
-    N_(""),
+    "",
     options::opts::none)
 {
   if (args.size() != 1)
@@ -59,7 +59,7 @@ CMD(dropkey, "dropkey", "", CMD_REF(key_
 
 CMD(dropkey, "dropkey", "", CMD_REF(key_and_cert), N_("KEYID"),
     N_("Drops a public and/or private key"),
-    N_(""),
+    "",
     options::opts::none)
 {
   bool key_deleted = false;
@@ -101,7 +101,7 @@ CMD(passphrase, "passphrase", "", CMD_RE
 
 CMD(passphrase, "passphrase", "", CMD_REF(key_and_cert), N_("KEYID"),
     N_("Changes the passphrase of a private RSA key"),
-    N_(""),
+    "",
     options::opts::none)
 {
   if (args.size() != 1)
@@ -124,7 +124,7 @@ CMD(ssh_agent_export, "ssh_agent_export"
 CMD(ssh_agent_export, "ssh_agent_export", "", CMD_REF(key_and_cert),
     N_("[FILENAME]"),
     N_("Exports a private key for use with ssh-agent"),
-    N_(""),
+    "",
     options::opts::none)
 {
   if (args.size() > 1)
@@ -164,7 +164,7 @@ CMD(ssh_agent_add, "ssh_agent_add", "", 
 
 CMD(ssh_agent_add, "ssh_agent_add", "", CMD_REF(key_and_cert), "",
     N_("Adds a private key to ssh-agent"),
-    N_(""),
+    "",
     options::opts::none)
 {
   if (args.size() > 1)
@@ -182,7 +182,7 @@ CMD(cert, "cert", "", CMD_REF(key_and_ce
 CMD(cert, "cert", "", CMD_REF(key_and_cert),
     N_("REVISION CERTNAME [CERTVAL]"),
     N_("Creates a certificate for a revision"),
-    N_(""),
+    "",
     options::opts::none)
 {
   if ((args.size() != 3) && (args.size() != 2))
@@ -263,7 +263,7 @@ CMD(tag, "tag", "", CMD_REF(review), N_(
 
 CMD(tag, "tag", "", CMD_REF(review), N_("REVISION TAGNAME"),
     N_("Puts a symbolic tag certificate on a revision"),
-    N_(""),
+    "",
     options::opts::none)
 {
   if (args.size() != 2)
@@ -278,7 +278,7 @@ CMD(testresult, "testresult", "", CMD_RE
 CMD(testresult, "testresult", "", CMD_REF(review),
     N_("ID (pass|fail|true|false|yes|no|1|0)"),
     N_("Notes the results of running a test on a revision"),
-    N_(""),
+    "",
     options::opts::none)
 {
   if (args.size() != 2)
@@ -292,7 +292,7 @@ CMD(approve, "approve", "", CMD_REF(revi
 
 CMD(approve, "approve", "", CMD_REF(review), N_("REVISION"),
     N_("Approves a particular revision"),
-    N_(""),
+    "",
     options::opts::branch)
 {
   if (args.size() != 1)
@@ -307,7 +307,7 @@ CMD(comment, "comment", "", CMD_REF(revi
 
 CMD(comment, "comment", "", CMD_REF(review), N_("REVISION [COMMENT]"),
     N_("Comments on a particular revision"),
-    N_(""),
+    "",
     options::opts::none)
 {
   if (args.size() != 1 && args.size() != 2)
============================================================
--- cmd_list.cc	fb6a8c3d5c1aad1775f35cf7b314fffc5372a50d
+++ cmd_list.cc	5a77fcef93d2661ed9899bc9f1a641c0e47178ad
@@ -48,7 +48,7 @@ CMD(certs, "certs", "", CMD_REF(list), "
 
 CMD(certs, "certs", "", CMD_REF(list), "ID",
     N_("Lists certificates attached to an identifier"),
-    N_(""),
+    "",
     options::opts::depth | options::opts::exclude)
 {
   if (args.size() != 1)
@@ -151,7 +151,7 @@ CMD(keys, "keys", "", CMD_REF(list), "[P
 
 CMD(keys, "keys", "", CMD_REF(list), "[PATTERN]",
     N_("Lists keys that match a pattern"),
-    N_(""),
+    "",
     options::opts::depth | options::opts::exclude)
 {
   vector<rsa_keypair_id> pubs;
@@ -245,7 +245,7 @@ CMD(branches, "branches", "", CMD_REF(li
 
 CMD(branches, "branches", "", CMD_REF(list), "[PATTERN]",
     N_("Lists branches in the database that match a pattern"),
-    N_(""),
+    "",
     options::opts::depth | options::opts::exclude)
 {
   globish inc("*");
@@ -273,7 +273,7 @@ CMD(epochs, "epochs", "", CMD_REF(list),
 
 CMD(epochs, "epochs", "", CMD_REF(list), "[BRANCH [...]]",
     N_("Lists the current epoch of branches that match a pattern"),
-    N_(""),
+    "",
     options::opts::depth | options::opts::exclude)
 {
   map<branch_name, epoch_data> epochs;
@@ -303,7 +303,7 @@ CMD(tags, "tags", "", CMD_REF(list), "",
 
 CMD(tags, "tags", "", CMD_REF(list), "",
     N_("Lists all tags in the database"),
-    N_(""),
+    "",
     options::opts::depth | options::opts::exclude)
 {
   set<tag_t> tags;
@@ -319,7 +319,7 @@ CMD(vars, "vars", "", CMD_REF(list), "[D
 
 CMD(vars, "vars", "", CMD_REF(list), "[DOMAIN]",
     N_("Lists variables in the whole database or a domain"),
-    N_(""),
+    "",
     options::opts::depth | options::opts::exclude)
 {
   bool filterp;
@@ -353,7 +353,7 @@ CMD(known, "known", "", CMD_REF(list), "
 
 CMD(known, "known", "", CMD_REF(list), "",
     N_("Lists workspace files that belong to the current branch"),
-    N_(""),
+    "",
     options::opts::depth | options::opts::exclude)
 {
   roster_t new_roster;
@@ -395,7 +395,7 @@ CMD(unknown, "unknown", "ignored", CMD_R
 
 CMD(unknown, "unknown", "ignored", CMD_REF(list), "",
     N_("Lists workspace files that do not belong to the current branch"),
-    N_(""),
+    "",
     options::opts::depth | options::opts::exclude)
 {
   app.require_workspace();
@@ -427,7 +427,7 @@ CMD(missing, "missing", "", CMD_REF(list
 
 CMD(missing, "missing", "", CMD_REF(list), "",
     N_("Lists files that belong to the branch but are not in the workspace"),
-    N_(""),
+    "",
     options::opts::depth | options::opts::exclude)
 {
   temp_node_id_source nis;
@@ -451,7 +451,7 @@ CMD(changed, "changed", "", CMD_REF(list
 
 CMD(changed, "changed", "", CMD_REF(list), "",
     N_("Lists files that have changed with respect to the current revision"),
-    N_(""),
+    "",
     options::opts::depth | options::opts::exclude)
 {
   parent_map parents;
@@ -559,7 +559,7 @@ CMD_AUTOMATE(keys, "",
 // Error conditions: None.
 CMD_AUTOMATE(keys, "",
              N_("Lists all keys in the keystore"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() == 0,
@@ -654,7 +654,7 @@ CMD_AUTOMATE(certs, N_("REV"),
 // and exits with status 1.
 CMD_AUTOMATE(certs, N_("REV"),
              N_("Prints all certificates attached to a revision"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() == 1,
============================================================
--- cmd_merging.cc	45290b180396c477923e8b55fcf72b01cdeb6da1
+++ cmd_merging.cc	8ffdc93fea885aef53e7208d9220a60bd17cee03
@@ -332,7 +332,7 @@ CMD(merge, "merge", "", CMD_REF(tree), "
 // log message constructed in merge_two().)
 CMD(merge, "merge", "", CMD_REF(tree), "",
     N_("Merges unmerged heads of a branch"),
-    N_(""),
+    "",
     options::opts::branch | options::opts::date | options::opts::author)
 {
   typedef std::pair<revision_id, revision_id> revpair;
@@ -434,7 +434,7 @@ CMD(propagate, "propagate", "", CMD_REF(
 CMD(propagate, "propagate", "", CMD_REF(tree),
     N_("SOURCE-BRANCH DEST-BRANCH"),
     N_("Merges from one branch to another asymmetrically"),
-    N_(""),
+    "",
     options::opts::date | options::opts::author | options::opts::message | options::opts::msgfile)
 {
   if (args.size() != 2)
@@ -447,7 +447,7 @@ CMD(merge_into_dir, "merge_into_dir", ""
 CMD(merge_into_dir, "merge_into_dir", "", CMD_REF(tree),
     N_("SOURCE-BRANCH DEST-BRANCH DIR"),
     N_("Merges one branch into a subdirectory in another branch"),
-    N_(""),
+    "",
     options::opts::date | options::opts::author | options::opts::message | options::opts::msgfile)
 {
   //   This is a special merge operator, but very useful for people
@@ -935,7 +935,7 @@ CMD(heads, "heads", "", CMD_REF(tree), "
 
 CMD(heads, "heads", "", CMD_REF(tree), "",
     N_("Shows unmerged head revisions of a branch"),
-    N_(""),
+    "",
     options::opts::branch)
 {
   set<revision_id> heads;
============================================================
--- cmd_netsync.cc	abf85cf8105f97e7f68eae1370e00bb8e1cefba7
+++ cmd_netsync.cc	345e30417c0e5d464118f011933d0fa576541821
@@ -393,7 +393,7 @@ CMD_NO_WORKSPACE(serve, "serve", "", CMD
 
 CMD_NO_WORKSPACE(serve, "serve", "", CMD_REF(network), "",
                  N_("Serves the database to connecting clients"),
-                 N_(""),
+                 "",
                  options::opts::bind | options::opts::pidfile |
                  options::opts::bind_stdio | options::opts::no_transport_auth)
 {
============================================================
--- cmd_othervcs.cc	816941fb30990435c2c79b26a9916ebf633c6a94
+++ cmd_othervcs.cc	a645d9d2fd6c0c738dbbfaafddd1c622a8751bc0
@@ -32,7 +32,7 @@ CMD(cvs_import, "cvs_import", "", CMD_RE
 
 CMD(cvs_import, "cvs_import", "", CMD_REF(rcs), N_("CVSROOT"), 
     N_("Imports all versions in a CVS repository"),
-    N_(""),
+    "",
     options::opts::branch)
 {
   if (args.size() != 1)
============================================================
--- cmd_packet.cc	fddb5ffaa9ce5478cdcdd18e94d5a2d4f7008766
+++ cmd_packet.cc	207c42e08dc0accce2740d090c484d706a00d9cc
@@ -21,7 +21,7 @@ CMD(pubkey, "pubkey", "", CMD_REF(packet
 
 CMD(pubkey, "pubkey", "", CMD_REF(packet_io), N_("ID"), 
     N_("Prints a public key packet"),
-    N_(""),
+    "",
     options::opts::none)
 {
   if (args.size() != 1)
@@ -51,7 +51,7 @@ CMD(privkey, "privkey", "", CMD_REF(pack
 
 CMD(privkey, "privkey", "", CMD_REF(packet_io), N_("ID"), 
     N_("Prints a private key packet"),
-    N_(""),
+    "",
     options::opts::none)
 {
   if (args.size() != 1)
============================================================
--- cmd_ws_commit.cc	4734eeb08e7e9c209ea99c35f66024cd76230a27
+++ cmd_ws_commit.cc	12e8559a3b9605157fe0252a140edd1ae971a773
@@ -276,7 +276,7 @@ CMD(disapprove, "disapprove", "", CMD_RE
 
 CMD(disapprove, "disapprove", "", CMD_REF(review), N_("REVISION"),
     N_("Disapproves a particular revision"),
-    N_(""),
+    "",
     options::opts::branch | options::opts::messages | options::opts::date |
     options::opts::author)
 {
@@ -330,7 +330,7 @@ CMD(mkdir, "mkdir", "", CMD_REF(workspac
 
 CMD(mkdir, "mkdir", "", CMD_REF(workspace), N_("[DIRECTORY...]"),
     N_("Creates directories and adds them to the workspace"),
-    N_(""),
+    "",
     options::opts::no_ignore)
 {
   if (args.size() < 1)
@@ -375,7 +375,7 @@ CMD(add, "add", "", CMD_REF(workspace), 
 
 CMD(add, "add", "", CMD_REF(workspace), N_("[PATH]..."),
     N_("Adds files to the workspace"),
-    N_(""),
+    "",
     options::opts::unknown | options::opts::no_ignore |
     options::opts::recursive)
 {
@@ -409,7 +409,7 @@ CMD(drop, "drop", "rm", CMD_REF(workspac
 
 CMD(drop, "drop", "rm", CMD_REF(workspace), N_("[PATH]..."),
     N_("Drops files from the workspace"),
-    N_(""),
+    "",
     options::opts::bookkeep_only | options::opts::missing | options::opts::recursive)
 {
   if (!app.opts.missing && (args.size() < 1))
@@ -440,7 +440,7 @@ CMD(rename, "rename", "mv", CMD_REF(work
     N_("SRC DEST\n"
        "SRC1 [SRC2 [...]] DEST_DIR"),
     N_("Renames entries in the workspace"),
-    N_(""),
+    "",
     options::opts::bookkeep_only)
 {
   if (args.size() < 2)
@@ -481,7 +481,7 @@ CMD(status, "status", "", CMD_REF(inform
 
 CMD(status, "status", "", CMD_REF(informative), N_("[PATH]..."),
     N_("Shows workspace's status information"),
-    N_(""),
+    "",
     options::opts::depth | options::opts::exclude)
 {
   roster_t new_roster;
@@ -778,7 +778,7 @@ CMD_AUTOMATE(get_attributes, N_("PATH"),
 //                   format version, if the file is unknown, escalates
 CMD_AUTOMATE(get_attributes, N_("PATH"),
              N_("Prints all attributes for the specified path"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() > 0,
@@ -893,7 +893,7 @@ CMD_AUTOMATE(set_attribute, N_("PATH KEY
 //                   exits with status 1.
 CMD_AUTOMATE(set_attribute, N_("PATH KEY VALUE"),
              N_("Sets an attribute on a certain path"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() == 3,
@@ -939,7 +939,7 @@ CMD_AUTOMATE(drop_attribute, N_("PATH [K
 //                   status 1.
 CMD_AUTOMATE(drop_attribute, N_("PATH [KEY]"),
              N_("Drops an attribute or all of them from a certain path"),
-             N_(""),
+             "",
              options::opts::none)
 {
   N(args.size() ==1 || args.size() == 2,
@@ -985,7 +985,7 @@ CMD(commit, "commit", "ci", CMD_REF(work
 
 CMD(commit, "commit", "ci", CMD_REF(workspace), N_("[PATH]..."),
     N_("Commits workspace changes to the database"),
-    N_(""),
+    "",
     options::opts::branch | options::opts::message | options::opts::msgfile
     | options::opts::date | options::opts::author | options::opts::depth
     | options::opts::exclude)
@@ -1256,7 +1256,7 @@ CMD_NO_WORKSPACE(import, "import", "", C
 
 CMD_NO_WORKSPACE(import, "import", "", CMD_REF(tree), N_("DIRECTORY"),
   N_("Imports the contents of a directory into a branch"),
-  N_(""),
+  "",
   options::opts::branch | options::opts::revision |
   options::opts::message | options::opts::msgfile |
   options::opts::dryrun |
@@ -1372,7 +1372,7 @@ CMD(refresh_inodeprints, "refresh_inodep
 
 CMD(refresh_inodeprints, "refresh_inodeprints", "", CMD_REF(tree), "",
     N_("Refreshes the inodeprint cache"),
-    N_(""),
+    "",
     options::opts::none)
 {
   app.require_workspace();
============================================================
--- commands.cc	d8eb728253d2abcd8c9ca02c7433acb9a1458780
+++ commands.cc	fd6e94498ce70716326673cf532db2ae63945ef5
@@ -39,7 +39,7 @@ using std::vector;
 using std::strlen;
 using std::vector;
 
-CMD_GROUP(__root__, "__root__", "", NULL, N_(""), N_(""));
+CMD_GROUP(__root__, "__root__", "", NULL, "", "");
 
 //
 // Definition of top-level commands, used to classify the real commands
@@ -55,40 +55,40 @@ CMD_GROUP(automation, "automation", "", 
 //
 CMD_GROUP(automation, "automation", "", CMD_REF(__root__),
           N_("Commands that aid in scripted execution"),
-          N_(""));
+          "");
 CMD_GROUP(database, "database", "", CMD_REF(__root__),
           N_("Commands that manipulate the database"),
-          N_(""));
+          "");
 CMD_GROUP(debug, "debug", "", CMD_REF(__root__),
           N_("Commands that aid in program debugging"),
-          N_(""));
+          "");
 CMD_GROUP(informative, "informative", "", CMD_REF(__root__),
           N_("Commands for information retrieval"),
-          N_(""));
+          "");
 CMD_GROUP(key_and_cert, "key_and_cert", "", CMD_REF(__root__),
           N_("Commands to manage keys and certificates"),
-          N_(""));
+          "");
 CMD_GROUP(network, "network", "", CMD_REF(__root__),
           N_("Commands that access the network"),
-          N_(""));
+          "");
 CMD_GROUP(packet_io, "packet_io", "", CMD_REF(__root__),
           N_("Commands for packet reading and writing"),
-          N_(""));
+          "");
 CMD_GROUP(rcs, "rcs", "", CMD_REF(__root__),
           N_("Commands for interaction with RCS and CVS"),
-          N_(""));
+          "");
 CMD_GROUP(review, "review", "", CMD_REF(__root__),
           N_("Commands to review revisions"),
-          N_(""));
+          "");
 CMD_GROUP(tree, "tree", "", CMD_REF(__root__),
           N_("Commands to manipulate the tree"),
-          N_(""));
+          "");
 CMD_GROUP(variables, "variables", "", CMD_REF(__root__),
           N_("Commands to manage persistent variables"),
-          N_(""));
+          "");
 CMD_GROUP(workspace, "workspace", "", CMD_REF(__root__),
           N_("Commands that deal with the workspace"),
-          N_(""));
+          "");
 
 // this file defines the task-oriented "top level" commands which can be
 // issued as part of a monotone command line. the command line can only
@@ -680,7 +680,7 @@ CMD(help, "help", "", CMD_REF(informativ
 
 CMD(help, "help", "", CMD_REF(informative), N_("command [ARGS...]"),
     N_("Displays help about commands and options"),
-    N_(""),
+    "",
     options::opts::none)
 {
   if (args.size() < 1)
@@ -697,7 +697,7 @@ CMD_HIDDEN(crash, "crash", "", CMD_REF(d
 CMD_HIDDEN(crash, "crash", "", CMD_REF(debug),
            "{ N | E | I | exception | signal }",
            N_("Triggers the specified kind of crash"),
-           N_(""),
+           "",
            options::opts::none)
 {
   if (args.size() != 1)
============================================================
--- mt_version.cc	dbf4efd1b6984b533ea72e4a247adb1f0862bb3f
+++ mt_version.cc	41449ae39ddbeb3c8b689d91e345289f84044707
@@ -33,7 +33,7 @@ CMD(version, "version", "", CMD_REF(info
 
 CMD(version, "version", "", CMD_REF(informative), "",
     N_("Shows the program version"),
-    N_(""),
+    "",
     options::opts::full)
 {
   N(args.size() == 0,
============================================================
--- revision.cc	46722ef105a4eb90571853a014c02752ca3dd044
+++ revision.cc	fbc92e485f3d52c4fdce11cfd0d4fa2d1ab61052
@@ -1771,7 +1771,7 @@ CMD_HIDDEN(rev_height, "rev_height", "",
 
 CMD_HIDDEN(rev_height, "rev_height", "", CMD_REF(informative), N_("REV"),
            N_("Shows a revision's height"),
-           N_(""),
+           "",
            options::opts::none)
 {
   if (args.size() != 1)
============================================================
--- sha1.cc	19586d394326fcd517f08de8e8f4362da1895aa0
+++ sha1.cc	ecdaa4a3c79dbb948c0dfc1178bd859b61fd58ed
@@ -94,7 +94,7 @@ CMD_HIDDEN(benchmark_sha1, "benchmark_sh
 
 CMD_HIDDEN(benchmark_sha1, "benchmark_sha1", "", CMD_REF(debug), "",
            N_("Benchmarks SHA-1 cores"),
-           N_(""),
+           "",
            options::opts::none)
 {
   P(F("Benchmarking %s SHA-1 cores") % registry().size());