From 51530925ec9efce86e105c0327cbe67a317aa950 Mon Sep 17 00:00:00 2001 From: Alexey Yakovenko Date: Sat, 15 May 2010 23:39:29 +0200 Subject: added basic gettext support and russian translation --- plugins/gtkui/callbacks.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'plugins/gtkui/callbacks.c') diff --git a/plugins/gtkui/callbacks.c b/plugins/gtkui/callbacks.c index 86850a27..7298cdd5 100644 --- a/plugins/gtkui/callbacks.c +++ b/plugins/gtkui/callbacks.c @@ -27,6 +27,7 @@ #include #include #include +#include "../../gettext.h" #include "callbacks.h" #include "interface.h" @@ -93,7 +94,7 @@ file_filter_func (const GtkFileFilterInfo *filter_info, gpointer data) { static GtkFileFilter * set_file_filter (GtkWidget *dlg, const char *name) { if (!name) { - name = "Supported sound formats"; + name = _("Supported sound formats"); } GtkFileFilter* flt; @@ -104,7 +105,7 @@ set_file_filter (GtkWidget *dlg, const char *name) { gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dlg), flt); gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dlg), flt); flt = gtk_file_filter_new (); - gtk_file_filter_set_name (flt, "Other files (*)"); + gtk_file_filter_set_name (flt, _("Other files (*)")); gtk_file_filter_add_pattern (flt, "*"); gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dlg), flt); } @@ -113,7 +114,7 @@ void on_open_activate (GtkMenuItem *menuitem, gpointer user_data) { - GtkWidget *dlg = gtk_file_chooser_dialog_new ("Open file(s)...", GTK_WINDOW (mainwin), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); + GtkWidget *dlg = gtk_file_chooser_dialog_new (_("Open file(s)..."), GTK_WINDOW (mainwin), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); set_file_filter (dlg, NULL); @@ -146,7 +147,7 @@ void on_add_files_activate (GtkMenuItem *menuitem, gpointer user_data) { - GtkWidget *dlg = gtk_file_chooser_dialog_new ("Add file(s) to playlist...", GTK_WINDOW (mainwin), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); + GtkWidget *dlg = gtk_file_chooser_dialog_new (_("Add file(s) to playlist..."), GTK_WINDOW (mainwin), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); set_file_filter (dlg, NULL); @@ -178,7 +179,7 @@ void on_add_folders_activate (GtkMenuItem *menuitem, gpointer user_data) { - GtkWidget *dlg = gtk_file_chooser_dialog_new ("Add folder(s) to playlist...", GTK_WINDOW (mainwin), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); + GtkWidget *dlg = gtk_file_chooser_dialog_new (_("Add folder(s) to playlist..."), GTK_WINDOW (mainwin), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); set_file_filter (dlg, NULL); @@ -360,14 +361,14 @@ char last_playlist_save_name[1024] = ""; void save_playlist_as (void) { - GtkWidget *dlg = gtk_file_chooser_dialog_new ("Save Playlist As", GTK_WINDOW (mainwin), GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_OK, NULL); + GtkWidget *dlg = gtk_file_chooser_dialog_new (_("Save Playlist As"), GTK_WINDOW (mainwin), GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_OK, NULL); gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dlg), TRUE); gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dlg), "untitled.dbpl"); GtkFileFilter* flt; flt = gtk_file_filter_new (); - gtk_file_filter_set_name (flt, "DeaDBeeF playlist files (*.dbpl)"); + gtk_file_filter_set_name (flt, _("DeaDBeeF playlist files (*.dbpl)")); gtk_file_filter_add_pattern (flt, "*.dbpl"); gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dlg), flt); @@ -690,7 +691,7 @@ show_info_window (const char *fname, const char *title, GtkWidget **pwindow) { char buf[s+1]; if (fread (buf, 1, s, fp) != s) { fprintf (stderr, "error reading help file contents\n"); - const char *error = "Failed while reading help file"; + const char *error = _("Failed while reading help file"); gtk_text_buffer_set_text (buffer, error, strlen (error)); } else { @@ -700,7 +701,7 @@ show_info_window (const char *fname, const char *title, GtkWidget **pwindow) { fclose (fp); } else { - const char *error = "Failed to load help file"; + const char *error = _("Failed to load help file"); gtk_text_buffer_set_text (buffer, error, strlen (error)); } gtk_text_view_set_buffer (GTK_TEXT_VIEW (txt), buffer); -- cgit v1.2.3 From 6503bfc06a0ae71c69667bef04df47603b789c1a Mon Sep 17 00:00:00 2001 From: Alexey Yakovenko Date: Mon, 17 May 2010 21:35:50 +0200 Subject: localization updates --- deadbeef.desktop.in | 5 ++++- plugins/gtkui/callbacks.c | 10 +++++++--- plugins/gtkui/deadbeef.glade | 28 ++++++++++++++-------------- po/POTFILES | 3 ++- po/POTFILES.in | 2 +- 5 files changed, 28 insertions(+), 20 deletions(-) (limited to 'plugins/gtkui/callbacks.c') diff --git a/deadbeef.desktop.in b/deadbeef.desktop.in index e08bb5a8..b85e009a 100644 --- a/deadbeef.desktop.in +++ b/deadbeef.desktop.in @@ -1,10 +1,13 @@ [Desktop Entry] +Encoding=UTF-8 Name=DeaDBeeF GenericName=Audio Player -Comment=Play music +Comment=Listen to music Exec=deadbeef %F MimeType=application/ogg;audio/x-vorbis+ogg;application/x-ogg;audio/mp3;audio/prs.sid;audio/x-flac;audio/mpeg;audio/x-mpeg;audio/x-mod;audio/x-it;audio/x-s3m;audio/x-xm Categories=AudioVideo;Player Terminal=false Type=Application Icon=deadbeef +GenericName[ru]=Аудио плеер +Comment[ru]=Слушай музыку diff --git a/plugins/gtkui/callbacks.c b/plugins/gtkui/callbacks.c index 4d967bc7..81183a66 100644 --- a/plugins/gtkui/callbacks.c +++ b/plugins/gtkui/callbacks.c @@ -661,7 +661,7 @@ void on_help1_activate (GtkMenuItem *menuitem, gpointer user_data) { - show_info_window (DOCDIR "/help.txt", "Help", &helpwindow); + show_info_window (DOCDIR "/help.txt", _("Help"), &helpwindow); } static GtkWidget *aboutwindow; @@ -670,7 +670,9 @@ void on_about1_activate (GtkMenuItem *menuitem, gpointer user_data) { - show_info_window (DOCDIR "/about.txt", "About DeaDBeeF " VERSION, &aboutwindow); + char s[200]; + snprintf (s, sizeof (s), _("About DeaDBeeF %s"), VERSION); + show_info_window (DOCDIR "/about.txt", s, &aboutwindow); } static GtkWidget *changelogwindow; @@ -679,7 +681,9 @@ void on_changelog1_activate (GtkMenuItem *menuitem, gpointer user_data) { - show_info_window (DOCDIR "/ChangeLog", "DeaDBeeF " VERSION " ChangeLog", &changelogwindow); + char s[200]; + snprintf (s, sizeof (s), _("DeaDBeeF %s ChangeLog"), VERSION); + show_info_window (DOCDIR "/ChangeLog", s, &changelogwindow); } static GtkWidget *gplwindow; diff --git a/plugins/gtkui/deadbeef.glade b/plugins/gtkui/deadbeef.glade index 9252035f..593fcdb8 100644 --- a/plugins/gtkui/deadbeef.glade +++ b/plugins/gtkui/deadbeef.glade @@ -6,7 +6,7 @@ True GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK - DeaDBeeF + DeaDBeeF GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -594,7 +594,7 @@ True - _GPLv2 + _GPLv2 True @@ -603,7 +603,7 @@ True - _LGPLv2.1 + _LGPLv2.1 True @@ -1893,7 +1893,7 @@ True - _Cancel + _Cancel True False GTK_JUSTIFY_LEFT @@ -1968,7 +1968,7 @@ True - _OK + _OK True False GTK_JUSTIFY_LEFT @@ -2361,7 +2361,7 @@ Example: %a - %t [%l] True - _Close + _Close True False GTK_JUSTIFY_LEFT @@ -3772,7 +3772,7 @@ Album True - HTTP + HTTP HTTP_1_0 SOCKS4 SOCKS5 @@ -4239,7 +4239,7 @@ SOCKS5_HOSTNAME True - <b>MP3</b> + <b>MP3</b> False True GTK_JUSTIFY_LEFT @@ -4411,7 +4411,7 @@ SOCKS5_HOSTNAME True - <b>APE</b> + <b>APE</b> False True GTK_JUSTIFY_LEFT @@ -4577,7 +4577,7 @@ SOCKS5_HOSTNAME True - <b>WavPack</b> + <b>WavPack</b> False True GTK_JUSTIFY_LEFT @@ -5126,7 +5126,7 @@ SOCKS5_HOSTNAME True - _Cancel + _Cancel True False GTK_JUSTIFY_LEFT @@ -5201,7 +5201,7 @@ SOCKS5_HOSTNAME True - _OK + _OK True False GTK_JUSTIFY_LEFT @@ -5387,7 +5387,7 @@ SOCKS5_HOSTNAME True - _Cancel + _Cancel True False GTK_JUSTIFY_LEFT @@ -5462,7 +5462,7 @@ SOCKS5_HOSTNAME True - _OK + _OK True False GTK_JUSTIFY_LEFT diff --git a/po/POTFILES b/po/POTFILES index d75151a1..1d0fae8c 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -12,4 +12,5 @@ ../plugins/gtkui/trkproperties.c \ ../main.c \ ../playlist.c \ - ../plugins.c + ../plugins.c \ + ../deadbeef.desktop.in diff --git a/po/POTFILES.in b/po/POTFILES.in index 34260080..45a2a59b 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -13,4 +13,4 @@ plugins/gtkui/trkproperties.c main.c playlist.c plugins.c - +deadbeef.desktop.in -- cgit v1.2.3