Merge branch 'master' into css_cleanup_kondou

Conflicts: core/css/styles.css settings/templates/personal.php
author: kondou <kondou@ts.unde.re> 2013-07-24 20:35:00 +0200
committer: kondou <kondou@ts.unde.re> 2013-07-24 20:35:00 +0200
commit: 92af840a51c51440eb6f55d841b47c1b3f5a1b69 (patch)
tree: 1d0fcd7ef38bb121d1710068cf4ef42cc0a9518d /core
parent: 4818e0062e5444a9b657a30001b6dbaca44413c7 (diff)
parent: ff86b6f1346be9eb90ad82ae49742d22d4ee3e9d (diff)
download: nextcloud-server-92af840a51c51440eb6f55d841b47c1b3f5a1b69.tar.gz
nextcloud-server-92af840a51c51440eb6f55d841b47c1b3f5a1b69.zip
94 files changed, 452 insertions, 350 deletions
diff --git a/core/ajax/update.php b/core/ajax/update.php
index db00da02239..43ed75b07f1 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -4,113 +4,34 @@ $RUNTIME_NOAPPS = true;
 require_once '../../lib/base.php';
 
 if (OC::checkUpgrade(false)) {
-	\OC_DB::enableCaching(false);
-	OC_Config::setValue('maintenance', true);
-	$installedVersion = OC_Config::getValue('version', '0.0.0');
-	$currentVersion = implode('.', OC_Util::getVersion());
-	OC_Log::write('core', 'starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, OC_Log::WARN);
-	$updateEventSource = new OC_EventSource();
-	$watcher = new UpdateWatcher($updateEventSource);
-	OC_Hook::connect('update', 'success', $watcher, 'success');
-	OC_Hook::connect('update', 'error', $watcher, 'error');
-	OC_Hook::connect('update', 'failure', $watcher, 'failure');
-	$watcher->success('Turned on maintenance mode');
-	try {
-		$result = OC_DB::updateDbFromStructure(OC::$SERVERROOT.'/db_structure.xml');
-		$watcher->success('Updated database');
-
-		// do a file cache upgrade for users with files
-		// this can take loooooooooooooooooooooooong
-		__doFileCacheUpgrade($watcher);
-	} catch (Exception $exception) {
-		$watcher->failure($exception->getMessage());
-	}
-	OC_Config::setValue('version', implode('.', OC_Util::getVersion()));
-	OC_App::checkAppsRequirements();
-	// load all apps to also upgrade enabled apps
-	OC_App::loadApps();
-	OC_Config::setValue('maintenance', false);
-	$watcher->success('Turned off maintenance mode');
-	$watcher->done();
-}
-
-/**
- * The FileCache Upgrade routine
- *
- * @param UpdateWatcher $watcher
- */
-function __doFileCacheUpgrade($watcher) {
-	try {
-		$query = \OC_DB::prepare('
-		SELECT DISTINCT `user`
-		FROM `*PREFIX*fscache`
-		');
-		$result = $query->execute();
-	} catch (\Exception $e) {
-		return;
-	}
-	$users = $result->fetchAll();
-	if(count($users) == 0) {
-		return;
-	}
-	$step = 100 / count($users);
-	$percentCompleted = 0;
-	$lastPercentCompletedOutput = 0;
-	$startInfoShown = false;
-	foreach($users as $userRow) {
-		$user = $userRow['user'];
-		\OC\Files\Filesystem::initMountPoints($user);
-		\OC\Files\Cache\Upgrade::doSilentUpgrade($user);
-		if(!$startInfoShown) {
-			//We show it only now, because otherwise Info about upgraded apps
-			//will appear between this and progress info
-			$watcher->success('Updating filecache, this may take really long...');
-			$startInfoShown = true;
-		}
-		$percentCompleted += $step;
-		$out = floor($percentCompleted);
-		if($out != $lastPercentCompletedOutput) {
-			$watcher->success('... '. $out.'% done ...');
-			$lastPercentCompletedOutput = $out;
-		}
-	}
-	$watcher->success('Updated filecache');
-}
-
-class UpdateWatcher {
-	/**
-	 * @var \OC_EventSource $eventSource;
-	 */
-	private $eventSource;
-
-	public function __construct($eventSource) {
-		$this->eventSource = $eventSource;
-	}
-
-	public function success($message) {
-		OC_Util::obEnd();
-		$this->eventSource->send('success', $message);
-		ob_start();
-	}
-
-	public function error($message) {
-		OC_Util::obEnd();
-		$this->eventSource->send('error', $message);
-		ob_start();
-	}
-
-	public function failure($message) {
-		OC_Util::obEnd();
-		$this->eventSource->send('failure', $message);
-		$this->eventSource->close();
+	$eventSource = new OC_EventSource();
+	$updater = new \OC\Updater(\OC_Log::$object);
+	$updater->listen('\OC\Updater', 'maintenanceStart', function () use ($eventSource) {
+		$eventSource->send('success', 'Turned on maintenance mode');
+	});
+	$updater->listen('\OC\Updater', 'maintenanceEnd', function () use ($eventSource) {
+		$eventSource->send('success', 'Turned off maintenance mode');
+	});
+	$updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource) {
+		$eventSource->send('success', 'Updated database');
+	});
+	$updater->listen('\OC\Updater', 'filecacheStart', function () use ($eventSource) {
+		$eventSource->send('success', 'Updating filecache, this may take really long...');
+	});
+	$updater->listen('\OC\Updater', 'filecacheDone', function () use ($eventSource) {
+		$eventSource->send('success', 'Updated filecache');
+	});
+	$updater->listen('\OC\Updater', 'filecacheProgress', function ($out) use ($eventSource) {
+		$eventSource->send('success', '... ' . $out . '% done ...');
+	});
+	$updater->listen('\OC\Updater', 'failure', function ($message) use ($eventSource) {
+		$eventSource->send('failure', $message);
+		$eventSource->close();
 		OC_Config::setValue('maintenance', false);
-		die();
-	}
+	});
 
-	public function done() {
-		OC_Util::obEnd();
-		$this->eventSource->send('done', '');
-		$this->eventSource->close();
-	}
+	$updater->upgrade();
 
-}
-\ No newline at end of file
+	$eventSource->send('done', '');
+	$eventSource->close();
+}
diff --git a/core/css/jquery.ocdialog.css b/core/css/jquery.ocdialog.css
index c300b031afd..aa72eaf8474 100644
--- a/core/css/jquery.ocdialog.css
+++ b/core/css/jquery.ocdialog.css
@@ -35,7 +35,7 @@
 	position:absolute;
 	top:7px; right:7px;
 	height:20px; width:20px;
-	background:url('../img/actions/delete.svg') no-repeat center;
+	background:url('../img/actions/close.svg') no-repeat center;
 }
 
 .oc-dialog-dim {
diff --git a/core/css/styles.css b/core/css/styles.css
index 7c82b55deff..d73b880a1c8 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -3,7 +3,7 @@
  See the COPYING-README file. */
 
 html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section { margin:0; padding:0; border:0; outline:0; font-weight:inherit; font-size:100%; font-family:inherit; vertical-align:baseline; cursor:default; }
-html, body { height:100%; overflow:auto; }
+html, body { height:100%; }
 article, aside, dialog, figure, footer, header, hgroup, nav, section { display:block; }
 body { line-height:1.5; }
 table { border-collapse:separate; border-spacing:0; white-space:nowrap; }
@@ -24,21 +24,16 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari
 	box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222;
 }
 
-#body-login #header {
-	margin: -2em auto 0;
-	text-align:center;
-	height:10em;
-	padding:1em 0 .5em;
-	-moz-box-shadow:0 0 1em rgba(0, 0, 0, .5);
-	-webkit-box-shadow:0 0 1em rgba(0, 0, 0, .5); box-shadow:0 0 1em rgba(0, 0, 0, .5);
-	background:#1d2d44; /* Old browsers */
-	background:-moz-linear-gradient(top, #35537a 0%, #1d2d44 100%); /* FF3.6+ */
-	background:-webkit-gradient(linear, left top, left bottom, color-stop(0%,#35537a), color-stop(100%,#1d2d44)); /* Chrome,Safari4+ */
-	background:-webkit-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Chrome10+,Safari5.1+ */
-	background:-o-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Opera11.10+ */
-	background:-ms-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* IE10+ */
-	background:linear-gradient(top, #35537a 0%,#1d2d44 100%); /* W3C */
-	filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d44',GradientType=0 ); /* IE6-9 */
+#body-login {
+	text-align: center;
+	background: #1d2d44; /* Old browsers */
+	background: url('../img/noise.png'), -moz-linear-gradient(top, #35537a 0%, #1d2d44 100%); /* FF3.6+ */
+	background: url('../img/noise.png'), -webkit-gradient(linear, left top, left bottom, color-stop(0%,#35537a), color-stop(100%,#1d2d44)); /* Chrome,Safari4+ */
+	background: url('../img/noise.png'), -webkit-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Chrome10+,Safari5.1+ */
+	background: url('../img/noise.png'), -o-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Opera11.10+ */
+	background: url('../img/noise.png'), -ms-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* IE10+ */
+	background: url('../img/noise.png'), linear-gradient(top, #35537a 0%,#1d2d44 100%); /* W3C */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d44',GradientType=0 ); /* IE6-9 */
 }
 
 #owncloud { position:absolute; top:0; left:0; padding:6px; padding-bottom:0; }
@@ -119,33 +114,35 @@ a.disabled, a.disabled:hover, a.disabled:focus {
 
 /* Primary action button, use sparingly */
 .primary, input[type="submit"].primary, input[type="button"].primary, button.primary, .button.primary {
-	border:1px solid #1d2d44;
-	background:#35537a; color:#ddd; text-shadow:#000 0 -1px 0;
-	-moz-box-shadow:0 0 1px #000,0 1px 1px #6d7d94 inset;
-	-webkit-box-shadow:0 0 1px #000,0 1px 1px #6d7d94 inset;
-	box-shadow:0 0 1px #000,0 1px 1px #6d7d94 inset;
+	border: 1px solid #1d2d44;
+	background: #35537a;
+	color: #ddd;
+	text-shadow: #000 0 -1px 0;
+	-moz-box-shadow: 0 0 1px #000, 0 1px 0 #6d7d94 inset;
+	-webkit-box-shadow: 0 0 1px #000, 0 1px 0 #6d7d94 inset;
+	box-shadow: 0 0 1px #000, 0 1px 0 #6d7d94 inset;
 }
 	.primary:hover, input[type="submit"].primary:hover, input[type="button"].primary:hover, button.primary:hover, .button.primary:hover,
 	.primary:focus, input[type="submit"].primary:focus, input[type="button"].primary:focus, button.primary:focus, .button.primary:focus {
-		border:1px solid #1d2d44;
-		background:#2d3d54; color:#fff; text-shadow:#000 0 -1px 0;
-		-moz-box-shadow:0 0 1px #000,0 1px 1px #5d6d84 inset;
-		-webkit-box-shadow:0 0 1px #000,0 1px 1px #5d6d84 inset;
-		box-shadow:0 0 1px #000,0 1px 1px #5d6d84 inset;
+		border: 1px solid #1d2d44;
+		background: #304d76;
+		color: #fff;
+		text-shadow: #000 0 -1px 0;
+		-moz-box-shadow: 0 0 1px #000, 0 1px 0 #4d5d74 inset;
+		-webkit-box-shadow: 0 0 1px #000, 0 1px 0 #4d5d74 inset;
+		box-shadow: 0 0 1px #000, 0 1px 0 #4d5d74 inset;
 	}
 	.primary:active, input[type="submit"].primary:active, input[type="button"].primary:active, button.primary:active, .button.primary:active {
-		border:1px solid #1d2d44;
-		background:#1d2d44; color:#bbb; text-shadow:#000 0 -1px 0;
-		-moz-box-shadow:0 1px 1px #fff,0 1px 1px 0 rgba(0,0,0,.2) inset;
-		-webkit-box-shadow:0 1px 1px #fff,0 1px 1px 0 rgba(0,0,0,.2) inset;
-		box-shadow:0 1px 1px #fff,0 1px 1px 0 rgba(0,0,0,.2) inset;
+		border: 1px solid #1d2d44;
+		background: #1d2d44;
+		color: #bbb;
+		text-shadow: #000 0 -1px 0;
+		-moz-box-shadow: 0 1px 1px #3d4d64, 0 1px 1px 0 rgba(0,0,0,.2) inset;
+		-webkit-box-shadow: 0 1px 1px #3d4d64, 0 1px 1px 0 rgba(0,0,0,.2) inset;
+		box-shadow: 0 1px 1px #3d4d64, 0 1px 1px 0 rgba(0,0,0,.2) inset;
 	}
 
 
-#body-login input { font-size:1.5em; }
-#body-login input[type="text"], #body-login input[type="password"] { width:13em; }
-#body-login input.login { width:auto; float:right; padding:7px 9px 6px; }
-#remember_login { margin:.8em .2em 0 1em; vertical-align:text-bottom; }
 .searchbox input[type="search"] { font-size:1.2em; padding:.2em .5em .2em 1.5em; background:#fff url('../img/actions/search.svg') no-repeat .5em center; border:0; -moz-border-radius:1em; -webkit-border-radius:1em; border-radius:1em; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70);opacity:.7; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; margin-top:10px; float:right; }
 input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; }
 #select_all{ margin-top:.4em }
@@ -180,24 +177,67 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
 #rightcontent, .rightcontent { position:fixed; top:6.4em; left:24.5em; overflow:auto }
 
 
+
+
 /* LOG IN & INSTALLATION ------------------------------------------------------------ */
-#body-login { background:#ddd; }
+
+/* Some whitespace to the top */
+#body-login #header {
+	padding-top: 100px;
+}
+/* Fix background gradient */
+#body-login {
+	background-attachment: fixed;
+}
+
+/* Dark subtle label text */
+#body-login p.info,
+#body-login form fieldset legend,
+#body-login #datadirContent label,
+#body-login form input[type="checkbox"]+label {
+	text-align: center;
+	color: #000;
+	text-shadow: 0 1px 0 rgba(255,255,255,.1);
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
+	filter: alpha(opacity=80);
+	opacity: .8;
+}
+
 #body-login div.buttons { text-align:center; }
-#body-login p.info { width:22em; text-align:center; margin:2em auto; color:#777; text-shadow:#fff 0 1px 0; }
-#body-login p.info a { font-weight:bold; color:#777; }
+#body-login p.info {
+	width: 22em;
+	margin: 0 auto;
+	padding-top: 20px;
+}
+#body-login p.info a {
+	font-weight: bold;
+}
 #body-login #submit.login { margin-right:7px; } /* quick fix for log in button not being aligned with input fields, should be properly fixed by input field width later */
 
-#login { min-height:30em; margin:2em auto 0; border-bottom:1px solid #f8f8f8; background:#eee; }
-#login form { width:22em; margin:2em auto 2em; padding:0; }
-#login form fieldset { margin-bottom:20px; }
-#login form #adminaccount { margin-bottom:5px; }
-#login form fieldset legend, #datadirContent label {
-	width:100%; text-align:center;
-	font-weight:bold; color:#999; text-shadow:0 1px 0 white;
+#body-login form { width:22em; margin:2em auto 2em; padding:0; }
+#body-login form fieldset {
+	margin-bottom: 20px;
+	text-align: left;
+}
+#body-login form #adminaccount { margin-bottom:5px; }
+#body-login form fieldset legend, #datadirContent label {
+	width: 100%;
+	font-weight: bold;
+}
+#body-login #datadirContent label {
+	display: block;
+	margin: 0;
+}
+#body-login form #datadirField legend {
+	margin-bottom: 15px;
+}
+#body-login #showAdvanced {
+	padding: 13px; /* increase clickable area of Advanced dropdown */
+}
+#body-login #showAdvanced img {
+	vertical-align: bottom; /* adjust position of Advanced dropdown arrow */
+	margin-left: -4px;
 }
-#login form fieldset legend a { color:#999; }
-#login #datadirContent label { display:block; margin:0; color:#999;  }
-#login form #datadirField legend { margin-bottom:15px; }
 
 /* Icons for username and password fields to better recognize them */
 #adminlogin, #adminpass, #user, #password { width:11.7em!important; padding-left:1.8em; }
@@ -209,84 +249,194 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
 input[name="password-clone"] { padding-left:1.8em; width:11.7em !important; }
 input[name="adminpass-clone"] { padding-left:1.8em; width:11.7em !important; }
 
-/* Nicely grouping input field sets */
-.grouptop input {
-	margin-bottom:0;
-	border-bottom:0; border-bottom-left-radius:0; border-bottom-right-radius:0;
+/* General new input field look */
+#body-login input[type="text"],
+#body-login input[type="password"],
+#body-login input[type="email"] {
+	border: 1px solid #323233;
+	-moz-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 3px rgba(0,0,0,.25) inset;
+	-webkit-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 3px rgba(0,0,0,.25) inset;
+	box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 3px rgba(0,0,0,.25) inset;
 }
-.groupmiddle input {
-	margin-top:0; margin-bottom:0;
-	border-top:0; border-bottom:0; border-radius:0;
-	box-shadow:0 1px 1px #fff,0 1px 0 #ddd inset;
+
+/* Nicely grouping input field sets */
+#body-login .grouptop input {
+	margin-bottom: 0;
+	border-bottom: 0;
+	border-bottom-left-radius: 0;
+	border-bottom-right-radius: 0;
+}
+#body-login .groupmiddle input {
+	margin-top: 0;
+	margin-bottom: 0;
+	border-top: 0;
+	border-bottom: 0;
+	border-radius: 0;
+	-moz-box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important;
+	-webkit-box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important;
+	box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important;
 }
-.groupbottom input {
-	margin-top:0;
-	border-top:0; border-top-right-radius:0; border-top-left-radius:0;
-	box-shadow:0 1px 1px #fff,0 1px 0 #ddd inset;
+#body-login .groupbottom input {
+	margin-top: 0;
+	border-top: 0;
+	border-top-right-radius: 0;
+	border-top-left-radius: 0;
+	-moz-box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important;
+	-webkit-box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important;
+	box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important;
 }
 
 /* In field labels. No, HTML placeholder does not work as well. */
-#login form label { color:#666; }
-#login .groupmiddle label, #login .groupbottom label { top:.65em; }
+#body-login .groupmiddle label, #body-login .groupbottom label { top:.65em; }
 p.infield { position:relative; }
 label.infield { cursor:text !important; top:1.05em; left:.85em; }
-#login form label.infield { /* labels are ellipsized when too long, keep them short */
+#body-login form label.infield { /* labels are ellipsized when too long, keep them short */
 	position:absolute; width:90%; padding-left:1.4em;
 	font-size:19px; color:#aaa;
 	white-space:nowrap; overflow:hidden; text-overflow:ellipsis;
 }
-#login #databaseField .infield { padding-left:0; }
-#login form input[type="checkbox"]+label { position:relative; margin:0; font-size:1em; text-shadow:#fff 0 1px 0; }
-#login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; }
-#login .success { background:#d7fed7; border:1px solid #0f0; width: 35%; margin: 30px auto; padding:1em; text-align: center;}
+#body-login #databaseField .infield { padding-left:0; }
+#body-login form input[type="checkbox"]+label {
+	position: relative;
+	margin: 0;
+	font-size: 1em;
+	padding: 14px;
+	padding-left: 28px;
+	margin-left: -28px;
+}
+#body-login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; }
+#body-login .success { background:#d7fed7; border:1px solid #0f0; width: 35%; margin: 30px auto; padding:1em; text-align: center;}
 
 /* Show password toggle */
-#show, #dbpassword { position:absolute; right:1em; top:.8em; float:right; }
-#show, #dbpassword, #personal-show { display:none; }
-#show + label, #dbpassword + label { right:1em; top:1.25em!important; }
-#show:checked + label, #dbpassword:checked + label, #personal-show:checked + label { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; }
+#show, #dbpassword {
+	position: absolute;
+	right: 1em;
+	top: .8em;
+	float: right;
+}
+#show, #dbpassword, #personal-show {
+	display: none;
+}
+#show + label, #dbpassword + label {
+	right: 21px;
+	top: 15px !important;
+	margin: -14px !important;
+	padding: 14px !important;
+}
+#show:checked + label, #dbpassword:checked + label, #personal-show:checked + label {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
+	filter: alpha(opacity=80);
+	opacity: .8;
+}
 #show + label, #dbpassword + label, #personal-show + label {
-	position:absolute!important; height:14px; width:24px;
-	background-image:url("../img/actions/toggle.png"); background-repeat:no-repeat;
-	-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; filter:alpha(opacity=30); opacity:.3;
+	position: absolute !important;
+	height: 14px;
+	width: 24px;
+	background-image: url("../img/actions/toggle.png");
+	background-repeat: no-repeat;
+	background-position: center;
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
+	filter: alpha(opacity=30);
+	opacity: .3;
+}
+#pass2, input[name="personal-password-clone"] {
+	padding: .6em 2.5em .4em .4em;
+	width: 8em;
+}
+#personal-show + label {
+	margin-top: 1em;
+	margin-left: -3em;
+}
+#passwordbutton {
+	margin-left: .5em;
 }
-#pass2, input[name="personal-password-clone"] { padding:0.6em 2.5em 0.4em 0.4em; width:8em;}
-#personal-show + label { margin-top:1em; margin-left:-3em; }
-#passwordbutton { margin-left:0.5em; }
 
 /* Database selector */
-#login form #selectDbType { text-align:center; }
-#login form #selectDbType label {
+#body-login form #selectDbType { text-align:center; }
+#body-login form #selectDbType label {
 	position:static; margin:0 -3px 5px; padding:.4em;
 	font-size:12px; font-weight:bold; background:#f8f8f8; color:#888; cursor:pointer;
 	border:1px solid #ddd; text-shadow:#eee 0 1px 0;
 	-moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset;
 }
-#login form #selectDbType label.ui-state-hover, #login form #selectDbType label.ui-state-active { color:#000; background-color:#e8e8e8; }
+#body-login form #selectDbType label.ui-state-hover, #body-login form #selectDbType label.ui-state-active { color:#000; background-color:#e8e8e8; }
+
 
-/* Warnings, for information */
-.warning {
+/* Warnings and errors are the same */
+.warning, .update, .error {
 	display: block;
-	background-color: #f2dede;
-	color: #b94a48;
-	padding: 8px;
-	margin: 0 7px 5px;
-	border: 1px solid #eed3d7;
+	padding: 10px;
+	color: #dd3b3b;
+	text-shadow: 0 -1px 0 rgba(0,0,0,.3);
+	background-color: rgba(0,0,0,.3);
+	text-align: center;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
 	border-radius: 5px;
+	cursor: default;
 }
 .warning legend,
-.warning a {
-	color: #b94a48 !important;
+.warning a,
+.error a {
+	color: #dd3b3b !important;
 	font-weight: bold;
 }
-/* Errors, for grave states */
-li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat;  border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; cursor:default; }
-.error { color:#FF3B3B; }
+/* Fixes for log in page, TODO should be removed some time */
+#body-login .update,
+#body-login .error {
+	margin: 35px auto;
+}
+#body-login .warning {
+	margin: 0 7px 5px;
+	font-weight: bold;
+}
+#body-login .warning legend {
+	text-shadow: none;
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+	filter: alpha(opacity=100);
+	opacity: 1;
+}
+#body-login a.warning {
+	cursor: pointer;
+}
+
 
 /* Alternative Logins */
 #alternative-logins legend { margin-bottom:10px; }
 #alternative-logins li { height:40px; display:inline-block; white-space:nowrap; }
 
+/* Log in and install button */
+#body-login input {
+	font-size: 1.5em;
+}
+#body-login input[type="text"],
+#body-login input[type="password"] {
+	width: 13em;
+}
+#body-login input.login {
+	width: auto;
+	float: right;
+}
+#body-login input[type="submit"] {
+	padding: 10px 20px; /* larger log in and installation buttons */
+}
+#remember_login {
+	margin: 18px 5px 0 18px;
+	vertical-align: text-bottom;
+}
+
+/* Sticky footer */
+#body-login .wrapper {
+	min-height: 100%;
+	margin: 0 auto -70px;
+	width: 300px;
+}
+#body-login footer, #body-login .push {
+	height: 70px;
+}
+
+
+
 
 /* NAVIGATION ------------------------------------------------------------- */
 #navigation {
@@ -405,7 +555,6 @@ div.jp-play-bar, div.jp-seek-bar { padding:0; }
 .pager li { display:inline-block; }
 
 .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { overflow:hidden; text-overflow:ellipsis; }
-.hint { background-image:url('../img/actions/info.png'); background-repeat:no-repeat; color:#777; padding-left:25px; background-position:0 0.3em;}
 .separator { display:inline; border-left:1px solid #d3d3d3; border-right:1px solid #fff; height:10px; width:0px; margin:4px; }
 
 a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;padding-top:0px;padding-bottom:2px; text-decoration:none; margin-top:5px }
@@ -438,7 +587,13 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin
 #oc-dialog-filepicker-content .filepicker_element_selected { background-color:lightblue;}
 .ui-dialog {position:fixed !important;}
 span.ui-icon {float: left; margin: 3px 7px 30px 0;}
+
 .loading { background: url('../img/loading.gif') no-repeat center; cursor: wait; }
+.move2trash { /* decrease spinner size */
+	width: 16px;
+	height: 16px;
+}
+
 
 /* ---- CATEGORIES ---- */
 #categoryform .scrollarea { position:absolute; left:10px; top:10px; right:10px; bottom:50px; overflow:auto; border:1px solid #ddd; background:#f8f8f8; }
@@ -453,7 +608,7 @@ span.ui-icon {float: left; margin: 3px 7px 30px 0;}
 .popup { background-color:white; border-radius:10px 10px 10px 10px; box-shadow:0 0 20px #888; color:#333; padding:10px; position:fixed !important; z-index:200; }
 .popup.topright { top:7em; right:1em; }
 .popup.bottomleft { bottom:1em; left:33em; }
-.popup .close { position:absolute; top:0.2em; right:0.2em; height:20px; width:20px; background:url('../img/actions/delete.svg') no-repeat center; }
+.popup .close { position:absolute; top:0.2em; right:0.2em; height:20px; width:20px; background:url('../img/actions/close.svg') no-repeat center; }
 .popup h2 { font-weight:bold; font-size:1.2em; }
 .arrow { border-bottom:10px solid white; border-left:10px solid transparent; border-right:10px solid transparent; display:block; height:0; position:absolute; width:0; z-index:201; }
 .arrow.left { left:-13px; bottom:1.2em; -webkit-transform:rotate(270deg); -moz-transform:rotate(270deg); -o-transform:rotate(270deg); -ms-transform:rotate(270deg); transform:rotate(270deg); }
@@ -677,19 +832,34 @@ div.crumb:active {
 /* icons */
 .folder-icon { background-image: url('../img/places/folder.svg'); }
 .delete-icon { background-image: url('../img/actions/delete.svg'); }
-.delete-icon:hover { background-image: url('../img/actions/delete-hover.svg'); }
 .edit-icon { background-image: url('../img/actions/rename.svg'); }
 
 /* buttons */
 button.loading {
 	background-image: url('../img/loading.gif');
 	background-position: right 10px center; background-repeat: no-repeat;
+	background-size: 16px;
 	padding-right: 30px;
 }
 
 
 
+
+
 /* ---- BROWSER-SPECIFIC FIXES ---- */
+
+/* remove dotted outlines in Firefox */
 ::-moz-focus-inner {
-	border: 0; /* remove dotted outlines in Firefox */
+	border: 0;
+}
+
+/* deactivate show password toggle for IE. Does not work for 8 and 9+ have their own implementation. */
+.ie #show, .ie #show+label {
+	display: none;
+	visibility: hidden;
+}
+
+/* fix installation screen rendering issue for IE8+9 */
+.lte9 #body-login {
+	height: auto !important;
 }
diff --git a/core/img/actions/add.png b/core/img/actions/add.png
index 25d472b2dc4..1aac02b8454 100644
--- a/core/img/actions/add.png
+++ b/core/img/actions/add.png
diff --git a/core/img/actions/add.svg b/core/img/actions/add.svg
index 136d6c4b311..250746e1660 100644
--- a/core/img/actions/add.svg
+++ b/core/img/actions/add.svg
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="22" width="22" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="a" y2="45.69" gradientUnits="userSpaceOnUse" x2="24.139" gradientTransform="matrix(.53994 0 0 .53668 -1.7557 -1.7859)" y1="6.5317" x1="24.139">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <path opacity=".4" d="m8.5932 8.2152v-5.9948h5v5.9948h6v5.0052h-6v6h-5v-6h-6v-5.0052h6z" fill-rule="evenodd" stroke="url(#a)"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="matrix(-.70711 -.70711 .70711 -.70711 -724.85 752.16)">
+  <path d="m1.6361 1040.9 2.8284-2.8284 3.5355 3.5355 3.5355-3.5355 2.8284 2.8284-3.5355 3.5355 3.5356 3.5356-2.8284 2.8284-3.5356-3.5356-3.5357 3.5354-2.8281-2.8281 3.5354-3.5357z"/>
+ </g>
 </svg>
diff --git a/core/img/actions/caret-dark.png b/core/img/actions/caret-dark.png
index 8ac5fbbd198..f84e87e0a82 100644
--- a/core/img/actions/caret-dark.png
+++ b/core/img/actions/caret-dark.png
diff --git a/core/img/actions/caret-dark.svg b/core/img/actions/caret-dark.svg
index be45ad402bf..3a5318e6fa2 100644
--- a/core/img/actions/caret-dark.svg
+++ b/core/img/actions/caret-dark.svg
@@ -1,5 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="10" width="10" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m1 2 4 8 4-7.989z" fill="#fff"/>
- <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m1 1 4 8 4-7.989z" fill="#999"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;" d="m4,5,4,7,4-6.989z" fill-opacity="0.19607843" fill="#FFF"/>
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;" fill="#000" d="m4,4,4,7,4-6.989z"/>
 </svg>
diff --git a/core/img/actions/delete-hover.png b/core/img/actions/delete-hover.png
deleted file mode 100644
index 048d91cee51..00000000000
--- a/core/img/actions/delete-hover.png
+++ /dev/null
diff --git a/core/img/actions/delete-hover.svg b/core/img/actions/delete-hover.svg
deleted file mode 100644
index 3e8d26c9786..00000000000
--- a/core/img/actions/delete-hover.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g transform="translate(0 -1036.4)">
-  <path d="m3 1040.4 1-1 4 3 4-3 1 1-3 4 3 4-1 1-4-3-4 3-1-1 3-4z" fill="#d40000"/>
- </g>
-</svg>
diff --git a/core/img/actions/delete.png b/core/img/actions/delete.png
index fa8e18183ed..99f549faf9b 100644
--- a/core/img/actions/delete.png
+++ b/core/img/actions/delete.png
diff --git a/core/img/actions/delete.svg b/core/img/actions/delete.svg
index ef564bfd482..568185c5c70 100644
--- a/core/img/actions/delete.svg
+++ b/core/img/actions/delete.svg
@@ -1,6 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g transform="translate(0 -1036.4)">
-  <path d="m3 1040.4 1-1 4 3 4-3 1 1-3 4 3 4-1 1-4-3-4 3-1-1 3-4z"/>
- </g>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <path fill="#d40000" d="M8,1c-3.866,0-7,3.134-7,7s3.134,7,7,7,7-3.134,7-7-3.134-7-7-7zm-2.8438,2.75l2.8438,2.8438,2.844-2.8438,1.406,1.4062-2.8438,2.8438,2.8438,2.844-1.406,1.406-2.844-2.8438-2.8438,2.8438-1.4062-1.406,2.8438-2.844-2.8438-2.8438,1.4062-1.4062z"/>
 </svg>
diff --git a/core/img/actions/lock.png b/core/img/actions/lock.png
index dbcffa3990f..f3121811ea6 100644
--- a/core/img/actions/lock.png
+++ b/core/img/actions/lock.png
diff --git a/core/img/actions/mail.png b/core/img/actions/mail.png
index 8e884fbc0ea..be6142444ae 100644
--- a/core/img/actions/mail.png
+++ b/core/img/actions/mail.png
diff --git a/core/img/actions/mail.svg b/core/img/actions/mail.svg
index 2c63daac034..c01f2c113e7 100644
--- a/core/img/actions/mail.svg
+++ b/core/img/actions/mail.svg
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g>
-  <rect stroke-linejoin="round" height="10.244" width="15.244" stroke="#000" stroke-linecap="square" y="2.6281" x=".37806" stroke-width=".75613"/>
-  <path d="m-0.6 11 8.6-5l8.6 5" stroke="#fff" stroke-width="1px" fill="none"/>
-  <path d="m0 2.5 8 6.5 8-6.5" stroke="#fff" stroke-linecap="round" stroke-width="1px"/>
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path d="m0.88889 3c-0.49245 0-0.88889 0.3968-0.88889 0.8892v8.2228c0 0.492 0.39644 0.888 0.88889 0.888h14.222c0.493 0 0.889-0.396 0.889-0.888v-8.2228c0-0.4924-0.396-0.8892-0.889-0.8892zm0.75 1.0281 6.0833 6.0833h0.52778l6.1111-6.0833 0.61111 0.61111-3.6389 3.6944 2.75 2.8056-0.61111 0.61111-2.8056-2.8056-2.0278 2.0556h-1.2778l-2.0271-2.0552-2.8055 2.8332-0.6111-0.639 2.7777-2.8054-3.6666-3.6944z"/>
 </svg>
diff --git a/core/img/actions/undelete.png b/core/img/actions/undelete.png
deleted file mode 100644
index d712527ef61..00000000000
--- a/core/img/actions/undelete.png
+++ /dev/null
diff --git a/core/img/loader.gif b/core/img/loader.gif
deleted file mode 100644
index e192ca895cd..00000000000
--- a/core/img/loader.gif
+++ /dev/null
diff --git a/core/img/loading-dark.gif b/core/img/loading-dark.gif
index 5fe86acabc4..13f0f64eab1 100644
--- a/core/img/loading-dark.gif
+++ b/core/img/loading-dark.gif
diff --git a/core/img/loading.gif b/core/img/loading.gif
index 5b33f7e54f4..f8f3dff6fb9 100644
--- a/core/img/loading.gif
+++ b/core/img/loading.gif
diff --git a/core/img/remoteStorage-big.png b/core/img/remoteStorage-big.png
deleted file mode 100644
index 7e76e21209e..00000000000
--- a/core/img/remoteStorage-big.png
+++ /dev/null
diff --git a/core/img/weather-clear.png b/core/img/weather-clear.png
deleted file mode 100644
index 0acf7a9b2af..00000000000
--- a/core/img/weather-clear.png
+++ /dev/null
diff --git a/core/js/eventsource.js b/core/js/eventsource.js
index ce8c8387c8e..536b180bc8f 100644
--- a/core/js/eventsource.js
+++ b/core/js/eventsource.js
@@ -110,7 +110,11 @@ OC.EventSource.prototype={
 					this.listeners[type].push(callback);
 				}else{
 					this.source.addEventListener(type,function(e){
-						callback(JSON.parse(e.data));
+						if (typeof e.data != 'undefined') {
+							callback(JSON.parse(e.data));
+						} else {
+							callback('');
+						}
 					},false);
 				}
 			}else{
diff --git a/core/js/js.js b/core/js/js.js
index 3904787c4e5..cf4e72324dc 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -226,8 +226,12 @@ var OC={
 		var path=OC.filePath(app,'css',style+'.css');
 		if(OC.addStyle.loaded.indexOf(path)===-1){
 			OC.addStyle.loaded.push(path);
-			style=$('<link rel="stylesheet" type="text/css" href="'+path+'"/>');
-			$('head').append(style);
+			if (document.createStyleSheet) {
+				document.createStyleSheet(path);
+			} else {
+				style=$('<link rel="stylesheet" type="text/css" href="'+path+'"/>');
+				$('head').append(style);
+			}
 		}
 	},
 	basename: function(path) {
@@ -662,8 +666,6 @@ $(document).ready(function(){
 	$('.selectedActions a').tipsy({gravity:'s', fade:true, live:true});
 	$('a.delete').tipsy({gravity: 'e', fade:true, live:true});
 	$('a.action').tipsy({gravity:'s', fade:true, live:true});
-	$('#headerSize').tipsy({gravity:'s', fade:true, live:true});
-	$('td.filesize').tipsy({gravity:'s', fade:true, live:true});
 	$('td .modified').tipsy({gravity:'s', fade:true, live:true});
 
 	$('input').tipsy({gravity:'w', fade:true});
@@ -693,14 +695,6 @@ function humanFileSize(size) {
 	return relativeSize + ' ' + readableFormat;
 }
 
-function simpleFileSize(bytes) {
-	var mbytes = Math.round(bytes/(1024*1024/10))/10;
-	if(bytes == 0) { return '0'; }
-	else if(mbytes < 0.1) { return '< 0.1'; }
-	else if(mbytes > 1000) { return '> 1000'; }
-	else { return mbytes.toFixed(1); }
-}
-
 function formatDate(date){
 	if(typeof date=='number'){
 		date=new Date(date);
diff --git a/core/js/share.js b/core/js/share.js
index 9494637c3dc..e59669cbc2b 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -92,6 +92,7 @@ OC.Share={
 			}
 		}
 		if (shares) {
+			OC.Share.statuses[itemSource] = OC.Share.statuses[itemSource] || {};
 			OC.Share.statuses[itemSource]['link'] = link;
 		} else {
 			delete OC.Share.statuses[itemSource];
@@ -122,7 +123,12 @@ OC.Share={
 					callback(result.data);
 				}
 			} else {
-				OC.dialogs.alert(result.data.message, t('core', 'Error while sharing'));
+				if (result.data && result.data.message) {
+					var msg = result.data.message;
+				} else {
+					var msg = t('core', 'Error');
+				}
+				OC.dialogs.alert(msg, t('core', 'Error while sharing'));
 			}
 		});
 	},
@@ -161,7 +167,12 @@ OC.Share={
 			// respective checkbox should be checked or
 			// not.
 
+			var publicUploadEnabled = $('#filestable').data('allow-public-upload');
+			if (typeof publicUploadEnabled == 'undefined') {
+				publicUploadEnabled = 'no';
+			}
 			var allowPublicUploadStatus = false;
+
 			$.each(data.shares, function(key, value) {
 				if (allowPublicUploadStatus) {
 					return true;
@@ -181,13 +192,13 @@ OC.Share={
 				html += '<div id="linkPass">';
 				html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />';
 				html += '</div>';
-				if (possiblePermissions & OC.PERMISSION_CREATE) {
+				if (itemType === 'folder' && (possiblePermissions & OC.PERMISSION_CREATE) && publicUploadEnabled === 'yes') {
 					html += '<div id="allowPublicUploadWrapper" style="display:none;">';
 					html += '<input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload"' + ((allowPublicUploadStatus) ? 'checked="checked"' : '') + ' />';
 					html += '<label for="sharingDialogAllowPublicUpload">' + t('core', 'Allow Public Upload') + '</label>';
 					html += '</div>';
 				}
-                html += '</div><form id="emailPrivateLink" >';
+				html += '</div><form id="emailPrivateLink" >';
 				html += '<input id="email" style="display:none; width:62%;" value="" placeholder="'+t('core', 'Email link to person')+'" type="text" />';
 				html += '<input id="emailButton" style="display:none;" type="submit" value="'+t('core', 'Send')+'" />';
 				html += '</form>';
diff --git a/core/js/update.js b/core/js/update.js
index 8ab02bbf935..2c28e72f7cd 100644
--- a/core/js/update.js
+++ b/core/js/update.js
@@ -5,6 +5,9 @@ $(document).ready(function () {
 	});
 	updateEventSource.listen('error', function(message) {
 		$('<span>').addClass('error').append(message).append('<br />').appendTo($('.update'));
+		message = 'Please reload the page.';
+		$('<span>').addClass('error').append(message).append('<br />').appendTo($('.update'));
+		updateEventSource.close();
 	});
 	updateEventSource.listen('failure', function(message) {
 		$('<span>').addClass('error').append(message).append('<br />').appendTo($('.update'));
@@ -20,4 +23,4 @@ $(document).ready(function () {
 			window.location.href = OC.webroot;
 		}, 3000);
 	});
-});
-\ No newline at end of file
+});
diff --git a/core/l10n/af_ZA.php b/core/l10n/af_ZA.php
index 4878c75edde..dc78e44c8d7 100644
--- a/core/l10n/af_ZA.php
+++ b/core/l10n/af_ZA.php
@@ -15,7 +15,6 @@
 "Admin" => "Admin",
 "Help" => "Hulp",
 "Cloud not found" => "Wolk nie gevind",
-"web services under your control" => "webdienste onder jou beheer",
 "Create an <strong>admin account</strong>" => "Skep `n <strong>admin-rekening</strong>",
 "Advanced" => "Gevorderd",
 "Configure the database" => "Stel databasis op",
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index 7ac7a564c35..b18ee712cfa 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -98,7 +98,6 @@
 "Help" => "المساعدة",
 "Access forbidden" => "التوصّل محظور",
 "Cloud not found" => "لم يتم إيجاد",
-"web services under your control" => "خدمات الشبكة تحت سيطرتك",
 "Edit categories" => "عدل الفئات",
 "Add" => "اضف",
 "Security Warning" => "تحذير أمان",
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index 490bea9b170..608f26bc861 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -50,7 +50,6 @@
 "Help" => "Помощ",
 "Access forbidden" => "Достъпът е забранен",
 "Cloud not found" => "облакът не намерен",
-"web services under your control" => "уеб услуги под Ваш контрол",
 "Edit categories" => "Редактиране на категориите",
 "Add" => "Добавяне",
 "Create an <strong>admin account</strong>" => "Създаване на <strong>админ профил</strong>",
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index c775d2fb6af..5c171af567c 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -95,7 +95,6 @@
 "Help" => "সহায়িকা",
 "Access forbidden" => "অধিগমনের অনুমতি নেই",
 "Cloud not found" => "ক্লাউড খুঁজে পাওয়া গেল না",
-"web services under your control" => "ওয়েব সার্ভিস আপনার হাতের মুঠোয়",
 "Edit categories" => "ক্যাটেগরি সম্পাদনা",
 "Add" => "যোগ কর",
 "Security Warning" => "নিরাপত্তাজনিত সতর্কতা",
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 9b3b45fdf9d..80f0e558a67 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -106,7 +106,6 @@
 "Access forbidden" => "Accés prohibit",
 "Cloud not found" => "No s'ha trobat el núvol",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ei,\n\nnomés fer-te saber que %s ha compartit %s amb tu.\nMira-ho: %s\n\nSalut!",
-"web services under your control" => "controleu els vostres serveis web",
 "Edit categories" => "Edita les categories",
 "Add" => "Afegeix",
 "Security Warning" => "Avís de seguretat",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 113d0f41ba8..b0e70938d4a 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -106,7 +106,6 @@
 "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",
-"web services under your control" => "služby webu pod Vaší kontrolou",
 "Edit categories" => "Upravit kategorie",
 "Add" => "Přidat",
 "Security Warning" => "Bezpečnostní upozornění",
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php
index 6158a356dc7..aeb2995e6bd 100644
--- a/core/l10n/cy_GB.php
+++ b/core/l10n/cy_GB.php
@@ -100,7 +100,6 @@
 "Help" => "Cymorth",
 "Access forbidden" => "Mynediad wedi'i wahardd",
 "Cloud not found" => "Methwyd canfod cwmwl",
-"web services under your control" => "gwasanaethau gwe a reolir gennych",
 "Edit categories" => "Golygu categorïau",
 "Add" => "Ychwanegu",
 "Security Warning" => "Rhybudd Diogelwch",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index b3da17ba798..2e84c3ff511 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -101,7 +101,6 @@
 "Help" => "Hjælp",
 "Access forbidden" => "Adgang forbudt",
 "Cloud not found" => "Sky ikke fundet",
-"web services under your control" => "Webtjenester under din kontrol",
 "Edit categories" => "Rediger kategorier",
 "Add" => "Tilføj",
 "Security Warning" => "Sikkerhedsadvarsel",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 897b379a28b..a8e1f811534 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -62,6 +62,7 @@
 "Share with link" => "Über einen Link freigegeben",
 "Password protect" => "Passwortschutz",
 "Password" => "Passwort",
+"Allow Public Upload" => "Öffentliches Hochladen erlauben",
 "Email link to person" => "Link per E-Mail verschicken",
 "Send" => "Senden",
 "Set expiration date" => "Setze ein Ablaufdatum",
@@ -105,7 +106,6 @@
 "Access forbidden" => "Zugriff verboten",
 "Cloud not found" => "Cloud nicht gefunden",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hallo,\n\nwollte dich nur kurz informieren, dass %s gerade %s mit dir geteilt hat.\nSchau es dir an: %s\n\nGruß!",
-"web services under your control" => "Web-Services unter Deiner Kontrolle",
 "Edit categories" => "Kategorien bearbeiten",
 "Add" => "Hinzufügen",
 "Security Warning" => "Sicherheitswarnung",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index eca14f7d9a9..4188522b0c7 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -62,7 +62,7 @@
 "Share with link" => "Über einen Link teilen",
 "Password protect" => "Passwortschutz",
 "Password" => "Passwort",
-"Allow Public Upload" => "Erlaube öffentliches hochladen",
+"Allow Public Upload" => "Öffentliches Hochladen erlauben",
 "Email link to person" => "Link per E-Mail verschicken",
 "Send" => "Senden",
 "Set expiration date" => "Ein Ablaufdatum setzen",
@@ -91,7 +91,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Anfrage fehlgeschlagen!<br>Haben Sie darauf geachtet, dass E-Mail-Adresse/Nutzername korrekt waren?",
 "You will receive a link to reset your password via Email." => "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.",
 "Username" => "Benutzername",
-"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?" => "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keinen Weg geben, um Ihre Daten wieder zu bekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?",
+"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?" => "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?",
 "Yes, I really want to reset my password now" => "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen.",
 "Request reset" => "Zurücksetzung anfordern",
 "Your password was reset" => "Ihr Passwort wurde zurückgesetzt.",
@@ -106,7 +106,6 @@
 "Access forbidden" => "Zugriff verboten",
 "Cloud not found" => "Cloud wurde nicht gefunden",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hallo,\n\nich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.\nSchauen Sie es sich an: %s\n\nViele Grüße!",
-"web services under your control" => "Web-Services unter Ihrer Kontrolle",
 "Edit categories" => "Kategorien ändern",
 "Add" => "Hinzufügen",
 "Security Warning" => "Sicherheitshinweis",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 022d9d90039..2dcfa1bb698 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -104,7 +104,6 @@
 "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Γεια χαρά!",
-"web services under your control" => "υπηρεσίες δικτύου υπό τον έλεγχό σας",
 "Edit categories" => "Επεξεργασία κατηγοριών",
 "Add" => "Προσθήκη",
 "Security Warning" => "Προειδοποίηση Ασφαλείας",
diff --git a/core/l10n/en@pirate.php b/core/l10n/en@pirate.php
index 0c590d0b758..482632f3fda 100644
--- a/core/l10n/en@pirate.php
+++ b/core/l10n/en@pirate.php
@@ -1,4 +1,3 @@
 <?php $TRANSLATIONS = array(
-"Password" => "Passcode",
-"web services under your control" => "web services under your control"
+"Password" => "Passcode"
 );
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 2adf09d3a01..00f925e5274 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -102,7 +102,6 @@
 "Access forbidden" => "Aliro estas malpermesata",
 "Cloud not found" => "La nubo ne estas trovita",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Saluton:\n\nNi nur sciigas vin, ke %s kunhavigis %s kun vi.\nVidu ĝin: %s\n\nĜis!",
-"web services under your control" => "TTT-servoj regataj de vi",
 "Edit categories" => "Redakti kategoriojn",
 "Add" => "Aldoni",
 "Security Warning" => "Sekureca averto",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 3845f68d24f..ae98a019db1 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -106,7 +106,6 @@
 "Access forbidden" => "Acceso prohibido",
 "Cloud not found" => "No se encuentra la nube",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Oye,⏎ sólo te hago saber que %s compartido %s contigo.⏎ Míralo: %s ⏎Disfrutalo!",
-"web services under your control" => "Servicios web bajo su control",
 "Edit categories" => "Editar categorías",
 "Add" => "Agregar",
 "Security Warning" => "Advertencia de seguridad",
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 8bef5151163..83123b76ea2 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -62,6 +62,7 @@
 "Share with link" => "Compartir con enlace",
 "Password protect" => "Proteger con contraseña ",
 "Password" => "Contraseña",
+"Allow Public Upload" => "Permitir Subida Pública",
 "Email link to person" => "Enviar el enlace por e-mail.",
 "Send" => "Mandar",
 "Set expiration date" => "Asignar fecha de vencimiento",
@@ -105,7 +106,6 @@
 "Access forbidden" => "Acceso prohibido",
 "Cloud not found" => "No se encontró ownCloud",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hola,\n\nSimplemente te informo que %s compartió %s con vos.\nMiralo acá: %s\n\n¡Chau!",
-"web services under your control" => "servicios web que controlás",
 "Edit categories" => "Editar categorías",
 "Add" => "Agregar",
 "Security Warning" => "Advertencia de seguridad",
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 4c0a41c5087..ec850491b79 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s jagas sinuga »%s«",
 "Category type not provided." => "Kategooria tüüp puudub.",
 "No category to add?" => "Pole kategooriat, mida lisada?",
 "This category already exists: %s" => "See kategooria on juba olemas: %s",
@@ -61,6 +62,7 @@
 "Share with link" => "Jaga lingiga",
 "Password protect" => "Parooliga kaitstud",
 "Password" => "Parool",
+"Allow Public Upload" => "Luba avalik üleslaadimine",
 "Email link to person" => "Saada link isikule e-postiga",
 "Send" => "Saada",
 "Set expiration date" => "Määra aegumise kuupäev",
@@ -89,6 +91,8 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Päring ebaõnnestus!<br>Oled sa veendunud, et e-post/kasutajanimi on õiged?",
 "You will receive a link to reset your password via Email." => "Sinu parooli taastamise link saadetakse sulle e-postile.",
 "Username" => "Kasutajanimi",
+"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?" => "Sinu failid on krüpteeritud. Kui sa pole taastamise võtit veel määranud, siis pole präast parooli taastamist mingit võimalust sinu andmeid tagasi saada. Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. Oled sa kindel, et sa soovid jätkata?",
+"Yes, I really want to reset my password now" => "Jah, ma tõesti soovin oma parooli praegu nullida",
 "Request reset" => "Päringu taastamine",
 "Your password was reset" => "Sinu parool on taastatud",
 "To login page" => "Sisselogimise lehele",
@@ -101,7 +105,7 @@
 "Help" => "Abiinfo",
 "Access forbidden" => "Ligipääs on keelatud",
 "Cloud not found" => "Pilve ei leitud",
-"web services under your control" => "veebitenused sinu kontrolli all",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hei,\n\nlihtsalt annan sulle teada, et %s jagas sinuga %s.\nVaata seda siin: %s\n\nTervitused!",
 "Edit categories" => "Muuda kategooriaid",
 "Add" => "Lisa",
 "Security Warning" => "Turvahoiatus",
@@ -131,6 +135,7 @@
 "remember" => "pea meeles",
 "Log in" => "Logi sisse",
 "Alternative Logins" => "Alternatiivsed sisselogimisviisid",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hei,<br><br>lihtsalt annan sulle teada, et %s jagas sinuga »%s«.<br><a href=\"%s\">Vaata seda!</a><br><br>Tervitades!",
 "prev" => "eelm",
 "next" => "järgm",
 "Updating ownCloud to version %s, this may take a while." => "ownCloudi uuendamine versioonile %s. See võib veidi aega võtta."
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 117c0105756..d17c9f2c4a5 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s-ek »%s« zurekin partekatu du",
 "Category type not provided." => "Kategoria mota ez da zehaztu.",
 "No category to add?" => "Ez dago gehitzeko kategoriarik?",
 "This category already exists: %s" => "Kategoria hau dagoeneko existitzen da: %s",
@@ -42,6 +43,7 @@
 "years ago" => "urte",
 "Choose" => "Aukeratu",
 "Cancel" => "Ezeztatu",
+"Error loading file picker template" => "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan",
 "Yes" => "Bai",
 "No" => "Ez",
 "Ok" => "Ados",
@@ -60,6 +62,7 @@
 "Share with link" => "Elkarbanatu lotura batekin",
 "Password protect" => "Babestu pasahitzarekin",
 "Password" => "Pasahitza",
+"Allow Public Upload" => "Gaitu igotze publikoa",
 "Email link to person" => "Postaz bidali lotura ",
 "Send" => "Bidali",
 "Set expiration date" => "Ezarri muga data",
@@ -84,8 +87,12 @@
 "The update was successful. Redirecting you to ownCloud now." => "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara.",
 "ownCloud password reset" => "ownCloud-en pasahitza berrezarri",
 "Use the following link to reset your password: {link}" => "Eribili hurrengo lotura zure pasahitza berrezartzeko: {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 ." => "Zure pasahitza berrezartzeko lotura zure postara bidalia izan da.<br>Ez baduzu arrazoizko denbora \nepe batean jasotzen begiratu zure zabor-posta karpetan.<br>Hor ere ez badago kudeatzailearekin harremanetan ipini.",
+"Request failed!<br>Did you make sure your email/username was right?" => "Eskaerak huts egin du!<br>Ziur zaude posta/pasahitza zuzenak direla?",
 "You will receive a link to reset your password via Email." => "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez.",
 "Username" => "Erabiltzaile izena",
+"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?" => "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik. Ziur zaude aurrera jarraitu nahi duzula?",
+"Yes, I really want to reset my password now" => "Bai, nire pasahitza orain berrabiarazi nahi dut",
 "Request reset" => "Eskaera berrezarri da",
 "Your password was reset" => "Zure pasahitza berrezarri da",
 "To login page" => "Sarrera orrira",
@@ -98,7 +105,7 @@
 "Help" => "Laguntza",
 "Access forbidden" => "Sarrera debekatuta",
 "Cloud not found" => "Ez da hodeia aurkitu",
-"web services under your control" => "web zerbitzuak zure kontrolpean",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Kaixo\n\n%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s\n\nOngi jarraitu!",
 "Edit categories" => "Editatu kategoriak",
 "Add" => "Gehitu",
 "Security Warning" => "Segurtasun abisua",
@@ -119,6 +126,7 @@
 "Database tablespace" => "Datu basearen taula-lekua",
 "Database host" => "Datubasearen hostalaria",
 "Finish setup" => "Bukatu konfigurazioa",
+"%s is available. Get more information on how to update." => "%s erabilgarri dago. Eguneratzeaz argibide gehiago eskuratu.",
 "Log out" => "Saioa bukatu",
 "Automatic logon rejected!" => "Saio hasiera automatikoa ez onartuta!",
 "If you did not change your password recently, your account may be compromised!" => "Zure pasahitza orain dela gutxi ez baduzu aldatu, zure kontua arriskuan egon daiteke!",
@@ -127,6 +135,7 @@
 "remember" => "gogoratu",
 "Log in" => "Hasi saioa",
 "Alternative Logins" => "Beste erabiltzaile izenak",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Kaixo<br><br>%s-ek %s zurekin partekatu duela jakin dezazun.<br><a href=\"%s\">\nIkusi ezazu</a><br><br>Ongi jarraitu!",
 "prev" => "aurrekoa",
 "next" => "hurrengoa",
 "Updating ownCloud to version %s, this may take a while." => "ownCloud %s bertsiora eguneratzen, denbora har dezake."
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index 338b3ad4b21..02fe2ce1148 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s به اشتراک گذاشته شده است »%s« توسط شما",
 "Category type not provided." => "نوع دسته بندی ارائه نشده است.",
 "No category to add?" => "آیا گروه دیگری برای افزودن ندارید",
 "This category already exists: %s" => "این دسته هم اکنون وجود دارد: %s",
@@ -42,6 +43,7 @@
 "years ago" => "سال‌های قبل",
 "Choose" => "انتخاب کردن",
 "Cancel" => "منصرف شدن",
+"Error loading file picker template" => "خطا در بارگذاری قالب انتخاب کننده فایل",
 "Yes" => "بله",
 "No" => "نه",
 "Ok" => "قبول",
@@ -60,6 +62,7 @@
 "Share with link" => "به اشتراک گذاشتن با پیوند",
 "Password protect" => "نگهداری کردن رمز عبور",
 "Password" => "گذرواژه",
+"Allow Public Upload" => "اجازه آپلود عمومی",
 "Email link to person" => "پیوند ایمیل برای شخص.",
 "Send" => "ارسال",
 "Set expiration date" => "تنظیم تاریخ انقضا",
@@ -84,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}" => "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{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" => "به صفحه ورود",
@@ -98,7 +105,7 @@
 "Help" => "راه‌نما",
 "Access forbidden" => "اجازه دسترسی به مناطق ممنوعه را ندارید",
 "Cloud not found" => "پیدا نشد",
-"web services under your control" => "سرویس های تحت وب در کنترل شما",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "اینجا,⏎\n فقط به شما اجازه میدهد که بدانید %s به اشتراک گذاشته شده %s توسط شما.⏎\nمشاهده آن :  %s⏎\n⏎\nبه سلامتی!",
 "Edit categories" => "ویرایش گروه",
 "Add" => "افزودن",
 "Security Warning" => "اخطار امنیتی",
@@ -119,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!" => "اگر شما اخیرا رمزعبور را تغییر نداده اید، حساب شما در معرض خطر می باشد !",
@@ -127,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><a href=\"%s\"> مشاهده آن!</a><br><br> به سلامتی!",
 "prev" => "بازگشت",
 "next" => "بعدی",
 "Updating ownCloud to version %s, this may take a while." => "به روز رسانی OwnCloud به نسخه ی %s، این عملیات ممکن است زمان بر باشد."
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 3e471ad1942..23b697a25c3 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -98,7 +98,6 @@
 "Access forbidden" => "Pääsy estetty",
 "Cloud not found" => "Pilveä ei löydy",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hei!\n\n%s jakoi kohteen %s kanssasi.\nKatso se tästä: %s\n\nNäkemiin!",
-"web services under your control" => "verkkopalvelut hallinnassasi",
 "Edit categories" => "Muokkaa luokkia",
 "Add" => "Lisää",
 "Security Warning" => "Turvallisuusvaroitus",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 079cde5c30c..bc8a0d28153 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -106,7 +106,6 @@
 "Access forbidden" => "Accès interdit",
 "Cloud not found" => "Introuvable",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Salut,\n\nje veux juste vous signaler %s partagé %s avec vous.\nVoyez-le: %s\n\nBonne continuation!",
-"web services under your control" => "services web sous votre contrôle",
 "Edit categories" => "Editer les catégories",
 "Add" => "Ajouter",
 "Security Warning" => "Avertissement de sécurité",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index db53a3e8a4b..b55daf27c21 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -62,6 +62,7 @@
 "Share with link" => "Compartir coa ligazón",
 "Password protect" => "Protexido con contrasinais",
 "Password" => "Contrasinal",
+"Allow Public Upload" => "Permitir o envío público",
 "Email link to person" => "Enviar ligazón por correo",
 "Send" => "Enviar",
 "Set expiration date" => "Definir a data de caducidade",
@@ -105,7 +106,6 @@
 "Access forbidden" => "Acceso denegado",
 "Cloud not found" => "Nube non atopada",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ola,\n\nsó facerlle saber que %s compartiu %s con vostede.\nVéxao en: %s\n\nSaúdos!",
-"web services under your control" => "servizos web baixo o seu control",
 "Edit categories" => "Editar as categorías",
 "Add" => "Engadir",
 "Security Warning" => "Aviso de seguranza",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index 1095507673b..ab002ab64e8 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -101,7 +101,6 @@
 "Help" => "עזרה",
 "Access forbidden" => "הגישה נחסמה",
 "Cloud not found" => "ענן לא נמצא",
-"web services under your control" => "שירותי רשת תחת השליטה שלך",
 "Edit categories" => "ערוך קטגוריות",
 "Add" => "הוספה",
 "Security Warning" => "אזהרת אבטחה",
diff --git a/core/l10n/hi.php b/core/l10n/hi.php
index afdd91d5f83..4285f8ce577 100644
--- a/core/l10n/hi.php
+++ b/core/l10n/hi.php
@@ -12,6 +12,7 @@
 "November" => "नवंबर",
 "December" => "दिसम्बर",
 "Settings" => "सेटिंग्स",
+"Error" => "त्रुटि",
 "Share" => "साझा करें",
 "Share with" => "के साथ साझा",
 "Password" => "पासवर्ड",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index 80a34094b27..3eb556e9f63 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -73,7 +73,6 @@
 "Help" => "Pomoć",
 "Access forbidden" => "Pristup zabranjen",
 "Cloud not found" => "Cloud nije pronađen",
-"web services under your control" => "web usluge pod vašom kontrolom",
 "Edit categories" => "Uredi kategorije",
 "Add" => "Dodaj",
 "Create an <strong>admin account</strong>" => "Stvori <strong>administratorski račun</strong>",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index a0b6979c4ba..07d4893d6ad 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -62,6 +62,7 @@
 "Share with link" => "Link megadásával osztom meg",
 "Password protect" => "Jelszóval is védem",
 "Password" => "Jelszó",
+"Allow Public Upload" => "Feltöltést is engedélyezek",
 "Email link to person" => "Email címre küldjük el",
 "Send" => "Küldjük el",
 "Set expiration date" => "Legyen lejárati idő",
@@ -90,6 +91,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "A kérést nem sikerült teljesíteni! <br>Biztos, hogy jó emailcímet/felhasználónevet adott meg?",
 "You will receive a link to reset your password via Email." => "Egy emailben fog értesítést kapni a jelszóbeállítás módjáról.",
 "Username" => "Felhasználónév",
+"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?" => "Az Ön állományai titkosítva vannak. Ha nem engedélyezte korábban az adatok visszanyeréséhez szükséges kulcs használatát, akkor a jelszó megváltoztatását követően nem fog hozzáférni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kérdezze meg a rendszergazdát, mielőtt továbbmenne. Biztos, hogy folytatni kívánja?",
 "Yes, I really want to reset my password now" => "Igen, tényleg meg akarom változtatni a jelszavam",
 "Request reset" => "Visszaállítás igénylése",
 "Your password was reset" => "Jelszó megváltoztatva",
@@ -104,7 +106,6 @@
 "Access forbidden" => "A hozzáférés nem engedélyezett",
 "Cloud not found" => "A felhő nem található",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Üdv!\n\nÚj hír: %s megosztotta Önnel ezt: %s.\nItt nézhető meg: %s\n\nMinden jót!",
-"web services under your control" => "webszolgáltatások saját kézben",
 "Edit categories" => "Kategóriák szerkesztése",
 "Add" => "Hozzáadás",
 "Security Warning" => "Biztonsági figyelmeztetés",
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index 9df7eda1dad..8c9b6b88ef3 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -38,7 +38,6 @@
 "Help" => "Adjuta",
 "Access forbidden" => "Accesso prohibite",
 "Cloud not found" => "Nube non trovate",
-"web services under your control" => "servicios web sub tu controlo",
 "Edit categories" => "Modificar categorias",
 "Add" => "Adder",
 "Create an <strong>admin account</strong>" => "Crear un <strong>conto de administration</strong>",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 5fe8b542223..2ee9c37ec2d 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -98,7 +98,6 @@
 "Help" => "Bantuan",
 "Access forbidden" => "Akses ditolak",
 "Cloud not found" => "Cloud tidak ditemukan",
-"web services under your control" => "layanan web dalam kontrol Anda",
 "Edit categories" => "Edit kategori",
 "Add" => "Tambah",
 "Security Warning" => "Peringatan Keamanan",
diff --git a/core/l10n/is.php b/core/l10n/is.php
index b8573b3624a..3d3ce41b27a 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -96,7 +96,6 @@
 "Help" => "Hjálp",
 "Access forbidden" => "Aðgangur bannaður",
 "Cloud not found" => "Ský finnst ekki",
-"web services under your control" => "vefþjónusta undir þinni stjórn",
 "Edit categories" => "Breyta flokkum",
 "Add" => "Bæta við",
 "Security Warning" => "Öryggis aðvörun",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index b053a2a21bb..f26be1d129c 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s ha condiviso »%s« con te",
+"%s shared »%s« with you" => "%s ha condiviso «%s» con te",
 "Category type not provided." => "Tipo di categoria non fornito.",
 "No category to add?" => "Nessuna categoria da aggiungere?",
 "This category already exists: %s" => "Questa categoria esiste già: %s",
@@ -106,7 +106,6 @@
 "Access forbidden" => "Accesso negato",
 "Cloud not found" => "Nuvola non trovata",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ehilà,\n\nvolevo solamente farti sapere che %s ha condiviso %s con te.\nGuarda: %s\n\nSaluti!",
-"web services under your control" => "servizi web nelle tue mani",
 "Edit categories" => "Modifica categorie",
 "Add" => "Aggiungi",
 "Security Warning" => "Avviso di sicurezza",
@@ -136,7 +135,7 @@
 "remember" => "ricorda",
 "Log in" => "Accedi",
 "Alternative Logins" => "Accessi alternativi",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Ehilà,<br><br>volevo solamente farti sapere che %s ha condiviso »%s« con te.<br><a href=\"%s\">Guarda!</a><br><br>Saluti!",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Ehilà,<br><br>volevo solamente farti sapere che %s ha condiviso «%s» con te.<br><a href=\"%s\">Guarda!</a><br><br>Saluti!",
 "prev" => "precedente",
 "next" => "successivo",
 "Updating ownCloud to version %s, this may take a while." => "Aggiornamento di ownCloud alla versione %s in corso, ciò potrebbe richiedere del tempo."
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index ccd5e46425c..0f445e7d85e 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -62,7 +62,7 @@
 "Share with link" => "URLリンクで共有",
 "Password protect" => "パスワード保護",
 "Password" => "パスワード",
-"Allow Public Upload" => "パブリックなアップロードを許可",
+"Allow Public Upload" => "アップロードを許可",
 "Email link to person" => "メールリンク",
 "Send" => "送信",
 "Set expiration date" => "有効期限を設定",
@@ -106,7 +106,6 @@
 "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それでは。",
-"web services under your control" => "管理下のウェブサービス",
 "Edit categories" => "カテゴリを編集",
 "Add" => "追加",
 "Security Warning" => "セキュリティ警告",
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index 6674106f1d7..877d66a0db3 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -98,7 +98,6 @@
 "Help" => "დახმარება",
 "Access forbidden" => "წვდომა აკრძალულია",
 "Cloud not found" => "ღრუბელი არ არსებობს",
-"web services under your control" => "web services under your control",
 "Edit categories" => "კატეგორიების რედაქტირება",
 "Add" => "დამატება",
 "Security Warning" => "უსაფრთხოების გაფრთხილება",
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index d95daaa3a73..9f95becf6de 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -60,6 +60,7 @@
 "Share with link" => "URL 링크로 공유",
 "Password protect" => "암호 보호",
 "Password" => "암호",
+"Allow Public Upload" => "퍼블릭 업로드 허용",
 "Email link to person" => "이메일 주소",
 "Send" => "전송",
 "Set expiration date" => "만료 날짜 설정",
@@ -84,8 +85,10 @@
 "The update was successful. Redirecting you to ownCloud now." => "업데이트가 성공하였습니다. ownCloud로 돌아갑니다.",
 "ownCloud password reset" => "ownCloud 암호 재설정",
 "Use the following link to reset your password: {link}" => "다음 링크를 사용하여 암호를 재설정할 수 있습니다: {link}",
+"Request failed!<br>Did you make sure your email/username was right?" => "요청이 실패했습니다!<br>email 주소와 사용자 명을 정확하게 넣으셨나요?",
 "You will receive a link to reset your password via Email." => "이메일로 암호 재설정 링크를 보냈습니다.",
 "Username" => "사용자 이름",
+"Yes, I really want to reset my password now" => "네, 전 제 비밀번호를 리셋하길 원합니다",
 "Request reset" => "요청 초기화",
 "Your password was reset" => "암호가 재설정되었습니다",
 "To login page" => "로그인 화면으로",
@@ -98,7 +101,6 @@
 "Help" => "도움말",
 "Access forbidden" => "접근 금지됨",
 "Cloud not found" => "클라우드를 찾을 수 없습니다",
-"web services under your control" => "내가 관리하는 웹 서비스",
 "Edit categories" => "분류 수정",
 "Add" => "추가",
 "Security Warning" => "보안 경고",
diff --git a/core/l10n/ku_IQ.php b/core/l10n/ku_IQ.php
index ab46b13a500..1902e450613 100644
--- a/core/l10n/ku_IQ.php
+++ b/core/l10n/ku_IQ.php
@@ -10,7 +10,6 @@
 "Admin" => "به‌ڕێوه‌به‌ری سه‌ره‌كی",
 "Help" => "یارمەتی",
 "Cloud not found" => "هیچ نه‌دۆزرایه‌وه‌",
-"web services under your control" => "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه",
 "Add" => "زیادکردن",
 "Advanced" => "هه‌ڵبژاردنی پیشكه‌وتوو",
 "Data folder" => "زانیاری فۆڵده‌ر",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index 08cf4317d2f..96a3222093f 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -106,7 +106,6 @@
 "Access forbidden" => "Zougrëff net erlaabt",
 "Cloud not found" => "Cloud net fonnt",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hallo,\n\nech wëll just Bescheed soen dass den/d' %s,  »%s« mat dir gedeelt huet.\nKucken: %s\n\nE schéine Bonjour!",
-"web services under your control" => "Web-Servicer ënnert denger Kontroll",
 "Edit categories" => "Kategorien editéieren",
 "Add" => "Dobäisetzen",
 "Security Warning" => "Sécherheets-Warnung",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 673ee83dca0..4faf7388b23 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -101,7 +101,6 @@
 "Help" => "Pagalba",
 "Access forbidden" => "Priėjimas draudžiamas",
 "Cloud not found" => "Negalima rasti",
-"web services under your control" => "jūsų valdomos web paslaugos",
 "Edit categories" => "Redaguoti kategorijas",
 "Add" => "Pridėti",
 "Security Warning" => "Saugumo pranešimas",
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index b8bfe74c377..9552891d7d5 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -98,7 +98,6 @@
 "Help" => "Palīdzība",
 "Access forbidden" => "Pieeja ir liegta",
 "Cloud not found" => "Mākonis netika atrasts",
-"web services under your control" => "tīmekļa servisi tavā varā",
 "Edit categories" => "Rediģēt kategoriju",
 "Add" => "Pievienot",
 "Security Warning" => "Brīdinājums par drošību",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index de89403ee3c..c2b7907aa32 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -94,7 +94,6 @@
 "Help" => "Помош",
 "Access forbidden" => "Забранет пристап",
 "Cloud not found" => "Облакот не е најден",
-"web services under your control" => "веб сервиси под Ваша контрола",
 "Edit categories" => "Уреди категории",
 "Add" => "Додади",
 "Security Warning" => "Безбедносно предупредување",
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index 7a18acea7cc..4227a317582 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -44,7 +44,6 @@
 "Help" => "Bantuan",
 "Access forbidden" => "Larangan akses",
 "Cloud not found" => "Awan tidak dijumpai",
-"web services under your control" => "Perkhidmatan web di bawah kawalan anda",
 "Edit categories" => "Ubah kategori",
 "Add" => "Tambah",
 "Security Warning" => "Amaran keselamatan",
diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php
index 614c353929d..bfdff351849 100644
--- a/core/l10n/my_MM.php
+++ b/core/l10n/my_MM.php
@@ -46,7 +46,6 @@
 "Admin" => "အက်ဒမင်",
 "Help" => "အကူအညီ",
 "Cloud not found" => "မတွေ့ရှိမိပါ",
-"web services under your control" => "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services",
 "Add" => "ပေါင်းထည့်",
 "Security Warning" => "လုံခြုံရေးသတိပေးချက်",
 "Create an <strong>admin account</strong>" => "<strong>အက်ဒမင်အကောင့်</strong>တစ်ခုဖန်တီးမည်",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index d6d9675d328..6780a69a22f 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -1,5 +1,7 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s delte »%s« med deg",
 "No category to add?" => "Ingen kategorier å legge til?",
+"This category already exists: %s" => "Denne kategorien finnes allerede: %s",
 "No categories selected for deletion." => "Ingen kategorier merket for sletting.",
 "Sunday" => "Søndag",
 "Monday" => "Mandag",
@@ -40,8 +42,10 @@
 "No" => "Nei",
 "Ok" => "Ok",
 "Error" => "Feil",
+"Shared" => "Delt",
 "Share" => "Del",
 "Error while sharing" => "Feil under deling",
+"Shared with you by {owner}" => "Delt med deg av {owner}",
 "Share with" => "Del med",
 "Share with link" => "Del med link",
 "Password protect" => "Passordbeskyttet",
@@ -78,7 +82,7 @@
 "Help" => "Hjelp",
 "Access forbidden" => "Tilgang nektet",
 "Cloud not found" => "Sky ikke funnet",
-"web services under your control" => "web tjenester du kontrollerer",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hei der.⏎\n⏎\nVille bare gjøre deg oppmerksom på at %s delte %s med deg.⏎\nVis den: %s⏎\n⏎\nVI ses!",
 "Edit categories" => "Rediger kategorier",
 "Add" => "Legg til",
 "Security Warning" => "Sikkerhetsadvarsel",
@@ -101,5 +105,6 @@
 "remember" => "husk",
 "Log in" => "Logg inn",
 "prev" => "forrige",
-"next" => "neste"
+"next" => "neste",
+"Updating ownCloud to version %s, this may take a while." => "Oppdaterer ownCloud til versjon %s, dette kan ta en stund."
 );
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 7afbdde3535..9352f595e76 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -106,7 +106,6 @@
 "Access forbidden" => "Toegang verboden",
 "Cloud not found" => "Cloud niet gevonden",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hallo daar,\n\n%s deelde %s met jou.\nBekijk: %s\n\nVeel plezier!",
-"web services under your control" => "Webdiensten in eigen beheer",
 "Edit categories" => "Wijzig categorieën",
 "Add" => "Toevoegen",
 "Security Warning" => "Beveiligingswaarschuwing",
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index 67dbe32ff61..2a4902962bd 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -100,7 +100,6 @@
 "Help" => "Hjelp",
 "Access forbidden" => "Tilgang forbudt",
 "Cloud not found" => "Fann ikkje skyen",
-"web services under your control" => "Vev tjenester under din kontroll",
 "Edit categories" => "Endra kategoriar",
 "Add" => "Legg til",
 "Security Warning" => "Tryggleiksåtvaring",
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index 4440444885d..ad400aa650a 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -74,7 +74,6 @@
 "Help" => "Ajuda",
 "Access forbidden" => "Acces enebit",
 "Cloud not found" => "Nívol pas trobada",
-"web services under your control" => "Services web jos ton contraròtle",
 "Edit categories" => "Edita categorias",
 "Add" => "Ajusta",
 "Security Warning" => "Avertiment de securitat",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 98a2c6b0af2..0d7c9eb21c6 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -104,7 +104,6 @@
 "Help" => "Pomoc",
 "Access forbidden" => "Dostęp zabroniony",
 "Cloud not found" => "Nie odnaleziono chmury",
-"web services under your control" => "Kontrolowane serwisy",
 "Edit categories" => "Edytuj kategorie",
 "Add" => "Dodaj",
 "Security Warning" => "Ostrzeżenie o zabezpieczeniach",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 69a87133ff2..b36511da600 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -106,7 +106,6 @@
 "Access forbidden" => "Acesso proibido",
 "Cloud not found" => "Cloud não encontrado",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Olá,\n\napenas para você saber que %s compartilhou %s com você.\nVeja: %s\n\nAbraços!",
-"web services under your control" => "serviços web sob seu controle",
 "Edit categories" => "Editar categorias",
 "Add" => "Adicionar",
 "Security Warning" => "Aviso de Segurança",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 77c27b641d1..20208233105 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s partilhado »%s« contigo",
 "Category type not provided." => "Tipo de categoria não fornecido",
 "No category to add?" => "Nenhuma categoria para adicionar?",
 "This category already exists: %s" => "A categoria já existe: %s",
@@ -61,6 +62,7 @@
 "Share with link" => "Partilhar com link",
 "Password protect" => "Proteger com palavra-passe",
 "Password" => "Password",
+"Allow Public Upload" => "Permitir Envios Públicos",
 "Email link to person" => "Enviar o link por e-mail",
 "Send" => "Enviar",
 "Set expiration date" => "Especificar data de expiração",
@@ -89,6 +91,8 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "O pedido falhou! <br> Tem a certeza que introduziu o seu email/username correcto?",
 "You will receive a link to reset your password via Email." => "Vai receber um endereço para repor a sua password",
 "Username" => "Nome de utilizador",
+"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?" => "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
+"Yes, I really want to reset my password now" => "Sim, tenho a certeza que pretendo redefinir a minha palavra-passe agora.",
 "Request reset" => "Pedir reposição",
 "Your password was reset" => "A sua password foi reposta",
 "To login page" => "Para a página de entrada",
@@ -101,7 +105,7 @@
 "Help" => "Ajuda",
 "Access forbidden" => "Acesso interdito",
 "Cloud not found" => "Cloud nao encontrada",
-"web services under your control" => "serviços web sob o seu controlo",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Olá,\n\nApenas para lhe informar que %s partilhou %s consigo.\nVeja-o: %s\n\nCumprimentos!",
 "Edit categories" => "Editar categorias",
 "Add" => "Adicionar",
 "Security Warning" => "Aviso de Segurança",
@@ -131,6 +135,7 @@
 "remember" => "lembrar",
 "Log in" => "Entrar",
 "Alternative Logins" => "Contas de acesso alternativas",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Olá,<br><br>Apenas para lhe informar que %s partilhou »%s« consigo.<br><a href=\"%s\">Consulte-o aqui!</a><br><br>Cumprimentos!",
 "prev" => "anterior",
 "next" => "seguinte",
 "Updating ownCloud to version %s, this may take a while." => "A actualizar o ownCloud para a versão %s, esta operação pode demorar."
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 327fb72f430..6f23cea1c26 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -62,6 +62,7 @@
 "Share with link" => "Partajare cu legătură",
 "Password protect" => "Protejare cu parolă",
 "Password" => "Parolă",
+"Allow Public Upload" => "Permiteţi încărcarea publică.",
 "Email link to person" => "Expediază legătura prin poșta electronică",
 "Send" => "Expediază",
 "Set expiration date" => "Specifică data expirării",
@@ -105,7 +106,6 @@
 "Access forbidden" => "Acces interzis",
 "Cloud not found" => "Nu s-a găsit",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Salutare,\n\nVă aduc la cunoștință că %s a partajat %s cu tine.\nAccesează la: %s\n\nNumai bine!",
-"web services under your control" => "servicii web controlate de tine",
 "Edit categories" => "Editează categorii",
 "Add" => "Adaugă",
 "Security Warning" => "Avertisment de securitate",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index f3acab5be38..3369072ba87 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -62,6 +62,7 @@
 "Share with link" => "Поделиться с ссылкой",
 "Password protect" => "Защитить паролем",
 "Password" => "Пароль",
+"Allow Public Upload" => "Разрешить открытую загрузку",
 "Email link to person" => "Почтовая ссылка на персону",
 "Send" => "Отправить",
 "Set expiration date" => "Установить срок доступа",
@@ -105,7 +106,6 @@
 "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Удачи!",
-"web services under your control" => "веб-сервисы под вашим управлением",
 "Edit categories" => "Редактировать категрии",
 "Add" => "Добавить",
 "Security Warning" => "Предупреждение безопасности",
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index b27f1c6c985..21038a93e88 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -66,7 +66,6 @@
 "Help" => "උදව්",
 "Access forbidden" => "ඇතුල් වීම තහනම්",
 "Cloud not found" => "සොයා ගත නොහැක",
-"web services under your control" => "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්",
 "Edit categories" => "ප්‍රභේදයන් සංස්කරණය",
 "Add" => "එකතු කරන්න",
 "Security Warning" => "ආරක්ෂක නිවේදනයක්",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index ead3842e452..582296139ec 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -62,6 +62,7 @@
 "Share with link" => "Zdieľať cez odkaz",
 "Password protect" => "Chrániť heslom",
 "Password" => "Heslo",
+"Allow Public Upload" => "Povoliť verejné nahrávanie",
 "Email link to person" => "Odoslať odkaz emailom",
 "Send" => "Odoslať",
 "Set expiration date" => "Nastaviť dátum expirácie",
@@ -90,6 +91,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Požiadavka zlyhala.<br>Uistili ste sa, že Vaše používateľské meno a email sú správne?",
 "You will receive a link to reset your password via Email." => "Odkaz pre obnovenie hesla obdržíte e-mailom.",
 "Username" => "Meno používateľa",
+"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 súbory sú šifrované. Ak nemáte povolený kľúč obnovy, nie je spôsob, ako získať po obnove hesla Vaše dáta. Ak nie ste si isí tým, čo robíte, obráťte sa najskôr na administrátora. Naozaj chcete pokračovať?",
 "Yes, I really want to reset my password now" => "Áno, želám si teraz obnoviť svoje heslo",
 "Request reset" => "Požiadať o obnovenie",
 "Your password was reset" => "Vaše heslo bolo obnovené",
@@ -104,7 +106,6 @@
 "Access forbidden" => "Prístup odmietnutý",
 "Cloud not found" => "Nenájdené",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ahoj,\n\nChcem Vám oznámiť, že %s s Vami zdieľa %s.\nPozrieť si to môžete tu: %s\n\nVďaka",
-"web services under your control" => "webové služby pod Vašou kontrolou",
 "Edit categories" => "Upraviť kategórie",
 "Add" => "Pridať",
 "Security Warning" => "Bezpečnostné varovanie",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index bbe7554245d..548a5a3f515 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -106,7 +106,6 @@
 "Access forbidden" => "Dostop je prepovedan",
 "Cloud not found" => "Oblaka ni mogoče najti",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Pozdravljen/a,⏎\n⏎\nsporočam, da je %s delil %s s teboj.⏎\nPoglej na: %s⏎\n⏎\nLep pozdrav!",
-"web services under your control" => "spletne storitve pod vašim nadzorom",
 "Edit categories" => "Uredi kategorije",
 "Add" => "Dodaj",
 "Security Warning" => "Varnostno opozorilo",
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index f5d7d933768..4e6c458f4df 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -100,7 +100,6 @@
 "Help" => "Ndihmë",
 "Access forbidden" => "Ndalohet hyrja",
 "Cloud not found" => "Cloud-i nuk u gjet",
-"web services under your control" => "shërbime web nën kontrollin tënd",
 "Edit categories" => "Ndrysho kategoritë",
 "Add" => "Shto",
 "Security Warning" => "Paralajmërim sigurie",
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index a85e1bfb7e1..d68012c505f 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -93,7 +93,6 @@
 "Help" => "Помоћ",
 "Access forbidden" => "Забрањен приступ",
 "Cloud not found" => "Облак није нађен",
-"web services under your control" => "веб сервиси под контролом",
 "Edit categories" => "Измени категорије",
 "Add" => "Додај",
 "Security Warning" => "Сигурносно упозорење",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index bb79e67d959..1c84c624674 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -83,7 +83,7 @@
 "Error setting expiration date" => "Fel vid sättning av utgångsdatum",
 "Sending ..." => "Skickar ...",
 "Email sent" => "E-post skickat",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Uppdateringen misslyckades. Rapportera detta problem till <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-gemenskapen</a>.",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Uppdateringen misslyckades. Rapportera detta problem till <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud.",
 "ownCloud password reset" => "ownCloud lösenordsåterställning",
 "Use the following link to reset your password: {link}" => "Använd följande länk för att återställa lösenordet: {link}",
@@ -106,7 +106,6 @@
 "Access forbidden" => "Åtkomst förbjuden",
 "Cloud not found" => "Hittade inget moln",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hej där,⏎\n⏎\nville bara meddela dig att %s delade %s med dig.⏎\nTitta på den: %s⏎\n⏎\nVi hörs!",
-"web services under your control" => "webbtjänster under din kontroll",
 "Edit categories" => "Editera kategorier",
 "Add" => "Lägg till",
 "Security Warning" => "Säkerhetsvarning",
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index 0770805ddf5..e593018aaad 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -90,7 +90,6 @@
 "Help" => "உதவி",
 "Access forbidden" => "அணுக தடை",
 "Cloud not found" => "Cloud காணப்படவில்லை",
-"web services under your control" => "வலைய சேவைகள் உங்களுடைய கட்டுப்பாட்டின் கீழ் உள்ளது",
 "Edit categories" => "வகைகளை தொகுக்க",
 "Add" => "சேர்க்க",
 "Security Warning" => "பாதுகாப்பு எச்சரிக்கை",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 83642ed89cb..392da561bf8 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -97,7 +97,6 @@
 "Help" => "ช่วยเหลือ",
 "Access forbidden" => "การเข้าถึงถูกหวงห้าม",
 "Cloud not found" => "ไม่พบ Cloud",
-"web services under your control" => "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้",
 "Edit categories" => "แก้ไขหมวดหมู่",
 "Add" => "เพิ่ม",
 "Security Warning" => "คำเตือนเกี่ยวกับความปลอดภัย",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index f6112040c50..b8701abffa1 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s  sizinle »%s« paylaşımında bulundu",
 "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",
@@ -61,6 +62,7 @@
 "Share with link" => "Bağlantı ile paylaş",
 "Password protect" => "Şifre korunması",
 "Password" => "Parola",
+"Allow Public Upload" => "Herkes tarafından yüklemeye izin ver",
 "Email link to person" => "Kişiye e-posta linki",
 "Send" => "Gönder",
 "Set expiration date" => "Son kullanma tarihini ayarla",
@@ -89,6 +91,8 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Isteği başarısız oldu!<br>E-posta / kullanıcı adınızı doğru olduğundan emin misiniz?",
 "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.",
 "Username" => "Kullanıcı Adı",
+"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?" => "Dosyalarınız şifrelenmiş. Eğer kurtarma anahtarını aktif etmediyseniz parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak. Eğer ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile irtibata geçiniz. Gerçekten devam etmek istiyor musunuz?",
+"Yes, I really want to reset my password now" => "Evet,Şu anda parolamı sıfırlamak istiyorum.",
 "Request reset" => "Sıfırlama iste",
 "Your password was reset" => "Parolanız sıfırlandı",
 "To login page" => "Giriş sayfasına git",
@@ -101,7 +105,7 @@
 "Help" => "Yardım",
 "Access forbidden" => "Erişim yasaklı",
 "Cloud not found" => "Bulut bulunamadı",
-"web services under your control" => "Bilgileriniz güvenli ve şifreli",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Merhaba\n\n%s sizinle %s dosyasını paylaştığı\nPaylaşımı gör:%s\n\nİyi günler!",
 "Edit categories" => "Kategorileri düzenle",
 "Add" => "Ekle",
 "Security Warning" => "Güvenlik Uyarisi",
@@ -131,6 +135,7 @@
 "remember" => "hatırla",
 "Log in" => "Giriş yap",
 "Alternative Logins" => "Alternatif Girişler",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Merhaba, <br><br> %s sizinle »%s« paylaşımında bulundu.<br><a href=\"%s\">Paylaşımı gör!</a><br><br>İyi günler!",
 "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 11ebda3af89..8e67a470956 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -98,7 +98,6 @@
 "Help" => "Допомога",
 "Access forbidden" => "Доступ заборонено",
 "Cloud not found" => "Cloud не знайдено",
-"web services under your control" => "підконтрольні Вам веб-сервіси",
 "Edit categories" => "Редагувати категорії",
 "Add" => "Додати",
 "Security Warning" => "Попередження про небезпеку",
diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php
index 0e0489bf33d..b27033b80e8 100644
--- a/core/l10n/ur_PK.php
+++ b/core/l10n/ur_PK.php
@@ -55,7 +55,6 @@
 "Help" => "مدد",
 "Access forbidden" => "پہنچ کی اجازت نہیں",
 "Cloud not found" => "نہیں مل سکا",
-"web services under your control" => "آپ کے اختیار میں ویب سروسیز",
 "Edit categories" => "زمرہ جات کی تدوین کریں",
 "Add" => "شامل کریں",
 "Create an <strong>admin account</strong>" => "ایک<strong> ایڈمن اکاؤنٹ</strong> بنائیں",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index ebe6c7006ff..37ed47de765 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -100,7 +100,6 @@
 "Help" => "Giúp đỡ",
 "Access forbidden" => "Truy cập bị cấm",
 "Cloud not found" => "Không tìm thấy Clound",
-"web services under your control" => "dịch vụ web dưới sự kiểm soát của bạn",
 "Edit categories" => "Sửa chuyên mục",
 "Add" => "Thêm",
 "Security Warning" => "Cảnh bảo bảo mật",
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
index b4cc129964b..237f0bb14bb 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -97,7 +97,6 @@
 "Help" => "帮助",
 "Access forbidden" => "禁止访问",
 "Cloud not found" => "云 没有被找到",
-"web services under your control" => "您控制的网络服务",
 "Edit categories" => "编辑分类",
 "Add" => "添加",
 "Security Warning" => "安全警告",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 80815b508ce..0c73fe31b3f 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -106,7 +106,6 @@
 "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",
-"web services under your control" => "您控制的web服务",
 "Edit categories" => "编辑分类",
 "Add" => "增加",
 "Security Warning" => "安全警告",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index 306ae7acb8c..f093a687f82 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s 與您分享了 %s",
 "Category type not provided." => "未提供分類類型。",
 "No category to add?" => "沒有可增加的分類？",
 "This category already exists: %s" => "分類已經存在： %s",
@@ -61,6 +62,7 @@
 "Share with link" => "使用連結分享",
 "Password protect" => "密碼保護",
 "Password" => "密碼",
+"Allow Public Upload" => "允許任何人上傳",
 "Email link to person" => "將連結 email 給別人",
 "Send" => "寄出",
 "Set expiration date" => "設置到期日",
@@ -87,8 +89,9 @@
 "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 ." => "重設密碼的連結已經寄至您的電子郵件信箱，如果您過了一段時間還是沒有收到它，請檢查看看它是不是被放到垃圾郵件了，如果還是沒有的話，請聯絡您的 ownCloud 系統管理員。",
 "Request failed!<br>Did you make sure your email/username was right?" => "請求失敗！<br>您確定填入的電子郵件地址或是帳號名稱是正確的嗎？",
-"You will receive a link to reset your password via Email." => "重設密碼的連結將會寄到你的電子郵件信箱。",
+"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" => "您的密碼已重設",
@@ -102,7 +105,7 @@
 "Help" => "說明",
 "Access forbidden" => "存取被拒",
 "Cloud not found" => "未發現雲端",
-"web services under your control" => "由您控制的網路服務",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "嗨，\n\n通知您，%s 與您分享了 %s 。\n看一下：%s",
 "Edit categories" => "編輯分類",
 "Add" => "增加",
 "Security Warning" => "安全性警告",
@@ -132,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><a href=\"%s\">看一下吧</a>",
 "prev" => "上一頁",
 "next" => "下一頁",
 "Updating ownCloud to version %s, this may take a while." => "正在將 Owncloud 升級至版本 %s ，這可能需要一點時間。"
diff --git a/core/templates/altmail.php b/core/templates/altmail.php
index a7df29a2446..2551473c6f0 100644
--- a/core/templates/altmail.php
+++ b/core/templates/altmail.php
@@ -1,9 +1,7 @@
 <?php
-$defaults = new OC_Defaults();
-
 print_unescaped($l->t("Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!", array($_['user_displayname'], $_['filename'], $_['link'])));
 ?>
 
 --
-<?php p($defaults->getName() . ' - ' . $defaults->getSlogan()); ?>
-<?php print_unescaped("\n".$defaults->getBaseUrl());
+<?php p($theme->getName() . ' - ' . $theme->getSlogan()); ?>
+<?php print_unescaped("\n".$theme->getBaseUrl());
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 7f2796a4b31..6de67a83d42 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -23,7 +23,7 @@
 	<fieldset class="warning">
 		<legend><strong><?php p($l->t('Security Warning'));?></strong></legend>
 		<p><?php p($l->t('Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)'));?><br/>
-		<?php p($l->t('Please update your PHP installation to use ownCloud securely.'));?></p>
+		<?php p($l->t('Please update your PHP installation to use %s securely.', $theme->getName() )); ?></p>
 	</fieldset>
 	<?php endif; ?>
 	<?php if(!$_['secureRNG']): ?>
@@ -37,7 +37,10 @@
 	<fieldset class="warning">
 		<legend><strong><?php p($l->t('Security Warning'));?></strong></legend>
 		<p><?php p($l->t('Your data directory and files are probably accessible from the internet because the .htaccess file does not work.'));?><br>
-		<?php print_unescaped($l->t('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>.'));?></p>
+		<?php print_unescaped($l->t(
+			'For information how to properly configure your server, please see the <a href="%s" target="_blank">documentation</a>.',
+			$theme->getDocBaseUrl().'/server/5.0/admin_manual/installation.html'
+		)); ?></p>
 	</fieldset>
 	<?php endif; ?>
 	<fieldset id="adminaccount">
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index 09e1006d507..ea10c3042b5 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -6,11 +6,9 @@
 <!--[if gt IE 9]><html class="ng-csp ie"><![endif]-->
 <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]-->
 
-	<?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?>
-
 	<head>
 		<title>
-		<?php p($defaults->getName()); ?>
+		<?php p($theme->getTitle()); ?>
 		</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" />
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 329744e3824..9c9eb63382f 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -6,11 +6,9 @@
 <!--[if gt IE 9]><html class="ng-csp ie"><![endif]-->
 <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]-->
 
-	<?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?>
-
 	<head data-requesttoken="<?php p($_['requesttoken']); ?>">
 		<title>
-		<?php p($defaults->getName()); ?>
+		<?php p($theme->getTitle()); ?>
 		</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta name="apple-itunes-app" content="app-id=543672169">
@@ -22,7 +20,7 @@
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php print_unescaped($jsfile); ?>"></script>
 		<?php endforeach; ?>
-	
+
 		<?php foreach($_['headers'] as $header): ?>
 			<?php
 				print_unescaped('<'.$header['tag'].' ');
@@ -35,16 +33,21 @@
 	</head>
 
 	<body id="body-login">
-		<div id="login">
+		<div class="wrapper"><!-- for sticky footer -->
 			<header><div id="header">
-				<img src="<?php print_unescaped(image_path('', 'logo.svg')); ?>" class="svg" alt="ownCloud" />
-				<div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div>
+				<img src="<?php print_unescaped(image_path('', 'logo.svg')); ?>" class="svg" alt="<?php p($theme->getName()); ?>" />
+				<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
 			</div></header>
+
 			<?php print_unescaped($_['content']); ?>
+
+			<div class="push"></div><!-- for sticky footer -->
 		</div>
+
 		<footer>
 			<p class="info">
-				<?php print_unescaped($defaults->getLongFooter()); ?>
-			</p></footer>
+				<?php print_unescaped($theme->getLongFooter()); ?>
+			</p>
+		</footer>
 	</body>
 </html>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index dacbe79bd34..b7405ea273b 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -6,12 +6,10 @@
 <!--[if gt IE 9]><html class="ng-csp ie"><![endif]-->
 <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]-->
 
-	<?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?>
-	
 	<head data-user="<?php p($_['user_uid']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>">
 		<title>
 			<?php p(!empty($_['application'])?$_['application'].' | ':'');
-			p($defaults->getName());
+			p($theme->getTitle());
 			p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?>
 		</title>
 		<meta charset="utf-8">
@@ -45,8 +43,8 @@
 	</div>
 	<header><div id="header">
 			<a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg"
-				src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="ownCloud" /></a>
-			<div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div>
+				src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="<?php p($theme->getName()); ?>" /></a>
+			<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
 			<ul id="settings" class="svg">
 				<span id="expand" tabindex="0" role="link">
 					<span id="expandDisplayName"><?php  p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span>
diff --git a/core/templates/login.php b/core/templates/login.php
index 571e0a865d9..9143510f757 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -35,8 +35,8 @@
 		</a>
 		<?php endif; ?>
 
-		<input type="checkbox" name="remember_login" value="1" id="remember_login"/><label
-			for="remember_login"><?php p($l->t('remember')); ?></label>
+		<input type="checkbox" name="remember_login" value="1" id="remember_login" checked />
+		<label for="remember_login"><?php p($l->t('remember')); ?></label>
 		<input type="hidden" name="timezone-offset" id="timezone-offset"/>
 		<input type="submit" id="submit" class="login primary" value="<?php p($l->t('Log in')); ?>"/>
 	</fieldset>
diff --git a/core/templates/mail.php b/core/templates/mail.php
index 562ad82e953..de72b136b13 100644
--- a/core/templates/mail.php
+++ b/core/templates/mail.php
@@ -1,11 +1,10 @@
-<?php $defaults = new OC_Defaults() // initialize themable default strings and urls ?>
 <table cellspacing="0" cellpadding="0" border="0" width="100%">
 <tr><td>
 <table cellspacing="0" cellpadding="0" border="0" width="600px">
 <tr>
 <td bgcolor="#1d2d44" width="20px">&nbsp;</td>
 <td bgcolor="#1d2d44">
-<img src="<?php print_unescaped(OC_Helper::makeURLAbsolute(image_path('', 'logo-mail.gif'))); ?>" alt="ownCloud"/>
+<img src="<?php print_unescaped(OC_Helper::makeURLAbsolute(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($theme->getName()); ?>"/>
 </td>
 </tr>
 <tr><td bgcolor="#f8f8f8" colspan="2">&nbsp;</td></tr>
@@ -21,9 +20,9 @@ print_unescaped($l->t('Hey there,<br><br>just letting you know that %s shared »
 <tr>
 <td bgcolor="#f8f8f8" width="20px">&nbsp;</td>
 <td bgcolor="#f8f8f8" style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br>
-<?php p($defaults->getName()); ?> -
-<?php p($defaults->getSlogan()); ?>
-<br><a href="<?php print_unescaped($defaults->getBaseUrl()); ?>"><?php print_unescaped($defaults->getBaseUrl());?></a></td>
+<?php p($theme->getName()); ?> -
+<?php p($theme->getSlogan()); ?>
+<br><a href="<?php print_unescaped($theme->getBaseUrl()); ?>"><?php print_unescaped($theme->getBaseUrl());?></a></td>
 </tr>
 <tr>
 <td bgcolor="#f8f8f8" colspan="2">&nbsp;</td>
author	kondou <kondou@ts.unde.re>	2013-07-24 20:35:00 +0200
committer	kondou <kondou@ts.unde.re>	2013-07-24 20:35:00 +0200
commit	92af840a51c51440eb6f55d841b47c1b3f5a1b69 (patch)
tree	1d0fcd7ef38bb121d1710068cf4ef42cc0a9518d /core
parent	4818e0062e5444a9b657a30001b6dbaca44413c7 (diff)
parent	ff86b6f1346be9eb90ad82ae49742d22d4ee3e9d (diff)
download	nextcloud-server-92af840a51c51440eb6f55d841b47c1b3f5a1b69.tar.gz nextcloud-server-92af840a51c51440eb6f55d841b47c1b3f5a1b69.zip