Merge branch 'master' into master-sqlserver

Conflicts:
	lib/db.php
	lib/files/cache/cache.php
	lib/files/cache/legacy.php
	lib/setup.php

1 files changed, 29 insertions, 29 deletions

diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index e247c006708..b4bd8a2d9ba 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-14 00:05+0100\n"
+"PO-Revision-Date: 2013-02-13 22:01+0000\n"
+"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,23 +28,23 @@ msgstr ""
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
-msgstr ""
+msgstr "Löschen der Serverkonfiguration fehlgeschlagen"
 
 #: ajax/testConfiguration.php:35
 msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "Die Konfiguration war erfolgreich, die Verbindung konnte hergestellt werden!"
 
 #: ajax/testConfiguration.php:37
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
-msgstr ""
+msgstr "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfen Sie die Servereinstellungen und die Anmeldeinformationen."
 
 #: ajax/testConfiguration.php:40
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
-msgstr ""
+msgstr "Die Konfiguration ist ungültig, bitte sehen Sie für weitere Details im ownCloud Log nach"
 
 #: js/settings.js:66
 msgid "Deletion failed"
@@ -52,7 +52,7 @@ msgstr "Löschen fehlgeschlagen"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
-msgstr ""
+msgstr "Einstellungen von letzter Konfiguration übernehmen?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
@@ -60,23 +60,23 @@ msgstr "Einstellungen beibehalten?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
-msgstr ""
+msgstr "Serverkonfiguration konnte nicht hinzugefügt werden."
 
 #: js/settings.js:121
 msgid "Connection test succeeded"
-msgstr ""
+msgstr "Verbindungstest erfolgreich"
 
 #: js/settings.js:126
 msgid "Connection test failed"
-msgstr ""
+msgstr "Verbindungstest fehlgeschlagen"
 
 #: js/settings.js:136
 msgid "Do you really want to delete the current Server Configuration?"
-msgstr ""
+msgstr "Wollen Sie die aktuelle Serverkonfiguration wirklich löschen?"
 
 #: js/settings.js:137
 msgid "Confirm Deletion"
-msgstr ""
+msgstr "Löschung bestätigen"
 
 #: templates/settings.php:8
 msgid ""
@@ -93,11 +93,11 @@ msgstr "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird d
 
 #: templates/settings.php:15
 msgid "Server configuration"
-msgstr ""
+msgstr "Serverkonfiguration"
 
 #: templates/settings.php:17
 msgid "Add Server Configuration"
-msgstr ""
+msgstr "Serverkonfiguration hinzufügen"
 
 #: templates/settings.php:21
 msgid "Host"
@@ -181,15 +181,15 @@ msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\""
 
 #: templates/settings.php:31
 msgid "Connection Settings"
-msgstr ""
+msgstr "Verbindungseinstellungen"
 
 #: templates/settings.php:33
 msgid "Configuration Active"
-msgstr ""
+msgstr "Konfiguration aktiv"
 
 #: templates/settings.php:33
 msgid "When unchecked, this configuration will be skipped."
-msgstr ""
+msgstr "Konfiguration wird übersprungen wenn deaktiviert"
 
 #: templates/settings.php:34
 msgid "Port"
@@ -197,25 +197,25 @@ msgstr "Port"
 
 #: templates/settings.php:35
 msgid "Backup (Replica) Host"
-msgstr ""
+msgstr "Backup Host (Kopie)"
 
 #: templates/settings.php:35
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
-msgstr ""
+msgstr "Gib einen optionalen Backup Host an. Es muss sich um eine kopie des Haupt LDAP/AD Servers handeln."
 
 #: templates/settings.php:36
 msgid "Backup (Replica) Port"
-msgstr ""
+msgstr "Backup Port"
 
 #: templates/settings.php:37
 msgid "Disable Main Server"
-msgstr ""
+msgstr "Hauptserver deaktivieren"
 
 #: templates/settings.php:37
 msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr ""
+msgstr "Wenn aktiviert  wird ownCloud ausschließlich den Backupserver verwenden"
 
 #: templates/settings.php:38
 msgid "Use TLS"
@@ -223,7 +223,7 @@ msgstr "Nutze TLS"
 
 #: templates/settings.php:38
 msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr ""
+msgstr "Benutze es nicht zusätzlich für LDAPS Verbindungen, es wird scheitern."
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
@@ -249,7 +249,7 @@ msgstr "in Sekunden. Eine Änderung leert den Cache."
 
 #: templates/settings.php:43
 msgid "Directory Settings"
-msgstr ""
+msgstr "Ordnereinstellungen"
 
 #: templates/settings.php:45
 msgid "User Display Name Field"
@@ -269,11 +269,11 @@ msgstr "Ein Benutzer Base DN pro Zeile"
 
 #: templates/settings.php:47
 msgid "User Search Attributes"
-msgstr ""
+msgstr "Benutzersucheigenschaften"
 
 #: templates/settings.php:47 templates/settings.php:50
 msgid "Optional; one attribute per line"
-msgstr ""
+msgstr "Optional, eine Eigenschaft pro Zeile"
 
 #: templates/settings.php:48
 msgid "Group Display Name Field"
@@ -293,7 +293,7 @@ msgstr "Ein Gruppen Base DN pro Zeile"
 
 #: templates/settings.php:50
 msgid "Group Search Attributes"
-msgstr ""
+msgstr "Gruppensucheigenschaften"
 
 #: templates/settings.php:51
 msgid "Group-Member association"
@@ -301,7 +301,7 @@ msgstr "Assoziation zwischen Gruppe und Benutzer"
 
 #: templates/settings.php:53
 msgid "Special Attributes"
-msgstr ""
+msgstr "Spezielle Eigenschaften"
 
 #: templates/settings.php:56
 msgid "in bytes"