fix merge conflicts

8 files changed, 95 insertions, 64 deletions

diff --git a/l10n/de/core.po b/l10n/de/core.po
index b6ea04d4be0..7f2bc3ce5f4 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-25 09:40+0000\n"
+"POT-Creation-Date: 2013-08-04 01:55-0400\n"
+"PO-Revision-Date: 2013-08-04 05:01+0000\n"
 "Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -148,55 +148,55 @@ msgstr "Dezember"
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:715
+#: js/js.js:753
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: js/js.js:716
+#: js/js.js:754
 msgid "1 minute ago"
 msgstr "vor einer Minute"
 
-#: js/js.js:717
+#: js/js.js:755
 msgid "{minutes} minutes ago"
 msgstr "Vor {minutes} Minuten"
 
-#: js/js.js:718
+#: js/js.js:756
 msgid "1 hour ago"
 msgstr "Vor einer Stunde"
 
-#: js/js.js:719
+#: js/js.js:757
 msgid "{hours} hours ago"
 msgstr "Vor {hours} Stunden"
 
-#: js/js.js:720
+#: js/js.js:758
 msgid "today"
 msgstr "Heute"
 
-#: js/js.js:721
+#: js/js.js:759
 msgid "yesterday"
 msgstr "Gestern"
 
-#: js/js.js:722
+#: js/js.js:760
 msgid "{days} days ago"
 msgstr "Vor {days} Tag(en)"
 
-#: js/js.js:723
+#: js/js.js:761
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: js/js.js:724
+#: js/js.js:762
 msgid "{months} months ago"
 msgstr "Vor {months} Monaten"
 
-#: js/js.js:725
+#: js/js.js:763
 msgid "months ago"
 msgstr "Vor Monaten"
 
-#: js/js.js:726
+#: js/js.js:764
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: js/js.js:727
+#: js/js.js:765
 msgid "years ago"
 msgstr "Vor Jahren"
 
@@ -233,7 +233,7 @@ msgstr "Der Objekttyp ist nicht angegeben."
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
 #: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:631 js/share.js:643
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Fehler"
 
@@ -253,7 +253,7 @@ msgstr "Geteilt"
 msgid "Share"
 msgstr "Teilen"
 
-#: js/share.js:131 js/share.js:671
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Fehler beim Teilen"
 
@@ -353,23 +353,23 @@ msgstr "löschen"
 msgid "share"
 msgstr "teilen"
 
-#: js/share.js:398 js/share.js:618
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Durch ein Passwort geschützt"
 
-#: js/share.js:631
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Fehler beim Entfernen des Ablaufdatums"
 
-#: js/share.js:643
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Fehler beim Setzen des Ablaufdatums"
 
-#: js/share.js:658
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "Sende ..."
 
-#: js/share.js:669
+#: js/share.js:681
 msgid "Email sent"
 msgstr "E-Mail wurde verschickt"
 
@@ -468,7 +468,7 @@ msgstr "Hilfe"
 msgid "Access forbidden"
 msgstr "Zugriff verboten"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Cloud nicht gefunden"
 
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 0d09722c430..03ee7749156 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-23 01:55-0400\n"
-"PO-Revision-Date: 2013-07-23 05:04+0000\n"
+"POT-Creation-Date: 2013-08-02 01:55-0400\n"
+"PO-Revision-Date: 2013-08-02 05:40+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -124,7 +124,7 @@ msgstr "Teilen"
 msgid "Delete permanently"
 msgstr "Endgültig löschen"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Löschen"
 
@@ -132,7 +132,7 @@ msgstr "Löschen"
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
 msgid "Pending"
 msgstr "Ausstehend"
 
@@ -164,11 +164,11 @@ msgstr "rückgängig machen"
 msgid "perform delete operation"
 msgstr "Löschvorgang ausführen"
 
-#: js/filelist.js:457
+#: js/filelist.js:458
 msgid "1 file uploading"
 msgstr "1 Datei wird hochgeladen"
 
-#: js/filelist.js:460 js/filelist.js:518
+#: js/filelist.js:461 js/filelist.js:519
 msgid "files uploading"
 msgstr "Dateien werden hoch geladen"
 
@@ -204,15 +204,15 @@ msgstr "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas d
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten."
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Geändert"
 
@@ -289,45 +289,45 @@ msgstr "Ordner"
 msgid "From link"
 msgstr "Von einem Link"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Gelöschte Dateien"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You don’t have write permissions here."
 msgstr "Du hast hier keine Schreib-Berechtigung."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Alles leer. Lade etwas hoch!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Freigabe aufheben"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Der Upload ist zu groß"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Scanne"
 
diff --git a/l10n/de/files_encryption.po b/l10n/de/files_encryption.po
index aa7ff7b7d98..2162f985814 100644
--- a/l10n/de/files_encryption.po
+++ b/l10n/de/files_encryption.po
@@ -7,14 +7,15 @@
 # Stephan Köninger <mail@stekoe.de>, 2013
 # ninov <ninovdl@ymail.com>, 2013
 # Pwnicorn <pwnicorndev@gmail.com>, 2013
+# thillux, 2013
 # kabum <uu.kabum@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-12 02:03+0200\n"
-"PO-Revision-Date: 2013-07-11 12:50+0000\n"
-"Last-Translator: kabum <uu.kabum@gmail.com>\n"
+"POT-Creation-Date: 2013-08-05 07:52-0400\n"
+"PO-Revision-Date: 2013-08-04 18:40+0000\n"
+"Last-Translator: thillux\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -77,6 +78,10 @@ msgid ""
 "app has been disabled."
 msgstr "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert ist und die OpenSSL-PHP-Erweiterung aktiviert und richtig konfiguriert ist. Die Verschlüsselungsanwendung wurde vorerst deaktiviert."
 
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
+msgstr "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:"
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Speichern..."
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index 8ca29758236..5984d3c31d9 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mario Siegmann <mario_siegmann@web.de>, 2013
 # Pwnicorn <pwnicorndev@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-23 01:55-0400\n"
-"PO-Revision-Date: 2013-07-23 05:05+0000\n"
-"Last-Translator: Pwnicorn <pwnicorndev@gmail.com>\n"
+"POT-Creation-Date: 2013-08-04 01:55-0400\n"
+"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,28 +31,52 @@ msgstr "Passwort"
 msgid "Submit"
 msgstr "Absenden"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesn’t seem to work anymore."
+msgstr "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren."
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr "Gründe könnten sein:"
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr "Die Elemente wurden entfernt"
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr "Der Link ist abgelaufen"
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr "Teilen ist deaktiviert"
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr "Für mehr Informationen, frage bitte die Person, die dir diesen Link geschickt hat."
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s hat den Ordner %s mit Dir geteilt"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s hat die Datei %s mit Dir geteilt"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Download"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Hochladen"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "Es ist keine Vorschau verfügbar für"
diff --git a/l10n/de/files_trashbin.po b/l10n/de/files_trashbin.po
index 100d4b686b2..e18f6c8e8c8 100644
--- a/l10n/de/files_trashbin.po
+++ b/l10n/de/files_trashbin.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mario Siegmann <mario_siegmann@web.de>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-31 01:55-0400\n"
+"PO-Revision-Date: 2013-07-30 16:42+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,7 +70,7 @@ msgstr "{count} Dateien"
 
 #: lib/trash.php:819 lib/trash.php:821
 msgid "restored"
-msgstr ""
+msgstr "Wiederhergestellt"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index 385b7e941c6..109207a62fc 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-24 15:30+0000\n"
+"POT-Creation-Date: 2013-08-04 01:55-0400\n"
+"PO-Revision-Date: 2013-08-04 05:01+0000\n"
 "Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index ecc5a27ab04..73764b744ad 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-25 09:31+0000\n"
+"POT-Creation-Date: 2013-08-05 07:52-0400\n"
+"PO-Revision-Date: 2013-08-05 11:10+0000\n"
 "Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index a7ea39ff991..a845eb3066f 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-29 01:56-0400\n"
-"PO-Revision-Date: 2013-07-28 16:00+0000\n"
+"POT-Creation-Date: 2013-08-04 01:55-0400\n"
+"PO-Revision-Date: 2013-08-04 05:02+0000\n"
 "Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"