+2007-05-14 Bruno Haible <bruno@clisp.org>
+
+ Avoid test suite failures on mingw.
+ * gettext-1: Convert CR/LF to LF before applying DIFF.
+ * msgattrib-1: Likewise.
+ * msgattrib-2: Likewise.
+ * msgattrib-3: Likewise.
+ * msgattrib-4: Likewise.
+ * msgattrib-5: Likewise.
+ * msgattrib-6: Likewise.
+ * msgattrib-7: Likewise.
+ * msgattrib-8: Likewise.
+ * msgattrib-9: Likewise.
+ * msgattrib-10: Likewise.
+ * msgattrib-11: Likewise.
+ * msgattrib-12: Likewise.
+ * msgattrib-13: Likewise.
+ * msgattrib-14: Likewise.
+ * msgattrib-15: Likewise.
+ * msgattrib-16: Likewise.
+ * msgattrib-17: Likewise.
+ * msgattrib-properties-1: Likewise.
+ * msgcat-1: Likewise.
+ * msgcat-2: Likewise.
+ * msgcat-3: Likewise.
+ * msgcat-4: Likewise.
+ * msgcat-5: Likewise.
+ * msgcat-6: Likewise.
+ * msgcat-7: Likewise.
+ * msgcat-8: Likewise.
+ * msgcat-9: Likewise.
+ * msgcat-10: Likewise.
+ * msgcat-11: Likewise.
+ * msgcat-13: Likewise.
+ * msgcat-15: Likewise.
+ * msgcat-16: Likewise.
+ * msgcat-properties-1: Likewise.
+ * msgcat-stringtable-1: Likewise.
+ * msgcmp-2: Likewise.
+ * msgcmp-3: Likewise.
+ * msgcomm-1: Likewise.
+ * msgcomm-2: Likewise.
+ * msgcomm-3: Likewise.
+ * msgcomm-4: Likewise.
+ * msgcomm-5: Likewise.
+ * msgcomm-6: Likewise.
+ * msgcomm-7: Likewise.
+ * msgcomm-8: Likewise.
+ * msgcomm-9: Likewise.
+ * msgcomm-10: Likewise.
+ * msgcomm-11: Likewise.
+ * msgcomm-12: Likewise.
+ * msgcomm-13: Likewise.
+ * msgcomm-14: Likewise.
+ * msgcomm-16: Likewise.
+ * msgcomm-17: Likewise.
+ * msgcomm-18: Likewise.
+ * msgcomm-19: Likewise.
+ * msgcomm-20: Likewise.
+ * msgcomm-21: Likewise.
+ * msgcomm-22: Likewise.
+ * msgcomm-23: Likewise.
+ * msgcomm-24: Likewise.
+ * msgcomm-25: Likewise.
+ * msgcomm-26: Likewise.
+ * msgconv-5: Likewise.
+ * msgconv-6: Likewise.
+ * msgen-1: Likewise.
+ * msgen-2: Likewise.
+ * msgen-3: Likewise.
+ * msgfilter-sr-latin-1: Likewise.
+ * msgfmt-1: Likewise.
+ * msgfmt-5: Likewise.
+ * msgfmt-7: Likewise.
+ * msgfmt-8: Likewise.
+ * msgfmt-9: Likewise.
+ * msgfmt-10: Likewise.
+ * msgfmt-12: Likewise.
+ * msgfmt-14: Likewise.
+ * msgfmt-16: Likewise.
+ * msgfmt-properties-1: Likewise.
+ * msggrep-1: Likewise.
+ * msggrep-2: Likewise.
+ * msggrep-3: Likewise.
+ * msggrep-4: Likewise.
+ * msggrep-5: Likewise.
+ * msggrep-6: Likewise.
+ * msggrep-7: Likewise.
+ * msggrep-8: Likewise.
+ * msgmerge-1: Likewise.
+ * msgmerge-3: Likewise.
+ * msgmerge-4: Likewise.
+ * msgmerge-5: Likewise.
+ * msgmerge-6: Likewise.
+ * msgmerge-7: Likewise.
+ * msgmerge-8: Likewise.
+ * msgmerge-10: Likewise.
+ * msgmerge-11: Likewise.
+ * msgmerge-12: Likewise.
+ * msgmerge-13: Likewise.
+ * msgmerge-14: Likewise.
+ * msgmerge-15: Likewise.
+ * msgmerge-16: Likewise.
+ * msgmerge-17: Likewise.
+ * msgmerge-18: Likewise.
+ * msgmerge-19: Likewise.
+ * msgmerge-20: Likewise.
+ * msgmerge-compendium-1: Likewise.
+ * msgmerge-compendium-2: Likewise.
+ * msgmerge-compendium-3: Likewise.
+ * msgmerge-compendium-4: Likewise.
+ * msgmerge-compendium-5: Likewise.
+ * msgmerge-compendium-6: Likewise.
+ * msgmerge-properties-1: Likewise.
+ * msgmerge-properties-2: Likewise.
+ * msgmerge-update-2: Likewise.
+ * msgunfmt-1: Likewise.
+ * msgunfmt-2: Likewise.
+ * msgunfmt-properties-1: Likewise.
+ * msguniq-1: Likewise.
+ * msguniq-2: Likewise.
+ * msguniq-3: Likewise.
+ * msguniq-5: Likewise.
+ * msguniq-6: Likewise.
+ * xgettext-2: Likewise.
+ * xgettext-6: Likewise.
+ * xgettext-7: Likewise.
+ * xgettext-9: Likewise.
+ * xgettext-awk-1: Likewise.
+ * xgettext-c-1: Likewise.
+ * xgettext-c-2: Likewise.
+ * xgettext-c-3: Likewise.
+ * xgettext-c-4: Likewise.
+ * xgettext-c-5: Likewise.
+ * xgettext-c-6: Likewise.
+ * xgettext-c-7: Likewise.
+ * xgettext-c-8: Likewise.
+ * xgettext-c-9: Likewise.
+ * xgettext-c-10: Likewise.
+ * xgettext-c-11: Likewise.
+ * xgettext-c-12: Likewise.
+ * xgettext-c-13: Likewise.
+ * xgettext-c-14: Likewise.
+ * xgettext-c-15: Likewise.
+ * xgettext-csharp-1: Likewise.
+ * xgettext-csharp-4: Likewise.
+ * xgettext-csharp-5: Likewise.
+ * xgettext-elisp-1: Likewise.
+ * xgettext-java-1: Likewise.
+ * xgettext-java-3: Likewise.
+ * xgettext-java-4: Likewise.
+ * xgettext-java-5: Likewise.
+ * xgettext-librep-1: Likewise.
+ * xgettext-lisp-1: Likewise.
+ * xgettext-objc-1: Likewise.
+ * xgettext-objc-2: Likewise.
+ * xgettext-perl-1: Likewise.
+ * xgettext-perl-4: Likewise.
+ * xgettext-perl-5: Likewise.
+ * xgettext-perl-6: Likewise.
+ * xgettext-php-1: Likewise.
+ * xgettext-php-2: Likewise.
+ * xgettext-po-1: Likewise.
+ * xgettext-properties-1: Likewise.
+ * xgettext-python-2: Likewise.
+ * xgettext-scheme-1: Likewise.
+ * xgettext-sh-1: Likewise.
+ * xgettext-sh-2: Likewise.
+ * xgettext-sh-3: Likewise.
+ * xgettext-sh-4: Likewise.
+ * xgettext-sh-5: Likewise.
+ * xgettext-smalltalk-1: Likewise.
+ * xgettext-tcl-2: Likewise.
+ * xgettext-ycp-1: Likewise.
+ * xgettext-ycp-2: Likewise.
+ * xgettext-ycp-3: Likewise.
+ * format-c-3: Likewise.
+ * format-c-4: Likewise.
+ * format-c-5: Likewise.
+ * plural-1: Likewise.
+ * lang-c: Likewise.
+ * lang-c++: Likewise.
+ * lang-objc: Likewise.
+ * lang-sh: Likewise.
+ * lang-bash: Likewise.
+ * lang-python-1: Likewise.
+ * lang-python-2: Likewise.
+ * lang-clisp: Likewise.
+ * lang-elisp: Likewise.
+ * lang-librep: Likewise.
+ * lang-guile: Likewise.
+ * lang-smalltalk: Likewise.
+ * lang-java: Likewise.
+ * lang-csharp: Likewise.
+ * lang-gawk: Likewise.
+ * lang-pascal: Likewise.
+ * lang-ycp: Likewise.
+ * lang-tcl: Likewise.
+ * lang-perl-1: Likewise.
+ * lang-perl-2: Likewise.
+ * lang-php: Likewise.
+ * lang-po: Likewise.
+ * lang-rst: Likewise.
+
2007-04-30 Bruno Haible <bruno@clisp.org>
* lang-php: Remove 'echo' of printf result.
tmpfiles=""
trap 'rm -fr $tmpfiles' 1 2 3 15
-tmpfiles="$tmpfiles fc3.pot"
+tmpfiles="$tmpfiles fc3.tmp fc3.pot"
: ${XGETTEXT=xgettext}
-${XGETTEXT} -o fc3.pot --omit-header --no-location ${top_srcdir}/tests/format-c-3-prg.c
+${XGETTEXT} -o fc3.tmp --omit-header --no-location ${top_srcdir}/tests/format-c-3-prg.c
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < fc3.tmp > fc3.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles fc3.ok"
cat <<EOF > fc3.ok
: ${MSGFMT=msgfmt}
${MSGFMT} -o de/LC_MESSAGES/fc3.mo de.po
-tmpfiles="$tmpfiles de.po.tmp"
+tmpfiles="$tmpfiles de.po.tmp de.po.un"
: ${MSGUNFMT=msgunfmt}
${MSGUNFMT} -o de.po.tmp de/LC_MESSAGES/fc3.mo
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < de.po.tmp > de.po.un
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
-${DIFF} de.po de.po.tmp || exit 1
+${DIFF} de.po de.po.un || exit 1
LANGUAGE= ./fc3 de_DE
result=$?
tmpfiles=""
trap 'rm -fr $tmpfiles' 1 2 3 15
-tmpfiles="$tmpfiles fc4.pot"
+tmpfiles="$tmpfiles fc4.tmp fc4.pot"
: ${XGETTEXT=xgettext}
-${XGETTEXT} -o fc4.pot --omit-header --no-location ${top_srcdir}/tests/format-c-4-prg.c
+${XGETTEXT} -o fc4.tmp --omit-header --no-location ${top_srcdir}/tests/format-c-4-prg.c
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < fc4.tmp > fc4.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles fc4.ok"
cat <<EOF > fc4.ok
: ${MSGFMT=msgfmt}
${MSGFMT} -o de/LC_MESSAGES/fc4.mo de.po
-tmpfiles="$tmpfiles de.po.tmp"
+tmpfiles="$tmpfiles de.po.tmp de.po.un"
: ${MSGUNFMT=msgunfmt}
${MSGUNFMT} -o de.po.tmp de/LC_MESSAGES/fc4.mo
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < de.po.tmp > de.po.un
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
-${DIFF} de.po de.po.tmp || exit 1
+${DIFF} de.po de.po.un || exit 1
LANGUAGE= ./fc4 de_DE
result=$?
tmpfiles=""
trap 'rm -fr $tmpfiles' 1 2 3 15
-tmpfiles="$tmpfiles fc5.pot"
+tmpfiles="$tmpfiles fc5.tmp fc5.pot"
: ${XGETTEXT=xgettext}
-${XGETTEXT} -o fc5.pot --omit-header --no-location ${top_srcdir}/tests/format-c-5-prg.c
+${XGETTEXT} -o fc5.tmp --omit-header --no-location ${top_srcdir}/tests/format-c-5-prg.c
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < fc5.tmp > fc5.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles fc5.ok"
cat <<EOF > fc5.ok
: ${MSGFMT=msgfmt}
${MSGFMT} -o fa/LC_MESSAGES/fc5.mo fa.po
-tmpfiles="$tmpfiles fa.po.tmp"
+tmpfiles="$tmpfiles fa.po.tmp fa.po.un"
: ${MSGUNFMT=msgunfmt}
${MSGUNFMT} -o fa.po.tmp fa/LC_MESSAGES/fc5.mo
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < fa.po.tmp > fa.po.un
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
-${DIFF} fa.po fa.po.tmp || exit 1
+${DIFF} fa.po fa.po.un || exit 1
LANGUAGE= ./fc5 fa_IR
case $? in
tmpfiles="$tmpfiles gt-test1.out"
: ${GETTEXT=gettext}
TEXTDOMAINDIR=.. LANGUAGE=tests \
-${GETTEXT} --env LC_ALL=en -e test 'SYS_(C)\n' > gt-test1.out
+${GETTEXT} --env LC_ALL=en -e test 'SYS_(C)\n' | tr -d '\r' > gt-test1.out
# Create correct file.
tmpfile="$tmpfiles gtmf-test1.ok"
$echo "`eval_ngettext "a piece of cake" "\\$n pieces of cake" $n`"
EOF
-tmpfiles="$tmpfiles prog.pot prog.err"
+tmpfiles="$tmpfiles prog.tmp prog.pot prog.err"
: ${XGETTEXT=xgettext}
LC_MESSAGES=C LC_ALL= \
-${XGETTEXT} -o prog.pot --omit-header --no-location prog.sh \
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.sh \
>prog.err 2>&1
result=$?
cat prog.err | grep -v 'warning: the syntax \$"\.\.\." is deprecated due to security reasons'
test $result = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles prog.ok"
cat <<\EOF > prog.ok
msgstr[1] "$n morceaux de gateau"
EOF
-tmpfiles="$tmpfiles fr.po.new"
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.new fr.po prog.pot
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
${DIFF} fr.po fr.po.new || exit 1
${LIBTOOL} --quiet --mode=link ${CC} -I.. -I$top_srcdir/gnulib-lib ../gnulib-lib/libgettextlib.la -I../intl ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o prog prog.c ${LTLIBINTL} \
|| exit 1
-tmpfiles="$tmpfiles prog.pot"
+tmpfiles="$tmpfiles prog.tmp prog.pot"
: ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.pot --omit-header --no-location -k_ prog.c
+${XGETTEXT} -o prog.tmp --omit-header --no-location -k_ prog.c
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles prog.ok"
cat <<EOF > prog.ok
msgstr "%2$s remplace %1$s."
EOF
-tmpfiles="$tmpfiles fr.po.new"
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.new fr.po prog.pot
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
${DIFF} fr.po fr.po.new || exit 1
${LIBTOOL} --quiet --mode=link ${CXX} ${CXXFLAGS} ${LDFLAGS} -o prog prog.${OBJEXT} ../../gettext-runtime/libasprintf/libasprintf.la ../gnulib-lib/libgettextlib.la ${LTLIBINTL} \
|| exit 1
-tmpfiles="$tmpfiles prog.pot"
+tmpfiles="$tmpfiles prog.tmp prog.pot"
: ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.pot --omit-header --no-location -k_ prog.cc
+${XGETTEXT} -o prog.tmp --omit-header --no-location -k_ prog.cc
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles prog.ok"
cat <<EOF > prog.ok
msgstr "%2$s remplace %1$s."
EOF
-tmpfiles="$tmpfiles fr.po.new"
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.new fr.po prog.pot
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
${DIFF} fr.po fr.po.new || exit 1
(format t "~A~%" (format nil (gettext "~A is replaced by ~A.") "FF" "EUR"))
EOF
-tmpfiles="$tmpfiles prog.pot"
+tmpfiles="$tmpfiles prog.tmp prog.pot"
: ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.pot --omit-header --no-location prog.lisp
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.lisp
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles prog.ok"
cat <<EOF > prog.ok
msgstr "~1@*~A remplace ~0@*~A."
EOF
-tmpfiles="$tmpfiles fr.po.new"
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.new fr.po prog.pot
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
${DIFF} fr.po fr.po.new || exit 1
: ${CSHARPCOMP="/bin/sh ../csharpcomp.sh"}
${CSHARPCOMP} -o program.exe -L ../../gettext-runtime/intl-csharp -l GNU.Gettext program.cs || exit 1
-tmpfiles="$tmpfiles prog.pot"
+tmpfiles="$tmpfiles prog.tmp prog.pot"
: ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.pot --omit-header --no-location program.cs
+${XGETTEXT} -o prog.tmp --omit-header --no-location program.cs
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles prog.ok"
cat <<EOF > prog.ok
msgstr "{1} remplace {0}."
EOF
-tmpfiles="$tmpfiles fr.po.new"
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.new fr.po prog.pot
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
${DIFF} fr.po fr.po.new || exit 1
(format nil (_ "%s is replaced by %s.") "FF" "EUR"))
EOF
-tmpfiles="$tmpfiles prog.pot"
+tmpfiles="$tmpfiles prog.tmp prog.pot"
: ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.pot --omit-header --no-location prog.el
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.el
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles prog.ok"
cat <<EOF > prog.ok
msgstr "%2$s remplace %1$s."
EOF
-tmpfiles="$tmpfiles fr.po.new"
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.new fr.po prog.pot
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
${DIFF} fr.po fr.po.new || exit 1
}
EOF
-tmpfiles="$tmpfiles prog.pot"
+tmpfiles="$tmpfiles prog.tmp prog.pot"
: ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.pot --omit-header --no-location prog.awk
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.awk
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles prog.ok"
cat <<EOF > prog.ok
msgstr "%2$s remplace %1$s."
EOF
-tmpfiles="$tmpfiles fr.po.new"
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.new fr.po prog.pot
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
${DIFF} fr.po fr.po.new || exit 1
(format #t "~A~%" (format #f (gettext "~A is replaced by ~A.") "FF" "EUR"))
EOF
-tmpfiles="$tmpfiles prog.pot"
+tmpfiles="$tmpfiles prog.tmp prog.pot"
: ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.pot --omit-header --no-location prog.scm
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.scm
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles prog.ok"
cat <<EOF > prog.ok
msgstr "~1@*~A remplace ~0@*~A."
EOF
-tmpfiles="$tmpfiles fr.po.new"
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.new fr.po prog.pot
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
${DIFF} fr.po fr.po.new || exit 1
CLASSPATH=../../gettext-runtime/intl-java/libintl.jar ${JAVACOMP} -d . Program.java 2>prog.err \
|| { cat prog.err 1>&2; exit 1; }
-tmpfiles="$tmpfiles prog.pot"
+tmpfiles="$tmpfiles prog.tmp prog.pot"
: ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.pot --omit-header --no-location Program.java
+${XGETTEXT} -o prog.tmp --omit-header --no-location Program.java
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles prog.ok"
cat <<EOF > prog.ok
msgstr "{1} remplace {0}."
EOF
-tmpfiles="$tmpfiles fr.po.new"
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.new fr.po prog.pot
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
${DIFF} fr.po fr.po.new || exit 1
(format nil (_ "%s is replaced by %s.") "FF" "EUR"))
EOF
-tmpfiles="$tmpfiles prog.pot"
+tmpfiles="$tmpfiles prog.tmp prog.pot"
: ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.pot --omit-header --no-location prog.jl
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.jl
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles prog.ok"
cat <<EOF > prog.ok
msgstr "%2$s remplace %1$s."
EOF
-tmpfiles="$tmpfiles fr.po.new"
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.new fr.po prog.pot
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
${DIFF} fr.po fr.po.new || exit 1
${LIBTOOL} --quiet --mode=link ${CC} -I.. -I$top_srcdir/gnulib-lib ../gnulib-lib/libgettextlib.la -I../intl ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o prog prog.m ${LTLIBINTL} \
|| exit 1
-tmpfiles="$tmpfiles prog.pot"
+tmpfiles="$tmpfiles prog.tmp prog.pot"
: ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.pot --omit-header --no-location -k_ prog.m
+${XGETTEXT} -o prog.tmp --omit-header --no-location -k_ prog.m
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles prog.ok"
cat <<EOF > prog.ok
msgstr "%2$s remplace %1$s."
EOF
-tmpfiles="$tmpfiles fr.po.new"
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.new fr.po prog.pot
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
${DIFF} fr.po fr.po.new || exit 1
rm -fr $tmpfiles; exit 77
}
-tmpfiles="$tmpfiles prog.pot"
+tmpfiles="$tmpfiles prog.tmp prog.pot"
: ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.pot --omit-header --add-location prog.rst
+${XGETTEXT} -o prog.tmp --omit-header --add-location prog.rst
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles prog.ok"
cat <<EOF > prog.ok
msgstr "%1:s remplace %0:s."
EOF
-tmpfiles="$tmpfiles fr.po.new"
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.new fr.po prog.pot
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
${DIFF} fr.po fr.po.new || exit 1
print "\n";
EOF
-tmpfiles="$tmpfiles prog.pot"
+tmpfiles="$tmpfiles prog.tmp prog.pot"
: ${XGETTEXT=xgettext}
${XGETTEXT} \
-k__ --flag=__:1:pass-perl-format --flag=__:1:pass-perl-brace-format \
- -o prog.pot --omit-header --no-location program.pl
+ -o prog.tmp --omit-header --no-location program.pl
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles prog.ok"
cat <<EOF > prog.ok
msgstr "%2$s remplace %1$s."
EOF
-tmpfiles="$tmpfiles fr.po.new"
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.new fr.po prog.pot
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
${DIFF} fr.po fr.po.new || exit 1
print "\n";
EOF
-tmpfiles="$tmpfiles prog.pot"
+tmpfiles="$tmpfiles prog.tmp prog.pot"
: ${XGETTEXT=xgettext}
${XGETTEXT} \
-k__ --flag=__:1:pass-perl-format --flag=__:1:pass-perl-brace-format \
-k__n:1,2 --flag=__n:1:pass-perl-format --flag=__n:1:pass-perl-brace-format \
--flag=__n:2:pass-perl-format --flag=__n:2:pass-perl-brace-format \
-k__x --flag=__x:1:perl-brace-format \
- -o prog.pot --omit-header --no-location program.pl
+ -o prog.tmp --omit-header --no-location program.pl
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles prog.ok"
cat <<EOF > prog.ok
msgstr "{new} remplace {old}."
EOF
-tmpfiles="$tmpfiles fr.po.new"
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.new fr.po prog.pot
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
${DIFF} fr.po fr.po.new || exit 1
?>
EOF
-tmpfiles="$tmpfiles prog.pot"
+tmpfiles="$tmpfiles prog.tmp prog.pot"
: ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.pot --omit-header --no-location prog.php
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.php
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles prog.ok"
cat <<EOF > prog.ok
msgstr "%2$s remplace %1$s."
EOF
-tmpfiles="$tmpfiles fr.po.new"
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.new fr.po prog.pot
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
${DIFF} fr.po fr.po.new || exit 1
msgstr ""
EOF
-tmpfiles="$tmpfiles prog.pot"
+tmpfiles="$tmpfiles prog.tmp prog.pot"
: ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.pot --omit-header --add-location prog-in.pot
+${XGETTEXT} -o prog.tmp --omit-header --add-location prog-in.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
${DIFF} prog-in.pot prog.pot || exit 1
msgstr "%2$s remplace %1$s."
EOF
-tmpfiles="$tmpfiles prog.po"
+tmpfiles="$tmpfiles prog.tmp.po prog.po"
: ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.po --omit-header --add-location prog-in.po
+${XGETTEXT} -o prog.tmp.po --omit-header --add-location prog-in.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < prog.tmp.po > prog.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
${DIFF} prog-in.po prog.po || exit 1
% { 'oldCurrency': "FF", 'newCurrency' : "EUR" }
EOF
-tmpfiles="$tmpfiles prog.pot"
+tmpfiles="$tmpfiles prog.tmp prog.pot"
: ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.pot --omit-header --no-location prog.py
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.py
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles prog.ok"
cat <<EOF > prog.ok
msgstr "%(newCurrency)s remplace %(oldCurrency)s."
EOF
-tmpfiles="$tmpfiles fr.po.new"
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.new fr.po prog.pot
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
${DIFF} fr.po fr.po.new || exit 1
% { 'oldCurrency': "FF", 'newCurrency' : "EUR" }
EOF
-tmpfiles="$tmpfiles prog.pot"
+tmpfiles="$tmpfiles prog.tmp prog.pot"
: ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.pot --omit-header --no-location prog.py
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.py
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles prog.ok"
cat <<EOF > prog.ok
msgstr "%(newCurrency)s remplace %(oldCurrency)s."
EOF
-tmpfiles="$tmpfiles fr.po.new"
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.new fr.po prog.pot
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
${DIFF} fr.po fr.po.new || exit 1
rstconv.InvalidOutputFormat='Invalid output format -'
EOF
-tmpfiles="$tmpfiles prog.pot"
+tmpfiles="$tmpfiles prog.tmp prog.pot"
: ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.pot --omit-header --add-location prog.rst
+${XGETTEXT} -o prog.tmp --omit-header --add-location prog.rst
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles prog.ok"
cat <<EOF > prog.ok
$echo "`eval_ngettext \"a piece of cake\" \"\\$n pieces of cake\" $n`"
EOF
-tmpfiles="$tmpfiles prog.pot"
+tmpfiles="$tmpfiles prog.tmp prog.pot"
: ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.pot --omit-header --no-location prog.sh
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.sh
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles prog.ok"
cat <<\EOF > prog.ok
msgstr[1] "$n morceaux de gateau"
EOF
-tmpfiles="$tmpfiles fr.po.new"
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.new fr.po prog.pot
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
${DIFF} fr.po fr.po.new || exit 1
Main new run!
EOF
-tmpfiles="$tmpfiles prog.pot"
+tmpfiles="$tmpfiles prog.tmp prog.pot"
: ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.pot --omit-header --no-location prog.st
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.st
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles prog.ok"
cat <<EOF > prog.ok
msgstr "%2 remplace %1."
EOF
-tmpfiles="$tmpfiles fr.po.new"
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.new fr.po prog.pot
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
${DIFF} fr.po fr.po.new || exit 1
puts [format [::msgcat::mc "%s is replaced by %s."] "FF" "EUR"]
EOF
-tmpfiles="$tmpfiles prog.pot"
+tmpfiles="$tmpfiles prog.tmp prog.pot"
: ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.pot --omit-header -k_ program.tcl
+${XGETTEXT} -o prog.tmp --omit-header -k_ program.tcl
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles prog.ok"
cat <<EOF > prog.ok
msgstr "%2$s remplace %1$s."
EOF
-tmpfiles="$tmpfiles fr.po.new"
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.new fr.po prog.pot
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
${DIFF} fr.po fr.po.new || exit 1
}
EOF
-tmpfiles="$tmpfiles prog.pot"
+tmpfiles="$tmpfiles prog.tmp prog.pot"
: ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.pot --omit-header --no-location prog.ycp
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.ycp
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < prog.tmp > prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles prog.ok"
cat <<EOF > prog.ok
msgstr "%2 remplace %1."
EOF
-tmpfiles="$tmpfiles fr.po.new"
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.new fr.po prog.pot
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
${DIFF} fr.po fr.po.new || exit 1
#~ msgstr "das einen verheirateten Mann liebt"
EOF
-tmpfiles="$tmpfiles ma-test1.out"
+tmpfiles="$tmpfiles ma-test1.tmp ma-test1.out"
: ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --translated -o ma-test1.out ma-test1.po
+${MSGATTRIB} --translated -o ma-test1.tmp ma-test1.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < ma-test1.tmp > ma-test1.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles ma-test1.ok"
#~ msgstr "das einen verheirateten Mann liebt"
EOF
-tmpfiles="$tmpfiles ma-test10.out"
+tmpfiles="$tmpfiles ma-test10.tmp ma-test10.out"
: ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --set-obsolete -o ma-test10.out ma-test10.po
+${MSGATTRIB} --set-obsolete -o ma-test10.tmp ma-test10.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < ma-test10.tmp > ma-test10.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles ma-test10.ok"
#~ msgstr "das einen verheirateten Mann liebt"
EOF
-tmpfiles="$tmpfiles ma-test11.out"
+tmpfiles="$tmpfiles ma-test11.tmp ma-test11.out"
: ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --clear-obsolete -o ma-test11.out ma-test11.po
+${MSGATTRIB} --clear-obsolete -o ma-test11.tmp ma-test11.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < ma-test11.tmp > ma-test11.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles ma-test11.ok"
#~ msgstr "das einen verheirateten Mann liebt"
EOF
-tmpfiles="$tmpfiles ma-test12.out"
+tmpfiles="$tmpfiles ma-test12.tmp ma-test12.out"
: ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --fuzzy -o ma-test12.out ma-test12.po
+${MSGATTRIB} --fuzzy -o ma-test12.tmp ma-test12.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < ma-test12.tmp > ma-test12.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles ma-test12.ok"
#~ msgstr "das einen verheirateten Mann liebt"
EOF
-tmpfiles="$tmpfiles ma-test13.out"
+tmpfiles="$tmpfiles ma-test13.tmp ma-test13.out"
: ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --obsolete -o ma-test13.out ma-test13.po
+${MSGATTRIB} --obsolete -o ma-test13.tmp ma-test13.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < ma-test13.tmp > ma-test13.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles ma-test13.ok"
#~ msgstr "das einen verheirateten Mann liebt"
EOF
-tmpfiles="$tmpfiles ma-test14.out"
+tmpfiles="$tmpfiles ma-test14.tmp ma-test14.out"
: ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --obsolete --no-fuzzy -o ma-test14.out ma-test14.po
+${MSGATTRIB} --obsolete --no-fuzzy -o ma-test14.tmp ma-test14.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < ma-test14.tmp > ma-test14.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles ma-test14.ok"
#~ msgstr "Enregistrer sous"
EOF
-tmpfiles="$tmpfiles ma-test15.out"
+tmpfiles="$tmpfiles ma-test15.tmp ma-test15.out"
: ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --clear-fuzzy -o ma-test15.out ma-test15.po
+${MSGATTRIB} --clear-fuzzy -o ma-test15.tmp ma-test15.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < ma-test15.tmp > ma-test15.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
#~ msgstr "%s: ungültige Option -- %c\n"
EOF
-tmpfiles="$tmpfiles ma-test16.out"
+tmpfiles="$tmpfiles ma-test16.tmp ma-test16.out"
: ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --fuzzy -o ma-test16.out ma-test16.po
+${MSGATTRIB} --fuzzy -o ma-test16.tmp ma-test16.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < ma-test16.tmp > ma-test16.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles ma-test16.ok"
#~ msgstr "%s: ungültige Option -- %c\n"
EOF
-tmpfiles="$tmpfiles ma-test17.out"
+tmpfiles="$tmpfiles ma-test17.tmp ma-test17.out"
: ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --clear-previous -o ma-test17.out ma-test17.po
+${MSGATTRIB} --clear-previous -o ma-test17.tmp ma-test17.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < ma-test17.tmp > ma-test17.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles ma-test17.ok"
#~ msgstr "das einen verheirateten Mann liebt"
EOF
-tmpfiles="$tmpfiles ma-test2.out"
+tmpfiles="$tmpfiles ma-test2.tmp ma-test2.out"
: ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --untranslated -o ma-test2.out ma-test2.po
+${MSGATTRIB} --untranslated -o ma-test2.tmp ma-test2.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < ma-test2.tmp > ma-test2.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles ma-test2.ok"
#~ msgstr "das einen verheirateten Mann liebt"
EOF
-tmpfiles="$tmpfiles ma-test3.out"
+tmpfiles="$tmpfiles ma-test3.tmp ma-test3.out"
: ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --no-fuzzy -o ma-test3.out ma-test3.po
+${MSGATTRIB} --no-fuzzy -o ma-test3.tmp ma-test3.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < ma-test3.tmp > ma-test3.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles ma-test3.ok"
#~ msgstr "das einen verheirateten Mann liebt"
EOF
-tmpfiles="$tmpfiles ma-test4.out"
+tmpfiles="$tmpfiles ma-test4.tmp ma-test4.out"
: ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --only-fuzzy -o ma-test4.out ma-test4.po
+${MSGATTRIB} --only-fuzzy -o ma-test4.tmp ma-test4.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < ma-test4.tmp > ma-test4.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles ma-test4.ok"
#~ msgstr "das einen verheirateten Mann liebt"
EOF
-tmpfiles="$tmpfiles ma-test5.out"
+tmpfiles="$tmpfiles ma-test5.tmp ma-test5.out"
: ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --no-obsolete -o ma-test5.out ma-test5.po
+${MSGATTRIB} --no-obsolete -o ma-test5.tmp ma-test5.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < ma-test5.tmp > ma-test5.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles ma-test5.ok"
#~ msgstr "das einen verheirateten Mann liebt"
EOF
-tmpfiles="$tmpfiles ma-test6.out"
+tmpfiles="$tmpfiles ma-test6.tmp ma-test6.out"
: ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --only-obsolete -o ma-test6.out ma-test6.po
+${MSGATTRIB} --only-obsolete -o ma-test6.tmp ma-test6.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < ma-test6.tmp > ma-test6.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles ma-test6.ok"
#~ msgstr "das einen verheirateten Mann liebt"
EOF
-tmpfiles="$tmpfiles ma-test7.out"
+tmpfiles="$tmpfiles ma-test7.tmp ma-test7.out"
: ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --translated --only-obsolete -o ma-test7.out ma-test7.po
+${MSGATTRIB} --translated --only-obsolete -o ma-test7.tmp ma-test7.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < ma-test7.tmp > ma-test7.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles ma-test7.ok"
#~ msgstr "das einen verheirateten Mann liebt"
EOF
-tmpfiles="$tmpfiles ma-test8.out"
+tmpfiles="$tmpfiles ma-test8.tmp ma-test8.out"
: ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --set-fuzzy -o ma-test8.out ma-test8.po
+${MSGATTRIB} --set-fuzzy -o ma-test8.tmp ma-test8.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < ma-test8.tmp > ma-test8.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles ma-test8.ok"
#~ msgstr "das einen verheirateten Mann liebt"
EOF
-tmpfiles="$tmpfiles ma-test9.out"
+tmpfiles="$tmpfiles ma-test9.tmp ma-test9.out"
: ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --clear-fuzzy -o ma-test9.out ma-test9.po
+${MSGATTRIB} --clear-fuzzy -o ma-test9.tmp ma-test9.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < ma-test9.tmp > ma-test9.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles ma-test9.ok"
!They\ warn\ you\ and\ darn\ you=
EOF
-tmpfiles="$tmpfiles ma-s-1.out"
+tmpfiles="$tmpfiles ma-s-1.tmp ma-s-1.out"
: ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --translated --properties-input --properties-output -o ma-s-1.out ma-s-1.properties
+${MSGATTRIB} --translated --properties-input --properties-output -o ma-s-1.tmp ma-s-1.properties
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < ma-s-1.tmp > ma-s-1.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles ma-s-1.ok"
msgstr "eins"
EOF
-tmpfiles="$tmpfiles mcat-test1.out"
+tmpfiles="$tmpfiles mcat-test1.tmp mcat-test1.out"
: ${MSGCAT=msgcat}
-${MSGCAT} -o mcat-test1.out mcat-test1.in1 mcat-test1.in2
+${MSGCAT} -o mcat-test1.tmp mcat-test1.in1 mcat-test1.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcat-test1.tmp > mcat-test1.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcat-test1.ok"
"Glückwunsch!"
EOF
-tmpfiles="$tmpfiles mcat-test10.out"
-rm -f mcat-test10.out
+tmpfiles="$tmpfiles mcat-test10.tmp mcat-test10.out"
+rm -f mcat-test10.tmp
: ${MSGCAT=msgcat}
-${MSGCAT} --more-than=0 -o mcat-test10.out \
+${MSGCAT} --more-than=0 -o mcat-test10.tmp \
mcat-test10.in1 mcat-test10.in2
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcat-test10.tmp > mcat-test10.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcat-test10.ok"
cat <<\EOF > mcat-test10.ok
msgstr "immer"
EOF
-tmpfiles="$tmpfiles mcat-test11.out"
+tmpfiles="$tmpfiles mcat-test11.tmp mcat-test11.out"
: ${MSGCAT=msgcat}
-${MSGCAT} -o mcat-test11.out mcat-test11.in
+${MSGCAT} -o mcat-test11.tmp mcat-test11.in
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcat-test11.tmp > mcat-test11.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
#~ msgstr "Enregistrer l'as"
EOF
-tmpfiles="$tmpfiles mcat-test13.out"
-rm -f mcat-test13.out
+tmpfiles="$tmpfiles mcat-test13.tmp mcat-test13.out"
+rm -f mcat-test13.tmp
: ${MSGCAT=msgcat}
-${MSGCAT} -o mcat-test13.out mcat-test13.in1 mcat-test13.in2
+${MSGCAT} -o mcat-test13.tmp mcat-test13.in1 mcat-test13.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcat-test13.tmp > mcat-test13.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcat-test13.ok"
#~ msgstr "%s: ungültige Option -- %c\n"
EOF
-tmpfiles="$tmpfiles mcat-test15.out1"
-rm -f mcat-test15.out1
+tmpfiles="$tmpfiles mcat-test15.tmp1 mcat-test15.out1"
+rm -f mcat-test15.tmp1
: ${MSGCAT=msgcat}
-${MSGCAT} -o mcat-test15.out1 mcat-test15.in
+${MSGCAT} -o mcat-test15.tmp1 mcat-test15.in
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcat-test15.tmp1 > mcat-test15.out1
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
${DIFF} mcat-test15.in mcat-test15.out1
result=$?
-tmpfiles="$tmpfiles mcat-test15.out2"
-rm -f mcat-test15.out2
+tmpfiles="$tmpfiles mcat-test15.tmp2 mcat-test15.out2"
+rm -f mcat-test15.tmp2
: ${MSGCAT=msgcat}
-${MSGCAT} --indent -o mcat-test15.out2 mcat-test15.in
+${MSGCAT} --indent -o mcat-test15.tmp2 mcat-test15.in
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcat-test15.tmp2 > mcat-test15.out2
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcat-test15.ok"
msgstr "zu wenige Argumente"
EOF
-tmpfiles="$tmpfiles mcat-test16.out"
-rm -f mcat-test16.out
+tmpfiles="$tmpfiles mcat-test16.tmp mcat-test16.out"
+rm -f mcat-test16.tmp
: ${MSGCAT=msgcat}
-${MSGCAT} -o mcat-test16.out mcat-test16.in1 mcat-test16.in2
+${MSGCAT} -o mcat-test16.tmp mcat-test16.in1 mcat-test16.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcat-test16.tmp > mcat-test16.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcat-test16.ok"
msgstr "Sie können sich als \"%1\" einloggen."
EOF
-tmpfiles="$tmpfiles mcat-test2.out mcat-test2.err"
-rm -f mcat-test2.out
+tmpfiles="$tmpfiles mcat-test2.tmp mcat-test2.err mcat-test2.out"
+rm -f mcat-test2.tmp
: ${MSGCAT=msgcat}
LC_MESSAGES=C LC_ALL= \
-${MSGCAT} --more-than=0 -o mcat-test2.out \
+${MSGCAT} --more-than=0 -o mcat-test2.tmp \
mcat-test2.in1 mcat-test2.in2 >mcat-test2.err 2>&1
result=$?
cat mcat-test2.err | grep -v 'warning: .* encodings' | grep -v '^ '
test $result = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcat-test2.tmp > mcat-test2.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcat-test2.ok"
cat << \EOF > mcat-test2.ok
msgstr "Sie können sich als \"%1\" einloggen."
EOF
-tmpfiles="$tmpfiles mcat-test3.out mcat-test3.err"
-rm -f mcat-test3.out
+tmpfiles="$tmpfiles mcat-test3.tmp mcat-test3.err mcat-test3.out"
+rm -f mcat-test3.tmp
: ${MSGCAT=msgcat}
LC_MESSAGES=C LC_ALL= \
-${MSGCAT} --use-first --more-than=0 -o mcat-test3.out \
+${MSGCAT} --use-first --more-than=0 -o mcat-test3.tmp \
mcat-test3.in1 mcat-test3.in2 >mcat-test3.err 2>&1
result=$?
cat mcat-test3.err | grep -v 'warning: .* encodings' | grep -v '^ '
test $result = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcat-test3.tmp > mcat-test3.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcat-test3.ok"
cat << \EOF > mcat-test3.ok
"Glückwunsch!"
EOF
-tmpfiles="$tmpfiles mcat-test4.out mcat-test4.err"
-rm -f mcat-test4.out
+tmpfiles="$tmpfiles mcat-test4.tmp mcat-test4.err mcat-test4.out"
+rm -f mcat-test4.tmp
: ${MSGCAT=msgcat}
LC_MESSAGES=C LC_ALL= \
-${MSGCAT} --use-first --more-than=0 -o mcat-test4.out \
+${MSGCAT} --use-first --more-than=0 -o mcat-test4.tmp \
mcat-test4.in1 mcat-test4.in2 >mcat-test4.err 2>&1
result=$?
cat mcat-test4.err | grep -v 'warning: .* encodings' | grep -v '^ '
test $result = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcat-test4.tmp > mcat-test4.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcat-test4.ok"
cat << \EOF > mcat-test4.ok
"Herzlichen Glückwunsch!"
EOF
-tmpfiles="$tmpfiles mcat-test5.out"
-rm -f mcat-test5.out
+tmpfiles="$tmpfiles mcat-test5.tmp mcat-test5.out"
+rm -f mcat-test5.tmp
: ${MSGCAT=msgcat}
-${MSGCAT} --use-first --more-than=0 -o mcat-test5.out \
+${MSGCAT} --use-first --more-than=0 -o mcat-test5.tmp \
mcat-test5.in1 mcat-test5.in2
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcat-test5.tmp > mcat-test5.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcat-test5.ok"
cat << \EOF > mcat-test5.ok
"Herzlichen Glückwunsch!"
EOF
-tmpfiles="$tmpfiles mcat-test6.out"
-rm -f mcat-test6.out
+tmpfiles="$tmpfiles mcat-test6.tmp mcat-test6.out"
+rm -f mcat-test6.tmp
: ${MSGCAT=msgcat}
-${MSGCAT} --more-than=0 -o mcat-test6.out \
+${MSGCAT} --more-than=0 -o mcat-test6.tmp \
mcat-test6.in1 mcat-test6.in2
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcat-test6.tmp > mcat-test6.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcat-test6.ok"
cat << \EOF > mcat-test6.ok
"1"
EOF
-tmpfiles="$tmpfiles mcat-test7.out"
-rm -f mcat-test7.out
+tmpfiles="$tmpfiles mcat-test7.tmp mcat-test7.out"
+rm -f mcat-test7.tmp
: ${MSGCAT=msgcat}
-${MSGCAT} --sort-output -o mcat-test7.out mcat-test7.in1
+${MSGCAT} --sort-output -o mcat-test7.tmp mcat-test7.in1
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcat-test7.tmp > mcat-test7.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcat-test7.ok"
"Glückwunsch!"
EOF
-tmpfiles="$tmpfiles mcat-test8.out"
-rm -f mcat-test8.out
+tmpfiles="$tmpfiles mcat-test8.tmp mcat-test8.out"
+rm -f mcat-test8.tmp
: ${MSGCAT=msgcat}
-${MSGCAT} --more-than=0 -o mcat-test8.out \
+${MSGCAT} --more-than=0 -o mcat-test8.tmp \
mcat-test8.in1 mcat-test8.in2
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcat-test8.tmp > mcat-test8.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcat-test8.ok"
cat <<\EOF > mcat-test8.ok
"Glückwunsch!"
EOF
-tmpfiles="$tmpfiles mcat-test9.out"
-rm -f mcat-test9.out
+tmpfiles="$tmpfiles mcat-test9.tmp mcat-test9.out"
+rm -f mcat-test9.tmp
: ${MSGCAT=msgcat}
-${MSGCAT} --more-than=0 -o mcat-test9.out \
+${MSGCAT} --more-than=0 -o mcat-test9.tmp \
mcat-test9.in1 mcat-test9.in2
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcat-test9.tmp > mcat-test9.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcat-test9.ok"
cat <<\EOF > mcat-test9.ok
Congratulations\!=Herzlichen Gl\u00fcckwunsch\!
EOF
-tmpfiles="$tmpfiles mcat-p-1.out"
-rm -f mcat-p-1.out
+tmpfiles="$tmpfiles mcat-p-1.tmp mcat-p-1.out"
+rm -f mcat-p-1.tmp
: ${MSGCAT=msgcat}
${MSGCAT} --use-first --more-than=0 --properties-input --properties-output \
- -o mcat-p-1.out mcat-p-1.in1 mcat-p-1.in2
+ -o mcat-p-1.tmp mcat-p-1.in1 mcat-p-1.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcat-p-1.tmp > mcat-p-1.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcat-p-1.ok"
"hoe322070.element";
EOF
-tmpfiles="$tmpfiles mcat-s-1.out mcat-s-1.err"
-rm -f mcat-s-1.out
+tmpfiles="$tmpfiles mcat-s-1.tmp mcat-s-1.err mcat-s-1.out"
+rm -f mcat-s-1.tmp
: ${MSGCAT=msgcat}
LC_MESSAGES=C LC_ALL= \
-${MSGCAT} --stringtable-input -o mcat-s-1.out mcat-s-1.in >mcat-s-1.err 2>&1
+${MSGCAT} --stringtable-input -o mcat-s-1.tmp mcat-s-1.in >mcat-s-1.err 2>&1
result=$?
cat mcat-s-1.err | grep -v ': internationalized messages'
test $result = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcat-s-1.tmp > mcat-s-1.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcat-s-1.ok"
cat << \EOF > mcat-s-1.ok
tmpfiles="$tmpfiles mc-test2.out"
: ${MSGCMP=msgcmp}
LC_MESSAGES=C LC_ALL= \
-${MSGCMP} mc-test2.in1 mc-test2.in2 2>&1 | grep -v '^==' > mc-test2.out
+${MSGCMP} mc-test2.in1 mc-test2.in2 2>&1 | grep -v '^==' | tr -d '\r' > mc-test2.out
tmpfiles="$tmpfiles mc-test2.ok"
cat <<EOF > mc-test2.ok
tmpfiles="$tmpfiles mc-test3.out"
: ${MSGCMP=msgcmp}
LC_MESSAGES=C LC_ALL= \
-${MSGCMP} --properties-input mc-test3.in1 mc-test3.in2 2>&1 | grep -v '^==' > mc-test3.out
+${MSGCMP} --properties-input mc-test3.in1 mc-test3.in2 2>&1 | grep -v '^==' | tr -d '\r' > mc-test3.out
tmpfiles="$tmpfiles mc-test3.ok"
cat <<EOF > mc-test3.ok
msgstr "2x"
EOF
-tmpfiles="$tmpfiles mcomm-test1.out"
+tmpfiles="$tmpfiles mcomm-test1.tmp mcomm-test1.out"
: ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=0 -o mcomm-test1.out mcomm-test1.in1 mcomm-test1.in2
+${MSGCOMM} --more-than=0 -o mcomm-test1.tmp mcomm-test1.in1 mcomm-test1.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcomm-test1.tmp > mcomm-test1.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcomm-test1.ok"
msgstr ""
EOF
-tmpfiles="$tmpfiles mcomm-test10.out"
+tmpfiles="$tmpfiles mcomm-test10.tmp mcomm-test10.out"
: ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=1 --no-location --omit-header -o mcomm-test10.out \
+${MSGCOMM} --more-than=1 --no-location --omit-header -o mcomm-test10.tmp \
mcomm-test10.in1 mcomm-test10.in2
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcomm-test10.tmp > mcomm-test10.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcomm-test10.ok"
cat << EOF > mcomm-test10.ok
msgstr ""
EOF
-tmpfiles="$tmpfiles mcomm-test11.out"
+tmpfiles="$tmpfiles mcomm-test11.tmp mcomm-test11.out"
: ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=1 --no-location --omit-header -o mcomm-test11.out \
+${MSGCOMM} --more-than=1 --no-location --omit-header -o mcomm-test11.tmp \
mcomm-test11.in1 mcomm-test11.in2
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcomm-test11.tmp > mcomm-test11.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcomm-test11.ok"
cat << EOF > mcomm-test11.ok
msgstr ""
EOF
-tmpfiles="$tmpfiles mcomm-test12.out"
+tmpfiles="$tmpfiles mcomm-test12.tmp mcomm-test12.out"
: ${MSGCOMM=msgcomm}
# --unique is shorthand for --less-than=2; do we've to test both
# switches? Are 'for' loops allowed? -ke-
-${MSGCOMM} --less-than=2 --no-location --force-po -o mcomm-test12.out \
+${MSGCOMM} --less-than=2 --no-location --force-po -o mcomm-test12.tmp \
mcomm-test12.in1 mcomm-test12.in2 mcomm-test12.in3
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcomm-test12.tmp > mcomm-test12.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcomm-test12.ok"
cat << EOF > mcomm-test12.ok
msgstr ""
EOF
-tmpfiles="$tmpfiles mcomm-test13.out"
+tmpfiles="$tmpfiles mcomm-test13.tmp mcomm-test13.out"
: ${MSGCOMM=msgcomm}
# --unique is shorthand for --less-than=2; do we've to test both
# switches? Are 'for' loops allowed? -ke-
-${MSGCOMM} --less-than=2 --no-location --force-po -o mcomm-test13.out \
+${MSGCOMM} --less-than=2 --no-location --force-po -o mcomm-test13.tmp \
mcomm-test13.in1 mcomm-test13.in2 mcomm-test13.in3
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcomm-test13.tmp > mcomm-test13.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcomm-test13.ok"
cat << EOF > mcomm-test13.ok
msgstr ""
EOF
-tmpfiles="$tmpfiles mcomm-test14.out"
+tmpfiles="$tmpfiles mcomm-test14.tmp mcomm-test14.out"
: ${MSGCOMM=msgcomm}
# --unique is shorthand for --less-than=2; do we've to test both
# switches? Are 'for' loops allowed? -ke-
-${MSGCOMM} --less-than=2 --no-location --force-po -o mcomm-test14.out \
+${MSGCOMM} --less-than=2 --no-location --force-po -o mcomm-test14.tmp \
mcomm-test14.in1 mcomm-test14.in2 mcomm-test14.in3
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcomm-test14.tmp > mcomm-test14.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcomm-test14.ok"
cat << EOF > mcomm-test14.ok
msgstr "Sie können sich als \"%1\" einloggen."
EOF
-tmpfiles="$tmpfiles mcomm-test16.out mcomm-test16.err"
-rm -f mcomm-test16.out
+tmpfiles="$tmpfiles mcomm-test16.tmp mcomm-test16.err mcomm-test16.out"
+rm -f mcomm-test16.tmp
: ${MSGCOMM=msgcomm}
LC_MESSAGES=C LC_ALL= \
-${MSGCOMM} --more-than=0 -o mcomm-test16.out \
+${MSGCOMM} --more-than=0 -o mcomm-test16.tmp \
mcomm-test16.in1 mcomm-test16.in2 >mcomm-test16.err 2>&1
result=$?
cat mcomm-test16.err | grep -v 'warning: .* encodings' | grep -v '^ '
test $result = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcomm-test16.tmp > mcomm-test16.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcomm-test16.ok"
cat << \EOF > mcomm-test16.ok
msgstr "fünf"
EOF
-tmpfiles="$tmpfiles mcomm-test17.out"
+tmpfiles="$tmpfiles mcomm-test17.tmp mcomm-test17.out"
: ${MSGCOMM=msgcomm}
${MSGCOMM} -u \
- -o mcomm-test17.out \
+ -o mcomm-test17.tmp \
mcomm-test17.in1 mcomm-test17.in2 mcomm-test17.in3
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcomm-test17.tmp > mcomm-test17.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcomm-test17.ok"
cat << \EOF > mcomm-test17.ok
msgstr "1x"
EOF
-tmpfiles="$tmpfiles mcomm-test18.out"
+tmpfiles="$tmpfiles mcomm-test18.tmp mcomm-test18.out"
: ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=0 -o mcomm-test18.out mcomm-test18.in1 mcomm-test18.in2
+${MSGCOMM} --more-than=0 -o mcomm-test18.tmp mcomm-test18.in1 mcomm-test18.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcomm-test18.tmp > mcomm-test18.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcomm-test18.ok"
msgstr "1x"
EOF
-tmpfiles="$tmpfiles mcomm-test19.out"
+tmpfiles="$tmpfiles mcomm-test19.tmp mcomm-test19.out"
: ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=0 -o mcomm-test19.out mcomm-test19.in1 mcomm-test19.in2
+${MSGCOMM} --more-than=0 -o mcomm-test19.tmp mcomm-test19.in1 mcomm-test19.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcomm-test19.tmp > mcomm-test19.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcomm-test19.ok"
msgstr "2x"
EOF
-tmpfiles="$tmpfiles mcomm-test2.out"
+tmpfiles="$tmpfiles mcomm-test2.tmp mcomm-test2.out"
: ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=0 --no-location -o mcomm-test2.out \
+${MSGCOMM} --more-than=0 --no-location -o mcomm-test2.tmp \
mcomm-test2.in1 mcomm-test2.in2
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcomm-test2.tmp > mcomm-test2.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcomm-test2.ok"
cat << EOF > mcomm-test2.ok
msgstr "1x"
EOF
-tmpfiles="$tmpfiles mcomm-test20.out"
+tmpfiles="$tmpfiles mcomm-test20.tmp mcomm-test20.out"
: ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=0 -o mcomm-test20.out \
+${MSGCOMM} --more-than=0 -o mcomm-test20.tmp \
mcomm-test20.in1 mcomm-test20.in2
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcomm-test20.tmp > mcomm-test20.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcomm-test20.ok"
cat << EOF > mcomm-test20.ok
msgstr "1x"
EOF
-tmpfiles="$tmpfiles mcomm-test21.out"
+tmpfiles="$tmpfiles mcomm-test21.tmp mcomm-test21.out"
: ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=0 -o mcomm-test21.out mcomm-test21.in1 mcomm-test21.in2
+${MSGCOMM} --more-than=0 -o mcomm-test21.tmp mcomm-test21.in1 mcomm-test21.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcomm-test21.tmp > mcomm-test21.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcomm-test21.ok"
msgstr "virtueller Speicher erschöpft"
EOF
-tmpfiles="$tmpfiles mcomm-test22.out"
-rm -f mcomm-test22.out
+tmpfiles="$tmpfiles mcomm-test22.tmp mcomm-test22.out"
+rm -f mcomm-test22.tmp
: ${MSGCOMM=msgcomm}
-${MSGCOMM} --less-than=2 -o mcomm-test22.out \
+${MSGCOMM} --less-than=2 -o mcomm-test22.tmp \
mcomm-test22.in1 mcomm-test22.in2
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcomm-test22.tmp > mcomm-test22.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcomm-test22.ok"
cat << \EOF > mcomm-test22.ok
cp ${top_srcdir}/tests/msguniq-a.in mcomm-23.in1
cp ${top_srcdir}/tests/msguniq-a.in mcomm-23.in2
-tmpfiles="$tmpfiles mcomm-23.out"
+tmpfiles="$tmpfiles mcomm-23.tmp mcomm-23.out"
: ${MSGCOMM=msgcomm}
-${MSGCOMM} -w 1000 -o mcomm-23.out mcomm-23.in1 mcomm-23.in2
+${MSGCOMM} -w 1000 -o mcomm-23.tmp mcomm-23.in1 mcomm-23.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcomm-23.tmp > mcomm-23.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
2=2x
EOF
-tmpfiles="$tmpfiles mcomm-test24.out"
+tmpfiles="$tmpfiles mcomm-test24.tmp mcomm-test24.out"
: ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=0 --properties-input --properties-output -o mcomm-test24.out mcomm-test24.in1 mcomm-test24.in2
+${MSGCOMM} --more-than=0 --properties-input --properties-output -o mcomm-test24.tmp mcomm-test24.in1 mcomm-test24.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcomm-test24.tmp > mcomm-test24.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcomm-test24.ok"
#~ msgstr "Enregistrer l'as"
EOF
-tmpfiles="$tmpfiles mcomm-test25.out"
+tmpfiles="$tmpfiles mcomm-test25.tmp mcomm-test25.out"
: ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=0 -o mcomm-test25.out mcomm-test25.in1 mcomm-test25.in2
+${MSGCOMM} --more-than=0 -o mcomm-test25.tmp mcomm-test25.in1 mcomm-test25.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcomm-test25.tmp > mcomm-test25.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcomm-test25.ok"
msgstr "%s: ungültige Optionen -- %c\n"
EOF
-tmpfiles="$tmpfiles mcomm-test26.out"
+tmpfiles="$tmpfiles mcomm-test26.tmp mcomm-test26.out"
: ${MSGCOMM=msgcomm}
-${MSGCOMM} -o mcomm-test26.out mcomm-test26.in1 mcomm-test26.in2
+${MSGCOMM} -o mcomm-test26.tmp mcomm-test26.in1 mcomm-test26.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcomm-test26.tmp > mcomm-test26.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcomm-test26.ok"
msgstr "2x"
EOF
-tmpfiles="$tmpfiles mcomm-test3.out"
+tmpfiles="$tmpfiles mcomm-test3.tmp mcomm-test3.out"
: ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=0 --omit-header -o mcomm-test3.out \
+${MSGCOMM} --more-than=0 --omit-header -o mcomm-test3.tmp \
mcomm-test3.in1 mcomm-test3.in2
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcomm-test3.tmp > mcomm-test3.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcomm-test3.ok"
cat << EOF > mcomm-test3.ok
msgstr "2x"
EOF
-tmpfiles="$tmpfiles mcomm-test4.out"
+tmpfiles="$tmpfiles mcomm-test4.tmp mcomm-test4.out"
: ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=0 -o mcomm-test4.out \
+${MSGCOMM} --more-than=0 -o mcomm-test4.tmp \
mcomm-test4.in1 mcomm-test4.in2
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcomm-test4.tmp > mcomm-test4.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcomm-test4.ok"
cat << EOF > mcomm-test4.ok
msgstr "2x"
EOF
-tmpfiles="$tmpfiles mcomm-test5.out"
+tmpfiles="$tmpfiles mcomm-test5.tmp mcomm-test5.out"
: ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=0 --omit-header -o mcomm-test5.out \
+${MSGCOMM} --more-than=0 --omit-header -o mcomm-test5.tmp \
mcomm-test5.in1 mcomm-test5.in2
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcomm-test5.tmp > mcomm-test5.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcomm-test5.ok"
cat << EOF > mcomm-test5.ok
msgstr "2x"
EOF
-tmpfiles="$tmpfiles mcomm-test6.out"
+tmpfiles="$tmpfiles mcomm-test6.tmp mcomm-test6.out"
: ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=0 --no-location -o mcomm-test6.out \
+${MSGCOMM} --more-than=0 --no-location -o mcomm-test6.tmp \
mcomm-test6.in1 mcomm-test6.in2
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcomm-test6.tmp > mcomm-test6.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcomm-test6.ok"
cat << EOF > mcomm-test6.ok
msgstr "2x"
EOF
-tmpfiles="$tmpfiles mcomm-test7.out"
+tmpfiles="$tmpfiles mcomm-test7.tmp mcomm-test7.out"
: ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=0 --no-location --omit-header -o mcomm-test7.out \
+${MSGCOMM} --more-than=0 --no-location --omit-header -o mcomm-test7.tmp \
mcomm-test7.in1 mcomm-test7.in2
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcomm-test7.tmp > mcomm-test7.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcomm-test7.ok"
cat << EOF > mcomm-test7.ok
msgstr ""
EOF
-tmpfiles="$tmpfiles mcomm-test8.out"
+tmpfiles="$tmpfiles mcomm-test8.tmp mcomm-test8.out"
: ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=1 -o mcomm-test8.out \
+${MSGCOMM} --more-than=1 -o mcomm-test8.tmp \
mcomm-test8.in1 mcomm-test8.in2
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcomm-test8.tmp > mcomm-test8.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcomm-test8.ok"
cat << EOF > mcomm-test8.ok
msgstr ""
EOF
-tmpfiles="$tmpfiles mcomm-test9.out"
+tmpfiles="$tmpfiles mcomm-test9.tmp mcomm-test9.out"
: ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=1 --no-location -o mcomm-test9.out \
+${MSGCOMM} --more-than=1 --no-location -o mcomm-test9.tmp \
mcomm-test9.in1 mcomm-test9.in2
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mcomm-test9.tmp > mcomm-test9.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mcomm-test9.ok"
cat << EOF > mcomm-test9.ok
#~ msgstr "Enregistrer sous"
EOF
-tmpfiles="$tmpfiles mco-test5.out"
+tmpfiles="$tmpfiles mco-test5.tmp mco-test5.out"
: ${MSGCONV=msgconv}
-${MSGCONV} --to-code=UTF-8 -o mco-test5.out mco-test5.po
+${MSGCONV} --to-code=UTF-8 -o mco-test5.tmp mco-test5.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mco-test5.tmp > mco-test5.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mco-test5.ok"
msgstr "Volle 360 Grad"
EOF
-tmpfiles="$tmpfiles mco-test6.out"
+tmpfiles="$tmpfiles mco-test6.tmp mco-test6.out"
: ${MSGCONV=msgconv}
-${MSGCONV} --to-code=ISO-8859-1 -o mco-test6.out mco-test6.po
+${MSGCONV} --to-code=ISO-8859-1 -o mco-test6.tmp mco-test6.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mco-test6.tmp > mco-test6.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mco-test6.ok"
msgstr[1] ""
EOF
-tmpfiles="$tmpfiles men-test1.out"
+tmpfiles="$tmpfiles men-test1.tmp men-test1.out"
: ${MSGEN=msgen}
-${MSGEN} -o men-test1.out men-test1.po
+${MSGEN} -o men-test1.tmp men-test1.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < men-test1.tmp > men-test1.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles men-test1.ok"
width\ must\ be\ positive=
EOF
-tmpfiles="$tmpfiles men-test2.out"
+tmpfiles="$tmpfiles men-test2.tmp men-test2.out"
: ${MSGEN=msgen}
-${MSGEN} --properties-input --properties-output -o men-test2.out men-test2.properties
+${MSGEN} --properties-input --properties-output -o men-test2.tmp men-test2.properties
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < men-test2.tmp > men-test2.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles men-test2.ok"
msgstr ""
EOF
-tmpfiles="$tmpfiles men-test3.out"
+tmpfiles="$tmpfiles men-test3.tmp men-test3.out"
: ${MSGEN=msgen}
-${MSGEN} -o men-test3.out men-test3.pot
+${MSGEN} -o men-test3.tmp men-test3.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < men-test3.tmp > men-test3.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles men-test3.ok"
"Óîáè÷à¼åíè äèðåêòîðè¼óì çà òðàæå\9cå: %s\n"
EOF
-tmpfiles="$tmpfiles mfi-srl-1.out"
+tmpfiles="$tmpfiles mfi-srl-1.tmp mfi-srl-1.out"
: ${MSGFILTER=msgfilter}
-${MSGFILTER} -i mfi-srl-1.po -o mfi-srl-1.out recode-sr-latin || { rm -fr $tmpfiles; exit 1; }
+${MSGFILTER} -i mfi-srl-1.po -o mfi-srl-1.tmp recode-sr-latin
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mfi-srl-1.tmp > mfi-srl-1.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mfi-srl-1.ok"
cat <<\EOF > mfi-srl-1.ok
: ${GETTEXT=gettext}
TEXTDOMAINDIR=.. LANGUAGE=tests \
${GETTEXT} --env LC_ALL=en gen 'SYS_(C)
-' > mf-test1.out
+' | tr -d '\r' > mf-test1.out
tmpfiles="$tmpfiles gtmf-test1.ok"
cat <<EOF > gtmf-test1.ok
: ${MSGFMT=msgfmt}
LC_MESSAGES=C LC_ALL= \
${MSGFMT} --check -o /dev/null mf-test10.po2 \
- 2>&1 | grep -v '^==' > mf-test10.err
+ 2>&1 | grep -v '^==' | tr -d '\r' > mf-test10.err
tmpfiles="$tmpfiles mf-test10.ok"
cat << EOF > mf-test10.ok
${MSGFMT} -o mf-12.mo mf-12.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-tmpfiles="$tmpfiles mf-12.out"
+tmpfiles="$tmpfiles mf-12.tmp mf-12.out"
: ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} -o mf-12.out mf-12.mo
+${MSGUNFMT} -o mf-12.tmp mf-12.mo
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mf-12.tmp > mf-12.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mf-12.ok"
${MSGFMT} -o mf-14.mo mf-14.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-tmpfiles="$tmpfiles mf-14.out"
+tmpfiles="$tmpfiles mf-14.tmp mf-14.out"
: ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} -o mf-14.out mf-14.mo
+${MSGUNFMT} -o mf-14.tmp mf-14.mo
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mf-14.tmp > mf-14.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mf-14.ok"
${MSGFMT} -o mf-16.mo mf-16.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-tmpfiles="$tmpfiles mf-16.out"
+tmpfiles="$tmpfiles mf-16.tmp mf-16.out"
: ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} -o mf-16.out mf-16.mo
+${MSGUNFMT} -o mf-16.tmp mf-16.mo
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mf-16.tmp > mf-16.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mf-16.ok"
${MSGFMT} foo.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-tmpfiles="$tmpfiles foo-de.out foo-fr.out"
+tmpfiles="$tmpfiles foo-de.tmp foo-de.out foo-fr.tmp foo-fr.out"
: ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} -o foo-de.out foo-de.mo
+${MSGUNFMT} -o foo-de.tmp foo-de.mo
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-${MSGUNFMT} -o foo-fr.out foo-fr.mo
+tr -d '\r' < foo-de.tmp > foo-de.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+${MSGUNFMT} -o foo-fr.tmp foo-fr.mo
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < foo-fr.tmp > foo-fr.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles foo-de.ok"
: ${MSGFMT=msgfmt}
LC_MESSAGES=C LC_ALL= \
${MSGFMT} --verbose --check mf-test7.in1 -o /dev/null \
- 2>&1 | grep -v '^==' > mf-test7.err
+ 2>&1 | grep -v '^==' | tr -d '\r' > mf-test7.err
tmpfiles="$tmpfiles mf-test7.ok"
cat << EOF > mf-test7.ok
: ${MSGFMT=msgfmt}
LC_MESSAGES=C LC_ALL= \
${MSGFMT} --verbose --check mf-test8.in1 -o /dev/null \
- 2>&1 | grep -v '^==' > mf-test8.err
+ 2>&1 | grep -v '^==' | tr -d '\r' > mf-test8.err
tmpfiles="$tmpfiles mf-test8.ok"
cat << EOF > mf-test8.ok
: ${MSGFMT=msgfmt}
LC_MESSAGES=C LC_ALL= \
${MSGFMT} --verbose --check mf-test9.in1 -o /dev/null \
- 2>&1 | grep -v '^==' > mf-test9.err
+ 2>&1 | grep -v '^==' | tr -d '\r' > mf-test9.err
tmpfiles="$tmpfiles mf-test9.ok"
cat << EOF > mf-test9.ok
: ${GETTEXT=gettext}
TEXTDOMAINDIR=.. LANGUAGE=tests \
${GETTEXT} --env LC_ALL=en gen 'SYS_(C)
-' > mf-test1.out
+' | tr -d '\r' > mf-test1.out
tmpfiles="$tmpfiles gtmf-test1.ok"
cat <<EOF > gtmf-test1.ok
msgstr "Subprozess %s hat ein fatales Signal erhalten"
EOF
-tmpfiles="$tmpfiles mg-test1.out"
+tmpfiles="$tmpfiles mg-test1.tmp mg-test1.out"
: ${MSGGREP=msggrep}
-${MSGGREP} -N pipe-bidi.c -o mg-test1.out mg-test1.po
+${MSGGREP} -N pipe-bidi.c -o mg-test1.tmp mg-test1.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mg-test1.tmp > mg-test1.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mg-test1.ok"
msgstr "%s: l'option « -W %s » ne tolère pas d'argument\n"
EOF
-tmpfiles="$tmpfiles mg-test2.out"
+tmpfiles="$tmpfiles mg-test2.tmp mg-test2.out"
: ${MSGGREP=msggrep}
-${MSGGREP} -M fr -o mg-test2.out mg-test2.po
+${MSGGREP} -M fr -o mg-test2.tmp mg-test2.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mg-test2.tmp > mg-test2.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mg-test2.ok"
msgstr "Antiterror-Einheit"
EOF
-tmpfiles="$tmpfiles mg-test3.out mg-test3.err"
+tmpfiles="$tmpfiles mg-test3.tmp mg-test3.err mg-test3.out"
: ${MSGGREP=msggrep}
LC_MESSAGES=C LC_ALL= \
-${MSGGREP} -K -e error -T -e Speicher -o mg-test3.out mg-test3.po >mg-test3.err 2>&1
+${MSGGREP} -K -e error -T -e Speicher -o mg-test3.tmp mg-test3.po >mg-test3.err 2>&1
result=$?
cat mg-test3.err | grep -v 'warning: Locale charset' | grep -v '^ '
test $result = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mg-test3.tmp > mg-test3.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mg-test3.ok"
cat <<\EOF > mg-test3.ok
tmpfiles="$tmpfiles mg-test4.in2"
echo 'illegal' > mg-test4.in2
-tmpfiles="$tmpfiles mg-test4.out mg-test4.err"
+tmpfiles="$tmpfiles mg-test4.tmp mg-test4.err mg-test4.out"
: ${MSGGREP=msggrep}
LC_MESSAGES=C LC_ALL= \
-${MSGGREP} -K -e error -f mg-test4.in1 -f mg-test4.in2 -e cannot -o mg-test4.out mg-test4.po > mg-test4.err 2>&1
+${MSGGREP} -K -e error -f mg-test4.in1 -f mg-test4.in2 -e cannot -o mg-test4.tmp mg-test4.po > mg-test4.err 2>&1
result=$?
cat mg-test4.err | grep -v 'warning: Locale charset' | grep -v '^ '
test $result = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mg-test4.tmp > mg-test4.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mg-test4.ok"
cat <<\EOF > mg-test4.ok
msgstr "Antiterror-Einheit"
EOF
-tmpfiles="$tmpfiles mg-test5.out mg-test5.err"
+tmpfiles="$tmpfiles mg-test5.tmp mg-test5.err mg-test5.out"
: ${MSGGREP=msggrep}
LC_MESSAGES=C LC_ALL= \
-${MSGGREP} -C -e @proofread -o mg-test5.out mg-test5.po >mg-test5.err 2>&1
+${MSGGREP} -C -e @proofread -o mg-test5.tmp mg-test5.po >mg-test5.err 2>&1
result=$?
cat mg-test5.err | grep -v 'warning: Locale charset' | grep -v '^ '
test $result = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mg-test5.tmp > mg-test5.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mg-test5.ok"
cat <<\EOF > mg-test5.ok
GSG-9=Antiterror-Einheit
EOF
-tmpfiles="$tmpfiles mg-test6.out"
+tmpfiles="$tmpfiles mg-test6.tmp mg-test6.out"
: ${MSGGREP=msggrep}
LC_MESSAGES=C LC_ALL= \
-${MSGGREP} --properties-input --properties-output -K -e error -T -e Speicher -o mg-test6.out mg-test6.properties
+${MSGGREP} --properties-input --properties-output -K -e error -T -e Speicher -o mg-test6.tmp mg-test6.properties
result=$?
test $result = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mg-test6.tmp > mg-test6.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mg-test6.ok"
cat <<\EOF > mg-test6.ok
#~ msgstr "Enregistrer sous"
EOF
-tmpfiles="$tmpfiles mg-test7.out"
+tmpfiles="$tmpfiles mg-test7.tmp mg-test7.out"
: ${MSGGREP=msggrep}
LC_MESSAGES=C LC_ALL= \
-${MSGGREP} -J -e "File|" -o mg-test7.out mg-test7.po
+${MSGGREP} -J -e "File|" -o mg-test7.tmp mg-test7.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mg-test7.tmp > mg-test7.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mg-test7.ok"
msgstr "%d mal wiederholen"
EOF
-tmpfiles="$tmpfiles mg-test8.out mg-test8.err"
+tmpfiles="$tmpfiles mg-test8.tmp mg-test8.err mg-test8.out"
: ${MSGGREP=msggrep}
LC_MESSAGES=C LC_ALL= \
-${MSGGREP} -X -e c-form -o mg-test8.out mg-test8.po >mg-test8.err 2>&1
+${MSGGREP} -X -e c-form -o mg-test8.tmp mg-test8.po >mg-test8.err 2>&1
result=$?
cat mg-test8.err | grep -v 'warning: Locale charset' | grep -v '^ '
test $result = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mg-test8.tmp > mg-test8.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mg-test8.ok"
cat <<\EOF > mg-test8.ok
msgstr ""
EOF
-tmpfiles="$tmpfiles mm-test1.out"
+tmpfiles="$tmpfiles mm-test1.tmp mm-test1.out"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test1.out mm-test1.in1 mm-test1.in2
+${MSGMERGE} -q -o mm-test1.tmp mm-test1.in1 mm-test1.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-test1.tmp > mm-test1.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mm-test1.ok"
msgstr[1] ""
EOF
-tmpfiles="$tmpfiles mm-test10.out"
+tmpfiles="$tmpfiles mm-test10.tmp mm-test10.out"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test10.out mm-test10.po mm-test10.pot
+${MSGMERGE} -q -o mm-test10.tmp mm-test10.po mm-test10.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-test10.tmp > mm-test10.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mm-test10.ok"
msgstr[1] ""
EOF
-tmpfiles="$tmpfiles mm-test11.out"
+tmpfiles="$tmpfiles mm-test11.tmp mm-test11.out"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test11.out mm-test11.po mm-test11.pot
+${MSGMERGE} -q -o mm-test11.tmp mm-test11.po mm-test11.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-test11.tmp > mm-test11.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mm-test11.ok"
msgstr ""
EOF
-tmpfiles="$tmpfiles mm-test12.out"
+tmpfiles="$tmpfiles mm-test12.tmp mm-test12.out"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test12.out mm-test12.po mm-test12.pot
+${MSGMERGE} -q -o mm-test12.tmp mm-test12.po mm-test12.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-test12.tmp > mm-test12.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mm-test12.ok"
msgstr ""
EOF
-tmpfiles="$tmpfiles mm-test13.out"
+tmpfiles="$tmpfiles mm-test13.tmp mm-test13.out"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test13.out mm-test13.po mm-test13.pot
+${MSGMERGE} -q -o mm-test13.tmp mm-test13.po mm-test13.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-test13.tmp > mm-test13.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mm-test13.ok"
msgstr ""
EOF
-tmpfiles="$tmpfiles mm-test14.out"
+tmpfiles="$tmpfiles mm-test14.tmp mm-test14.out"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test14.out mm-test14-ru.po mm-test14.pot
+${MSGMERGE} -q -o mm-test14.tmp mm-test14-ru.po mm-test14.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-test14.tmp > mm-test14.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mm-test14.ok"
msgstr ""
EOF
-tmpfiles="$tmpfiles mm-test15.out"
+tmpfiles="$tmpfiles mm-test15.tmp mm-test15.out"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test15.out mm-test15.pot mm-test15.po
+${MSGMERGE} -q -o mm-test15.tmp mm-test15.pot mm-test15.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-test15.tmp > mm-test15.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mm-test15.ok"
msgstr ""
EOF
-tmpfiles="$tmpfiles mm-test16.new.po"
+tmpfiles="$tmpfiles mm-test16.tmp.po mm-test16.new.po"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test16.new.po mm-test16.po mm-test16.pot
+${MSGMERGE} -q -o mm-test16.tmp.po mm-test16.po mm-test16.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-test16.tmp.po > mm-test16.new.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mm-test16.ok"
msgstr ""
EOF
-tmpfiles="$tmpfiles mm-test17.new.po"
+tmpfiles="$tmpfiles mm-test17.tmp.po mm-test17.new.po"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test17.new.po mm-test17.po mm-test17.pot
+${MSGMERGE} -q -o mm-test17.tmp.po mm-test17.po mm-test17.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-test17.tmp.po > mm-test17.new.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mm-test17.ok"
${MSGCMP} --use-fuzzy --use-untranslated mm-test18.po mm-test18.pot 2>/dev/null
test $? = 1 || { rm -fr $tmpfiles; exit 1; }
-tmpfiles="$tmpfiles mm-test18.new.po"
+tmpfiles="$tmpfiles mm-test18.tmp.po mm-test18.new.po"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test18.new.po mm-test18.po mm-test18.pot
+${MSGMERGE} -q -o mm-test18.tmp.po mm-test18.po mm-test18.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-test18.tmp.po > mm-test18.new.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mm-test18.ok"
msgstr ""
EOF
-tmpfiles="$tmpfiles mm-test19.new1.po"
+tmpfiles="$tmpfiles mm-test19.tmp.po mm-test19.new1.po"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --previous -o mm-test19.new1.po mm-test19.po mm-test19.pot
+${MSGMERGE} -q --previous -o mm-test19.tmp.po mm-test19.po mm-test19.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-test19.tmp.po > mm-test19.new1.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mm-test19.ok1"
msgstr ""
EOF
-tmpfiles="$tmpfiles mm-test19.new2.po"
+tmpfiles="$tmpfiles mm-test19.tmp.po mm-test19.new2.po"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --previous -o mm-test19.new2.po mm-test19.new1.po mm-test19.pot
+${MSGMERGE} -q --previous -o mm-test19.tmp.po mm-test19.new1.po mm-test19.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-test19.tmp.po > mm-test19.new2.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mm-test19.ok2"
#~ msgstr "Dieses Programm läuft mit der Prozeß-Nummer {pid}."
EOF
-tmpfiles="$tmpfiles mm-test20.new.po"
+tmpfiles="$tmpfiles mm-test20.tmp.po mm-test20.new.po"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test20.new.po mm-test20.po mm-test20.pot
+${MSGMERGE} -q -o mm-test20.tmp.po mm-test20.po mm-test20.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-test20.tmp.po > mm-test20.new.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mm-test20.ok"
# trailing comments should be removed, even here
EOF
-tmpfiles="$tmpfiles mm-test3.out"
+tmpfiles="$tmpfiles mm-test3.tmp mm-test3.out"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test3.out mm-test3.in1 mm-test3.in2
+${MSGMERGE} -q -o mm-test3.tmp mm-test3.in1 mm-test3.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-test3.tmp > mm-test3.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mm-test3.ok"
msgstr ""
EOF
-tmpfiles="$tmpfiles mm-test4.out"
+tmpfiles="$tmpfiles mm-test4.tmp mm-test4.out"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test4.out mm-test4.in1.po mm-test4.in2.po
+${MSGMERGE} -q -o mm-test4.tmp mm-test4.in1.po mm-test4.in2.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-test4.tmp > mm-test4.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mm-test4.ok"
"blah blah blah blah blah blah blah blah blah blah blah blah blah bla bla bla\n"
EOF
-tmpfiles="$tmpfiles mm-test5.out mm-test5.err"
+tmpfiles="$tmpfiles mm-test5.tmp mm-test5.out mm-test5.err"
: ${MSGMERGE=msgmerge}
LC_MESSAGES=C LC_ALL= \
-${MSGMERGE} -q -o mm-test5.out mm-test5.in1.po mm-test5.in2.po >mm-test5.err 2>&1
+${MSGMERGE} -q -o mm-test5.tmp mm-test5.in1.po mm-test5.in2.po >mm-test5.err 2>&1
result=$?
cat mm-test5.err | grep -v 'warning: Charset' | grep -v '^ '
test $result = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-test5.tmp > mm-test5.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mm-test5.ok"
cat <<EOF > mm-test5.ok
msgstr ""
EOF
-tmpfiles="$tmpfiles mm-test6.out"
+tmpfiles="$tmpfiles mm-test6.tmp mm-test6.out"
: ${MSGMERGE=msgmerge}
LC_MESSAGES=C LC_ALL= \
-${MSGMERGE} -q -o mm-test6.out mm-test6.in1.po mm-test6.in2.po
+${MSGMERGE} -q -o mm-test6.tmp mm-test6.in1.po mm-test6.in2.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-test6.tmp > mm-test6.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mm-test6.ok"
msgstr ""
EOF
-tmpfiles="$tmpfiles mm-test7.out"
+tmpfiles="$tmpfiles mm-test7.tmp mm-test7.out"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test7.out mm-test7.po mm-test7.pot
+${MSGMERGE} -q -o mm-test7.tmp mm-test7.po mm-test7.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-test7.tmp > mm-test7.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mm-test7.ok"
msgstr ""
EOF
-tmpfiles="$tmpfiles mm-test8.out"
+tmpfiles="$tmpfiles mm-test8.tmp mm-test8.out"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} --multi-domain -q -o mm-test8.out mm-test8.po mm-test8.pot
+${MSGMERGE} --multi-domain -q -o mm-test8.tmp mm-test8.po mm-test8.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-test8.tmp > mm-test8.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mm-test8.ok"
msgstr ""
EOF
-tmpfiles="$tmpfiles mm-c-1.out"
+tmpfiles="$tmpfiles mm-c-1.tmp mm-c-1.out"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -C mm-c-1.com -o mm-c-1.out mm-c-1.in1 mm-c-1.pot
+${MSGMERGE} -q -C mm-c-1.com -o mm-c-1.tmp mm-c-1.in1 mm-c-1.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-c-1.tmp > mm-c-1.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mm-c-1.ok"
msgstr ""
EOF
-tmpfiles="$tmpfiles mm-c-2.out"
+tmpfiles="$tmpfiles mm-c-2.tmp mm-c-2.out"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -C mm-c-2.com -o mm-c-2.out mm-c-2.in1 mm-c-2.pot
+${MSGMERGE} -q -C mm-c-2.com -o mm-c-2.tmp mm-c-2.in1 mm-c-2.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-c-2.tmp > mm-c-2.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mm-c-2.ok"
msgstr ""
EOF
-tmpfiles="$tmpfiles mm-c-3.out"
+tmpfiles="$tmpfiles mm-c-3.tmp mm-c-3.out"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -C mm-c-3.com -o mm-c-3.out mm-c-3.in1 mm-c-3.pot
+${MSGMERGE} -q -C mm-c-3.com -o mm-c-3.tmp mm-c-3.in1 mm-c-3.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-c-3.tmp > mm-c-3.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mm-c-3.ok"
msgstr ""
EOF
-tmpfiles="$tmpfiles mm-c-4.out"
+tmpfiles="$tmpfiles mm-c-4.tmp mm-c-4.out"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --compendium mm-c-4.com -o mm-c-4.out /dev/null mm-c-4.pot
+${MSGMERGE} -q --compendium mm-c-4.com -o mm-c-4.tmp /dev/null mm-c-4.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-c-4.tmp > mm-c-4.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mm-c-4.ok"
tmpfiles=""
trap 'rm -fr $tmpfiles' 1 2 3 15
-tmpfiles="$tmpfiles mm-c-5.out"
+tmpfiles="$tmpfiles mm-c-5.tmp mm-c-5.out"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-c-5.out \
+${MSGMERGE} -q -o mm-c-5.tmp \
--compendium ${top_srcdir}/tests/mm-viet.comp.po \
/dev/null ${top_srcdir}/tests/mm-viet.pot
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-c-5.tmp > mm-c-5.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
${DIFF} ${top_srcdir}/tests/mm-viet.out mm-c-5.out
: ${MSGCONV=msgconv}
${MSGCONV} --to-code=UTF-8 -o mm-ko-comp.utf-8.po ${top_srcdir}/tests/mm-ko-comp.euc-kr.po
-tmpfiles="$tmpfiles mm-c-6-AEE.out"
+tmpfiles="$tmpfiles mm-c-6-AEE.tmp mm-c-6-AEE.out"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-c-6-AEE.out \
+${MSGMERGE} -q -o mm-c-6-AEE.tmp \
--compendium ${top_srcdir}/tests/mm-ko-comp.euc-kr.po \
${top_srcdir}/tests/mm-ko.euc-kr.po ${top_srcdir}/tests/mm-ko.ascii.pot
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-c-6-AEE.tmp > mm-c-6-AEE.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-tmpfiles="$tmpfiles mm-c-6-AEU.out"
+tmpfiles="$tmpfiles mm-c-6-AEU.tmp mm-c-6-AEU.out"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-c-6-AEU.out \
+${MSGMERGE} -q -o mm-c-6-AEU.tmp \
--compendium mm-ko-comp.utf-8.po \
${top_srcdir}/tests/mm-ko.euc-kr.po ${top_srcdir}/tests/mm-ko.ascii.pot
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-c-6-AEU.tmp > mm-c-6-AEU.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-tmpfiles="$tmpfiles mm-c-6-AUE.out"
+tmpfiles="$tmpfiles mm-c-6-AUE.tmp mm-c-6-AUE.out"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-c-6-AUE.out \
+${MSGMERGE} -q -o mm-c-6-AUE.tmp \
--compendium ${top_srcdir}/tests/mm-ko-comp.euc-kr.po \
mm-ko.utf-8.po ${top_srcdir}/tests/mm-ko.ascii.pot
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-c-6-AUE.tmp > mm-c-6-AUE.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-tmpfiles="$tmpfiles mm-c-6-AUU.out"
+tmpfiles="$tmpfiles mm-c-6-AUU.tmp mm-c-6-AUU.out"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-c-6-AUU.out \
+${MSGMERGE} -q -o mm-c-6-AUU.tmp \
--compendium mm-ko-comp.utf-8.po \
mm-ko.utf-8.po ${top_srcdir}/tests/mm-ko.ascii.pot
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-c-6-AUU.tmp > mm-c-6-AUU.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-tmpfiles="$tmpfiles mm-c-6-UEE.out"
+tmpfiles="$tmpfiles mm-c-6-UEE.tmp mm-c-6-UEE.out"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-c-6-UEE.out \
+${MSGMERGE} -q -o mm-c-6-UEE.tmp \
--compendium ${top_srcdir}/tests/mm-ko-comp.euc-kr.po \
${top_srcdir}/tests/mm-ko.euc-kr.po mm-ko.utf-8.pot
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-c-6-UEE.tmp > mm-c-6-UEE.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-tmpfiles="$tmpfiles mm-c-6-UEU.out"
+tmpfiles="$tmpfiles mm-c-6-UEU.tmp mm-c-6-UEU.out"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-c-6-UEU.out \
+${MSGMERGE} -q -o mm-c-6-UEU.tmp \
--compendium mm-ko-comp.utf-8.po \
${top_srcdir}/tests/mm-ko.euc-kr.po mm-ko.utf-8.pot
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-c-6-UEU.tmp > mm-c-6-UEU.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-tmpfiles="$tmpfiles mm-c-6-UUE.out"
+tmpfiles="$tmpfiles mm-c-6-UUE.tmp mm-c-6-UUE.out"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-c-6-UUE.out \
+${MSGMERGE} -q -o mm-c-6-UUE.tmp \
--compendium ${top_srcdir}/tests/mm-ko-comp.euc-kr.po \
mm-ko.utf-8.po mm-ko.utf-8.pot
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-c-6-UUE.tmp > mm-c-6-UUE.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-tmpfiles="$tmpfiles mm-c-6-UUU.out"
+tmpfiles="$tmpfiles mm-c-6-UUU.tmp mm-c-6-UUU.out"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-c-6-UUU.out \
+${MSGMERGE} -q -o mm-c-6-UUU.tmp \
--compendium mm-ko-comp.utf-8.po \
mm-ko.utf-8.po mm-ko.utf-8.pot
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-c-6-UUU.tmp > mm-c-6-UUU.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mm-c-6-U.ok mm-c-6-E.ok"
: ${MSGCONV=msgconv}
-${MSGCONV} --to-code=UTF-8 -o mm-c-6-U.ok mm-c-6-UUU.out
-${MSGCONV} --to-code=EUC-KR mm-c-6-UUU.out | sed -e 's,EUC-KR,euc-kr,' > mm-c-6-E.ok
+${MSGCONV} --to-code=UTF-8 mm-c-6-UUU.out | tr -d '\r' > mm-c-6-U.ok
+${MSGCONV} --to-code=EUC-KR mm-c-6-UUU.out | sed -e 's,EUC-KR,euc-kr,' | tr -d '\r' > mm-c-6-E.ok
: ${DIFF=diff}
${DIFF} mm-c-6-E.ok mm-c-6-AEE.out || { rm -fr $tmpfiles; exit 1; }
# trailing comments should be removed, even here
EOF
-tmpfiles="$tmpfiles mm-p-1.out"
+tmpfiles="$tmpfiles mm-p-1.tmp mm-p-1.out"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --properties-input --properties-output -o mm-p-1.out mm-p-1.in1 mm-p-1.in2
+${MSGMERGE} -q --properties-input --properties-output -o mm-p-1.tmp mm-p-1.in1 mm-p-1.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-p-1.tmp > mm-p-1.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mm-p-1.ok"
!white=
EOF
-tmpfiles="$tmpfiles mm-p-2.po~"
+tmpfiles="$tmpfiles mm-p-2.po~ mm-p-2.tmp"
: ${MSGMERGE=msgmerge}
${MSGMERGE} -q --properties-input --update mm-p-2.po mm-p-2.pot
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+mv mm-p-2.po mm-p-2.tmp || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-p-2.tmp > mm-p-2.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mm-p-2.ok"
cat <<\EOF > mm-p-2.ok
msgstr ""
EOF
-tmpfiles="$tmpfiles mm-u-2.po~"
+tmpfiles="$tmpfiles mm-u-2.po~ mm-u-2.tmp"
: ${MSGMERGE=msgmerge}
${MSGMERGE} -q --update mm-u-2.po mm-u-2.pot
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+mv mm-u-2.po mm-u-2.tmp || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mm-u-2.tmp > mm-u-2.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles mm-u-2.ok"
cat <<\EOF > mm-u-2.ok
${MSGFMT} -o mu-test1.mo mu-test1.in
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-tmpfiles="$tmpfiles mu-test1.out"
+tmpfiles="$tmpfiles mu-test1.tmp mu-test1.out"
: ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} -o mu-test1.out mu-test1.mo
+${MSGUNFMT} -o mu-test1.tmp mu-test1.mo
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mu-test1.tmp > mu-test1.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
${MSGFMT} -o mu-2.mo mu-2.in
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-tmpfiles="$tmpfiles mu-2.out"
+tmpfiles="$tmpfiles mu-2.tmp mu-2.out"
: ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} -o mu-2.out mu-2.mo
+${MSGUNFMT} -o mu-2.tmp mu-2.mo
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mu-2.tmp > mu-2.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
${MSGFMT} --properties-input -o mu-p-1.mo mu-p-1.in
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-tmpfiles="$tmpfiles mu-p-1.out"
+tmpfiles="$tmpfiles mu-p-1.tmp mu-p-1.out"
: ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} --properties-output -o mu-p-1.out mu-p-1.mo
+${MSGUNFMT} --properties-output -o mu-p-1.tmp mu-p-1.mo
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < mu-p-1.tmp > mu-p-1.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
tmpfiles=""
trap 'rm -fr $tmpfiles' 1 2 3 15
-tmpfiles="$tmpfiles msguniq-1.out"
+tmpfiles="$tmpfiles msguniq-1.tmp msguniq-1.out"
: ${MSGUNIQ-msguniq}
-${MSGUNIQ} -w 1000 -o msguniq-1.out ${top_srcdir}/tests/msguniq-a.in
+${MSGUNIQ} -w 1000 -o msguniq-1.tmp ${top_srcdir}/tests/msguniq-a.in
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < msguniq-1.tmp > msguniq-1.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
tmpfiles=""
trap 'rm -fr $tmpfiles' 1 2 3 15
-tmpfiles="$tmpfiles msguniq-2.out"
+tmpfiles="$tmpfiles msguniq-2.tmp msguniq-2.out"
: ${MSGUNIQ-msguniq}
-${MSGUNIQ} -w 1000 -u -o msguniq-2.out ${top_srcdir}/tests/msguniq-a.in
+${MSGUNIQ} -w 1000 -u -o msguniq-2.tmp ${top_srcdir}/tests/msguniq-a.in
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < msguniq-2.tmp > msguniq-2.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles msguniq-2.ok"
tmpfiles=""
trap 'rm -fr $tmpfiles' 1 2 3 15
-tmpfiles="$tmpfiles msguniq-3.out"
+tmpfiles="$tmpfiles msguniq-3.tmp msguniq-3.out"
: ${MSGUNIQ-msguniq}
-${MSGUNIQ} -w 1000 -d -o msguniq-3.out ${top_srcdir}/tests/msguniq-a.in
+${MSGUNIQ} -w 1000 -d -o msguniq-3.tmp ${top_srcdir}/tests/msguniq-a.in
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < msguniq-3.tmp > msguniq-3.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles msguniq-3.ok"
#~ msgstr "Enregistrer sous"
EOF
-tmpfiles="$tmpfiles msguniq-5.out"
+tmpfiles="$tmpfiles msguniq-5.tmp msguniq-5.out"
: ${MSGUNIQ-msguniq}
-${MSGUNIQ} -o msguniq-5.out msguniq-5.po
+${MSGUNIQ} -o msguniq-5.tmp msguniq-5.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < msguniq-5.tmp > msguniq-5.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles msguniq-5.ok"
msgstr "%s: Option erwartet ein Argument -- %c\n"
EOF
-tmpfiles="$tmpfiles msguniq-6.out"
+tmpfiles="$tmpfiles msguniq-6.tmp msguniq-6.out"
: ${MSGUNIQ=msguniq}
-${MSGUNIQ} -o msguniq-6.out msguniq-6.in
+${MSGUNIQ} -o msguniq-6.tmp msguniq-6.in
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < msguniq-6.tmp > msguniq-6.out
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles msguniq-6.ok"
tmpfiles=""
trap 'rm -fr $tmpfiles' 1 2 3 15
-tmpfiles="$tmpfiles cake.pot"
+tmpfiles="$tmpfiles cake.tmp cake.pot"
: ${XGETTEXT=xgettext}
-${XGETTEXT} -o cake.pot --omit-header --no-location ${top_srcdir}/tests/plural-1-prg.c
+${XGETTEXT} -o cake.tmp --omit-header --no-location ${top_srcdir}/tests/plural-1-prg.c
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < cake.tmp > cake.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles cake.ok"
cat <<EOF > cake.ok
msgstr[1] "%d morceaux de gateau"
EOF
-tmpfiles="$tmpfiles fr.po.new"
+tmpfiles="$tmpfiles fr.po.tmp fr.po.new"
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.new fr.po cake.pot
+${MSGMERGE} -q -o fr.po.tmp fr.po cake.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < fr.po.tmp > fr.po.new
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
${DIFF} fr.po fr.po.new || exit 1
_("")
EOF
-tmpfiles="$tmpfiles xg-test2.po"
+tmpfiles="$tmpfiles xg-test2.tmp.po xg-test2.po"
: ${XGETTEXT=xgettext}
-${XGETTEXT} -d xg-test2 -k_ --omit-header --no-location xg-test2.in.c
+${XGETTEXT} -d xg-test2.tmp -k_ --omit-header --no-location xg-test2.in.c
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-test2.tmp.po > xg-test2.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-test2.ok"
printk (_ ("php-format negative2"));
EOF
-tmpfiles="$tmpfiles xg-test6.po"
+tmpfiles="$tmpfiles xg-test6.tmp.po xg-test6.po"
: ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-test6 \
+${XGETTEXT} --omit-header --no-location -d xg-test6.tmp \
--flag=my_printf:1:python-format \
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; }
+tr -d '\r' < xg-test6.tmp.po > xg-test6.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-test6.ok"
cat <<\EOF > xg-test6.ok
gettext ("abc");
EOF
-tmpfiles="$tmpfiles xg-test7.po"
+tmpfiles="$tmpfiles xg-test7.tmp.po xg-test7.po"
: ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --add-comments -d xg-test7 xg-test7.c
+${XGETTEXT} --omit-header --add-comments -d xg-test7.tmp xg-test7.c
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-test7.tmp.po > xg-test7.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-test7.ok"
label ("pigeon");
EOF
-tmpfiles="$tmpfiles xg-test9.po"
+tmpfiles="$tmpfiles xg-test9.tmp.po xg-test9.po"
: ${XGETTEXT=xgettext}
${XGETTEXT} --omit-header \
--keyword=label:1,\"xhtml-format\",\"xml-format\" \
--keyword=title:1,\"xhtml-format\",\"xml-format\" \
- -d xg-test9 xg-test9.c
+ -d xg-test9.tmp xg-test9.c
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-test9.tmp.po > xg-test9.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-test9.ok"
print _"The Fabulous Four"
EOF
-tmpfiles="$tmpfiles xg-a-1.po"
+tmpfiles="$tmpfiles xg-a-1.tmp.po xg-a-1.po"
: ${XGETTEXT=xgettext}
${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
- -d xg-a-1 xg-a-1.awk
+ -d xg-a-1.tmp xg-a-1.awk
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-a-1.tmp.po > xg-a-1.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-a-1.ok"
tmpfiles=""
trap 'rm -fr $tmpfiles' 1 2 3 15
-tmpfiles="$tmpfiles xg-c-1.po"
+tmpfiles="$tmpfiles xg-c-1.tmp.po xg-c-1.po"
: ${XGETTEXT=xgettext}
-${XGETTEXT} -d xg-c-1 -k_ --omit-header --no-location \
+${XGETTEXT} -d xg-c-1.tmp -k_ --omit-header --no-location \
$top_srcdir/src/xgettext.c $top_srcdir/src/msgfmt.c
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-c-1.tmp.po > xg-c-1.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
: ${DIFF=diff}
${DIFF} $top_srcdir/tests/xg-c-1.ok.po xg-c-1.po
print (tr ("open", "File"));
EOF
-tmpfiles="$tmpfiles xg-c-10.po"
+tmpfiles="$tmpfiles xg-c-10.tmp.po xg-c-10.po"
: ${XGETTEXT=xgettext}
${XGETTEXT} --omit-header --no-location \
--keyword=i18n:1 --keyword=i18n:1c,2 --keyword=tr:1 --keyword=tr:1,2c \
- -d xg-c-10 xg-c-10.c
+ -d xg-c-10.tmp xg-c-10.c
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-c-10.tmp.po > xg-c-10.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-c-10.ok"
print (i18n ("error", "errors", 7));
EOF
-tmpfiles="$tmpfiles xg-c-11.po"
+tmpfiles="$tmpfiles xg-c-11.tmp.po xg-c-11.po"
: ${XGETTEXT=xgettext}
${XGETTEXT} --omit-header --no-location \
--keyword=i18n:1 --keyword=i18n:1c,2,2t --keyword=i18n:1,2,3t \
- -d xg-c-11 xg-c-11.c
+ -d xg-c-11.tmp xg-c-11.c
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-c-11.tmp.po > xg-c-11.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-c-11.ok"
gettext ("%1% on, %2% off");
EOF
-tmpfiles="$tmpfiles xg-c-12.po"
+tmpfiles="$tmpfiles xg-c-12.tmp.po xg-c-12.po"
: ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-c-12 xg-c-12.c
+${XGETTEXT} --omit-header --no-location -d xg-c-12.tmp xg-c-12.c
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-c-12.tmp.po > xg-c-12.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-c-12.ok"
foo (gettext ("on"));
EOF
-tmpfiles="$tmpfiles xg-c-13.po"
+tmpfiles="$tmpfiles xg-c-13.tmp.po xg-c-13.po"
: ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-c-13 \
+${XGETTEXT} --omit-header --no-location -d xg-c-13.tmp \
--flag=foo:1:qt-format --flag=gettext:1:pass-qt-format --qt \
xg-c-13.cc
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-c-13.tmp.po > xg-c-13.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-c-13.ok"
cat <<EOF > xg-c-13.ok
gettext("heuristic %1% on, %2% off");
EOF
-tmpfiles="$tmpfiles xg-c-14.po"
+tmpfiles="$tmpfiles xg-c-14.tmp.po xg-c-14.po"
: ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-c-14 --boost xg-c-14.cc
+${XGETTEXT} --omit-header --no-location -d xg-c-14.tmp --boost xg-c-14.cc
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-c-14.tmp.po > xg-c-14.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
# The first 4 are not marked as c-format, because they are known as
print (Q_ ("Menu|Recent File", "Menu|Recent Files"));
EOF
-tmpfiles="$tmpfiles xg-c-15.po"
+tmpfiles="$tmpfiles xg-c-15.tmp.po xg-c-15.po"
: ${XGETTEXT=xgettext}
${XGETTEXT} --omit-header --no-location \
--keyword=Q_:1g --keyword=Q_:1g,2g \
- -d xg-c-15 xg-c-15.c
+ -d xg-c-15.tmp xg-c-15.c
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-c-15.tmp.po > xg-c-15.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-c-15.ok"
)
EOF
-tmpfiles="$tmpfiles xg-c-2.po"
+tmpfiles="$tmpfiles xg-c-2.tmp.po xg-c-2.po"
: ${XGETTEXT=xgettext}
-${XGETTEXT} -d xg-c-2 -k_ --omit-header --no-location xg-c-2.in.c
+${XGETTEXT} -d xg-c-2.tmp -k_ --omit-header --no-location xg-c-2.in.c
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-c-2.tmp.po > xg-c-2.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-c-2.ok"
gettext("nothing");
EOF
-tmpfiles="$tmpfiles xg-c-3.po"
+tmpfiles="$tmpfiles xg-c-3.tmp.po xg-c-3.po"
: ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --add-location -d xg-c-3 xg-c-3.in.c
+${XGETTEXT} --omit-header --add-location -d xg-c-3.tmp xg-c-3.in.c
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-c-3.tmp.po > xg-c-3.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-c-3.ok"
main()??<printf(gettext("Hello, " "World!" "??/n")); ??>
EOF
-tmpfiles="$tmpfiles xg-c-4.po"
+tmpfiles="$tmpfiles xg-c-4.tmp.po xg-c-4.po"
: ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location --trigraphs -d xg-c-4 xg-c-4.in.c
+${XGETTEXT} --omit-header --no-location --trigraphs -d xg-c-4.tmp xg-c-4.in.c
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-c-4.tmp.po > xg-c-4.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-c-4.ok"
main(){printf(gettext/*puke*/(/*barf*/"Hello, " "World!" "\n")); }
EOF
-tmpfiles="$tmpfiles xg-c-5.po"
+tmpfiles="$tmpfiles xg-c-5.tmp.po xg-c-5.po"
: ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location --add-comments -d xg-c-5 xg-c-5.in.cc
+${XGETTEXT} --omit-header --no-location --add-comments -d xg-c-5.tmp xg-c-5.in.cc
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-c-5.tmp.po > xg-c-5.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-c-5.ok"
dgettext ("bar", "!");
EOF
-tmpfiles="$tmpfiles xg-c-6.po"
+tmpfiles="$tmpfiles xg-c-6.tmp.po xg-c-6.po"
: ${XGETTEXT=xgettext}
${XGETTEXT} --omit-header --no-location --add-comments=XXX \
- -d xg-c-6 xg-c-6.in.C
+ -d xg-c-6.tmp xg-c-6.in.C
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-c-6.tmp.po > xg-c-6.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-c-6.ok"
}
EOF
-tmpfiles="$tmpfiles xg-c-7.po"
+tmpfiles="$tmpfiles xg-c-7.tmp.po xg-c-7.po"
: ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -c --c++ -d xg-c-7 xg-c-7.c
+${XGETTEXT} --omit-header --no-location -c --c++ -d xg-c-7.tmp xg-c-7.c
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-c-7.tmp.po > xg-c-7.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-c-7.ok"
}
EOF
-tmpfiles="$tmpfiles xg-c-8.po"
+tmpfiles="$tmpfiles xg-c-8.tmp xg-c-8.po"
: ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -k_ -o xg-c-8.po xg-c-8.c
+${XGETTEXT} --omit-header --no-location -k_ -o xg-c-8.tmp xg-c-8.c
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-c-8.tmp > xg-c-8.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-c-8.ok"
"verbose string"));
EOF
-tmpfiles="$tmpfiles xg-c-9.po"
+tmpfiles="$tmpfiles xg-c-9.tmp.po xg-c-9.po"
: ${XGETTEXT=xgettext}
${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
- -d xg-c-9 xg-c-9.c
+ -d xg-c-9.tmp xg-c-9.c
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-c-9.tmp.po > xg-c-9.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-c-9.ok"
}
EOF
-tmpfiles="$tmpfiles xg-cs-1.po"
+tmpfiles="$tmpfiles xg-cs-1.tmp.po xg-cs-1.po"
: ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -c -d xg-cs-1 xg-cs-1.cs
+${XGETTEXT} --omit-header --no-location -c -d xg-cs-1.tmp xg-cs-1.cs
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-cs-1.tmp.po > xg-cs-1.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-cs-1.ok"
}
EOF
-tmpfiles="$tmpfiles xg-cs-4.po"
+tmpfiles="$tmpfiles xg-cs-4.tmp.po xg-cs-4.po"
: ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location --keyword=MyPluralString:2,3 -d xg-cs-4 xg-cs-4.cs
+${XGETTEXT} --omit-header --no-location --keyword=MyPluralString:2,3 \
+ -d xg-cs-4.tmp xg-cs-4.cs
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-cs-4.tmp.po > xg-cs-4.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-cs-4.ok"
+ "verbose string"));
EOF
-tmpfiles="$tmpfiles xg-cs-5.po"
+tmpfiles="$tmpfiles xg-cs-5.tmp.po xg-cs-5.po"
: ${XGETTEXT=xgettext}
${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
- -d xg-cs-5 xg-cs-5.cs
+ -d xg-cs-5.tmp xg-cs-5.cs
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-cs-5.tmp.po > xg-cs-5.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-cs-5.ok"
(princ (_ "The Fabulous Four"))
EOF
-tmpfiles="$tmpfiles xg-el-1.po"
+tmpfiles="$tmpfiles xg-el-1.tmp.po xg-el-1.po"
: ${XGETTEXT=xgettext}
${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
- -d xg-el-1 xg-el-1.el
+ -d xg-el-1.tmp xg-el-1.el
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-el-1.tmp.po > xg-el-1.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-el-1.ok"
}
EOF
-tmpfiles="$tmpfiles xg-j-1.po"
+tmpfiles="$tmpfiles xg-j-1.tmp.po xg-j-1.po"
: ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -c -d xg-j-1 xg-j-1.java
+${XGETTEXT} --omit-header --no-location -c -d xg-j-1.tmp xg-j-1.java
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-j-1.tmp.po > xg-j-1.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-j-1.ok"
}
EOF
-tmpfiles="$tmpfiles xg-j-3.po"
+tmpfiles="$tmpfiles xg-j-3.tmp.po xg-j-3.po"
: ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-j-3 xg-j-3.java
+${XGETTEXT} --omit-header --no-location -d xg-j-3.tmp xg-j-3.java
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-j-3.tmp.po > xg-j-3.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-j-3.ok"
}
EOF
-tmpfiles="$tmpfiles xg-j-4.po"
+tmpfiles="$tmpfiles xg-j-4.tmp.po xg-j-4.po"
: ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location --keyword=ngettext:2,3 -d xg-j-4 xg-j-4.java
+${XGETTEXT} --omit-header --no-location --keyword=ngettext:2,3 \
+ -d xg-j-4.tmp xg-j-4.java
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-j-4.tmp.po > xg-j-4.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-j-4.ok"
+ "verbose string"));
EOF
-tmpfiles="$tmpfiles xg-j-5.po"
+tmpfiles="$tmpfiles xg-j-5.tmp.po xg-j-5.po"
: ${XGETTEXT=xgettext}
${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
- -d xg-j-5 xg-j-5.java
+ -d xg-j-5.tmp xg-j-5.java
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-j-5.tmp.po > xg-j-5.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-j-5.ok"
(princ (_ "The Fabulous Four"))
EOF
-tmpfiles="$tmpfiles xg-lr-1.po"
+tmpfiles="$tmpfiles xg-lr-1.tmp.po xg-lr-1.po"
: ${XGETTEXT=xgettext}
${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
- -d xg-lr-1 xg-lr-1.jl
+ -d xg-lr-1.tmp xg-lr-1.jl
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-lr-1.tmp.po > xg-lr-1.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-lr-1.ok"
(write-line (gettext "The Fabulous Four"))
EOF
-tmpfiles="$tmpfiles xg-ls-1.po"
+tmpfiles="$tmpfiles xg-ls-1.tmp.po xg-ls-1.po"
: ${XGETTEXT=xgettext}
${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
- -d xg-ls-1 xg-ls-1.lisp
+ -d xg-ls-1.tmp xg-ls-1.lisp
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-ls-1.tmp.po > xg-ls-1.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-ls-1.ok"
NSLocalizedString(@"Information", @"")
EOF
-tmpfiles="$tmpfiles xg-ob-1.po"
+tmpfiles="$tmpfiles xg-ob-1.tmp.po xg-ob-1.po"
: ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header -k_ -kNSLocalizedString -d xg-ob-1 xg-ob-1.m
+${XGETTEXT} --omit-header -k_ -kNSLocalizedString -d xg-ob-1.tmp xg-ob-1.m
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-ob-1.tmp.po > xg-ob-1.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-ob-1.ok"
@ "verbose string"));
EOF
-tmpfiles="$tmpfiles xg-ob-2.po"
+tmpfiles="$tmpfiles xg-ob-2.tmp.po xg-ob-2.po"
: ${XGETTEXT=xgettext}
${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
- -d xg-ob-2 xg-ob-2.m
+ -d xg-ob-2.tmp xg-ob-2.m
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-ob-2.tmp.po > xg-ob-2.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-ob-2.ok"
gettext "Discarded!";
EOF
-tmpfiles="$tmpfiles xg-pl-1.po"
+tmpfiles="$tmpfiles xg-pl-1.tmp.po 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 \
- -d xg-pl-1 xg-pl-1.pl
+ -d xg-pl-1.tmp xg-pl-1.pl
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-pl-1.tmp.po > xg-pl-1.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-pl-1.ok"
# "\x{430}\x{447}\x{43a}\x{430}\n";
EOPERL
-tmpfiles="$tmpfiles xg-pl-4.pot"
+tmpfiles="$tmpfiles xg-pl-4.tmp.pot xg-pl-4.pot"
: ${XGETTEXT=xgettext}
LC_MESSAGES=C LC_ALL= \
-${XGETTEXT} -a --omit-header --no-location -o xg-pl-4.pot xg-pl-4.pl
+${XGETTEXT} -a --omit-header --no-location -o xg-pl-4.tmp.pot xg-pl-4.pl
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-pl-4.tmp.pot > xg-pl-4.pot
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-pl-4.ok"
print gettext "The Fabulous Four";
EOF
-tmpfiles="$tmpfiles xg-pl-5.po"
+tmpfiles="$tmpfiles xg-pl-5.tmp.po xg-pl-5.po"
: ${XGETTEXT=xgettext}
${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
- -d xg-pl-5 xg-pl-5.pl
+ -d xg-pl-5.tmp xg-pl-5.pl
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-pl-5.tmp.po > xg-pl-5.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-pl-5.ok"
print dgettext foo 17, "extracted16";
EOPERL
-tmpfiles="$tmpfiles xg-pl-6.pot"
+tmpfiles="$tmpfiles xg-pl-6.tmp xg-pl-6.pot"
: ${XGETTEXT=xgettext}
LC_MESSAGES=C LC_ALL= \
-${XGETTEXT} --omit-header --no-location -o xg-pl-6.pot xg-pl-6.pl
+${XGETTEXT} --omit-header --no-location -o xg-pl-6.tmp xg-pl-6.pl
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-pl-6.tmp > xg-pl-6.pot
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-pl-6.ok"
?>
EOF
-tmpfiles="$tmpfiles xg-ph-1.po"
+tmpfiles="$tmpfiles xg-ph-1.tmp.po xg-ph-1.po"
: ${XGETTEXT=xgettext}
${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
- -d xg-ph-1 xg-ph-1.php
+ -d xg-ph-1.tmp xg-ph-1.php
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-ph-1.tmp.po > xg-ph-1.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-ph-1.ok"
?>
EOF
-tmpfiles="$tmpfiles xg-ph-2.po"
+tmpfiles="$tmpfiles xg-ph-2.tmp.po xg-ph-2.po"
: ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-ph-2 xg-ph-2.php
+${XGETTEXT} --omit-header --no-location -d xg-ph-2.tmp xg-ph-2.php
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-ph-2.tmp.po > xg-ph-2.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-ph-2.ok"
}
EOF
-tmpfiles="$tmpfiles xg-po-1.po"
+tmpfiles="$tmpfiles xg-po-1.tmp.po xg-po-1.po"
: ${XGETTEXT=xgettext}
${XGETTEXT} --omit-header -n \
- -d xg-po-1 xg-po-1.in.po xg-po-1.c xg-po-1.cc
+ -d xg-po-1.tmp xg-po-1.in.po xg-po-1.c xg-po-1.cc
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-po-1.tmp.po > xg-po-1.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-po-1.ok"
}
EOF
-tmpfiles="$tmpfiles xg-pr-1.po"
+tmpfiles="$tmpfiles xg-pr-1.tmp.po xg-pr-1.po"
: ${XGETTEXT=xgettext}
${XGETTEXT} --omit-header -n \
- -d xg-pr-1 xg-pr-1.in.properties xg-pr-1.c xg-pr-1.cc
+ -d xg-pr-1.tmp xg-pr-1.in.properties xg-pr-1.c xg-pr-1.cc
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-pr-1.tmp.po > xg-pr-1.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-pr-1.ok"
"verbose string")
EOF
-tmpfiles="$tmpfiles xg-py-2.po"
+tmpfiles="$tmpfiles xg-py-2.tmp.po xg-py-2.po"
: ${XGETTEXT=xgettext}
${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
- -d xg-py-2 xg-py-2.py
+ -d xg-py-2.tmp xg-py-2.py
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-py-2.tmp.po > xg-py-2.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-py-2.ok"
(display (_ "The Fabulous Four"))
EOF
-tmpfiles="$tmpfiles xg-sc-1.po"
+tmpfiles="$tmpfiles xg-sc-1.tmp.po xg-sc-1.po"
: ${XGETTEXT=xgettext}
${XGETTEXT} -k_ --omit-header --no-location --add-comments=TRANSLATORS: \
- -d xg-sc-1 xg-sc-1.scm
+ -d xg-sc-1.tmp xg-sc-1.scm
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-sc-1.tmp.po > xg-sc-1.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-sc-1.ok"
echo "`echo "\`ngettext 'depth_2_11_squote_8_semi \\\\\\\\;'\`"`"
EOF
-tmpfiles="$tmpfiles xg-sh-1.po"
+tmpfiles="$tmpfiles xg-sh-1.tmp.po xg-sh-1.po"
: ${XGETTEXT=xgettext}
# Here we use ngettext with two signatures: ngettext:1 and ngettext:1,2.
${XGETTEXT} --omit-header --no-location --keyword=ngettext:1 \
- -d xg-sh-1 xg-sh-1.sh
+ -d xg-sh-1.tmp xg-sh-1.sh
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-sh-1.tmp.po > xg-sh-1.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-sh-1.ok"
gettext "The Fabulous Four"
EOF
-tmpfiles="$tmpfiles xg-sh-2.po"
+tmpfiles="$tmpfiles xg-sh-2.tmp.po xg-sh-2.po"
: ${XGETTEXT=xgettext}
${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
- -d xg-sh-2 xg-sh-2.sh
+ -d xg-sh-2.tmp xg-sh-2.sh
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-sh-2.tmp.po > xg-sh-2.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-sh-2.ok"
echo `gettext 'abc\"def'`
EOF
-tmpfiles="$tmpfiles xg-sh-3.po"
+tmpfiles="$tmpfiles xg-sh-3.tmp.po xg-sh-3.po"
: ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-sh-3 xg-sh-3.sh
+${XGETTEXT} --omit-header --no-location -d xg-sh-3.tmp xg-sh-3.sh
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-sh-3.tmp.po > xg-sh-3.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-sh-3.ok"
echo "`echo "\`echo $"depth_2_11_bashquote_8_\\\\\\\\$var"\`"`"
EOF
-tmpfiles="$tmpfiles xg-sh-4.err xg-sh-4.po"
+tmpfiles="$tmpfiles xg-sh-4.err xg-sh-4.tmp.po xg-sh-4.po"
: ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-sh-4 xg-sh-4.sh 2>xg-sh-4.err
+${XGETTEXT} --omit-header --no-location -d xg-sh-4.tmp xg-sh-4.sh 2>xg-sh-4.err
test $? = 0 || { cat xg-sh-4.err; rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-sh-4.tmp.po > xg-sh-4.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-sh-4.ok"
cat <<\EOF > xg-sh-4.ok
echo "$(gettext "Simple decorated dstring: \"x\" \\\"y\\\" inside double-quotes")"
EOF
-tmpfiles="$tmpfiles xg-sh-5.po"
+tmpfiles="$tmpfiles xg-sh-5.tmp.po xg-sh-5.po"
: ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-sh-5 xg-sh-5.sh
+${XGETTEXT} --omit-header --no-location -d xg-sh-5.tmp xg-sh-5.sh
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-sh-5.tmp.po > xg-sh-5.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-sh-5.ok"
Transcript showCr: (NLS ? 'The Fabulous Four').
EOF
-tmpfiles="$tmpfiles xg-st-1.po"
+tmpfiles="$tmpfiles xg-st-1.tmp.po xg-st-1.po"
: ${XGETTEXT=xgettext}
${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
- -d xg-st-1 xg-st-1.st
+ -d xg-st-1.tmp xg-st-1.st
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-st-1.tmp.po > xg-st-1.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-st-1.ok"
puts [_ "The Fabulous Four"]
EOF
-tmpfiles="$tmpfiles xg-t-2.po"
+tmpfiles="$tmpfiles xg-t-2.tmp.po xg-t-2.po"
: ${XGETTEXT=xgettext}
${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: -k_ \
- -d xg-t-2 xg-t-2.tcl
+ -d xg-t-2.tmp xg-t-2.tcl
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-t-2.tmp.po > xg-t-2.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-t-2.ok"
title = sformat (_("%1 package", "%1 packages", num), num);
EOF
-tmpfiles="$tmpfiles xg-y-1.po"
+tmpfiles="$tmpfiles xg-y-1.tmp.po xg-y-1.po"
: ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -k:1,2 -d xg-y-1 xg-y-1.ycp
+${XGETTEXT} --omit-header --no-location -k:1,2 -d xg-y-1.tmp xg-y-1.ycp
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-y-1.tmp.po > xg-y-1.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-y-1.ok"
print (_("The Fabulous Four"));
EOF
-tmpfiles="$tmpfiles xg-y-2.po"
+tmpfiles="$tmpfiles xg-y-2.tmp.po xg-y-2.po"
: ${XGETTEXT=xgettext}
${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
- -d xg-y-2 xg-y-2.ycp
+ -d xg-y-2.tmp xg-y-2.ycp
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-y-2.tmp.po > xg-y-2.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-y-2.ok"
"Ringo"));
EOF
-tmpfiles="$tmpfiles xg-y-3.po"
+tmpfiles="$tmpfiles xg-y-3.tmp.po xg-y-3.po"
: ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-y-3 xg-y-3.ycp
+${XGETTEXT} --omit-header --no-location -d xg-y-3.tmp xg-y-3.ycp
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+tr -d '\r' < xg-y-3.tmp.po > xg-y-3.po
test $? = 0 || { rm -fr $tmpfiles; exit 1; }
tmpfiles="$tmpfiles xg-y-3.ok"
projects / thirdparty / gettext.git / commitdiff
