Merge branch 'master' of gitorious.org:mahara/mahara-scripts

mahara-langpacks/langpacks.sh

@@ -43,7 +43,7 @@ echo "Checking langpacks for updates: `date \"+%Y-%m-%d %H:%M:%S\"`"
 [ ! -d ${CLEAN} ] && mkdir ${CLEAN}
 [ ! -d ${TARBALLS} ] && mkdir ${TARBALLS}
 
-langs="ca cs de en_us es eu fi fr he it ja ko nl no_nb sl zh_tw"
+langs="ca cs da de en_us es eu fi fr he it ja ko nl no_nb ru_ru sl zh_tw"
 
 for lang in ${langs} ; do
 
@@ -93,7 +93,7 @@ for lang in ${langs} ; do
                 git checkout --quiet -b ${localbranch} ${remotebranch}
             else
                 git checkout --quiet ${localbranch}
-                git pull --quiet
+                git reset --hard -q ${remotebranch}
             fi
 
             dirtybranchdir=${dirtylangdir}/${localbranch}