fix merge conflicts

10 files changed, 109 insertions, 26 deletions

diff --git a/core/js/js.js b/core/js/js.js
index cf4e72324dc..03f660be62c 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -370,6 +370,44 @@ OC.Notification={
 OC.Breadcrumb={
 	container:null,
 	crumbs:[],
+	show:function(dir, leafname, leaflink){
+		OC.Breadcrumb.clear();
+		
+		// show home + path in subdirectories
+		if (dir && dir !== '/') {
+			//add home
+			var link = OC.linkTo('files','index.php');
+
+			var crumb=$('<div/>');
+			crumb.addClass('crumb');
+
+			var crumbLink=$('<a/>');
+			crumbLink.attr('href',link);
+
+			var crumbImg=$('<img/>');
+			crumbImg.attr('src',OC.imagePath('core','places/home'));
+			crumbLink.append(crumbImg);
+			crumb.append(crumbLink);
+			OC.Breadcrumb.container.prepend(crumb);
+			OC.Breadcrumb.crumbs.push(crumb);
+
+			//add path parts
+			var segments = dir.split('/');
+			var pathurl = '';
+			jQuery.each(segments, function(i,name) {
+				if (name !== '') {
+					pathurl = pathurl+'/'+name;
+					var link = OC.linkTo('files','index.php')+'?dir='+encodeURIComponent(pathurl);
+					OC.Breadcrumb.push(name, link);
+				}
+			});
+		}
+		
+		//add leafname
+		if (leafname && leaflink) {
+				OC.Breadcrumb.push(leafname, leaflink);
+		}
+	},
 	push:function(name, link){
 		if(!OC.Breadcrumb.container){//default
 			OC.Breadcrumb.container=$('#controls');
@@ -387,7 +425,7 @@ OC.Breadcrumb={
 			existing.removeClass('last');
 			existing.last().after(crumb);
 		}else{
-			OC.Breadcrumb.container.append(crumb);
+			OC.Breadcrumb.container.prepend(crumb);
 		}
 		OC.Breadcrumb.crumbs.push(crumb);
 		return crumb;
diff --git a/core/js/share.js b/core/js/share.js
index e59669cbc2b..b4b5159b0b5 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -592,8 +592,7 @@ $(document).ready(function() {
 		}
 
 		// Update the share information
-		OC.Share.share(itemType, itemSource,	OC.Share.SHARE_TYPE_LINK, '', permissions, function(data) {
-			return;
+		OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', permissions, function(data) {
 		});
 	});
 
@@ -609,13 +608,26 @@ $(document).ready(function() {
 	});
 
 	$(document).on('focusout keyup', '#dropdown #linkPassText', function(event) {
-		if ( $('#linkPassText').val() != '' && (event.type == 'focusout' || event.keyCode == 13) ) {
-			var itemType = $('#dropdown').data('item-type');
-			var itemSource = $('#dropdown').data('item-source');
-			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $('#linkPassText').val(), OC.PERMISSION_READ, function() {
-				console.log("password set to: '" + $('#linkPassText').val() +"' by event: " + event.type);
-				$('#linkPassText').val('');
-				$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
+		var linkPassText = $('#linkPassText');
+		if ( linkPassText.val() != '' && (event.type == 'focusout' || event.keyCode == 13) ) {
+
+			var allowPublicUpload = $('#sharingDialogAllowPublicUpload').is(':checked');
+			var dropDown = $('#dropdown');
+			var itemType = dropDown.data('item-type');
+			var itemSource = dropDown.data('item-source');
+			var permissions = 0;
+
+			// Calculate permissions
+			if (allowPublicUpload) {
+				permissions = OC.PERMISSION_UPDATE + OC.PERMISSION_CREATE + OC.PERMISSION_READ;
+			} else {
+				permissions = OC.PERMISSION_READ;
+			}
+
+			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $('#linkPassText').val(), permissions, function() {
+				console.log("password set to: '" + linkPassText.val() +"' by event: " + event.type);
+				linkPassText.val('');
+				linkPassText.attr('placeholder', t('core', 'Password protected'));
 			});
 		}
 	});
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 0a444156026..8974840994a 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -50,7 +50,7 @@
 "The object type is not specified." => "Není určen typ objektu.",
 "Error" => "Chyba",
 "The app name is not specified." => "Není určen název aplikace.",
-"The required file {file} is not installed!" => "Požadovaný soubor {file} není nainstalován.",
+"The required file {file} is not installed!" => "Požadovaný soubor {file} není nainstalován!",
 "Shared" => "Sdílené",
 "Share" => "Sdílet",
 "Error while sharing" => "Chyba při sdílení",
@@ -88,11 +88,11 @@
 "ownCloud password reset" => "Obnovení hesla pro ownCloud",
 "Use the following link to reset your password: {link}" => "Heslo obnovíte použitím následujícího odkazu: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Odkaz na obnovení hesla byl odeslán na vaši e-mailovou adresu.<br>Pokud jej v krátké době neobdržíte, zkontrolujte váš koš a složku spam.<br>Pokud jej nenaleznete, kontaktujte svého správce.",
-"Request failed!<br>Did you make sure your email/username was right?" => "Požadavek selhal.<br>Ujistili jste se, že vaše uživatelské jméno a e-mail jsou správně?",
-"You will receive a link to reset your password via Email." => "Bude Vám e-mailem zaslán odkaz pro obnovu hesla.",
+"Request failed!<br>Did you make sure your email/username was right?" => "Požadavek selhal!<br>Ujistili jste se, že vaše uživatelské jméno a e-mail jsou správně?",
+"You will receive a link to reset your password via Email." => "E-mailem Vám bude zaslán odkaz pro obnovu hesla.",
 "Username" => "Uživatelské jméno",
-"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Vaše soubory jsou šifrovány. Pokud nemáte povolen klíč obnovy, neexistuje způsob jak získat po obnově hesla vaše data. Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce. Opravdu si přejete pokračovat?",
-"Yes, I really want to reset my password now" => "Ano, opravdu si nyní přeji obnovit své heslo",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Vaše soubory jsou šifrovány. Pokud nemáte povolen klíč pro obnovu, neexistuje způsob jak získat, po změně hesla, vaše data. Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce. Opravdu si přejete pokračovat?",
+"Yes, I really want to reset my password now" => "Ano, opravdu si nyní přeji obnovit mé heslo",
 "Request reset" => "Vyžádat obnovu",
 "Your password was reset" => "Vaše heslo bylo obnoveno",
 "To login page" => "Na stránku přihlášení",
@@ -105,7 +105,7 @@
 "Help" => "Nápověda",
 "Access forbidden" => "Přístup zakázán",
 "Cloud not found" => "Cloud nebyl nalezen",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ahoj,\n\njenom vám chci oznámit že %s s vámi sdílí %s.\nPodívat se můžete zde: %s\n\nDíky",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ahoj,\n\njenom vám chci oznámit, že %s s vámi sdílí %s.\nPodívat se můžete zde: %s\n\nDíky",
 "Edit categories" => "Upravit kategorie",
 "Add" => "Přidat",
 "Security Warning" => "Bezpečnostní upozornění",
@@ -114,7 +114,7 @@
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Není dostupný žádný bezpečný generátor náhodných čísel. Povolte, prosím, rozšíření OpenSSL v PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez bezpečného generátoru náhodných čísel může útočník předpovědět token pro obnovu hesla a převzít kontrolu nad Vaším účtem.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Váš adresář s daty a soubory jsou dostupné z internetu, protože soubor .htaccess nefunguje.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pro informace jak správně nastavit váš server se podívejte do <a href=\"%s\" target=\"_blank\">dokumentace</a>.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pro informace, jak správně nastavit váš server, se podívejte do <a href=\"%s\" target=\"_blank\">dokumentace</a>.",
 "Create an <strong>admin account</strong>" => "Vytvořit <strong>účet správce</strong>",
 "Advanced" => "Pokročilé",
 "Data folder" => "Složka s daty",
@@ -128,14 +128,14 @@
 "Finish setup" => "Dokončit nastavení",
 "%s is available. Get more information on how to update." => "%s je dostupná. Získejte více informací k postupu aktualizace.",
 "Log out" => "Odhlásit se",
-"Automatic logon rejected!" => "Automatické přihlášení odmítnuto.",
-"If you did not change your password recently, your account may be compromised!" => "V nedávné době jste nezměnili své heslo, Váš účet může být kompromitován.",
+"Automatic logon rejected!" => "Automatické přihlášení odmítnuto!",
+"If you did not change your password recently, your account may be compromised!" => "Pokud jste v nedávné době neměnili své heslo, Váš účet může být kompromitován!",
 "Please change your password to secure your account again." => "Změňte, prosím, své heslo pro opětovné zabezpečení Vašeho účtu.",
 "Lost your password?" => "Ztratili jste své heslo?",
 "remember" => "zapamatovat",
 "Log in" => "Přihlásit",
 "Alternative Logins" => "Alternativní přihlášení",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Ahoj,<br><br>jenom vám chci oznámit že %s s vámi sdílí %s.\nPodívat se můžete <br><a href=\"%s\">zde</a>.<br><br>Díky",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Ahoj,<br><br>jenom vám chci oznámit, že %s s vámi sdílí %s.\nPodívat se můžete <br><a href=\"%s\">zde</a>.<br><br>Díky",
 "prev" => "předchozí",
 "next" => "následující",
 "Updating ownCloud to version %s, this may take a while." => "Aktualizuji ownCloud na verzi %s, bude to chvíli trvat."
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index af3bb0bf35a..6e5b4327c48 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -91,6 +91,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Żądanie niepowiodło się!<br>Czy Twój email/nazwa użytkownika są poprawne?",
 "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.",
 "Username" => "Nazwa użytkownika",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Pliki są szyfrowane. Jeśli nie włączono klucza odzyskiwania, nie będzie możliwe odzyskać dane z powrotem po zresetowaniu hasła. Jeśli nie masz pewności, co zrobić, prosimy o kontakt z administratorem, przed kontynuowaniem. Czy chcesz kontynuować?",
 "Yes, I really want to reset my password now" => "Tak, naprawdę chcę zresetować hasło teraz",
 "Request reset" => "Żądanie resetowania",
 "Your password was reset" => "Zresetowano hasło",
@@ -104,13 +105,16 @@
 "Help" => "Pomoc",
 "Access forbidden" => "Dostęp zabroniony",
 "Cloud not found" => "Nie odnaleziono chmury",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Cześć,\n\nInformuję cię że %s udostępnia ci %s.\nZobacz na: %s\n\nPozdrawiam!",
 "Edit categories" => "Edytuj kategorie",
 "Add" => "Dodaj",
 "Security Warning" => "Ostrzeżenie o zabezpieczeniach",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Twója wersja PHP jest narażona na NULL Byte attack (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Proszę uaktualnij swoją instalacje PHP aby używać %s bezpiecznie.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Bezpieczny generator liczb losowych jest niedostępny. Włącz 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 przewidzieć token resetujący hasło i przejąć kontrolę nad twoim 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=\"%s\" target=\"_blank\">documentation</a>." => "Aby uzyskać informacje jak poprawnie skonfigurować swój serwer, zapoznaj się z <a href=\"%s\" target=\"_blank\">dokumentacją</a>.",
 "Create an <strong>admin account</strong>" => "Utwórz <strong>konta administratora</strong>",
 "Advanced" => "Zaawansowane",
 "Data folder" => "Katalog danych",
@@ -131,6 +135,7 @@
 "remember" => "pamiętaj",
 "Log in" => "Zaloguj",
 "Alternative Logins" => "Alternatywne loginy",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Cześć,<br><br>Informuję cię że %s udostępnia ci »%s«.\n<br><a href=\"%s\">Zobacz</a><br><br>Pozdrawiam!",
 "prev" => "wstecz",
 "next" => "naprzód",
 "Updating ownCloud to version %s, this may take a while." => "Aktualizowanie ownCloud do wersji %s. Może to trochę potrwać."
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 27af45212d2..f9c293de9b8 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -110,9 +110,11 @@
 "Add" => "Добавить",
 "Security Warning" => "Предупреждение безопасности",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ваша версия PHP уязвима к атаке NULL Byte (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Пожалуйста обновите Вашу PHP конфигурацию для безопасного использования %s.",
 "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=\"%s\" target=\"_blank\">documentation</a>." => "Для информации, как правильно настроить Ваш сервер, пожалуйста загляните в <a hrev=\"%s\"target=\"blank\">документацию</a>.",
 "Create an <strong>admin account</strong>" => "Создать <strong>учётную запись администратора</strong>",
 "Advanced" => "Дополнительно",
 "Data folder" => "Директория с данными",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 60d3c619fc6..e7b88316ec3 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -110,9 +110,11 @@
 "Add" => "Dodaj",
 "Security Warning" => "Varnostno opozorilo",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Uporabljena različica PHP je ranljiva za napad NULL Byte (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Za varno uporabo storitve %s posodobite PHP",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Na voljo ni nobenega varnega ustvarjalnika naključnih števil. Omogočiti je treba razširitev PHP OpenSSL.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Brez varnega ustvarjalnika naključnih števil je mogoče napovedati žetone za ponastavitev gesla, s čimer je mogoče prevzeti nadzor nad računom.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Za navodila, kako pravilno nastaviti vaš strežnik, kliknite na povezavo do <a href=\"%s\" target=\"_blank\">dokumentacije</a>.",
 "Create an <strong>admin account</strong>" => "Ustvari <strong>skrbniški račun</strong>",
 "Advanced" => "Napredne možnosti",
 "Data folder" => "Podatkovna mapa",
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index 25e8d6a4b6b..0daeccc4814 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -42,6 +42,7 @@
 "years ago" => "vite më parë",
 "Choose" => "Zgjidh",
 "Cancel" => "Anulo",
+"Error loading file picker template" => "Veprim i gabuar gjatë ngarkimit të modelit të zgjedhësit të skedarëve",
 "Yes" => "Po",
 "No" => "Jo",
 "Ok" => "Në rregull",
@@ -60,6 +61,7 @@
 "Share with link" => "Nda me lidhje",
 "Password protect" => "Mbro me kod",
 "Password" => "Kodi",
+"Allow Public Upload" => "Lejo Ngarkimin Publik",
 "Email link to person" => "Dërgo email me lidhjen",
 "Send" => "Dërgo",
 "Set expiration date" => "Cakto datën e përfundimit",
@@ -88,6 +90,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Kërkesa dështoi!<br>A u siguruat që email-i/përdoruesi juaj ishte i saktë?",
 "You will receive a link to reset your password via Email." => "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kodin.",
 "Username" => "Përdoruesi",
+"Yes, I really want to reset my password now" => "Po, dua ta rivendos kodin tani",
 "Request reset" => "Bëj kërkesë për rivendosjen",
 "Your password was reset" => "Kodi yt u rivendos",
 "To login page" => "Tek faqja e hyrjes",
@@ -100,6 +103,7 @@
 "Help" => "Ndihmë",
 "Access forbidden" => "Ndalohet hyrja",
 "Cloud not found" => "Cloud-i nuk u gjet",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Tungjatjeta,\n\nju njoftojmë që %s ka ndarë %s me ju.\nShikojeni: %s\n\nPëshëndetje!",
 "Edit categories" => "Ndrysho kategoritë",
 "Add" => "Shto",
 "Security Warning" => "Paralajmërim sigurie",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 9fdebe6377e..091ae9e2fae 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -110,9 +110,11 @@
 "Add" => "Lägg till",
 "Security Warning" => "Säkerhetsvarning",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Din version av PHP är sårbar för NULL byte attack (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Var god uppdatera din PHP-installation för att använda %s säkert.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ingen säker slumptalsgenerator finns tillgänglig. Du bör aktivera PHP OpenSSL-tillägget.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Utan en säker slumptalsgenerator kan angripare få möjlighet att förutsäga lösenordsåterställningar och ta över ditt konto.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Din datakatalog och filer är förmodligen tillgängliga från Internet, eftersom .htaccess-filen inte fungerar.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "För information hur du korrekt konfigurerar din servern, se ownCloud <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
 "Create an <strong>admin account</strong>" => "Skapa ett <strong>administratörskonto</strong>",
 "Advanced" => "Avancerad",
 "Data folder" => "Datamapp",
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
index 26e524d016f..fce45b3c98a 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -1,8 +1,10 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%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 到收藏夹时发生错误。",
 "No categories selected for deletion." => "没有选中要删除的分类。",
 "Error removing %s from favorites." => "在移除收藏夹中的 %s 时发生错误。",
@@ -41,6 +43,7 @@
 "years ago" => "年前",
 "Choose" => "选择",
 "Cancel" => "取消",
+"Error loading file picker template" => "加载文件选取模板出错",
 "Yes" => "是",
 "No" => "否",
 "Ok" => "好的",
@@ -59,6 +62,7 @@
 "Share with link" => "分享链接",
 "Password protect" => "密码保护",
 "Password" => "密码",
+"Allow Public Upload" => "允许公众上传",
 "Email link to person" => "面向个人的电子邮件链接",
 "Send" => "发送",
 "Set expiration date" => "设置失效日期",
@@ -83,8 +87,12 @@
 "The update was successful. Redirecting you to ownCloud now." => "升级成功。现在为您跳转到ownCloud。",
 "ownCloud password reset" => "私有云密码重置",
 "Use the following link to reset your password: {link}" => "使用下面的链接来重置你的密码:{link}",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "重置密码的连接已经通过邮件到您的邮箱。<br> 如果你没有收到邮件，可能是由于要再等一下，或者检查一下您的垃圾邮件夹。<br> 如果还是没有收到，请联系您的系统管理员。",
+"Request failed!<br>Did you make sure your email/username was right?" => "请求失败！<br> 你确定你的邮件地址/用户名是正确的？",
 "You will receive a link to reset your password via Email." => "你将会收到一个重置密码的链接",
 "Username" => "用户名",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "您的文件是加密的。如果您还没有启用恢复密钥，在重置了密码后，您的数据讲无法恢复回来。如果您不确定是否这么做，请联系您的管理员在继续这个操作。你却是想继续么？",
+"Yes, I really want to reset my password now" => "是的，我想现在重置密码。",
 "Request reset" => "要求重置",
 "Your password was reset" => "你的密码已经被重置了",
 "To login page" => "转至登陆页面",
@@ -97,12 +105,16 @@
 "Help" => "帮助",
 "Access forbidden" => "禁止访问",
 "Cloud not found" => "云 没有被找到",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "你好！⏎\n⏎\n温馨提示： %s 与您共享了 %s 。⏎\n查看： %s⏎\n⏎\n祝顺利！",
 "Edit categories" => "编辑分类",
 "Add" => "添加",
 "Security Warning" => "安全警告",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "您的PHP版本是会受到NULL字节漏洞攻击的(CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "请安全地升级您的PHP版本到 %s 。",
 "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=\"%s\" target=\"_blank\">documentation</a>." => "有关如何正确地配置您的服务器，请查看 <a href=\"%s\" target=\"_blank\">文档</a>。",
 "Create an <strong>admin account</strong>" => "建立一个 <strong>管理帐户</strong>",
 "Advanced" => "进阶",
 "Data folder" => "数据存放文件夹",
@@ -114,6 +126,7 @@
 "Database tablespace" => "数据库表格空间",
 "Database host" => "数据库主机",
 "Finish setup" => "完成安装",
+"%s is available. Get more information on how to update." => "%s 是可用的。获取更多关于升级的信息。",
 "Log out" => "注销",
 "Automatic logon rejected!" => "自动登录被拒绝！",
 "If you did not change your password recently, your account may be compromised!" => "如果您最近没有修改您的密码，那您的帐号可能被攻击了！",
@@ -122,6 +135,7 @@
 "remember" => "记住登录",
 "Log in" => "登陆",
 "Alternative Logins" => "备选登录",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "你好！<br><br>温馨提示： %s 与您共享了 %s 。<br><br>\n查看： %s <br><br> 祝顺利！",
 "prev" => "后退",
 "next" => "前进",
 "Updating ownCloud to version %s, this may take a while." => "ownCloud正在升级至 %s 版，这可能需要一点时间。"
diff --git a/core/templates/404.php b/core/templates/404.php
index ee17f0de8e1..bf1e03e6bc9 100644
--- a/core/templates/404.php
+++ b/core/templates/404.php
@@ -7,9 +7,13 @@ if(!isset($_)) {//also provide standalone error page
 	exit;
 }
 ?>
-<ul>
-	<li class='error'>
-		<?php p($l->t( 'Cloud not found' )); ?><br/>
-		<p class='hint'><?php if(isset($_['file'])) p($_['file'])?></p>
-	</li>
-</ul>
+<?php if (isset($_['content'])): ?>
+	<?php print_unescaped($_['content']) ?>
+<?php else: ?>
+	<ul>
+		<li class="error">
+			<?php p($l->t( 'Cloud not found' )); ?><br/>
+			<p class='hint'><?php if(isset($_['file'])) p($_['file'])?></p>
+		</li>
+	</ul>
+<?php endif; ?>