[network-manager-openconnect] use msgmerge -q
- From: David Woodhouse <dwmw2 src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-openconnect] use msgmerge -q
- Date: Sat, 23 Jun 2012 16:23:45 +0000 (UTC)
commit 7c71489194a35d5742a4a14a386bef783fecb0db
Author: David Woodhouse <David Woodhouse intel com>
Date: Sat Jun 23 18:23:41 2012 +0200
use msgmerge -q
import-strings.sh | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/import-strings.sh b/import-strings.sh
index 2835d90..995ca18 100644
--- a/import-strings.sh
+++ b/import-strings.sh
@@ -96,16 +96,16 @@ for a in po/*.po ; do
echo Comparing $a...
if [ -r $OPENCONNECT_DIR/$a ]; then
msgattrib -F --no-fuzzy $OPENCONNECT_DIR/$a > $a.openconnect 2>/dev/null
- msgmerge -N -F $a -C $a.openconnect po/NetworkManager-openconnect.pot > $a.merged 2>/dev/null
- msgmerge -N -F $a po/NetworkManager-openconnect.pot > $a.unmerged 2>/dev/null
+ msgmerge -q -N -F $a -C $a.openconnect po/NetworkManager-openconnect.pot > $a.merged
+ msgmerge -q -N -F $a po/NetworkManager-openconnect.pot > $a.unmerged
if ! cmp $a.merged $a.unmerged; then
echo New changes for $a
mv $a.merged $a
fi
rm -f $a.openconnect $a.merged $a.unmerged
- msgattrib -F --no-fuzzy $a > $a.nmo 2>/dev/null
- msgmerge -N -F $OPENCONNECT_DIR/$a -C $a.nmo $OPENCONNECT_BUILD_DIR/po/openconnect.pot > $OPENCONNECT_DIR/$a.merged 2>/dev/null
- msgmerge -N -F $OPENCONNECT_DIR/$a $OPENCONNECT_BUILD_DIR/po/openconnect.pot > $OPENCONNECT_DIR/$a.unmerged 2>/dev/null
+ msgattrib -F --no-fuzzy $a > $a.nmo
+ msgmerge -q -N -F $OPENCONNECT_DIR/$a -C $a.nmo $OPENCONNECT_BUILD_DIR/po/openconnect.pot > $OPENCONNECT_DIR/$a.merged
+ msgmerge -q -N -F $OPENCONNECT_DIR/$a $OPENCONNECT_BUILD_DIR/po/openconnect.pot > $OPENCONNECT_DIR/$a.unmerged
if ! cmp $OPENCONNECT_DIR/$a.merged $OPENCONNECT_DIR/$a.unmerged; then
echo New changes for OpenConnect $a
mv $OPENCONNECT_DIR/$a.merged $OPENCONNECT_DIR/$a
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]