Merge branch 'master' into clean_up_util

Conflicts:
	lib/base.php

1 files changed, 50 insertions, 62 deletions

diff --git a/l10n/de_CH/files.po b/l10n/de_CH/files.po
index 8befee513b7..95d27fc4a67 100644
--- a/l10n/de_CH/files.po
+++ b/l10n/de_CH/files.po
@@ -5,6 +5,7 @@
 # Translators:
 # a.tangemann <a.tangemann@web.de>, 2013
 # FlorianScholz <work@bgstyle.de>, 2013
+# FlorianScholz <work@bgstyle.de>, 2013
 # I Robot <owncloud-bot@tmit.eu>, 2013
 # kabum <uu.kabum@gmail.com>, 2013
 # Marcel Kühlhorn <susefan93@gmx.de>, 2013
@@ -15,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-01 13:27-0400\n"
+"PO-Revision-Date: 2013-08-30 13:50+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
@@ -82,7 +83,11 @@ msgstr "Fehler beim Schreiben auf die Festplatte"
 msgid "Not enough storage available"
 msgstr "Nicht genug Speicher vorhanden."
 
-#: ajax/upload.php:123
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr "Hochladen fehlgeschlagen"
+
+#: ajax/upload.php:127
 msgid "Invalid directory."
 msgstr "Ungültiges Verzeichnis."
 
@@ -102,21 +107,20 @@ msgstr "Nicht genügend Speicherplatz verfügbar"
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/file-upload.js:167 js/files.js:280
+#: js/file-upload.js:165
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen."
 
-#: js/file-upload.js:233 js/files.js:353
+#: js/file-upload.js:239
 msgid "URL cannot be empty."
 msgstr "Die URL darf nicht leer sein."
 
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:244 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Ungültiger Ordnername. Die Verwendung von «Shared» ist ownCloud vorbehalten."
 
-#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
-#: js/files.js:709 js/files.js:747
+#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
 msgid "Error"
 msgstr "Fehler"
 
@@ -132,41 +136,57 @@ msgstr "Endgültig löschen"
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:307 js/filelist.js:309
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:307 js/filelist.js:309
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:303
+#: js/filelist.js:307
 msgid "suggest name"
 msgstr "Namen vorschlagen"
 
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:307 js/filelist.js:309
 msgid "cancel"
 msgstr "abbrechen"
 
-#: js/filelist.js:350
+#: js/filelist.js:354
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} wurde ersetzt durch {new_name}"
 
-#: js/filelist.js:350
+#: js/filelist.js:354
 msgid "undo"
 msgstr "rückgängig machen"
 
-#: js/filelist.js:453
+#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] "%n Ordner"
+
+#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] "%n Dateien"
+
+#: js/filelist.js:432
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:563
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n Datei wird hochgeladen"
+msgstr[1] "%n Dateien werden hochgeladen"
 
-#: js/filelist.js:518
+#: js/filelist.js:628
 msgid "files uploading"
 msgstr "Dateien werden hoch geladen"
 
@@ -196,7 +216,7 @@ msgstr "Ihr Speicher ist fast voll ({usedSpacePercent}%)"
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
-msgstr ""
+msgstr "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln."
 
 #: js/files.js:245
 msgid ""
@@ -204,34 +224,18 @@ msgid ""
 "big."
 msgstr "Ihr Download wird vorbereitet. Dies kann bei grösseren Dateien etwas dauern."
 
-#: js/files.js:358
-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:760 templates/index.php:67
+#: js/files.js:563 templates/index.php:69
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:761 templates/index.php:78
+#: js/files.js:564 templates/index.php:81
 msgid "Size"
 msgstr "Grösse"
 
-#: js/files.js:762 templates/index.php:80
+#: js/files.js:565 templates/index.php:83
 msgid "Modified"
 msgstr "Geändert"
 
-#: js/files.js:778
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:784
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
@@ -305,52 +309,36 @@ msgstr "Sie haben hier keine Schreib-Berechtigungen."
 msgid "Nothing in here. Upload something!"
 msgstr "Alles leer. Laden Sie etwas hoch!"
 
-#: templates/index.php:73
+#: templates/index.php:75
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:88 templates/index.php:89
 msgid "Unshare"
 msgstr "Freigabe aufheben"
 
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:94 templates/index.php:95
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/index.php:105
+#: templates/index.php:108
 msgid "Upload too large"
 msgstr "Der Upload ist zu gross"
 
-#: templates/index.php:107
+#: templates/index.php:110
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Die Datei überschreitet die Maximalgrösse für Uploads auf diesem Server."
 
-#: templates/index.php:112
+#: templates/index.php:115
 msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
-#: templates/index.php:115
+#: templates/index.php:118
 msgid "Current scanning"
 msgstr "Scanne"
 
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "Verzeichnis"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "Verzeichnisse"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "Datei"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "Dateien"
-
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
 msgstr "Dateisystem-Cache wird aktualisiert ..."