Merge branch 'master' into master-sqlserver

Conflicts:
	lib/files/cache/cache.php

4 files changed, 18 insertions, 2 deletions

diff --git a/core/css/styles.css b/core/css/styles.css
index c2e1ad92088..8a01211d8b0 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -258,8 +258,8 @@ fieldset.warning a { color:#b94a48 !important; font-weight:bold; }
 #expand:hover img, #expand:focus img, #expand:active img { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
 #expanddiv {
 	position:absolute; right:0; top:45px; z-index:76; display:none;
-	background-color:#444; border-bottom-left-radius:7px; box-shadow: 0 0 20px rgb(29,45,68);
-	background:#383c43 url('../img/noise.png') repeat; border-bottom:1px #333 solid; border-left:border-bottom:1px #333 solid;
+	background:#383c43 url('../img/noise.png') repeat;
+	border-bottom-left-radius:7px; border-bottom:1px #333 solid; border-left:1px #333 solid;
 	-moz-box-shadow:0 0 7px rgb(29,45,68); -webkit-box-shadow:0 0 7px rgb(29,45,68); box-shadow:0 0 7px rgb(29,45,68);
 }
 	#expanddiv a {
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 8f548fe5be6..0f23d573fc6 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -5,6 +5,7 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Uzytkownik %s wspóldzieli folder \"%s\" z toba. Jest dostepny tutaj: %s",
 "Category type not provided." => "Typ kategorii nie podany.",
 "No category to add?" => "Brak kategorii",
+"This category already exists: %s" => "Ta kategoria już istnieje: %s",
 "Object type not provided." => "Typ obiektu nie podany.",
 "%s ID not provided." => "%s ID nie podany.",
 "Error adding %s to favorites." => "Błąd dodania %s do ulubionych.",
@@ -83,6 +84,8 @@
 "Error setting expiration date" => "Błąd podczas ustawiania daty wygaśnięcia",
 "Sending ..." => "Wysyłanie...",
 "Email sent" => "Wyślij Email",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizacja zakończyła się niepowodzeniem. Proszę zgłosić ten problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\"> spoleczności ownCloud</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.",
 "ownCloud password reset" => "restart hasła",
 "Use the following link to reset your password: {link}" => "Proszę użyć tego odnośnika do zresetowania hasła: {link}",
 "You will receive a link to reset your password via Email." => "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.",
@@ -106,6 +109,8 @@
 "Security Warning" => "Ostrzeżenie o zabezpieczeniach",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Niedostępny bezpieczny generator liczb losowych, należy włączyć rozszerzenie OpenSSL w PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez bezpiecznego generatora liczb losowych, osoba atakująca może być w stanie przewidzieć resetujące hasło tokena i przejąć kontrolę nad swoim kontem.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Twój katalog danych i pliki są prawdopodobnie dostępne z poziomu internetu, ponieważ plik .htaccess nie działa.",
+"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "W celu uzyskania informacji dotyczących prawidłowego skonfigurowania serwera sięgnij do <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentacji</a>.",
 "Create an <strong>admin account</strong>" => "Tworzenie <strong>konta administratora</strong>",
 "Advanced" => "Zaawansowane",
 "Data folder" => "Katalog danych",
@@ -125,6 +130,7 @@
 "Lost your password?" => "Nie pamiętasz hasła?",
 "remember" => "Zapamiętanie",
 "Log in" => "Zaloguj",
+"Alternative Logins" => "Alternatywne loginy",
 "prev" => "wstecz",
 "next" => "naprzód",
 "Updating ownCloud to version %s, this may take a while." => "Aktualizowanie ownCloud do wersji %s, może to potrwać chwilę."
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 201b511647c..9d9ff0e7eba 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -5,6 +5,7 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s kullanıcısı \"%s\" dizinini sizinle paylaştı. %s adresinden indirilebilir",
 "Category type not provided." => "Kategori türü desteklenmemektedir.",
 "No category to add?" => "Eklenecek kategori yok?",
+"This category already exists: %s" => "Bu kategori zaten mevcut:  %s",
 "Object type not provided." => "Nesne türü desteklenmemektedir.",
 "%s ID not provided." => "%s ID belirtilmedi.",
 "Error adding %s to favorites." => "%s favorilere eklenirken hata oluştu",
@@ -52,6 +53,7 @@
 "Error" => "Hata",
 "The app name is not specified." => "uygulama adı belirtilmedi.",
 "The required file {file} is not installed!" => "İhtiyaç duyulan {file} dosyası kurulu değil.",
+"Shared" => "Paylaşılan",
 "Share" => "Paylaş",
 "Error while sharing" => "Paylaşım sırasında hata  ",
 "Error while unsharing" => "Paylaşım iptal ediliyorken hata",
@@ -82,6 +84,8 @@
 "Error setting expiration date" => "Geçerlilik tarihi tanımlama hatası",
 "Sending ..." => "Gönderiliyor...",
 "Email sent" => "Eposta gönderildi",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Güncelleme başarılı olmadı. Lütfen bu hatayı bildirin <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "Güncelleme başarılı. ownCloud'a yönlendiriliyor.",
 "ownCloud password reset" => "ownCloud parola sıfırlama",
 "Use the following link to reset your password: {link}" => "Bu bağlantıyı kullanarak parolanızı sıfırlayın: {link}",
 "You will receive a link to reset your password via Email." => "Parolanızı sıfırlamak için bir bağlantı Eposta olarak gönderilecek.",
@@ -105,6 +109,8 @@
 "Security Warning" => "Güvenlik Uyarisi",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Güvenli rasgele sayı üreticisi bulunamadı. Lütfen PHP OpenSSL eklentisini etkinleştirin.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Güvenli rasgele sayı üreticisi olmadan saldırganlar parola sıfırlama simgelerini tahmin edip hesabınızı ele geçirebilir.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Veri klasörünüz ve dosyalarınız .htaccess dosyası çalışmadığı için internet'ten erişime açık.",
+"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Server'ınızı nasıl ayarlayacağınıza dair bilgi için, lütfen bu linki ziyaret edin <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>.",
 "Create an <strong>admin account</strong>" => "Bir <strong>yönetici hesabı</strong> oluşturun",
 "Advanced" => "Gelişmiş",
 "Data folder" => "Veri klasörü",
@@ -124,6 +130,7 @@
 "Lost your password?" => "Parolanızı mı unuttunuz?",
 "remember" => "hatırla",
 "Log in" => "Giriş yap",
+"Alternative Logins" => "Alternatif Girişler",
 "prev" => "önceki",
 "next" => "sonraki",
 "Updating ownCloud to version %s, this may take a while." => "Owncloud %s versiyonuna güncelleniyor. Biraz zaman alabilir."
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index a2f297fc224..685a31d52ed 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -5,6 +5,7 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Користувач %s поділився текою \"%s\" з вами. Він доступний для завантаження звідси: %s",
 "Category type not provided." => "Не вказано тип категорії.",
 "No category to add?" => "Відсутні категорії для додавання?",
+"This category already exists: %s" => "Ця категорія вже існує: %s",
 "Object type not provided." => "Не вказано тип об'єкту.",
 "%s ID not provided." => "%s ID не вказано.",
 "Error adding %s to favorites." => "Помилка при додаванні %s до обраного.",
@@ -108,6 +109,8 @@
 "Security Warning" => "Попередження про небезпеку",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Не доступний безпечний генератор випадкових чисел, будь ласка, активуйте PHP OpenSSL додаток.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Без безпечного генератора випадкових чисел зловмисник може визначити токени скидання пароля і заволодіти Вашим обліковим записом.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ваші дані каталогів і файлів, ймовірно, доступні з інтернету, тому що  .htaccess файл не працює.",
+"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Для отримання інформації, як правильно налаштувати сервер, зверніться до  <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">документації</a>.",
 "Create an <strong>admin account</strong>" => "Створити <strong>обліковий запис адміністратора</strong>",
 "Advanced" => "Додатково",
 "Data folder" => "Каталог даних",