diff options
author | John Emmas <johne53@tiscali.co.uk> | 2014-03-27 10:16:28 +0000 |
---|---|---|
committer | John Emmas <johne53@tiscali.co.uk> | 2014-03-27 10:16:28 +0000 |
commit | f5602071ce046df06094222e4c69863c225e4cfd (patch) | |
tree | ece938c601edb2498535ffe01984b4167fd45048 | |
parent | e6a011b96928be3be271d98ce0f649040a101982 (diff) |
Add internationalization support for my newly committed 'bundle_env_msvc.cc'
(also, move a #included file to keep MSVC happy)
-rw-r--r-- | gtk2_ardour/bundle_env_msvc.cc | 27 | ||||
-rw-r--r-- | gtk2_ardour/sfdb_ui.cc | 4 |
2 files changed, 16 insertions, 15 deletions
diff --git a/gtk2_ardour/bundle_env_msvc.cc b/gtk2_ardour/bundle_env_msvc.cc index 826e84fdff..8dced22050 100644 --- a/gtk2_ardour/bundle_env_msvc.cc +++ b/gtk2_ardour/bundle_env_msvc.cc @@ -18,6 +18,7 @@ */ #include "bundle_env.h" +#include "i18n.h" #include <shlobj.h> #include <stdlib.h> @@ -178,7 +179,7 @@ bool succeeded = false; i->insert(token_begin, str_replace_with); } else { error = true; - cerr << "ERROR: unknown environment variable" << endl; + cerr << _("ERROR: unknown environment variable") << endl; } } } @@ -211,7 +212,7 @@ bool succeeded = false; succeeded = false; } } else { - cerr << "ERROR: Could not open config file '" << str_file_to_fix << "'" << endl; + cerr << _("ERROR: Could not open config file '") << str_file_to_fix << "'" << endl; } return succeeded; @@ -235,9 +236,9 @@ string fonts_conf_file; Glib::setenv ("FONTCONFIG_FILE", fonts_conf_file, true); if (0 == fixup_config_file (fonts_conf_file)) - cerr << "ERROR: processing error for 'fonts.conf' file" << endl; + cerr << _("ERROR: processing error for 'fonts.conf' file") << endl; } else { - cerr << "ERROR: Malformed module folder (fonts.conf)" << endl; + cerr << _("ERROR: Malformed module folder (fonts.conf)") << endl; } } @@ -273,9 +274,9 @@ string pango_modules_file; Glib::setenv ("PANGO_MODULE_PATH", Glib::filename_from_utf8(pango_modules_path), true); if (0 == fixup_config_file (pango_modules_file)) - cerr << "ERROR: processing error for 'pango.modules' file" << endl; + cerr << _("ERROR: processing error for 'pango.modules' file") << endl; } else { - cerr << "ERROR: Malformed module folder (pango.modules)" << endl; + cerr << _("ERROR: Malformed module folder (pango.modules)") << endl; } } @@ -299,9 +300,9 @@ string gdk_pixbuf_loaders_file; Glib::setenv ("GDK_PIXBUF_MODULE_FILE", Glib::filename_from_utf8(gdk_pixbuf_loaders_file), true); if (0 == fixup_config_file (gdk_pixbuf_loaders_file)) - cerr << "ERROR: processing error for 'gdk-pixbuf.loaders' file" << endl; + cerr << _("ERROR: processing error for 'gdk-pixbuf.loaders' file") << endl; } else { - cerr << "ERROR: Malformed module folder (gdk-pixbuf.loaders)" << endl; + cerr << _("ERROR: Malformed module folder (gdk-pixbuf.loaders)") << endl; } } @@ -326,9 +327,9 @@ string clearlooks_la_file; Glib::setenv ("GTK_THEME_ENGINE_FILE", Glib::filename_from_utf8(clearlooks_la_file).c_str(), true); if (0 == fixup_config_file (clearlooks_la_file)) - cerr << "ERROR: processing error for 'clearlooks.la' file" << endl; + cerr << _("ERROR: processing error for 'clearlooks.la' file") << endl; } else { - cerr << "ERROR: Malformed module folder (clearlooks.la)" << endl; + cerr << _("ERROR: Malformed module folder (clearlooks.la)") << endl; } } @@ -475,19 +476,19 @@ void load_custom_fonts() std::string ardour_mono_file; if (!find_file_in_search_path (ardour_data_search_path(), "ArdourMono.ttf", ardour_mono_file)) { - cerr << "Cannot find ArdourMono TrueType font" << endl; + cerr << _("Cannot find ArdourMono TrueType font") << endl; } FcConfig *config = FcInitLoadConfigAndFonts(); FcBool ret = FcConfigAppFontAddFile(config, reinterpret_cast<const FcChar8*>(ardour_mono_file.c_str())); if (ret == FcFalse) { - cerr << "Cannot load ArdourMono TrueType font." << endl; + cerr << _("Cannot load ArdourMono TrueType font.") << endl; } ret = FcConfigSetCurrent(config); if (ret == FcFalse) { - cerr << "Failed to set fontconfig configuration." << endl; + cerr << _("Failed to set fontconfig configuration.") << endl; } } diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index 8e92d7948f..8011268335 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -21,6 +21,8 @@ #include "gtk2ardour-config.h" #endif +#include "i18n.h" + #include <map> #include <cerrno> #include <sstream> @@ -69,8 +71,6 @@ #include "sfdb_freesound_mootcher.h" -#include "i18n.h" - using namespace ARDOUR; using namespace PBD; using namespace std; |