- Fixed 2 syntax errors in plmenu.zh_TW.Big5 (Mike FABIAN <mfabian@suse.de>)

- Some .po file fixes (Mike FABIAN <mfabian@suse.de>)
- Fixed the problem with the root menu code changing the locale setting as
  a side effect of loading a localized menu
- Fixed e memory leak in the code that reads a localized root menu

ChangeLog

@@ -73,6 +73,11 @@ Changes since version 0.80.2:
 - Updated Bulgarian translations (Anton Zinoviev <zinoviev@debian.org>)
 - Fixed a bug in WINGs' hashtable which free'd the wrong memory in the
   WMResetHashTable() function (possible source of SIGSEGVs)
+- Fixed 2 syntax errors in plmenu.zh_TW.Big5 (Mike FABIAN <mfabian@suse.de>)
+- Some .po file fixes (Mike FABIAN <mfabian@suse.de>)
+- Fixed the problem with the root menu code changing the locale setting as
+  a side effect of loading a localized menu
+- Fixed e memory leak in the code that reads a localized root menu
 
 
 Changes since version 0.80.1:

WPrefs.app/po/hr.po

@@ -1,11 +1,17 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
 msgid ""
 msgstr ""
-"Date: 1998-08-24 14:36:41-0300\n"
+"Project-Id-Version: WindowMaker 0.80.2\n"
-"From: Toni Biliæ tbilic@oliver.efos.hr \n"
+"POT-Creation-Date: 1998-08-24 14:36:41-0300\n"
+"PO-Revision-Date: 1998-08-24 14:36:41-0300\n"
+"Last-Translator: Toni Biliæ tbilic@oliver.efos.hr \n"
 "Language-Team: Croatian \n"
+"MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
-"Xgettext-Options: --default-domain=WPrefs --add-comments --keyword=_\n"
+"Content-Transfer-Encoding: 8bit\n"
-"Files: ../../WPrefs/Configurations.c ../../WPrefs/Expert.c ../../WPrefs/Focus.c ../../WPrefs/KeyboardSettings.c ../../WPrefs/KeyboardShortcuts.c ../../WPrefs/Menu.c ../../WPrefs/MenuGuru.c ../../WPrefs/MenuPreferences.c ../../WPrefs/MouseSettings.c ../../WPrefs/Paths.c ../../WPrefs/Preferences.c ../../WPrefs/Text.c ../../WPrefs/TextureAndColor.c ../../WPrefs/WPrefs.c ../../WPrefs/WindowHandling.c ../../WPrefs/Workspace.c ../../WPrefs/main.c ../../WPrefs/xmodifier.c\n"
 
 #: ../../WPrefs/Configurations.c:142 ../../WPrefs/Configurations.c:148 ../../WPrefs/MouseSettings.c:510 ../../WPrefs/WindowHandling.c:270 ../../WPrefs/WindowHandling.c:282 ../../WPrefs/Workspace.c:71 ../../WPrefs/Workspace.c:77
 msgid "could not load icon %s"

WindowMaker/plmenu.zh_TW.Big5

@@ -91,7 +91,7 @@
    ("圖片", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
    ),
   ("儲存主題", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/%a(主題名稱)"),
-  ("儲存圖示集", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/%a(圖示集名稱)")
+  ("儲存圖示集", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/%a(圖示集名稱)"),
   ("偏好設定公用程式", EXEC, "/usr/local/GNUstep/Apps/WPrefs.app/WPrefs")
   ),
  ("離開",
@@ -99,6 +99,6 @@
   ("啟動 BlackBox", RESTART, blackbox),
   ("啟動 kwm", RESTART, kwm),
   ("啟動 IceWM", RESTART, icewm),
-  ("離開...", EXIT),
+  ("離開...", EXIT)
  )
 )

po/hr.po

@@ -1,12 +1,16 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
 msgid ""
 msgstr ""
-"Date: 1998-08-18 16:28:19+0200\n"
+"Project-Id-Version: 0.80.2\n"
-"From: Toni Biliæ <tbilic@oliver.efos.hr>\n"
+"PO-Revision-Date: 1998-08-18 16:28:19+0200\n"
+"Last-Translator: Toni Biliæ <tbilic@oliver.efos.hr>\n"
 "Language-Team: Croatian\n"
 "MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
-"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
-
 
 #: ../src/appicon.c:509 ../src/dialog.c:215 ../src/dialog.c:271 ../src/dock.c:2953 ../src/dockedapp.c:206 ../src/winspector.c:279 ../src/winspector.c:295
 msgid "Error"

po/no.po

@@ -2,10 +2,9 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: WindowMaker 0.80.2\n"
 "POT-Creation-Date: 1998-05-23 12:54+0200\n"
 "PO-Revision-Date: 1998-05-23 H12:54+0200\n"
 "Last-Translator: Marcus Ramberg <draven@mo.himolde.no>\n"

po/pl.po

@@ -5,12 +5,11 @@
 # Copyright (C) 1999 Free Software Foundation, Inc.
 # Piotr Dembiñski <pdemb@fanthom.math.put.poznan.pl>, 1998.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: WindowMaker 0.80.2\n"
 "POT-Creation-Date: 1999-01-24 14:05+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2003-04-15 20:21+0200\n"
 "Last-Translator: Piotr Dembiñski <pdemb@fanthom.math.put.poznan.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -521,7 +520,7 @@ msgstr "nie mo
 #: ../src/main.c:297
 #, c-format
 msgid "%s:could not execute initialization script"
-msgstr "#s:nie mo¿na wykonaæ skryptu inicjalizacji"
+msgstr "%s:nie mo¿na wykonaæ skryptu inicjalizacji"
 
 #: ../src/main.c:314
 #, c-format

src/rootmenu.c

@@ -362,8 +362,7 @@ legalPanelCommand(WMenu *menu, WMenuEntry *entry)
 static char*
 getLocalizedMenuFile(char *menu)
 {
-    char *buffer;
+    char *buffer, *ptr, *locale;
-    char *ptr;
     int len;
 
     if (!Locale)
@@ -377,8 +376,12 @@ getLocalizedMenuFile(char *menu)
     if (access(buffer, F_OK)==0) {
 	return buffer;
     }
+
+    /* position of locale in our buffer */
+    locale = buffer + strlen(menu) + 1;
+
     /* check if it is in the form aa_bb.encoding and check for aa_bb */
-    ptr = strchr(Locale, '.');
+    ptr = strchr(locale, '.');
     if (ptr) {
 	*ptr = 0;
 	if (access(buffer, F_OK)==0) {
@@ -386,7 +389,7 @@ getLocalizedMenuFile(char *menu)
 	}
     }
     /* now check for aa */
-    ptr = strchr(buffer, '_');
+    ptr = strchr(locale, '_');
     if (ptr) {
 	*ptr = 0;
 	if (access(buffer, F_OK)==0) {
@@ -394,6 +397,8 @@ getLocalizedMenuFile(char *menu)
 	}
     }
 
+    wfree(buffer);
+
     return NULL;
 }