Mercurial > audlegacy-plugins

changeset 1369:6d87598ff8a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Internationalization... (The first step of the "i18n" project could be ready for Audacious 1.4 release)
author Stany HENRY <StrassBoy@gmail.com>
date Wed, 25 Jul 2007 23:21:07 +0200
parents f611c44cc67b
children ea2ecaeff8ce
files src/jack/configure.c src/jack/jack.c src/sndstretch/sndstretch_xmms.c src/song_change/song_change.c src/tonegen/tonegen.c
diffstat 5 files changed, 39 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/src/jack/configure.c	Wed Jul 25 16:06:23 2007 -0500
+++ b/src/jack/configure.c	Wed Jul 25 23:21:07 2007 +0200
@@ -25,6 +25,8 @@
 #include "jack.h"
 
 #include "audacious/configdb.h"
+#include <audacious/i18n.h>
+# include "config.h"
 
 #include <gtk/gtk.h>
 
@@ -64,21 +66,21 @@
     GtkWidget *item;
     char *descr;
 
-    descr = g_strdup("Connect to all available jack ports");
+    descr = g_strdup(_("Connect to all available jack ports"));
     item = gtk_list_item_new_with_label(descr);
     gtk_widget_show(item);
     g_free(descr);
     gtk_combo_set_item_string(combo, GTK_ITEM(item), "CONNECT_ALL");
     gtk_container_add(GTK_CONTAINER(combo->list), item);
 
-    descr = g_strdup("Connect only the output ports");
+    descr = g_strdup(_("Connect only the output ports"));
     item = gtk_list_item_new_with_label(descr);
     gtk_widget_show(item);
     g_free(descr);
     gtk_combo_set_item_string(combo, GTK_ITEM(item), "CONNECT_OUTPUT");
     gtk_container_add(GTK_CONTAINER(combo->list), item);
 
-    descr = g_strdup("Connect to no ports");
+    descr = g_strdup(_("Connect to no ports"));
     item = gtk_list_item_new_with_label(descr);
     gtk_widget_show(item);
     g_free(descr);
@@ -89,11 +91,11 @@
 void jack_configure(void)
 {
 	if (!configure_win)
-	{	
+	{
 		configure_win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 		gtk_window_set_type_hint ( GTK_WINDOW(configure_win), GDK_WINDOW_TYPE_HINT_DIALOG);
 		gtk_signal_connect(GTK_OBJECT(configure_win), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &configure_win);
-		gtk_window_set_title(GTK_WINDOW(configure_win), ("jack Plugin configuration"));
+		gtk_window_set_title(GTK_WINDOW(configure_win), _("jack Plugin configuration"));
 		gtk_window_set_policy(GTK_WINDOW(configure_win), FALSE, FALSE, FALSE);
 		gtk_window_set_position(GTK_WINDOW(configure_win), GTK_WIN_POS_MOUSE);
 		gtk_container_border_width(GTK_CONTAINER(configure_win), 10);
@@ -102,7 +104,7 @@
     gtk_container_add(GTK_CONTAINER(configure_win), vbox);
 
     /* add a frame for other xmms-jack options */
-    option_frame = gtk_frame_new("Options:");
+    option_frame = gtk_frame_new(_("Options:"));
     gtk_box_pack_start(GTK_BOX(vbox), option_frame, FALSE, FALSE, 0);
 
     /* add a hbox that will contain a label for a dropdown and the dropdown itself */
@@ -111,7 +113,7 @@
     gtk_container_add(GTK_CONTAINER(option_frame), port_connection_mode_box);
 
     /* add the label */
-    gtk_box_pack_start(GTK_BOX(port_connection_mode_box), gtk_label_new("Connection mode:"),
+    gtk_box_pack_start(GTK_BOX(port_connection_mode_box), gtk_label_new(_("Connection mode:")),
                        FALSE, FALSE, 0);
 
     /* add the dropdown */
@@ -123,7 +125,7 @@
                        TRUE, TRUE, 0);
 
     /* create a check_button for debug output */
-    GTK_isTraceEnabled = gtk_check_button_new_with_label("Enable debug printing");
+    GTK_isTraceEnabled = gtk_check_button_new_with_label(_("Enable debug printing"));
     gtk_box_pack_start(GTK_BOX(vbox), GTK_isTraceEnabled, FALSE, FALSE, 0);
     gtk_widget_show(GTK_isTraceEnabled);
 
@@ -135,14 +137,14 @@
     bbox = gtk_hbox_new(FALSE, 10);
     gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
 
-		ok = gtk_button_new_with_label(("Ok"));
+		ok = gtk_button_new_with_label(_("Ok"));
 		gtk_signal_connect(GTK_OBJECT(ok), "clicked", GTK_SIGNAL_FUNC(configure_win_ok_cb), NULL);
 		GTK_WIDGET_SET_FLAGS(ok, GTK_CAN_DEFAULT);
 		gtk_box_pack_start(GTK_BOX(bbox), ok, TRUE, TRUE, 0);
 		gtk_widget_show(ok);
 		gtk_widget_grab_default(ok);
 
-		cancel = gtk_button_new_with_label(("Cancel"));
+		cancel = gtk_button_new_with_label(_("Cancel"));
 		gtk_signal_connect_object(GTK_OBJECT(cancel), "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT(configure_win));
 		GTK_WIDGET_SET_FLAGS(cancel, GTK_CAN_DEFAULT);
 		gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 0);
--- a/src/jack/jack.c	Wed Jul 25 16:06:23 2007 -0500
+++ b/src/jack/jack.c	Wed Jul 25 23:21:07 2007 +0200
@@ -99,9 +99,9 @@
 void jack_sample_rate_error(void)
 {
 	dialog = gtk_dialog_new();
-	gtk_window_set_title(GTK_WINDOW(dialog), ("Sample rate mismatch"));
+	gtk_window_set_title(GTK_WINDOW(dialog), _("Sample rate mismatch"));
 	gtk_container_border_width(GTK_CONTAINER(dialog), 5);
-	label = gtk_label_new((
+	label = gtk_label_new(_(
 		"Xmms is asking for a sample rate that differs from\n "
 		"that of the jack server.  Xmms 1.2.8 or later\n"
 		"contains resampling routines that xmms-jack will\n"
@@ -115,7 +115,7 @@
 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), label, TRUE, TRUE, 0);
 	gtk_widget_show(label);
 
-	button = gtk_button_new_with_label((" Close "));
+	button = gtk_button_new_with_label(_(" Close "));
 	gtk_signal_connect_object(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT(dialog));
 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area), button, FALSE, FALSE, 0);
 	gtk_widget_show(button);
@@ -142,7 +142,7 @@
 gint jack_get_output_time(void)
 {
   gint return_val;
-  
+
   /* don't try to get any values if the device is still closed */
   if(JACK_GetState(driver) == CLOSED)
     return_val = 0;
@@ -182,7 +182,7 @@
 {
   /* setup the port connection mode that determines how bio2jack will connect ports */
   enum JACK_PORT_CONNECTION_MODE mode;
-  
+
   if(strcmp(jack_cfg.port_connection_mode, "CONNECT_ALL") == 0)
       mode = CONNECT_ALL;
   else if(strcmp(jack_cfg.port_connection_mode, "CONNECT_OUTPUT") == 0)
@@ -460,12 +460,12 @@
     TRACE("format changed, storing new values and opening/closing jack\n");
     TRACE("effect.format == %d, new_format == %d, effect.frequency == %ld, new_frequency == %d, effect.channels == %d, new_channels = %d\n",
 	  effect.format, new_format, effect.frequency, new_frequency, effect.channels, new_channels);
- 
+
     positionMS = JACK_GetPosition(driver, MILLISECONDS, PLAYED);
 
     jack_close();
     jack_open(new_format, new_frequency, new_channels);
- 
+
     /* restore the position after the open and close */
     JACK_SetState(driver, PAUSED);
     JACK_SetPosition(driver, MILLISECONDS, positionMS);
@@ -591,7 +591,7 @@
 void jack_about(void)
 {
 	static GtkWidget *aboutbox = NULL;
-	
+
 	if ( aboutbox == NULL )
 	{
 		aboutbox = xmms_show_message(
--- a/src/sndstretch/sndstretch_xmms.c	Wed Jul 25 16:06:23 2007 -0500
+++ b/src/sndstretch/sndstretch_xmms.c	Wed Jul 25 23:21:07 2007 +0200
@@ -24,8 +24,10 @@
 #include "sndstretch_xmms-logo.xpm"
 #include "FB_logo.xpm"
 
+#include "config.h"
 #include "audacious/configdb.h"
 #include "audacious/plugin.h"
+#include <audacious/i18n.h>
 #include <gtk/gtk.h>
 #include <math.h>
 #include <stdlib.h>
@@ -83,7 +85,7 @@
 
 static const char sndstretch_title_text[] = "SndStretch xmms - " SNDSTRETCH_VERSION_STRING;
 
-static const gchar sndstretch_about_text[] = 
+static const gchar sndstretch_about_text[] =
 	"Copyright (C) 2001 Florian Berger\n<harpin_floh@yahoo.de>\n"
 	"Ported to Audacious by Michael Färber\n"
 	"http://www.geocities.com/harpin_floh/home.html";
@@ -123,7 +125,7 @@
 {
 	GtkWidget * vbox, * scrolltext, * button;
 	GtkWidget * titlelabel, * copylabel;
-	GtkWidget * text; 
+	GtkWidget * text;
 	GtkTextBuffer * textbuffer;
 	GtkTextIter iter;
 
@@ -158,7 +160,7 @@
 
 	gtk_signal_connect(GTK_OBJECT(sndstretch_about_dialog), "destroy",
 					   GTK_SIGNAL_FUNC(sndstretch_about_destroy_cb), NULL);
-	gtk_window_set_title(GTK_WINDOW(sndstretch_about_dialog), "About SndStretch");
+	gtk_window_set_title(GTK_WINDOW(sndstretch_about_dialog), _("About SndStretch"));
 
 
 	/* labels */
@@ -318,8 +320,8 @@
 	SS.scale_adj = gtk_adjustment_new( 100.0*log(SS.scale)/log(2.0),
 									   -100, 100+10, 2, 10, 10);
 
-	volume_toggle  = gtk_check_button_new_with_label("Volume corr.");
-	overlap_toggle = gtk_check_button_new_with_label("Short Overlap");
+	volume_toggle  = gtk_check_button_new_with_label(_("Volume corr."));
+	overlap_toggle = gtk_check_button_new_with_label(_("Short Overlap"));
 	gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(volume_toggle), SS.volume_corr );
 	gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(overlap_toggle), SS.short_overlap );
 
@@ -373,10 +375,10 @@
 	gtk_box_pack_start(GTK_BOX(opt_hbox), volume_toggle, FALSE, TRUE, 5);
 	gtk_box_pack_start(GTK_BOX(opt_hbox), overlap_toggle,TRUE, TRUE, 5);
 
-	speed_frame   = gtk_frame_new("Speed");
-	pitch_frame   = gtk_frame_new("Pitch");
-	scale_frame   = gtk_frame_new("Scale");
-	opt_frame     = gtk_frame_new("Options");
+	speed_frame   = gtk_frame_new(_("Speed"));
+	pitch_frame   = gtk_frame_new(_("Pitch"));
+	scale_frame   = gtk_frame_new(_("Scale"));
+	opt_frame     = gtk_frame_new(_("Options"));
 	gtk_container_add(GTK_CONTAINER(speed_frame), speed_hbox);
 	gtk_container_add(GTK_CONTAINER(pitch_frame), pitch_hbox);
 	gtk_container_add(GTK_CONTAINER(scale_frame), scale_hbox);
@@ -395,10 +397,10 @@
 
 	gtk_signal_connect(GTK_OBJECT(sndstretch_config_dialog), "destroy",
 					   GTK_SIGNAL_FUNC(sndstretch_config_destroy_cb), NULL);
-	gtk_window_set_title(GTK_WINDOW(sndstretch_config_dialog), "SndStretch - Configuration");
+	gtk_window_set_title(GTK_WINDOW(sndstretch_config_dialog), _("SndStretch - Configuration"));
 	gtk_container_add(GTK_CONTAINER(sndstretch_config_dialog), vbox);
 
-	gtk_widget_set_usize(sndstretch_config_dialog, 275, -1);
+	gtk_widget_set_usize(sndstretch_config_dialog, -1, -1);
 	gtk_widget_show_all(sndstretch_config_dialog);
 }
 
--- a/src/song_change/song_change.c	Wed Jul 25 16:06:23 2007 -0500
+++ b/src/song_change/song_change.c	Wed Jul 25 23:21:07 2007 +0200
@@ -341,7 +341,7 @@
 	GtkWidget *song_frame, *song_vbox;
 	GtkWidget *bbox_hbox;
 	char *temp;
-	
+
 	read_config();
 
 	configure_vbox = gtk_vbox_new(FALSE, 12);
@@ -351,13 +351,13 @@
 	song_vbox = gtk_vbox_new(FALSE, 12);
 	gtk_container_set_border_width(GTK_CONTAINER(song_vbox), 6);
 	gtk_container_add(GTK_CONTAINER(song_frame), song_vbox);
-	
+
 	cmd_desc = gtk_label_new(_(
 		   "Command to run when Audacious starts a new song."));
 	gtk_label_set_justify(GTK_LABEL(cmd_desc), GTK_JUSTIFY_LEFT);
 	gtk_misc_set_alignment(GTK_MISC(cmd_desc), 0, 0.5);
 	gtk_box_pack_start(GTK_BOX(song_vbox), cmd_desc, FALSE, FALSE, 0);
-	gtk_label_set_line_wrap(GTK_LABEL(cmd_desc), TRUE);
+	gtk_label_set_line_wrap(GTK_LABEL(cmd_desc), FALSE);
 
 	cmd_hbox = gtk_hbox_new(FALSE, 6);
 	gtk_box_pack_start(GTK_BOX(song_vbox), cmd_hbox, FALSE, FALSE, 0);
--- a/src/tonegen/tonegen.c	Wed Jul 25 16:06:23 2007 -0500
+++ b/src/tonegen/tonegen.c	Wed Jul 25 23:21:07 2007 +0200
@@ -163,7 +163,7 @@
 	if (freqs == NULL)
 		return NULL;
 
-	title = g_strdup_printf("%s %.1f Hz", _("Tone Generator: "),
+	title = g_strdup_printf(_("%s %.1f Hz"), _("Tone Generator: "),
 				g_array_index(freqs, double, 0));
 	for (i = 1; i < freqs->len; i++)
 	{
@@ -177,7 +177,7 @@
 
 	return title;
 }
-	
+
 
 static void tone_play(InputPlayback *playback)
 {
@@ -235,7 +235,7 @@
 	*title = tone_title(filename);
 }
 
-static InputPlugin tone_ip = 
+static InputPlugin tone_ip =
 {
 	NULL,
 	NULL,