fixed some bugs

WINGs/po/fr.po

@@ -49,7 +49,7 @@ msgstr "Impossible de lire le mot de passe de l'UID %i"
 #: ../../WINGs/findfile.c:66
 #, c-format
 msgid "could not get password entry for user %s"
-msgstr "Impossible de lire le mot de passe de l'utilisateur %i"
+msgstr "Impossible de lire le mot de passe de l'utilisateur %s"
 
 #: ../../WINGs/host.c:114
 msgid "Cannot get current host name"

WINGs/wfont.c

@@ -19,21 +19,20 @@
 
 
 static FcPattern*
-xlfdToFcPattern(char *xlfd, int size)
+xlfdToFcPattern(char *xlfd)
 {
     FcPattern *pattern;
     char *fname, *ptr;
 
-    if (strchr(xlfd, "%")!=NULL)
+    /* Just skip old font names that contain %d in them.
-       return FcNameParse("sans:pixelsize=12");
+     * We don't support that anymore. */
-    else {
+    if (strchr(xlfd, '%')!=NULL)
-        fname= wstrdup(xlfd);
+        return FcNameParse(DEFAULT_FONT);
-    }
 
+    fname= wstrdup(xlfd);
     if ((ptr = strchr(fname, ','))) {
         *ptr = 0;
     }
-
     pattern = XftXlfdParse(fname, False, False);
     wfree(fname);
 
@@ -47,12 +46,12 @@ xlfdToFcPattern(char *xlfd, int size)
 
 
 static char*
-xlfdToFcName(char *xlfd, int size)
+xlfdToFcName(char *xlfd)
 {
     FcPattern *pattern;
     char *fname;
 
-    pattern = xlfdToFcPattern(xlfd, size);
+    pattern = xlfdToFcPattern(xlfd);
     fname = FcNameUnparse(pattern);
     FcPatternDestroy(pattern);
 
@@ -101,7 +100,7 @@ makeFontOfSize(char *font, int size, char *fallback)
     char *result;
 
     if (font[0]=='-') {
-        pattern = xlfdToFcPattern(font, size);
+        pattern = xlfdToFcPattern(font);
     } else {
         pattern = FcNameParse(font);
     }
@@ -137,7 +136,7 @@ WMCreateFont(WMScreen *scrPtr, char *fontName)
     char *fname;
 
     if (fontName[0]=='-'){
-        fname = xlfdToFcName(fontName, 0);
+        fname = xlfdToFcName(fontName);
     } else {
         fname = wstrdup(fontName);
     }

WPrefs.app/Menu.c

@@ -1563,45 +1563,30 @@ buildMenuFromPL(_Panel *panel, WMPropList *pl)
 static WMPropList*
 getDefaultMenu(_Panel *panel)
 {
-    WMPropList *menu, *pmenu;
+    WMPropList *menu;
     char *menuPath, *gspath;
 
     gspath = wusergnusteppath();
 
     menuPath = wmalloc(strlen(gspath)+128);
-    /* if there is a localized plmenu for the tongue put it's filename here */
+    sprintf(menuPath, "%s/Library/WindowMaker/plmenu", gspath);
-    sprintf(menuPath, _("%s/Library/WindowMaker/plmenu"), gspath);
 
     menu = WMReadPropListFromFile(menuPath);
+
     if (!menu) {
-        wwarning("%s:could not read property list menu", menuPath);
+        char *buffer, *msg;
 
-        if (strcmp("%s/Library/WindowMaker/plmenu",
+        msg = _("Could not open default menu from '%s'");
-                   _("%s/Library/WindowMaker/plmenu"))!=0) {
+        buffer = wmalloc(strlen(msg) + strlen(menuPath) + 10);
-
+        sprintf(buffer, msg, menuPath);
-            sprintf(menuPath, "%s/Library/WindowMaker/plmenu", gspath);
+        WMRunAlertPanel(WMWidgetScreen(panel->parent), panel->parent,
-            menu = WMReadPropListFromFile(menuPath);
+                        _("Error"), buffer,	_("OK"), NULL, NULL);
-            wwarning("%s:could not read property list menu", menuPath);
+        wfree(buffer);
-        }
-        if (!menu) {
-            char buffer[512];
-
-            sprintf(buffer, _("Could not open default menu from '%s'"),
-                    menuPath);
-            WMRunAlertPanel(WMWidgetScreen(panel->parent), panel->parent,
-                            _("Error"), buffer,	_("OK"), NULL, NULL);
-        }
     }
 
     wfree(menuPath);
 
-    if (menu) {
+    return menu;
-        pmenu = menu;
-    } else {
-        pmenu = NULL;
-    }
-
-    return pmenu;
 }
 
 

WPrefs.app/po/hu.po

@@ -7,7 +7,11 @@
 msgid ""
 msgstr ""
 "Date: 2000-07-28 17:07:33+0200\n"
-"From: Horvath Szabolcs <horvathsz@penguinpowered.com>\n"
+"Project-Id-Version: Window Maker 0.61.1\n"
+"POT-Creation-Date: 2000-07-12 08:32+0300\n"
+"PO-Revision-Date: 2000-07-27 19:50-0100\n"
+"Last-Translator: Horvath Szabolcs <horvathsz@penguinpowered.com>\n"
+"Language-Team: Hungarian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

src/wconfig.h.in

@@ -315,13 +315,13 @@
 #define HIDE_ANIMATION_STEPS (MINIATURIZE_ANIMATION_STEPS*2/3)
 
 /* delay before balloon is shown (ms) */
-#define BALLOON_DELAY	        1000
+#define BALLOON_DELAY           1000
 
 /* delay for menu item selection hysteresis (ms) */
 #define MENU_SELECT_DELAY       200
 
 /* delay for jumpback of scrolled menus (ms) */
-#define MENU_JUMP_BACK_DELAY 	400
+#define MENU_JUMP_BACK_DELAY    400
 
 /* *** animation speed constants *** */