[network-manager-openconnect] remove pointless renames

[David Woodhouse <dwmw2 src gnome org>]

commit 32b8960742dd69e6ef49d616b8313aa50c19c7da
Author: David Woodhouse <David Woodhouse intel com>
Date:   Sat Jun 23 17:17:09 2012 +0200

    remove pointless renames

 import-strings.sh |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/import-strings.sh b/import-strings.sh
index 73d7281..2835d90 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.new 2>/dev/null && mv $a.new $a.merged
-	msgmerge -N -F $a po/NetworkManager-openconnect.pot > $a.new 2>/dev/null && mv $a.new $a.unmerged
+	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
 	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.new 2>/dev/null && mv $OPENCONNECT_DIR/$a.new $OPENCONNECT_DIR/$a.merged
-	msgmerge -N -F $OPENCONNECT_DIR/$a $OPENCONNECT_BUILD_DIR/po/openconnect.pot > $OPENCONNECT_DIR/$a.new 2>/dev/null && mv $OPENCONNECT_DIR/$a.new $OPENCONNECT_DIR/$a.unmerged
+	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
 	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