diff --git a/init-po-files b/init-po-files
index 164da99..2cb8aac 100755
--- a/init-po-files
+++ b/init-po-files
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 # Copyright (C) 2009  Andrius Štikonas <andrius@stikonas.eu>
 #
 # This program is free software: you can redistribute it and/or modify
@@ -14,11 +14,11 @@
 # 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`/ths-variables"
+source "$(dirname "$0")/ths-variables"
 source ".ths"
 
 if [ "$1" = "--help" ] || [ "$1" = "-h" ]; then
-    echo "Usage `basename $0` <messages-tree> <pot-tree>"
+    echo "Usage $(basename "$0") <messages-tree> <pot-tree>"
     exit 1
 fi
 
@@ -30,28 +30,29 @@ else
     pot="trunk-kf5/templates/messages"
 fi
 
-wdir="`pwd`"
+wdir=$PWD
 cd "$pot"
-for dir in `ls`; do
-    cd "$dir"
-    podir="$wdir/$messages/$dir"
-    if [ ! -e "$podir" ]; then
-        mkdir "$podir"
-        svn add "$podir"
-    fi
-    for file in `find . -name '*.pot'`; do
-    po=`echo $file | sed 's/.\{1\}$//'`
-    if [ ! -e "$podir/$po" ]; then
-        echo -e $RED"$dir/$po"$ENDCOLOR
-        msginit -i "$file" -o "$podir/$po" --no-translator
-	cd "$podir"
-        svn add "$po"
-	cd "$wdir/$pot/$dir"
-        sed -ie 's/\"Plural-Forms: nplurals=3; plural=(n%10==1 \&\& n%100!=11 ? 0 : n%10>=2 \&\& (n"/"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 \&\& (n%100<10 || n"/
+for dir in */; do
+    (
+        cd "$dir"
+        podir="$wdir/$messages/$dir"
+        if [ ! -e "$podir" ]; then
+            mkdir "$podir"
+            svn add "$podir"
+        fi
+        for file in $(find . -name '*.pot'); do
+            po=$(echo "$file" | sed 's/.\{1\}$//')
+            if [ ! -e "$podir/$po" ]; then
+                echo -e "${RED}${dir}/${po}${ENDCOLOR}"
+                msginit -i "$file" -o "$podir/$po" --no-translator
+	        cd "$podir"
+                svn add "$po"
+	        cd "$wdir/$pot/$dir"
+                sed -ie 's/\"Plural-Forms: nplurals=3; plural=(n%10==1 \&\& n%100!=11 ? 0 : n%10>=2 \&\& (n"/"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 \&\& (n%100<10 || n"/
 s/\"%100<10 || n%100>=20) ? 1 : 2);\\n\"/"%100>=20) ? 1 : n%10==0 || (n%100>10 \&\& n%100<20) ? 2 : 3);\\n"/
 /\"Language: lt\\n\"/d' "$podir/$po"
-        rm "$podir/$po"e
-    fi
-    done
-    cd ..
+                rm "$podir/$po"e
+            fi
+        done
+    )
 done