X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Frc_configuration.cc;h=7fc2f5105b6755ed7906c0d1d7f9f781c1e417f1;hb=6946bdc0830c9f0971d2cd0d54b27e343c54d96a;hp=2abf3477fb58a63147f58e2e311218790b9a73f0;hpb=2397429e99d4b79ae874392665db2627674daaa0;p=ardour.git diff --git a/libs/ardour/rc_configuration.cc b/libs/ardour/rc_configuration.cc index 2abf3477fb..7fc2f5105b 100644 --- a/libs/ardour/rc_configuration.cc +++ b/libs/ardour/rc_configuration.cc @@ -36,7 +36,7 @@ #include "ardour/rc_configuration.h" #include "ardour/session_metadata.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace std; @@ -89,7 +89,7 @@ RCConfiguration::load_state () } if (statbuf.st_size != 0) { - info << string_compose (_("Loading system configuration file %1"), rcfile) << endl; + info << string_compose (_("Loading system configuration file %1"), rcfile) << endmsg; XMLTree tree; if (!tree.read (rcfile.c_str())) { @@ -117,7 +117,7 @@ RCConfiguration::load_state () } if (statbuf.st_size != 0) { - info << string_compose (_("Loading user configuration file %1"), rcfile) << endl; + info << string_compose (_("Loading user configuration file %1"), rcfile) << endmsg; XMLTree tree; if (!tree.read (rcfile)) { @@ -172,7 +172,7 @@ XMLNode& RCConfiguration::get_state () { XMLNode* root; - LocaleGuard lg (X_("C")); + LocaleGuard lg; root = new XMLNode("Ardour"); @@ -193,7 +193,7 @@ XMLNode& RCConfiguration::get_variables () { XMLNode* node; - LocaleGuard lg (X_("C")); + LocaleGuard lg; node = new XMLNode ("Config"); @@ -220,6 +220,7 @@ RCConfiguration::set_state (const XMLNode& root, int version) XMLNodeList nlist = root.children(); XMLNodeConstIterator niter; XMLNode *node; + LocaleGuard lg; Stateful::save_extra_xml (root);