From 5668611cadff99faf78c19b54fa6a43c8e666fc4 Mon Sep 17 00:00:00 2001 From: Jordi Albornoz Date: Fri, 18 Oct 2002 00:54:33 +0000 Subject: [PATCH] include "../config.h" where needed to fix i18n. CList header i18n fixes. --- ChangeLog | 18 ++++++++++++++++++ src/client.c | 1 + src/commands.c | 3 +++ src/commands.h | 2 -- src/config.c | 3 +++ src/dialogs.c | 33 +++++++++++++++++---------------- src/fields.c | 3 +++ src/gtetrinet.c | 3 +++ src/keys.c | 1 + src/misc.c | 1 + src/partyline.c | 3 +++ src/sound.c | 1 + src/tetrinet.c | 3 +++ src/tetris.c | 1 + src/winlist.c | 2 ++ 15 files changed, 60 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index adc5ea4..96a0167 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2002-10-18 Jordi Mallach + + * src/client.c: tidy spacing between copyright header and code. + * src/keys.c: likewise. + * src/misc.c: likewise. + * src/sound.c: likewise. + * src/tetris.c: likewise. + + * src/commands.c: include "../config.h". + * src/commands.h: remove include. + * src/config.c: include "../config.h". + * src/dialogs.c: include "../config.h". CList header i18n fixes. + * src/fields.c: include "../config.h". + * src/gtetrinet.c: likewise. + * src/partyline.c: likewise. + * src/tetrinet.c: likewise. + * src/winlist.c: likewise. + 2002-10-17 Jordi Mallach * NEWS, configure.in: released gtetrinet 0.4.2. diff --git a/src/client.c b/src/client.c index 7ce0e04..0bbbc62 100644 --- a/src/client.c +++ b/src/client.c @@ -16,6 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + #include #include #include diff --git a/src/commands.c b/src/commands.c index 50123b5..70d29b5 100644 --- a/src/commands.c +++ b/src/commands.c @@ -16,6 +16,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +#include "../config.h" + #include #include #include diff --git a/src/commands.h b/src/commands.h index 043ac68..870f402 100644 --- a/src/commands.h +++ b/src/commands.h @@ -1,5 +1,3 @@ -#include "../config.h" - extern GnomeUIInfo menubar[]; extern GnomeUIInfo toolbar[]; diff --git a/src/config.c b/src/config.c index 9ea88ea..2d8f43e 100644 --- a/src/config.c +++ b/src/config.c @@ -16,6 +16,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +#include "../config.h" + #include #include #include diff --git a/src/dialogs.c b/src/dialogs.c index 117c2e8..43098bc 100644 --- a/src/dialogs.c +++ b/src/dialogs.c @@ -16,6 +16,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +#include "../config.h" + #include #include #include @@ -392,21 +395,7 @@ GtkWidget *namelabel, *authlabel, *desclabel; int themechanged, midichanged; -char *keytitles[] = { - N_("Action"), - N_("Key") -}; - -char *actions[K_NUM] = { - N_("Move right"), - N_("Move left"), - N_("Move down"), - N_("Rotate right"), - N_("Rotate left"), - N_("Drop piece"), - N_("Send Message") -}; - +char *actions[K_NUM]; int actionid[K_NUM] = { K_RIGHT, K_LEFT, @@ -437,6 +426,14 @@ void prefdialog_drawkeys (void) char *array[2]; int i; + actions[0] = _("Move right"); + actions[1] = _("Move left"); + actions[2] = _("Move down"); + actions[3] = _("Rotate right"); + actions[4] = _("Rotate left"); + actions[5] = _("Drop piece"); + actions[6] = _("Send message"); + for (i = 0; i < K_NUM; i ++) { array[0] = actions[i]; array[1] = keystr (newkeys[actionid[i]]); @@ -477,7 +474,7 @@ void prefdialog_changekey (GtkWidget *widget, gpointer data) if (pk_row == -1) return; - sprintf (buf, _("Press new key for %s"), actions[pk_row]); + sprintf (buf, _("Press new key for \"%s\""), actions[pk_row]); k = key_dialog (buf); if (k) { newkeys[actionid[pk_row]] = k; @@ -667,8 +664,12 @@ void prefdialog_apply (GnomePropertyBox *dialog, gint pagenum) void prefdialog_new (void) { GtkWidget *label, *table, *frame, *button, *button1, *widget, *table1, *divider; + char *keytitles[2]; int i; + keytitles[0] = _("Action"); + keytitles[1] = _("Key"); + prefdialog = gnome_property_box_new(); gtk_window_set_title(GTK_WINDOW(prefdialog), _("GTetrinet Preferences")); diff --git a/src/fields.c b/src/fields.c index db0e0ea..bfc8472 100644 --- a/src/fields.c +++ b/src/fields.c @@ -16,6 +16,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +#include "../config.h" + #include #include #include diff --git a/src/gtetrinet.c b/src/gtetrinet.c index e6a7580..7ffe535 100644 --- a/src/gtetrinet.c +++ b/src/gtetrinet.c @@ -16,6 +16,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +#include "../config.h" + #include #include #include diff --git a/src/keys.c b/src/keys.c index d77c86d..4ccb8e3 100644 --- a/src/keys.c +++ b/src/keys.c @@ -16,6 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + #include #include "keys.h" diff --git a/src/misc.c b/src/misc.c index a1c3747..eb5da18 100644 --- a/src/misc.c +++ b/src/misc.c @@ -16,6 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + #include #include #include diff --git a/src/partyline.c b/src/partyline.c index 2ec82a7..c3bac87 100644 --- a/src/partyline.c +++ b/src/partyline.c @@ -16,6 +16,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +#include "../config.h" + #include #include #include diff --git a/src/sound.c b/src/sound.c index 8f38a40..32aeb8c 100644 --- a/src/sound.c +++ b/src/sound.c @@ -16,6 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + #include #include #include diff --git a/src/tetrinet.c b/src/tetrinet.c index 3ab6282..db5392b 100644 --- a/src/tetrinet.c +++ b/src/tetrinet.c @@ -16,6 +16,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +#include "../config.h" + #include #include #include diff --git a/src/tetris.c b/src/tetris.c index 720e664..bab69d0 100644 --- a/src/tetris.c +++ b/src/tetris.c @@ -16,6 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + #include #include "client.h" diff --git a/src/winlist.c b/src/winlist.c index 2bd4acb..e6a6ef7 100644 --- a/src/winlist.c +++ b/src/winlist.c @@ -17,6 +17,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "../config.h" + #include #include #include -- 2.50.1