* Makevars: Add --no-location to msgmerge arguments.

* update.pl: Likewise.
* update.sh: Likewise.
This commit is contained in:
Pavel Roskin 2005-05-23 03:08:43 +00:00
parent 6b494ddd63
commit 2f70d699ad
4 changed files with 12 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2005-05-22 Pavel Roskin <proski@gnu.org>
* Makevars: Add --no-location to msgmerge arguments.
* update.pl: Likewise.
* update.sh: Likewise.
2005-05-19 Roland Illig <roland.illig@gmx.de> 2005-05-19 Roland Illig <roland.illig@gmx.de>
* de.po: Updated German translation. * de.po: Updated German translation.

View File

@ -39,3 +39,7 @@ MSGID_BUGS_ADDRESS = mc-devel@gnome.org
# This is the list of locale categories, beyond LC_MESSAGES, for which the # This is the list of locale categories, beyond LC_MESSAGES, for which the
# message catalogs shall be used. It is usually empty. # message catalogs shall be used. It is usually empty.
EXTRA_LOCALE_CATEGORIES = EXTRA_LOCALE_CATEGORIES =
# Suppress location information
MSGMERGE = msgmerge --no-location
MSGMERGE_UPDATE = msgmerge --update --no-location

View File

@ -146,7 +146,7 @@ elsif(-s "$LANG.po"){
print "\nNow merging $LANG.po with $PACKAGE.pot, and creating an updated $LANG.po ...\n"; print "\nNow merging $LANG.po with $PACKAGE.pot, and creating an updated $LANG.po ...\n";
$d="mv $LANG.po $LANG.po.old && msgmerge $LANG.po.old $PACKAGE.pot -o $LANG.po"; $d="mv $LANG.po $LANG.po.old && msgmerge --no-location $LANG.po.old $PACKAGE.pot -o $LANG.po";
$f="msgfmt --statistics $LANG.po"; $f="msgfmt --statistics $LANG.po";

View File

@ -60,7 +60,7 @@ xgettext --default-domain=$PACKAGE --directory=.. \
echo "Building the $PACKAGE.pot ..." echo "Building the $PACKAGE.pot ..."
echo "Now merging $1.po with $PACKAGE.pot, and creating an updated $1.po ..." echo "Now merging $1.po with $PACKAGE.pot, and creating an updated $1.po ..."
mv $1.po $1.po.old && msgmerge $1.po.old $PACKAGE.pot -o $1.po \ mv $1.po $1.po.old && msgmerge --no-location $1.po.old $PACKAGE.pot -o $1.po \
&& rm $1.po.old; && rm $1.po.old;
msgfmt --statistics $1.po msgfmt --statistics $1.po