Merge branch 'master' into fixing-998-master

Conflicts:
	apps/files/js/files.js

10 files changed, 105 insertions, 50 deletions

diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 89066d2baa9..853e12812ed 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -1,29 +1,9 @@
 <?php $TRANSLATIONS = array(
-"Email saved" => "Е-пощата е записана",
-"Invalid email" => "Неправилна е-поща",
-"OpenID Changed" => "OpenID е сменено",
-"Invalid request" => "Невалидна заявка",
-"Authentication error" => "Проблем с идентификацията",
-"Language changed" => "Езика е сменен",
-"Disable" => "Изключване",
-"Enable" => "Включване",
-"Saving..." => "Записване...",
-"Select an App" => "Изберете програма",
-"Clients" => "Клиенти",
+"Authentication error" => "Възникна проблем с идентификацията",
+"Enable" => "Включено",
 "Password" => "Парола",
-"Unable to change your password" => "Невъзможна промяна на паролата",
-"Current password" => "Текуща парола",
-"New password" => "Нова парола",
-"show" => "показва",
-"Change password" => "Промяна на парола",
-"Email" => "Е-поща",
-"Your email address" => "Адресът на е-пощата ви",
-"Fill in an email address to enable password recovery" => "Въведете е-поща за възстановяване на паролата",
-"Language" => "Език",
-"Help translate" => "Помощ за превода",
+"Email" => "E-mail",
 "Name" => "Име",
 "Groups" => "Групи",
-"Create" => "Ново",
-"Other" => "Друго",
 "Delete" => "Изтриване"
 );
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
index 0b7983c6c1c..49b86c0e5e7 100644
--- a/settings/l10n/bn_BD.php
+++ b/settings/l10n/bn_BD.php
@@ -1,46 +1,63 @@
 <?php $TRANSLATIONS = array(
-"Unable to load list from App Store" => "অ্যাপস্টোর থেকে তালিকা লোড করা সম্ভব হলো না",
-"Group already exists" => "গোষ্ঠীটি বিদ্যমান",
-"Unable to add group" => "গোষ্ঠী যোগ করতে পারা গেল না",
-"Could not enable app. " => "অ্যাপ সক্রিয় করা সম্ভব হলো না",
-"Email saved" => "ই-মেইল সংরক্ষণ করা হয়েছে",
+"Unable to load list from App Store" => "অ্যাপস্টোর থেকে তালিকা লোড করতে সক্ষম নয়",
+"Group already exists" => "গোষ্ঠীটি পূর্ব থেকেই বিদ্যমান",
+"Unable to add group" => "গোষ্ঠী যোগ করা সম্ভব হলো না",
+"Could not enable app. " => "অ্যপটি সক্রিয় করতে সক্ষম নয়।",
+"Email saved" => "ই-মেইল সংরক্ষন করা হয়েছে",
 "Invalid email" => "ই-মেইলটি সঠিক নয়",
 "OpenID Changed" => "OpenID পরিবর্তন করা হয়েছে",
-"Invalid request" => "অননুমোদিত অনুরোধ",
-"Unable to delete group" => "গোষ্ঠী মুছে ফেলা সম্ভব হলো না",
-"Authentication error" => "নিশ্চিতকরণে সমস্যা দেখা দিয়েছে",
-"Unable to delete user" => "ব্যবহারকারি মুছে ফেলা সম্ভব হলো না",
+"Invalid request" => "অনুরোধটি যথাযথ নয়",
+"Unable to delete group" => "গোষ্ঠী মুছে ফেলা সম্ভব হলো না ",
+"Authentication error" => "অনুমোদন ঘটিত সমস্যা",
+"Unable to delete user" => "ব্যবহারকারী মুছে ফেলা সম্ভব হলো না ",
 "Language changed" => "ভাষা পরিবর্তন করা হয়েছে",
+"Admins can't remove themself from the admin group" => "প্রশাসকবৃন্দ তাদেরকে প্রশাসক গোষ্ঠী থেকে মুছে ফেলতে পারবেন না",
+"Unable to add user to group %s" => " %s গোষ্ঠীতে ব্যবহারকারী যোগ করা সম্ভব হলো না ",
+"Unable to remove user from group %s" => "%s গোষ্ঠী থেকে ব্যবহারকারীকে অপসারণ করা সম্ভব হলো না",
 "Disable" => "নিষ্ক্রিয়",
-"Enable" => "সক্রিয়",
-"Saving..." => "সংরক্ষণ করা হচ্ছে....",
-"__language_name__" => "_ভাষার_নাম_",
+"Enable" => "সক্রিয় ",
+"Saving..." => "সংরক্ষণ করা হচ্ছে..",
+"__language_name__" => "__language_name__",
 "Add your App" => "আপনার অ্যাপটি যোগ করুন",
 "More Apps" => "আরও অ্যাপ",
 "Select an App" => "অ্যাপ নির্বাচন করুন",
-"See application page at apps.owncloud.com" => "অ্যাপ্লিকেসন পাতাটি দেখুন এখানে apps.owncloud.com",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-লাইসেন্স করিয়েছেন <span class=\"author\"></span>",
+"See application page at apps.owncloud.com" => "apps.owncloud.com এ অ্যাপ্লিকেসন পৃষ্ঠা দেখুন",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-লাইসেন্সধারী <span class=\"author\"></span>",
+"User Documentation" => "ব্যবহারকারী সহায়িকা",
+"Administrator Documentation" => "প্রশাসক সহায়িকা",
+"Online Documentation" => "অনলাইন সহায়িকা",
 "Forum" => "ফোরাম",
 "Bugtracker" => "বাগট্র্যাকার",
 "Commercial Support" => "বাণিজ্যিক সাপোর্ট",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "আপনি ব্যবহার করছেন  <strong>%s</strong>, সুলভ  <strong>%s</strong> এর মধ্যে।",
 "Clients" => "ক্লায়েন্ট",
 "Download Desktop Clients" => "ডেস্কটপ ক্লায়েন্ট  ডাউনলোড করুন",
+"Download Android Client" => "অ্যান্ড্রয়েড ক্লায়েন্ট ডাউনলোড করুন",
+"Download iOS Client" => "iOS ক্লায়েন্ট ডাউনলোড করুন",
 "Password" => "কূটশব্দ",
-"Your password was changed" => "আপনার কূটশব্দটি পরিবর্তন করা হয়েছে",
-"Unable to change your password" => "কূটশব্দ পরিবর্তন করা সম্ভব হলো না",
+"Your password was changed" => "আপনার কূটশব্দটি পরিবর্তন করা হয়েছে ",
+"Unable to change your password" => "আপনার কূটশব্দটি পরিবর্তন করতে সক্ষম নয়",
 "Current password" => "বর্তমান কূটশব্দ",
 "New password" => "নতুন কূটশব্দ",
 "show" => "প্রদর্শন",
-"Change password" => "কূটশব্দ পরিবর্তন কর",
-"Email" => "ই-মেইল",
+"Change password" => "কূটশব্দ পরিবর্তন করুন",
+"Email" => "ই-মেইল ",
 "Your email address" => "আপনার ই-মেইল ঠিকানা",
+"Fill in an email address to enable password recovery" => "কূটশব্দ পূনরূদ্ধার সক্রিয় করার জন্য ই-মেইল ঠিকানাটি পূরণ করুন",
 "Language" => "ভাষা",
-"Help translate" => "অনুবাদ করতে সাহায্য করুন",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "তৈরি করেছেন <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, যার <a href=\"https://github.com/owncloud\" target=\"_blank\">উৎস কোড</a> <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr>এর অধীনে লাইেসন্সকৃত</a>.",
-"Name" => "নাম",
-"Groups" => "গোষ্ঠী",
-"Create" => "তৈরি কর",
+"Help translate" => "অনুবাদ করতে সহায়তা করুন",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "আপনার ownCloud এ সংযুক্ত হতে এই ঠিকানাটি আপনার ফাইল ব্যবস্থাপকে ব্যবহার করুন",
+"Version" => "ভার্সন",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "তৈলী করেছেন <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud সম্প্রদায়</a>, যার <a href=\"https://github.com/owncloud\" target=\"_blank\"> উৎস কোডটি <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> এর অধীনে লাইসেন্সকৃত।",
+"Name" => "রাম",
+"Groups" => "গোষ্ঠীসমূহ",
+"Create" => "তৈরী কর",
+"Default Storage" => "পূর্বনির্ধারিত সংরক্ষণাগার",
+"Unlimited" => "অসীম",
 "Other" => "অন্যান্য",
-"Group Admin" => "গোষ্ঠী প্রশাসন",
+"Group Admin" => "গোষ্ঠী প্রশাসক",
+"Storage" => "সংরক্ষণাগার",
+"Default" => "পূর্বনির্ধারিত",
 "Delete" => "মুছে ফেল"
 );
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 5700f86036f..cf80b5187ec 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -53,7 +53,9 @@
 "Name" => "Nimi",
 "Groups" => "Ryhmät",
 "Create" => "Luo",
+"Unlimited" => "Rajoittamaton",
 "Other" => "Muu",
 "Group Admin" => "Ryhmän ylläpitäjä",
+"Default" => "Oletus",
 "Delete" => "Poista"
 );
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index a8367ef458d..0004d24fc7b 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -31,7 +31,7 @@
 "Commercial Support" => "Support commercial",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Vous avez utilisé <strong>%s</strong> des <strong>%s<strong> disponibles",
 "Clients" => "Clients",
-"Download Desktop Clients" => "Télécharger des clients de bureau",
+"Download Desktop Clients" => "Télécharger le client de synchronisation pour votre ordinateur",
 "Download Android Client" => "Télécharger le client Android",
 "Download iOS Client" => "Télécharger le client iOS",
 "Password" => "Mot de passe",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 5fdc11e44f9..26a52bd616c 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -53,7 +53,11 @@
 "Name" => "Név",
 "Groups" => "Csoportok",
 "Create" => "Létrehozás",
+"Default Storage" => "Alapértelmezett tárhely",
+"Unlimited" => "Korlátlan",
 "Other" => "Más",
 "Group Admin" => "Csoportadminisztrátor",
+"Storage" => "Tárhely",
+"Default" => "Alapértelmezett",
 "Delete" => "Törlés"
 );
diff --git a/settings/l10n/is.php b/settings/l10n/is.php
index 2056dfc5b72..7f5fa384133 100644
--- a/settings/l10n/is.php
+++ b/settings/l10n/is.php
@@ -21,7 +21,8 @@
 "Add your App" => "Bæta við forriti",
 "More Apps" => "Fleiri forrit",
 "Select an App" => "Veldu forrit",
-"See application page at apps.owncloud.com" => "Skoða forrita síðuna hjá apps.owncloud.com",
+"See application page at apps.owncloud.com" => "Skoða síðu forrits hjá apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-leyfi skráð af <span class=\"author\"></span>",
 "User Documentation" => "Notenda handbók",
 "Administrator Documentation" => "Stjórnenda handbók",
 "Online Documentation" => "Handbók á netinu",
@@ -55,7 +56,7 @@
 "Default Storage" => "Sjálfgefin gagnageymsla",
 "Unlimited" => "Ótakmarkað",
 "Other" => "Annað",
-"Group Admin" => "Hópa stjóri",
+"Group Admin" => "Hópstjóri",
 "Storage" => "gagnapláss",
 "Default" => "Sjálfgefið",
 "Delete" => "Eyða"
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index 6556e1b93b8..21724a1782e 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -23,8 +23,16 @@
 "Select an App" => "앱 선택",
 "See application page at apps.owncloud.com" => "apps.owncloud.com에 있는 앱 페이지를 참고하십시오",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-라이선스 보유자 <span class=\"author\"></span>",
+"User Documentation" => "유저 문서",
+"Administrator Documentation" => "관리자 문서",
+"Online Documentation" => "온라인 문서",
+"Forum" => "포럼",
+"Bugtracker" => "버그트래커",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "현재 공간 <strong>%s</strong>/<strong>%s</strong>을(를) 사용 중입니다",
 "Clients" => "고객",
+"Download Desktop Clients" => "데스크탑 클라이언트 다운로드",
+"Download Android Client" => "안드로이드 클라이언트 다운로드",
+"Download iOS Client" => "iOS 클라이언트 다운로드",
 "Password" => "암호",
 "Your password was changed" => "암호가 변경되었습니다",
 "Unable to change your password" => "암호를 변경할 수 없음",
@@ -37,11 +45,18 @@
 "Fill in an email address to enable password recovery" => "암호 찾기 기능을 사용하려면 이메일 주소를 입력하십시오.",
 "Language" => "언어",
 "Help translate" => "번역 돕기",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "파일 매니저에서 사용자의 ownCloud에 접속하기 위해 이 주소를 사용하십시요.",
+"Version" => "버젼",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 커뮤니티</a>에 의해서 개발되었습니다. <a href=\"https://github.com/owncloud\" target=\"_blank\">원본 코드</a>는 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>에 따라 사용이 허가됩니다.",
 "Name" => "이름",
 "Groups" => "그룹",
 "Create" => "만들기",
+"Default Storage" => "기본 저장소",
+"Unlimited" => "무제한",
 "Other" => "기타",
 "Group Admin" => "그룹 관리자",
+"Storage" => "저장소",
+"Default" => "기본값",
 "Delete" => "삭제"
 );
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 583c044ba47..ca7e84ce6cb 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -53,7 +53,11 @@
 "Name" => "Naam",
 "Groups" => "Groepen",
 "Create" => "Creëer",
+"Default Storage" => "Default opslag",
+"Unlimited" => "Ongelimiteerd",
 "Other" => "Andere",
 "Group Admin" => "Groep beheerder",
+"Storage" => "Opslag",
+"Default" => "Default",
 "Delete" => "verwijderen"
 );
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 1008726d36e..87fd9fb3317 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -23,8 +23,17 @@
 "Select an App" => "Zaznacz aplikacje",
 "See application page at apps.owncloud.com" => "Zobacz stronę aplikacji na apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencjonowane przez <span class=\"author\"></span>",
+"User Documentation" => "Dokumentacja użytkownika",
+"Administrator Documentation" => "Dokumentacja Administratora",
+"Online Documentation" => "Dokumentacja Online",
+"Forum" => "Forum",
+"Bugtracker" => "Zgłaszanie błędów",
+"Commercial Support" => "Wsparcie komercyjne",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Korzystasz z <strong>%s</strong> z dostępnych <strong>%s</strong>",
 "Clients" => "Klienci",
+"Download Desktop Clients" => "Pobierz klienta dla Komputera",
+"Download Android Client" => "Pobierz klienta dla Androida",
+"Download iOS Client" => "Pobierz klienta dla iOS",
 "Password" => "Hasło",
 "Your password was changed" => "Twoje hasło zostało zmienione",
 "Unable to change your password" => "Nie można zmienić hasła",
@@ -37,11 +46,18 @@
 "Fill in an email address to enable password recovery" => "Proszę wprowadzić adres e-mail, aby uzyskać możliwość odzyskania hasła",
 "Language" => "Język",
 "Help translate" => "Pomóż w tłumaczeniu",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Użyj tego adresu aby podłączyć zasób ownCloud w menedżerze plików",
+"Version" => "Wersja",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Stwirzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\"> społeczność ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Name" => "Nazwa",
 "Groups" => "Grupy",
 "Create" => "Utwórz",
+"Default Storage" => "Domyślny magazyn",
+"Unlimited" => "Bez limitu",
 "Other" => "Inne",
 "Group Admin" => "Grupa Admin",
+"Storage" => "Magazyn",
+"Default" => "Domyślny",
 "Delete" => "Usuń"
 );
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index d25ae4e149c..255eb5ee2c1 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -23,8 +23,17 @@
 "Select an App" => "選擇一個應用程式",
 "See application page at apps.owncloud.com" => "查看應用程式頁面於 apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-核准: <span class=\"author\"></span>",
+"User Documentation" => "用戶說明文件",
+"Administrator Documentation" => "管理者說明文件",
+"Online Documentation" => "線上說明文件",
+"Forum" => "論壇",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "商用支援",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "您已經使用了 <strong>%s</strong> ，目前可用空間為 <strong>%s</strong>",
 "Clients" => "客戶",
+"Download Desktop Clients" => "下載桌面客戶端",
+"Download Android Client" => "下載 Android 客戶端",
+"Download iOS Client" => "下載 iOS 客戶端",
 "Password" => "密碼",
 "Your password was changed" => "你的密碼已更改",
 "Unable to change your password" => "無法變更你的密碼",
@@ -37,11 +46,18 @@
 "Fill in an email address to enable password recovery" => "請填入電子郵件信箱以便回復密碼",
 "Language" => "語言",
 "Help translate" => "幫助翻譯",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "在您的檔案管理員中使用這個地址來連線到 ownCloud",
+"Version" => "版本",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "由<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社區</a>開發，<a href=\"https://github.com/owncloud\" target=\"_blank\">源代碼</a>在<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>許可證下發布。",
 "Name" => "名稱",
 "Groups" => "群組",
 "Create" => "創造",
+"Default Storage" => "預設儲存區",
+"Unlimited" => "無限制",
 "Other" => "其他",
 "Group Admin" => "群組 管理員",
+"Storage" => "儲存區",
+"Default" => "預設",
 "Delete" => "刪除"
 );