Switch out some strings that still use Ardour and use PROGRAM_NAME instead

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@11559 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Todd Naugle 2012-02-29 20:07:23 +00:00
parent 1a794ca4cd
commit 920a1fae53
5 changed files with 9 additions and 10 deletions

View File

@ -3360,14 +3360,14 @@ ARDOUR_UI::pending_state_dialog ()
HBox* hbox = new HBox();
Image* image = new Image (Stock::DIALOG_QUESTION, ICON_SIZE_DIALOG);
ArdourDialog dialog (_("Crash Recovery"), true);
Label message (_("\
Label message (string_compose (_("\
This session appears to have been in\n\
middle of recording when ardour or\n\
the computer was shutdown.\n\
\n\
Ardour can recover any captured audio for\n\
%1 can recover any captured audio for\n\
you, or it can ignore it. Please decide\n\
what you would like to do.\n"));
what you would like to do.\n"), PROGRAM_NAME));
image->set_alignment(ALIGN_CENTER, ALIGN_TOP);
hbox->pack_start (*image, PACK_EXPAND_WIDGET, 12);
hbox->pack_end (message, PACK_EXPAND_PADDING, 12);

View File

@ -829,7 +829,7 @@ ExportDialog::export_cue_file (Locations::LocationList& locations, const string&
}
}
out << "REM Cue file generated by Ardour" << endl;
out << "REM Cue file generated by " << PROGRAM_NAME << endl;
out << "TITLE \"" << session->name() << "\"" << endl;
out << "FILE \"" << Glib::path_get_basename(path) << "\" ";

View File

@ -623,9 +623,8 @@ Keyboard::load_keybindings (string path)
std::map<string,string> dict;
dict.insert (pair<string,string> ("<Meta>", "<Mod2>"));
if (PBD::file_subst (path, dict)) {
cerr << string_compose (_("Your keybindings will be wrong. The file %1 needs to be editable by Ardour to update it"),
path)
<< endl;
cerr << string_compose (_("Your keybindings will be wrong. The file %1 needs to be editable by %2 to update it"),
path, PROGRAM_NAME)
}
#endif

View File

@ -110,8 +110,8 @@ Configuration::load_state ()
return -1;
}
} else {
error << string_compose (_("your system %1 configuration file is empty. This probably means that there as an error installing Ardour"),
PROGRAM_NAME)
error << string_compose (_("your system \"%1\" configuration file is empty. This probably means that there as an error installing %2"),
rcfile, PROGRAM_NAME)
<< endmsg;
}
}

View File

@ -435,7 +435,7 @@ ARDOUR::get_user_ardour_path ()
/* create it if necessary */
if (g_mkdir_with_parents (path.c_str (), 0755)) {
cerr << "\n\n\nYour home folder is not writable (Ardour cannot create its settings folder there). Please fix this before running Ardour again."
cerr << "\n\n\nYour home folder is not writable (" << PROGRAM_NAME << " cannot create its settings folder there). Please fix this before running " << PROGRAM_NAME << " again."
<< endl;
_exit (1);
}