--- Begin Message ---
Package: gtkterm
Version: 0.99.5-1
Severity: minor
Tags: l10n patch
Hi,
while translating gtkterm to german, I've found some wrong spaces before
punctuation characters. This patch removes them.
Regards,
Chris
diff -ru gtkterm-0.99.5.orig//src/buffer.c gtkterm-0.99.5/src/buffer.c
--- gtkterm-0.99.5.orig//src/buffer.c 2010-03-22 15:59:10.000000000 +0100
+++ gtkterm-0.99.5/src/buffer.c 2010-03-22 16:02:20.000000000 +0100
@@ -89,7 +89,7 @@
if(buffer == NULL)
{
- i18n_printf(_("ERROR : Buffer is not initialized !\n"));
+ i18n_printf(_("ERROR : Buffer is not initialized!\n"));
return;
}
diff -ru gtkterm-0.99.5.orig//src/cmdline.c gtkterm-0.99.5/src/cmdline.c
--- gtkterm-0.99.5.orig//src/cmdline.c 2010-03-22 15:59:10.000000000 +0100
+++ gtkterm-0.99.5/src/cmdline.c 2010-03-22 16:05:19.000000000 +0100
@@ -37,7 +37,7 @@
i18n_printf(_("\t (c) Julien Schmitt - [email protected]\n"));
i18n_printf(_("\t http://www.jls-info.com/julien/linux\n";));
i18n_printf(_("\nThis program is released under the terms of the GPL V.2\n"));
- i18n_printf(_("\t ** Use at your own risks ! **\n"));
+ i18n_printf(_("\t ** Use at your own risks! **\n"));
i18n_printf(_("\nCommand line options\n"));
i18n_printf(_("--help or -h : this help screen\n"));
i18n_printf(_("--config <configuration> or -c : load configuration\n"));
diff -ru gtkterm-0.99.5.orig//src/config.c gtkterm-0.99.5/src/config.c
--- gtkterm-0.99.5.orig//src/config.c 2010-03-22 15:59:10.000000000 +0100
+++ gtkterm-0.99.5/src/config.c 2010-03-22 16:11:37.000000000 +0100
@@ -170,7 +170,7 @@
if(liste == NULL)
{
- show_message(_("No valid serial device found in /dev, sorry !\nYou should have at least one of these :\n/dev/ttyS*\n/dev/tts/*\n/dev/ttyUSB*\n/dev/usb/tts/*\n"), MSG_ERR);
+ show_message(_("No valid serial device found in /dev, sorry!\nYou should have at least one of these:\n/dev/ttyS*\n/dev/tts/*\n/dev/ttyUSB*\n/dev/usb/tts/*\n"), MSG_ERR);
return FALSE;
}
@@ -184,11 +184,11 @@
Table = gtk_table_new(4, 3, FALSE);
gtk_container_add(GTK_CONTAINER(Frame), Table);
- Label = gtk_label_new(_("Port :"));
+ Label = gtk_label_new(_("Port:"));
gtk_table_attach(GTK_TABLE(Table), Label, 0, 1, 0, 1, 0, 0, 10, 5);
- Label = gtk_label_new(_("Speed :"));
+ Label = gtk_label_new(_("Speed:"));
gtk_table_attach(GTK_TABLE(Table), Label, 1, 2, 0, 1, 0, 0, 10, 5);
- Label = gtk_label_new(_("Parity :"));
+ Label = gtk_label_new(_("Parity:"));
gtk_table_attach(GTK_TABLE(Table), Label, 2, 3, 0, 1, 0, 0, 10, 5);
Combo = gtk_combo_new();
@@ -249,11 +249,11 @@
gtk_table_attach(GTK_TABLE(Table), Combo, 2, 3, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 5, 5);
Combos[2] = Combo;
- Label = gtk_label_new(_("Bits :"));
+ Label = gtk_label_new(_("Bits:"));
gtk_table_attach(GTK_TABLE(Table), Label, 0, 1, 2, 3, 0, 0, 10, 5);
- Label = gtk_label_new(_("Stopbits :"));
+ Label = gtk_label_new(_("Stopbits:"));
gtk_table_attach(GTK_TABLE(Table), Label, 1, 2, 2, 3, 0, 0, 10, 5);
- Label = gtk_label_new(_("Flow control :"));
+ Label = gtk_label_new(_("Flow control:"));
gtk_table_attach(GTK_TABLE(Table), Label, 2, 3, 2, 3, 0, 0, 10, 5);
Combo = gtk_combo_new();
@@ -320,7 +320,7 @@
Table = gtk_table_new(2, 2, FALSE);
gtk_container_add(GTK_CONTAINER(Frame), Table);
- Label = gtk_label_new(_("End of line delay (milliseconds) :"));
+ Label = gtk_label_new(_("End of line delay (milliseconds):"));
gtk_table_attach_defaults(GTK_TABLE(Table), Label, 0, 1, 0, 1);
adj = gtk_adjustment_new(0.0, 0.0, 500.0, 10.0, 20.0, 0.0);
@@ -334,7 +334,7 @@
gtk_widget_set_sensitive(GTK_WIDGET(Entry), FALSE);
gtk_table_attach(GTK_TABLE(Table), Entry, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 5, 5);
- CheckBouton = gtk_check_button_new_with_label(_("Wait for this special character before passing to next line :"));
+ CheckBouton = gtk_check_button_new_with_label(_("Wait for this special character before passing to next line:"));
gtk_signal_connect(GTK_OBJECT(CheckBouton), "clicked", GTK_SIGNAL_FUNC(Grise_Degrise), (gpointer)Spin);
if(config.car != -1)
{
@@ -498,7 +498,7 @@
if(max == -1)
{
- show_message(_("Cannot read configuration file !\n"), MSG_ERR);
+ show_message(_("Cannot read configuration file!\n"), MSG_ERR);
return;
}
@@ -578,7 +578,7 @@
GTK_RESPONSE_ACCEPT,
NULL);
- label=gtk_label_new(_("Configuration name : "));
+ label=gtk_label_new(_("Configuration name: "));
box = gtk_hbox_new(FALSE, 0);
entry = gtk_entry_new();
@@ -623,12 +623,12 @@
{
if(remove_section(config_file, (char *)data) == -1)
{
- show_message(_("Cannot overwrite section !"), MSG_ERR);
+ show_message(_("Cannot overwrite section!"), MSG_ERR);
return;
}
if(max == cfgParse(config_file, cfg, CFG_INI))
{
- show_message(_("Cannot read configuration file !"), MSG_ERR);
+ show_message(_("Cannot read configuration file!"), MSG_ERR);
return;
}
max = cfgAllocForNewSection(cfg, (char *)data);
@@ -664,7 +664,7 @@
if(!strcmp(gtk_entry_get_text(GTK_ENTRY(edit)), cfgSectionNumberToName(i)))
{
/* section already exists */
- dialog = gtk_dialog_new_with_buttons (_("Warning !"),
+ dialog = gtk_dialog_new_with_buttons (_("Warning!"),
NULL,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_CANCEL,
@@ -673,7 +673,7 @@
GTK_RESPONSE_ACCEPT,
NULL);
- sprintf(text, _("\nSection [%s] already exists\nDo you want to overwrite it ?\n"), gtk_entry_get_text(GTK_ENTRY(edit)));
+ sprintf(text, _("\nSection [%s] already exists\nDo you want to overwrite it?\n"), gtk_entry_get_text(GTK_ENTRY(edit)));
label=gtk_label_new(text);
strcpy(text, gtk_entry_get_text(GTK_ENTRY(edit)));
g_signal_connect(GTK_OBJECT(dialog), "response", G_CALLBACK(really_save_config), (gpointer)text);
@@ -731,7 +731,7 @@
{
gtk_tree_model_get(GTK_TREE_MODEL(Modele), &iter, 0, (gint *)&txt, -1);
if(remove_section(config_file, txt) == -1)
- show_message(_("Cannot delete section !"), MSG_ERR);
+ show_message(_("Cannot delete section!"), MSG_ERR);
}
}
}
@@ -939,7 +939,7 @@
break;
default:
- string = g_strdup_printf(_("Unknown speed : %d bauds\nFalling back to default speed : %d bauds\n"), config.vitesse, DEFAULT_SPEED);
+ string = g_strdup_printf(_("Unknown speed: %d bauds\nFalling back to default speed: %d bauds\n"), config.vitesse, DEFAULT_SPEED);
show_message(string, MSG_ERR);
config.vitesse = DEFAULT_SPEED;
g_free(string);
@@ -947,7 +947,7 @@
if(config.stops != 1 && config.stops != 2)
{
- string = g_strdup_printf(_("Impossible stopbits number : %d\nFalling back to default stop bits number : %d\n"), config.stops, DEFAULT_STOP);
+ string = g_strdup_printf(_("Impossible stopbits number: %d\nFalling back to default stop bits number: %d\n"), config.stops, DEFAULT_STOP);
show_message(string, MSG_ERR);
config.stops = DEFAULT_STOP;
g_free(string);
@@ -955,7 +955,7 @@
if(config.bits < 5 || config.bits > 8)
{
- string = g_strdup_printf(_("Impossible bits number : %d\nFalling back to default stop bits : %d\n"), config.bits, DEFAULT_BITS);
+ string = g_strdup_printf(_("Impossible bits number: %d\nFalling back to default stop bits: %d\n"), config.bits, DEFAULT_BITS);
show_message(string, MSG_ERR);
config.bits = DEFAULT_BITS;
g_free(string);
diff -ru gtkterm-0.99.5.orig//src/fichier.c gtkterm-0.99.5/src/fichier.c
--- gtkterm-0.99.5.orig//src/fichier.c 2010-03-22 15:59:10.000000000 +0100
+++ gtkterm-0.99.5/src/fichier.c 2010-03-22 16:13:36.000000000 +0100
@@ -109,7 +109,7 @@
if(Fichier != -1)
{
fic_defaut = g_strdup(NomFichier);
- msg = g_strdup_printf(_("%s : transfer in progress..."), NomFichier);
+ msg = g_strdup_printf(_("%s: transfer in progress..."), NomFichier);
gtk_statusbar_push(GTK_STATUSBAR(StatusBar), id, msg);
car_written = 0;
@@ -153,7 +153,7 @@
else
{
g_free(str);
- str = g_strdup_printf(_("Cannot read file %s : %s\n"), NomFichier, strerror_utf8(errno));
+ str = g_strdup_printf(_("Cannot read file %s: %s\n"), NomFichier, strerror_utf8(errno));
show_message(str, MSG_ERR);
}
return FALSE;
@@ -298,7 +298,7 @@
if(Fic == NULL)
{
g_free(str);
- str = g_strdup_printf(_("Cannot open file %s : %s\n"), NomFichier, strerror_utf8(errno));
+ str = g_strdup_printf(_("Cannot open file %s: %s\n"), NomFichier, strerror_utf8(errno));
show_message(str, MSG_ERR);
}
else
diff -ru gtkterm-0.99.5.orig//src/macros.c gtkterm-0.99.5/src/macros.c
--- gtkterm-0.99.5.orig//src/macros.c 2010-03-22 15:59:10.000000000 +0100
+++ gtkterm-0.99.5/src/macros.c 2010-03-22 16:14:47.000000000 +0100
@@ -140,7 +140,7 @@
}
}
- str = g_strdup_printf(_("Macro \"%s\" sent !"), macros[(gint)number].shortcut);
+ str = g_strdup_printf(_("Macro \"%s\" sent!"), macros[(gint)number].shortcut);
Put_temp_message(str, 800);
g_free(str);
}
diff -ru gtkterm-0.99.5.orig//src/serie.c gtkterm-0.99.5/src/serie.c
--- gtkterm-0.99.5.orig//src/serie.c 2010-03-22 15:59:10.000000000 +0100
+++ gtkterm-0.99.5/src/serie.c 2010-03-22 16:16:52.000000000 +0100
@@ -209,7 +209,7 @@
if(serial_port_fd == -1)
{
g_free(str_err);
- str_err = g_strdup_printf(_("Cannot open %s : %s\n"), config.port, strerror_utf8(errno));
+ str_err = g_strdup_printf(_("Cannot open %s: %s\n"), config.port, strerror_utf8(errno));
show_message(str_err, MSG_ERR);
return NULL;
}
@@ -218,7 +218,7 @@
Ferme_Port();
return NULL;
}
- msg = g_strdup_printf("%s : %d,%d", config.port, config.vitesse, config.bits);
+ msg = g_strdup_printf("%s: %d,%d", config.port, config.vitesse, config.bits);
tcgetattr(serial_port_fd, &termios_p);
memcpy(&termios_save, &termios_p, sizeof(struct termios));
switch(config.vitesse)
@@ -467,7 +467,7 @@
}
if(pid > 0 && kill((pid_t)pid, 0) < 0 && errno == ESRCH)
{
- i18n_fprintf(stderr, _("Lockfile is stale. Overriding it..\n"));
+ i18n_fprintf(stderr, _("Lockfile is stale. Overriding it...\n"));
sleep(1);
unlink(lockfile);
}
diff -ru gtkterm-0.99.5.orig//src/widgets.c gtkterm-0.99.5/src/widgets.c
--- gtkterm-0.99.5.orig//src/widgets.c 2010-03-22 15:59:10.000000000 +0100
+++ gtkterm-0.99.5/src/widgets.c 2010-03-22 16:18:45.000000000 +0100
@@ -304,7 +304,7 @@
gtk_box_pack_start_defaults(GTK_BOX(BoiteH), display);
Hex_Box = gtk_hbox_new(TRUE, 0);
- Label = gtk_label_new(_("Hexadecimal data to send (separator : ';' or space) : "));
+ Label = gtk_label_new(_("Hexadecimal data to send (separator: ';' or space): "));
gtk_box_pack_start_defaults(GTK_BOX(Hex_Box), Label);
Hex_Send_Entry = gtk_entry_new();
gtk_signal_connect(GTK_OBJECT(Hex_Send_Entry), "activate", (GtkSignalFunc)Send_Hexadecimal, NULL);
@@ -507,7 +507,7 @@
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton, TRUE, TRUE, 0);
Label = gtk_label_new("");
- chaine = g_strdup_printf(_("\n <big><i> GTKTerm V. %s </i></big> \n\n\t(c) Julien Schmitt : [email protected] \n\thttp://www.jls-info.com/julien/linux\n";), VERSION);
+ chaine = g_strdup_printf(_("\n <big><i> GTKTerm V. %s </i></big> \n\n\t(c) Julien Schmitt: [email protected] \n\thttp://www.jls-info.com/julien/linux\n";), VERSION);
gtk_label_set_markup(GTK_LABEL(Label), chaine);
g_free(chaine);
gtk_label_set_selectable(GTK_LABEL(Label), TRUE);
@@ -551,7 +551,7 @@
if(param == 2)
{
sendbreak();
- Put_temp_message(_("Break signal sent !"), 800);
+ Put_temp_message(_("Break signal sent!"), 800);
}
else
Set_signals(param);
@@ -633,7 +633,7 @@
}
}
all_written[strlen(all_written) - 1] = 0;
- message = g_strdup_printf(_("\"%s\" : %d byte(s) sent !"), all_written, sent);
+ message = g_strdup_printf(_("\"%s\": %d byte(s) sent!"), all_written, sent);
Put_temp_message(message, 1500);
gtk_entry_set_text(GTK_ENTRY(widget), "");
g_free(message);
--- End Message ---
