Merge branch 'master' of git://anongit.kde.org/owncloud into autoload

Conflicts:
	lib/base.php
	lib/filestorage.php

6 files changed, 9 insertions, 13 deletions

diff --git a/l10n/l10n.pl b/l10n/l10n.pl
index 0ad33d2116b..b993727e8f1 100644
--- a/l10n/l10n.pl
+++ b/l10n/l10n.pl
@@ -3,6 +3,7 @@ use strict;
 use Locale::PO;
 use Cwd;
 use Data::Dumper;
+use File::Path;
 
 sub crawl{
 	my( $dir ) = @_;
@@ -28,7 +29,7 @@ sub crawl{
 my $task = shift( @ARGV );
 my $place = '..';
 
-die( "Usuage: l10n.pl task\ntask: read, write\n") unless $task && $place;
+die( "Usage: l10n.pl task\ntask: read, write\n" ) unless $task && $place;
 
 # Our current position
 my $whereami = cwd();
@@ -38,6 +39,7 @@ die( "Program must be executed in a l10n-folder called 'l10n'" ) unless $wheream
 my @dirs = crawl( $place );
 
 # Languages
+rmtree( 'templates' );
 mkdir( 'templates' ) unless -d 'templates';
 
 my @languages = ();
@@ -55,13 +57,7 @@ if( $task eq 'read' ){
 		my $app = pop( @temp );
 		chdir( $dir );
 		my $output = "${whereami}/templates/$app.pot";
-			
-		if( -e $output ){
-			`xgettext --files-from=xgettextfiles --join-existing --output="$output" --keyword=t`
-		}
-		else{
-			`xgettext --files-from=xgettextfiles --output="$output" --keyword=t`
-		}
+		`xgettext --files-from=xgettextfiles --output="$output" --keyword=t`;
 		chdir( $whereami );
 	}
 }
diff --git a/l10n/templates/admin.pot b/l10n/templates/admin.pot
index 411ecacce97..d6233365185 100644
--- a/l10n/templates/admin.pot
+++ b/l10n/templates/admin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 08:52+0200\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 8b73bf7ef10..6bcadf8cfc7 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 08:52+0200\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/help.pot b/l10n/templates/help.pot
index 362fdf123d7..e5ffb5a4cf5 100644
--- a/l10n/templates/help.pot
+++ b/l10n/templates/help.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 08:52+0200\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/log.pot b/l10n/templates/log.pot
index 54b633c2f1b..ea98e5c2b14 100644
--- a/l10n/templates/log.pot
+++ b/l10n/templates/log.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 08:52+0200\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 8c077f56889..24e255fa259 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 08:52+0200\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"