Update after rename.

61 files changed, 563 insertions, 564 deletions

diff --git a/gettext-tools/tests/msgattrib-properties-1 b/gettext-tools/tests/msgattrib-properties-1
index 5e6e843..a396452 100755
--- a/gettext-tools/tests/msgattrib-properties-1
+++ b/gettext-tools/tests/msgattrib-properties-1
@@ -5,8 +5,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles ma-test15.properties"
-cat <<\EOF > ma-test15.properties
+tmpfiles="$tmpfiles ma-s-1.properties"
+cat <<\EOF > ma-s-1.properties
 # HEADER.
 #
 !=Project-Id-Version\: Bonnie Tyler\n
@@ -32,13 +32,13 @@ with\ wives\ who\ never\ understand=und ihre Frauen verstehen sie nicht
 !They\ warn\ you\ and\ darn\ you=
 EOF
 
-tmpfiles="$tmpfiles ma-test15.out"
+tmpfiles="$tmpfiles ma-s-1.out"
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --translated --properties-input --properties-output ma-test15.properties -o ma-test15.out
+${MSGATTRIB} --translated --properties-input --properties-output ma-s-1.properties -o ma-s-1.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles ma-test15.ok"
-cat <<\EOF > ma-test15.ok
+tmpfiles="$tmpfiles ma-s-1.ok"
+cat <<\EOF > ma-s-1.ok
 # HEADER.
 #
 !=Project-Id-Version\: Bonnie Tyler\n
@@ -52,7 +52,7 @@ with\ wives\ who\ never\ understand=und ihre Frauen verstehen sie nicht
 EOF
 
 : ${DIFF=diff}
-${DIFF} ma-test15.ok ma-test15.out
+${DIFF} ma-s-1.ok ma-s-1.out
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msgcat-properties-1 b/gettext-tools/tests/msgcat-properties-1
index 8c12b30..9662a5e 100755
--- a/gettext-tools/tests/msgcat-properties-1
+++ b/gettext-tools/tests/msgcat-properties-1
@@ -5,36 +5,36 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles mcat-test11.in1 mcat-test11.in2"
-cat <<\EOF > mcat-test11.in1
+tmpfiles="$tmpfiles mcat-p-1.in1 mcat-p-1.in2"
+cat <<\EOF > mcat-p-1.in1
 #. Help text (HTML-like) START
 #: clients/inst_ask_config.ycp:119
 Congratulations\!=Gl\u00fcckwunsch\!
 EOF
 
-cat <<\EOF > mcat-test11.in2
+cat <<\EOF > mcat-p-1.in2
 #. Help text (HTML-like) START
 #: clients/inst_ask_config.ycp:119
 Congratulations\!=Herzlichen Gl\u00fcckwunsch\!
 EOF
 
-tmpfiles="$tmpfiles mcat-test11.out"
-rm -f mcat-test11.out
+tmpfiles="$tmpfiles mcat-p-1.out"
+rm -f mcat-p-1.out
 
 : ${MSGCAT=msgcat}
 ${MSGCAT} --use-first --more-than=0 --properties-input --properties-output \
-    mcat-test11.in1 mcat-test11.in2 -o mcat-test11.out
+    mcat-p-1.in1 mcat-p-1.in2 -o mcat-p-1.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles mcat-test11.ok"
-cat << \EOF > mcat-test11.ok
+tmpfiles="$tmpfiles mcat-p-1.ok"
+cat << \EOF > mcat-p-1.ok
 #. Help text (HTML-like) START
 #: clients/inst_ask_config.ycp:119
 Congratulations\!=Gl\u00fcckwunsch\!
 EOF
 
 : ${DIFF=diff}
-${DIFF} mcat-test11.ok mcat-test11.out
+${DIFF} mcat-p-1.ok mcat-p-1.out
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msgcat-properties-2 b/gettext-tools/tests/msgcat-properties-2
index 2c29975..765e88a 100755
--- a/gettext-tools/tests/msgcat-properties-2
+++ b/gettext-tools/tests/msgcat-properties-2
@@ -6,20 +6,20 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles mcat-test12.properties"
-cat <<\EOF > mcat-test12.properties
+tmpfiles="$tmpfiles mcat-p-2.properties"
+cat <<\EOF > mcat-p-2.properties
 #: src/msgcmp.c:155 src/msgmerge.c:273
 exactly\ 2\ input\ files\ required=\u6b64\u529f\u80fd\u9700\u8981\u6070\u597d\u6307\u5b9a\u5169\u500b\u8f38\u5165\u6a94
 EOF
 
-tmpfiles="$tmpfiles mcat-test12.out"
+tmpfiles="$tmpfiles mcat-p-2.out"
 : ${MSGCAT=msgcat}
-${MSGCAT} --properties-input --properties-output -t Big5 mcat-test12.properties -o mcat-test12.out
+${MSGCAT} --properties-input --properties-output -t Big5 mcat-p-2.properties -o mcat-p-2.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 # Redirect stdout, so as not to fill the user's screen with non-ASCII bytes.
-${DIFF} mcat-test12.properties mcat-test12.out >/dev/null
+${DIFF} mcat-p-2.properties mcat-p-2.out >/dev/null
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msgcat-stringtable-1 b/gettext-tools/tests/msgcat-stringtable-1
index e896003..7ec23b8 100755
--- a/gettext-tools/tests/msgcat-stringtable-1
+++ b/gettext-tools/tests/msgcat-stringtable-1
@@ -5,8 +5,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles mcat-test13.in"
-cat <<\EOF > mcat-test13.in
+tmpfiles="$tmpfiles mcat-s-1.in"
+cat <<\EOF > mcat-s-1.in
 /* This is an example of a string table file. Everything inside a comment
 is completely ignored, even if in "quotes", or \escape characters, etc.
 */
@@ -27,14 +27,14 @@ is completely ignored, even if in "quotes", or \escape characters, etc.
 "hoe322070.element";
 EOF
 
-tmpfiles="$tmpfiles mcat-test13.out"
-rm -f mcat-test13.out
+tmpfiles="$tmpfiles mcat-s-1.out"
+rm -f mcat-s-1.out
 : ${MSGCAT=msgcat}
-${MSGCAT} --stringtable-input mcat-test13.in -o mcat-test13.out
+${MSGCAT} --stringtable-input mcat-s-1.in -o mcat-s-1.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles mcat-test13.ok"
-cat << \EOF > mcat-test13.ok
+tmpfiles="$tmpfiles mcat-s-1.ok"
+cat << \EOF > mcat-s-1.ok
 # This is an example of a string table file. Everything inside a comment
 # is completely ignored, even if in "quotes", or \escape characters, etc.
 #
@@ -61,7 +61,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} mcat-test13.ok mcat-test13.out
+${DIFF} mcat-s-1.ok mcat-s-1.out
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msgfmt-13 b/gettext-tools/tests/msgfmt-13
index 08d2b1d..6822c8a 100755
--- a/gettext-tools/tests/msgfmt-13
+++ b/gettext-tools/tests/msgfmt-13
@@ -5,8 +5,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles mf-test14.po"
-cat <<\EOF >mf-test14.po
+tmpfiles="$tmpfiles mf-test13.po"
+cat <<\EOF >mf-test13.po
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -28,9 +28,9 @@ msgstr " [Gehe zu]  [Zurück]  [Anzeigen]  [Markieren]  [Markierung l����en]  [O
 
 EOF
 
-tmpfiles="$tmpfiles mf-test14.mo"
+tmpfiles="$tmpfiles mf-test13.mo"
 : ${MSGFMT=msgfmt}
-${MSGFMT} mf-test14.po -o mf-test14.mo 2>/dev/null
+${MSGFMT} mf-test13.po -o mf-test13.mo 2>/dev/null
 # Exit code must be 1.
 # If the invalid sequence didn't get noticed, it would be 0.
 # If it produced a core dump, it would be 134 (= 128 + SIGABRT).
diff --git a/gettext-tools/tests/msgfmt-properties-1 b/gettext-tools/tests/msgfmt-properties-1
index e7a52f4..a3cebb9 100755
--- a/gettext-tools/tests/msgfmt-properties-1
+++ b/gettext-tools/tests/msgfmt-properties-1
@@ -8,15 +8,15 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 tmpfiles="$tmpfiles LC_MESSAGES"
 test -d LC_MESSAGES || mkdir LC_MESSAGES
 
-tmpfiles="$tmpfiles module1.properties module2.properties"
-cat <<\EOF > module1.properties
+tmpfiles="$tmpfiles mf-p-1-1.properties mf-p-1-2.properties"
+cat <<\EOF > mf-p-1-1.properties
 SYS_(C)\n=MSGFMT(3) portable message object file compiler\nCopyright (C) 1995 Free Software Foundation\nReport bugs to <bug-gnu-utils@gnu.org>\n
 msg\ 1=msg 1 translation
 help\ 2\ %d=help 2 translation
 error\ 3=error 3 translation
 EOF
 
-cat <<\EOF > module2.properties
+cat <<\EOF > mf-p-1-2.properties
 # ---
 mesg\ 4=mesg 4 translation
 error\ 3=alternate error 3 translation
@@ -26,17 +26,17 @@ EOF
 
 # Without use of msgcat, expect a "duplicate message definition" error.
 : ${MSGFMT=msgfmt}
-if ${MSGFMT} --properties-input module1.properties module2.properties -o LC_MESSAGES/gen.mo 2> /dev/null; then
+if ${MSGFMT} --properties-input mf-p-1-1.properties mf-p-1-2.properties -o LC_MESSAGES/gen.mo 2> /dev/null; then
   rm -fr $tmpfiles
   exit 1
 fi
 
 # With msgcat, it should work.
-tmpfiles="$tmpfiles modules.properties"
+tmpfiles="$tmpfiles mf-p-1-s.properties"
 : ${MSGCAT=msgcat} ${MSGFMT=msgfmt}
-${MSGCAT} --properties-input --properties-output --use-first module1.properties module2.properties -o modules.properties
+${MSGCAT} --properties-input --properties-output --use-first mf-p-1-1.properties mf-p-1-2.properties -o mf-p-1-s.properties
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-${MSGFMT} --properties-input modules.properties -o LC_MESSAGES/gen.mo
+${MSGFMT} --properties-input mf-p-1-s.properties -o LC_MESSAGES/gen.mo
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mf-test1.out"
diff --git a/gettext-tools/tests/msgfmt-qt-1 b/gettext-tools/tests/msgfmt-qt-1
index 76158e9..3ade4a9 100755
--- a/gettext-tools/tests/msgfmt-qt-1
+++ b/gettext-tools/tests/msgfmt-qt-1
@@ -5,13 +5,13 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles mf-test15.qm"
+tmpfiles="$tmpfiles mf-qt-1.qm"
 : ${MSGFMT=msgfmt}
-${MSGFMT} --qt ${top_srcdir}/tests/qttest_pl.po -o mf-test15.qm
+${MSGFMT} --qt ${top_srcdir}/tests/qttest_pl.po -o mf-qt-1.qm
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${CMP=cmp}
-${CMP} ${top_srcdir}/tests/qttest_pl.qm mf-test15.qm >/dev/null 2>/dev/null
+${CMP} ${top_srcdir}/tests/qttest_pl.qm mf-qt-1.qm >/dev/null 2>/dev/null
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msgmerge-10 b/gettext-tools/tests/msgmerge-10
index 48e697e..8def4e2 100755
--- a/gettext-tools/tests/msgmerge-10
+++ b/gettext-tools/tests/msgmerge-10
@@ -6,8 +6,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles mm-test17.po"
-cat <<EOF > mm-test17.po
+tmpfiles="$tmpfiles mm-test10.po"
+cat <<EOF > mm-test10.po
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -29,8 +29,8 @@ msgid "%d error"
 msgstr "%d erreur"
 EOF
 
-tmpfiles="$tmpfiles mm-test17.pot"
-cat <<EOF > mm-test17.pot
+tmpfiles="$tmpfiles mm-test10.pot"
+cat <<EOF > mm-test10.pot
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -54,13 +54,13 @@ msgstr[0] ""
 msgstr[1] ""
 EOF
 
-tmpfiles="$tmpfiles mm-test17.out"
+tmpfiles="$tmpfiles mm-test10.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q mm-test17.po mm-test17.pot -o mm-test17.out
+${MSGMERGE} -q mm-test10.po mm-test10.pot -o mm-test10.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles mm-test17.ok"
-cat <<EOF > mm-test17.ok
+tmpfiles="$tmpfiles mm-test10.ok"
+cat <<EOF > mm-test10.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -85,7 +85,7 @@ msgstr[1] "%d erreur"
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test17.ok mm-test17.out
+${DIFF} mm-test10.ok mm-test10.out
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msgmerge-11 b/gettext-tools/tests/msgmerge-11
index 70113b4..32ca042 100755
--- a/gettext-tools/tests/msgmerge-11
+++ b/gettext-tools/tests/msgmerge-11
@@ -6,8 +6,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles mm-test18.po"
-cat <<EOF > mm-test18.po
+tmpfiles="$tmpfiles mm-test11.po"
+cat <<EOF > mm-test11.po
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -31,8 +31,8 @@ msgid "%d error"
 msgstr "%d erreur"
 EOF
 
-tmpfiles="$tmpfiles mm-test18.pot"
-cat <<EOF > mm-test18.pot
+tmpfiles="$tmpfiles mm-test11.pot"
+cat <<EOF > mm-test11.pot
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -56,13 +56,13 @@ msgstr[0] ""
 msgstr[1] ""
 EOF
 
-tmpfiles="$tmpfiles mm-test18.out"
+tmpfiles="$tmpfiles mm-test11.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q mm-test18.po mm-test18.pot -o mm-test18.out
+${MSGMERGE} -q mm-test11.po mm-test11.pot -o mm-test11.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles mm-test18.ok"
-cat <<EOF > mm-test18.ok
+tmpfiles="$tmpfiles mm-test11.ok"
+cat <<EOF > mm-test11.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -91,7 +91,7 @@ msgstr[3] "%d erreur"
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test18.ok mm-test18.out
+${DIFF} mm-test11.ok mm-test11.out
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msgmerge-12 b/gettext-tools/tests/msgmerge-12
index 2cc6a31..a7c6fa1 100755
--- a/gettext-tools/tests/msgmerge-12
+++ b/gettext-tools/tests/msgmerge-12
@@ -6,8 +6,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles mm-test19.po"
-cat <<EOF > mm-test19.po
+tmpfiles="$tmpfiles mm-test12.po"
+cat <<EOF > mm-test12.po
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -31,8 +31,8 @@ msgstr[0] "%d erreur"
 msgstr[1] "%d erreurs"
 EOF
 
-tmpfiles="$tmpfiles mm-test19.pot"
-cat <<EOF > mm-test19.pot
+tmpfiles="$tmpfiles mm-test12.pot"
+cat <<EOF > mm-test12.pot
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -54,13 +54,13 @@ msgid "%d error"
 msgstr ""
 EOF
 
-tmpfiles="$tmpfiles mm-test19.out"
+tmpfiles="$tmpfiles mm-test12.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q mm-test19.po mm-test19.pot -o mm-test19.out
+${MSGMERGE} -q mm-test12.po mm-test12.pot -o mm-test12.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles mm-test19.ok"
-cat <<EOF > mm-test19.ok
+tmpfiles="$tmpfiles mm-test12.ok"
+cat <<EOF > mm-test12.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -83,7 +83,7 @@ msgstr "%d erreur"
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test19.ok mm-test19.out
+${DIFF} mm-test12.ok mm-test12.out
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msgmerge-13 b/gettext-tools/tests/msgmerge-13
index abd6cee..aae35a7 100755
--- a/gettext-tools/tests/msgmerge-13
+++ b/gettext-tools/tests/msgmerge-13
@@ -6,8 +6,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles mm-test20.po"
-cat <<EOF > mm-test20.po
+tmpfiles="$tmpfiles mm-test13.po"
+cat <<EOF > mm-test13.po
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -46,8 +46,8 @@ msgid "%age"
 msgstr "%-Satz"
 EOF
 
-tmpfiles="$tmpfiles mm-test20.pot"
-cat <<EOF > mm-test20.pot
+tmpfiles="$tmpfiles mm-test13.pot"
+cat <<EOF > mm-test13.pot
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -87,13 +87,13 @@ msgid "%age"
 msgstr ""
 EOF
 
-tmpfiles="$tmpfiles mm-test20.out"
+tmpfiles="$tmpfiles mm-test13.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q mm-test20.po mm-test20.pot -o mm-test20.out
+${MSGMERGE} -q mm-test13.po mm-test13.pot -o mm-test13.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles mm-test20.ok"
-cat <<EOF > mm-test20.ok
+tmpfiles="$tmpfiles mm-test13.ok"
+cat <<EOF > mm-test13.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -134,7 +134,7 @@ msgstr "%-Satz"
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test20.ok mm-test20.out
+${DIFF} mm-test13.ok mm-test13.out
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msgmerge-14 b/gettext-tools/tests/msgmerge-14
index 11e52dc..dc0141c 100755
--- a/gettext-tools/tests/msgmerge-14
+++ b/gettext-tools/tests/msgmerge-14
@@ -7,8 +7,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles mm-test21-ru.po"
-cat <<\EOF > mm-test21-ru.po
+tmpfiles="$tmpfiles mm-test14-ru.po"
+cat <<\EOF > mm-test14-ru.po
 # Russian messages for CLISP
 # Copyright (C) 1998 Free Software Foundation, Inc.
 # Eduard Haritonov <hed@iis.nsk.su>, 1998.
@@ -30,8 +30,8 @@ msgid "Division durch Null"
 msgstr "������� �� ����"
 EOF
 
-tmpfiles="$tmpfiles mm-test21.pot"
-cat <<\EOF > mm-test21.pot
+tmpfiles="$tmpfiles mm-test14.pot"
+cat <<\EOF > mm-test14.pot
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -58,13 +58,13 @@ msgid "Überlauf"
 msgstr ""
 EOF
 
-tmpfiles="$tmpfiles mm-test21.out"
+tmpfiles="$tmpfiles mm-test14.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q mm-test21-ru.po mm-test21.pot -o mm-test21.out
+${MSGMERGE} -q mm-test14-ru.po mm-test14.pot -o mm-test14.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles mm-test21.ok"
-cat <<\EOF > mm-test21.ok
+tmpfiles="$tmpfiles mm-test14.ok"
+cat <<\EOF > mm-test14.ok
 # Russian messages for CLISP
 # Copyright (C) 1998 Free Software Foundation, Inc.
 # Eduard Haritonov <hed@iis.nsk.su>, 1998.
@@ -91,7 +91,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test21.ok mm-test21.out
+${DIFF} mm-test14.ok mm-test14.out
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msgmerge-15 b/gettext-tools/tests/msgmerge-15
index 7c39ec6..b047b5e 100755
--- a/gettext-tools/tests/msgmerge-15
+++ b/gettext-tools/tests/msgmerge-15
@@ -5,8 +5,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles mm-test22.pot mm-test22.po"
-cat <<\EOF > mm-test22.pot
+tmpfiles="$tmpfiles mm-test15.pot mm-test15.po"
+cat <<\EOF > mm-test15.pot
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.11.5\n"
@@ -22,20 +22,20 @@ msgid "invalid argument `%s' for `%s'"
 msgstr "ungültiges Argument »%s« für »%s«"
 EOF
 
-cat <<\EOF > mm-test22.po
+cat <<\EOF > mm-test15.po
 #: 123.c:134
 #, c-format
 msgid "invalid argument `%s' for `%s'"
 msgstr ""
 EOF
 
-tmpfiles="$tmpfiles mm-test22.out"
+tmpfiles="$tmpfiles mm-test15.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q mm-test22.pot mm-test22.po -o mm-test22.out
+${MSGMERGE} -q mm-test15.pot mm-test15.po -o mm-test15.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles mm-test22.ok"
-cat <<\EOF > mm-test22.ok
+tmpfiles="$tmpfiles mm-test15.ok"
+cat <<\EOF > mm-test15.ok
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.11.5\n"
@@ -52,7 +52,7 @@ msgstr "ungültiges Argument »%s« für »%s«"
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test22.ok mm-test22.out
+${DIFF} mm-test15.ok mm-test15.out
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msgmerge-16 b/gettext-tools/tests/msgmerge-16
index 9ed3b5d..f86893d 100755
--- a/gettext-tools/tests/msgmerge-16
+++ b/gettext-tools/tests/msgmerge-16
@@ -6,8 +6,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles mm-test25.po"
-cat <<\EOF > mm-test25.po
+tmpfiles="$tmpfiles mm-test16.po"
+cat <<\EOF > mm-test16.po
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-cplusplus-qt 0\n"
@@ -31,8 +31,8 @@ msgid "error %1."
 msgstr "b��d %1."
 EOF
 
-tmpfiles="$tmpfiles mm-test25.pot"
-cat <<EOF > mm-test25.pot
+tmpfiles="$tmpfiles mm-test16.pot"
+cat <<EOF > mm-test16.pot
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Yoyodyne, Inc.
 # This file is distributed under the same license as the PACKAGE package.
@@ -60,13 +60,13 @@ msgid "error %1."
 msgstr ""
 EOF
 
-tmpfiles="$tmpfiles mm-test25.new.po"
+tmpfiles="$tmpfiles mm-test16.new.po"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q mm-test25.po mm-test25.pot -o mm-test25.new.po
+${MSGMERGE} -q mm-test16.po mm-test16.pot -o mm-test16.new.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles mm-test25.ok"
-cat <<\EOF > mm-test25.ok
+tmpfiles="$tmpfiles mm-test16.ok"
+cat <<\EOF > mm-test16.ok
 msgid ""
 msgstr ""
 "Project-Id-Version: hello-cplusplus-qt 0\n"
@@ -91,7 +91,7 @@ msgstr "błąd %1."
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test25.ok mm-test25.new.po
+${DIFF} mm-test16.ok mm-test16.new.po
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msgmerge-6 b/gettext-tools/tests/msgmerge-6
index bedccd9..e3e147c 100755
--- a/gettext-tools/tests/msgmerge-6
+++ b/gettext-tools/tests/msgmerge-6
@@ -5,8 +5,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles mm-test9.in1.po mm-test9.in2.po"
-cat <<\EOF > mm-test9.in1.po
+tmpfiles="$tmpfiles mm-test6.in1.po mm-test6.in2.po"
+cat <<\EOF > mm-test6.in1.po
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -27,7 +27,7 @@ msgid "white"
 msgstr "wei�"
 EOF
 
-cat <<EOF > mm-test9.in2.po
+cat <<EOF > mm-test6.in2.po
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -56,14 +56,14 @@ msgid "was correct."
 msgstr ""
 EOF
 
-tmpfiles="$tmpfiles mm-test9.out"
+tmpfiles="$tmpfiles mm-test6.out"
 : ${MSGMERGE=msgmerge}
 LC_MESSAGES=C LC_ALL= \
-${MSGMERGE} -q mm-test9.in1.po mm-test9.in2.po -o mm-test9.out
+${MSGMERGE} -q mm-test6.in1.po mm-test6.in2.po -o mm-test6.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles mm-test9.ok"
-cat <<\EOF > mm-test9.ok
+tmpfiles="$tmpfiles mm-test6.ok"
+cat <<\EOF > mm-test6.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -93,7 +93,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test9.ok mm-test9.out
+${DIFF} mm-test6.ok mm-test6.out
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msgmerge-7 b/gettext-tools/tests/msgmerge-7
index de0aefc..9edbf3d 100755
--- a/gettext-tools/tests/msgmerge-7
+++ b/gettext-tools/tests/msgmerge-7
@@ -5,8 +5,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles foo.po"
-cat <<\EOF > foo.po
+tmpfiles="$tmpfiles mm-test7.po"
+cat <<\EOF > mm-test7.po
 domain "foo-de"
 msgid ""
 msgstr "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -32,8 +32,8 @@ msgid "bye"
 msgstr "A bient�t"
 EOF
 
-tmpfiles="$tmpfiles foo.pot"
-cat <<EOF > foo.pot
+tmpfiles="$tmpfiles mm-test7.pot"
+cat <<EOF > mm-test7.pot
 domain "foo-de"
 msgid "Hello"
 msgstr ""
@@ -42,13 +42,13 @@ msgid "Hello"
 msgstr ""
 EOF
 
-tmpfiles="$tmpfiles foo.out"
+tmpfiles="$tmpfiles mm-test7.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q foo.po foo.pot -o foo.out
+${MSGMERGE} -q mm-test7.po mm-test7.pot -o mm-test7.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles foo.ok"
-cat <<\EOF > foo.ok
+tmpfiles="$tmpfiles mm-test7.ok"
+cat <<\EOF > mm-test7.ok
 domain "foo-de"
 
 msgid ""
@@ -79,7 +79,7 @@ msgstr "Salut"
 EOF
 
 : ${DIFF=diff}
-${DIFF} foo.ok foo.out
+${DIFF} mm-test7.ok mm-test7.out
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msgmerge-8 b/gettext-tools/tests/msgmerge-8
index 0ab0c91..60f1658 100755
--- a/gettext-tools/tests/msgmerge-8
+++ b/gettext-tools/tests/msgmerge-8
@@ -5,8 +5,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles foo.po"
-cat <<\EOF > foo.po
+tmpfiles="$tmpfiles mm-test8.po"
+cat <<\EOF > mm-test8.po
 domain "foo-de"
 msgid ""
 msgstr "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -32,19 +32,19 @@ msgid "bye"
 msgstr "A bient�t"
 EOF
 
-tmpfiles="$tmpfiles foo.pot"
-cat <<EOF > foo.pot
+tmpfiles="$tmpfiles mm-test8.pot"
+cat <<EOF > mm-test8.pot
 msgid "Hello"
 msgstr ""
 EOF
 
-tmpfiles="$tmpfiles foo.out"
+tmpfiles="$tmpfiles mm-test8.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} --multi-domain -q foo.po foo.pot -o foo.out
+${MSGMERGE} --multi-domain -q mm-test8.po mm-test8.pot -o mm-test8.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles foo.ok"
-cat <<\EOF > foo.ok
+tmpfiles="$tmpfiles mm-test8.ok"
+cat <<\EOF > mm-test8.ok
 domain "foo-de"
 
 msgid ""
@@ -75,7 +75,7 @@ msgstr "Salut"
 EOF
 
 : ${DIFF=diff}
-${DIFF} foo.ok foo.out
+${DIFF} mm-test8.ok mm-test8.out
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msgmerge-9 b/gettext-tools/tests/msgmerge-9
index 8e9c207..872dc9f 100755
--- a/gettext-tools/tests/msgmerge-9
+++ b/gettext-tools/tests/msgmerge-9
@@ -5,8 +5,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles mm-test13.in1 mm-test13.in2"
-cat <<EOF > mm-test13.in1
+tmpfiles="$tmpfiles mm-test9.in1 mm-test9.in2"
+cat <<EOF > mm-test9.in1
 msgid "2" msgstr "2"
 msgid "3" msgstr "3"
 #~ msgid
@@ -15,27 +15,27 @@ msgid "3" msgstr "3"
 #~ "ha ha"
 EOF
 
-cat <<EOF > mm-test13.in2
+cat <<EOF > mm-test9.in2
 msgid "1" msgstr ""
 msgid "2" msgstr ""
 msgid "3" msgstr ""
 EOF
 
-tmpfiles="$tmpfiles mm-test13.err"
+tmpfiles="$tmpfiles mm-test9.err"
 : ${MSGMERGE=msgmerge}
 LC_MESSAGES=C LC_ALL= \
-${MSGMERGE} -q mm-test13.in1 mm-test13.in2 -o /dev/null \
-    2>&1 | grep -v '^==' > mm-test13.err
+${MSGMERGE} -q mm-test9.in1 mm-test9.in2 -o /dev/null \
+    2>&1 | grep -v '^==' > mm-test9.err
 
-tmpfiles="$tmpfiles mm-test13.ok"
-cat << EOF > mm-test13.ok
-mm-test13.in1:3: duplicate message definition
-mm-test13.in1:1: ...this is the location of the first definition
+tmpfiles="$tmpfiles mm-test9.ok"
+cat << EOF > mm-test9.ok
+mm-test9.in1:3: duplicate message definition
+mm-test9.in1:1: ...this is the location of the first definition
 msgmerge: found 1 fatal error
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test13.ok mm-test13.err
+${DIFF} mm-test9.ok mm-test9.err
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msgmerge-compendium-1 b/gettext-tools/tests/msgmerge-compendium-1
index 43a2ddb..a150e1e 100755
--- a/gettext-tools/tests/msgmerge-compendium-1
+++ b/gettext-tools/tests/msgmerge-compendium-1
@@ -5,20 +5,20 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles mm-test6.in1 mm-test6.com mm-test6.pot"
-cat <<EOF > mm-test6.in1
+tmpfiles="$tmpfiles mm-c-1.in1 mm-c-1.com mm-c-1.pot"
+cat <<EOF > mm-c-1.in1
 #: file.c:123
 msgid "1"
 msgstr "1x"
 EOF
 
-cat <<EOF > mm-test6.com
+cat <<EOF > mm-c-1.com
 #: file.c:345
 msgid "2"
 msgstr "2x"
 EOF
 
-cat <<EOF > mm-test6.pot
+cat <<EOF > mm-c-1.pot
 #: file.c:123
 msgid "1"
 msgstr ""
@@ -28,13 +28,13 @@ msgid "2"
 msgstr ""
 EOF
 
-tmpfiles="$tmpfiles mm-test6.out"
+tmpfiles="$tmpfiles mm-c-1.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -C mm-test6.com mm-test6.in1 mm-test6.pot -o mm-test6.out
+${MSGMERGE} -q -C mm-c-1.com mm-c-1.in1 mm-c-1.pot -o mm-c-1.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles mm-test6.ok"
-cat << EOF > mm-test6.ok
+tmpfiles="$tmpfiles mm-c-1.ok"
+cat << EOF > mm-c-1.ok
 #: file.c:123
 msgid "1"
 msgstr "1x"
@@ -45,7 +45,7 @@ msgstr "2x"
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test6.ok mm-test6.out
+${DIFF} mm-c-1.ok mm-c-1.out
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msgmerge-compendium-2 b/gettext-tools/tests/msgmerge-compendium-2
index d245493..2a6f0f7 100755
--- a/gettext-tools/tests/msgmerge-compendium-2
+++ b/gettext-tools/tests/msgmerge-compendium-2
@@ -5,20 +5,20 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles mm-test7.in1 mm-test7.com mm-test7.pot"
-cat <<EOF > mm-test7.in1
+tmpfiles="$tmpfiles mm-c-2.in1 mm-c-2.com mm-c-2.pot"
+cat <<EOF > mm-c-2.in1
 #: file.c:123
 msgid "1"
 msgstr "1x"
 EOF
 
-cat <<EOF > mm-test7.com
+cat <<EOF > mm-c-2.com
 #: file.c:345
 msgid "one, two, three"
 msgstr "1, 2, 3"
 EOF
 
-cat <<EOF > mm-test7.pot
+cat <<EOF > mm-c-2.pot
 #: file.c:123
 msgid "1"
 msgstr ""
@@ -28,13 +28,13 @@ msgid "one, two, three..."
 msgstr ""
 EOF
 
-tmpfiles="$tmpfiles mm-test7.out"
+tmpfiles="$tmpfiles mm-c-2.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -C mm-test7.com mm-test7.in1 mm-test7.pot -o mm-test7.out
+${MSGMERGE} -q -C mm-c-2.com mm-c-2.in1 mm-c-2.pot -o mm-c-2.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles mm-test7.ok"
-cat << EOF > mm-test7.ok
+tmpfiles="$tmpfiles mm-c-2.ok"
+cat << EOF > mm-c-2.ok
 #: file.c:123
 msgid "1"
 msgstr "1x"
@@ -46,7 +46,7 @@ msgstr "1, 2, 3"
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test7.ok mm-test7.out
+${DIFF} mm-c-2.ok mm-c-2.out
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msgmerge-compendium-3 b/gettext-tools/tests/msgmerge-compendium-3
index 1bdff44..e1e8141 100755
--- a/gettext-tools/tests/msgmerge-compendium-3
+++ b/gettext-tools/tests/msgmerge-compendium-3
@@ -2,15 +2,15 @@
 
 # Test compendium option.
 
-# Translation is available within the compendium (mm-test8.com)
-# the old translation file (mm-test8.in1) contains the same msgid
+# Translation is available within the compendium (mm-c-3.com)
+# the old translation file (mm-c-3.in1) contains the same msgid
 # Why not make use of the translation from the compendium?
 
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles mm-test8.in1 mm-test8.com mm-test8.pot"
-cat <<EOF > mm-test8.in1
+tmpfiles="$tmpfiles mm-c-3.in1 mm-c-3.com mm-c-3.pot"
+cat <<EOF > mm-c-3.in1
 #: file.c:123
 msgid "1"
 msgstr "1x"
@@ -20,13 +20,13 @@ msgid "one, two, three"
 msgstr ""
 EOF
 
-cat <<EOF > mm-test8.com
+cat <<EOF > mm-c-3.com
 #: file.c:345
 msgid "one, two, three"
 msgstr "1, 2, 3"
 EOF
 
-cat <<EOF > mm-test8.pot
+cat <<EOF > mm-c-3.pot
 #: file.c:123
 msgid "1"
 msgstr ""
@@ -36,13 +36,13 @@ msgid "one, two, three"
 msgstr ""
 EOF
 
-tmpfiles="$tmpfiles mm-test8.out"
+tmpfiles="$tmpfiles mm-c-3.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -C mm-test8.com mm-test8.in1 mm-test8.pot -o mm-test8.out
+${MSGMERGE} -q -C mm-c-3.com mm-c-3.in1 mm-c-3.pot -o mm-c-3.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles mm-test8.ok"
-cat << EOF > mm-test8.ok
+tmpfiles="$tmpfiles mm-c-3.ok"
+cat << EOF > mm-c-3.ok
 #: file.c:123
 msgid "1"
 msgstr "1x"
@@ -53,7 +53,7 @@ msgstr "1, 2, 3"
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test8.ok mm-test8.out
+${DIFF} mm-c-3.ok mm-c-3.out
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msgmerge-compendium-4 b/gettext-tools/tests/msgmerge-compendium-4
index 6306c07..26ccacb 100755
--- a/gettext-tools/tests/msgmerge-compendium-4
+++ b/gettext-tools/tests/msgmerge-compendium-4
@@ -6,9 +6,9 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles mm-test12.com mm-test12.pot"
+tmpfiles="$tmpfiles mm-c-4.com mm-c-4.pot"
 
-cat <<\EOF > mm-test12.com
+cat <<\EOF > mm-c-4.com
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
@@ -19,7 +19,7 @@ msgid "5"
 msgstr "f�nf"
 EOF
 
-cat <<EOF > mm-test12.pot
+cat <<EOF > mm-c-4.pot
 #: file.c:123
 msgid "1"
 msgstr ""
@@ -29,13 +29,13 @@ msgid "5"
 msgstr ""
 EOF
 
-tmpfiles="$tmpfiles mm-test12.out"
+tmpfiles="$tmpfiles mm-c-4.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --compendium mm-test12.com /dev/null mm-test12.pot -o mm-test12.out
+${MSGMERGE} -q --compendium mm-c-4.com /dev/null mm-c-4.pot -o mm-c-4.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles mm-test12.ok"
-cat << \EOF > mm-test12.ok
+tmpfiles="$tmpfiles mm-c-4.ok"
+cat << \EOF > mm-c-4.ok
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
@@ -51,7 +51,7 @@ msgstr "f�nf"
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test12.ok mm-test12.out
+${DIFF} mm-c-4.ok mm-c-4.out
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msgmerge-properties-1 b/gettext-tools/tests/msgmerge-properties-1
index 27304e9..6f56861 100755
--- a/gettext-tools/tests/msgmerge-properties-1
+++ b/gettext-tools/tests/msgmerge-properties-1
@@ -5,8 +5,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles mm-test23.in1 mm-test23.in2"
-cat <<EOF > mm-test23.in1
+tmpfiles="$tmpfiles mm-p-1.in1 mm-p-1.in2"
+cat <<EOF > mm-p-1.in1
 #
 # def.po
 #
@@ -23,7 +23,7 @@ still\ existing=translation
 # trailing comments should be removed
 EOF
 
-cat <<EOF > mm-test23.in2
+cat <<EOF > mm-p-1.in2
 #
 # ref.po
 #
@@ -37,13 +37,13 @@ still\ existing=here is normally no comment
 # trailing comments should be removed, even here
 EOF
 
-tmpfiles="$tmpfiles mm-test23.out"
+tmpfiles="$tmpfiles mm-p-1.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --properties-input --properties-output mm-test23.in1 mm-test23.in2 -o mm-test23.out
+${MSGMERGE} -q --properties-input --properties-output mm-p-1.in1 mm-p-1.in2 -o mm-p-1.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles mm-test23.ok"
-cat << EOF > mm-test23.ok
+tmpfiles="$tmpfiles mm-p-1.ok"
+cat << EOF > mm-p-1.ok
 #: file3:102
 still\ existing=translation
 
@@ -52,7 +52,7 @@ still\ existing=translation
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test23.ok mm-test23.out
+${DIFF} mm-p-1.ok mm-p-1.out
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msgmerge-properties-2 b/gettext-tools/tests/msgmerge-properties-2
index 9344d79..3f37b8d 100755
--- a/gettext-tools/tests/msgmerge-properties-2
+++ b/gettext-tools/tests/msgmerge-properties-2
@@ -6,33 +6,33 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles mm-test24.po"
-cat <<\EOF > mm-test24.po
+tmpfiles="$tmpfiles mm-p-2.po"
+cat <<\EOF > mm-p-2.po
 #: cogarithmetic.cc:12
 white=wei\u00df
 EOF
 
-tmpfiles="$tmpfiles mm-test24.pot"
-cat <<EOF > mm-test24.pot
+tmpfiles="$tmpfiles mm-p-2.pot"
+cat <<EOF > mm-p-2.pot
 #. location changed
 #: cogarithmetic.cc:33
 !white=
 EOF
 
-tmpfiles="$tmpfiles mm-test24.po~"
+tmpfiles="$tmpfiles mm-p-2.po~"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --properties-input --update mm-test24.po mm-test24.pot
+${MSGMERGE} -q --properties-input --update mm-p-2.po mm-p-2.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles mm-test24.ok"
-cat <<\EOF > mm-test24.ok
+tmpfiles="$tmpfiles mm-p-2.ok"
+cat <<\EOF > mm-p-2.ok
 #. location changed
 #: cogarithmetic.cc:33
 white=wei\u00df
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test24.ok mm-test24.po
+${DIFF} mm-p-2.ok mm-p-2.po
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msgmerge-update-1 b/gettext-tools/tests/msgmerge-update-1
index 09a03b6..54e17ef 100755
--- a/gettext-tools/tests/msgmerge-update-1
+++ b/gettext-tools/tests/msgmerge-update-1
@@ -5,8 +5,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles mm-test14.po"
-cat <<\EOF > mm-test14.po
+tmpfiles="$tmpfiles mm-u-1.po"
+cat <<\EOF > mm-u-1.po
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -33,8 +33,8 @@ msgstr ""
 "schwarz"
 EOF
 
-tmpfiles="$tmpfiles mm-test14.pot"
-cat <<EOF > mm-test14.pot
+tmpfiles="$tmpfiles mm-u-1.pot"
+cat <<EOF > mm-u-1.pot
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -59,16 +59,16 @@ msgid "black"
 msgstr ""
 EOF
 
-tmpfiles="$tmpfiles mm-test14.bak"
-cp mm-test14.po mm-test14.bak
+tmpfiles="$tmpfiles mm-u-1.bak"
+cp mm-u-1.po mm-u-1.bak
 
-tmpfiles="$tmpfiles mm-test14.po~"
+tmpfiles="$tmpfiles mm-u-1.po~"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --update mm-test14.po mm-test14.pot
+${MSGMERGE} -q --update mm-u-1.po mm-u-1.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
-${DIFF} mm-test14.bak mm-test14.po
+${DIFF} mm-u-1.bak mm-u-1.po
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msgmerge-update-2 b/gettext-tools/tests/msgmerge-update-2
index f507c42..0f0c58e 100755
--- a/gettext-tools/tests/msgmerge-update-2
+++ b/gettext-tools/tests/msgmerge-update-2
@@ -6,8 +6,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles mm-test15.po"
-cat <<\EOF > mm-test15.po
+tmpfiles="$tmpfiles mm-u-2.po"
+cat <<\EOF > mm-u-2.po
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -28,8 +28,8 @@ msgid "white"
 msgstr "wei�"
 EOF
 
-tmpfiles="$tmpfiles mm-test15.pot"
-cat <<EOF > mm-test15.pot
+tmpfiles="$tmpfiles mm-u-2.pot"
+cat <<EOF > mm-u-2.pot
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -51,13 +51,13 @@ msgid "white"
 msgstr ""
 EOF
 
-tmpfiles="$tmpfiles mm-test15.po~"
+tmpfiles="$tmpfiles mm-u-2.po~"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --update mm-test15.po mm-test15.pot
+${MSGMERGE} -q --update mm-u-2.po mm-u-2.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles mm-test15.ok"
-cat <<\EOF > mm-test15.ok
+tmpfiles="$tmpfiles mm-u-2.ok"
+cat <<\EOF > mm-u-2.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -80,7 +80,7 @@ msgstr "wei�"
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test15.ok mm-test15.po
+${DIFF} mm-u-2.ok mm-u-2.po
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msgmerge-update-3 b/gettext-tools/tests/msgmerge-update-3
index dd620ee..4ee2bd8 100755
--- a/gettext-tools/tests/msgmerge-update-3
+++ b/gettext-tools/tests/msgmerge-update-3
@@ -7,8 +7,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles mm-test16.po"
-cat <<\EOF > mm-test16.po
+tmpfiles="$tmpfiles mm-u-3.po"
+cat <<\EOF > mm-u-3.po
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -29,8 +29,8 @@ msgid "white"
 msgstr "wei�"
 EOF
 
-tmpfiles="$tmpfiles mm-test16.pot"
-cat <<EOF > mm-test16.pot
+tmpfiles="$tmpfiles mm-u-3.pot"
+cat <<EOF > mm-u-3.pot
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -51,13 +51,13 @@ msgid "white"
 msgstr ""
 EOF
 
-tmpfiles="$tmpfiles mm-test16.po~"
+tmpfiles="$tmpfiles mm-u-3.po~"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --update mm-test16.po mm-test16.pot
+${MSGMERGE} -q --update mm-u-3.po mm-u-3.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles mm-test16.ok"
-cat <<\EOF > mm-test16.ok
+tmpfiles="$tmpfiles mm-u-3.ok"
+cat <<\EOF > mm-u-3.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -79,7 +79,7 @@ msgstr "wei�"
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test16.ok mm-test16.po
+${DIFF} mm-u-3.ok mm-u-3.po
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/msgunfmt-properties-1 b/gettext-tools/tests/msgunfmt-properties-1
index 1f87de8..e679203 100755
--- a/gettext-tools/tests/msgunfmt-properties-1
+++ b/gettext-tools/tests/msgunfmt-properties-1
@@ -5,8 +5,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles mu-test4.in"
-cat <<EOF > mu-test4.in
+tmpfiles="$tmpfiles mu-p-1.in"
+cat <<EOF > mu-p-1.in
 eight=eighth
 
 five=fifth
@@ -24,18 +24,18 @@ three=third
 two=second
 EOF
 
-tmpfiles="$tmpfiles mu-test4.mo"
+tmpfiles="$tmpfiles mu-p-1.mo"
 : ${MSGFMT=msgfmt}
-${MSGFMT} --properties-input mu-test4.in -o mu-test4.mo
+${MSGFMT} --properties-input mu-p-1.in -o mu-p-1.mo
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles mu-test4.out"
+tmpfiles="$tmpfiles mu-p-1.out"
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} --properties-output mu-test4.mo -o mu-test4.out
+${MSGUNFMT} --properties-output mu-p-1.mo -o mu-p-1.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
-${DIFF} mu-test4.in mu-test4.out
+${DIFF} mu-p-1.in mu-p-1.out
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-1 b/gettext-tools/tests/xgettext-1
index c468770..69a9fdb 100755
--- a/gettext-tools/tests/xgettext-1
+++ b/gettext-tools/tests/xgettext-1
@@ -7,14 +7,14 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles zero-domain.po xg-test3.err"
+tmpfiles="$tmpfiles zero-domain.po xg-test1.err"
 rm -f zero-domain.po
 : ${XGETTEXT=xgettext}
 LC_MESSAGES=C LC_ALL= \
 ${XGETTEXT} -k_ -d zero-domain -x $top_srcdir/po/gettext-tools.pot \
-  $top_srcdir/src/xgettext.c >xg-test3.err 2>&1
+  $top_srcdir/src/xgettext.c >xg-test1.err 2>&1
 result=$?
-cat xg-test3.err | grep -v 'warning: Charset' | grep -v '^ '
+cat xg-test1.err | grep -v 'warning: Charset' | grep -v '^ '
 test $result = 0 || { rm -fr $tmpfiles; exit 1; }
 
 test ! -f zero-domain.po
diff --git a/gettext-tools/tests/xgettext-2 b/gettext-tools/tests/xgettext-2
index ff6dbc6..92d19ba 100755
--- a/gettext-tools/tests/xgettext-2
+++ b/gettext-tools/tests/xgettext-2
@@ -6,8 +6,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles xg-test12.in.c"
-cat <<EOF > xg-test12.in.c
+tmpfiles="$tmpfiles xg-test2.in.c"
+cat <<EOF > xg-test2.in.c
 This is a test of the xgettext functionality.
 /* xgettext:no-c-format */
 _("extract me")
@@ -24,13 +24,13 @@ _
 _("")
 EOF
 
-tmpfiles="$tmpfiles xg-test12.po"
+tmpfiles="$tmpfiles xg-test2.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -d xg-test12 -k_ --omit-header --no-location xg-test12.in.c
+${XGETTEXT} -d xg-test2 -k_ --omit-header --no-location xg-test2.in.c
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles xg-test12.ok"
-cat <<EOF > xg-test12.ok
+tmpfiles="$tmpfiles xg-test2.ok"
+cat <<EOF > xg-test2.ok
 #, no-c-format
 msgid "extract me"
 msgstr ""
@@ -46,7 +46,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test12.ok xg-test12.po
+${DIFF} xg-test2.ok xg-test2.po
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-3 b/gettext-tools/tests/xgettext-3
index 9ab2903..b2dcef1 100755
--- a/gettext-tools/tests/xgettext-3
+++ b/gettext-tools/tests/xgettext-3
@@ -6,8 +6,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles xg-test13.in.c"
-cat <<EOF > xg-test13.in.c
+tmpfiles="$tmpfiles xg-test3.in.c"
+cat <<EOF > xg-test3.in.c
 This is a test of the xgettext functionality.
 /* xgettext:no-c-format */
 _("extract me")
@@ -24,14 +24,14 @@ _
 _("")
 EOF
 
-tmpfiles="$tmpfiles xg-test13.po"
+tmpfiles="$tmpfiles xg-test3.po"
 : ${XGETTEXT=xgettext}
 # delete POT-Creation-Date: line because the date depends on local time.
-${XGETTEXT} --output - --no-location -k_ xg-test13.in.c 2>/dev/null \
-  | sed '/\"POT-Creation-Date:.*/d' > xg-test13.po
+${XGETTEXT} --output - --no-location -k_ xg-test3.in.c 2>/dev/null \
+  | sed '/\"POT-Creation-Date:.*/d' > xg-test3.po
 
-tmpfiles="$tmpfiles xg-test13.ok"
-cat <<EOF > xg-test13.ok
+tmpfiles="$tmpfiles xg-test3.ok"
+cat <<EOF > xg-test3.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -61,7 +61,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test13.ok xg-test13.po
+${DIFF} xg-test3.ok xg-test3.po
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-4 b/gettext-tools/tests/xgettext-4
index 3e0db31..e6f7c92 100755
--- a/gettext-tools/tests/xgettext-4
+++ b/gettext-tools/tests/xgettext-4
@@ -5,19 +5,19 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles xg-test14.in.c"
-cat <<EOF > xg-test14.in.c
+tmpfiles="$tmpfiles xg-test4.in.c"
+cat <<EOF > xg-test4.in.c
 _("extract me")
 EOF
 
-tmpfiles="$tmpfiles xg-test14.po"
+tmpfiles="$tmpfiles xg-test4.po"
 : ${XGETTEXT=xgettext}
 # delete POT-Creation-Date: line because the date depends on local time.
-${XGETTEXT} --output - --foreign-user --no-location -k_ xg-test14.in.c \
-  | sed '/\"POT-Creation-Date:.*/d' > xg-test14.po
+${XGETTEXT} --output - --foreign-user --no-location -k_ xg-test4.in.c \
+  | sed '/\"POT-Creation-Date:.*/d' > xg-test4.po
 
-tmpfiles="$tmpfiles xg-test14.ok"
-cat <<EOF > xg-test14.ok
+tmpfiles="$tmpfiles xg-test4.ok"
+cat <<EOF > xg-test4.ok
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -39,7 +39,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test14.ok xg-test14.po
+${DIFF} xg-test4.ok xg-test4.po
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-5 b/gettext-tools/tests/xgettext-5
index 862a412..71f7458 100755
--- a/gettext-tools/tests/xgettext-5
+++ b/gettext-tools/tests/xgettext-5
@@ -5,8 +5,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles xg-test23.c"
-cat <<EOF > xg-test23.c
+tmpfiles="$tmpfiles xg-test5.c"
+cat <<EOF > xg-test5.c
 void foo (int option)
 {
   printf (_("%s: nezn�m� p�ep�na� -- %c\n"), option);
@@ -14,18 +14,18 @@ void foo (int option)
 }
 EOF
 
-tmpfiles="$tmpfiles xg-test23.po"
+tmpfiles="$tmpfiles xg-test5.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --no-location -k_ -o xg-test23.po xg-test23.c 2>/dev/null
+${XGETTEXT} --no-location -k_ -o xg-test5.po xg-test5.c 2>/dev/null
 test $? = 1 || { rm -fr $tmpfiles; exit 1; }
-${XGETTEXT} --no-location -k_ --from-code=iso-8859-2 -o xg-test23.po xg-test23.c
+${XGETTEXT} --no-location -k_ --from-code=iso-8859-2 -o xg-test5.po xg-test5.c
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles xg-test23.pot"
-sed -e '/POT-Creation-Date/d' < xg-test23.po > xg-test23.pot
+tmpfiles="$tmpfiles xg-test5.pot"
+sed -e '/POT-Creation-Date/d' < xg-test5.po > xg-test5.pot
 
-tmpfiles="$tmpfiles xg-test23.ok"
-cat <<EOF > xg-test23.ok
+tmpfiles="$tmpfiles xg-test5.ok"
+cat <<EOF > xg-test5.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -53,7 +53,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test23.ok xg-test23.pot
+${DIFF} xg-test5.ok xg-test5.pot
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-6 b/gettext-tools/tests/xgettext-6
index 0b6f11b..51f04d4 100755
--- a/gettext-tools/tests/xgettext-6
+++ b/gettext-tools/tests/xgettext-6
@@ -5,73 +5,73 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles xg-test31.c"
-cat <<\EOF > xg-test31.c
+tmpfiles="$tmpfiles xg-test6.c"
+cat <<\EOF > xg-test6.c
 fprintf (fp, gettext ("c-format positive1"), gettext ("c-format negative1"));
 printk (gettext ("c-format negative2"));
 EOF
 
-tmpfiles="$tmpfiles xg-test31.sh"
-cat <<\EOF > xg-test31.sh
+tmpfiles="$tmpfiles xg-test6.sh"
+cat <<\EOF > xg-test6.sh
 eval_gettext "sh-format positive1" "`gettext \"sh-format negative1\"`"
 echo "`gettext \"sh-format negative2\"`"
 EOF
 
-tmpfiles="$tmpfiles xg-test31.py"
-cat <<\EOF > xg-test31.py
+tmpfiles="$tmpfiles xg-test6.py"
+cat <<\EOF > xg-test6.py
 my_printf (gettext ("python-format positive1"),
            gettext ("python-format negative1"));
 printk (gettext ("python-format negative2"));
 EOF
 
-tmpfiles="$tmpfiles xg-test31.lisp"
-cat <<\EOF > xg-test31.lisp
+tmpfiles="$tmpfiles xg-test6.lisp"
+cat <<\EOF > xg-test6.lisp
 (format t (gettext "lisp-format positive1") (gettext "lisp-format negative1"))
 (prin1 (gettext "lisp-format negative2"))
 EOF
 
-tmpfiles="$tmpfiles xg-test31.el"
-cat <<\EOF > xg-test31.el
+tmpfiles="$tmpfiles xg-test6.el"
+cat <<\EOF > xg-test6.el
 (format (_ "elisp-format positive1") (_ "elisp-format negative1"))
 (printk (_ "elisp-format negative2"))
 EOF
 
-tmpfiles="$tmpfiles xg-test31.jl"
-cat <<\EOF > xg-test31.jl
+tmpfiles="$tmpfiles xg-test6.jl"
+cat <<\EOF > xg-test6.jl
 (format stream (_ "librep-format positive1") (_ "librep-format negative1"))
 (printk (_ "librep-format negative2"))
 EOF
 
-tmpfiles="$tmpfiles xg-test31.java"
-cat <<\EOF > xg-test31.java
+tmpfiles="$tmpfiles xg-test6.java"
+cat <<\EOF > xg-test6.java
 MessageFormat.format(gettext("java-format positive1"),
                      gettext("java-format negative1"));
 System.err.println(gettext("java-format negative2"));
 EOF
 
-tmpfiles="$tmpfiles xg-test31.awk"
-cat <<\EOF > xg-test31.awk
+tmpfiles="$tmpfiles xg-test6.awk"
+cat <<\EOF > xg-test6.awk
 printf dcgettext ("awk-format positive1"), dcgettext ("awk-format negative1");
 printf (dcgettext ("awk-format positive2"), dcgettext ("awk-format negative2"));
 printf dcgettext ("awk-format positive3"); dcgettext ("awk-format negative3");
 printk dcgettext ("awk-format negative4");
 EOF
 
-tmpfiles="$tmpfiles xg-test31.ycp"
-cat <<\EOF > xg-test31.ycp
+tmpfiles="$tmpfiles xg-test6.ycp"
+cat <<\EOF > xg-test6.ycp
 sformat (_("ycp-format positive1"), _("ycp-format negative1"));
 printk (_("ycp-format negative2"));
 EOF
 
-tmpfiles="$tmpfiles xg-test31.tcl"
-cat <<\EOF > xg-test31.tcl
+tmpfiles="$tmpfiles xg-test6.tcl"
+cat <<\EOF > xg-test6.tcl
 [format [::msgcat::mc "tcl-format positive1"]
         [::msgcat::mc "tcl-format negative1"]]
 [print [::msgcat::mc "tcl-format negative2"]]
 EOF
 
-tmpfiles="$tmpfiles xg-test31.pl"
-cat <<\EOF > xg-test31.pl
+tmpfiles="$tmpfiles xg-test6.pl"
+cat <<\EOF > xg-test6.pl
 printf gettext "perl-format positive1", gettext ("perl-format negative1");
 gettext ("perl-format negative2");
 printf gettext "perl-format positive2"; gettext ("perl-format negative3");
@@ -80,24 +80,24 @@ print sprintf gettext "perl-format positive3";
 print kprintf gettext "perl-format negative5";
 EOF
 
-tmpfiles="$tmpfiles xg-test31.php"
-cat <<\EOF > xg-test31.php
+tmpfiles="$tmpfiles xg-test6.php"
+cat <<\EOF > xg-test6.php
 <? php
 printf (_ ("php-format positive1"), _ ("php-format negative1"));
 printk (_ ("php-format negative2"));
 EOF
 
-tmpfiles="$tmpfiles xg-test31.po"
+tmpfiles="$tmpfiles xg-test6.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-test31 \
+${XGETTEXT} --omit-header --no-location -d xg-test6 \
   --flag=my_printf:1:python-format \
-  xg-test31.c xg-test31.sh xg-test31.py xg-test31.lisp xg-test31.el \
-  xg-test31.jl xg-test31.java xg-test31.awk xg-test31.ycp xg-test31.tcl \
-  xg-test31.pl xg-test31.php 
+  xg-test6.c xg-test6.sh xg-test6.py xg-test6.lisp xg-test6.el \
+  xg-test6.jl xg-test6.java xg-test6.awk xg-test6.ycp xg-test6.tcl \
+  xg-test6.pl xg-test6.php 
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles xg-test31.ok"
-cat <<\EOF > xg-test31.ok
+tmpfiles="$tmpfiles xg-test6.ok"
+cat <<\EOF > xg-test6.ok
 #, c-format
 msgid "c-format positive1"
 msgstr ""
@@ -251,7 +251,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test31.ok xg-test31.po
+${DIFF} xg-test6.ok xg-test6.po
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-c-1 b/gettext-tools/tests/xgettext-c-1
index a3470db..212989c 100755
--- a/gettext-tools/tests/xgettext-c-1
+++ b/gettext-tools/tests/xgettext-c-1
@@ -7,14 +7,14 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles xg-test1.po"
+tmpfiles="$tmpfiles xg-c-1.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -d xg-test1 -k_ --omit-header --no-location \
+${XGETTEXT} -d xg-c-1 -k_ --omit-header --no-location \
  $top_srcdir/src/xgettext.c $top_srcdir/src/msgfmt.c
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
-${DIFF} $top_srcdir/tests/xg-test1.ok.po xg-test1.po
+${DIFF} $top_srcdir/tests/xg-c-1.ok.po xg-c-1.po
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-c-2 b/gettext-tools/tests/xgettext-c-2
index d33f579..5bbf056 100755
--- a/gettext-tools/tests/xgettext-c-2
+++ b/gettext-tools/tests/xgettext-c-2
@@ -5,8 +5,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles xg-test2.in.c"
-cat <<EOF > xg-test2.in.c
+tmpfiles="$tmpfiles xg-c-2.in.c"
+cat <<EOF > xg-c-2.in.c
 This is a test of the xgettext functionality.
 /* xgettext:no-c-format */
 _("extract me")
@@ -20,13 +20,13 @@ _
 )
 EOF
 
-tmpfiles="$tmpfiles xg-test2.po"
+tmpfiles="$tmpfiles xg-c-2.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -d xg-test2 -k_ --omit-header --no-location xg-test2.in.c
+${XGETTEXT} -d xg-c-2 -k_ --omit-header --no-location xg-c-2.in.c
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles xg-test2.ok"
-cat <<EOF > xg-test2.ok
+tmpfiles="$tmpfiles xg-c-2.ok"
+cat <<EOF > xg-c-2.ok
 #, no-c-format
 msgid "extract me"
 msgstr ""
@@ -39,7 +39,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test2.ok xg-test2.po
+${DIFF} xg-c-2.ok xg-c-2.po
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-c-3 b/gettext-tools/tests/xgettext-c-3
index 42fe841..182c833 100755
--- a/gettext-tools/tests/xgettext-c-3
+++ b/gettext-tools/tests/xgettext-c-3
@@ -5,21 +5,21 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles xg-test4.in.c"
-cat <<EOF > xg-test4.in.c
+tmpfiles="$tmpfiles xg-c-3.in.c"
+cat <<EOF > xg-c-3.in.c
 #line 42 "bozo"
 main(){printf(gettext("Hello, World!\n"));}
 # 6 "clown"
 gettext("nothing");
 EOF
 
-tmpfiles="$tmpfiles xg-test4.po"
+tmpfiles="$tmpfiles xg-c-3.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --add-location xg-test4.in.c -d xg-test4
+${XGETTEXT} --omit-header --add-location xg-c-3.in.c -d xg-c-3
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles xg-test4.ok"
-cat <<EOF > xg-test4.ok
+tmpfiles="$tmpfiles xg-c-3.ok"
+cat <<EOF > xg-c-3.ok
 #: bozo:42
 #, c-format
 msgid "Hello, World!\n"
@@ -31,7 +31,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test4.ok xg-test4.po
+${DIFF} xg-c-3.ok xg-c-3.po
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-c-4 b/gettext-tools/tests/xgettext-c-4
index ce100a4..5dd8c0c 100755
--- a/gettext-tools/tests/xgettext-c-4
+++ b/gettext-tools/tests/xgettext-c-4
@@ -5,25 +5,25 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles xg-test5.in.c"
-cat <<EOF > xg-test5.in.c
+tmpfiles="$tmpfiles xg-c-4.in.c"
+cat <<EOF > xg-c-4.in.c
 main()??<printf(gettext("Hello, " "World!" "??/n")); ??>
 EOF
 
-tmpfiles="$tmpfiles xg-test5.po"
+tmpfiles="$tmpfiles xg-c-4.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location --trigraphs xg-test5.in.c -d xg-test5
+${XGETTEXT} --omit-header --no-location --trigraphs xg-c-4.in.c -d xg-c-4
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles xg-test5.ok"
-cat <<EOF > xg-test5.ok
+tmpfiles="$tmpfiles xg-c-4.ok"
+cat <<EOF > xg-c-4.ok
 #, c-format
 msgid "Hello, World!\n"
 msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test5.ok xg-test5.po
+${DIFF} xg-c-4.ok xg-c-4.po
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-c-5 b/gettext-tools/tests/xgettext-c-5
index c9a4119..a63f50d 100755
--- a/gettext-tools/tests/xgettext-c-5
+++ b/gettext-tools/tests/xgettext-c-5
@@ -5,18 +5,18 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles xg-test6.in.cc"
-cat <<EOF > xg-test6.in.cc
+tmpfiles="$tmpfiles xg-c-5.in.cc"
+cat <<EOF > xg-c-5.in.cc
 main(){printf(gettext/*puke*/(/*barf*/"Hello, " "World!" "\n")); }
 EOF
 
-tmpfiles="$tmpfiles xg-test6.po"
+tmpfiles="$tmpfiles xg-c-5.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location --add-comments xg-test6.in.cc -d xg-test6
+${XGETTEXT} --omit-header --no-location --add-comments xg-c-5.in.cc -d xg-c-5
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles xg-test6.ok"
-cat <<EOF > xg-test6.ok
+tmpfiles="$tmpfiles xg-c-5.ok"
+cat <<EOF > xg-c-5.ok
 #. puke
 #. barf
 #, c-format
@@ -25,7 +25,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test6.ok xg-test6.po
+${DIFF} xg-c-5.ok xg-c-5.po
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-c-6 b/gettext-tools/tests/xgettext-c-6
index 362bf5e..757e9c3 100755
--- a/gettext-tools/tests/xgettext-c-6
+++ b/gettext-tools/tests/xgettext-c-6
@@ -5,8 +5,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles xg-test7.in.C"
-cat <<EOF > xg-test7.in.C
+tmpfiles="$tmpfiles xg-c-6.in.C"
+cat <<EOF > xg-c-6.in.C
 /* This comment will not be extracted.  */
 gettext ("help");
 
@@ -20,14 +20,14 @@ dcgettext ("foo", "quick", LC_MESSAGES);
 dgettext ("bar", "!");
 EOF
 
-tmpfiles="$tmpfiles xg-test7.po"
+tmpfiles="$tmpfiles xg-c-6.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location --add-comments=XXX xg-test7.in.C \
-  -d xg-test7
+${XGETTEXT} --omit-header --no-location --add-comments=XXX xg-c-6.in.C \
+  -d xg-c-6
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles xg-test7.ok"
-cat <<EOF > xg-test7.ok
+tmpfiles="$tmpfiles xg-c-6.ok"
+cat <<EOF > xg-c-6.ok
 msgid "help"
 msgstr ""
 
@@ -44,7 +44,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test7.ok xg-test7.po
+${DIFF} xg-c-6.ok xg-c-6.po
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-c-7 b/gettext-tools/tests/xgettext-c-7
index 2f7082b..3992bc5 100755
--- a/gettext-tools/tests/xgettext-c-7
+++ b/gettext-tools/tests/xgettext-c-7
@@ -5,8 +5,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles xg-test9.c"
-cat <<EOF > xg-test9.c
+tmpfiles="$tmpfiles xg-c-7.c"
+cat <<EOF > xg-c-7.c
 int
 main()
 {
@@ -40,13 +40,13 @@ main()
 }
 EOF
 
-tmpfiles="$tmpfiles xg-test9.po"
+tmpfiles="$tmpfiles xg-c-7.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -c --c++ -d xg-test9 xg-test9.c
+${XGETTEXT} --omit-header --no-location -c --c++ -d xg-c-7 xg-c-7.c
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles xg-test9.ok"
-cat <<EOF > xg-test9.ok
+tmpfiles="$tmpfiles xg-c-7.ok"
+cat <<EOF > xg-c-7.ok
 #. This is a comment which immediately before a keyword.
 msgid "1"
 msgstr ""
@@ -79,7 +79,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test9.ok xg-test9.po
+${DIFF} xg-c-7.ok xg-c-7.po
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-c-8 b/gettext-tools/tests/xgettext-c-8
index 9287a0b..9bef7cc 100755
--- a/gettext-tools/tests/xgettext-c-8
+++ b/gettext-tools/tests/xgettext-c-8
@@ -5,8 +5,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles xg-test22.c"
-cat <<EOF > xg-test22.c
+tmpfiles="$tmpfiles xg-c-8.c"
+cat <<EOF > xg-c-8.c
 void foo ()
 {
   printf (_("File size is: %" PRId64), size);
@@ -16,13 +16,13 @@ void foo ()
 }
 EOF
 
-tmpfiles="$tmpfiles xg-test22.po"
+tmpfiles="$tmpfiles xg-c-8.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -k_ -o xg-test22.po xg-test22.c
+${XGETTEXT} --omit-header --no-location -k_ -o xg-c-8.po xg-c-8.c
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles xg-test22.ok"
-cat <<EOF > xg-test22.ok
+tmpfiles="$tmpfiles xg-c-8.ok"
+cat <<EOF > xg-c-8.ok
 #, c-format
 msgid "File size is: %<PRId64>"
 msgstr ""
@@ -41,7 +41,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test22.ok xg-test22.po
+${DIFF} xg-c-8.ok xg-c-8.po
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-glade-1 b/gettext-tools/tests/xgettext-glade-1
index fad0de9..f87af40 100755
--- a/gettext-tools/tests/xgettext-glade-1
+++ b/gettext-tools/tests/xgettext-glade-1
@@ -11,9 +11,9 @@ cat <<EOF > empty.glade
 <GTK-Interface/>
 EOF
 
-tmpfiles="$tmpfiles xg-test19.pot"
+tmpfiles="$tmpfiles xg-gl-1.pot"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o xg-test19.pot empty.glade 2>/dev/null
+${XGETTEXT} -o xg-gl-1.pot empty.glade 2>/dev/null
 test $? = 0 || { rm -fr $tmpfiles; exit 77; }
 
 tmpfiles="$tmpfiles widgets.glade"
@@ -1331,13 +1331,13 @@ for said code in libglade.</text>
 </GTK-Interface>
 EOF
 
-tmpfiles="$tmpfiles xg-test19.pot"
+tmpfiles="$tmpfiles xg-gl-1.pot"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --add-comments -o - widgets.glade | grep -v 'POT-Creation-Date' > xg-test19.pot
+${XGETTEXT} --add-comments -o - widgets.glade | grep -v 'POT-Creation-Date' > xg-gl-1.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles xg-test19.ok"
-cat <<EOF > xg-test19.ok
+tmpfiles="$tmpfiles xg-gl-1.ok"
+cat <<EOF > xg-gl-1.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -1562,7 +1562,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test19.ok xg-test19.pot
+${DIFF} xg-gl-1.ok xg-gl-1.pot
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-glade-2 b/gettext-tools/tests/xgettext-glade-2
index 6119bdc..16bf237 100755
--- a/gettext-tools/tests/xgettext-glade-2
+++ b/gettext-tools/tests/xgettext-glade-2
@@ -12,9 +12,9 @@ cat <<EOF > empty.glade
 <GTK-Interface/>
 EOF
 
-tmpfiles="$tmpfiles xg-test20.pot"
+tmpfiles="$tmpfiles xg-gl-2.pot"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o xg-test20.pot empty.glade 2>/dev/null
+${XGETTEXT} -o xg-gl-2.pot empty.glade 2>/dev/null
 test $? = 0 || { rm -fr $tmpfiles; exit 77; }
 
 tmpfiles="$tmpfiles simple.glade"
@@ -56,14 +56,14 @@ cat <<\EOF > simple.glade
 </GTK-Interface>
 EOF
 
-tmpfiles="$tmpfiles xg-test20.tmp xg-test20.pot"
+tmpfiles="$tmpfiles xg-gl-2.tmp xg-gl-2.pot"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --add-comments -o xg-test20.tmp simple.glade 
+${XGETTEXT} --add-comments -o xg-gl-2.tmp simple.glade 
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-grep -v 'POT-Creation-Date' < xg-test20.tmp > xg-test20.pot
+grep -v 'POT-Creation-Date' < xg-gl-2.tmp > xg-gl-2.pot
 
-tmpfiles="$tmpfiles xg-test20.ok"
-cat <<EOF > xg-test20.ok
+tmpfiles="$tmpfiles xg-gl-2.ok"
+cat <<EOF > xg-gl-2.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -96,7 +96,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test20.ok xg-test20.pot
+${DIFF} xg-gl-2.ok xg-gl-2.pot
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-glade-3 b/gettext-tools/tests/xgettext-glade-3
index abc096e..0a1521f 100755
--- a/gettext-tools/tests/xgettext-glade-3
+++ b/gettext-tools/tests/xgettext-glade-3
@@ -152,14 +152,14 @@ button or double click the character in the table.</property>
 </glade-interface>
 EOF
 
-tmpfiles="$tmpfiles xg-test25.tmp xg-test25.pot"
+tmpfiles="$tmpfiles xg-gl-3.tmp xg-gl-3.pot"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o xg-test25.tmp asciitable.glade2 
+${XGETTEXT} -o xg-gl-3.tmp asciitable.glade2 
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-grep -v 'POT-Creation-Date' < xg-test25.tmp > xg-test25.pot
+grep -v 'POT-Creation-Date' < xg-gl-3.tmp > xg-gl-3.pot
 
-tmpfiles="$tmpfiles xg-test25.ok"
-cat <<EOF > xg-test25.ok
+tmpfiles="$tmpfiles xg-gl-3.ok"
+cat <<EOF > xg-gl-3.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -194,7 +194,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test25.ok xg-test25.pot
+${DIFF} xg-gl-3.ok xg-gl-3.pot
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-java-1 b/gettext-tools/tests/xgettext-java-1
index dd059b0..cd7f12e 100755
--- a/gettext-tools/tests/xgettext-java-1
+++ b/gettext-tools/tests/xgettext-java-1
@@ -6,8 +6,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles xg-test10.java"
-cat <<EOF > xg-test10.java
+tmpfiles="$tmpfiles xg-j-1.java"
+cat <<EOF > xg-j-1.java
 class TestCase {
     public TestCase() {
         ResourceBundle b = ResourceBundle.getBundle("test");
@@ -31,13 +31,13 @@ class TestCase {
 }
 EOF
 
-tmpfiles="$tmpfiles xg-test10.po"
+tmpfiles="$tmpfiles xg-j-1.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -c -d xg-test10 xg-test10.java
+${XGETTEXT} --omit-header --no-location -c -d xg-j-1 xg-j-1.java
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles xg-test10.ok"
-cat <<EOF > xg-test10.ok
+tmpfiles="$tmpfiles xg-j-1.ok"
+cat <<EOF > xg-j-1.ok
 #. standard usage
 msgid "Test String 1"
 msgstr ""
@@ -60,7 +60,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test10.ok xg-test10.po
+${DIFF} xg-j-1.ok xg-j-1.po
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-java-2 b/gettext-tools/tests/xgettext-java-2
index 85646a7..2287ff4 100755
--- a/gettext-tools/tests/xgettext-java-2
+++ b/gettext-tools/tests/xgettext-java-2
@@ -6,8 +6,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles xg-test11.java"
-cat <<\EOF > xg-test11.java
+tmpfiles="$tmpfiles xg-j-2.java"
+cat <<\EOF > xg-j-2.java
 class TestCase {
   public static void main (String[] args) {
     // Test recognition of \u escapes: B�se B�bchen
@@ -58,14 +58,14 @@ comment! */ "this is a single " /* now comes the concatenation! */ + // after +
 }
 EOF
 
-tmpfiles="$tmpfiles xg-test11.tmp xg-test11.pot"
+tmpfiles="$tmpfiles xg-j-2.tmp xg-j-2.pot"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --from-code=ISO-8859-1 -c -o xg-test11.tmp xg-test11.java 2>/dev/null
+${XGETTEXT} --from-code=ISO-8859-1 -c -o xg-j-2.tmp xg-j-2.java 2>/dev/null
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-grep -v 'POT-Creation-Date' < xg-test11.tmp > xg-test11.pot
+grep -v 'POT-Creation-Date' < xg-j-2.tmp > xg-j-2.pot
 
-tmpfiles="$tmpfiles xg-test11.ok"
-cat <<\EOF > xg-test11.ok
+tmpfiles="$tmpfiles xg-j-2.ok"
+cat <<\EOF > xg-j-2.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -84,57 +84,56 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Test recognition of \u escapes: Böse Bübchen
-#: xg-test11.java:4
+#: xg-j-2.java:4
 msgid "Böse Bübchen"
 msgstr ""
 
 #. Test recognition of \u escapes with different number of u
-#: xg-test11.java:6
+#: xg-j-2.java:6
 msgid "Japanese: 日本語"
 msgstr ""
 
 #. Test recognition of \u escapes when they form UTF-16 surrogates
 #. Here: U+1D49E MATHEMATICAL SCRIPT CAPITAL C
-#: xg-test11.java:9
+#: xg-j-2.java:9
 msgid "script 𝒞 = ..."
 msgstr ""
 
 #. Test invalid surrogates.
-#: xg-test11.java:11
+#: xg-j-2.java:11
 msgid "invalid surrogate � first half"
 msgstr ""
 
-#: xg-test11.java:12
+#: xg-j-2.java:12
 msgid "invalid surrogate ��� second half"
 msgstr ""
 
 #. Don't let the line numbers be confused by \u newlines.
-#: xg-test11.java:15
+#: xg-j-2.java:15
 msgid ""
 "embedded\n"
 "newline"
 msgstr ""
 
 #. Spaces from end of comment are removed.
-#: xg-test11.java:16
+#: xg-j-2.java:16
 msgid "dummy"
 msgstr ""
 
 #. Various ways to write a backslash are equivalent.
-#: xg-test11.java:18 xg-test11.java:19 xg-test11.java:20 xg-test11.java:21
-#: xg-test11.java:22
+#: xg-j-2.java:18 xg-j-2.java:19 xg-j-2.java:20 xg-j-2.java:21 xg-j-2.java:22
 msgid "\\"
 msgstr ""
 
 #. Escape sequences in strings.
-#: xg-test11.java:24
+#: xg-j-2.java:24
 msgid ""
 "t -> \t, b -> \b, n -> \n"
 ", dquote -> \", squote -> ' ..."
 msgstr ""
 
 #. Octal escapes have 2 or 3 digits, depending on the initial digit.
-#: xg-test11.java:26
+#: xg-j-2.java:26
 msgid ""
 "bel: \n"
 "newline: \n"
@@ -143,34 +142,34 @@ msgid ""
 msgstr ""
 
 #. Hex escapes are not recognized
-#: xg-test11.java:28
+#: xg-j-2.java:28
 msgid "no bel: \\x07\n"
 msgstr ""
 
 #. Recognized despite comments
 #. Even across multiline
 #. comment!
-#: xg-test11.java:31
+#: xg-j-2.java:31
 msgid "this is a single long line"
 msgstr ""
 
 #. Invalid concatenations are not concatenated.
-#: xg-test11.java:36
+#: xg-j-2.java:36
 msgid "fooba"
 msgstr ""
 
 #. Verify that the static function name has priority.
-#: xg-test11.java:38
+#: xg-j-2.java:38
 msgid "this one is extracted"
 msgstr ""
 
-#: xg-test11.java:46
+#: xg-j-2.java:46
 msgid "this is the second argument"
 msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test11.ok xg-test11.pot
+${DIFF} xg-j-2.ok xg-j-2.pot
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-java-3 b/gettext-tools/tests/xgettext-java-3
index a0d1371..d54a83d 100755
--- a/gettext-tools/tests/xgettext-java-3
+++ b/gettext-tools/tests/xgettext-java-3
@@ -6,8 +6,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles xg-test15.java"
-cat <<EOF > xg-test15.java
+tmpfiles="$tmpfiles xg-j-3.java"
+cat <<EOF > xg-j-3.java
 class TestCase {
     public TestCase() {
         Bundle test = Bundle.getBundle();
@@ -16,13 +16,13 @@ class TestCase {
 }
 EOF
 
-tmpfiles="$tmpfiles xg-test15.po"
+tmpfiles="$tmpfiles xg-j-3.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-test15 xg-test15.java
+${XGETTEXT} --omit-header --no-location -d xg-j-3 xg-j-3.java
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles xg-test15.ok"
-cat <<EOF > xg-test15.ok
+tmpfiles="$tmpfiles xg-j-3.ok"
+cat <<EOF > xg-j-3.ok
 msgid "test 1"
 msgid_plural "plural test"
 msgstr[0] ""
@@ -30,7 +30,7 @@ msgstr[1] ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test15.ok xg-test15.po
+${DIFF} xg-j-3.ok xg-j-3.po
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-java-4 b/gettext-tools/tests/xgettext-java-4
index 87fd468..6b47e66 100755
--- a/gettext-tools/tests/xgettext-java-4
+++ b/gettext-tools/tests/xgettext-java-4
@@ -6,8 +6,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles xg-test16.java"
-cat <<EOF > xg-test16.java
+tmpfiles="$tmpfiles xg-j-4.java"
+cat <<EOF > xg-j-4.java
 class TestCase {
     public TestCase() {
         Bundle test = Bundle.getBundle();
@@ -16,13 +16,13 @@ class TestCase {
 }
 EOF
 
-tmpfiles="$tmpfiles xg-test16.po"
+tmpfiles="$tmpfiles xg-j-4.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location --keyword=ngettext:2,3 -d xg-test16 xg-test16.java
+${XGETTEXT} --omit-header --no-location --keyword=ngettext:2,3 -d xg-j-4 xg-j-4.java
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles xg-test16.ok"
-cat <<EOF > xg-test16.ok
+tmpfiles="$tmpfiles xg-j-4.ok"
+cat <<EOF > xg-j-4.ok
 msgid "test 1"
 msgid_plural "plural test"
 msgstr[0] ""
@@ -30,7 +30,7 @@ msgstr[1] ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test16.ok xg-test16.po
+${DIFF} xg-j-4.ok xg-j-4.po
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-objc-1 b/gettext-tools/tests/xgettext-objc-1
index 1ea3d28..2faf22c 100755
--- a/gettext-tools/tests/xgettext-objc-1
+++ b/gettext-tools/tests/xgettext-objc-1
@@ -5,8 +5,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles xg-test32.m"
-cat <<\EOF > xg-test32.m
+tmpfiles="$tmpfiles xg-ob-1.m"
+cat <<\EOF > xg-ob-1.m
 id str = _(@
 "conca" /* comment */
 @
@@ -28,36 +28,36 @@ _ // test
 NSLocalizedString(@"Information", @"")
 EOF
 
-tmpfiles="$tmpfiles xg-test32.po"
+tmpfiles="$tmpfiles xg-ob-1.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header -k_ -kNSLocalizedString xg-test32.m -d xg-test32
+${XGETTEXT} --omit-header -k_ -kNSLocalizedString xg-ob-1.m -d xg-ob-1
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles xg-test32.ok"
-cat <<\EOF > xg-test32.ok
-#: xg-test32.m:2
+tmpfiles="$tmpfiles xg-ob-1.ok"
+cat <<\EOF > xg-ob-1.ok
+#: xg-ob-1.m:2
 msgid "concatenated"
 msgstr ""
 
-#: xg-test32.m:7
+#: xg-ob-1.m:7
 msgid "foo"
 msgstr ""
 
-#: xg-test32.m:7
+#: xg-ob-1.m:7
 msgid "foo2"
 msgstr ""
 
-#: xg-test32.m:14
+#: xg-ob-1.m:14
 msgid "test test2"
 msgstr ""
 
-#: xg-test32.m:19
+#: xg-ob-1.m:19
 msgid "Information"
 msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test32.ok xg-test32.po
+${DIFF} xg-ob-1.ok xg-ob-1.po
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-perl-1 b/gettext-tools/tests/xgettext-perl-1
index 8491be4..5afb325 100755
--- a/gettext-tools/tests/xgettext-perl-1
+++ b/gettext-tools/tests/xgettext-perl-1
@@ -5,8 +5,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles xg-test26.pl"
-cat <<\EOF > xg-test26.pl
+tmpfiles="$tmpfiles xg-pl-1.pl"
+cat <<\EOF > xg-pl-1.pl
 use Locale::Messages qw (textdomain bindtextdomain gettext ngettext dngettext);
 
 textdomain "prog";
@@ -148,179 +148,179 @@ __END__
 gettext "Discarded!";
 EOF
 
-tmpfiles="$tmpfiles xg-test26.po"
+tmpfiles="$tmpfiles xg-pl-1.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header -n \
   -k_ --flag=_:1:pass-perl-format --flag=_:1:pass-perl-brace-format \
   -k%__ --flag=%__:1:pass-perl-format --flag=%__:1:pass-perl-brace-format \
   -k\$__ --flag=\$__:1:pass-perl-format --flag=\$__:1:pass-perl-brace-format \
-  xg-test26.pl -d xg-test26
+  xg-pl-1.pl -d xg-pl-1
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles xg-test26.ok"
-cat <<\EOF > xg-test26.ok
-#: xg-test26.pl:9
+tmpfiles="$tmpfiles xg-pl-1.ok"
+cat <<\EOF > xg-pl-1.ok
+#: xg-pl-1.pl:9
 msgid "'Your command, please?', asked the waiter."
 msgstr ""
 
-#: xg-test26.pl:11
+#: xg-pl-1.pl:11
 #, perl-format
 msgid "a piece of cake"
 msgid_plural "%d pieces of cake"
 msgstr[0] ""
 msgstr[1] ""
 
-#: xg-test26.pl:13
+#: xg-pl-1.pl:13
 #, perl-format
 msgid "%s is replaced by %s."
 msgstr ""
 
-#: xg-test26.pl:16
+#: xg-pl-1.pl:16
 #, perl-format
 msgid "one file deleted"
 msgid_plural "%d files deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: xg-test26.pl:22
+#: xg-pl-1.pl:22
 #, perl-format
 msgid "Singular\n"
 msgid_plural "Plural\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: xg-test26.pl:28
+#: xg-pl-1.pl:28
 msgid "Bareword"
 msgstr ""
 
-#: xg-test26.pl:30
+#: xg-pl-1.pl:30
 msgid "quoted string"
 msgstr ""
 
-#: xg-test26.pl:31
+#: xg-pl-1.pl:31
 msgid ""
 "weird\n"
 "formatting"
 msgstr ""
 
-#: xg-test26.pl:38
+#: xg-pl-1.pl:38
 msgid "Welcome to the Republic of Perl!"
 msgstr ""
 
-#: xg-test26.pl:42
+#: xg-pl-1.pl:42
 msgid "pattern match"
 msgstr ""
 
-#: xg-test26.pl:43
+#: xg-pl-1.pl:43
 msgid "substitution"
 msgstr ""
 
-#: xg-test26.pl:43
+#: xg-pl-1.pl:43
 msgid "find me"
 msgstr ""
 
-#: xg-test26.pl:50
+#: xg-pl-1.pl:50
 msgid "First here document.\n"
 msgstr ""
 
-#: xg-test26.pl:52
+#: xg-pl-1.pl:52
 msgid "Second here document.\n"
 msgstr ""
 
-#: xg-test26.pl:56
+#: xg-pl-1.pl:56
 msgid "abc$def"
 msgstr ""
 
-#: xg-test26.pl:57
+#: xg-pl-1.pl:57
 msgid "abc\\$def"
 msgstr ""
 
-#: xg-test26.pl:60
+#: xg-pl-1.pl:60
 msgid "abc$defg"
 msgstr ""
 
-#: xg-test26.pl:61 xg-test26.pl:62
+#: xg-pl-1.pl:61 xg-pl-1.pl:62
 msgid "abc\\$defg"
 msgstr ""
 
-#: xg-test26.pl:63
+#: xg-pl-1.pl:63
 msgid "abc\\\\$defg"
 msgstr ""
 
-#: xg-test26.pl:66 xg-test26.pl:67 xg-test26.pl:71 xg-test26.pl:72
-#: xg-test26.pl:81 xg-test26.pl:86
+#: xg-pl-1.pl:66 xg-pl-1.pl:67 xg-pl-1.pl:71 xg-pl-1.pl:72 xg-pl-1.pl:81
+#: xg-pl-1.pl:86
 msgid "ecs\\tasy"
 msgstr ""
 
-#: xg-test26.pl:68 xg-test26.pl:69 xg-test26.pl:73 xg-test26.pl:74
-#: xg-test26.pl:83 xg-test26.pl:88
+#: xg-pl-1.pl:68 xg-pl-1.pl:69 xg-pl-1.pl:73 xg-pl-1.pl:74 xg-pl-1.pl:83
+#: xg-pl-1.pl:88
 msgid "ecs\\\\tasy"
 msgstr ""
 
-#: xg-test26.pl:70 xg-test26.pl:75
+#: xg-pl-1.pl:70 xg-pl-1.pl:75
 msgid "ecs\\\\\\tasy"
 msgstr ""
 
-#: xg-test26.pl:80 xg-test26.pl:85
+#: xg-pl-1.pl:80 xg-pl-1.pl:85
 msgid "ecs\tasy"
 msgstr ""
 
-#: xg-test26.pl:82 xg-test26.pl:87
+#: xg-pl-1.pl:82 xg-pl-1.pl:87
 msgid "ecs\\\tasy"
 msgstr ""
 
-#: xg-test26.pl:84 xg-test26.pl:89
+#: xg-pl-1.pl:84 xg-pl-1.pl:89
 msgid "ecs\\\\\tasy"
 msgstr ""
 
-#: xg-test26.pl:90 xg-test26.pl:95
+#: xg-pl-1.pl:90 xg-pl-1.pl:95
 msgid "marihuana"
 msgstr ""
 
-#: xg-test26.pl:91 xg-test26.pl:92 xg-test26.pl:96 xg-test26.pl:97
+#: xg-pl-1.pl:91 xg-pl-1.pl:92 xg-pl-1.pl:96 xg-pl-1.pl:97
 msgid "mari\\huana"
 msgstr ""
 
-#: xg-test26.pl:93 xg-test26.pl:94 xg-test26.pl:98 xg-test26.pl:99
+#: xg-pl-1.pl:93 xg-pl-1.pl:94 xg-pl-1.pl:98 xg-pl-1.pl:99
 msgid "mari\\\\huana"
 msgstr ""
 
-#: xg-test26.pl:102
+#: xg-pl-1.pl:102
 #, perl-brace-format
 msgid "This is {only} a brace formatstring."
 msgstr ""
 
-#: xg-test26.pl:103
+#: xg-pl-1.pl:103
 #, perl-format, perl-brace-format
 msgid "This is %s {mixed}."
 msgstr ""
 
-#: xg-test26.pl:104
+#: xg-pl-1.pl:104
 #, perl-format
 msgid "This is only %c."
 msgstr ""
 
-#: xg-test26.pl:105
+#: xg-pl-1.pl:105
 msgid "This is nothing at all."
 msgstr ""
 
-#: xg-test26.pl:106
+#: xg-pl-1.pl:106
 msgid "And this is %l also no format at all."
 msgstr ""
 
-#: xg-test26.pl:109
+#: xg-pl-1.pl:109
 #, no-perl-format, perl-brace-format
 msgid "The function '{func}' expects '%c' here."
 msgstr ""
 
-#: xg-test26.pl:114 xg-test26.pl:116 xg-test26.pl:118
+#: xg-pl-1.pl:114 xg-pl-1.pl:116 xg-pl-1.pl:118
 #, perl-format, no-perl-brace-format
 msgid "Left as an %exercise to {maintainer}."
 msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test26.ok xg-test26.po
+${DIFF} xg-pl-1.ok xg-pl-1.po
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-perl-2 b/gettext-tools/tests/xgettext-perl-2
index 2284a1c..d9a76bf 100755
--- a/gettext-tools/tests/xgettext-perl-2
+++ b/gettext-tools/tests/xgettext-perl-2
@@ -5,8 +5,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles xg-test27.pl"
-cat <<\EOF > xg-test27.pl
+tmpfiles="$tmpfiles xg-pl-2.pl"
+cat <<\EOF > xg-pl-2.pl
 use charnames ':full';
 printf "%s\n", gettext "B�se B�bchen - wo sind sie blo\N{LATIN SMALL LETTER SHARP S}?";
 print gettext <<STR
@@ -14,15 +14,15 @@ Die europ�ische W�hrung ist \N{EURO SIGN}.
 STR
 EOF
 
-tmpfiles="$tmpfiles xg-test27.po"
+tmpfiles="$tmpfiles xg-pl-2.po"
 : ${XGETTEXT=xgettext}
 # delete POT-Creation-Date: line because the date depends on local time.
-${XGETTEXT} --output - --from-code=ISO-8859-1 xg-test27.pl \
-  | sed '/\"POT-Creation-Date:.*/d' > xg-test27.po
+${XGETTEXT} --output - --from-code=ISO-8859-1 xg-pl-2.pl \
+  | sed '/\"POT-Creation-Date:.*/d' > xg-pl-2.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles xg-test27.ok"
-cat <<\EOF > xg-test27.ok
+tmpfiles="$tmpfiles xg-pl-2.ok"
+cat <<\EOF > xg-pl-2.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -40,17 +40,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: xg-test27.pl:2
+#: xg-pl-2.pl:2
 msgid "Böse Bübchen - wo sind sie bloß?"
 msgstr ""
 
-#: xg-test27.pl:4
+#: xg-pl-2.pl:4
 msgid "Die europäische Währung ist €.\n"
 msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test27.ok xg-test27.po
+${DIFF} xg-pl-2.ok xg-pl-2.po
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-perl-3 b/gettext-tools/tests/xgettext-perl-3
index e84aafe..c05cb56 100755
--- a/gettext-tools/tests/xgettext-perl-3
+++ b/gettext-tools/tests/xgettext-perl-3
@@ -5,8 +5,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles xg-test28.pl"
-cat <<\EOF > xg-test28.pl
+tmpfiles="$tmpfiles xg-pl-3.pl"
+cat <<\EOF > xg-pl-3.pl
 use charnames ':full';
 printf "%s\n", gettext "Böse Bübchen - wo sind sie blo\N{LATIN SMALL LETTER SHARP S}?";
 print gettext <<STR
@@ -14,15 +14,15 @@ Die europäische Währung ist \N{EURO SIGN}.
 STR
 EOF
 
-tmpfiles="$tmpfiles xg-test28.po"
+tmpfiles="$tmpfiles xg-pl-3.po"
 : ${XGETTEXT=xgettext}
 # delete POT-Creation-Date: line because the date depends on local time.
-${XGETTEXT} --output - --from-code=UTF-8 xg-test28.pl \
-  | sed '/\"POT-Creation-Date:.*/d' > xg-test28.po
+${XGETTEXT} --output - --from-code=UTF-8 xg-pl-3.pl \
+  | sed '/\"POT-Creation-Date:.*/d' > xg-pl-3.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles xg-test28.ok"
-cat <<\EOF > xg-test28.ok
+tmpfiles="$tmpfiles xg-pl-3.ok"
+cat <<\EOF > xg-pl-3.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -40,17 +40,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: xg-test28.pl:2
+#: xg-pl-3.pl:2
 msgid "Böse Bübchen - wo sind sie bloß?"
 msgstr ""
 
-#: xg-test28.pl:4
+#: xg-pl-3.pl:4
 msgid "Die europäische Währung ist €.\n"
 msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test28.ok xg-test28.po
+${DIFF} xg-pl-3.ok xg-pl-3.po
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-perl-4 b/gettext-tools/tests/xgettext-perl-4
index f75c196..8a00ece 100755
--- a/gettext-tools/tests/xgettext-perl-4
+++ b/gettext-tools/tests/xgettext-perl-4
@@ -6,8 +6,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles xg-test29.pl"
-cat <<\EOPERL > xg-test29.pl
+tmpfiles="$tmpfiles xg-pl-4.pl"
+cat <<\EOPERL > xg-pl-4.pl
 use strict;
 
 # A double quoted string.
@@ -52,14 +52,14 @@ print "\U\x70\LO\154\x{69}\x{004E}a \Q\lRu\LLeS\E\041\n";
 #      "\x{430}\x{447}\x{43a}\x{430}\n";
 EOPERL
 
-tmpfiles="$tmpfiles xg-test29.pot"
+tmpfiles="$tmpfiles xg-pl-4.pot"
 : ${XGETTEXT=xgettext}
 LC_MESSAGES=C LC_ALL= \
-${XGETTEXT} -a --omit-header --no-location -o xg-test29.pot xg-test29.pl
+${XGETTEXT} -a --omit-header --no-location -o xg-pl-4.pot xg-pl-4.pl
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles xg-test29.ok"
-cat <<\EOF > xg-test29.ok
+tmpfiles="$tmpfiles xg-pl-4.ok"
+cat <<\EOF > xg-pl-4.ok
 msgid "'Your command, please?', asked the waiter.\n"
 msgstr ""
 
@@ -105,7 +105,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test29.ok xg-test29.pot
+${DIFF} xg-pl-4.ok xg-pl-4.pot
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-po-1 b/gettext-tools/tests/xgettext-po-1
index 0c784ff..5c733e4 100755
--- a/gettext-tools/tests/xgettext-po-1
+++ b/gettext-tools/tests/xgettext-po-1
@@ -5,8 +5,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles xg-test8.in.po xg-test8.c xg-test8.cc"
-cat <<EOF > xg-test8.in.po
+tmpfiles="$tmpfiles xg-po-1.in.po xg-po-1.c xg-po-1.cc"
+cat <<EOF > xg-po-1.in.po
 #: file1.c:199
 #, fuzzy
 msgid "extract me"
@@ -22,7 +22,7 @@ msgid "hello"
 msgstr "Again some text for fuzzy"
 EOF
 
-cat <<EOF > xg-test8.c
+cat <<EOF > xg-po-1.c
 #include <libintl.h>
 #include <stdio.h>
 int
@@ -33,7 +33,7 @@ main (int argc, char *argv[])
 }
 EOF
 
-cat <<EOF > xg-test8.cc
+cat <<EOF > xg-po-1.cc
 #include <iostream.h>
 #include <libintl.h>
 #include <locale.h>
@@ -45,14 +45,14 @@ main (int argc, char *argv[])
 }
 EOF
 
-tmpfiles="$tmpfiles xg-test8.po"
+tmpfiles="$tmpfiles xg-po-1.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header -n xg-test8.in.po \
-  xg-test8.c xg-test8.cc -d xg-test8
+${XGETTEXT} --omit-header -n xg-po-1.in.po \
+  xg-po-1.c xg-po-1.cc -d xg-po-1
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles xg-test8.ok"
-cat <<EOF > xg-test8.ok
+tmpfiles="$tmpfiles xg-po-1.ok"
+cat <<EOF > xg-po-1.ok
 #: file1.c:199
 #, fuzzy
 msgid "extract me"
@@ -67,18 +67,18 @@ msgstr ""
 msgid "hello"
 msgstr "Again some text for fuzzy"
 
-#: xg-test8.c:6
+#: xg-po-1.c:6
 #, c-format
 msgid "Hello, world."
 msgstr ""
 
-#: xg-test8.cc:7
+#: xg-po-1.cc:7
 msgid "Hello world!"
 msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test8.ok xg-test8.po
+${DIFF} xg-po-1.ok xg-po-1.po
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-properties-1 b/gettext-tools/tests/xgettext-properties-1
index 8ebb2b2..30c22a5 100755
--- a/gettext-tools/tests/xgettext-properties-1
+++ b/gettext-tools/tests/xgettext-properties-1
@@ -5,8 +5,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles xg-test24.in.properties xg-test24.c xg-test24.cc"
-cat <<EOF > xg-test24.in.properties
+tmpfiles="$tmpfiles xg-pr-1.in.properties xg-pr-1.c xg-pr-1.cc"
+cat <<EOF > xg-pr-1.in.properties
 #: file1.c:199
 #, fuzzy
 !extract\ me=some text to get fuzzy copied to result
@@ -19,7 +19,7 @@ cat <<EOF > xg-test24.in.properties
 !hello=Again some text for fuzzy
 EOF
 
-cat <<EOF > xg-test24.c
+cat <<EOF > xg-pr-1.c
 #include <libintl.h>
 #include <stdio.h>
 int
@@ -30,7 +30,7 @@ main (int argc, char *argv[])
 }
 EOF
 
-cat <<EOF > xg-test24.cc
+cat <<EOF > xg-pr-1.cc
 #include <iostream.h>
 #include <libintl.h>
 #include <locale.h>
@@ -42,14 +42,14 @@ main (int argc, char *argv[])
 }
 EOF
 
-tmpfiles="$tmpfiles xg-test24.po"
+tmpfiles="$tmpfiles xg-pr-1.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header -n xg-test24.in.properties \
-  xg-test24.c xg-test24.cc -d xg-test24
+${XGETTEXT} --omit-header -n xg-pr-1.in.properties \
+  xg-pr-1.c xg-pr-1.cc -d xg-pr-1
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles xg-test24.ok"
-cat <<EOF > xg-test24.ok
+tmpfiles="$tmpfiles xg-pr-1.ok"
+cat <<EOF > xg-pr-1.ok
 #: file1.c:199
 #, fuzzy
 msgid "extract me"
@@ -64,18 +64,18 @@ msgstr ""
 msgid "hello"
 msgstr "Again some text for fuzzy"
 
-#: xg-test24.c:6
+#: xg-pr-1.c:6
 #, c-format
 msgid "Hello, world."
 msgstr ""
 
-#: xg-test24.cc:7
+#: xg-pr-1.cc:7
 msgid "Hello world!"
 msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test24.ok xg-test24.po
+${DIFF} xg-pr-1.ok xg-pr-1.po
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-python-1 b/gettext-tools/tests/xgettext-python-1
index 093df1e..817cc99 100755
--- a/gettext-tools/tests/xgettext-python-1
+++ b/gettext-tools/tests/xgettext-python-1
@@ -5,8 +5,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles xg-test18.py"
-cat <<\EOF > xg-test18.py
+tmpfiles="$tmpfiles xg-py-1.py"
+cat <<\EOF > xg-py-1.py
 # interpret_ansic = true, interpret_unicode = false
 _("abc\
 \\def\'ghi\"jkl\a\b\f\n\r\t\v x\040x\x7ey\u0142\U00010123\N{LATIN SMALL LETTER Z}");
@@ -24,14 +24,14 @@ _(ur"abc\
 \\def\'ghi\"jkl\a\b\f\n\r\t\v x\040x\x7ey\u0142\U00010123\N{LATIN SMALL LETTER Z}");
 EOF
 
-tmpfiles="$tmpfiles xg-test18.err xg-test18.tmp xg-test18.pot"
+tmpfiles="$tmpfiles xg-py-1.err xg-py-1.tmp xg-py-1.pot"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --add-comments --no-location -o xg-test18.tmp xg-test18.py 2>xg-test18.err
-test $? = 0 || { cat xg-test18.err; rm -fr $tmpfiles; exit 1; }
-grep -v 'POT-Creation-Date' < xg-test18.tmp > xg-test18.pot
+${XGETTEXT} --add-comments --no-location -o xg-py-1.tmp xg-py-1.py 2>xg-py-1.err
+test $? = 0 || { cat xg-py-1.err; rm -fr $tmpfiles; exit 1; }
+grep -v 'POT-Creation-Date' < xg-py-1.tmp > xg-py-1.pot
 
-tmpfiles="$tmpfiles xg-test18.ok"
-cat <<\EOF > xg-test18.ok
+tmpfiles="$tmpfiles xg-py-1.ok"
+cat <<\EOF > xg-py-1.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -77,7 +77,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test18.ok xg-test18.pot
+${DIFF} xg-py-1.ok xg-py-1.pot
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-sh-1 b/gettext-tools/tests/xgettext-sh-1
index 6075c75..f0ef250 100755
--- a/gettext-tools/tests/xgettext-sh-1
+++ b/gettext-tools/tests/xgettext-sh-1
@@ -5,8 +5,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles xg-test30.sh"
-cat <<\EOF > xg-test30.sh
+tmpfiles="$tmpfiles xg-sh-1.sh"
+cat <<\EOF > xg-sh-1.sh
 # Test backslash before normal alphabetic character.
 
 gettext  depth_0_none_0_x
@@ -464,13 +464,13 @@ echo "`echo "\`ngettext 'depth_2_11_squote_7_semi \\\\\\\;'\`"`"
 echo "`echo "\`ngettext 'depth_2_11_squote_8_semi \\\\\\\\;'\`"`"
 EOF
 
-tmpfiles="$tmpfiles xg-test30.po"
+tmpfiles="$tmpfiles xg-sh-1.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location xg-test30.sh -d xg-test30
+${XGETTEXT} --omit-header --no-location xg-sh-1.sh -d xg-sh-1
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles xg-test30.ok"
-cat <<\EOF > xg-test30.ok
+tmpfiles="$tmpfiles xg-sh-1.ok"
+cat <<\EOF > xg-sh-1.ok
 msgid "depth_0_none_0_x"
 msgstr ""
 
@@ -1803,7 +1803,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test30.ok xg-test30.po
+${DIFF} xg-sh-1.ok xg-sh-1.po
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-stringtable-1 b/gettext-tools/tests/xgettext-stringtable-1
index a4f17f9..85340ff 100755
--- a/gettext-tools/tests/xgettext-stringtable-1
+++ b/gettext-tools/tests/xgettext-stringtable-1
@@ -5,8 +5,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles xg-test33.strings"
-cat <<\EOF > xg-test33.strings
+tmpfiles="$tmpfiles xg-st-1.strings"
+cat <<\EOF > xg-st-1.strings
 /***
 German.lproj/Localizable.strings
 updated by make_strings 2003-10-12 15:31:50 +0200
@@ -23,14 +23,14 @@ add comments above this one
 = "Dieses Programm l�uft mit der Prozess-Nummer %d.";
 EOF
 
-tmpfiles="$tmpfiles xg-test33.tmp xg-test33.po"
+tmpfiles="$tmpfiles xg-st-1.tmp xg-st-1.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} xg-test33.strings -o xg-test33.tmp
+${XGETTEXT} xg-st-1.strings -o xg-st-1.tmp
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-grep -v 'POT-Creation-Date' < xg-test33.tmp > xg-test33.po
+grep -v 'POT-Creation-Date' < xg-st-1.tmp > xg-st-1.po
 
-tmpfiles="$tmpfiles xg-test33.ok"
-cat <<\EOF > xg-test33.ok
+tmpfiles="$tmpfiles xg-st-1.ok"
+cat <<\EOF > xg-st-1.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -64,7 +64,7 @@ msgstr "Dieses Programm läuft mit der Prozess-Nummer %d."
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test33.ok xg-test33.po
+${DIFF} xg-st-1.ok xg-st-1.po
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-tcl-1 b/gettext-tools/tests/xgettext-tcl-1
index 15ed4af..5424cb6 100755
--- a/gettext-tools/tests/xgettext-tcl-1
+++ b/gettext-tools/tests/xgettext-tcl-1
@@ -5,8 +5,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles xg-test21.tcl"
-cat <<\EOF > xg-test21.tcl
+tmpfiles="$tmpfiles xg-t-1.tcl"
+cat <<\EOF > xg-t-1.tcl
 #!/usr/bin/tclsh
 
 proc isValid {target} {
@@ -24,14 +24,14 @@ proc isValid {target} {
 }
 EOF
 
-tmpfiles="$tmpfiles xg-test21.err xg-test21.tmp xg-test21.pot"
+tmpfiles="$tmpfiles xg-t-1.err xg-t-1.tmp xg-t-1.pot"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --add-comments --no-location -k_ -o xg-test21.tmp xg-test21.tcl 2>xg-test21.err
-test $? = 0 || { cat xg-test21.err; rm -fr $tmpfiles; exit 1; }
-grep -v 'POT-Creation-Date' < xg-test21.tmp > xg-test21.pot
+${XGETTEXT} --add-comments --no-location -k_ -o xg-t-1.tmp xg-t-1.tcl 2>xg-t-1.err
+test $? = 0 || { cat xg-t-1.err; rm -fr $tmpfiles; exit 1; }
+grep -v 'POT-Creation-Date' < xg-t-1.tmp > xg-t-1.pot
 
-tmpfiles="$tmpfiles xg-test21.ok"
-cat <<\EOF > xg-test21.ok
+tmpfiles="$tmpfiles xg-t-1.ok"
+cat <<\EOF > xg-t-1.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -61,7 +61,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test21.ok xg-test21.pot
+${DIFF} xg-t-1.ok xg-t-1.pot
 result=$?
 
 rm -fr $tmpfiles
diff --git a/gettext-tools/tests/xgettext-ycp-1 b/gettext-tools/tests/xgettext-ycp-1
index a0498b5..0ad3e22 100755
--- a/gettext-tools/tests/xgettext-ycp-1
+++ b/gettext-tools/tests/xgettext-ycp-1
@@ -6,18 +6,18 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles xg-test17.ycp"
-cat <<EOF > xg-test17.ycp
+tmpfiles="$tmpfiles xg-y-1.ycp"
+cat <<EOF > xg-y-1.ycp
 title = sformat (_("%1 package", "%1 packages", num), num);
 EOF
 
-tmpfiles="$tmpfiles xg-test17.po"
+tmpfiles="$tmpfiles xg-y-1.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -k:1,2 -d xg-test17 xg-test17.ycp
+${XGETTEXT} --omit-header --no-location -k:1,2 -d xg-y-1 xg-y-1.ycp
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="$tmpfiles xg-test17.ok"
-cat <<EOF > xg-test17.ok
+tmpfiles="$tmpfiles xg-y-1.ok"
+cat <<EOF > xg-y-1.ok
 #, ycp-format
 msgid "%1 package"
 msgid_plural "%1 packages"
@@ -26,7 +26,7 @@ msgstr[1] ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-test17.ok xg-test17.po
+${DIFF} xg-y-1.ok xg-y-1.po
 result=$?
 
 rm -fr $tmpfiles