diff --git a/ChangeLog b/ChangeLog
index 01f72f27..e43891b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1842,3 +1842,10 @@ Use _NET_WM_STATE_SKIP_PAGER and _NET_WM_STATE_SKIP_TASKBAR to hide them as desi
 (fixes menu's in taskbar problem).
 (Re)enable focusing of dock type windows.
 Commented out some unused code (ewin->expanded_*).
+
+-------------------------------------------------------------------------------
+
+Sun May  4 21:14:35 EDT 2003
+(KainX)
+
+Fix a seg fault during restart.  Also some cleanups.
diff --git a/dox/file.c b/dox/file.c
index 6d0f88fd..f5fad2f5 100644
--- a/dox/file.c
+++ b/dox/file.c
@@ -625,13 +625,13 @@ word_mb(char *s, int num, char *wd, int *spaceflag)
    }                   *cc, char_class_tbl[] = {
 #ifdef linux
 	/* Will be supported on glibc 2.1.3 or later */
-	{"jspace"}, {"jhira"}, {"jkata"}, {"jkanji"}, {"jdigit"},/* Japanese */
-	{"hangul"}, {"hanja"},                                   /* Korean    */
+	{"jspace", 0}, {"jhira", 0}, {"jkata", 0}, {"jkanji", 0}, {"jdigit", 0},/* Japanese */
+	{"hangul", 0}, {"hanja", 0},                                   /* Korean    */
 	/* {"?????"}, {"?????"},*/                               /* Chinese   */
 #endif
 #ifdef sgi
 	  /* SGI IRIX (Japanese, Chinese, Korean, etc..) */
-	  {"special"}, {"phonogram"}, {"ideogram"},
+	  {"special", 0}, {"phonogram", 0}, {"ideogram", 0},
 #endif
 #ifdef sun
 	/* {"?????"}, {"?????"},*/
@@ -639,7 +639,7 @@ word_mb(char *s, int num, char *wd, int *spaceflag)
 #ifdef hpux
 	/* {"?????"}, {"?????"},*/
 #endif
-	  {NULL}
+	  {NULL, 0}
    };
 
 
diff --git a/dox/ttfont.c b/dox/ttfont.c
index 50d66cce..9334c233 100644
--- a/dox/ttfont.c
+++ b/dox/ttfont.c
@@ -39,48 +39,103 @@ static unsigned char alpha_lut[5] =
 static unsigned char bounded_palette[9] =
 {0, 1, 2, 3, 4, 4, 4, 4, 4};
 
+
 struct _imlib_encoding_map {
-  unsigned short char_map[96];
+   unsigned short      char_map[98];
 };
 
-typedef struct _imlib_encoding_map ImlibEncodingMap ;
+typedef struct _imlib_encoding_map ImlibEncodingMap;
 
 /* Encoding maps */
-static const ImlibEncodingMap iso1 =
-{
-  /* ISO-8859-1 encoding (conversion to UTF-8) */
-  0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF, 0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, 0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF, 0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, 0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF
+static const ImlibEncodingMap iso1 = {
+    {
+        /* ISO-8859-1 encoding (conversion to UTF-8) */
+        0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8,
+        0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, 0x00B0, 0x00B1,
+        0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x00BA,
+        0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF, 0x00C0, 0x00C1, 0x00C2, 0x00C3,
+        0x00C4, 0x00C5, 0x00C6, 0x00C7, 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC,
+        0x00CD, 0x00CE, 0x00CF, 0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5,
+        0x00D6, 0x00D7, 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE,
+        0x00DF, 0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
+        0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, 0x00F0,
+        0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, 0x00F8, 0x00F9,
+        0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF
+    }
 };
 
-static const ImlibEncodingMap iso2 =
-{
-  /* ISO-8859-2 encoding (conversion to UTF-8) */
-  0x00A0, 0x0104, 0x02D8, 0x0141, 0x00A4, 0x013D, 0x015A, 0x00A7, 0x00A8, 0x0160, 0x015E, 0x0164, 0x0179, 0x00AD, 0x017D, 0x017B, 0x00B0, 0x0105, 0x02DB, 0x0142, 0x00B4, 0x013E, 0x015B, 0x02C7, 0x00B8, 0x0161, 0x015F, 0x0165, 0x017A, 0x02DD, 0x017E, 0x017C, 0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7, 0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E, 0x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7, 0x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF, 0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7, 0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F, 0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7, 0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9
+static const ImlibEncodingMap iso2 = {
+    {
+        /* ISO-8859-2 encoding (conversion to UTF-8) */
+        0x00A0, 0x0104, 0x02D8, 0x0141, 0x00A4, 0x013D, 0x015A, 0x00A7, 0x00A8,
+        0x0160, 0x015E, 0x0164, 0x0179, 0x00AD, 0x017D, 0x017B, 0x00B0, 0x0105,
+        0x02DB, 0x0142, 0x00B4, 0x013E, 0x015B, 0x02C7, 0x00B8, 0x0161, 0x015F,
+        0x0165, 0x017A, 0x02DD, 0x017E, 0x017C, 0x0154, 0x00C1, 0x00C2, 0x0102,
+        0x00C4, 0x0139, 0x0106, 0x00C7, 0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A,
+        0x00CD, 0x00CE, 0x010E, 0x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150,
+        0x00D6, 0x00D7, 0x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162,
+        0x00DF, 0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7,
+        0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F, 0x0111,
+        0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7, 0x0159, 0x016F,
+        0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9
+    }
 };
 
-static const ImlibEncodingMap iso3 =
-{
-  /* ISO-8859-3 encoding (conversion to UTF-8) */
-  0x00A0, 0x0126, 0x02D8, 0x00A3, 0x00A4, 0x0124, 0x00A7, 0x00A8, 0x0130, 0x015E, 0x011E, 0x0134, 0x00AD, 0x017B, 0x00B0, 0x0127, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x0125, 0x00B7, 0x00B8, 0x0131, 0x015F, 0x011F, 0x0135, 0x00BD, 0x017C, 0x00C0, 0x00C1, 0x00C2, 0x00C4, 0x010A, 0x0108, 0x00C7, 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x0120, 0x00D6, 0x00D7, 0x011C, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x016C, 0x015C, 0x00DF, 0x00E0, 0x00E1, 0x00E2, 0x00E4, 0x010B, 0x0109, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x0121, 0x00F6, 0x00F7, 0x011D, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x016D, 0x015D, 0x02D9
+static const ImlibEncodingMap iso3 = {
+    {
+        /* ISO-8859-3 encoding (conversion to UTF-8) */
+        0x00A0, 0x0126, 0x02D8, 0x00A3, 0x00A4, 0x0124, 0x00A7, 0x00A8, 0x0130,
+        0x015E, 0x011E, 0x0134, 0x00AD, 0x017B, 0x00B0, 0x0127, 0x00B2, 0x00B3,
+        0x00B4, 0x00B5, 0x0125, 0x00B7, 0x00B8, 0x0131, 0x015F, 0x011F, 0x0135,
+        0x00BD, 0x017C, 0x00C0, 0x00C1, 0x00C2, 0x00C4, 0x010A, 0x0108, 0x00C7,
+        0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, 0x00D1,
+        0x00D2, 0x00D3, 0x00D4, 0x0120, 0x00D6, 0x00D7, 0x011C, 0x00D9, 0x00DA,
+        0x00DB, 0x00DC, 0x016C, 0x015C, 0x00DF, 0x00E0, 0x00E1, 0x00E2, 0x00E4,
+        0x010B, 0x0109, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED,
+        0x00EE, 0x00EF, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x0121, 0x00F6, 0x00F7,
+        0x011D, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x016D, 0x015D, 0x02D9
+    }
 };
 
-static const ImlibEncodingMap iso4 =
-{
-  /* ISO-8859-4 encoding (conversion to UTF-8) */
-  0x00A0, 0x0104, 0x0138, 0x0156, 0x00A4, 0x0128, 0x013B, 0x00A7, 0x00A8, 0x0160, 0x0112, 0x0122, 0x0166, 0x00AD, 0x017D, 0x00AF, 0x00B0, 0x0105, 0x02DB, 0x0157, 0x00B4, 0x0129, 0x013C, 0x02C7, 0x00B8, 0x0161, 0x0113, 0x0123, 0x0167, 0x014A, 0x017E, 0x014B, 0x0100, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x012E, 0x010C, 0x00C9, 0x0118, 0x00CB, 0x0116, 0x00CD, 0x00CE, 0x012A, 0x0110, 0x0145, 0x014C, 0x0136, 0x00D4, 0x00D5, 0x00D6, 0x00D7, 0x00D8, 0x0172, 0x00DA, 0x00DB, 0x00DC, 0x0168, 0x016A, 0x00DF, 0x0101, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x012F, 0x010D, 0x00E9, 0x0119, 0x00EB, 0x0117, 0x00ED, 0x00EE, 0x012B, 0x0111, 0x0146, 0x014D, 0x0137, 0x00F4, 0x00F5, 0x00F6, 0x00F7, 0x00F8, 0x0173, 0x00FA, 0x00FB, 0x00FC, 0x0169, 0x016B, 0x02D9
+static const ImlibEncodingMap iso4 = {
+    {
+        /* ISO-8859-4 encoding (conversion to UTF-8) */
+        0x00A0, 0x0104, 0x0138, 0x0156, 0x00A4, 0x0128, 0x013B, 0x00A7, 0x00A8,
+        0x0160, 0x0112, 0x0122, 0x0166, 0x00AD, 0x017D, 0x00AF, 0x00B0, 0x0105,
+        0x02DB, 0x0157, 0x00B4, 0x0129, 0x013C, 0x02C7, 0x00B8, 0x0161, 0x0113,
+        0x0123, 0x0167, 0x014A, 0x017E, 0x014B, 0x0100, 0x00C1, 0x00C2, 0x00C3,
+        0x00C4, 0x00C5, 0x00C6, 0x012E, 0x010C, 0x00C9, 0x0118, 0x00CB, 0x0116,
+        0x00CD, 0x00CE, 0x012A, 0x0110, 0x0145, 0x014C, 0x0136, 0x00D4, 0x00D5,
+        0x00D6, 0x00D7, 0x00D8, 0x0172, 0x00DA, 0x00DB, 0x00DC, 0x0168, 0x016A,
+        0x00DF, 0x0101, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x012F,
+        0x010D, 0x00E9, 0x0119, 0x00EB, 0x0117, 0x00ED, 0x00EE, 0x012B, 0x0111,
+        0x0146, 0x014D, 0x0137, 0x00F4, 0x00F5, 0x00F6, 0x00F7, 0x00F8, 0x0173,
+        0x00FA, 0x00FB, 0x00FC, 0x0169, 0x016B, 0x02D9
+    }
 };
 
-static const ImlibEncodingMap iso5 =
-{
-  /* ISO-8859-5 encoding (conversion to UTF-8) */
-  0x00A0, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406, 0x0407, 0x0408, 0x0409, 0x040A, 0x040B, 0x040C, 0x00AD, 0x040E, 0x040F, 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F, 0x2116, 0x0451, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457, 0x0458, 0x0459, 0x045A, 0x045B, 0x045C, 0x00A7, 0x045E, 0x045F
+static const ImlibEncodingMap iso5 = {
+    {
+        /* ISO-8859-5 encoding (conversion to UTF-8) */
+        0x00A0, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406, 0x0407, 0x0408,
+        0x0409, 0x040A, 0x040B, 0x040C, 0x00AD, 0x040E, 0x040F, 0x0410, 0x0411,
+        0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, 0x0418, 0x0419, 0x041A,
+        0x041B, 0x041C, 0x041D, 0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x0423,
+        0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C,
+        0x042D, 0x042E, 0x042F, 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435,
+        0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E,
+        0x043F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
+        0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F, 0x2116,
+        0x0451, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457, 0x0458, 0x0459,
+        0x045A, 0x045B, 0x045C, 0x00A7, 0x045E, 0x045F
+    }
 };
 
 static const ImlibEncodingMap* _imlib_encodings[5] = { &iso1, &iso2, &iso3, &iso4, &iso5 };
 int IsoEncoding = ENCOING_ISO_8859_1;
 char encoding_initialized = 0;
 
-void          
+static void          
 __init_iso_encoding()
 {
   /* Set the current ISO encoding based on (in that order):
diff --git a/e.rh.spec b/e.rh.spec
index 7390139b..969f37ce 100644
--- a/e.rh.spec
+++ b/e.rh.spec
@@ -1,7 +1,7 @@
 Summary: The Enlightenment window manager.
 Name: enlightenment
 Version: 0.16.6
-Release: 0.11
+Release: 0.12
 Copyright: BSD
 Group: User Interface/Desktops
 Source: ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment-%{version}.tar.gz
diff --git a/e.spec b/e.spec
index 0a289029..e58baed3 100644
--- a/e.spec
+++ b/e.spec
@@ -1,7 +1,7 @@
 Summary: The Enlightenment window manager.
 Name: enlightenment
 Version: 0.16.6
-Release: 0.11
+Release: 0.12
 Copyright: BSD
 Group: User Interface/Desktops
 Source: ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment-%{version}.tar.gz
diff --git a/epp/cpperror.c b/epp/cpperror.c
index 171f1044..7fce8d8a 100644
--- a/epp/cpperror.c
+++ b/epp/cpperror.c
@@ -23,6 +23,7 @@
  * what you give them.   Help stamp out software-hoarding!  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include "header.h"
 
 /* Print the file names and line numbers of the #include
diff --git a/epp/cpplib.c b/epp/cpplib.c
index 71080daa..002d1292 100644
--- a/epp/cpplib.c
+++ b/epp/cpplib.c
@@ -4199,7 +4199,7 @@ do_pragma(pfile, keyword, buf, limit)
 
 	fname = p + 1;
 	p = (unsigned char *)index(fname, '\"');
-	fname_len = p != NULL ? p - fname : strlen((char *)fname);
+	fname_len = (int) (((int) (p != NULL)) ? ((int) (p - fname)) : ((int) (strlen((char *)fname))));
 
 	for (ptr = pfile->all_include_files; ptr; ptr = ptr->next)
 	  {
diff --git a/epp/cppmain.c b/epp/cppmain.c
index 62eceefe..8432d9c1 100644
--- a/epp/cppmain.c
+++ b/epp/cppmain.c
@@ -23,6 +23,7 @@
 #include "header.h"
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include "config.h"
 
diff --git a/po/de.po b/po/de.po
index a972cf28..b0c6d960 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment 0.16.5\n"
-"POT-Creation-Date: 2003-05-04 12:33+0200\n"
+"POT-Creation-Date: 2003-05-04 19:58-0400\n"
 "PO-Revision-Date: 2000-03-29 21:12+0200\n"
 "Last-Translator: Matthias Warkus <mawa@iname.com>\n"
 "Language-Team: Enlightenment l10n <e-develop@enlightenment.org>\n"
@@ -1473,7 +1473,6 @@ msgstr ""
 "Code aktuell bis     : %s\n"
 
 # src/main.c:89
-#. Set up all the text bits that belong on the GSOD
 #: src/main.c:89
 msgid "Enlightenment Message Dialog"
 msgstr "Enlightenment-Meldungsfenster"
@@ -1685,28 +1684,28 @@ msgstr ""
 "Der Fehler trat auf in %s, Zeile %d.\n"
 
 # src/menus.c:1947
-#: src/menus.c:1967
+#: src/menus.c:1973
 msgid "Go to this Desktop"
 msgstr "Zu diesem Desktop gehen"
 
 # src/menus.c:1964
-#: src/menus.c:1983
+#: src/menus.c:1989
 #, c-format
 msgid "Desktop %i"
 msgstr "Desktop %i"
 
 # src/menus.c:2027
-#: src/menus.c:2046
+#: src/menus.c:2052
 msgid "Show/Hide this group"
 msgstr "Diese Gruppe zeigen/verbergen"
 
 # src/menus.c:2031
-#: src/menus.c:2049
+#: src/menus.c:2055
 msgid "Iconify this group"
 msgstr "Diese Gruppe minimieren"
 
 # src/menus.c:2044
-#: src/menus.c:2061
+#: src/menus.c:2067
 #, c-format
 msgid "Group %i"
 msgstr "Gruppe %i"
diff --git a/po/dk.po b/po/dk.po
index 66c767ec..38d7d657 100644
--- a/po/dk.po
+++ b/po/dk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment 0.16.5\n"
-"POT-Creation-Date: 2003-05-04 12:33+0200\n"
+"POT-Creation-Date: 2003-05-04 19:58-0400\n"
 "PO-Revision-Date: 2000-03-02 16:23+0100\n"
 "Last-Translator: Birger Langkjer <birger.langkjer@image.dk>\n"
 "Language-Team: Dansk/Danish <sslug-locale@sslug.dk>\n"
@@ -1096,7 +1096,6 @@ msgstr ""
 "Enlightenment version : %s\n"
 "kode er fra dato      : %s\n"
 
-#. Set up all the text bits that belong on the GSOD
 #: src/main.c:89
 msgid "Enlightenment Message Dialog"
 msgstr "Enlightenment meddelelsesdialog"
@@ -1227,24 +1226,24 @@ msgid ""
 "The error occurred at %s, line %d.\n"
 msgstr ""
 
-#: src/menus.c:1967
+#: src/menus.c:1973
 msgid "Go to this Desktop"
 msgstr "Gå til dette skrivebord"
 
-#: src/menus.c:1983
+#: src/menus.c:1989
 #, c-format
 msgid "Desktop %i"
 msgstr "Skrivebord %i"
 
-#: src/menus.c:2046
+#: src/menus.c:2052
 msgid "Show/Hide this group"
 msgstr "Vis/skjul denne gruppe"
 
-#: src/menus.c:2049
+#: src/menus.c:2055
 msgid "Iconify this group"
 msgstr "Ikonificér denne gruppe"
 
-#: src/menus.c:2061
+#: src/menus.c:2067
 #, c-format
 msgid "Group %i"
 msgstr "Gruppe %i"
diff --git a/po/en_US.po b/po/en_US.po
index c18a3bcb..e33846d1 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment 0.16.5\n"
-"POT-Creation-Date: 2003-05-04 12:33+0200\n"
+"POT-Creation-Date: 2003-05-04 19:58-0400\n"
 "PO-Revision-Date: 2000-01-04 23:15+0100\n"
 "Last-Translator: Peter Kjellerstedt <pkj@axis.com>\n"
 "Language-Team: American English <en@li.org>\n"
@@ -1004,7 +1004,6 @@ msgid ""
 "code is current to    : %s\n"
 msgstr ""
 
-#. Set up all the text bits that belong on the GSOD
 #: src/main.c:89
 msgid "Enlightenment Message Dialog"
 msgstr ""
@@ -1133,24 +1132,24 @@ msgid ""
 "The error occurred at %s, line %d.\n"
 msgstr ""
 
-#: src/menus.c:1967
+#: src/menus.c:1973
 msgid "Go to this Desktop"
 msgstr ""
 
-#: src/menus.c:1983
+#: src/menus.c:1989
 #, c-format
 msgid "Desktop %i"
 msgstr ""
 
-#: src/menus.c:2046
+#: src/menus.c:2052
 msgid "Show/Hide this group"
 msgstr ""
 
-#: src/menus.c:2049
+#: src/menus.c:2055
 msgid "Iconify this group"
 msgstr ""
 
-#: src/menus.c:2061
+#: src/menus.c:2067
 #, c-format
 msgid "Group %i"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 5d813659..4e850354 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment 0.16.5\n"
-"POT-Creation-Date: 2003-05-04 12:33+0200\n"
+"POT-Creation-Date: 2003-05-04 19:58-0400\n"
 "PO-Revision-Date: 2000-04-09 18:46+0200\n"
 "Last-Translator: Antonio Ognio Cesti  <ognio@altavista.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -1320,7 +1320,6 @@ msgstr ""
 "Versión de Enlightenment: %s\n"
 "Código actualizado al   : %s\n"
 
-#. Set up all the text bits that belong on the GSOD
 #: src/main.c:89
 msgid "Enlightenment Message Dialog"
 msgstr "Diálogo de Mensajes de Enlightenment"
@@ -1509,24 +1508,24 @@ msgstr ""
 "El valor del apuntador fue %x.\n"
 "El error ocurrió en %s, línea %d.\n"
 
-#: src/menus.c:1967
+#: src/menus.c:1973
 msgid "Go to this Desktop"
 msgstr "Ir a este Escritorio"
 
-#: src/menus.c:1983
+#: src/menus.c:1989
 #, c-format
 msgid "Desktop %i"
 msgstr "Escritorio %i"
 
-#: src/menus.c:2046
+#: src/menus.c:2052
 msgid "Show/Hide this group"
 msgstr "Mostrar/Ocultar este grupo"
 
-#: src/menus.c:2049
+#: src/menus.c:2055
 msgid "Iconify this group"
 msgstr "Iconizar este grupo"
 
-#: src/menus.c:2061
+#: src/menus.c:2067
 #, c-format
 msgid "Group %i"
 msgstr "Grupo %i"
diff --git a/po/fr.po b/po/fr.po
index e85b2145..cf2a71e3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment 0.16.5\n"
-"POT-Creation-Date: 2003-05-04 12:33+0200\n"
+"POT-Creation-Date: 2003-05-04 19:58-0400\n"
 "PO-Revision-Date: 2000-01-05 00:25+0100\n"
 "Last-Translator: Sylvain GIL <tootella@tootella.com>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -1257,7 +1257,6 @@ msgstr ""
 "Version d'Enlightenment : %s\n"
 "code courant            : %s\n"
 
-#. Set up all the text bits that belong on the GSOD
 #: src/main.c:89
 msgid "Enlightenment Message Dialog"
 msgstr "Boite de dialogue Enlightenment"
@@ -1446,24 +1445,24 @@ msgstr ""
 "La valeur du pointeur était %x.\n"
 "L'erreur a eu lieu dans %s, ligne %d.\n"
 
-#: src/menus.c:1967
+#: src/menus.c:1973
 msgid "Go to this Desktop"
 msgstr "Aller à ce bureau"
 
-#: src/menus.c:1983
+#: src/menus.c:1989
 #, c-format
 msgid "Desktop %i"
 msgstr "Bureau %i"
 
-#: src/menus.c:2046
+#: src/menus.c:2052
 msgid "Show/Hide this group"
 msgstr "Montrer/Cacher ce groupe"
 
-#: src/menus.c:2049
+#: src/menus.c:2055
 msgid "Iconify this group"
 msgstr "Iconifier ce groupe"
 
-#: src/menus.c:2061
+#: src/menus.c:2067
 #, c-format
 msgid "Group %i"
 msgstr "Groupe %i"
diff --git a/po/hu.po b/po/hu.po
index 062eaa61..fa4b59e6 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment 0.16.5\n"
-"POT-Creation-Date: 2003-05-04 12:33+0200\n"
+"POT-Creation-Date: 2003-05-04 19:58-0400\n"
 "PO-Revision-Date: 2000-01-04 23:15+0100\n"
 "Last-Translator: Gergely Egerváry <mauzi@poli.hu>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
@@ -990,7 +990,6 @@ msgstr ""
 "Enlightenment verzió     : %s\n"
 "a kód utoljára frissítve : %s\n"
 
-#. Set up all the text bits that belong on the GSOD
 #: src/main.c:89
 msgid "Enlightenment Message Dialog"
 msgstr "Enlightenment üzenetablak"
@@ -1121,24 +1120,24 @@ msgid ""
 "The error occurred at %s, line %d.\n"
 msgstr ""
 
-#: src/menus.c:1967
+#: src/menus.c:1973
 msgid "Go to this Desktop"
 msgstr "Ugrás erre az asztalra"
 
-#: src/menus.c:1983
+#: src/menus.c:1989
 #, c-format
 msgid "Desktop %i"
 msgstr "%i. asztal"
 
-#: src/menus.c:2046
+#: src/menus.c:2052
 msgid "Show/Hide this group"
 msgstr "Csoport mutatása/elrejtése"
 
-#: src/menus.c:2049
+#: src/menus.c:2055
 msgid "Iconify this group"
 msgstr "Csoport kicsinyítése"
 
-#: src/menus.c:2061
+#: src/menus.c:2067
 #, c-format
 msgid "Group %i"
 msgstr "%i. csoport"
diff --git a/po/ja.po b/po/ja.po
index 9b26ee81..a7d3b2e6 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment 0.16.5\n"
-"POT-Creation-Date: 2003-05-04 12:33+0200\n"
+"POT-Creation-Date: 2003-05-04 19:58-0400\n"
 "PO-Revision-Date: 2001-01-07 14:00+0900\n"
 "Last-Translator: Enlightenment-jp Mailing List <enlightenment-jp@UaUa.ORG>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -1301,7 +1301,6 @@ msgstr ""
 "Enlightenment ¥Ð¡¼¥¸¥ç¥ó: %s\n"
 "¥³¡¼¥É¥Ð¡¼¥¸¥ç¥ó        : %s\n"
 
-#. Set up all the text bits that belong on the GSOD
 #: src/main.c:89
 msgid "Enlightenment Message Dialog"
 msgstr "Enlightenment ¥á¥Ã¥»¡¼¥¸¥À¥¤¥¢¥í¥°"
@@ -1488,24 +1487,24 @@ msgstr ""
 "¥Ý¥¤¥ó¥¿¤ÎÃÍ¤Ï %x ¤Ç¤¹¡£\n"
 "¤³¤Î¥¨¥é¡¼¤Ï %s ¤Î %d ¹Ô¤ÇÀ¸¤¸¤Þ¤·¤¿¡£\n"
 
-#: src/menus.c:1967
+#: src/menus.c:1973
 msgid "Go to this Desktop"
 msgstr "¤³¤Î¥Ç¥¹¥¯¥È¥Ã¥×¤Ë°ÜÆ°"
 
-#: src/menus.c:1983
+#: src/menus.c:1989
 #, c-format
 msgid "Desktop %i"
 msgstr "¥Ç¥¹¥¯¥È¥Ã¥× %i"
 
-#: src/menus.c:2046
+#: src/menus.c:2052
 msgid "Show/Hide this group"
 msgstr "¤³¤Î¥°¥ë¡¼¥×¤ò ɽ¼¨/Èóɽ¼¨ ¤Ë¤¹¤ë"
 
-#: src/menus.c:2049
+#: src/menus.c:2055
 msgid "Iconify this group"
 msgstr "¤³¤Î¥°¥ë¡¼¥×¤ò¥¢¥¤¥³¥ó¤Ë"
 
-#: src/menus.c:2061
+#: src/menus.c:2067
 #, c-format
 msgid "Group %i"
 msgstr "¥°¥ë¡¼¥× %i"
diff --git a/po/ko.po b/po/ko.po
index fe467079..cda2a5d4 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment 0.16.5\n"
-"POT-Creation-Date: 2003-05-04 12:33+0200\n"
+"POT-Creation-Date: 2003-05-04 19:58-0400\n"
 "PO-Revision-Date: 2000-04-10 16:10:30+0900\n"
 "Last-Translator: Sung-Hyun Nam <namsh@kldp.org>\n"
 "Language-Team: Korean <ko@li.org>\n"
@@ -1276,7 +1276,6 @@ msgstr ""
 "ÀζóÀÌÆ°¸ÕÆ® ¹öÀü : %s\n"
 "ÇöÀçÀÇ ÄÚµå       : %s\n"
 
-#. Set up all the text bits that belong on the GSOD
 #: src/main.c:89
 msgid "Enlightenment Message Dialog"
 msgstr "ÀζóÀÌÆ°¸ÕÆ® ¸Þ½ÃÁö ´ëÈ­»óÀÚ"
@@ -1462,24 +1461,24 @@ msgstr ""
 "Æ÷ÀÎÅÍ °ªÀº %x À̾ú½À´Ï´Ù.\n"
 "ÀÌ ¿¡·¯´Â %s, %d ¶óÀο¡¼­ ¹ß»ýÇß½À´Ï´Ù.\n"
 
-#: src/menus.c:1967
+#: src/menus.c:1973
 msgid "Go to this Desktop"
 msgstr "ÀÌ µ¥½ºÅ©Å¾À¸·Î °¡±â"
 
-#: src/menus.c:1983
+#: src/menus.c:1989
 #, c-format
 msgid "Desktop %i"
 msgstr "µ¥½ºÅ©Å¾ %i"
 
-#: src/menus.c:2046
+#: src/menus.c:2052
 msgid "Show/Hide this group"
 msgstr "ÀÌ ±×·ì º¸¿©ÁÖ±â/¼û±â±â"
 
-#: src/menus.c:2049
+#: src/menus.c:2055
 msgid "Iconify this group"
 msgstr "ÀÌ ±×·ì ¾ÆÀÌÄÜÈ­"
 
-#: src/menus.c:2061
+#: src/menus.c:2067
 #, c-format
 msgid "Group %i"
 msgstr "±×·ì %i"
diff --git a/po/nl.po b/po/nl.po
index 45a0f284..a140d3c0 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment 0.16.5\n"
-"POT-Creation-Date: 2003-05-04 12:33+0200\n"
+"POT-Creation-Date: 2003-05-04 19:58-0400\n"
 "PO-Revision-Date: 2000-01-04 23:15+0100\n"
 "Last-Translator: Dènis Riedijk <ried@si.tn.tudelft.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -1123,7 +1123,6 @@ msgstr ""
 "Enlightenment Versie : %s\n"
 "code is van datum    : %s\n"
 
-#. Set up all the text bits that belong on the GSOD
 #: src/main.c:89
 msgid "Enlightenment Message Dialog"
 msgstr "Enlightenment Bericht Dialoog"
@@ -1254,24 +1253,24 @@ msgid ""
 "The error occurred at %s, line %d.\n"
 msgstr ""
 
-#: src/menus.c:1967
+#: src/menus.c:1973
 msgid "Go to this Desktop"
 msgstr "Ga naar deze desktop"
 
-#: src/menus.c:1983
+#: src/menus.c:1989
 #, c-format
 msgid "Desktop %i"
 msgstr "Desktop %i"
 
-#: src/menus.c:2046
+#: src/menus.c:2052
 msgid "Show/Hide this group"
 msgstr "Toon/Verberg deze groep"
 
-#: src/menus.c:2049
+#: src/menus.c:2055
 msgid "Iconify this group"
 msgstr "Minimaliseer deze groep"
 
-#: src/menus.c:2061
+#: src/menus.c:2067
 #, c-format
 msgid "Group %i"
 msgstr "Groep %i"
diff --git a/po/no.po b/po/no.po
index 8d4220bb..c54fe06b 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment 0.16.5\n"
-"POT-Creation-Date: 2003-05-04 12:33+0200\n"
+"POT-Creation-Date: 2003-05-04 19:58-0400\n"
 "PO-Revision-Date: 2000-03-07 12:08+0100\n"
 "Last-Translator: Terje Røsten <terjeros@phys.ntnu.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -1293,7 +1293,6 @@ msgstr ""
 "Enlightenment Versjon : %s\n"
 "koden oppdatert       : %s\n"
 
-#. Set up all the text bits that belong on the GSOD
 #: src/main.c:89
 msgid "Enlightenment Message Dialog"
 msgstr "Enlightment dialog"
@@ -1481,24 +1480,24 @@ msgstr ""
 "Verdien til pekeren var: %x.\n"
 "Feilen oppstod ved %s, linje %d.\n"
 
-#: src/menus.c:1967
+#: src/menus.c:1973
 msgid "Go to this Desktop"
 msgstr "Skift fokus til dette skrivebordet"
 
-#: src/menus.c:1983
+#: src/menus.c:1989
 #, c-format
 msgid "Desktop %i"
 msgstr "Skriverbord nr. %i"
 
-#: src/menus.c:2046
+#: src/menus.c:2052
 msgid "Show/Hide this group"
 msgstr "Vis/Skjul denne gruppa"
 
-#: src/menus.c:2049
+#: src/menus.c:2055
 msgid "Iconify this group"
 msgstr "Ikonifiser denne gruppa"
 
-#: src/menus.c:2061
+#: src/menus.c:2067
 #, c-format
 msgid "Group %i"
 msgstr "Gruppe %i"
diff --git a/po/pl.po b/po/pl.po
index 66e45dee..5e6d33d4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment 0.16.5\n"
-"POT-Creation-Date: 2003-05-04 12:33+0200\n"
+"POT-Creation-Date: 2003-05-04 19:58-0400\n"
 "PO-Revision-Date: 2000-01-04 23:15+0100\n"
 "Last-Translator: Adam Kisiel <kisiel@if.pw.edu.pl>\n"
 "Language-Team: Polshi <pl@li.org>\n"
@@ -1296,7 +1296,6 @@ msgstr ""
 "Wersja Enlightenment : %s\n"
 "kod jest aktualny na : %s\n"
 
-#. Set up all the text bits that belong on the GSOD
 #: src/main.c:89
 msgid "Enlightenment Message Dialog"
 msgstr "Okno wiadomo¶ci Enlightenment"
@@ -1483,24 +1482,24 @@ msgstr ""
 "Warto¶æ wska¼nika wynosi³a %x.\n"
 "B³±d wyst±pi³ w %s, linia %d.\n"
 
-#: src/menus.c:1967
+#: src/menus.c:1973
 msgid "Go to this Desktop"
 msgstr "Przejd¼ do tego Pulpitu"
 
-#: src/menus.c:1983
+#: src/menus.c:1989
 #, c-format
 msgid "Desktop %i"
 msgstr "Pulpit %i"
 
-#: src/menus.c:2046
+#: src/menus.c:2052
 msgid "Show/Hide this group"
 msgstr "Poka¿/Ukryj t± grupê"
 
-#: src/menus.c:2049
+#: src/menus.c:2055
 msgid "Iconify this group"
 msgstr "Zwiñ t± grupê do ikony"
 
-#: src/menus.c:2061
+#: src/menus.c:2067
 #, c-format
 msgid "Group %i"
 msgstr "Grupa %i"
diff --git a/po/pt.po b/po/pt.po
index 0d47abd3..6983da2b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment 0.16.5\n"
-"POT-Creation-Date: 2003-05-04 12:33+0200\n"
+"POT-Creation-Date: 2003-05-04 19:58-0400\n"
 "PO-Revision-Date: 2000-03-07 16:35+0100\n"
 "Last-Translator: Daniel Vieira Pereira <gunsmithcat@ip.pt>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -1307,7 +1307,6 @@ msgstr ""
 "Versão do Enlightenment : %s\n"
 "data do actual código   : %s\n"
 
-#. Set up all the text bits that belong on the GSOD
 #: src/main.c:89
 msgid "Enlightenment Message Dialog"
 msgstr "Caixa de Diálogo do Enlightement"
@@ -1494,24 +1493,24 @@ msgstr ""
 "value: %x\n"
 "Este erro ocorreu em %s, linha %d.\n"
 
-#: src/menus.c:1967
+#: src/menus.c:1973
 msgid "Go to this Desktop"
 msgstr "Ir para este Desktop"
 
-#: src/menus.c:1983
+#: src/menus.c:1989
 #, c-format
 msgid "Desktop %i"
 msgstr "Desktop %i"
 
-#: src/menus.c:2046
+#: src/menus.c:2052
 msgid "Show/Hide this group"
 msgstr "Mostar/esconder este grupo"
 
-#: src/menus.c:2049
+#: src/menus.c:2055
 msgid "Iconify this group"
 msgstr "Minimizar este grupo"
 
-#: src/menus.c:2061
+#: src/menus.c:2067
 #, c-format
 msgid "Group %i"
 msgstr "Grupo %i"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7560610f..0f3ee7ea 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment 0.16.5\n"
-"POT-Creation-Date: 2003-05-04 12:33+0200\n"
+"POT-Creation-Date: 2003-05-04 19:58-0400\n"
 "PO-Revision-Date: 2000-02-24 16:22+0100\n"
 "Last-Translator: Roberto S. Teixeira <robteix@zaz.com.br>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -1321,7 +1321,6 @@ msgstr ""
 "O código é do dia      : %s\n"
 
 # melhor assim, né, Rainer? :)
-#. Set up all the text bits that belong on the GSOD
 #: src/main.c:89
 msgid "Enlightenment Message Dialog"
 msgstr "Mensagem de Diálogo do Enlightenment"
@@ -1511,24 +1510,24 @@ msgstr ""
 "O valor do ponteiro era %x.\n"
 "Esse erro ocorreu em %s, linha %d.\n"
 
-#: src/menus.c:1967
+#: src/menus.c:1973
 msgid "Go to this Desktop"
 msgstr "Ir para essa Área de Trabalho"
 
-#: src/menus.c:1983
+#: src/menus.c:1989
 #, c-format
 msgid "Desktop %i"
 msgstr "Área de Trabalho %i"
 
-#: src/menus.c:2046
+#: src/menus.c:2052
 msgid "Show/Hide this group"
 msgstr "Exibir/Esconder esse grupo"
 
-#: src/menus.c:2049
+#: src/menus.c:2055
 msgid "Iconify this group"
 msgstr "Iconificar esse grupo"
 
-#: src/menus.c:2061
+#: src/menus.c:2067
 #, c-format
 msgid "Group %i"
 msgstr "Grupo %i"
diff --git a/po/ru.po b/po/ru.po
index d1b0cc04..5acfa27b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment 0.16.5\n"
-"POT-Creation-Date: 2003-05-04 12:33+0200\n"
+"POT-Creation-Date: 2003-05-04 19:58-0400\n"
 "PO-Revision-Date: 2000-01-14 20:43-0300\n"
 "Last-Translator: Vladimir STEPANOV <stepanov@bird.iki.rssi.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -1317,7 +1317,6 @@ msgstr ""
 "÷ÅÒÓÉÑ Enlightenment : %s\n"
 "ëÏÄ ÔÅËÕÝÉÊ ÎÁ       : %s\n"
 
-#. Set up all the text bits that belong on the GSOD
 #: src/main.c:89
 msgid "Enlightenment Message Dialog"
 msgstr "äÉÁÌÏÇ ÓÏÏÂÝÅÎÉÑ Enlightenment"
@@ -1507,24 +1506,24 @@ msgstr ""
 "pointer = %x.\n"
 "ïÛÉÂËÁ ×ÏÚÎÉËÌÁ × %s, ÓÔÒÏËÁ %d.\n"
 
-#: src/menus.c:1967
+#: src/menus.c:1973
 msgid "Go to this Desktop"
 msgstr "ðÅÒÅÊÔÉ ÎÁ ÜÔÏÔ ÒÁÂÏÞÉÊ ÓÔÏÌ"
 
-#: src/menus.c:1983
+#: src/menus.c:1989
 #, c-format
 msgid "Desktop %i"
 msgstr "òÁÂÏÞÉÊ ÓÔÏÌ %i"
 
-#: src/menus.c:2046
+#: src/menus.c:2052
 msgid "Show/Hide this group"
 msgstr "ðÏËÁÚÁÔØ/ÓÐÒÑÔÁÔØ ÜÔÕ ÇÒÕÐÐÕ"
 
-#: src/menus.c:2049
+#: src/menus.c:2055
 msgid "Iconify this group"
 msgstr "ó×ÅÒÎÕÔØ ÜÔÕ ÇÒÕÐÐÕ"
 
-#: src/menus.c:2061
+#: src/menus.c:2067
 #, c-format
 msgid "Group %i"
 msgstr "çÒÕÐÐÁ %i"
diff --git a/po/sv.po b/po/sv.po
index 31ee1c5b..bba91660 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment 0.16.5\n"
-"POT-Creation-Date: 2003-05-04 12:33+0200\n"
+"POT-Creation-Date: 2003-05-04 19:58-0400\n"
 "PO-Revision-Date: 2000-04-10 17:30+0200\n"
 "Last-Translator: Bernt Holmberg <bernt@grub01.physto.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -1295,7 +1295,6 @@ msgstr ""
 "Version av Enlightenment : %s\n"
 "Koden är aktuell till    : %s\n"
 
-#. Set up all the text bits that belong on the GSOD
 #: src/main.c:89
 msgid "Enlightenment Message Dialog"
 msgstr "Enlightenment meddelandedialog"
@@ -1486,24 +1485,24 @@ msgstr ""
 "Pekarens värde var %x.\n"
 "Felet uppstod vid %s, rad %d.\n"
 
-#: src/menus.c:1967
+#: src/menus.c:1973
 msgid "Go to this Desktop"
 msgstr "Gå till detta skrivbord"
 
-#: src/menus.c:1983
+#: src/menus.c:1989
 #, c-format
 msgid "Desktop %i"
 msgstr "Skrivbord %i"
 
-#: src/menus.c:2046
+#: src/menus.c:2052
 msgid "Show/Hide this group"
 msgstr "Visa/gömma denna grupp"
 
-#: src/menus.c:2049
+#: src/menus.c:2055
 msgid "Iconify this group"
 msgstr "Ikonifiera denna grupp"
 
-#: src/menus.c:2061
+#: src/menus.c:2067
 #, c-format
 msgid "Group %i"
 msgstr "Grupp %i"
diff --git a/po/tr.po b/po/tr.po
index 00d8f3c8..e0638d2c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment 0.16.5\n"
-"POT-Creation-Date: 2003-05-04 12:33+0200\n"
+"POT-Creation-Date: 2003-05-04 19:58-0400\n"
 "PO-Revision-Date: 2000-07-30 22:39+0200\n"
 "Last-Translator: Fatih Demir <kabalak@gmx.net>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -1287,7 +1287,6 @@ msgstr ""
 "Enlightenment nesli   : %s\n"
 "kaynak tarihi         : %s\n"
 
-#. Set up all the text bits that belong on the GSOD
 #: src/main.c:89
 msgid "Enlightenment Message Dialog"
 msgstr "Enlightenment ileti kutusu"
@@ -1472,24 +1471,24 @@ msgstr ""
 "Gösterge deðeri %x idi .\n"
 "Hata'nýn oluþtuðu yer : %s , satýr %d .\n"
 
-#: src/menus.c:1967
+#: src/menus.c:1973
 msgid "Go to this Desktop"
 msgstr "Bu masaüstüne geç"
 
-#: src/menus.c:1983
+#: src/menus.c:1989
 #, c-format
 msgid "Desktop %i"
 msgstr "Masaüstü %i"
 
-#: src/menus.c:2046
+#: src/menus.c:2052
 msgid "Show/Hide this group"
 msgstr "Bu kitleyi göster/gizle"
 
-#: src/menus.c:2049
+#: src/menus.c:2055
 msgid "Iconify this group"
 msgstr "Bu kitleyi simgeleþtir"
 
-#: src/menus.c:2061
+#: src/menus.c:2067
 #, c-format
 msgid "Group %i"
 msgstr "Kitle %i"
diff --git a/src/E.h b/src/E.h
index 40f2ed58..25b660b5 100644
--- a/src/E.h
+++ b/src/E.h
@@ -77,6 +77,7 @@ if (__xim) XDestroyImage(__xim);}
 #include <time.h>
 #include <math.h>
 #include <pwd.h>
+#include <errno.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/src/ewmh.c b/src/ewmh.c
index 10682558..3a2b3a0d 100644
--- a/src/ewmh.c
+++ b/src/ewmh.c
@@ -484,7 +484,7 @@ EWMH_GetWindowDesktop(EWin * ewin)
    if (!val)
       goto exit;
 
-   if (val[0] == 0xFFFFFFFF)
+   if ((unsigned)val[0] == 0xFFFFFFFF)
      {
         /* It is possible to distinguish between "sticky" and "on all desktops". */
         /* E doesn't */
@@ -545,7 +545,7 @@ EWMH_GetWindowState(EWin * ewin)
    EDBUG_RETURN_;
 }
 
-void
+static void
 EWMH_GetWindowType(EWin * ewin)
 {
    Atom               *p_atoms, atom;
@@ -647,6 +647,7 @@ do_set(int is_set, int action)
           return !is_set;
           break;
      }
+   return -1;
 }
 
 void
@@ -704,7 +705,7 @@ EWMH_ProcessClientMessage(XClientMessageEvent * event)
      }
    else if (event->message_type == _NET_WM_DESKTOP)
      {
-        if (event->data.l[0] == 0xFFFFFFFF)
+        if ((unsigned)event->data.l[0] == 0xFFFFFFFF)
           {
              if (!ewin->sticky)
                 MakeWindowSticky(ewin);
diff --git a/src/hints.c b/src/hints.c
index 4b29d44a..79a45346 100644
--- a/src/hints.c
+++ b/src/hints.c
@@ -184,7 +184,9 @@ HintsSetWindowState(EWin * ewin)
 void
 HintsSetWindowHints(EWin * ewin)
 {
+#if ENABLE_KDE
    int                 kde_support = 0;
+#endif
 
    EDBUG(6, "HintsSetWindowHints");
 #if ENABLE_KDE
diff --git a/src/menus.c b/src/menus.c
index e41415ed..bc1ad28d 100644
--- a/src/menus.c
+++ b/src/menus.c
@@ -1525,6 +1525,13 @@ FillFlatFileMenu(Menu * m, MenuStyle * ms, char *name, char *file,
 #else
    f = fopen(file, "rt");
 #endif
+   if (!f)
+     {
+        fprintf(stderr, "Unable to open menu file %s -- %s\n", file,
+                strerror(errno));
+        return;
+     }
+
    while (fgets(s, 4096, f))
      {
         s[strlen(s) - 1] = 0;
diff --git a/src/misc.c b/src/misc.c
index d8b8d5b4..463031ca 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -214,7 +214,7 @@ EExit(void *code)
      {
         int                 i;
 
-        exitcode = code;
+        exitcode = (long)code;
         SoundExit();
         if (mustdel)
           {
diff --git a/src/ttfont.c b/src/ttfont.c
index 3e7429b5..4c06577f 100644
--- a/src/ttfont.c
+++ b/src/ttfont.c
@@ -36,84 +36,89 @@ static unsigned char alpha_lut[5] = { 0, 64, 128, 192, 255 };
 static unsigned char bounded_palette[9] = { 0, 1, 2, 3, 4, 4, 4, 4, 4 };
 
 struct _imlib_encoding_map {
-   unsigned short      char_map[96];
+   unsigned short      char_map[98];
 };
 
 typedef struct _imlib_encoding_map ImlibEncodingMap;
 
 /* Encoding maps */
 static const ImlibEncodingMap iso1 = {
-   /* ISO-8859-1 encoding (conversion to UTF-8) */
-   0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8,
-   0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, 0x00B0, 0x00B1,
-   0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x00BA,
-   0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF, 0x00C0, 0x00C1, 0x00C2, 0x00C3,
-   0x00C4, 0x00C5, 0x00C6, 0x00C7, 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC,
-   0x00CD, 0x00CE, 0x00CF, 0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5,
-   0x00D6, 0x00D7, 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE,
-   0x00DF, 0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
-   0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, 0x00F0,
-   0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, 0x00F8, 0x00F9,
-   0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF
+   {
+    /* ISO-8859-1 encoding (conversion to UTF-8) */
+    0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8,
+    0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, 0x00B0, 0x00B1,
+    0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x00BA,
+    0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF, 0x00C0, 0x00C1, 0x00C2, 0x00C3,
+    0x00C4, 0x00C5, 0x00C6, 0x00C7, 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC,
+    0x00CD, 0x00CE, 0x00CF, 0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5,
+    0x00D6, 0x00D7, 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE,
+    0x00DF, 0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
+    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, 0x00F0,
+    0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, 0x00F8, 0x00F9,
+    0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF}
 };
 
 static const ImlibEncodingMap iso2 = {
-   /* ISO-8859-2 encoding (conversion to UTF-8) */
-   0x00A0, 0x0104, 0x02D8, 0x0141, 0x00A4, 0x013D, 0x015A, 0x00A7, 0x00A8,
-   0x0160, 0x015E, 0x0164, 0x0179, 0x00AD, 0x017D, 0x017B, 0x00B0, 0x0105,
-   0x02DB, 0x0142, 0x00B4, 0x013E, 0x015B, 0x02C7, 0x00B8, 0x0161, 0x015F,
-   0x0165, 0x017A, 0x02DD, 0x017E, 0x017C, 0x0154, 0x00C1, 0x00C2, 0x0102,
-   0x00C4, 0x0139, 0x0106, 0x00C7, 0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A,
-   0x00CD, 0x00CE, 0x010E, 0x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150,
-   0x00D6, 0x00D7, 0x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162,
-   0x00DF, 0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7,
-   0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F, 0x0111,
-   0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7, 0x0159, 0x016F,
-   0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9
+   {
+    /* ISO-8859-2 encoding (conversion to UTF-8) */
+    0x00A0, 0x0104, 0x02D8, 0x0141, 0x00A4, 0x013D, 0x015A, 0x00A7, 0x00A8,
+    0x0160, 0x015E, 0x0164, 0x0179, 0x00AD, 0x017D, 0x017B, 0x00B0, 0x0105,
+    0x02DB, 0x0142, 0x00B4, 0x013E, 0x015B, 0x02C7, 0x00B8, 0x0161, 0x015F,
+    0x0165, 0x017A, 0x02DD, 0x017E, 0x017C, 0x0154, 0x00C1, 0x00C2, 0x0102,
+    0x00C4, 0x0139, 0x0106, 0x00C7, 0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A,
+    0x00CD, 0x00CE, 0x010E, 0x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150,
+    0x00D6, 0x00D7, 0x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162,
+    0x00DF, 0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7,
+    0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F, 0x0111,
+    0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7, 0x0159, 0x016F,
+    0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9}
 };
 
 static const ImlibEncodingMap iso3 = {
-   /* ISO-8859-3 encoding (conversion to UTF-8) */
-   0x00A0, 0x0126, 0x02D8, 0x00A3, 0x00A4, 0x0124, 0x00A7, 0x00A8, 0x0130,
-   0x015E, 0x011E, 0x0134, 0x00AD, 0x017B, 0x00B0, 0x0127, 0x00B2, 0x00B3,
-   0x00B4, 0x00B5, 0x0125, 0x00B7, 0x00B8, 0x0131, 0x015F, 0x011F, 0x0135,
-   0x00BD, 0x017C, 0x00C0, 0x00C1, 0x00C2, 0x00C4, 0x010A, 0x0108, 0x00C7,
-   0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, 0x00D1,
-   0x00D2, 0x00D3, 0x00D4, 0x0120, 0x00D6, 0x00D7, 0x011C, 0x00D9, 0x00DA,
-   0x00DB, 0x00DC, 0x016C, 0x015C, 0x00DF, 0x00E0, 0x00E1, 0x00E2, 0x00E4,
-   0x010B, 0x0109, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED,
-   0x00EE, 0x00EF, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x0121, 0x00F6, 0x00F7,
-   0x011D, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x016D, 0x015D, 0x02D9
+   {
+    /* ISO-8859-3 encoding (conversion to UTF-8) */
+    0x00A0, 0x0126, 0x02D8, 0x00A3, 0x00A4, 0x0124, 0x00A7, 0x00A8, 0x0130,
+    0x015E, 0x011E, 0x0134, 0x00AD, 0x017B, 0x00B0, 0x0127, 0x00B2, 0x00B3,
+    0x00B4, 0x00B5, 0x0125, 0x00B7, 0x00B8, 0x0131, 0x015F, 0x011F, 0x0135,
+    0x00BD, 0x017C, 0x00C0, 0x00C1, 0x00C2, 0x00C4, 0x010A, 0x0108, 0x00C7,
+    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, 0x00D1,
+    0x00D2, 0x00D3, 0x00D4, 0x0120, 0x00D6, 0x00D7, 0x011C, 0x00D9, 0x00DA,
+    0x00DB, 0x00DC, 0x016C, 0x015C, 0x00DF, 0x00E0, 0x00E1, 0x00E2, 0x00E4,
+    0x010B, 0x0109, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED,
+    0x00EE, 0x00EF, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x0121, 0x00F6, 0x00F7,
+    0x011D, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x016D, 0x015D, 0x02D9}
 };
 
 static const ImlibEncodingMap iso4 = {
-   /* ISO-8859-4 encoding (conversion to UTF-8) */
-   0x00A0, 0x0104, 0x0138, 0x0156, 0x00A4, 0x0128, 0x013B, 0x00A7, 0x00A8,
-   0x0160, 0x0112, 0x0122, 0x0166, 0x00AD, 0x017D, 0x00AF, 0x00B0, 0x0105,
-   0x02DB, 0x0157, 0x00B4, 0x0129, 0x013C, 0x02C7, 0x00B8, 0x0161, 0x0113,
-   0x0123, 0x0167, 0x014A, 0x017E, 0x014B, 0x0100, 0x00C1, 0x00C2, 0x00C3,
-   0x00C4, 0x00C5, 0x00C6, 0x012E, 0x010C, 0x00C9, 0x0118, 0x00CB, 0x0116,
-   0x00CD, 0x00CE, 0x012A, 0x0110, 0x0145, 0x014C, 0x0136, 0x00D4, 0x00D5,
-   0x00D6, 0x00D7, 0x00D8, 0x0172, 0x00DA, 0x00DB, 0x00DC, 0x0168, 0x016A,
-   0x00DF, 0x0101, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x012F,
-   0x010D, 0x00E9, 0x0119, 0x00EB, 0x0117, 0x00ED, 0x00EE, 0x012B, 0x0111,
-   0x0146, 0x014D, 0x0137, 0x00F4, 0x00F5, 0x00F6, 0x00F7, 0x00F8, 0x0173,
-   0x00FA, 0x00FB, 0x00FC, 0x0169, 0x016B, 0x02D9
+   {
+    /* ISO-8859-4 encoding (conversion to UTF-8) */
+    0x00A0, 0x0104, 0x0138, 0x0156, 0x00A4, 0x0128, 0x013B, 0x00A7, 0x00A8,
+    0x0160, 0x0112, 0x0122, 0x0166, 0x00AD, 0x017D, 0x00AF, 0x00B0, 0x0105,
+    0x02DB, 0x0157, 0x00B4, 0x0129, 0x013C, 0x02C7, 0x00B8, 0x0161, 0x0113,
+    0x0123, 0x0167, 0x014A, 0x017E, 0x014B, 0x0100, 0x00C1, 0x00C2, 0x00C3,
+    0x00C4, 0x00C5, 0x00C6, 0x012E, 0x010C, 0x00C9, 0x0118, 0x00CB, 0x0116,
+    0x00CD, 0x00CE, 0x012A, 0x0110, 0x0145, 0x014C, 0x0136, 0x00D4, 0x00D5,
+    0x00D6, 0x00D7, 0x00D8, 0x0172, 0x00DA, 0x00DB, 0x00DC, 0x0168, 0x016A,
+    0x00DF, 0x0101, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x012F,
+    0x010D, 0x00E9, 0x0119, 0x00EB, 0x0117, 0x00ED, 0x00EE, 0x012B, 0x0111,
+    0x0146, 0x014D, 0x0137, 0x00F4, 0x00F5, 0x00F6, 0x00F7, 0x00F8, 0x0173,
+    0x00FA, 0x00FB, 0x00FC, 0x0169, 0x016B, 0x02D9}
 };
 
 static const ImlibEncodingMap iso5 = {
-   /* ISO-8859-5 encoding (conversion to UTF-8) */
-   0x00A0, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406, 0x0407, 0x0408,
-   0x0409, 0x040A, 0x040B, 0x040C, 0x00AD, 0x040E, 0x040F, 0x0410, 0x0411,
-   0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, 0x0418, 0x0419, 0x041A,
-   0x041B, 0x041C, 0x041D, 0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x0423,
-   0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C,
-   0x042D, 0x042E, 0x042F, 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435,
-   0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E,
-   0x043F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
-   0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F, 0x2116,
-   0x0451, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457, 0x0458, 0x0459,
-   0x045A, 0x045B, 0x045C, 0x00A7, 0x045E, 0x045F
+   {
+    /* ISO-8859-5 encoding (conversion to UTF-8) */
+    0x00A0, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406, 0x0407, 0x0408,
+    0x0409, 0x040A, 0x040B, 0x040C, 0x00AD, 0x040E, 0x040F, 0x0410, 0x0411,
+    0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, 0x0418, 0x0419, 0x041A,
+    0x041B, 0x041C, 0x041D, 0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x0423,
+    0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C,
+    0x042D, 0x042E, 0x042F, 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435,
+    0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E,
+    0x043F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
+    0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F, 0x2116,
+    0x0451, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457, 0x0458, 0x0459,
+    0x045A, 0x045B, 0x045C, 0x00A7, 0x045E, 0x045F}
 };
 
 static const ImlibEncodingMap *_imlib_encodings[5] =
@@ -121,7 +126,7 @@ static const ImlibEncodingMap *_imlib_encodings[5] =
 int                 IsoEncoding = ENCOING_ISO_8859_1;
 char                encoding_initialized = 0;
 
-void
+static void
 __init_iso_encoding()
 {
    /* Set the current ISO encoding based on (in that order):