as nobody read this nobody will notice my stupid bug

1 files changed, 0 insertions, 1 deletions

diff --git a/i18n/status.sh b/i18n/status.sh
index 2eef724..b669bf2 100755
--- a/i18n/status.sh
+++ b/i18n/status.sh
@@ -5,25 +5,24 @@ if [ x${arg}x = xx ]
 then
 	arg=.
 	foo="all"
 fi
 
 echo "Status of $foo"
 echo
 
 #general figures
 echo "Status of $foo"
 echo
 
->>>>>>> 1.4
 echo "number of strings: "
 strs=`find $arg -name "*.ts" -exec cat {} \; | grep translation | wc -l`
 echo $strs
 echo "unfinished: "
 unfi=`find $arg -name "*.ts" -exec cat {} \; | grep translation | grep type=\"unfinished\" | wc -l`
 echo $unfi", that means" `expr \( $strs - $unfi \) \* 100 / $strs`% "are done"
 echo "obsolete: "
 obso=`find $arg -name "*.ts" -exec cat {} \; | grep translation | grep type=\"obsolete\" | wc -l`
 echo $obso `expr \( $strs - $obso \) \* 100 / $strs`%
 
 #from here on we will only look at the core-parts. All numbers have to be 0% if
 #the specific language will be in the official release.