diff options
Diffstat (limited to 'apps')
51 files changed, 197 insertions, 114 deletions
diff --git a/apps/comments/l10n/uk.js b/apps/comments/l10n/uk.js index 547fa22b7a5..30942d77ae3 100644 --- a/apps/comments/l10n/uk.js +++ b/apps/comments/l10n/uk.js @@ -1,20 +1,29 @@ OC.L10N.register( "comments", { - "Type in a new comment..." : "Введіть новий коментар...", + "Comments" : "Коментарі", + "New comment …" : "Новий коментар...", "Delete comment" : "Видалити коментар", "Post" : "Відправити", "Cancel" : "Скасувати", "Edit comment" : "Редагувати коментар", "[Deleted user]" : "[Видалений користувач]", - "Comments" : "Коментарі", - "No other comments available" : "Інші коментарі не доступні", - "More comments..." : "Більше коментарів...", + "No comments yet, start the conversation!" : "Коментарі відсутні, почніть бесіду!", + "More comments …" : "Більше коментарів ...", "Save" : "Зберегти", "Allowed characters {count} of {max}" : "Доступно символів {count} з {max}", - "{count} unread comments" : "{count} непрочитаних коментарів", + "Error occurred while retrieving comment with ID {id}" : "Помилка під час відповіді на коментар ID {id}", + "Error occurred while updating comment with id {id}" : "Помилка під час оновлення коментаря з id {id}", + "Error occurred while posting comment" : "Помилка під час написання коментаря", "Comment" : "Коментар", + "You commented" : "Ви прокоментували", "%1$s commented" : "%1$s прокоментовано", - "%1$s commented on %2$s" : "%1$s прокоментовано у %2$s" + "{author} commented" : "{author} прокоментував", + "You commented on %1$s" : "Ви прокоментували на %1$s", + "You commented on {file}" : "Ви прокоментували {file}", + "%1$s commented on %2$s" : "%1$s прокоментовано у %2$s", + "{author} commented on {file}" : "{author} прокоментував {file}", + "<strong>Comments</strong> for files" : "<strong>Коментів</strong> для файлів", + "Unknown user" : "Невідомий користувач" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/comments/l10n/uk.json b/apps/comments/l10n/uk.json index 5fbbe2a6217..f5103ea7820 100644 --- a/apps/comments/l10n/uk.json +++ b/apps/comments/l10n/uk.json @@ -1,18 +1,27 @@ { "translations": { - "Type in a new comment..." : "Введіть новий коментар...", + "Comments" : "Коментарі", + "New comment …" : "Новий коментар...", "Delete comment" : "Видалити коментар", "Post" : "Відправити", "Cancel" : "Скасувати", "Edit comment" : "Редагувати коментар", "[Deleted user]" : "[Видалений користувач]", - "Comments" : "Коментарі", - "No other comments available" : "Інші коментарі не доступні", - "More comments..." : "Більше коментарів...", + "No comments yet, start the conversation!" : "Коментарі відсутні, почніть бесіду!", + "More comments …" : "Більше коментарів ...", "Save" : "Зберегти", "Allowed characters {count} of {max}" : "Доступно символів {count} з {max}", - "{count} unread comments" : "{count} непрочитаних коментарів", + "Error occurred while retrieving comment with ID {id}" : "Помилка під час відповіді на коментар ID {id}", + "Error occurred while updating comment with id {id}" : "Помилка під час оновлення коментаря з id {id}", + "Error occurred while posting comment" : "Помилка під час написання коментаря", "Comment" : "Коментар", + "You commented" : "Ви прокоментували", "%1$s commented" : "%1$s прокоментовано", - "%1$s commented on %2$s" : "%1$s прокоментовано у %2$s" + "{author} commented" : "{author} прокоментував", + "You commented on %1$s" : "Ви прокоментували на %1$s", + "You commented on {file}" : "Ви прокоментували {file}", + "%1$s commented on %2$s" : "%1$s прокоментовано у %2$s", + "{author} commented on {file}" : "{author} прокоментував {file}", + "<strong>Comments</strong> for files" : "<strong>Коментів</strong> для файлів", + "Unknown user" : "Невідомий користувач" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/en_GB.js b/apps/federatedfilesharing/l10n/en_GB.js index 0e2ed2dfb1a..1f76e082c18 100644 --- a/apps/federatedfilesharing/l10n/en_GB.js +++ b/apps/federatedfilesharing/l10n/en_GB.js @@ -17,6 +17,7 @@ OC.L10N.register( "Couldn't establish a federated share." : "Couldn't establish a federated share.", "Couldn't establish a federated share, maybe the password was wrong." : "Couldn't establish a federated share, maybe the password was wrong.", "Federated Share request sent, you will receive an invitation. Check your notifications." : "Federated Share request sent, you will receive an invitation. Check your notifications.", + "Couldn't establish a federated share, it looks like the server to federate with is too old (Nextcloud <= 9)." : "Couldn't establish a federated share, it looks like the server to federate with is too old (Nextcloud <= 9).", "Sharing %s failed, because this item is already shared with %s" : "Sharing %s failed, because this item is already shared with %s", "Not allowed to create a federated share with the same user" : "Not allowed to create a federated share with the same user", "File is already shared with %s" : "File is already shared with %s", diff --git a/apps/federatedfilesharing/l10n/en_GB.json b/apps/federatedfilesharing/l10n/en_GB.json index 6e14617f0b5..1471472e031 100644 --- a/apps/federatedfilesharing/l10n/en_GB.json +++ b/apps/federatedfilesharing/l10n/en_GB.json @@ -15,6 +15,7 @@ "Couldn't establish a federated share." : "Couldn't establish a federated share.", "Couldn't establish a federated share, maybe the password was wrong." : "Couldn't establish a federated share, maybe the password was wrong.", "Federated Share request sent, you will receive an invitation. Check your notifications." : "Federated Share request sent, you will receive an invitation. Check your notifications.", + "Couldn't establish a federated share, it looks like the server to federate with is too old (Nextcloud <= 9)." : "Couldn't establish a federated share, it looks like the server to federate with is too old (Nextcloud <= 9).", "Sharing %s failed, because this item is already shared with %s" : "Sharing %s failed, because this item is already shared with %s", "Not allowed to create a federated share with the same user" : "Not allowed to create a federated share with the same user", "File is already shared with %s" : "File is already shared with %s", diff --git a/apps/federatedfilesharing/l10n/nl.js b/apps/federatedfilesharing/l10n/nl.js index ef12bf97e7a..2f536035cf1 100644 --- a/apps/federatedfilesharing/l10n/nl.js +++ b/apps/federatedfilesharing/l10n/nl.js @@ -17,6 +17,7 @@ OC.L10N.register( "Couldn't establish a federated share." : "Kon geen gefedereerde share tot stand brengen", "Couldn't establish a federated share, maybe the password was wrong." : "Kon geen gefedereerde share tot stand brengen, misschien was het wachtwoord onjuist.", "Federated Share request sent, you will receive an invitation. Check your notifications." : "De gefedereerde share aanvraag is verzonden, je ontvangt een uitnodiging. Controleer je meldingen.", + "Couldn't establish a federated share, it looks like the server to federate with is too old (Nextcloud <= 9)." : "Kon geen gefedereerde share tot stand brengen, waarschijnlijk was de federatieserver te oud (Nextcloud <=9).", "Sharing %s failed, because this item is already shared with %s" : "Delen van %s is mislukt, omdat het object al wordt gedeeld met %s", "Not allowed to create a federated share with the same user" : "Het is niet toegestaan om een gefedereerde share met dezelfde gebruikersserver te maken", "File is already shared with %s" : "Bestand is al gedeeld met %s", diff --git a/apps/federatedfilesharing/l10n/nl.json b/apps/federatedfilesharing/l10n/nl.json index 2be75acc143..328087c4ece 100644 --- a/apps/federatedfilesharing/l10n/nl.json +++ b/apps/federatedfilesharing/l10n/nl.json @@ -15,6 +15,7 @@ "Couldn't establish a federated share." : "Kon geen gefedereerde share tot stand brengen", "Couldn't establish a federated share, maybe the password was wrong." : "Kon geen gefedereerde share tot stand brengen, misschien was het wachtwoord onjuist.", "Federated Share request sent, you will receive an invitation. Check your notifications." : "De gefedereerde share aanvraag is verzonden, je ontvangt een uitnodiging. Controleer je meldingen.", + "Couldn't establish a federated share, it looks like the server to federate with is too old (Nextcloud <= 9)." : "Kon geen gefedereerde share tot stand brengen, waarschijnlijk was de federatieserver te oud (Nextcloud <=9).", "Sharing %s failed, because this item is already shared with %s" : "Delen van %s is mislukt, omdat het object al wordt gedeeld met %s", "Not allowed to create a federated share with the same user" : "Het is niet toegestaan om een gefedereerde share met dezelfde gebruikersserver te maken", "File is already shared with %s" : "Bestand is al gedeeld met %s", diff --git a/apps/federation/l10n/ar.js b/apps/federation/l10n/ar.js index ab3d48c9856..d95f532bec0 100644 --- a/apps/federation/l10n/ar.js +++ b/apps/federation/l10n/ar.js @@ -1,15 +1,13 @@ OC.L10N.register( "federation", { - "Server added to the list of trusted ownClouds" : "تمت إضافة الخادم إلى قائمة مضيفات ownCloud الموثوق بها", - "Server is already in the list of trusted servers." : "الخادم موجود بالفعل في قائمة مضيفات ownCloud الموثوق بها", - "No ownCloud server found" : "لم يتم العثور على خادم ownCloud", + "Server is already in the list of trusted servers." : "الخادوم موجود بالفعل في قائمة الخوادم الموثوق فيها.", "Could not add server" : "تعذَّرت إضافة خادم", - "Federation" : "الاتحاد", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "يتيح لك اتحاد مضيفات ownCloud الاتصال بخادمات ownCloud الأخرى الموثوق بها لتبادل دليل المستخدمين. على سبيل المثال ، يتيح الاتحاد خدمة الإكمال التلقائي للمستخدمين الخارجيين لتمكين المشاركة في الاتحاد.", + "Federation" : "الإتحاد", + "Trusted servers" : "الخوادم الموثوق فيها", "Add server automatically once a federated share was created successfully" : "أضف الخادم تلقائياً حال نجاح إنشاء حصة في الاتحاد", - "Trusted ownCloud Servers" : "خادمات ownCloud الموثوق بها", - "+ Add ownCloud server" : "+ أضف خادم ownCloud", - "ownCloud Server" : "خادم ownCloud" + "+ Add trusted server" : "+ إضافة خادوم موثوق فيه", + "Trusted server" : "خادوم موثوق فيه", + "Add" : "إضافة" }, "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"); diff --git a/apps/federation/l10n/ar.json b/apps/federation/l10n/ar.json index dc62c5d54f9..749443171ff 100644 --- a/apps/federation/l10n/ar.json +++ b/apps/federation/l10n/ar.json @@ -1,13 +1,11 @@ { "translations": { - "Server added to the list of trusted ownClouds" : "تمت إضافة الخادم إلى قائمة مضيفات ownCloud الموثوق بها", - "Server is already in the list of trusted servers." : "الخادم موجود بالفعل في قائمة مضيفات ownCloud الموثوق بها", - "No ownCloud server found" : "لم يتم العثور على خادم ownCloud", + "Server is already in the list of trusted servers." : "الخادوم موجود بالفعل في قائمة الخوادم الموثوق فيها.", "Could not add server" : "تعذَّرت إضافة خادم", - "Federation" : "الاتحاد", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "يتيح لك اتحاد مضيفات ownCloud الاتصال بخادمات ownCloud الأخرى الموثوق بها لتبادل دليل المستخدمين. على سبيل المثال ، يتيح الاتحاد خدمة الإكمال التلقائي للمستخدمين الخارجيين لتمكين المشاركة في الاتحاد.", + "Federation" : "الإتحاد", + "Trusted servers" : "الخوادم الموثوق فيها", "Add server automatically once a federated share was created successfully" : "أضف الخادم تلقائياً حال نجاح إنشاء حصة في الاتحاد", - "Trusted ownCloud Servers" : "خادمات ownCloud الموثوق بها", - "+ Add ownCloud server" : "+ أضف خادم ownCloud", - "ownCloud Server" : "خادم ownCloud" + "+ Add trusted server" : "+ إضافة خادوم موثوق فيه", + "Trusted server" : "خادوم موثوق فيه", + "Add" : "إضافة" },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;" }
\ No newline at end of file diff --git a/apps/files/appinfo/routes.php b/apps/files/appinfo/routes.php index 3912d723508..0d1449ff355 100644 --- a/apps/files/appinfo/routes.php +++ b/apps/files/appinfo/routes.php @@ -86,8 +86,3 @@ $this->create('files_ajax_download', 'ajax/download.php') ->actionInclude('files/ajax/download.php'); $this->create('files_ajax_list', 'ajax/list.php') ->actionInclude('files/ajax/list.php'); - -$this->create('download', 'download{file}') - ->requirements(['file' => '.*']) - ->actionInclude('files/download.php'); - diff --git a/apps/files/download.php b/apps/files/download.php deleted file mode 100644 index 2389c9b535e..00000000000 --- a/apps/files/download.php +++ /dev/null @@ -1,50 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2016, ownCloud, Inc. - * - * @author Andreas Fischer <bantu@owncloud.com> - * @author Felix Moeller <mail@felixmoeller.de> - * @author Frank Karlitschek <frank@karlitschek.de> - * @author Jakob Sack <mail@jakobsack.de> - * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin Appelman <robin@icewind.nl> - * @author Roeland Jago Douma <roeland@famdouma.nl> - * @author Vincent Petry <pvince81@owncloud.com> - * - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program 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, version 3, - * along with this program. If not, see <http://www.gnu.org/licenses/> - * - */ - -$filename = $_GET["file"]; - -if(!\OC\Files\Filesystem::file_exists($filename)) { - header("HTTP/1.0 404 Not Found"); - $tmpl = new OCP\Template( '', '404', 'guest' ); - $tmpl->assign('file', $filename); - $tmpl->printPage(); - exit; -} - -$ftype=\OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType( $filename )); - -header('Content-Type:'.$ftype); -OCP\Response::setContentDispositionHeader(basename($filename), 'attachment'); -header('Pragma: public');// enable caching in IE -header('Expires: 0'); -header("Cache-Control: must-revalidate, post-check=0, pre-check=0"); -OCP\Response::setContentLengthHeader(\OC\Files\Filesystem::filesize($filename)); - -OC_Util::obEnd(); -\OC\Files\Filesystem::readfile( $filename ); diff --git a/apps/files/l10n/ar.js b/apps/files/l10n/ar.js index 26dd7d81748..cd9230a163f 100644 --- a/apps/files/l10n/ar.js +++ b/apps/files/l10n/ar.js @@ -5,7 +5,7 @@ OC.L10N.register( "Storage invalid" : "وحدة تخزين غير صالحة", "Unknown error" : "خطأ غير معروف", "All files" : "كل الملفات", - "Recent" : "الأخيرة", + "Recent" : "الحديثة", "File could not be found" : "الملف غير موجود", "Home" : "الرئيسية", "Close" : "إغلاق", @@ -13,7 +13,7 @@ OC.L10N.register( "Could not create folder \"{dir}\"" : "لا يمكن إنشاء المجلد \"{dir}\"", "Upload cancelled." : "تم إلغاء عملية رفع الملفات.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "تعذر رفع الملف {filename} إما لأنه مجلد أو لان حجم الملف 0 بايت", - "Not enough free space, you are uploading {size1} but only {size2} is left" : "لا يوجد مساحة تخزين كافية، انت تقوم برفع {size1} ولكن المساحه المتوفره هي {size2}.", + "Not enough free space, you are uploading {size1} but only {size2} is left" : "لا يوجد مساحة تخزين كافية، إنك بصدد رفع {size1} ولكن المساحة المتبقية المتوفرة تبلُغ {size2}", "Target folder \"{dir}\" does not exist any more" : "المجلد المطلوب \"{dir}\" غير موجود بعد الان", "Not enough free space" : "لا يوجد مساحة تخزينية كافية", "Uploading …" : "جاري الرفع...", @@ -21,18 +21,19 @@ OC.L10N.register( "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} من {totalSize} ({bitrate})", "Target folder does not exist any more" : "المجلد المراد غير موجود بعد الان", "Error when assembling chunks, status code {status}" : "خطأ عند تجميع القطع، حالة الخطأ {status}", - "Actions" : "* تطبيقات.\n* أنشطة.", + "Actions" : "الإجراءات", "Download" : "تنزيل", "Rename" : "إعادة التسمية", "Move or copy" : "إنقل أو انسخ", + "Copy" : "نسخ", "Target folder" : "المجلد الهدف", "Delete" : "حذف ", "Disconnect storage" : "قطع اتصال التخزين", "Unshare" : "إلغاء المشاركة", "Could not load info for file \"{file}\"" : "لم يستطع تحميل معلومات الملف \"{file}\"", "Files" : "الملفات", - "Details" : "تفاصيل", - "Select" : "اختار", + "Details" : "التفاصيل", + "Select" : "إختر", "Pending" : "قيد الانتظار", "Unable to determine date" : "تعذر تحديد التاريخ", "This operation is forbidden" : "هذة العملية ممنوعة ", @@ -80,17 +81,25 @@ OC.L10N.register( "Favorited" : "المفضلة", "Favorite" : "المفضلة", "New folder" : "مجلد جديد", + "Upload file" : "رفع ملف", + "Remove from favorites" : "إزالته مِن المفضلة", + "Add to favorites" : "إضافة إلى المفضلة", "An error occurred while trying to update the tags" : "حدث خطأ اثناء محاولة تحديث tags", + "Added to favorites" : "تمت إضافته إلى المفضلة", + "Removed from favorites" : "تمت إزالته مِن المفضلة", "A new file or folder has been <strong>created</strong>" : "تم <strong> إنشاء</strong> ملف جديد أو مجلد ", + "Unlimited" : "غير محدود", "Upload (max. %s)" : "الرفع ( حد اقصى. %s ) ", "File handling" : "التعامل مع الملف", "Maximum upload size" : "الحد الأقصى لحجم الملفات التي يمكن رفعها", "max. possible: " : "الحد الأقصى المسموح به", "Save" : "حفظ", "With PHP-FPM it might take 5 minutes for changes to be applied." : "باستخدام PHP-FPM قد يستغرق 5 دقائق لتطبيق التغيرات.", + "%s used" : "%s مُستخدَم", "Settings" : "الإعدادات", "Show hidden files" : "عرض الملفات المخفية", "WebDAV" : "WebDAV", + "Cancel upload" : "إلغاء الرفع", "No files in here" : "لا يوجد ملفات هنا ", "Upload some content or sync with your devices!" : "ارفع بعض المحتوي او زامن مع اجهزتك !", "No entries found in this folder" : "لا يوجد مدخلات في هذا المجلد ", @@ -98,7 +107,10 @@ OC.L10N.register( "Upload too large" : "حجم الترفيع أعلى من المسموح", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم.", "Files and folders you mark as favorite will show up here" : "الملفات والمجلدات التي حددتها كامفضلة سوف تظهر هنا ", + "Tags" : "الوسوم", + "Deleted files" : "الملفات المحذوفة", "Text file" : "ملف نصي", - "New text file.txt" : "ملف نصي جديد fille.txt" + "New text file.txt" : "ملف نصي جديد fille.txt", + "Move" : "نقل" }, "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"); diff --git a/apps/files/l10n/ar.json b/apps/files/l10n/ar.json index 99066052587..918ba10ec42 100644 --- a/apps/files/l10n/ar.json +++ b/apps/files/l10n/ar.json @@ -3,7 +3,7 @@ "Storage invalid" : "وحدة تخزين غير صالحة", "Unknown error" : "خطأ غير معروف", "All files" : "كل الملفات", - "Recent" : "الأخيرة", + "Recent" : "الحديثة", "File could not be found" : "الملف غير موجود", "Home" : "الرئيسية", "Close" : "إغلاق", @@ -11,7 +11,7 @@ "Could not create folder \"{dir}\"" : "لا يمكن إنشاء المجلد \"{dir}\"", "Upload cancelled." : "تم إلغاء عملية رفع الملفات.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "تعذر رفع الملف {filename} إما لأنه مجلد أو لان حجم الملف 0 بايت", - "Not enough free space, you are uploading {size1} but only {size2} is left" : "لا يوجد مساحة تخزين كافية، انت تقوم برفع {size1} ولكن المساحه المتوفره هي {size2}.", + "Not enough free space, you are uploading {size1} but only {size2} is left" : "لا يوجد مساحة تخزين كافية، إنك بصدد رفع {size1} ولكن المساحة المتبقية المتوفرة تبلُغ {size2}", "Target folder \"{dir}\" does not exist any more" : "المجلد المطلوب \"{dir}\" غير موجود بعد الان", "Not enough free space" : "لا يوجد مساحة تخزينية كافية", "Uploading …" : "جاري الرفع...", @@ -19,18 +19,19 @@ "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} من {totalSize} ({bitrate})", "Target folder does not exist any more" : "المجلد المراد غير موجود بعد الان", "Error when assembling chunks, status code {status}" : "خطأ عند تجميع القطع، حالة الخطأ {status}", - "Actions" : "* تطبيقات.\n* أنشطة.", + "Actions" : "الإجراءات", "Download" : "تنزيل", "Rename" : "إعادة التسمية", "Move or copy" : "إنقل أو انسخ", + "Copy" : "نسخ", "Target folder" : "المجلد الهدف", "Delete" : "حذف ", "Disconnect storage" : "قطع اتصال التخزين", "Unshare" : "إلغاء المشاركة", "Could not load info for file \"{file}\"" : "لم يستطع تحميل معلومات الملف \"{file}\"", "Files" : "الملفات", - "Details" : "تفاصيل", - "Select" : "اختار", + "Details" : "التفاصيل", + "Select" : "إختر", "Pending" : "قيد الانتظار", "Unable to determine date" : "تعذر تحديد التاريخ", "This operation is forbidden" : "هذة العملية ممنوعة ", @@ -78,17 +79,25 @@ "Favorited" : "المفضلة", "Favorite" : "المفضلة", "New folder" : "مجلد جديد", + "Upload file" : "رفع ملف", + "Remove from favorites" : "إزالته مِن المفضلة", + "Add to favorites" : "إضافة إلى المفضلة", "An error occurred while trying to update the tags" : "حدث خطأ اثناء محاولة تحديث tags", + "Added to favorites" : "تمت إضافته إلى المفضلة", + "Removed from favorites" : "تمت إزالته مِن المفضلة", "A new file or folder has been <strong>created</strong>" : "تم <strong> إنشاء</strong> ملف جديد أو مجلد ", + "Unlimited" : "غير محدود", "Upload (max. %s)" : "الرفع ( حد اقصى. %s ) ", "File handling" : "التعامل مع الملف", "Maximum upload size" : "الحد الأقصى لحجم الملفات التي يمكن رفعها", "max. possible: " : "الحد الأقصى المسموح به", "Save" : "حفظ", "With PHP-FPM it might take 5 minutes for changes to be applied." : "باستخدام PHP-FPM قد يستغرق 5 دقائق لتطبيق التغيرات.", + "%s used" : "%s مُستخدَم", "Settings" : "الإعدادات", "Show hidden files" : "عرض الملفات المخفية", "WebDAV" : "WebDAV", + "Cancel upload" : "إلغاء الرفع", "No files in here" : "لا يوجد ملفات هنا ", "Upload some content or sync with your devices!" : "ارفع بعض المحتوي او زامن مع اجهزتك !", "No entries found in this folder" : "لا يوجد مدخلات في هذا المجلد ", @@ -96,7 +105,10 @@ "Upload too large" : "حجم الترفيع أعلى من المسموح", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم.", "Files and folders you mark as favorite will show up here" : "الملفات والمجلدات التي حددتها كامفضلة سوف تظهر هنا ", + "Tags" : "الوسوم", + "Deleted files" : "الملفات المحذوفة", "Text file" : "ملف نصي", - "New text file.txt" : "ملف نصي جديد fille.txt" + "New text file.txt" : "ملف نصي جديد fille.txt", + "Move" : "نقل" },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;" }
\ No newline at end of file diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php index 553e5316333..483f1610bcb 100644 --- a/apps/files_external/lib/Lib/Storage/AmazonS3.php +++ b/apps/files_external/lib/Lib/Storage/AmazonS3.php @@ -410,7 +410,7 @@ class AmazonS3 extends \OC\Files\Storage\Common { } case 'w': case 'wb': - $tmpFile = \OCP\Files::tmpFile(); + $tmpFile = \OC::$server->getTempManager()->getTemporaryFile(); $handle = fopen($tmpFile, 'w'); return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) { @@ -431,7 +431,7 @@ class AmazonS3 extends \OC\Files\Storage\Common { } else { $ext = ''; } - $tmpFile = \OCP\Files::tmpFile($ext); + $tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext); if ($this->file_exists($path)) { $source = $this->readObject($path); file_put_contents($tmpFile, $source); diff --git a/apps/files_external/lib/Lib/Storage/FTP.php b/apps/files_external/lib/Lib/Storage/FTP.php index 17afb1fcf95..dc4ab9cb0e1 100644 --- a/apps/files_external/lib/Lib/Storage/FTP.php +++ b/apps/files_external/lib/Lib/Storage/FTP.php @@ -128,7 +128,7 @@ class FTP extends StreamWrapper{ } else { $ext=''; } - $tmpFile=\OCP\Files::tmpFile($ext); + $tmpFile = \OC::$server->getTempManager()->getTemporaryFile(); if ($this->file_exists($path)) { $this->getFile($path, $tmpFile); } diff --git a/apps/files_external/lib/Lib/Storage/SMB.php b/apps/files_external/lib/Lib/Storage/SMB.php index f8fd37a4d48..12ab6b0fed8 100644 --- a/apps/files_external/lib/Lib/Storage/SMB.php +++ b/apps/files_external/lib/Lib/Storage/SMB.php @@ -353,7 +353,7 @@ class SMB extends Common implements INotifyStorage { if (!$this->isCreatable(dirname($path))) { return false; } - $tmpFile = \OCP\Files::tmpFile($ext); + $tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext); } $source = fopen($tmpFile, $mode); $share = $this->share; diff --git a/apps/files_external/lib/Lib/Storage/Swift.php b/apps/files_external/lib/Lib/Storage/Swift.php index a638169dcb2..4fcd60a797d 100644 --- a/apps/files_external/lib/Lib/Storage/Swift.php +++ b/apps/files_external/lib/Lib/Storage/Swift.php @@ -194,7 +194,11 @@ class Swift extends \OC\Files\Storage\Common { $this->params = $params; // FIXME: private class... $this->objectCache = new \OC\Cache\CappedMemoryCache(); - $this->connectionFactory = new SwiftFactory(\OC::$server->getMemCacheFactory()->createDistributed('swift/'), $this->params); + $this->connectionFactory = new SwiftFactory( + \OC::$server->getMemCacheFactory()->createDistributed('swift/'), + $this->params, + \OC::$server->getLogger() + ); $this->objectStore = new \OC\Files\ObjectStore\Swift($this->params, $this->connectionFactory); $this->bucket = $params['bucket']; } @@ -424,7 +428,7 @@ class Swift extends \OC\Files\Storage\Common { } else { $ext = ''; } - $tmpFile = \OCP\Files::tmpFile($ext); + $tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext); // Fetch existing file if required if ($mode[0] !== 'w' && $this->file_exists($path)) { if ($mode[0] === 'x') { diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php index 1e121d8c868..1390eedf26e 100644 --- a/apps/files_sharing/lib/Controller/ShareAPIController.php +++ b/apps/files_sharing/lib/Controller/ShareAPIController.php @@ -207,8 +207,16 @@ class ShareAPIController extends OCSController { $result['share_with_displayname'] = $this->getDisplayNameFromAddressBook($share->getSharedWith(), 'EMAIL'); $result['token'] = $share->getToken(); } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_CIRCLE) { - $result['share_with_displayname'] = $share->getSharedWith(); - $result['share_with'] = explode(' ', $share->getSharedWith(), 2)[0]; + // getSharedWith() returns either "name (type, owner)" or + // "name (type, owner) [id]", depending on the Circles app version. + $hasCircleId = (substr($share->getSharedWith(), -1) === ']'); + + $displayNameLength = ($hasCircleId? strrpos($share->getSharedWith(), ' '): strlen($share->getSharedWith())); + $result['share_with_displayname'] = substr($share->getSharedWith(), 0, $displayNameLength); + + $shareWithStart = ($hasCircleId? strrpos($share->getSharedWith(), '[') + 1: 0); + $shareWithLength = ($hasCircleId? -1: strpos($share->getSharedWith(), ' ')); + $result['share_with'] = substr($share->getSharedWith(), $shareWithStart, $shareWithLength); } diff --git a/apps/files_versions/l10n/ar.js b/apps/files_versions/l10n/ar.js index 5729bde7b54..cb4fb02dd37 100644 --- a/apps/files_versions/l10n/ar.js +++ b/apps/files_versions/l10n/ar.js @@ -4,6 +4,8 @@ OC.L10N.register( "Could not revert: %s" : "غير قادر على الاستعادة : %s", "Versions" : "الإصدارات", "Failed to revert {file} to revision {timestamp}." : "فشل في استعادة {ملف} لنتقيح {الطابع الزمني}", - "Restore" : "استعادة " + "Restore" : "استعادة ", + "No earlier versions available" : "ليس هناك أية نُسخة سابقة", + "More versions …" : "المزيد مِن النُسَخ …" }, "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"); diff --git a/apps/files_versions/l10n/ar.json b/apps/files_versions/l10n/ar.json index 0b226adb309..c45da41a761 100644 --- a/apps/files_versions/l10n/ar.json +++ b/apps/files_versions/l10n/ar.json @@ -2,6 +2,8 @@ "Could not revert: %s" : "غير قادر على الاستعادة : %s", "Versions" : "الإصدارات", "Failed to revert {file} to revision {timestamp}." : "فشل في استعادة {ملف} لنتقيح {الطابع الزمني}", - "Restore" : "استعادة " + "Restore" : "استعادة ", + "No earlier versions available" : "ليس هناك أية نُسخة سابقة", + "More versions …" : "المزيد مِن النُسَخ …" },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;" }
\ No newline at end of file diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php index c09f1617f40..cd277adb162 100644 --- a/apps/provisioning_api/lib/Controller/UsersController.php +++ b/apps/provisioning_api/lib/Controller/UsersController.php @@ -495,7 +495,7 @@ class UsersController extends OCSController { $this->config->setUserValue($targetUser->getUID(), 'core', 'lang', $value); break; case AccountManager::PROPERTY_EMAIL: - if(filter_var($value, FILTER_VALIDATE_EMAIL)) { + if(filter_var($value, FILTER_VALIDATE_EMAIL) || $value === '') { $targetUser->setEMailAddress($value); } else { throw new OCSException('', 102); diff --git a/apps/sharebymail/l10n/sk.js b/apps/sharebymail/l10n/sk.js index 047c9eb2c35..d10d5d49959 100644 --- a/apps/sharebymail/l10n/sk.js +++ b/apps/sharebymail/l10n/sk.js @@ -9,14 +9,26 @@ OC.L10N.register( "You shared {file} with {email} by mail" : "Sprístupnili ste {file} používateľovi {email} pomocou emailu", "%3$s shared %1$s with %2$s by mail" : "%3$s sprístupnil %1$s používateľovi %2$s pomocou emailu", "{actor} shared {file} with {email} by mail" : "{actor} sprístupnil {file} používateľovi {email} pomocou emailu", + "Password to access {file} was sent to {email}" : "Heslo na sprístupnenie {file} bolo zaslané na {email}", + "Password to access %1$s was sent to you" : "Heslo na sprístupnenie %1$s Vám bolo zaslané", + "Password to access {file} was sent to you" : "Heslo na sprístupnenie {file} Vám bolo zaslané", "Sharing %s failed, this item is already shared with %s" : "Sprístupnenie %s zlyhalo, táto položka je už používateľovi %s sprístupnená", + "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Vygenerované heslo Vám nemôže byť zaslané. Zadajte správnu mailovú adresu vo Vašich osobných nastaveniach a skúste znovu.", + "Failed to send share by email" : "Zaslanie sprístupnenia cez e-mail zlyhalo", "%s shared »%s« with you" : "%s vám sprístupnil »%s«", + "%s shared »%s« with you." : "%s Vám sprístupnil »%s«", + "Click the button below to open it." : "Stlačte tlačidlo nižšie pre otvorenie.", "Open »%s«" : "Otvoriť »%s«", "%s via %s" : "%s cez %s", + "%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n" : "%s Vám sprístupnil »%s«.\nSpráva s odkazom by Vám už mala byť doručená.\n", + "%s shared »%s« with you. You should have already received a separate mail with a link to access it." : "%s Vám sprístupnil »%s«. Správa s odkazom by Vám už mala byť doručená.", + "Password to access »%s«" : "Heslo pre prístup k »%s«", "Password to access »%s« shared with %s" : "Heslo pre prístup k »%s« sprístupnené používateľovi %s", "This is the password: %s" : "Toto je heslo: %s", + "You can choose a different password at any time in the share dialog." : "Kedykoľvek môžete vybrať iné heslo v okne zdieľania.", "Could not find share" : "Nebolo možné nájsť sprístupnenie", "Share by mail" : "Sprístupniť e-mailom", + "Allows users to share a personalized link to a file or folder by putting in an email address." : "Povoľuje používateľom zdieľať personalizovaný odkaz na súbor alebo priečinok zadaním e-mailovej adresy.", "Send password by mail" : "Odoslať heslo e-mailom", "Enforce password protection" : "Vynútiť ochranu heslom", "Failed to send share by E-mail" : "Nebolo možné poslať sprístupnenie emailom" diff --git a/apps/sharebymail/l10n/sk.json b/apps/sharebymail/l10n/sk.json index 2350b994ced..89f0b8fc2f3 100644 --- a/apps/sharebymail/l10n/sk.json +++ b/apps/sharebymail/l10n/sk.json @@ -7,14 +7,26 @@ "You shared {file} with {email} by mail" : "Sprístupnili ste {file} používateľovi {email} pomocou emailu", "%3$s shared %1$s with %2$s by mail" : "%3$s sprístupnil %1$s používateľovi %2$s pomocou emailu", "{actor} shared {file} with {email} by mail" : "{actor} sprístupnil {file} používateľovi {email} pomocou emailu", + "Password to access {file} was sent to {email}" : "Heslo na sprístupnenie {file} bolo zaslané na {email}", + "Password to access %1$s was sent to you" : "Heslo na sprístupnenie %1$s Vám bolo zaslané", + "Password to access {file} was sent to you" : "Heslo na sprístupnenie {file} Vám bolo zaslané", "Sharing %s failed, this item is already shared with %s" : "Sprístupnenie %s zlyhalo, táto položka je už používateľovi %s sprístupnená", + "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Vygenerované heslo Vám nemôže byť zaslané. Zadajte správnu mailovú adresu vo Vašich osobných nastaveniach a skúste znovu.", + "Failed to send share by email" : "Zaslanie sprístupnenia cez e-mail zlyhalo", "%s shared »%s« with you" : "%s vám sprístupnil »%s«", + "%s shared »%s« with you." : "%s Vám sprístupnil »%s«", + "Click the button below to open it." : "Stlačte tlačidlo nižšie pre otvorenie.", "Open »%s«" : "Otvoriť »%s«", "%s via %s" : "%s cez %s", + "%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n" : "%s Vám sprístupnil »%s«.\nSpráva s odkazom by Vám už mala byť doručená.\n", + "%s shared »%s« with you. You should have already received a separate mail with a link to access it." : "%s Vám sprístupnil »%s«. Správa s odkazom by Vám už mala byť doručená.", + "Password to access »%s«" : "Heslo pre prístup k »%s«", "Password to access »%s« shared with %s" : "Heslo pre prístup k »%s« sprístupnené používateľovi %s", "This is the password: %s" : "Toto je heslo: %s", + "You can choose a different password at any time in the share dialog." : "Kedykoľvek môžete vybrať iné heslo v okne zdieľania.", "Could not find share" : "Nebolo možné nájsť sprístupnenie", "Share by mail" : "Sprístupniť e-mailom", + "Allows users to share a personalized link to a file or folder by putting in an email address." : "Povoľuje používateľom zdieľať personalizovaný odkaz na súbor alebo priečinok zadaním e-mailovej adresy.", "Send password by mail" : "Odoslať heslo e-mailom", "Enforce password protection" : "Vynútiť ochranu heslom", "Failed to send share by E-mail" : "Nebolo možné poslať sprístupnenie emailom" diff --git a/apps/theming/lib/Controller/ThemingController.php b/apps/theming/lib/Controller/ThemingController.php index 74f6a6f036d..47f806d16f9 100644 --- a/apps/theming/lib/Controller/ThemingController.php +++ b/apps/theming/lib/Controller/ThemingController.php @@ -218,14 +218,14 @@ class ThemingController extends Controller { $newBackgroundLogo = $this->request->getUploadedFile('upload-login-background'); $error = null; $phpFileUploadErrors = [ - UPLOAD_ERR_OK => $this->l10n->t('There is no error, the file uploaded with success'), + UPLOAD_ERR_OK => $this->l10n->t('The file was uploaded'), UPLOAD_ERR_INI_SIZE => $this->l10n->t('The uploaded file exceeds the upload_max_filesize directive in php.ini'), UPLOAD_ERR_FORM_SIZE => $this->l10n->t('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'), UPLOAD_ERR_PARTIAL => $this->l10n->t('The file was only partially uploaded'), UPLOAD_ERR_NO_FILE => $this->l10n->t('No file was uploaded'), UPLOAD_ERR_NO_TMP_DIR => $this->l10n->t('Missing a temporary folder'), - UPLOAD_ERR_CANT_WRITE => $this->l10n->t('Failed to write file to disk.'), - UPLOAD_ERR_EXTENSION => $this->l10n->t('A PHP extension stopped the file upload.'), + UPLOAD_ERR_CANT_WRITE => $this->l10n->t('Could not write file to disk'), + UPLOAD_ERR_EXTENSION => $this->l10n->t('A PHP extension stopped the file upload'), ]; if (empty($newLogo) && empty($newBackgroundLogo)) { $error = $this->l10n->t('No file uploaded'); diff --git a/apps/theming/tests/Controller/ThemingControllerTest.php b/apps/theming/tests/Controller/ThemingControllerTest.php index 25c5686dda1..08af13f994b 100644 --- a/apps/theming/tests/Controller/ThemingControllerTest.php +++ b/apps/theming/tests/Controller/ThemingControllerTest.php @@ -529,8 +529,8 @@ class ThemingControllerTest extends TestCase { [UPLOAD_ERR_PARTIAL, 'The file was only partially uploaded'], [UPLOAD_ERR_NO_FILE, 'No file was uploaded'], [UPLOAD_ERR_NO_TMP_DIR, 'Missing a temporary folder'], - [UPLOAD_ERR_CANT_WRITE, 'Failed to write file to disk.'], - [UPLOAD_ERR_EXTENSION, 'A PHP extension stopped the file upload.'], + [UPLOAD_ERR_CANT_WRITE, 'Could not write file to disk'], + [UPLOAD_ERR_EXTENSION, 'A PHP extension stopped the file upload'], ]; } diff --git a/apps/updatenotification/css/admin.css b/apps/updatenotification/css/admin.css index cb03f6a15cb..52cc961ae35 100644 --- a/apps/updatenotification/css/admin.css +++ b/apps/updatenotification/css/admin.css @@ -31,3 +31,12 @@ #updatenotification .icon-triangle-n { opacity: 0.5; } + +#updatenotification .channel-description span { + color: #aaa; +} + +#updatenotification .channel-description span strong { + color: #555; + font-weight: normal; +} diff --git a/apps/updatenotification/js-src/components/root.vue b/apps/updatenotification/js-src/components/root.vue index 11dfd351c63..774fd6dd539 100644 --- a/apps/updatenotification/js-src/components/root.vue +++ b/apps/updatenotification/js-src/components/root.vue @@ -55,6 +55,12 @@ <em>{{ t('updatenotification', 'Note that after a new release it can take some time before it shows up here. We roll out new versions spread out over time to our users and sometimes skip a version when issues are found.') }}</em> </p> + <p class="channel-description"> + <span v-html="productionInfoString"></span><br> + <span v-html="stableInfoString"></span><br> + <span v-html="betaInfoString"></span> + </p> + <p id="oca_updatenotification_groups"> {{ t('updatenotification', 'Notify members of the following groups about available updates:') }} <v-select multiple :value="notifyGroups" :options="availableGroups"></v-select><br /> @@ -174,6 +180,18 @@ this.missingAppUpdates.length, { version: this.newVersionString }); + }, + + productionInfoString: function() { + return t('updatenotification', '<strong>production</strong> will always provide the latest patch level, but not update to the next major release immediately. That update usually happens with the second minor release (x.0.2).'); + }, + + stableInfoString: function() { + return t('updatenotification', '<strong>stable</strong> is the most recent stable version. It is suited for production use and will always update to the latest major version.'); + }, + + betaInfoString: function() { + return t('updatenotification', '<strong>beta</strong> is a pre-release version only for testing new features, not for production environments.'); } }, diff --git a/apps/updatenotification/l10n/cs.js b/apps/updatenotification/l10n/cs.js index 67e3c96f4e1..62c9dc731aa 100644 --- a/apps/updatenotification/l10n/cs.js +++ b/apps/updatenotification/l10n/cs.js @@ -2,6 +2,8 @@ OC.L10N.register( "updatenotification", { "{version} is available. Get more information on how to update." : "Je dostupná {version}. Přečtěte si více informací jak aktualizovat.", + "Apps missing updates" : "Aplikace s chybějícími aktualizacemi", + "Apps with available updates" : "Aplikace s dostupnými aktualizacemi", "Open updater" : "Otevřít aktualizátor", "Your version is up to date." : "Používáte nejnovější verzi.", "A non-default update server is in use to be checked for updates:" : "Pro kontrolu aktualizací se používá jiný než výchozí server:", @@ -11,6 +13,7 @@ OC.L10N.register( "Notify members of the following groups about available updates:" : "Upozorňovat členy následujících skupin na dostupné aktualizace:", "Only notification for app updates are available." : "Je možné pouze upozornění na dostupné aktualizace aplikací.", "The selected update channel does not support updates of the server." : "Vybraný kanál aktualizací nepodporuje aktualizace serveru.", + "A new version is available: <strong>{newVersionString}</strong>" : "K dispozici je nová verze: <strong>{newVersionString}</strong>", "Checked on {lastCheckedDate}" : "Zkontrolováno {lastCheckedDate}", "Could not start updater, please try the manual update" : "Nepodařilo se spustit aktualizátor, zkuste ruční aktualizaci", "Update notifications" : "Aktualizovat upozornění", diff --git a/apps/updatenotification/l10n/cs.json b/apps/updatenotification/l10n/cs.json index 694836f0296..e6ecbb32896 100644 --- a/apps/updatenotification/l10n/cs.json +++ b/apps/updatenotification/l10n/cs.json @@ -1,5 +1,7 @@ { "translations": { "{version} is available. Get more information on how to update." : "Je dostupná {version}. Přečtěte si více informací jak aktualizovat.", + "Apps missing updates" : "Aplikace s chybějícími aktualizacemi", + "Apps with available updates" : "Aplikace s dostupnými aktualizacemi", "Open updater" : "Otevřít aktualizátor", "Your version is up to date." : "Používáte nejnovější verzi.", "A non-default update server is in use to be checked for updates:" : "Pro kontrolu aktualizací se používá jiný než výchozí server:", @@ -9,6 +11,7 @@ "Notify members of the following groups about available updates:" : "Upozorňovat členy následujících skupin na dostupné aktualizace:", "Only notification for app updates are available." : "Je možné pouze upozornění na dostupné aktualizace aplikací.", "The selected update channel does not support updates of the server." : "Vybraný kanál aktualizací nepodporuje aktualizace serveru.", + "A new version is available: <strong>{newVersionString}</strong>" : "K dispozici je nová verze: <strong>{newVersionString}</strong>", "Checked on {lastCheckedDate}" : "Zkontrolováno {lastCheckedDate}", "Could not start updater, please try the manual update" : "Nepodařilo se spustit aktualizátor, zkuste ruční aktualizaci", "Update notifications" : "Aktualizovat upozornění", diff --git a/apps/updatenotification/l10n/es.js b/apps/updatenotification/l10n/es.js index 07d831c7ad7..cc10e44fe9f 100644 --- a/apps/updatenotification/l10n/es.js +++ b/apps/updatenotification/l10n/es.js @@ -31,7 +31,7 @@ OC.L10N.register( "Update notification" : "Notificación de actualización", "A new version is available: %s" : "Hay una nueva versión disponible: %s", "Download now" : "Descargar ahora", - "Checked on %s" : "Revisado el %s", + "Checked on %s" : "Comprobado el %s", "The selected update channel makes dedicated notifications for the server obsolete." : "El canal de actualización seleccionado hace obsoletas las notificaciones dedicadas para el servidor.", "The update check is not yet finished. Please refresh the page." : "La comprobación de actuliazaciones no ha finalizado aún. Por favor, recarga la página." }, diff --git a/apps/updatenotification/l10n/es.json b/apps/updatenotification/l10n/es.json index 39c9f9099e0..9de3196df1b 100644 --- a/apps/updatenotification/l10n/es.json +++ b/apps/updatenotification/l10n/es.json @@ -29,7 +29,7 @@ "Update notification" : "Notificación de actualización", "A new version is available: %s" : "Hay una nueva versión disponible: %s", "Download now" : "Descargar ahora", - "Checked on %s" : "Revisado el %s", + "Checked on %s" : "Comprobado el %s", "The selected update channel makes dedicated notifications for the server obsolete." : "El canal de actualización seleccionado hace obsoletas las notificaciones dedicadas para el servidor.", "The update check is not yet finished. Please refresh the page." : "La comprobación de actuliazaciones no ha finalizado aún. Por favor, recarga la página." },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/updatenotification/l10n/nl.js b/apps/updatenotification/l10n/nl.js index 6cb9548264f..cc2360ca7dc 100644 --- a/apps/updatenotification/l10n/nl.js +++ b/apps/updatenotification/l10n/nl.js @@ -15,7 +15,9 @@ OC.L10N.register( "The selected update channel does not support updates of the server." : "Het geselecteerde updatekanaal ondersteunt geen updates voor de server.", "A new version is available: <strong>{newVersionString}</strong>" : "Er is een nieuwe versie beschikbaar: <strong>{newVersionString}</strong>", "Checked on {lastCheckedDate}" : "Gecontroleerd op {lastCheckedDate}", + "Checking apps for compatible updates" : "Apps controleren op compatibele updates", "Please make sure your config.php does not set <samp>appstoreenabled</samp> to false." : "Zorg ervoor dat je in config.php <samp>appstoreenabled</samp> niet op 'false' zet.", + "Could not connect to the appstore or the appstore returned no updates at all. Search manually for updates or make sure your server has access to the internet and can connect to the appstore." : "Kan niet verbinden met de appstore of de appstore gaf geen updates terug. Zoek handmatig naar updates of verifieer dat je server internettoegang heeft en kan verbinden met de appstore.", "<strong>All</strong> apps have an update for this version available" : "<strong>Alle</strong> apps hebben een update voor deze versie beschikbaar", "_<strong>%n</strong> app has no update for this version available_::_<strong>%n</strong> apps have no update for this version available_" : ["<strong>%n</strong> app heeft geen update voor deze versie beschikbaar","<strong>%n</strong> apps hebben geen update voor deze versie beschikbaar"], "Could not start updater, please try the manual update" : "Kon de updater niet starten, probeer alsjeblieft de handmatige update", diff --git a/apps/updatenotification/l10n/nl.json b/apps/updatenotification/l10n/nl.json index 411d9ebae8f..a33d9157b52 100644 --- a/apps/updatenotification/l10n/nl.json +++ b/apps/updatenotification/l10n/nl.json @@ -13,7 +13,9 @@ "The selected update channel does not support updates of the server." : "Het geselecteerde updatekanaal ondersteunt geen updates voor de server.", "A new version is available: <strong>{newVersionString}</strong>" : "Er is een nieuwe versie beschikbaar: <strong>{newVersionString}</strong>", "Checked on {lastCheckedDate}" : "Gecontroleerd op {lastCheckedDate}", + "Checking apps for compatible updates" : "Apps controleren op compatibele updates", "Please make sure your config.php does not set <samp>appstoreenabled</samp> to false." : "Zorg ervoor dat je in config.php <samp>appstoreenabled</samp> niet op 'false' zet.", + "Could not connect to the appstore or the appstore returned no updates at all. Search manually for updates or make sure your server has access to the internet and can connect to the appstore." : "Kan niet verbinden met de appstore of de appstore gaf geen updates terug. Zoek handmatig naar updates of verifieer dat je server internettoegang heeft en kan verbinden met de appstore.", "<strong>All</strong> apps have an update for this version available" : "<strong>Alle</strong> apps hebben een update voor deze versie beschikbaar", "_<strong>%n</strong> app has no update for this version available_::_<strong>%n</strong> apps have no update for this version available_" : ["<strong>%n</strong> app heeft geen update voor deze versie beschikbaar","<strong>%n</strong> apps hebben geen update voor deze versie beschikbaar"], "Could not start updater, please try the manual update" : "Kon de updater niet starten, probeer alsjeblieft de handmatige update", diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php index 0c87bd9c069..9fb37090270 100644 --- a/apps/user_ldap/lib/Access.php +++ b/apps/user_ldap/lib/Access.php @@ -472,6 +472,7 @@ class Access extends LDAPUtility implements IUserTools { * * @param string[] $groupDNs * @return string[] + * @throws ServerNotAvailableException */ public function groupsMatchFilter($groupDNs) { $validGroupDNs = []; @@ -492,7 +493,7 @@ class Access extends LDAPUtility implements IUserTools { continue; } - $result = $this->readAttribute($dn, 'cn', $this->connection->ldapGroupFilter); + $result = $this->readAttribute($dn, '', $this->connection->ldapGroupFilter); if(is_array($result)) { $this->connection->writeToCache($cacheKey, true); $validGroupDNs[] = $dn; diff --git a/apps/workflowengine/l10n/de.js b/apps/workflowengine/l10n/de.js index 001167543c8..33558774c84 100644 --- a/apps/workflowengine/l10n/de.js +++ b/apps/workflowengine/l10n/de.js @@ -1,6 +1,7 @@ OC.L10N.register( "workflowengine", { + "Unable to retrieve the group list" : "Gruppenliste konnte nicht empfangen werden", "Saved" : "Gespeichert", "Saving failed:" : "Speichern fehlgeschlagen:", "File MIME type" : "Datei MIME-Typ", diff --git a/apps/workflowengine/l10n/de.json b/apps/workflowengine/l10n/de.json index 17f5d2f6e53..5d777ff9101 100644 --- a/apps/workflowengine/l10n/de.json +++ b/apps/workflowengine/l10n/de.json @@ -1,4 +1,5 @@ { "translations": { + "Unable to retrieve the group list" : "Gruppenliste konnte nicht empfangen werden", "Saved" : "Gespeichert", "Saving failed:" : "Speichern fehlgeschlagen:", "File MIME type" : "Datei MIME-Typ", diff --git a/apps/workflowengine/l10n/de_DE.js b/apps/workflowengine/l10n/de_DE.js index ec2abb93049..a8349e499a8 100644 --- a/apps/workflowengine/l10n/de_DE.js +++ b/apps/workflowengine/l10n/de_DE.js @@ -1,6 +1,7 @@ OC.L10N.register( "workflowengine", { + "Unable to retrieve the group list" : "Gruppenliste konnte nicht empfangen werden", "Saved" : "Gespeichert", "Saving failed:" : "Speichern fehlgeschlagen:", "File MIME type" : "Datei MIME-Typ", diff --git a/apps/workflowengine/l10n/de_DE.json b/apps/workflowengine/l10n/de_DE.json index a113e877326..7e01b378c93 100644 --- a/apps/workflowengine/l10n/de_DE.json +++ b/apps/workflowengine/l10n/de_DE.json @@ -1,4 +1,5 @@ { "translations": { + "Unable to retrieve the group list" : "Gruppenliste konnte nicht empfangen werden", "Saved" : "Gespeichert", "Saving failed:" : "Speichern fehlgeschlagen:", "File MIME type" : "Datei MIME-Typ", diff --git a/apps/workflowengine/l10n/en_GB.js b/apps/workflowengine/l10n/en_GB.js index 2fa01805ea0..5c90961bc12 100644 --- a/apps/workflowengine/l10n/en_GB.js +++ b/apps/workflowengine/l10n/en_GB.js @@ -1,6 +1,7 @@ OC.L10N.register( "workflowengine", { + "Unable to retrieve the group list" : "Unable to retrieve the group list", "Saved" : "Saved", "Saving failed:" : "Saving failed:", "File MIME type" : "File MIME type", diff --git a/apps/workflowengine/l10n/en_GB.json b/apps/workflowengine/l10n/en_GB.json index c0f489d4dc9..fbaa43772d2 100644 --- a/apps/workflowengine/l10n/en_GB.json +++ b/apps/workflowengine/l10n/en_GB.json @@ -1,4 +1,5 @@ { "translations": { + "Unable to retrieve the group list" : "Unable to retrieve the group list", "Saved" : "Saved", "Saving failed:" : "Saving failed:", "File MIME type" : "File MIME type", diff --git a/apps/workflowengine/l10n/es.js b/apps/workflowengine/l10n/es.js index 95d3b577cd2..e628e101fd5 100644 --- a/apps/workflowengine/l10n/es.js +++ b/apps/workflowengine/l10n/es.js @@ -1,6 +1,7 @@ OC.L10N.register( "workflowengine", { + "Unable to retrieve the group list" : "No es posible recibir la lista de grupos", "Saved" : "Guardado", "Saving failed:" : "Fallo al guardar:", "File MIME type" : "Tipo MIME del archivo", diff --git a/apps/workflowengine/l10n/es.json b/apps/workflowengine/l10n/es.json index 55450639bf1..6620c4a765e 100644 --- a/apps/workflowengine/l10n/es.json +++ b/apps/workflowengine/l10n/es.json @@ -1,4 +1,5 @@ { "translations": { + "Unable to retrieve the group list" : "No es posible recibir la lista de grupos", "Saved" : "Guardado", "Saving failed:" : "Fallo al guardar:", "File MIME type" : "Tipo MIME del archivo", diff --git a/apps/workflowengine/l10n/fr.js b/apps/workflowengine/l10n/fr.js index 576c1a821aa..5d66c6dafd5 100644 --- a/apps/workflowengine/l10n/fr.js +++ b/apps/workflowengine/l10n/fr.js @@ -1,6 +1,7 @@ OC.L10N.register( "workflowengine", { + "Unable to retrieve the group list" : "Impossible de récupérer la liste du groupe", "Saved" : "Sauvegardé", "Saving failed:" : "L'enregistrement a échoué:", "File MIME type" : "Type MIME du fichier", diff --git a/apps/workflowengine/l10n/fr.json b/apps/workflowengine/l10n/fr.json index 5229395b99a..e85bec67c94 100644 --- a/apps/workflowengine/l10n/fr.json +++ b/apps/workflowengine/l10n/fr.json @@ -1,4 +1,5 @@ { "translations": { + "Unable to retrieve the group list" : "Impossible de récupérer la liste du groupe", "Saved" : "Sauvegardé", "Saving failed:" : "L'enregistrement a échoué:", "File MIME type" : "Type MIME du fichier", diff --git a/apps/workflowengine/l10n/it.js b/apps/workflowengine/l10n/it.js index 3a7c0c9f859..a16fec791f0 100644 --- a/apps/workflowengine/l10n/it.js +++ b/apps/workflowengine/l10n/it.js @@ -1,6 +1,7 @@ OC.L10N.register( "workflowengine", { + "Unable to retrieve the group list" : "Impossibile recuperare l'elenco dei gruppi", "Saved" : "Salvato", "Saving failed:" : "Salvataggio non riuscito:", "File MIME type" : "Tipo MIME del file", diff --git a/apps/workflowengine/l10n/it.json b/apps/workflowengine/l10n/it.json index 1f6a04a240c..7ced857a54c 100644 --- a/apps/workflowengine/l10n/it.json +++ b/apps/workflowengine/l10n/it.json @@ -1,4 +1,5 @@ { "translations": { + "Unable to retrieve the group list" : "Impossibile recuperare l'elenco dei gruppi", "Saved" : "Salvato", "Saving failed:" : "Salvataggio non riuscito:", "File MIME type" : "Tipo MIME del file", diff --git a/apps/workflowengine/l10n/nl.js b/apps/workflowengine/l10n/nl.js index 3a95f5f551d..0215ec52473 100644 --- a/apps/workflowengine/l10n/nl.js +++ b/apps/workflowengine/l10n/nl.js @@ -1,6 +1,7 @@ OC.L10N.register( "workflowengine", { + "Unable to retrieve the group list" : "Kan groepsoverzicht niet ophalen", "Saved" : "Bewaard", "Saving failed:" : "Opslaan mislukt:", "File MIME type" : "Mimetype bestand", diff --git a/apps/workflowengine/l10n/nl.json b/apps/workflowengine/l10n/nl.json index c267d4d5809..6d739bc8bf4 100644 --- a/apps/workflowengine/l10n/nl.json +++ b/apps/workflowengine/l10n/nl.json @@ -1,4 +1,5 @@ { "translations": { + "Unable to retrieve the group list" : "Kan groepsoverzicht niet ophalen", "Saved" : "Bewaard", "Saving failed:" : "Opslaan mislukt:", "File MIME type" : "Mimetype bestand", diff --git a/apps/workflowengine/l10n/pt_BR.js b/apps/workflowengine/l10n/pt_BR.js index d9457eac8eb..e6f5b05ed8c 100644 --- a/apps/workflowengine/l10n/pt_BR.js +++ b/apps/workflowengine/l10n/pt_BR.js @@ -1,6 +1,7 @@ OC.L10N.register( "workflowengine", { + "Unable to retrieve the group list" : "Impossível recuperar a lista do grupo", "Saved" : "Salvo", "Saving failed:" : "A gravação falhou:", "File MIME type" : "Tipo de arquivo MIME", diff --git a/apps/workflowengine/l10n/pt_BR.json b/apps/workflowengine/l10n/pt_BR.json index a5087303cba..3a5dd45540c 100644 --- a/apps/workflowengine/l10n/pt_BR.json +++ b/apps/workflowengine/l10n/pt_BR.json @@ -1,4 +1,5 @@ { "translations": { + "Unable to retrieve the group list" : "Impossível recuperar a lista do grupo", "Saved" : "Salvo", "Saving failed:" : "A gravação falhou:", "File MIME type" : "Tipo de arquivo MIME", diff --git a/apps/workflowengine/l10n/tr.js b/apps/workflowengine/l10n/tr.js index 014605ceb48..e41710f175f 100644 --- a/apps/workflowengine/l10n/tr.js +++ b/apps/workflowengine/l10n/tr.js @@ -1,6 +1,7 @@ OC.L10N.register( "workflowengine", { + "Unable to retrieve the group list" : "Grup listesi alınamadı", "Saved" : "Kaydedildi", "Saving failed:" : "Kaydedilemedi:", "File MIME type" : "Dosya MIME türü", diff --git a/apps/workflowengine/l10n/tr.json b/apps/workflowengine/l10n/tr.json index 3f18ad4b290..40f33f4cf13 100644 --- a/apps/workflowengine/l10n/tr.json +++ b/apps/workflowengine/l10n/tr.json @@ -1,4 +1,5 @@ { "translations": { + "Unable to retrieve the group list" : "Grup listesi alınamadı", "Saved" : "Kaydedildi", "Saving failed:" : "Kaydedilemedi:", "File MIME type" : "Dosya MIME türü", |