[network-manager-openconnect] make import bidirectional, sort catalogs, disable fuzzy matches

[David Woodhouse <dwmw2 src gnome org>]

commit 8e51ba0168cfc3edcd9f6ef2336e9054098d0497
Author: David Woodhouse <David Woodhouse intel com>
Date:   Wed Jun 20 15:03:15 2012 +0100

    make import bidirectional, sort catalogs, disable fuzzy matches

 import-strings.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/import-strings.sh b/import-strings.sh
index 17f2852..30eeb0d 100644
--- a/import-strings.sh
+++ b/import-strings.sh
@@ -82,11 +82,11 @@ fi
 
 mv openconnect-strings-$COMMIT.txt openconnect-strings.txt
 
-set -x
 make -C po NetworkManager-openconnect.pot || exit 1
 for a in po/*.po ; do
     if [ -r $OPENCONNECT_DIR/$a ]; then
-	msgmerge $a -C $OPENCONNECT_DIR/$a po/NetworkManager-openconnect.pot > $a.new && mv $a.new $a
+	msgmerge -N -F $a -C $OPENCONNECT_DIR/$a po/NetworkManager-openconnect.pot > $a.new && mv $a.new $a
+	msgmerge -N -F $OPENCONNECT_DIR/$a -C $a $OPENCONNECT_BUILD_DIR/po/openconnect.pot > $OPENCONNECT_DIR/$a.new && mv $OPENCONNECT_DIR/$a.new $OPENCONNECT_DIR/$a
     fi
 done