From 7baf540e56fb1a3e91752acba872a88543529d46 Mon Sep 17 00:00:00 2001
From: Thomas Adam <thomas@xteddy.org>
Date: Wed, 19 Oct 2022 23:02:59 +0100
Subject: [PATCH] Release 2.7.0

---
 NEWS                               |   7 +-
 configure.ac                       |  10 +-
 modules/FvwmCommandS/FvwmCommand.h |  33 ++-
 modules/FvwmCommandS/fifos.c       | 175 ++++++++++++-
 po/FvwmScript.ar.gmo               | Bin 359 -> 329 bytes
 po/FvwmScript.de.gmo               | Bin 2550 -> 2520 bytes
 po/FvwmScript.fr.gmo               | Bin 2593 -> 2552 bytes
 po/FvwmScript.ru.gmo               | Bin 2934 -> 2904 bytes
 po/FvwmScript.ru.po                |   1 +
 po/FvwmScript.sv_SE.gmo            | Bin 2581 -> 2551 bytes
 po/FvwmScript.zh_CN.gmo            | Bin 2496 -> 2466 bytes
 po/fvwm.ar.gmo                     | Bin 4886 -> 4856 bytes
 po/fvwm.ar.po                      | 382 +++++++++++++++++++++++++++++
 po/fvwm.ru.gmo                     | Bin 5130 -> 5089 bytes
 po/fvwm.sv_SE.gmo                  | Bin 4307 -> 4277 bytes
 po/fvwm.zh_CN.gmo                  | Bin 3755 -> 3725 bytes
 po/fvwm.zh_CN.po                   | 382 +++++++++++++++++++++++++++++
 utils/fvwm-version-str.sh          |   2 +-
 18 files changed, 983 insertions(+), 9 deletions(-)
 mode change 120000 => 100644 modules/FvwmCommandS/FvwmCommand.h
 mode change 120000 => 100644 modules/FvwmCommandS/fifos.c

diff --git a/NEWS b/NEWS
index 3e37b5147..a81d810cd 100644
--- a/NEWS
+++ b/NEWS
@@ -2,12 +2,17 @@ Note, the changes for the last STABLE release start with release
 2.6.0.
 
 -------------------------------------------------------------------
-Changes in stable release 2.6.9 (UNRELEASED)
+Changes in stable release 2.7.0 (19-Oct-2022)
 
 * Bug fixes:
 
   - Fix handling of configure's --enable-mandoc/--enable-htmldoc
   - Fix crash in FvwmPager when desk height or width is 0
+  - Added DoubleClick time to man page.
+  - Fix to FvwmIconMan to disable a SizeHint warning.
+  - Allow for reproducible builds.
+  - Increase the number of supported mouse buttons to 15.
+  - Tweaks to configure.ac
 
 * New fvwm features:
 
diff --git a/configure.ac b/configure.ac
index 1a6089040..1389d5643 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@ dnl
 AC_PREREQ(2.60)
 
 dnl should be "yes" only within the released distribution
-ISRELEASED="no"
-if test $ISRELEASED = "no"; then
+ISRELEASED="yes"
+if test $ISRELEASED = "yes"; then
 	RELDATELONG=""
 	RELDATESHORT=""
 	RELDATENUM=""
@@ -26,9 +26,9 @@ VERSIONINFO=""
 dnl date of the released version (please zero pad the day in the last 2 dates)
 dnl for example: "4 February 2003", "04 Feb 2003", "2003-02-04"
 dnl date format strings: "%e %B %Y", "%d-%b-%Y", "%Y-%m-%d"
-RELDATELONG="05 September 2019"
-RELDATESHORT="05-Sep-2019"
-RELDATENUM="2019-10-05"
+RELDATELONG="19 October 2022"
+RELDATESHORT="19-Oct-2022"
+RELDATENUM="2022-10-19"
 
 # constant variable settings
 FVWMNAMELONG="F? Virtual Window Manager"
diff --git a/modules/FvwmCommandS/FvwmCommand.h b/modules/FvwmCommandS/FvwmCommand.h
deleted file mode 120000
index 65941c01e..000000000
--- a/modules/FvwmCommandS/FvwmCommand.h
+++ /dev/null
@@ -1 +0,0 @@
-../FvwmCommand/FvwmCommand.h
\ No newline at end of file
diff --git a/modules/FvwmCommandS/FvwmCommand.h b/modules/FvwmCommandS/FvwmCommand.h
new file mode 100644
index 000000000..43f87e42b
--- /dev/null
+++ b/modules/FvwmCommandS/FvwmCommand.h
@@ -0,0 +1,32 @@
+/* -*-c-*- */
+#include <unistd.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include "libs/ftime.h"
+#include <sys/wait.h>
+
+#if HAVE_GETOPT_H
+#include <getopt.h>
+#endif
+
+#include <errno.h>
+
+#include "libs/Module.h"
+#include "libs/fvwmlib.h"
+#include "fvwm/fvwm.h"
+#include "libs/vpacket.h"
+#include "libs/fvwm_sys_stat.h"
+
+#define F_NAME  "FvwmCommand-"
+
+/* number of default arguments when invoked from fvwm */
+#define FARGS 6
+
+#define SOL  sizeof( unsigned long )
+
+#ifndef HAVE_MKFIFO
+#define mkfifo(path, mode) ((errno = ENOSYS) - ENOSYS - 1)
+#endif
+
+
+char * fifos_get_default_name(void);
diff --git a/modules/FvwmCommandS/fifos.c b/modules/FvwmCommandS/fifos.c
deleted file mode 120000
index 1490c9925..000000000
--- a/modules/FvwmCommandS/fifos.c
+++ /dev/null
@@ -1 +0,0 @@
-../FvwmCommand/fifos.c
\ No newline at end of file
diff --git a/modules/FvwmCommandS/fifos.c b/modules/FvwmCommandS/fifos.c
new file mode 100644
index 000000000..d6ea13852
--- /dev/null
+++ b/modules/FvwmCommandS/fifos.c
@@ -0,0 +1,174 @@
+/* -*-c-*- */
+/*
+ * Fvwm command input interface.
+ *
+ * Copyright 1998, Toshi Isogai.
+ * Use this program at your own risk.
+ * Permission to use this program for any purpose is given,
+ * as long as the copyright is kept intact.
+ *
+ */
+
+/* This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see: <http://www.gnu.org/licenses/>
+ */
+
+#include "config.h"
+#include "FvwmCommand.h"
+
+#define MAXHOSTNAME 32
+
+char * fifos_get_default_name(void)
+{
+	char file_suffix[] = { 'R', 'C', 'M', '\0' };
+	char *f_stem;
+	char *dpy_name;
+	char dpy_name_add[3];
+	char *c;
+	int i;
+	struct stat stat_buf;
+	char hostname[MAXHOSTNAME];
+	int type_pos;
+	uid_t owner;
+	Bool is_path_valid;
+
+	/* default name */
+	dpy_name = getenv("DISPLAY");
+	if (!dpy_name || *dpy_name == 0)
+	{
+		dpy_name = ":0.0";
+	}
+	if (strncmp(dpy_name, "unix:", 5) == 0)
+	{
+		dpy_name += 4;
+	}
+	dpy_name_add[0] = 0;
+	c = strrchr(dpy_name, '.');
+	i = 0;
+	if (c != NULL)
+	{
+		if (*(c + 1) != 0)
+		{
+			for (c++, i = 0; isdigit(*c); c++, i++)
+			{
+				/* nothing */
+			}
+		}
+		else
+		{
+			/* cut off trailing period */
+			*c = 0;
+		}
+	}
+	if (i == 0)
+	{
+		/* append screen number */
+		strcpy(dpy_name_add, ".0");
+	}
+	f_stem = safemalloc(11 + strlen(F_NAME) + MAXHOSTNAME +
+			    strlen(dpy_name) + strlen(dpy_name_add));
+
+	if (
+		(stat("/var/tmp", &stat_buf) == 0) &&
+		(stat_buf.st_mode & S_IFDIR))
+	{
+		strcpy (f_stem, "/var/tmp/");
+	}
+	else
+	{
+		strcpy (f_stem, "/tmp/");
+	}
+	strcat(f_stem, F_NAME);
+
+	/* Make it unique */
+	if (!dpy_name[0] || ':' == dpy_name[0])
+	{
+		/* Put hostname before dpy if not there */
+		gethostname(hostname, MAXHOSTNAME);
+		strcat(f_stem, hostname);
+	}
+	strcat(f_stem, dpy_name);
+	strcat(f_stem, dpy_name_add);
+
+	/* Verify that all files are either non-symlinks owned by the current
+	 * user or non-existing. If not: use FVWM_USERDIR as base instead. */
+
+	type_pos = strlen(f_stem);
+	owner = geteuid();
+	is_path_valid = True;
+
+	f_stem[type_pos+1] = 0;
+
+	for (c = file_suffix; *c != 0 && is_path_valid; c++)
+	{
+		int rc;
+
+		f_stem[type_pos] = *c;
+		if (DO_USE_LSTAT)
+		{
+			rc = fvwm_lstat(f_stem, &stat_buf);
+		}
+		else
+		{
+			rc = stat(f_stem, &stat_buf);
+		}
+		if (rc == 0)
+		{
+			/* stat successful */
+			if (
+				stat_buf.st_uid != owner ||
+				stat_buf.st_nlink > 1 ||
+				S_ISDIR(stat_buf.st_mode) ||
+				FVWM_S_ISLNK(stat_buf.st_mode) ||
+				(stat_buf.st_mode & FVWM_S_IFLNK) != 0)
+			{
+				is_path_valid = False;
+			}
+			break;
+		}
+		else if (errno != ENOENT)
+		{
+			is_path_valid = False;
+		}
+	}
+	f_stem[type_pos] = 0;
+	if (!is_path_valid)
+	{
+		char *userdir;
+		char *tailname;
+		char *tmp;
+		tmp = f_stem;
+
+		if (f_stem[1] == 't') /* /tmp/ */
+		{
+			tailname = f_stem + 4;
+		}
+		else /* /var/tmp/ */
+		{
+			tailname = f_stem + 8;
+		}
+
+		userdir = getenv("FVWM_USERDIR");
+		if (userdir == NULL)
+		{
+			free(tmp);
+			return NULL;
+		}
+		f_stem = safemalloc(strlen(userdir) + strlen(tailname) + 1);
+		strcpy(f_stem, userdir);
+		strcat(f_stem, tailname);
+		free(tmp);
+	}
+
+	return f_stem;
+}
diff --git a/po/FvwmScript.ar.gmo b/po/FvwmScript.ar.gmo
index 7fd3ed6899d9d174867ba1397c7c435821b2fc7b..0e0cb3c388e32b64d2aef1af052cf8ca2cb45fad 100644
GIT binary patch
delta 29
kcmaFPbdqU;3M2nSRsD&z{aikYdFiEz>8Vx<lermV0G4VAegFUf

delta 56
zcmX@f^qgse3Zw2sReiM(UFV|I#FEVXJYAQ>l2j`NBLf2?T|+}%BMSvX6DuQQZ39CC
MgNcEYCccXX0NRZZr2qf`

diff --git a/po/FvwmScript.de.gmo b/po/FvwmScript.de.gmo
index 01b88c78a1ce0fa11511e05e3e66f6192531fde5..7defd7c3a0a16684b005f0f8345888a538c75a25 100644
GIT binary patch
delta 416
zcmXZYuS-K=6vpvqyLxx`17y3P&LA4ihKX&#=0D(IVL`Sq1eGPjRhz{!yC7==5eD19
zU|159&7wt2igDQVd)$GS_rr5|@B5x}r}0aCca=)kQ&J_AmL=_Fqy;>}Jf35Wm!5Bs
zrCYWF4siu1IEQbT!*|T$H<s}S7qJx0>Kkb1HzOtg7j02kqOgN@LEUYkJ#>sLowC`3
z7if+3FpXp64c+5BPCP%N4f5>y6`55ZSi-L;nSJ<6!8**)w*84!v<WJnt5_u0kfUm&
wUEJ~dndh#1?e@_c8+m>}8|Vr7@zS6eRD<qGc$nL595g$P=Kl8D;4{nzf6DMGvj6}9

delta 444
zcmXZYPbdUo7{~Ev3}bg}X-%y^rS`%_Q|}B#o02F;DO|N_4=$9ZD2KT@IMF)e=Hftm
zR&rBvLL40SBqui)4!#dhy}h4)PczT^yzfi&6<r>C`HUwr8Hfys$WFINFCJnKo?(O+
zmT!<H_iQD6#35{BC;niFUO}XYB^<;GR?t~}0rmT(g5-aVRw?vTSVwKJXYQjObc8H9
zVbcT8Q3t!l4tz$=mRIb;w&i!!i+o!CM(!#;)AeCk%>REJrl1p!puWU3vSh{b8kWhs
zNDnzcZQQi_spTv4+Pp&@?8)*Q>V-a#hZkv;{aJr>IiA~Y)U%DP&3L|^HEPw=xin6a
XIGw5{6SZ`F%q7k>7lW+z5QP3O;|(xJ

diff --git a/po/FvwmScript.fr.gmo b/po/FvwmScript.fr.gmo
index 8b200e6c57866513c5e885ccad9325c885371194..c72f196ae1497d89708e205ec023ec49642f86ed 100644
GIT binary patch
delta 401
zcmXZYy-Pw-9LDiSZ`w8S-6U#kaSfz~TKpSqZ`41)E%0uxI=G8V&=6d36e6%CYHH1`
zaIjf$3Hm;G;c!0Z^>?0oXZ2kzo}{9ilysGq&Ls5@r6P_ohf}QJBOc%a1AIZQ=oL@#
zJ=tHQ@BJc8Te>>_;W1W2iKZr<>s^G3bj0A21wYirJa*6p?y!N~WIn(X=0hyw6w?@E
z3Fk=Dk}iWE$@~*t?+YFL8y$QTM*EEnv7NAhE_{wY*g`*ejWxVQpX;H|4bZ_y=-{(t
e{R#bH&sfDbbbuAQ&JXhANn8oq!Tdh^5c~t1SS8c|

delta 440
zcmXZYJxc>Y5P;!{m&C-cB;F~aAgR*G$=)d%VijU3h+rj%1iV5E1xcw~YngzpMXF$>
zkjDIjU}+%)ECmr_BMO3z?~sLMpWE5l+1dMb+up-XB90Own`x0H5xE@~nZX`rv5y6O
z#w5O>gCEEd`NT#1w)?rv=$wayWEnjy;T&!uL-v@o-a$rUnc(AyfL?TplX!_*;2P(#
zY1bWGV118y?Bf^?Fo&<mkRekFf9(1XwO*1}Y2#C<jl0=+w6RJ+JKR7mykip&Q7=43
z7q3wBTBvy))W#oC8-KF#7u1Kn<1BumHjpByb*7OYFVZbIRj0J?*Dj)Z<K+Cz->x^J
bN-;Dh^n<_;%f(>560WV7z?klC`p)?WM^`Qu

diff --git a/po/FvwmScript.ru.gmo b/po/FvwmScript.ru.gmo
index 6e5fe748b5d94ec9f906a91e4c0fe121ef363511..4ffce548cfeec481f59336c069e842bb84b4795e 100644
GIT binary patch
delta 416
zcmXZYy-Nad7{KvIl<Usdv=Bj4!=TZcG`D6QL}=GRBm$QbgobMn99n{0UBW2`1s4Yw
z|A2;?Y-@K56_=pzqX)-*?s@LH=Xrj&i7uk!p3B~fNX`(+;>Cf;5mqsR517C%QX&KN
z;}DN=is$%&UR+}U#oX5g@q{prF}y;3UqKI6O|f@_>Lkucv@wHyJj6Mk;uq?`73x6C
z5=r7EYNImh;y1`8x7>8mdko<dhVjM8zoGUWS++=!hfflE(jP3~AL<{-bF35=9q&*F
zKchB$NBwT*#NST5L>+AU_VqE;1#_s2714z<3A?Y|ua8FCTdFl1ty-gANKbx^j^`g+
C^(sdI

delta 444
zcmXZYze~eV5Ww*(EwS-;TM2?%D@r?P=t~rTWD}k3;*YsQhb&dJo6rm$#8EAdZVoOY
zbaW9X9UK*L@egp&NjLF(HW2d3UGBZR_g<ZE=cb*AoP@}dB~liVjUJI4HZhB*IF6S{
ziQHp9KH><zU<p647jtQm0nDS;&EW*D;3)3I|MxIO+)PXK->5}mhQv8e<1G&3J5J#j
zYQwDEZCJuQaRqgwI_lsD$RkI*bbu2a!VApcb)3IL-S^3kL<afzB%vq$#Q?`Rj^4mF
zPGT5)jN14Lb;AeLb#HO}6UTO6w{a1*ei3!RE!4q6<l;p-ndEA+xaqF#*Q$+hx9+Z2
g8?~U|8{@m4=laV9Zz1sKXN_mfS;ac+JX@{QA7vOY+5i9m

diff --git a/po/FvwmScript.ru.po b/po/FvwmScript.ru.po
index b0abfc86c..262c527e3 100644
--- a/po/FvwmScript.ru.po
+++ b/po/FvwmScript.ru.po
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2013-02-12 14:20+0800\n"
 "Last-Translator: Ivan Gayevskiy <ivan.gayevskiy@gmail.com>\n"
 "Language-Team: Russian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/FvwmScript.sv_SE.gmo b/po/FvwmScript.sv_SE.gmo
index 50effb7e35e876d38344eefbc8aa0feb5a94a54a..5ab609e25e2a285e4150a1a58ab92360e412f093 100644
GIT binary patch
delta 416
zcmXZYze_@46vpwRSFblKf1@U34T1U>2yQt!h)b)>9YS1m(IE`(RI5V;cNIi%Q*3N>
zaA<LK3!Q4nu`T)@yYTXU;JNob=e+Mr>L)pS_BmHRk+LZg7m;R2<P<x2g!icVBU<QU
z07n?c38rz52Cnb~-;t8C!3cif1@2MnMA@`X))MDX=$zn;polT7B1>-Av|tmDv5op)
zA9b)H`f-F&93wsC)$<MY{1Ub98g;NOrts5p{tx^TWC%>IUBWyDv4#n3puUWaEa|f8
zKzFF$A5a^(n8PU^8lw)nMs2+F@-O7!MHX@6+ISk6y>Q*`wEA}IwsN`nHVeidZ|W*T

delta 444
zcmXZYKT88a5Qg!&oL(+!qS2rzf+-{*VPWqSm1yH1Y;F7iridVjq6CC%u1sU9L<C!H
z1tE|&AcCc6X=!0$lQNz7OcGf32XnXY%x-VyHuv0g;$25%!xPDhNR$*w;|-?p9<~06
zKDKcLJ2-}~IE(M-;tx*XFA^y|%-|m`VVV%lF>IQ%?n~Sc+M+N|;Q*)b7+G@3rhyTT
zV-5Ac2I^o>n7|HB;tSGCK8Jpxp8rP8?V=8*x645?6%P(9QkbK#j4QZ}qj-YTc!v5i
zF|wr2rUTufet$r1(8dLP!+vAbLA$7p9iC0=KJxG)t*pD_7LLr`Ri#`#y*M}f<!Ysr
d53LPN5SVZ?AFP$a)uIioZ5(>ntq-r@{sXekFV_G7

diff --git a/po/FvwmScript.zh_CN.gmo b/po/FvwmScript.zh_CN.gmo
index 42867726f944d2cd56c78f5b57c2e0c3f02d0b31..0ca5e1dd00e7d17bd40385e617f381b051d81793 100644
GIT binary patch
delta 412
zcmXZYy=%f?5XbS0DNj=93mT{d96A@5PJ*4BT5#3Hz0kqQtz-xe9ZEYC><c(JxCjci
z;Ob!M;@+i$TmJ(WaS^|#2O%GR_vG%9%%Xnu_3EVsPo(5TA`z(tB8PZ~l%$2HcyIa9
zd@(=pi1Qx$II{d{=Tp@FAM+Pa$p3hN%RtiIq7?;wfeq#{7w%u+0(HQp<qGP;8>`o?
zev3M|iTVMF)gSPf{EXVywfX>a<Z+np7kyLEMRSbt&mLT&Hm*?{9Mjbpbzu>;@5*u&
nv*d>5rky9qB~RRR-W&4cMJ8GQ+V8a8duQRoO!<6r77R06ujwYm

delta 444
zcmXZYze~el5XSL~kr=@rtwD<5&_P@z@FohCtQ8a&7ag3WLxnC1wS!v*!J(6&AX(c%
z>L5Z992{I61pNnG#Kql3aPxb55c0`$Z|=P}=|zvx?S+?To=7baiA1D5CNhqvNJ-9c
z8ZRwhnK$MgPO$!fK0aH1we>gD{txpDr^sF?GK!^8^1nf|6!ZY|SV4z+fDP0Qwk+?V
z4&1l;k=0L7H}0Z-Kw<ShPLi)t`|hp&gfrxqF#jL)PC*BK;v9b4izRl`#tLe~f>}cy
zxQW`gYq^DG^0DQvtry5818%zC5c%;ul>K#oaXYTJn~hHE@E~4mbedT;buNvQBu-bW
U$x4<kFS*3I^PQj={se=OUuTCe2LJ#7

diff --git a/po/fvwm.ar.gmo b/po/fvwm.ar.gmo
index e4ebdfac4d8400e5a4847aaba26a35c1c4fa325d..44c171efeff0bf368662ddbc103f2929adaaf893 100644
GIT binary patch
delta 562
zcmXZYKP&@r6u|LEi1yUA^{=YP1y@2Btq!_aESHEx3<e2qkS3yMVlX(Hgv})#Nem(;
z$wk6skl09UCX3D9qzmzV-1PbV-uvaf_j~nx)4naV`tcT#oFS4F5xY|)j^)VtNC!KJ
zuV6Q>;RJfvgLNFh8}#rA$FZ0Y8O2r1-~pEK3}^5;A^u;Y89hvOi4;hbkdSPmHmo5t
z$`SVCX%xRiZE%NWd`BBiQ)CEdQ9rgE-CeY}AEFL?VfrF{9PSD9;wz@{6JyxGLHt48
zOqOaEj-hT~0X4saBY2Ej_zI`+5w-po>fn<4-&h8Rxla2Ww6TM_qV?#(KI#A`s6P)-
z8=a%B_5mIIz-^plY8L~{Vgq$EN!FLcBI<xkSiu@<-SjmFog~COzJ+sb-|fMMv1=^4
PUUko{ZdI)C#c*Q3zVtXK

delta 590
zcmXZYPbh<N9LMqRL}nN>=Fes=u@!stJe!5xG|6uB=jt%EMA{+_N}jv9ksRcvxNUKy
z93)pMP7caZxyga@{_>n&zkko~_jx{F1BcN{yvB~XM1mfX77@ubiZtMy<AUQ7*0a8b
zZMcOo+(SQJVi(?H5nr(%b4?<BxQU&3gh{NRg>Ow_|7`@C{|^phoQ)aejO?I3SVl6+
z2?p@oS-(Mj;1N^!i31q-iiB_$^~Xxi+{Os=W7NRcUR$Jt!4nJZ_>Mkw@s%6>*n=U|
zW=1iB6Q~U=I{UjAW`2r#@huMG3+nyu*8kvP)W%ZSi&>k2KD>ll(YABo05!lF>YrCp
zgIu9j`;1xq#uc0*bsnqOjecs=W(*8s4mIE^rm>8AukVh5CV9Xpeq4;#{?tY1jm&x>
pzp-2@8k6~rLOPN#&4giDMq(^tjieLFA=5I={iJ98qT-o${{l0)KlT6s

diff --git a/po/fvwm.ar.po b/po/fvwm.ar.po
index 0dc229e63..c08ae6997 100644
--- a/po/fvwm.ar.po
+++ b/po/fvwm.ar.po
@@ -317,3 +317,385 @@ msgstr "رجوع - خروج"
 #. ./modules/FvwmForm/FvwmForm-Setup.in: line 55
 msgid "Copy Config File(s)"
 msgstr "إنسخ ملفات التعريف"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 51
+msgid "Fvwm Menu Desktop Config"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 58
+#, fuzzy
+msgid "Multiple Menu"
+msgstr "قائمة مبنية داخليا"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 66
+msgid "Menus in"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 95
+msgid "No menus found! Check why from within a terminal with"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 109
+#, fuzzy
+msgid "Single Menu"
+msgstr "قائمة مبنية داخليا"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 114
+msgid ""
+"If you want a single menu only deselect all menus above and fill out the "
+"fields below."
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 116
+msgid "But remember, if the menu doesn't exist, nothing happens."
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 120
+msgid "Menu Top Title:     "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 123
+msgid "  "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 124
+msgid "Install-Prefix:     "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 128
+msgid "Desktop:            "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 132
+msgid "Menutype:           "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 141
+msgid "General Options"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 146
+msgid "Used Menu Type:     "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 149
+msgid "Multiple "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 150
+msgid "Single"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 153
+msgid "Use Icons?          "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 155
+msgid "Yes      "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 156
+msgid "No   "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 159
+msgid "Icon size:          "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 161
+msgid " (Default is 24)"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 164
+msgid "Use Titles?         "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 170
+msgid "Used Icon theme:    "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 174
+msgid "Menu(s) in a Menu?  "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 180
+msgid "Insert in menu:     "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 184
+msgid "Directory Icon:     "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 188
+msgid "Application Icon:   "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 192
+msgid "Icon directory:     "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 194
+msgid " (Directory for converted icons)"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 197
+msgid "Output path:        "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 199
+msgid " (Full path to store output)"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 209
+msgid "Generate Menu(s)"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 235
+msgid "Save Settings"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 262
+msgid "Reset"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 264
+msgid "Help"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 266
+msgid "Quit"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop.in: line 472
+msgid "Regenerate XDG Menu(s)"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop.in: line 515
+msgid "Regenerate XDG Menu"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 17
+msgid ""
+"In this section you can define a custom-assembled menu 'foo-bar.menu' placed "
+"on another"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 19
+msgid "location as defined in the XDG menu definitions."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 24
+msgid "Specifies the menu title of the top menu used by Fvwm's Popup command."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 26
+msgid "                    "
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 27
+msgid "Default is 'FvwmMenu'."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 32
+msgid "Overrides the standard locations for XDG menu definitions. The standard"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 35
+msgid "locations are /etc/xdg/menus and"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 35
+msgid "if available."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 40
+msgid "Overrides the name of the main desktop environment installed on the"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 43
+msgid ""
+"system. If a system offers multiple desktop environments $XDG_MENU_PREFIX"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 46
+msgid "is typically set. It is ignored if this field is used."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 49
+msgid "Possible names: gnome, kde, lxde, etc."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 54
+msgid ""
+"Defines which type of menu should be found. Possible name types could be:"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 57
+msgid ""
+"applications, settings, preferences, etc. Note if the specified menu type"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 60
+msgid "doesn't exist the generated menu is empty!"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-MultiMenuHelp: line 17
+msgid ""
+"In this section all XDG menus found on the system are shown. All selected "
+"menus"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-MultiMenuHelp: line 19
+msgid ""
+"will integrate in one Fvwm menu. If you want to generate a custom-assembled "
+"menu"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-MultiMenuHelp: line 21
+msgid "use the 'Single Menu' section."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-MultiMenuHelp: line 28
+msgid "List menus with checkboxes found in /etc/xdg/menus/"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-MultiMenuHelp: line 36
+msgid "List menus with checkboxes found in $HOME/.config/menus/"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-MultiMenuHelp: line 42
+msgid ""
+"Note that equal menus found under /etc/xdg/menus AND $HOME/.config/menus/"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-MultiMenuHelp: line 44
+msgid ""
+"following the XDG menu specification only shown in $HOME/.config/menus/."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-MultiMenuHelp: line 48
+msgid ""
+"If no menus appear check why from within a terminal with 'fvwm-menu-desktop -"
+"v'."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-MultiMenuHelp: line 50
+msgid ""
+"Also it is a good idea to check .xsession-errors in the user home for errors."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-MultiMenuHelp: line 54
+msgid "One limitation exists:"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-MultiMenuHelp: line 56
+msgid "If there are too much menus found an error occurs in .xsession-errors:"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-MultiMenuHelp: line 62
+msgid ""
+"This happens because PipeRead used for menu generation has a command length"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-MultiMenuHelp: line 64
+msgid "limit of 1000 characters. Sorry for that inconvinience."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 18
+msgid "Set which menu generation will be used."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 23
+msgid "Option enables mini-icons in the menu(s)."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 28
+msgid ""
+"If 'Use Icons' is set, by default 24x24 mini-icons are used. If another size "
+"is"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 31
+msgid "desired enter the wanted size in this field."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 36
+msgid ""
+"If the specified icon isn't that size it is converted if ImageMagick is "
+"installed."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 39
+msgid ""
+"Generated icons are saved in $HOME/.fvwm/icons or the directory specified "
+"here."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 42
+msgid "Otherwise no icon appears in the menu for that entry."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 47
+msgid "Sets the used icon theme. Default is 'gnome' but all others found in"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 50
+msgid ""
+"/usr/share/icons can used except the hicolor theme because it's the default"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 53
+msgid ""
+"fallback theme if no icon is found. Note that the theme name must be written"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 56
+msgid "exactly as the icon directory e.g."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 61
+msgid ""
+"If 'Use Icons' is enabled and for a directory in a menu no icon is found"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 64
+msgid "as default icon is used. But if the gnome icon theme isn't"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 67
+msgid "installed no default icon appears. Another icon can defined here."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 70
+msgid "Only the name of an icon is needed not the path!"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 75
+msgid "If 'Use Icons' is enabled and for an application no icon is found"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 89
+msgid "Enable this checkbox to insert generated menu(s) IN a menu."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 94
+msgid ""
+"Enter in this field the name of the menu (its top title) where the generated "
+"menu(s)"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 97
+msgid ""
+"should insert. For more information see the USAGE section in the man page of"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 105
+msgid ""
+"If this option is set menus are generated with titles. Default is no titles."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 110
+msgid ""
+"Enter here the FULL path of the menu to store. Default path is "
+"$FVWM_USERDIR/.menu."
+msgstr ""
diff --git a/po/fvwm.ru.gmo b/po/fvwm.ru.gmo
index 21b40a18d708e7ca961eb06ee8fd3c96ce4e5b7d..cb159ff4e7028bde52591b856ea8f82528bef48a 100644
GIT binary patch
delta 555
zcmXZYzb`{k7{>88B~8_B{i@J%i3Yt`q^`jv5oyv5qZo)pVj^PbO(b_{iWm$SI*CCd
zv5?%sB<<)gXd)&FgTcUL^nG*A^f~XzIq!MibLPDl9{pJOEh2tWqzm(%#-eoz)9kO|
z0B+$32H1mj?8kd+6ZfcFIFBXA+&jV?^%c(G0~YYjkx;TM+EOB8=;ACcVgmP30|clK
zoni*Btr1R9zu+AHS|_=r53QpHJ;rgY+x=(MLB7(VX_#PqK0#a@LJu|2GSX9aP%j)}
zH(sJnbc@=!fjZF#PN2gf4OT=CH&D;la1?KF5St+j{n}T|<BvU%A@(q}kA#&~)F0VI
z7k5z`o!|=IVSs<QjR(EvUJEtYCu+Y`pBZEt7pSvk7CLzqHR(BO@~5cW9*;+r<VD9n
Djyp9G

delta 594
zcmXZYy-Pw-7{~FGh?J$4y{f%fR2nASd(|kRsSu)|qBd!e5Q->4T&m#?(U40JG(@xr
zZBd3pOASuZ5Ckm^4Yfp${RQ@Y@J^p|?tRX4e$V+16~pDY&FpDXD(+Ouqm)`~ZJ4&)
zK{wwIu@{Rth$Za6Dt6<$Wes!e>zKe?TjSg{`q@8W1V1o@c9$}hkHw@*sbNf^hFjQ-
z7bpQrC>Pyh7d~5l;spCYjA4LcaT(>JBb1<bIEq#4`wz+>UXR&ms53r~pi&sXRg^%x
zNN;tDa^MQv@eyUBSCq!TC=<E(Ife<8U}+5FF-rX{4&e*-Va;SAPirIQ2>MY9X0abP
zkg)0i<wZ_#0MAhB%D94WxR1kLr8e;r<y;*ln7gylZwh6QHJm|To`p<)gOc<CCHYrn
u!R~O3uSe(d*-T+Ow-=qy6tc;np=m}`*Q3UCP>&~#SVYq`t+M1iZ}|s-jzEV1

diff --git a/po/fvwm.sv_SE.gmo b/po/fvwm.sv_SE.gmo
index 00c6f77bd8d694f8298cafc22aa7672fd9165207..f8fa5b06305192d0ab195ee34914df28f31277fc 100644
GIT binary patch
delta 570
zcmXZZJxIeq6u|LkX``l%U-c^$F~QPNP`lX0f;bceXF-JsT3sqgg>G>w-4xvfaTYpA
zi%W5FR~!_aby5UH5Ok~mhX=>~?!6>;@8ur+EB`VZ3DX@SSzDw_L{{P=7H*)%I~c<~
z?8FN8-~l>#XyP*y*Kv+~3rF!A6X-CFU<!wE1_!Z_kWhwLtdkhWGEU$zc4Gs3@fx*&
zTV%+i@frJwKQM!BbTLD99_Eph1gQBEPGSwUfVva@cXC5Q54gvEd_wKu4fRh%Xj==3
zV-&|w5B88(WZFERH}Nv+K5M8Q@1izTMTQ(P4d8jmLJw}3L<_aDJ7mZUlU~V}@fVZC
zZPWsiRJDL<%;PpL;sxrypXlQc>b@=?aVs)~ns;+7w6ay4#Vt(XX|oWutdojewwHoZ
PaX%<-=Dg;+{TllNP=h#;

delta 598
zcmXZZKS%;`6u|LU_@_*>EG+{`34{>gPKDGVLTw0y8X8&(93&bl2tlae8lskhC}?bo
zwnC5~h~~f{gcfOO42qVZxxTLse%$Bx-u?K!_wH_E&#^|P+bVR4WIQ50B2w=Yap4|n
ze27jwK{uXbKVF~@ukHBWj$4=`-@#D~ctu!};4y+(4B-L}<EmFI39{KG5y4X&#|HLd
z8~yl#+Q2)q<jeL42Z+6N6UPXKv4l}vK|OET`6HYlzCvxF<+J`Lc_pC*K5-DgQ73RS
zu6~IqY9o{Az#MAfY2>KP+wYg{cpdeg9n^`BQ3tw2mfY|N;Dg0R3%Bh=2eq>gWc^ju
zU*e~_8p0urpf+G)5eqnj2RMt5sQ3Cf6vH6uy;I2Fk+Pi+FR{_iwlR(SIEHu4Ifu&?
uUrZLas+HQ>=0>tqsa5mQlwqWjrkPA-qh=<bN+%4{FwV-Jdh^Ni=KKZs);xg#

diff --git a/po/fvwm.zh_CN.gmo b/po/fvwm.zh_CN.gmo
index 785cd681a8e01643e9dbbd6584dd5c3bc5ace11f..d27fc829cc9c168e8b837fe3e3d72ee702c265ab 100644
GIT binary patch
delta 513
zcmXZYy-EW?6o%om7!BFP^^aI2M$Hvy>{L>i%0eVyr;RBzU?GYG5tMC|fM_NDlnPb~
zBBbyVBo|<j+Cs1v1hMcv=7WJ}zcaIQX6CVQUU>cu;?cmYlrl@2*<xtMu&P{>n{rnk
zVn6Ge%9qNwI8XfvGx#aLF-uOQyXMg6r_&bOFdt<K6IjJQ+(B=!uY7_GJCir)|J~yd
zzNp?-e$)I1dZQoZB*FL3;UE?>areeEDwHwL#4>t=Eo9h{JXQT#`2qhAfCH>+Badkv
z^ak(9urC>KD?dOav+I0#qcJ&!3*-t`@EB+D6@8;1>KdUxX&#GMLf?1=$8i-$@SxS{
Z+3US%q^`oH+IGEBt8dIrw!-i(@dp~GF46!1

delta 541
zcmXZYzb`{k6u|M*P&}<)l_nCYmV`xL^4@EQwg&NIG59gqy68}eL@MaO)Wu-IAR<_V
zNQ6bwFd9q-tHB>2olFLc!T0D%ZtmxvbAO$C4-)r@hu=^w8xrvyk#-ST?G&L&#oRUb
z%p>z0yI6N)aoyr)oFM;(QS68`jbog6#LQWKAtE)2F;OIu#0s|IA?gJu7GEPx?#w6D
zeJ|LD@0M>^{B84Ls?b6P=yd%k>iIeB#mQ)``Qjx@6mgJ=b<_>}NRtcm*7A=Qzv6!Z
z*u%O8@|p63dO?U+FqD{?L@gj~W>y&JMFn#nr-(H_jaQh*Pt=2w-A&V|Uz*2ZTtq#1
z6NhjI`|-5?(Xt&LTXtu*%BAYsM#Y^iRm+7`;CX@T`)-g+`Po8{8TWk8JDzjS>R--f
F>mO5%HtPTY

diff --git a/po/fvwm.zh_CN.po b/po/fvwm.zh_CN.po
index 0c936c6bc..ceefc79c5 100644
--- a/po/fvwm.zh_CN.po
+++ b/po/fvwm.zh_CN.po
@@ -316,3 +316,385 @@ msgstr "返回 - 丢弃"
 #. ./modules/FvwmForm/FvwmForm-Setup.in: line 55
 msgid "Copy Config File(s)"
 msgstr "复制配置文件"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 51
+msgid "Fvwm Menu Desktop Config"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 58
+#, fuzzy
+msgid "Multiple Menu"
+msgstr "内建菜单"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 66
+msgid "Menus in"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 95
+msgid "No menus found! Check why from within a terminal with"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 109
+#, fuzzy
+msgid "Single Menu"
+msgstr "内建菜单"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 114
+msgid ""
+"If you want a single menu only deselect all menus above and fill out the "
+"fields below."
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 116
+msgid "But remember, if the menu doesn't exist, nothing happens."
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 120
+msgid "Menu Top Title:     "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 123
+msgid "  "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 124
+msgid "Install-Prefix:     "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 128
+msgid "Desktop:            "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 132
+msgid "Menutype:           "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 141
+msgid "General Options"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 146
+msgid "Used Menu Type:     "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 149
+msgid "Multiple "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 150
+msgid "Single"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 153
+msgid "Use Icons?          "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 155
+msgid "Yes      "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 156
+msgid "No   "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 159
+msgid "Icon size:          "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 161
+msgid " (Default is 24)"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 164
+msgid "Use Titles?         "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 170
+msgid "Used Icon theme:    "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 174
+msgid "Menu(s) in a Menu?  "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 180
+msgid "Insert in menu:     "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 184
+msgid "Directory Icon:     "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 188
+msgid "Application Icon:   "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 192
+msgid "Icon directory:     "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 194
+msgid " (Directory for converted icons)"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 197
+msgid "Output path:        "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 199
+msgid " (Full path to store output)"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 209
+msgid "Generate Menu(s)"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 235
+msgid "Save Settings"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 262
+msgid "Reset"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 264
+msgid "Help"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 266
+msgid "Quit"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop.in: line 472
+msgid "Regenerate XDG Menu(s)"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop.in: line 515
+msgid "Regenerate XDG Menu"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 17
+msgid ""
+"In this section you can define a custom-assembled menu 'foo-bar.menu' placed "
+"on another"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 19
+msgid "location as defined in the XDG menu definitions."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 24
+msgid "Specifies the menu title of the top menu used by Fvwm's Popup command."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 26
+msgid "                    "
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 27
+msgid "Default is 'FvwmMenu'."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 32
+msgid "Overrides the standard locations for XDG menu definitions. The standard"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 35
+msgid "locations are /etc/xdg/menus and"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 35
+msgid "if available."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 40
+msgid "Overrides the name of the main desktop environment installed on the"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 43
+msgid ""
+"system. If a system offers multiple desktop environments $XDG_MENU_PREFIX"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 46
+msgid "is typically set. It is ignored if this field is used."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 49
+msgid "Possible names: gnome, kde, lxde, etc."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 54
+msgid ""
+"Defines which type of menu should be found. Possible name types could be:"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 57
+msgid ""
+"applications, settings, preferences, etc. Note if the specified menu type"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-SingleMenuHelp: line 60
+msgid "doesn't exist the generated menu is empty!"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-MultiMenuHelp: line 17
+msgid ""
+"In this section all XDG menus found on the system are shown. All selected "
+"menus"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-MultiMenuHelp: line 19
+msgid ""
+"will integrate in one Fvwm menu. If you want to generate a custom-assembled "
+"menu"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-MultiMenuHelp: line 21
+msgid "use the 'Single Menu' section."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-MultiMenuHelp: line 28
+msgid "List menus with checkboxes found in /etc/xdg/menus/"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-MultiMenuHelp: line 36
+msgid "List menus with checkboxes found in $HOME/.config/menus/"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-MultiMenuHelp: line 42
+msgid ""
+"Note that equal menus found under /etc/xdg/menus AND $HOME/.config/menus/"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-MultiMenuHelp: line 44
+msgid ""
+"following the XDG menu specification only shown in $HOME/.config/menus/."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-MultiMenuHelp: line 48
+msgid ""
+"If no menus appear check why from within a terminal with 'fvwm-menu-desktop -"
+"v'."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-MultiMenuHelp: line 50
+msgid ""
+"Also it is a good idea to check .xsession-errors in the user home for errors."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-MultiMenuHelp: line 54
+msgid "One limitation exists:"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-MultiMenuHelp: line 56
+msgid "If there are too much menus found an error occurs in .xsession-errors:"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-MultiMenuHelp: line 62
+msgid ""
+"This happens because PipeRead used for menu generation has a command length"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-MultiMenuHelp: line 64
+msgid "limit of 1000 characters. Sorry for that inconvinience."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 18
+msgid "Set which menu generation will be used."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 23
+msgid "Option enables mini-icons in the menu(s)."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 28
+msgid ""
+"If 'Use Icons' is set, by default 24x24 mini-icons are used. If another size "
+"is"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 31
+msgid "desired enter the wanted size in this field."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 36
+msgid ""
+"If the specified icon isn't that size it is converted if ImageMagick is "
+"installed."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 39
+msgid ""
+"Generated icons are saved in $HOME/.fvwm/icons or the directory specified "
+"here."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 42
+msgid "Otherwise no icon appears in the menu for that entry."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 47
+msgid "Sets the used icon theme. Default is 'gnome' but all others found in"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 50
+msgid ""
+"/usr/share/icons can used except the hicolor theme because it's the default"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 53
+msgid ""
+"fallback theme if no icon is found. Note that the theme name must be written"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 56
+msgid "exactly as the icon directory e.g."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 61
+msgid ""
+"If 'Use Icons' is enabled and for a directory in a menu no icon is found"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 64
+msgid "as default icon is used. But if the gnome icon theme isn't"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 67
+msgid "installed no default icon appears. Another icon can defined here."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 70
+msgid "Only the name of an icon is needed not the path!"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 75
+msgid "If 'Use Icons' is enabled and for an application no icon is found"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 89
+msgid "Enable this checkbox to insert generated menu(s) IN a menu."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 94
+msgid ""
+"Enter in this field the name of the menu (its top title) where the generated "
+"menu(s)"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 97
+msgid ""
+"should insert. For more information see the USAGE section in the man page of"
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 105
+msgid ""
+"If this option is set menus are generated with titles. Default is no titles."
+msgstr ""
+
+#. ./modules/FvwmForm/FvwmForm-GenOptionHelp: line 110
+msgid ""
+"Enter here the FULL path of the menu to store. Default path is "
+"$FVWM_USERDIR/.menu."
+msgstr ""
diff --git a/utils/fvwm-version-str.sh b/utils/fvwm-version-str.sh
index e3356d6fa..976a85441 100755
--- a/utils/fvwm-version-str.sh
+++ b/utils/fvwm-version-str.sh
@@ -12,7 +12,7 @@
 
 if grep -q -i '^ISRELEASED="yes"' ./configure.ac; then
 	# A release build.  Strip the git information off the tag name.
-	git describe --tags --abbrev=0 2>/dev/null || echo "2.6.9"
+	echo "2.7.0"
 else
 	git describe --always --long --dirty
 fi