include "../config.h" where needed to fix i18n. CList header i18n fixes.

diff --git a/ChangeLog b/ChangeLog
index adc5ea44caaedec3378efbdba04570d9df7ce048..96a016768aced0a4a3401793a187091fb91be825 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2002-10-18  Jordi Mallach  <jordi@sindominio.net>
+
+       * 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  <jordi@sindominio.net>
 
        * NEWS, configure.in: released gtetrinet 0.4.2.

diff --git a/src/client.c b/src/client.c
index 7ce0e0497a80034f6a6a41e8158dc262f8d1cac2..0bbbc620b19eb58738efb550b28530aaf5f5e117 100644 (file)
--- 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 <stdio.h>
 #include <string.h>
 #include <unistd.h>

diff --git a/src/commands.c b/src/commands.c
index 50123b5a376423421d1bad1d1bd61cd709d5a642..70d29b5a5ab8f5d608b49aa4885daf3ce4fc0978 100644 (file)
--- 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 <gtk/gtk.h>
 #include <gnome.h>
 #include <string.h>

diff --git a/src/commands.h b/src/commands.h
index 043ac682aefe62bde379aab75c154eec5aeecf5e..870f40229bc10ae201d0496ddc6f705cce875c87 100644 (file)
--- 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 9ea88ea1177fafe53d88a8997accdc986c615b36..2d8f43e8476c77876999fdd6b3a69e019541a836 100644 (file)
--- 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 <gtk/gtk.h>
 #include <gnome.h>
 #include <stdlib.h>

diff --git a/src/dialogs.c b/src/dialogs.c
index 117c2e897eba70267b7509ae9e2128b41a425df9..43098bc387c7f47e4e3886bb9c31e0015b916041 100644 (file)
--- 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 <gtk/gtk.h>
 #include <gnome.h>
 #include <sys/types.h>
@@ -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 db0e0ea5d3e1eb2d98ac093d4a5843c38cd12c3f..bfc84725d09fedad8499ab11ce64bfcb7f286b35 100644 (file)
--- 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 <gtk/gtk.h>
 #include <gnome.h>
 #include <gdk_imlib.h>

diff --git a/src/gtetrinet.c b/src/gtetrinet.c
index e6a7580503c42ad3f5e76d6591a61b2dc5b8cf3d..7ffe53556327e3d4a24c5f1b761dfb3351217368 100644 (file)
--- 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 <gtk/gtk.h>
 #include <gnome.h>
 #include <gdk_imlib.h>

diff --git a/src/keys.c b/src/keys.c
index d77c86da1341195212d5aaabd4f33bd590439d76..4ccb8e35daa0b11bb23c9f54cc4327ed63344cfa 100644 (file)
--- 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 <string.h>
 
 #include "keys.h"

diff --git a/src/misc.c b/src/misc.c
index a1c374777593d6d433cb9d184bed6ad250080608..eb5da1801350bf5d36ff5002463b4527a31c47a3 100644 (file)
--- 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 <gtk/gtk.h>
 #include <gnome.h>
 #include <unistd.h>

diff --git a/src/partyline.c b/src/partyline.c
index 2ec82a71d4b06c18b7434c906caa12ae5ec591d5..c3bac872f0fe6ed1f003bde75e3c471018949cc8 100644 (file)
--- 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 <gtk/gtk.h>
 #include <gnome.h>
 #include <string.h>

diff --git a/src/sound.c b/src/sound.c
index 8f38a40c9eb3e9e87e6b1f3b85fdf78492ccfcb8..32aeb8c828bd99f9eb2268fccf3c4384b14fb2fd 100644 (file)
--- 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 <gtk/gtk.h>
 #include <gnome.h>
 #include <sys/types.h>

diff --git a/src/tetrinet.c b/src/tetrinet.c
index 3ab6282b13e01b520b2e7c110f47255641040b83..db5392b31c64fd5b03612207eeb704cbb2f66733 100644 (file)
--- 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 <gtk/gtk.h>
 #include <gnome.h>
 #include <stdlib.h>

diff --git a/src/tetris.c b/src/tetris.c
index 720e664cfef985581c72b07a4a6d29befdd029b7..bab69d05a149dbfe1103c2e9dad7cc82aa0d83e5 100644 (file)
--- 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 <string.h>
 
 #include "client.h"

diff --git a/src/winlist.c b/src/winlist.c
index 2bd4acb1bac1f99567034d150366173b597f24ea..e6a6ef782c320a64b66496945667bc37faf3e406 100644 (file)
--- 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 <gtk/gtk.h>
 #include <gnome.h>
 #include <string.h>