# 
# patch "ChangeLog"
#  from [7395128e00e24f276e8170c96b0bb9cb9b05f47d]
#    to [d85ea520a8845f43129fc814f6d00fba5fe7f0aa]
# 
# patch "commands.cc"
#  from [f49af71084614f5fbfc72b9d6ef1b9793e0d0b11]
#    to [9e0d6e39bd584b9fcfce5dacf56601cf63bcc783]
# 
========================================================================
--- ChangeLog	7395128e00e24f276e8170c96b0bb9cb9b05f47d
+++ ChangeLog	d85ea520a8845f43129fc814f6d00fba5fe7f0aa
@@ -1,5 +1,10 @@
 2005-08-22  Nathaniel Smith  <address@hidden>
 
+	* commands.cc (commands): Oops, can't call gettext on a
+	std::string...
+
+2005-08-22  Nathaniel Smith  <address@hidden>
+
 	* monotone.cc (coptions, options): Use gettext_noop to mark usage
 	strings for i18n.
 	* commands.cc (commands): gettextify command descriptions
========================================================================
--- commands.cc	f49af71084614f5fbfc72b9d6ef1b9793e0d0b11
+++ commands.cc	9e0d6e39bd584b9fcfce5dacf56601cf63bcc783
@@ -115,8 +115,8 @@
             string const & p,
             string const & d,
             command_opts const & o)
-      : name(n), cmdgroup(gettext(g)), params(gettext(p)), desc(gettext(d)),
-        options(o)
+      : name(n), cmdgroup(gettext(g.c_str())), params(gettext(p.c_str())),
+        desc(gettext(d.c_str())), options(o)
     { cmds[n] = this; }
     virtual ~command() {}
     virtual void exec(app_state & app, vector<utf8> const & args) = 0;