From f89c285bcc6c99fce417da9ebfc9434e2e60314f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 2 May 2011 23:21:53 +0000 Subject: [PATCH] Tinker with text related to clean-up. git-svn-id: svn://localhost/ardour2/branches/3.0@9459 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/ardour_ui.cc | 23 +++++++++++++---------- gtk2_ardour/ardour_ui_ed.cc | 4 ++-- gtk2_ardour/editor.cc | 8 ++++---- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 843be588d3..449ce2f376 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -2948,10 +2948,11 @@ ARDOUR_UI::display_cleanup_results (ARDOUR::CleanupReport& rep, const gchar* lis if (removed == 0) { MessageDialog msgd (*editor, - _("No files were ready for cleanup"), + _("No files were ready for clean-up"), true, Gtk::MESSAGE_INFO, (Gtk::ButtonsType)(Gtk::BUTTONS_OK) ); + msgd.set_title (_("Clean-up")); msgd.set_secondary_text (_("If this seems suprising, \n\ check for any existing snapshots.\n\ These may still include regions that\n\ @@ -3073,17 +3074,19 @@ ARDOUR_UI::cleanup () } - MessageDialog checker (_("Are you sure you want to cleanup?"), + MessageDialog checker (_("Are you sure you want to clean-up?"), true, Gtk::MESSAGE_QUESTION, (Gtk::ButtonsType)(Gtk::BUTTONS_NONE)); - checker.set_secondary_text(_("Cleanup is a destructive operation.\n\ -ALL undo/redo information will be lost if you cleanup.\n\ -Cleanup will move all unused files to a \"dead\" location.")); + checker.set_title (_("Clean-up")); + + checker.set_secondary_text(_("Clean-up is a destructive operation.\n\ +ALL undo/redo information will be lost if you clean-up.\n\ +Clean-up will move all unused files to a \"dead\" location.")); checker.add_button (Stock::CANCEL, RESPONSE_CANCEL); - checker.add_button (_("Clean Up"), RESPONSE_ACCEPT); + checker.add_button (_("Clean-up"), RESPONSE_ACCEPT); checker.set_default_response (RESPONSE_CANCEL); checker.set_name (_("CleanupDialog")); @@ -3117,21 +3120,21 @@ Cleanup will move all unused files to a \"dead\" location.")); checker.hide(); display_cleanup_results (rep, - _("cleaned files"), + _("Cleaned Files"), _("\ The following %1 files were not in use and \n\ have been moved to:\n\n\ %2\n\n\ After a restart of Ardour,\n\n\ -Session -> Cleanup -> Flush Wastebasket\n\n\ +Session -> Clean-up -> Flush Wastebasket\n\n\ will release an additional\n\ %3 %4bytes of disk space.\n"), _("\ -The following file was not in use and \n \ +The following file was not in use and \n\ has been moved to:\n \ %2\n\n\ After a restart of Ardour,\n\n\ -Session -> Cleanup -> Flush Wastebasket\n\n\ +Session -> Clean-up -> Flush Wastebasket\n\n\ will release an additional\n\ %3 %4bytes of disk space.\n" )); diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index 81cf8091e2..9a9e2484bf 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -98,7 +98,7 @@ ARDOUR_UI::install_actions () /* menus + submenus that need action items */ ActionManager::register_action (main_actions, X_("Session"), _("Session")); - act = ActionManager::register_action (main_actions, X_("Cleanup"), _("Cleanup")); + act = ActionManager::register_action (main_actions, X_("Cleanup"), _("Clean-up")); ActionManager::write_sensitive_actions.push_back (act); ActionManager::register_action (main_actions, X_("Sync"), _("Sync")); ActionManager::register_action (main_actions, X_("TransportOptions"), _("Options")); @@ -168,7 +168,7 @@ ARDOUR_UI::install_actions () act = ActionManager::register_action (main_actions, X_("Export"), _("Export")); ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (main_actions, X_("CleanupUnused"), _("Cleanup Unused Sources..."), sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::cleanup)); + act = ActionManager::register_action (main_actions, X_("CleanupUnused"), _("Clean-up Unused Sources..."), sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::cleanup)); ActionManager::session_sensitive_actions.push_back (act); ActionManager::write_sensitive_actions.push_back (act); diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index ef81f06f2b..8a6e78d9aa 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -3833,8 +3833,8 @@ Editor::playlist_deletion_dialog (boost::shared_ptr pl) { ArdourDialog dialog (_("Playlist Deletion")); Label label (string_compose (_("Playlist %1 is currently unused.\n" - "If left alone, no audio files used by it will be cleaned.\n" - "If deleted, audio files used by it alone by will cleaned."), + "If it is kept, its audio files will not be cleaned.\n" + "If it is deleted, audio files used by it alone will be cleaned."), pl->name())); dialog.set_position (WIN_POS_CENTER); @@ -3842,8 +3842,8 @@ Editor::playlist_deletion_dialog (boost::shared_ptr pl) label.show (); - dialog.add_button (_("Delete playlist"), RESPONSE_ACCEPT); - dialog.add_button (_("Keep playlist"), RESPONSE_REJECT); + dialog.add_button (_("Delete Playlist"), RESPONSE_ACCEPT); + dialog.add_button (_("Keep Playlist"), RESPONSE_REJECT); dialog.add_button (_("Cancel"), RESPONSE_CANCEL); switch (dialog.run ()) {