Re-try de.po with (hopefully) the correct encoding.

[ardour.git] / gtk2_ardour / main.cc

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 4d092cd28ad220d7e5aec840c4173d6357804a49..fc07758eea91e321a525613ee8aa4c59d762122a 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -74,9 +74,9 @@ void
 gui_jack_error ()
 {
        MessageDialog win (string_compose (_("%1 could not connect to JACK."), PROGRAM_NAME),
-                    false,
-                    Gtk::MESSAGE_INFO,
-                    (Gtk::ButtonsType)(Gtk::BUTTONS_NONE));
+                          false,
+                          Gtk::MESSAGE_INFO,
+                          Gtk::BUTTONS_NONE);
 win.set_secondary_text(_("There are several possible reasons:\n\
 \n\
 1) JACK is not running.\n\
@@ -140,8 +140,7 @@ fixup_bundle_environment (int, char* [])
 
        _NSGetExecutablePath (execpath, &pathsz);
 
-       std::string exec_path (execpath);
-       std::string dir_path = Glib::path_get_dirname (exec_path);
+       std::string dir_path = Glib::path_get_dirname (execpath);
        std::string path;
        const char *cstr = getenv ("PATH");
 
@@ -169,9 +168,9 @@ fixup_bundle_environment (int, char* [])
        path = dir_path;
        path += "/../Resources";
        path += dir_path;
-       path += "/../Resources/Surfaces";
+       path += "/../Surfaces";
        path += dir_path;
-       path += "/../Resources/Panners";
+       path += "/../Panners";
 
        setenv ("ARDOUR_MODULE_PATH", path.c_str(), 1);
 
@@ -296,8 +295,7 @@ fixup_bundle_environment (int /*argc*/, char* argv[])
 
        EnvironmentalProtectionAgency::set_global_epa (new EnvironmentalProtectionAgency (true, "PREBUNDLE_ENV"));
 
-       Glib::ustring exec_path = argv[0];
-       Glib::ustring dir_path = Glib::path_get_dirname (Glib::path_get_dirname (exec_path));
+       Glib::ustring dir_path = Glib::path_get_dirname (Glib::path_get_dirname (argv[0]));
        Glib::ustring path;
        Glib::ustring userconfigdir = user_config_directory().to_string();
 
@@ -407,7 +405,7 @@ tell_about_jack_death (void* /* ignored */)
 {
        if (AudioEngine::instance()->processed_frames() == 0) {
                /* died during startup */
-               MessageDialog msg (_("JACK exited"), false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_OK);
+               MessageDialog msg (_("JACK exited"), false);
                msg.set_position (Gtk::WIN_POS_CENTER);
                msg.set_secondary_text (string_compose (_(
 "JACK exited unexpectedly, and without notifying %1.\n\
@@ -423,7 +421,7 @@ Click OK to exit %1."), PROGRAM_NAME));
 
                /* engine has already run, so this is a mid-session JACK death */
 
-               MessageDialog* msg = manage (new MessageDialog (_("JACK exited"), false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_NONE));
+               MessageDialog* msg = manage (new MessageDialog (_("JACK exited"), false));
                msg->set_secondary_text (string_compose (_(
 "JACK exited unexpectedly, and without notifying %1.\n\
 \n\