Locale translation file updates.

configure.ac

@@ -1108,15 +1108,12 @@ AC_ARG_ENABLE(perllib,
 AC_SUBST(FVWM_PERLLIB)
 
 # ******* gettext
-ALL_LINGUAS="ar da de fr sv_SE zh_CN ru es"
-FVWM_DOMAIN="fvwm"
-FVWMSCRIPT_DOMAIN="FvwmScript"
-ALL_DOMAINS="$FVWM_DOMAIN $FVWMTASKBAR_DOMAIN $FVWMSCRIPT_DOMAIN"
+ALL_LINGUAS="ar da de es fr ru sv_SE zh_CN zh_TW"
+FVWM_DOMAIN="fvwm3"
+ALL_DOMAINS="$FVWM_DOMAIN"
 
 AC_SUBST(ALL_LINGUAS)
 AC_SUBST(FVWM_DOMAIN)
-AC_SUBST(FVWMTASKBAR_DOMAIN)
-AC_SUBST(FVWMSCRIPT_DOMAIN)
 AC_SUBST(ALL_DOMAINS)
 
 LOCALEDIR="$FVWM_DATADIR/locale"

fvwm/fvwm3.c

@@ -1701,8 +1701,8 @@ int main(int argc, char **argv)
 	}
 	g_argv[g_argc] = NULL;
 
-	FlocaleInit(LC_CTYPE, "", "", "fvwm");
-	FGettextInit("fvwm", LOCALEDIR, "fvwm");
+	FlocaleInit(LC_CTYPE, "", "", "fvwm3");
+	FGettextInit("fvwm3", LOCALEDIR, "fvwm3");
 
 	setVersionInfo();
 	/* Put the default module directory into the environment so it can be

fvwm/menus.c

@@ -1808,7 +1808,7 @@ static Bool size_menu_vertically(MenuSizingParameters *msp)
 			/* don't propagate sidepic, sidecolor, popup and
 			 * popdown actions */
 			/* And add the entry pointing to the new menu */
-			gt_name = gettext("More&...");
+			gt_name = _("More&...");
 			name = fxstrdup(gt_name);
 			AddToMenu(
 				msp->menu, name, tempname,

modules/FvwmScript/script.c

@@ -2230,7 +2230,7 @@ yyparse ()
 #endif
 #endif
 {
-  
+
   int yystate;
   int yyn;
   int yyresult;
@@ -2482,7 +2482,7 @@ yyparse ()
   case 5:
 #line 402 "script.y"
     {
-	FGettextInit("FvwmScript", LOCALEDIR, "FvwmScript");
+	FGettextInit("fvwm3", LOCALEDIR, "fvwm3");
 	FGettextSetLocalePath((yyvsp[(3) - (3)].str));
 }
     break;
@@ -2491,7 +2491,7 @@ yyparse ()
 #line 407 "script.y"
     {
 	fprintf(stderr,"UseGettext!\n");
-	FGettextInit("FvwmScript", LOCALEDIR, "FvwmScript");
+	FGettextInit("fvwm3", LOCALEDIR, "fvwm3");
 }
     break;
 

modules/FvwmScript/script.y

@@ -399,13 +399,13 @@ initvar: 			{ InitVarGlob(); }
 head:
 | head USEGETTEXT GSTR
 {
-	FGettextInit("FvwmScript", LOCALEDIR, "FvwmScript");
+	FGettextInit("fvwm3", LOCALEDIR, "fvwm3");
 	FGettextSetLocalePath($3);
 }
 | head USEGETTEXT
 {
 	fprintf(stderr,"UseGettext!\n");
-	FGettextInit("FvwmScript", LOCALEDIR, "FvwmScript");
+	FGettextInit("fvwm3", LOCALEDIR, "fvwm3");
 }
 /* empty: we use default values */
 | head WINDOWTITLE GSTR