# HG changeset patch # User chainsaw # Date 1133717354 28800 # Node ID 256b3acc87d47ede2bb175f0dc28ec964c475dc5 # Parent 84aabc053b6ef84b0d6fa62ac24ad4901854c905 [svn] Properly report Audacious instead of XMMS or BMP in all places. Patch by laci; closes bug #379. diff -r 84aabc053b6e -r 256b3acc87d4 Plugins/Input/vorbis/fileinfo.c --- a/Plugins/Input/vorbis/fileinfo.c Sun Dec 04 08:49:53 2005 -0800 +++ b/Plugins/Input/vorbis/fileinfo.c Sun Dec 04 09:29:14 2005 -0800 @@ -1011,7 +1011,7 @@ filename_utf8 = filename_to_utf8(vte.filename); - title = g_strdup_printf(_("%s - BMP"), g_basename(filename_utf8)); + title = g_strdup_printf(_("%s - Audacious"), g_basename(filename_utf8)); gtk_window_set_title(GTK_WINDOW(window), title); g_free(title); diff -r 84aabc053b6e -r 256b3acc87d4 Plugins/Input/wav/wav-sndfile.c --- a/Plugins/Input/wav/wav-sndfile.c Sun Dec 04 08:49:53 2005 -0800 +++ b/Plugins/Input/wav/wav-sndfile.c Sun Dec 04 09:29:14 2005 -0800 @@ -241,7 +241,7 @@ static GtkWidget *box; box = xmms_show_message( _("About sndfile WAV support"), - _("Adapted for audacious usage by Tony Vroon \n" + _("Adapted for Audacious usage by Tony Vroon \n" "from the xmms_sndfile plugin which is:\n" "Copyright (C) 2000, 2002 Erik de Castro Lopo\n\n" "This program is free software ; you can redistribute it and/or modify \n" diff -r 84aabc053b6e -r 256b3acc87d4 Plugins/Output/OSS/about.c --- a/Plugins/Output/OSS/about.c Sun Dec 04 08:49:53 2005 -0800 +++ b/Plugins/Output/OSS/about.c Sun Dec 04 09:29:14 2005 -0800 @@ -37,7 +37,7 @@ return; dialog = xmms_show_message(_("About OSS Driver"), - _("XMMS OSS Driver\n\n " + _("Audacious OSS Driver\n\n " "This program is free software; you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n" "the Free Software Foundation; either version 2 of the License, or\n" diff -r 84aabc053b6e -r 256b3acc87d4 Plugins/Output/esd/about.c --- a/Plugins/Output/esd/about.c Sun Dec 04 08:49:53 2005 -0800 +++ b/Plugins/Output/esd/about.c Sun Dec 04 09:29:14 2005 -0800 @@ -32,7 +32,7 @@ return; dialog = xmms_show_message(_("About ESounD Plugin"), - _("XMMS ESounD Plugin\n\n " + _("Audacious ESounD Plugin\n\n " "This program is free software; you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n" "the Free Software Foundation; either version 2 of the License, or\n" diff -r 84aabc053b6e -r 256b3acc87d4 Plugins/Visualization/libvisual-proxy/about.c --- a/Plugins/Visualization/libvisual-proxy/about.c Sun Dec 04 08:49:53 2005 -0800 +++ b/Plugins/Visualization/libvisual-proxy/about.c Sun Dec 04 09:29:14 2005 -0800 @@ -51,7 +51,7 @@ window_about = gtk_window_new (GTK_WINDOW_DIALOG); gtk_object_set_data (GTK_OBJECT (window_about), "window_about", window_about); - gtk_window_set_title (GTK_WINDOW (window_about), _("About Libvisual XMMS Plugin")); + gtk_window_set_title (GTK_WINDOW (window_about), _("About Libvisual Audacious Plugin")); gtk_window_set_position (GTK_WINDOW (window_about), GTK_WIN_POS_CENTER); gtk_window_set_default_size (GTK_WINDOW (window_about), 457, 230); @@ -85,7 +85,7 @@ gtk_widget_show (text_about); gtk_container_add (GTK_CONTAINER (scrolledwindow1), text_about); gtk_text_insert (GTK_TEXT (text_about), NULL, NULL, NULL, - _("Libvisual XMMS Plugin\n\nCopyright (C) 2004, Duilio Protti \nDennis Smit \n\nThe Libvisual XMMS Plugin, more information about Libvisual can be found at\nhttp://libvisual.sf.net\n"), -1); + _("Libvisual Audacious Plugin\n\nCopyright (C) 2004, Duilio Protti \nDennis Smit \n\nThe Libvisual Audacious Plugin, more information about Libvisual can be found at\nhttp://libvisual.sf.net\n"), -1); label_credits = gtk_label_new (_("Credits")); gtk_widget_ref (label_credits); diff -r 84aabc053b6e -r 256b3acc87d4 Plugins/Visualization/libvisual-proxy/config_gui.c --- a/Plugins/Visualization/libvisual-proxy/config_gui.c Sun Dec 04 08:49:53 2005 -0800 +++ b/Plugins/Visualization/libvisual-proxy/config_gui.c Sun Dec 04 09:29:14 2005 -0800 @@ -63,7 +63,7 @@ window_main = gtk_window_new (GTK_WINDOW_DIALOG); gtk_object_set_data (GTK_OBJECT (window_main), "window_main", window_main); - gtk_window_set_title (GTK_WINDOW (window_main), _("LibVisual XMMS Plugin")); + gtk_window_set_title (GTK_WINDOW (window_main), _("LibVisual Audacious Plugin")); gtk_window_set_position (GTK_WINDOW (window_main), GTK_WIN_POS_CENTER); gtk_window_set_default_size (GTK_WINDOW (window_main), -1, 450); diff -r 84aabc053b6e -r 256b3acc87d4 Plugins/Visualization/libvisual-proxy/lv_bmp_config.c --- a/Plugins/Visualization/libvisual-proxy/lv_bmp_config.c Sun Dec 04 08:49:53 2005 -0800 +++ b/Plugins/Visualization/libvisual-proxy/lv_bmp_config.c Sun Dec 04 09:29:14 2005 -0800 @@ -195,13 +195,13 @@ visual_log (VISUAL_LOG_WARNING, "Cannot determine which kind of plugin to show"); if (errors) { - visual_log (VISUAL_LOG_INFO, _("LibVisual BMP plugin: config file contain errors, fixing...")); + visual_log (VISUAL_LOG_INFO, _("LibVisual Audacious plugin: config file contain errors, fixing...")); lv_bmp_config_save_prefs (); } else if (must_update) { - visual_log (VISUAL_LOG_INFO, _("LibVisual BMP plugin: config file is from old version, updating...")); + visual_log (VISUAL_LOG_INFO, _("LibVisual Audacious plugin: config file is from old version, updating...")); lv_bmp_config_save_prefs (); } else if (must_create_entry) { - visual_log (VISUAL_LOG_INFO, _("LibVisual BMP plugin: adding entry to config file...")); + visual_log (VISUAL_LOG_INFO, _("LibVisual Audacious plugin: adding entry to config file...")); lv_bmp_config_save_prefs (); } diff -r 84aabc053b6e -r 256b3acc87d4 Plugins/Visualization/libvisual-proxy/main.c --- a/Plugins/Visualization/libvisual-proxy/main.c Sun Dec 04 08:49:53 2005 -0800 +++ b/Plugins/Visualization/libvisual-proxy/main.c Sun Dec 04 09:29:14 2005 -0800 @@ -113,7 +113,7 @@ if (!visual_is_initialized ()) { argv = g_malloc (sizeof(char*)); - argv[0] = g_strdup (_("XMMS plugin")); + argv[0] = g_strdup (_("Audacious plugin")); argc = 1; visual_init (&argc, &argv); diff -r 84aabc053b6e -r 256b3acc87d4 audacious/glade/prefswin.glade --- a/audacious/glade/prefswin.glade Sun Dec 04 08:49:53 2005 -0800 +++ b/audacious/glade/prefswin.glade Sun Dec 04 09:29:14 2005 -0800 @@ -808,7 +808,7 @@ True True - The change is now effective in BMP's configuration database, but won't take effect for playback until the next song! + The change is now effective in Audacious' configuration database, but won't take effect for playback until the next song! Optionally, you can stop and restart playback for the change to take effect. False diff -r 84aabc053b6e -r 256b3acc87d4 audacious/input.c --- a/audacious/input.c Sun Dec 04 08:49:53 2005 -0800 +++ b/audacious/input.c Sun Dec 04 09:29:14 2005 -0800 @@ -486,7 +486,7 @@ basename = g_path_get_basename(filename); fileinfo = filename_to_utf8(basename); - title = g_strdup_printf(_("bmp: %s"), fileinfo); + title = g_strdup_printf(_("audacious: %s"), fileinfo); gtk_window_set_title(GTK_WINDOW(window), title); diff -r 84aabc053b6e -r 256b3acc87d4 audacious/main.c --- a/audacious/main.c Sun Dec 04 08:49:53 2005 -0800 +++ b/audacious/main.c Sun Dec 04 09:29:14 2005 -0800 @@ -643,7 +643,7 @@ g_print(_("Display this text and exit")); g_print("\n-n, --session "); /* -n, --session switch */ - g_print(_("Select audacious/BMP/XMMS session (Default: 0)")); + g_print(_("Select Audacious/BMP/XMMS session (Default: 0)")); g_print("\n-r, --rew "); /* -r, --rew switch */ g_print(_("Skip backwards in playlist")); @@ -670,7 +670,7 @@ g_print(_("Show the main window")); g_print("\n-a, --activate "); /* -a, --activate switch */ - g_print(_("Activate audacious")); + g_print(_("Activate Audacious")); g_print("\n-i, --sm-client-id "); /* -i, --sm-client-id switch */ g_print(_("Previous session ID")); @@ -917,7 +917,7 @@ /* Check GTK version. Really, this is only needed for binary * distribution since configure already checks. */ if (!GTK_CHECK_VERSION(2, 4, 0)) { - g_printerr(_("Sorry, your GTK+ version (%d.%d.%d) does not work with audacious.\n" + g_printerr(_("Sorry, your GTK+ version (%d.%d.%d) does not work with Audacious.\n" "Please use GTK+ %s or newer.\n"), gtk_major_version, gtk_minor_version, gtk_micro_version, "2.4.0");