diff options
Diffstat (limited to 'apps')
61 files changed, 266 insertions, 66 deletions
diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php index d601c9f8993..41c7925b9f7 100644 --- a/apps/files/l10n/ar.php +++ b/apps/files/l10n/ar.php @@ -26,8 +26,8 @@ $TRANSLATIONS = array( "File upload is in progress. Leaving the page now will cancel the upload." => "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات.", "{new_name} already exists" => "{new_name} موجود مسبقا", "Share" => "شارك", -"Delete permanently" => "حذف بشكل دائم", "Delete" => "إلغاء", +"Delete permanently" => "حذف بشكل دائم", "Rename" => "إعادة تسميه", "Your download is being prepared. This might take some time if the files are big." => "جاري تجهيز عملية التحميل. قد تستغرق بعض الوقت اذا كان حجم الملفات كبير.", "Pending" => "قيد الانتظار", diff --git a/apps/files/l10n/ast.php b/apps/files/l10n/ast.php index 585838d685f..f3a992ddb75 100644 --- a/apps/files/l10n/ast.php +++ b/apps/files/l10n/ast.php @@ -44,8 +44,8 @@ $TRANSLATIONS = array( "Could not create folder" => "Nun pudo crease la carpeta", "Error fetching URL" => "Fallu obteniendo URL", "Share" => "Compartir", -"Delete permanently" => "Desaniciar dafechu", "Delete" => "Desaniciar", +"Delete permanently" => "Desaniciar dafechu", "Rename" => "Renomar", "Your download is being prepared. This might take some time if the files are big." => "Ta preparándose la to descarga. Esto podría llevar dalgún tiempu si los ficheros son grandes.", "Pending" => "Pendiente", diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php index aa2232d27ae..e4685794a82 100644 --- a/apps/files/l10n/bg_BG.php +++ b/apps/files/l10n/bg_BG.php @@ -10,8 +10,8 @@ $TRANSLATIONS = array( "Files" => "Файлове", "Upload cancelled." => "Качването е спряно.", "Share" => "Споделяне", -"Delete permanently" => "Изтриване завинаги", "Delete" => "Изтриване", +"Delete permanently" => "Изтриване завинаги", "Rename" => "Преименуване", "Pending" => "Чакащо", "Error" => "Грешка", diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php index 113ef86f028..b215a4ca832 100644 --- a/apps/files/l10n/ca.php +++ b/apps/files/l10n/ca.php @@ -44,8 +44,8 @@ $TRANSLATIONS = array( "Could not create folder" => "No s'ha pogut crear la carpeta", "Error fetching URL" => "Error en obtenir la URL", "Share" => "Comparteix", -"Delete permanently" => "Esborra permanentment", "Delete" => "Esborra", +"Delete permanently" => "Esborra permanentment", "Rename" => "Reanomena", "Your download is being prepared. This might take some time if the files are big." => "S'està preparant la baixada. Pot trigar una estona si els fitxers són grans.", "Pending" => "Pendent", diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php index 3d78f57fc6e..2bba115c2be 100644 --- a/apps/files/l10n/cs_CZ.php +++ b/apps/files/l10n/cs_CZ.php @@ -44,8 +44,8 @@ $TRANSLATIONS = array( "Could not create folder" => "Nepodařilo se vytvořit složku", "Error fetching URL" => "Chyba při načítání URL", "Share" => "Sdílet", -"Delete permanently" => "Trvale odstranit", "Delete" => "Smazat", +"Delete permanently" => "Trvale odstranit", "Rename" => "Přejmenovat", "Your download is being prepared. This might take some time if the files are big." => "Vaše soubory ke stažení se připravují. Pokud jsou velké, může to chvíli trvat.", "Pending" => "Nevyřízené", diff --git a/apps/files/l10n/cy_GB.php b/apps/files/l10n/cy_GB.php index bd9059e186d..cdb7a4c7169 100644 --- a/apps/files/l10n/cy_GB.php +++ b/apps/files/l10n/cy_GB.php @@ -19,8 +19,8 @@ $TRANSLATIONS = array( "File upload is in progress. Leaving the page now will cancel the upload." => "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses.", "{new_name} already exists" => "{new_name} yn bodoli'n barod", "Share" => "Rhannu", -"Delete permanently" => "Dileu'n barhaol", "Delete" => "Dileu", +"Delete permanently" => "Dileu'n barhaol", "Rename" => "Ailenwi", "Your download is being prepared. This might take some time if the files are big." => "Wrthi'n paratoi i lwytho i lawr. Gall gymryd peth amser os yw'r ffeiliau'n fawr.", "Pending" => "I ddod", diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php index 8199a371685..0479eaee9ee 100644 --- a/apps/files/l10n/da.php +++ b/apps/files/l10n/da.php @@ -44,8 +44,8 @@ $TRANSLATIONS = array( "Could not create folder" => "Kunne ikke oprette mappe", "Error fetching URL" => "Fejl ved URL", "Share" => "Del", -"Delete permanently" => "Slet permanent", "Delete" => "Slet", +"Delete permanently" => "Slet permanent", "Rename" => "Omdøb", "Your download is being prepared. This might take some time if the files are big." => "Dit download forberedes. Dette kan tage lidt tid ved større filer.", "Pending" => "Afventer", diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php index 9b89c6098af..899b7e3ca6a 100644 --- a/apps/files/l10n/de.php +++ b/apps/files/l10n/de.php @@ -44,8 +44,8 @@ $TRANSLATIONS = array( "Could not create folder" => "Der Ordner konnte nicht erstellt werden", "Error fetching URL" => "Fehler beim Abrufen der URL", "Share" => "Teilen", -"Delete permanently" => "Endgültig löschen", "Delete" => "Löschen", +"Delete permanently" => "Endgültig löschen", "Rename" => "Umbenennen", "Your download is being prepared. This might take some time if the files are big." => "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern.", "Pending" => "Ausstehend", diff --git a/apps/files/l10n/de_CH.php b/apps/files/l10n/de_CH.php index 6d5f67f4b49..1d3546b07bc 100644 --- a/apps/files/l10n/de_CH.php +++ b/apps/files/l10n/de_CH.php @@ -22,8 +22,8 @@ $TRANSLATIONS = array( "File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.", "{new_name} already exists" => "{new_name} existiert bereits", "Share" => "Teilen", -"Delete permanently" => "Endgültig löschen", "Delete" => "Löschen", +"Delete permanently" => "Endgültig löschen", "Rename" => "Umbenennen", "Your download is being prepared. This might take some time if the files are big." => "Ihr Download wird vorbereitet. Dies kann bei grösseren Dateien etwas dauern.", "Pending" => "Ausstehend", diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php index bc8b88c60a7..1e20c3594a2 100644 --- a/apps/files/l10n/de_DE.php +++ b/apps/files/l10n/de_DE.php @@ -44,8 +44,8 @@ $TRANSLATIONS = array( "Could not create folder" => "Der Ordner konnte nicht erstellt werden", "Error fetching URL" => "Fehler beim Abrufen der URL", "Share" => "Teilen", -"Delete permanently" => "Endgültig löschen", "Delete" => "Löschen", +"Delete permanently" => "Endgültig löschen", "Rename" => "Umbenennen", "Your download is being prepared. This might take some time if the files are big." => "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern.", "Pending" => "Ausstehend", diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php index a3b40185261..de92e8a1012 100644 --- a/apps/files/l10n/el.php +++ b/apps/files/l10n/el.php @@ -42,8 +42,8 @@ $TRANSLATIONS = array( "Could not create folder" => "Αδυναμία δημιουργίας φακέλου", "Error fetching URL" => "Σφάλμα φόρτωσης URL", "Share" => "Διαμοιρασμός", -"Delete permanently" => "Μόνιμη διαγραφή", "Delete" => "Διαγραφή", +"Delete permanently" => "Μόνιμη διαγραφή", "Rename" => "Μετονομασία", "Your download is being prepared. This might take some time if the files are big." => "Η λήψη προετοιμάζεται. Αυτό μπορεί να πάρει ώρα εάν τα αρχεία έχουν μεγάλο μέγεθος.", "Pending" => "Εκκρεμεί", diff --git a/apps/files/l10n/en_GB.php b/apps/files/l10n/en_GB.php index bdb9b0c445f..962af3978ec 100644 --- a/apps/files/l10n/en_GB.php +++ b/apps/files/l10n/en_GB.php @@ -44,8 +44,8 @@ $TRANSLATIONS = array( "Could not create folder" => "Could not create folder", "Error fetching URL" => "Error fetching URL", "Share" => "Share", -"Delete permanently" => "Delete permanently", "Delete" => "Delete", +"Delete permanently" => "Delete permanently", "Rename" => "Rename", "Your download is being prepared. This might take some time if the files are big." => "Your download is being prepared. This might take some time if the files are big.", "Pending" => "Pending", diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php index f6394c0b055..8e0b741c688 100644 --- a/apps/files/l10n/eo.php +++ b/apps/files/l10n/eo.php @@ -34,8 +34,8 @@ $TRANSLATIONS = array( "Could not create file" => "Ne povis kreiĝi dosiero", "Could not create folder" => "Ne povis kreiĝi dosierujo", "Share" => "Kunhavigi", -"Delete permanently" => "Forigi por ĉiam", "Delete" => "Forigi", +"Delete permanently" => "Forigi por ĉiam", "Rename" => "Alinomigi", "Your download is being prepared. This might take some time if the files are big." => "Via elŝuto pretiĝatas. Ĉi tio povas daŭri iom da tempo se la dosieroj grandas.", "Pending" => "Traktotaj", diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php index 302177af110..43ab3fb7b29 100644 --- a/apps/files/l10n/es.php +++ b/apps/files/l10n/es.php @@ -44,8 +44,8 @@ $TRANSLATIONS = array( "Could not create folder" => "No se pudo crear la carpeta", "Error fetching URL" => "Error al descargar URL.", "Share" => "Compartir", -"Delete permanently" => "Eliminar permanentemente", "Delete" => "Eliminar", +"Delete permanently" => "Eliminar permanentemente", "Rename" => "Renombrar", "Your download is being prepared. This might take some time if the files are big." => "Su descarga está siendo preparada. Esto podría tardar algo de tiempo si los archivos son grandes.", "Pending" => "Pendiente", diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php index cb6ec950b93..525793618ac 100644 --- a/apps/files/l10n/es_AR.php +++ b/apps/files/l10n/es_AR.php @@ -37,8 +37,8 @@ $TRANSLATIONS = array( "Could not create folder" => "No se pudo crear el directorio", "Error fetching URL" => "Error al obtener la URL", "Share" => "Compartir", -"Delete permanently" => "Borrar permanentemente", "Delete" => "Borrar", +"Delete permanently" => "Borrar permanentemente", "Rename" => "Cambiar nombre", "Your download is being prepared. This might take some time if the files are big." => "Tu descarga se está preparando. Esto puede demorar si los archivos son muy grandes.", "Pending" => "Pendientes", diff --git a/apps/files/l10n/es_MX.php b/apps/files/l10n/es_MX.php index 79ce99aedd9..cba714ff2d7 100644 --- a/apps/files/l10n/es_MX.php +++ b/apps/files/l10n/es_MX.php @@ -37,8 +37,8 @@ $TRANSLATIONS = array( "Could not create folder" => "No se pudo crear la carpeta", "Error fetching URL" => "Error al descargar URL.", "Share" => "Compartir", -"Delete permanently" => "Eliminar permanentemente", "Delete" => "Eliminar", +"Delete permanently" => "Eliminar permanentemente", "Rename" => "Renombrar", "Your download is being prepared. This might take some time if the files are big." => "Su descarga está siendo preparada. Esto podría tardar algo de tiempo si los archivos son grandes.", "Pending" => "Pendiente", diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php index 07e72aef6bc..265147c5fce 100644 --- a/apps/files/l10n/et_EE.php +++ b/apps/files/l10n/et_EE.php @@ -44,8 +44,8 @@ $TRANSLATIONS = array( "Could not create folder" => "Ei suuda luua kataloogi", "Error fetching URL" => "Viga URL-i haaramisel", "Share" => "Jaga", -"Delete permanently" => "Kustuta jäädavalt", "Delete" => "Kustuta", +"Delete permanently" => "Kustuta jäädavalt", "Rename" => "Nimeta ümber", "Your download is being prepared. This might take some time if the files are big." => "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. ", "Pending" => "Ootel", diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php index 161a44a90c2..516a1e09252 100644 --- a/apps/files/l10n/eu.php +++ b/apps/files/l10n/eu.php @@ -44,8 +44,8 @@ $TRANSLATIONS = array( "Could not create folder" => "Ezin izan da karpeta sortu", "Error fetching URL" => "Errorea URLa eskuratzerakoan", "Share" => "Elkarbanatu", -"Delete permanently" => "Ezabatu betirako", "Delete" => "Ezabatu", +"Delete permanently" => "Ezabatu betirako", "Rename" => "Berrizendatu", "Your download is being prepared. This might take some time if the files are big." => "Zure deskarga prestatu egin behar da. Denbora bat har lezake fitxategiak handiak badira. ", "Pending" => "Zain", diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php index ba2f228230b..049583cb526 100644 --- a/apps/files/l10n/fa.php +++ b/apps/files/l10n/fa.php @@ -22,8 +22,8 @@ $TRANSLATIONS = array( "File upload is in progress. Leaving the page now will cancel the upload." => "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. ", "{new_name} already exists" => "{نام _جدید} در حال حاضر وجود دارد.", "Share" => "اشتراکگذاری", -"Delete permanently" => "حذف قطعی", "Delete" => "حذف", +"Delete permanently" => "حذف قطعی", "Rename" => "تغییرنام", "Your download is being prepared. This might take some time if the files are big." => "دانلود شما در حال آماده شدن است. در صورتیکه پرونده ها بزرگ باشند ممکن است مدتی طول بکشد.", "Pending" => "در انتظار", diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php index 8d31ff42a81..48cdf18860c 100644 --- a/apps/files/l10n/fi_FI.php +++ b/apps/files/l10n/fi_FI.php @@ -44,8 +44,8 @@ $TRANSLATIONS = array( "Could not create folder" => "Kansion luominen epäonnistui", "Error fetching URL" => "Virhe noutaessa verkko-osoitetta", "Share" => "Jaa", -"Delete permanently" => "Poista pysyvästi", "Delete" => "Poista", +"Delete permanently" => "Poista pysyvästi", "Rename" => "Nimeä uudelleen", "Your download is being prepared. This might take some time if the files are big." => "Lataustasi valmistellaan. Tämä saattaa kestää hetken, jos tiedostot ovat suuria kooltaan.", "Pending" => "Odottaa", diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php index f3538f80573..e2e28e7a648 100644 --- a/apps/files/l10n/fr.php +++ b/apps/files/l10n/fr.php @@ -44,8 +44,8 @@ $TRANSLATIONS = array( "Could not create folder" => "Impossible de créer le dossier", "Error fetching URL" => "Erreur d'accès à l'URL", "Share" => "Partager", -"Delete permanently" => "Supprimer de façon définitive", "Delete" => "Supprimer", +"Delete permanently" => "Supprimer de façon définitive", "Rename" => "Renommer", "Your download is being prepared. This might take some time if the files are big." => "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux.", "Pending" => "En attente", diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php index 75fd694e75d..c9ea8c6a99b 100644 --- a/apps/files/l10n/gl.php +++ b/apps/files/l10n/gl.php @@ -44,8 +44,8 @@ $TRANSLATIONS = array( "Could not create folder" => "Non foi posíbel crear o cartafol", "Error fetching URL" => "Produciuse un erro ao obter o URL", "Share" => "Compartir", -"Delete permanently" => "Eliminar permanentemente", "Delete" => "Eliminar", +"Delete permanently" => "Eliminar permanentemente", "Rename" => "Renomear", "Your download is being prepared. This might take some time if the files are big." => "Está a prepararse a súa descarga. Isto pode levar bastante tempo se os ficheiros son grandes.", "Pending" => "Pendentes", diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php index 35b05603515..58d375f4df2 100644 --- a/apps/files/l10n/he.php +++ b/apps/files/l10n/he.php @@ -22,8 +22,8 @@ $TRANSLATIONS = array( "File upload is in progress. Leaving the page now will cancel the upload." => "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה.", "{new_name} already exists" => "{new_name} כבר קיים", "Share" => "שתף", -"Delete permanently" => "מחק לצמיתות", "Delete" => "מחיקה", +"Delete permanently" => "מחק לצמיתות", "Rename" => "שינוי שם", "Pending" => "ממתין", "Error" => "שגיאה", diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php index ce4cac89b1a..c02b27fd2bb 100644 --- a/apps/files/l10n/hu_HU.php +++ b/apps/files/l10n/hu_HU.php @@ -42,8 +42,8 @@ $TRANSLATIONS = array( "Could not create folder" => "A mappa nem hozható létre", "Error fetching URL" => "A megadott URL-ről nem sikerül adatokat kapni", "Share" => "Megosztás", -"Delete permanently" => "Végleges törlés", "Delete" => "Törlés", +"Delete permanently" => "Végleges törlés", "Rename" => "Átnevezés", "Your download is being prepared. This might take some time if the files are big." => "Készül a letöltendő állomány. Ez eltarthat egy ideig, ha nagyok a fájlok.", "Pending" => "Folyamatban", diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php index 29a02f5fc5e..e6a7077f0fa 100644 --- a/apps/files/l10n/id.php +++ b/apps/files/l10n/id.php @@ -35,8 +35,8 @@ $TRANSLATIONS = array( "Could not create file" => "Tidak dapat membuat berkas", "Could not create folder" => "Tidak dapat membuat folder", "Share" => "Bagikan", -"Delete permanently" => "Hapus secara permanen", "Delete" => "Hapus", +"Delete permanently" => "Hapus secara permanen", "Rename" => "Ubah nama", "Your download is being prepared. This might take some time if the files are big." => "Unduhan Anda sedang disiapkan. Prosesnya dapat berlangsung agak lama jika ukuran berkasnya besar.", "Pending" => "Menunggu", diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php index ffb620579e6..4d5398b74fc 100644 --- a/apps/files/l10n/it.php +++ b/apps/files/l10n/it.php @@ -44,8 +44,8 @@ $TRANSLATIONS = array( "Could not create folder" => "Impossibile creare la cartella", "Error fetching URL" => "Errore durante il recupero dello URL", "Share" => "Condividi", -"Delete permanently" => "Elimina definitivamente", "Delete" => "Elimina", +"Delete permanently" => "Elimina definitivamente", "Rename" => "Rinomina", "Your download is being prepared. This might take some time if the files are big." => "Il tuo scaricamento è in fase di preparazione. Ciò potrebbe richiedere del tempo se i file sono grandi.", "Pending" => "In corso", diff --git a/apps/files/l10n/ja.php b/apps/files/l10n/ja.php index 592dbb7c303..bd2dae6afd2 100644 --- a/apps/files/l10n/ja.php +++ b/apps/files/l10n/ja.php @@ -44,8 +44,8 @@ $TRANSLATIONS = array( "Could not create folder" => "フォルダーを作成できませんでした", "Error fetching URL" => "URL取得エラー", "Share" => "共有", -"Delete permanently" => "完全に削除する", "Delete" => "削除", +"Delete permanently" => "完全に削除する", "Rename" => "名前の変更", "Your download is being prepared. This might take some time if the files are big." => "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。", "Pending" => "中断", diff --git a/apps/files/l10n/ka_GE.php b/apps/files/l10n/ka_GE.php index 6de58f1ad70..8dd16887d45 100644 --- a/apps/files/l10n/ka_GE.php +++ b/apps/files/l10n/ka_GE.php @@ -20,8 +20,8 @@ $TRANSLATIONS = array( "File upload is in progress. Leaving the page now will cancel the upload." => "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას", "{new_name} already exists" => "{new_name} უკვე არსებობს", "Share" => "გაზიარება", -"Delete permanently" => "სრულად წაშლა", "Delete" => "წაშლა", +"Delete permanently" => "სრულად წაშლა", "Rename" => "გადარქმევა", "Your download is being prepared. This might take some time if the files are big." => "გადმოწერის მოთხოვნა მუშავდება. ის მოითხოვს გარკვეულ დროს რაგდან ფაილები არის დიდი ზომის.", "Pending" => "მოცდის რეჟიმში", diff --git a/apps/files/l10n/km.php b/apps/files/l10n/km.php index 5c00c5e6d82..67fe5f0c952 100644 --- a/apps/files/l10n/km.php +++ b/apps/files/l10n/km.php @@ -11,8 +11,8 @@ $TRANSLATIONS = array( "Upload cancelled." => "បានបោះបង់ការផ្ទុកឡើង។", "{new_name} already exists" => "មានឈ្មោះ {new_name} រួចហើយ", "Share" => "ចែករំលែក", -"Delete permanently" => "លុបជាអចិន្ត្រៃយ៍", "Delete" => "លុប", +"Delete permanently" => "លុបជាអចិន្ត្រៃយ៍", "Rename" => "ប្ដូរឈ្មោះ", "Your download is being prepared. This might take some time if the files are big." => "ការទាញយករបស់អ្នកកំពុងត្រូវបានរៀបចំហើយ។ នេះអាចចំណាយពេលមួយសំទុះ ប្រសិនបើឯកសារធំ។", "Pending" => "កំពុងរង់ចាំ", diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php index 2edf570c3fc..7fd7837ae36 100644 --- a/apps/files/l10n/ko.php +++ b/apps/files/l10n/ko.php @@ -37,8 +37,8 @@ $TRANSLATIONS = array( "Could not create folder" => "폴더를 만들 수 없음", "Error fetching URL" => "URL을 가져올 수 없음", "Share" => "공유", -"Delete permanently" => "영구히 삭제", "Delete" => "삭제", +"Delete permanently" => "영구히 삭제", "Rename" => "이름 바꾸기", "Your download is being prepared. This might take some time if the files are big." => "다운로드 준비 중입니다. 파일 크기가 크면 시간이 오래 걸릴 수도 있습니다.", "Pending" => "대기 중", diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php index 616a20f1e7a..f3403231ce1 100644 --- a/apps/files/l10n/lt_LT.php +++ b/apps/files/l10n/lt_LT.php @@ -37,8 +37,8 @@ $TRANSLATIONS = array( "Could not create folder" => "Neįmanoma sukurti aplanko", "Error fetching URL" => "Klauda gaunant URL", "Share" => "Dalintis", -"Delete permanently" => "Ištrinti negrįžtamai", "Delete" => "Ištrinti", +"Delete permanently" => "Ištrinti negrįžtamai", "Rename" => "Pervadinti", "Your download is being prepared. This might take some time if the files are big." => "Jūsų atsisiuntimas yra paruošiamas. tai gali užtrukti jei atsisiunčiamas didelis failas.", "Pending" => "Laukiantis", diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php index b8f0764ea4c..7186851320c 100644 --- a/apps/files/l10n/lv.php +++ b/apps/files/l10n/lv.php @@ -22,8 +22,8 @@ $TRANSLATIONS = array( "File upload is in progress. Leaving the page now will cancel the upload." => "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde.", "{new_name} already exists" => "{new_name} jau eksistē", "Share" => "Dalīties", -"Delete permanently" => "Dzēst pavisam", "Delete" => "Dzēst", +"Delete permanently" => "Dzēst pavisam", "Rename" => "Pārsaukt", "Your download is being prepared. This might take some time if the files are big." => "Tiek sagatavota lejupielāde. Tas var aizņemt kādu laiciņu, ja datnes ir lielas.", "Pending" => "Gaida savu kārtu", diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php index a683af1a6c4..eb0a76f3e1e 100644 --- a/apps/files/l10n/mk.php +++ b/apps/files/l10n/mk.php @@ -32,8 +32,8 @@ $TRANSLATIONS = array( "Could not create file" => "Не множам да креирам датотека", "Could not create folder" => "Не можам да креирам папка", "Share" => "Сподели", -"Delete permanently" => "Трајно избришани", "Delete" => "Избриши", +"Delete permanently" => "Трајно избришани", "Rename" => "Преименувај", "Your download is being prepared. This might take some time if the files are big." => "Вашето преземање се подготвува. Ова може да потрае до колку датотеките се големи.", "Pending" => "Чека", diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php index cb9be29ccc3..ada83c44fd9 100644 --- a/apps/files/l10n/nb_NO.php +++ b/apps/files/l10n/nb_NO.php @@ -44,8 +44,8 @@ $TRANSLATIONS = array( "Could not create folder" => "Klarte ikke å opprette mappe", "Error fetching URL" => "Feil ved henting av URL", "Share" => "Del", -"Delete permanently" => "Slett permanent", "Delete" => "Slett", +"Delete permanently" => "Slett permanent", "Rename" => "Gi nytt navn", "Your download is being prepared. This might take some time if the files are big." => "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid.", "Pending" => "Ventende", diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php index 7a270c5f805..40eeac48641 100644 --- a/apps/files/l10n/nl.php +++ b/apps/files/l10n/nl.php @@ -44,8 +44,8 @@ $TRANSLATIONS = array( "Could not create folder" => "Kon niet creëren map", "Error fetching URL" => "Fout bij ophalen URL", "Share" => "Delen", -"Delete permanently" => "Verwijder definitief", "Delete" => "Verwijder", +"Delete permanently" => "Verwijder definitief", "Rename" => "Hernoem", "Your download is being prepared. This might take some time if the files are big." => "Uw download wordt voorbereid. Dit kan enige tijd duren bij grote bestanden.", "Pending" => "In behandeling", diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php index 0d304d5abe2..88b32046a80 100644 --- a/apps/files/l10n/nn_NO.php +++ b/apps/files/l10n/nn_NO.php @@ -25,8 +25,8 @@ $TRANSLATIONS = array( "File upload is in progress. Leaving the page now will cancel the upload." => "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten.", "{new_name} already exists" => "{new_name} finst allereie", "Share" => "Del", -"Delete permanently" => "Slett for godt", "Delete" => "Slett", +"Delete permanently" => "Slett for godt", "Rename" => "Endra namn", "Your download is being prepared. This might take some time if the files are big." => "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store.", "Pending" => "Under vegs", diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php index 3ee00819eb3..61da396688f 100644 --- a/apps/files/l10n/pl.php +++ b/apps/files/l10n/pl.php @@ -44,8 +44,8 @@ $TRANSLATIONS = array( "Could not create folder" => "Nie można utworzyć folderu", "Error fetching URL" => "Błąd przy pobieraniu adresu URL", "Share" => "Udostępnij", -"Delete permanently" => "Trwale usuń", "Delete" => "Usuń", +"Delete permanently" => "Trwale usuń", "Rename" => "Zmień nazwę", "Your download is being prepared. This might take some time if the files are big." => "Pobieranie jest przygotowywane. Może to zająć trochę czasu jeśli pliki są duże.", "Pending" => "Oczekujące", diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php index b7a7fb9d909..e16959fa6f8 100644 --- a/apps/files/l10n/pt_BR.php +++ b/apps/files/l10n/pt_BR.php @@ -44,8 +44,8 @@ $TRANSLATIONS = array( "Could not create folder" => "Não foi possível criar a pasta", "Error fetching URL" => "Erro ao buscar URL", "Share" => "Compartilhar", -"Delete permanently" => "Excluir permanentemente", "Delete" => "Excluir", +"Delete permanently" => "Excluir permanentemente", "Rename" => "Renomear", "Your download is being prepared. This might take some time if the files are big." => "Seu download está sendo preparado. Isto pode levar algum tempo se os arquivos forem grandes.", "Pending" => "Pendente", diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php index 1f37659d5a6..83db4f306d9 100644 --- a/apps/files/l10n/pt_PT.php +++ b/apps/files/l10n/pt_PT.php @@ -42,8 +42,8 @@ $TRANSLATIONS = array( "Could not create folder" => "Não pôde criar pasta", "Error fetching URL" => "Erro ao obter URL", "Share" => "Compartilhar", -"Delete permanently" => "Apagar Para Sempre", "Delete" => "Apagar", +"Delete permanently" => "Apagar Para Sempre", "Rename" => "Renomear", "Your download is being prepared. This might take some time if the files are big." => "A sua transferência está a ser preparada. Isto poderá demorar algum tempo, se os seus ficheiros forem grandes.", "Pending" => "Pendente", diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php index ff3e99bf5be..4bb7cd9a6be 100644 --- a/apps/files/l10n/ro.php +++ b/apps/files/l10n/ro.php @@ -1,5 +1,7 @@ <?php $TRANSLATIONS = array( +"Storage not available" => "Spațiu de stocare indisponibil", +"Storage invalid" => "Spațiu de stocare invalid", "Unknown error" => "Eroare necunoscută", "Could not move %s - File with this name already exists" => "%s nu se poate muta - Fișierul cu acest nume există deja ", "Could not move %s" => "Nu se poate muta %s", @@ -21,7 +23,7 @@ $TRANSLATIONS = array( "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Fișierul încărcat depășește directiva upload_max_filesize din php.ini:", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Fișierul încărcat depășește directiva MAX_FILE_SIZE specificată în formularul HTML", "The uploaded file was only partially uploaded" => "Fișierul a fost încărcat doar parțial", -"No file was uploaded" => "Nu a fost încărcat niciun fișier", +"No file was uploaded" => "Nu a fost încărcat nici un fișier", "Missing a temporary folder" => "Lipsește un dosar temporar", "Failed to write to disk" => "Eroare la scrierea pe disc", "Not enough storage available" => "Nu este disponibil suficient spațiu", @@ -42,8 +44,8 @@ $TRANSLATIONS = array( "Could not create folder" => "Nu s-a putut crea folderul", "Error fetching URL" => "Eroare încarcare URL", "Share" => "Partajează", -"Delete permanently" => "Șterge permanent", "Delete" => "Șterge", +"Delete permanently" => "Șterge permanent", "Rename" => "Redenumește", "Your download is being prepared. This might take some time if the files are big." => "Se pregătește descărcarea. Aceasta poate dura ceva timp dacă fișierele sunt mari.", "Pending" => "În așteptare", diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php index 1700da58922..32c7efccc30 100644 --- a/apps/files/l10n/ru.php +++ b/apps/files/l10n/ru.php @@ -44,8 +44,8 @@ $TRANSLATIONS = array( "Could not create folder" => "Не удалось создать каталог", "Error fetching URL" => "Ошибка получения URL", "Share" => "Открыть доступ", -"Delete permanently" => "Удалить окончательно", "Delete" => "Удалить", +"Delete permanently" => "Удалить окончательно", "Rename" => "Переименовать", "Your download is being prepared. This might take some time if the files are big." => "Идёт подготовка к скачиванию. Это может занять некоторое время, если файлы большого размера.", "Pending" => "Ожидание", diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php index 9d4097d3978..eb8c93de302 100644 --- a/apps/files/l10n/sk_SK.php +++ b/apps/files/l10n/sk_SK.php @@ -42,8 +42,8 @@ $TRANSLATIONS = array( "Could not create folder" => "Nemožno vytvoriť priečinok", "Error fetching URL" => "Chyba pri načítavaní URL", "Share" => "Zdieľať", -"Delete permanently" => "Zmazať trvalo", "Delete" => "Zmazať", +"Delete permanently" => "Zmazať trvalo", "Rename" => "Premenovať", "Your download is being prepared. This might take some time if the files are big." => "Vaše sťahovanie sa pripravuje. Ak sú sťahované súbory veľké, môže to chvíľu trvať.", "Pending" => "Čaká", diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php index 80b4251cd92..6fe6c3f3306 100644 --- a/apps/files/l10n/sl.php +++ b/apps/files/l10n/sl.php @@ -44,8 +44,8 @@ $TRANSLATIONS = array( "Could not create folder" => "Ni mogoče ustvariti mape", "Error fetching URL" => "Napaka pridobivanja naslova URL", "Share" => "Souporaba", -"Delete permanently" => "Izbriši dokončno", "Delete" => "Izbriši", +"Delete permanently" => "Izbriši dokončno", "Rename" => "Preimenuj", "Your download is being prepared. This might take some time if the files are big." => "Postopek priprave datoteke za prejem je lahko dolgotrajen, kadar je datoteka zelo velika.", "Pending" => "V čakanju ...", diff --git a/apps/files/l10n/sq.php b/apps/files/l10n/sq.php index 5c3157cd636..ed82f17a419 100644 --- a/apps/files/l10n/sq.php +++ b/apps/files/l10n/sq.php @@ -24,8 +24,8 @@ $TRANSLATIONS = array( "{new_name} already exists" => "{new_name} është ekzistues ", "Could not create folder" => "I pamundur krijimi i kartelës", "Share" => "Ndaj", -"Delete permanently" => "Fshi përfundimisht", "Delete" => "Fshi", +"Delete permanently" => "Fshi përfundimisht", "Rename" => "Riemëro", "Your download is being prepared. This might take some time if the files are big." => "Shkarkimi juaj është duke u përgatitur. Kjo mund të kërkojë kohë nëse skedarët janë të mëdhenj.", "Pending" => "Në vijim", diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php index a609b7d8105..00784709f8f 100644 --- a/apps/files/l10n/sr.php +++ b/apps/files/l10n/sr.php @@ -19,8 +19,8 @@ $TRANSLATIONS = array( "File upload is in progress. Leaving the page now will cancel the upload." => "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање.", "{new_name} already exists" => "{new_name} већ постоји", "Share" => "Дели", -"Delete permanently" => "Обриши за стално", "Delete" => "Обриши", +"Delete permanently" => "Обриши за стално", "Rename" => "Преименуј", "Your download is being prepared. This might take some time if the files are big." => "Припремам преузимање. Ово може да потраје ако су датотеке велике.", "Pending" => "На чекању", diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php index db3889a7986..767e2497a56 100644 --- a/apps/files/l10n/sv.php +++ b/apps/files/l10n/sv.php @@ -42,8 +42,8 @@ $TRANSLATIONS = array( "Could not create folder" => "Kunde ej skapa katalog", "Error fetching URL" => "Fel vid hämtning av URL", "Share" => "Dela", -"Delete permanently" => "Radera permanent", "Delete" => "Radera", +"Delete permanently" => "Radera permanent", "Rename" => "Byt namn", "Your download is being prepared. This might take some time if the files are big." => "Din nedladdning förbereds. Det kan ta tid om det är stora filer.", "Pending" => "Väntar", diff --git a/apps/files/l10n/te.php b/apps/files/l10n/te.php index ee62ddafabf..ac70a956c08 100644 --- a/apps/files/l10n/te.php +++ b/apps/files/l10n/te.php @@ -1,7 +1,7 @@ <?php $TRANSLATIONS = array( -"Delete permanently" => "శాశ్వతంగా తొలగించు", "Delete" => "తొలగించు", +"Delete permanently" => "శాశ్వతంగా తొలగించు", "Error" => "పొరపాటు", "Name" => "పేరు", "Size" => "పరిమాణం", diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php index 38edb2de6f4..acc4511b29f 100644 --- a/apps/files/l10n/tr.php +++ b/apps/files/l10n/tr.php @@ -44,8 +44,8 @@ $TRANSLATIONS = array( "Could not create folder" => "Klasör oluşturulamadı", "Error fetching URL" => "Adres getirilirken hata", "Share" => "Paylaş", -"Delete permanently" => "Kalıcı olarak sil", "Delete" => "Sil", +"Delete permanently" => "Kalıcı olarak sil", "Rename" => "Yeniden adlandır", "Your download is being prepared. This might take some time if the files are big." => "İndirme hazırlanıyor. Dosyalar büyük ise bu biraz zaman alabilir.", "Pending" => "Bekliyor", diff --git a/apps/files/l10n/ug.php b/apps/files/l10n/ug.php index 53162962c8d..67bcaca0c8d 100644 --- a/apps/files/l10n/ug.php +++ b/apps/files/l10n/ug.php @@ -12,8 +12,8 @@ $TRANSLATIONS = array( "File upload is in progress. Leaving the page now will cancel the upload." => "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋاتىدۇ. Leaving the page now will cancel the upload.", "{new_name} already exists" => "{new_name} مەۋجۇت", "Share" => "ھەمبەھىر", -"Delete permanently" => "مەڭگۈلۈك ئۆچۈر", "Delete" => "ئۆچۈر", +"Delete permanently" => "مەڭگۈلۈك ئۆچۈر", "Rename" => "ئات ئۆزگەرت", "Pending" => "كۈتۈۋاتىدۇ", "Error" => "خاتالىق", diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php index cfa8c917126..3447cb93661 100644 --- a/apps/files/l10n/uk.php +++ b/apps/files/l10n/uk.php @@ -40,8 +40,8 @@ $TRANSLATIONS = array( "Could not create folder" => "Не вдалося створити теку", "Error fetching URL" => "Помилка отримання URL", "Share" => "Поділитися", -"Delete permanently" => "Видалити назавжди", "Delete" => "Видалити", +"Delete permanently" => "Видалити назавжди", "Rename" => "Перейменувати", "Your download is being prepared. This might take some time if the files are big." => "Ваше завантаження готується. Це може зайняти деякий час, якщо файли завеликі.", "Pending" => "Очікування", diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php index 83f577cca13..894fccaac10 100644 --- a/apps/files/l10n/vi.php +++ b/apps/files/l10n/vi.php @@ -36,8 +36,8 @@ $TRANSLATIONS = array( "Could not create file" => "Không thể tạo file", "Could not create folder" => "Không thể tạo thư mục", "Share" => "Chia sẻ", -"Delete permanently" => "Xóa vĩnh vễn", "Delete" => "Xóa", +"Delete permanently" => "Xóa vĩnh vễn", "Rename" => "Sửa tên", "Your download is being prepared. This might take some time if the files are big." => "Your download is being prepared. This might take some time if the files are big.", "Pending" => "Đang chờ", diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php index fd5cf0cff67..8dfd52079a5 100644 --- a/apps/files/l10n/zh_CN.php +++ b/apps/files/l10n/zh_CN.php @@ -44,8 +44,8 @@ $TRANSLATIONS = array( "Could not create folder" => "不能创建文件夹", "Error fetching URL" => "获取URL出错", "Share" => "分享", -"Delete permanently" => "永久删除", "Delete" => "删除", +"Delete permanently" => "永久删除", "Rename" => "重命名", "Your download is being prepared. This might take some time if the files are big." => "下载正在准备中。如果文件较大可能会花费一些时间。", "Pending" => "等待", diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php index 092bfe52c04..a99d3941eda 100644 --- a/apps/files/l10n/zh_TW.php +++ b/apps/files/l10n/zh_TW.php @@ -35,8 +35,8 @@ $TRANSLATIONS = array( "Could not create file" => "無法建立檔案", "Could not create folder" => "無法建立資料夾", "Share" => "分享", -"Delete permanently" => "永久刪除", "Delete" => "刪除", +"Delete permanently" => "永久刪除", "Rename" => "重新命名", "Your download is being prepared. This might take some time if the files are big." => "正在準備您的下載，若您的檔案較大，將會需要更多時間。", "Pending" => "等候中", diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index e46be4ada46..eccd21c9248 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -143,7 +143,7 @@ ' data-action="Share-Notification" href="#" original-title="">' + ' <img class="svg" src="' + OC.imagePath('core', 'actions/share') + '"></img>'; $tr.find('.fileactions').append(function() { - var shareBy = t('files_sharing', 'Shared by {owner}', {owner: escapeHTML($tr.attr('data-share-owner'))}); + var shareBy = escapeHTML($tr.attr('data-share-owner')); var $result = $(shareNotification + '<span> ' + shareBy + '</span></span>'); $result.on('click', function() { return false; diff --git a/apps/files_sharing/l10n/sk_SK.php b/apps/files_sharing/l10n/sk_SK.php index e8620e2401d..150862cf432 100644 --- a/apps/files_sharing/l10n/sk_SK.php +++ b/apps/files_sharing/l10n/sk_SK.php @@ -8,7 +8,11 @@ $TRANSLATIONS = array( "No files have been shared with you yet." => "Zatiaľ s vami nikto žiadne súbory nezdieľal.", "You haven't shared any files yet." => "Zatiaľ ste nezdieľali žiadne súbory.", "You haven't shared any files by link yet." => "Zatiaľ ste pomocou odkazu nezdieľali žiaden súbor.", +"Do you want to add the remote share {name} from {owner}@{remote}?" => "Chcete pridať vzdialené úložisko {name} patriace používateľovi {owner}@{remote}?", +"Remote share" => "Vzdialené úložisko", +"Remote share password" => "Heslo k vzdialenému úložisku", "Cancel" => "Zrušiť", +"Add remote share" => "Pridať vzdialené úložisko", "No ownCloud installation found at {remote}" => "Žiadna ownCloud inštancia na {remote}", "Invalid ownCloud url" => "Chybná ownCloud url", "Shared by {owner}" => "Zdieľa {owner}", @@ -24,9 +28,11 @@ $TRANSLATIONS = array( "the link expired" => "linke vypršala platnosť", "sharing is disabled" => "zdieľanie je zakázané", "For more info, please ask the person who sent this link." => "Pre viac informácií kontaktujte osobu, ktorá vám poslala tento odkaz.", +"Add to your ownCloud" => "Pridať do svojho ownCloudu", "Download" => "Sťahovanie", "Download %s" => "Stiahnuť %s", "Direct link" => "Priama linka", +"Remote Shares" => "Vzdialené úložiská", "Allow other instances to mount public links shared from this server" => "Povoliť ďalším inštanciám pripojiť verejné odkazy zdieľané z tohto servera", "Allow users to mount public link shares" => "Povoliť používateľom pripojiť sa na zdieľané verejné odkazy" ); diff --git a/apps/files_sharing/tests/js/shareSpec.js b/apps/files_sharing/tests/js/shareSpec.js index 600859b4e7d..2cf5dc47b63 100644 --- a/apps/files_sharing/tests/js/shareSpec.js +++ b/apps/files_sharing/tests/js/shareSpec.js @@ -165,7 +165,7 @@ describe('OCA.Sharing.Util tests', function() { $tr = fileList.$el.find('tbody tr:first'); $action = $tr.find('.action-share'); expect($action.hasClass('permanent')).toEqual(true); - expect($action.find('>span').text()).toEqual('Shared by User One'); + expect($action.find('>span').text()).toEqual('User One'); expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg'); expect(OC.basename(getImageUrl($tr.find('.filename')))).toEqual('folder-shared.svg'); }); @@ -207,7 +207,7 @@ describe('OCA.Sharing.Util tests', function() { expect($tr.find('.action-share').length).toEqual(0); $action = $tr.find('.action-share-notification'); expect($action.hasClass('permanent')).toEqual(true); - expect($action.find('>span').text().trim()).toEqual('Shared by User One'); + expect($action.find('>span').text().trim()).toEqual('User One'); expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg'); expect(OC.basename(getImageUrl($tr.find('.filename')))).toEqual('folder-shared.svg'); expect($action.find('img').length).toEqual(1); @@ -369,7 +369,7 @@ describe('OCA.Sharing.Util tests', function() { OC.Share.updateIcon('file', 1); expect($action.hasClass('permanent')).toEqual(true); - expect($action.find('>span').text()).toEqual('Shared by User One'); + expect($action.find('>span').text()).toEqual('User One'); expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg'); }); it('keep share text after unsharing reshare', function() { @@ -405,7 +405,7 @@ describe('OCA.Sharing.Util tests', function() { OC.Share.updateIcon('file', 1); expect($action.hasClass('permanent')).toEqual(true); - expect($action.find('>span').text()).toEqual('Shared by User One'); + expect($action.find('>span').text()).toEqual('User One'); expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg'); }); }); diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php index 383115b8e63..718c2f45a34 100644 --- a/apps/files_trashbin/appinfo/app.php +++ b/apps/files_trashbin/appinfo/app.php @@ -1,6 +1,8 @@ <?php $l = OC_L10N::get('files_trashbin'); +OC::$CLASSPATH['OCA\Files_Trashbin\Exceptions\CopyRecursiveException'] = 'files_trashbin/lib/exceptions.php'; + // register hooks \OCA\Files_Trashbin\Trashbin::registerHooks(); diff --git a/apps/files_trashbin/lib/exceptions.php b/apps/files_trashbin/lib/exceptions.php new file mode 100644 index 00000000000..23e50293b77 --- /dev/null +++ b/apps/files_trashbin/lib/exceptions.php @@ -0,0 +1,26 @@ +<?php +/** + * ownCloud - trash bin + * + * @author Bjoern Schiessle + * @copyright 2014 Bjoern Schiessle schiessle@owncloud.com + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * + * You should have received a copy of the GNU Affero General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + * + */ + +namespace OCA\Files_Trashbin\Exceptions; + +class CopyRecursiveException extends \Exception { +} diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php index 522f7d4b7e3..ee3969323cf 100644 --- a/apps/files_trashbin/lib/trashbin.php +++ b/apps/files_trashbin/lib/trashbin.php @@ -117,10 +117,18 @@ class Trashbin { $proxyStatus = \OC_FileProxy::$enabled; \OC_FileProxy::$enabled = false; $trashPath = '/files_trashbin/files/' . $filename . '.d' . $timestamp; - $sizeOfAddedFiles = self::copy_recursive('/files/' . $file_path, $trashPath, $view); + try { + $sizeOfAddedFiles = self::copy_recursive('/files/'.$file_path, $trashPath, $view); + } catch (\OCA\Files_Trashbin\Exceptions\CopyRecursiveException $e) { + $sizeOfAddedFiles = false; + if ($view->file_exists($trashPath)) { + $view->deleteAll($trashPath); + } + \OC_Log::write('files_trashbin', 'Couldn\'t move ' . $file_path . ' to the trash bin', \OC_log::ERROR); + } \OC_FileProxy::$enabled = $proxyStatus; - if ($view->file_exists('files_trashbin/files/' . $filename . '.d' . $timestamp)) { + if ($sizeOfAddedFiles !== false) { $size = $sizeOfAddedFiles; $query = \OC_DB::prepare("INSERT INTO `*PREFIX*files_trash` (`id`,`timestamp`,`location`,`user`) VALUES (?,?,?,?)"); $result = $query->execute(array($filename, $timestamp, $location, $user)); @@ -137,8 +145,6 @@ class Trashbin { if ($user !== $owner) { self::copyFilesToOwner($file_path, $owner, $ownerPath, $timestamp); } - } else { - \OC_Log::write('files_trashbin', 'Couldn\'t move ' . $file_path . ' to the trash bin', \OC_log::ERROR); } $userTrashSize += $size; @@ -823,13 +829,19 @@ class Trashbin { $size += self::copy_recursive($pathDir, $destination . '/' . $i['name'], $view); } else { $size += $view->filesize($pathDir); - $view->copy($pathDir, $destination . '/' . $i['name']); + $result = $view->copy($pathDir, $destination . '/' . $i['name']); + if (!$result) { + throw new \OCA\Files_Trashbin\Exceptions\CopyRecursiveException(); + } $view->touch($destination . '/' . $i['name'], $view->filemtime($pathDir)); } } } else { $size += $view->filesize($source); - $view->copy($source, $destination); + $result = $view->copy($source, $destination); + if (!$result) { + throw new \OCA\Files_Trashbin\Exceptions\CopyRecursiveException(); + } $view->touch($destination, $view->filemtime($source)); } return $size; diff --git a/apps/user_ldap/lib/user/manager.php b/apps/user_ldap/lib/user/manager.php index 6c635518d95..0f17900b5f3 100644 --- a/apps/user_ldap/lib/user/manager.php +++ b/apps/user_ldap/lib/user/manager.php @@ -143,7 +143,8 @@ class Manager { return $this->users['byUid'][$id]; } - if(strpos(mb_strtolower($id, 'UTF-8'), 'dc=') === false) { + if(strpos(mb_strtolower($id, 'UTF-8'), 'dc=') === false + && strpos(mb_strtolower($id, 'UTF-8'), 'uid=') === false ) { //most likely a uid $dn = $this->access->username2dn($id); if($dn !== false) { diff --git a/apps/user_ldap/tests/user/manager.php b/apps/user_ldap/tests/user/manager.php new file mode 100644 index 00000000000..7599980ff9a --- /dev/null +++ b/apps/user_ldap/tests/user/manager.php @@ -0,0 +1,151 @@ +<?php +/** +* ownCloud +* +* @author Arthur Schiwon +* @copyright 2014 Arthur Schiwon blizzz@owncloud.com +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE +* License as published by the Free Software Foundation; either +* version 3 of the License, or any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU AFFERO GENERAL PUBLIC LICENSE for more details. +* +* You should have received a copy of the GNU Affero General Public +* License along with this library. If not, see <http://www.gnu.org/licenses/>. +* +*/ + +namespace OCA\user_ldap\tests; + +use OCA\user_ldap\lib\user\Manager; + +class Test_User_Manager extends \PHPUnit_Framework_TestCase { + + private function getTestInstances() { + $access = $this->getMock('\OCA\user_ldap\lib\user\IUserTools'); + $config = $this->getMock('\OCP\IConfig'); + $filesys = $this->getMock('\OCA\user_ldap\lib\FilesystemHelper'); + $log = $this->getMock('\OCA\user_ldap\lib\LogWrapper'); + $avaMgr = $this->getMock('\OCP\IAvatarManager'); + $image = $this->getMock('\OCP\Image'); + + return array($access, $config, $filesys, $image, $log, $avaMgr); + } + + public function testGetByDNExisting() { + list($access, $config, $filesys, $image, $log, $avaMgr) = + $this->getTestInstances(); + + $inputDN = 'cn=foo,dc=foobar,dc=bar'; + $uid = '563418fc-423b-1033-8d1c-ad5f418ee02e'; + + $access->expects($this->once()) + ->method('dn2username') + ->with($this->equalTo($inputDN)) + ->will($this->returnValue($uid)); + + $access->expects($this->never()) + ->method('username2dn'); + + $manager = new Manager($config, $filesys, $log, $avaMgr, $image); + $manager->setLdapAccess($access); + $user = $manager->get($inputDN); + + $this->assertInstanceOf('\OCA\user_ldap\lib\user\User', $user); + } + + public function testGetByEDirectoryDN() { + list($access, $config, $filesys, $image, $log, $avaMgr) = + $this->getTestInstances(); + + $inputDN = 'uid=foo,o=foobar,c=bar'; + $uid = '563418fc-423b-1033-8d1c-ad5f418ee02e'; + + $access->expects($this->once()) + ->method('dn2username') + ->with($this->equalTo($inputDN)) + ->will($this->returnValue($uid)); + + $access->expects($this->never()) + ->method('username2dn'); + + $manager = new Manager($config, $filesys, $log, $avaMgr, $image); + $manager->setLdapAccess($access); + $user = $manager->get($inputDN); + + $this->assertInstanceOf('\OCA\user_ldap\lib\user\User', $user); + } + + public function testGetByDNNotExisting() { + list($access, $config, $filesys, $image, $log, $avaMgr) = + $this->getTestInstances(); + + $inputDN = 'cn=gone,dc=foobar,dc=bar'; + + $access->expects($this->once()) + ->method('dn2username') + ->with($this->equalTo($inputDN)) + ->will($this->returnValue(false)); + + $access->expects($this->once()) + ->method('username2dn') + ->with($this->equalTo($inputDN)) + ->will($this->returnValue(false)); + + $manager = new Manager($config, $filesys, $log, $avaMgr, $image); + $manager->setLdapAccess($access); + $user = $manager->get($inputDN); + + $this->assertNull($user); + } + + public function testGetByUidExisting() { + list($access, $config, $filesys, $image, $log, $avaMgr) = + $this->getTestInstances(); + + $dn = 'cn=foo,dc=foobar,dc=bar'; + $uid = '563418fc-423b-1033-8d1c-ad5f418ee02e'; + + $access->expects($this->never()) + ->method('dn2username'); + + $access->expects($this->once()) + ->method('username2dn') + ->with($this->equalTo($uid)) + ->will($this->returnValue($dn)); + + $manager = new Manager($config, $filesys, $log, $avaMgr, $image); + $manager->setLdapAccess($access); + $user = $manager->get($uid); + + $this->assertInstanceOf('\OCA\user_ldap\lib\user\User', $user); + } + + public function testGetByUidNotExisting() { + list($access, $config, $filesys, $image, $log, $avaMgr) = + $this->getTestInstances(); + + $dn = 'cn=foo,dc=foobar,dc=bar'; + $uid = 'gone'; + + $access->expects($this->never()) + ->method('dn2username'); + + $access->expects($this->exactly(2)) + ->method('username2dn') + ->with($this->equalTo($uid)) + ->will($this->returnValue(false)); + + $manager = new Manager($config, $filesys, $log, $avaMgr, $image); + $manager->setLdapAccess($access); + $user = $manager->get($uid); + + $this->assertNull($user); + } + +} |