Mercurial > audlegacy-plugins
changeset 1552:96f83b3872ea
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins
| author | Sascha Hlusiak <contact@saschahlusiak.de> |
|---|---|
| date | Sat, 01 Sep 2007 11:18:52 +0200 |
| parents | a9af4f1aede9 (diff) a9d7b36cc6af (current diff) |
| children | 22f1948c9c28 |
| files | |
| diffstat | 1 files changed, 6 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotkey/plugin.c Sat Sep 01 06:02:34 2007 +0300 +++ b/src/hotkey/plugin.c Sat Sep 01 11:18:52 2007 +0200 @@ -49,20 +49,7 @@ #include <audacious/auddrct.h> #include <audacious/configdb.h> -#ifdef ENABLE_NLS - #ifdef HAVE_AUDACIOUS_I18N_H - #include <audacious/i18n.h> - #else - #ifdef HAVE_DCGETTEXT - #include <libintl.h> - #define _(String) dgettext(PACKAGE, String) - #else - #define _(String) (String) - #endif - #endif -#else - #define _(String) (String) -#endif +#include <audacious/i18n.h> /* for xmms_show_message () */ #include <audacious/util.h> @@ -751,10 +738,6 @@ if (!xdisplay) x_display_init(); -#ifdef ENABLE_NLS - bind_textdomain_codeset(PACKAGE, "UTF-8"); -#endif - load_config ( ); ungrab_keys(); @@ -919,26 +902,18 @@ { static GtkWidget *dialog; -#ifdef ENABLE_NLS - bind_textdomain_codeset(PACKAGE, "UTF-8"); -#endif - dialog = xmms_show_message (_("About Global Hotkey Plugin"), - _("Global Hotkey Plugin version " VERSION "\n\n" + _("Global Hotkey Plugin\n" + "Control the player with global key combinations or multimedia keys.\n\n" "Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n\n" - - "Parts of the plugin source are from itouch-ctrl plugin.\n" - "Authors of itouch-ctrl are listed below:\n" - "Copyright (C) 2006 - 2007 Vladimir Paskov <vlado.paskov@gmail.com>\n\n" - - "Parts of the plugin source are from xmms-itouch plugin.\n" - "Authors of xmms-itouch are listed below:\n" + "Contributers include:\n" + "Copyright (C) 2006 - 2007 Vladimir Paskov <vlado.paskov@gmail.com>\n" "Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n" " Bryn Davies <curious@ihug.com.au>\n" " Jonathan A. Davis <davis@jdhouse.org>\n" " Jeremy Tan <nsx@nsx.homeip.net>\n\n" ), - _("Ok"), TRUE, NULL, NULL); + _("OK"), TRUE, NULL, NULL); gtk_signal_connect(GTK_OBJECT(dialog), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &dialog); @@ -1036,4 +1011,3 @@ grabbed = 0; } -