diff --git a/compile b/compile
index 5d995d9..d5d1962 100755
--- a/compile
+++ b/compile
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-source `dirname $0`/variables
+source "`dirname $0`/variables"
 
 if [ ! $MSGFMT ]; then
 	echo -e $RED"This program needs the msgfmt utility."$ENDCOLOR
diff --git a/pack b/pack
index 26c24c6..7044fdc 100755
--- a/pack
+++ b/pack
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-source `dirname $0`/variables
+source "`dirname $0`/variables"
 
 if [ ! $DIFF ]; then
     echo -e $RED"This program needs the diff utility."$ENDCOLOR
diff --git a/statistics b/statistics
index 6e458fd..1ae2b83 100755
--- a/statistics
+++ b/statistics
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-source `dirname $0`/variables
+source "`dirname $0`/variables"
 
 LC_NUMERIC="en_US.UTF-8"
 ODD_CHARS='�'
diff --git a/update b/update
index 2915060..ddcdbe4 100755
--- a/update
+++ b/update
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-source `dirname $0`/variables
+source "`dirname $0`/variables"
 
 if [ ! $SVN ]; then
 	echo -e $RED"This program needs the svn utility."$ENDCOLOR
@@ -83,21 +83,13 @@ for BRANCH in $TRUNK $BRANCHES; do
 		f=`echo "$stat" | sed -ne 's/.* \([0-9]\+\) fuzzy translation.*/\1/p'`; f=${f:-0}
 		file=$DIR"/"`basename $dir`"."$LCODE".po"
 		if [ -f $dir"/"$LCODE".po" ]; then
-			if [ $(($u+$f)) == 0 ]; then
-				echo -e $GREEN"File is translated."$ENDCOLOR
-				if [ -f $DIR"/"`basename $dir`"."$LCODE".po" ]; then
-					echo -e $GREEN"Removing from $DIR."$ENDCOLOR
-					rm -f $file
-				fi
+			if [ -f "$DIR/"`basename $dir`".$LCODE.po" ]; then
+				echo -e $BLUE"Merging:"$ENDCOLOR
+				$MSGMERGE -U -v $file $dir"/"`basename $dir`".pot"
+				rm -f $file~
 			else
-				if [ -f "$DIR/"`basename $dir`".$LCODE.po" ]; then
-					echo -e $BLUE"Merging:"$ENDCOLOR
-					$MSGMERGE -U -v $file $dir"/"`basename $dir`".pot"
-					rm -f $file~
-				else
-					echo -e $RED"Copying:"$ENDCOLOR
-					cp $dir"/"$LCODE".po" $file
-				fi
+				echo -e $RED"Copying:"$ENDCOLOR
+				cp $dir"/"$LCODE".po" $file
 			fi
 		else
 			if [ ! -f $file ]; then