Merge master into oc_preview

31 files changed, 489 insertions, 317 deletions

diff --git a/core/ajax/share.php b/core/ajax/share.php
index d3c6a8456a6..648f0a71bd4 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -181,10 +181,10 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 // 						}
 // 					}
 // 				}
+				$groups = OC_Group::getGroups($_GET['search']);
 				if ($sharePolicy == 'groups_only') {
-					$groups = OC_Group::getUserGroups(OC_User::getUser());
-				} else {
-					$groups = OC_Group::getGroups();
+					$usergroups = OC_Group::getUserGroups(OC_User::getUser());
+					$groups = array_intersect($groups, $usergroups);
 				}
 				$count = 0;
 				$users = array();
@@ -219,11 +219,10 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 				
 				foreach ($groups as $group) {
 					if ($count < 15) {
-						if (stripos($group, $_GET['search']) !== false
-							&& (!isset($_GET['itemShares'])
+						if (!isset($_GET['itemShares'])
 							|| !isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])
 							|| !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])
-							|| !in_array($group, $_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP]))) {
+							|| !in_array($group, $_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])) {
 							$shareWith[] = array(
 								'label' => $group.' ('.$l->t('group').')',
 								'value' => array(
diff --git a/core/css/apps.css b/core/css/apps.css
new file mode 100644
index 00000000000..445a3b9b59f
--- /dev/null
+++ b/core/css/apps.css
@@ -0,0 +1,236 @@
+/* ---- APP STYLING ---- */
+
+#app {
+	height: 100%;
+	width: 100%;
+}
+#app * {
+	-moz-box-sizing: border-box; box-sizing: border-box;
+}
+
+/* Navigation: folder like structure */
+#app-navigation {
+	width: 300px;
+	height: 100%;
+	float: left;
+	-moz-box-sizing: border-box; box-sizing: border-box;
+	background-color: #f8f8f8;
+	border-right: 1px solid #ccc;
+}
+#app-navigation > ul {
+	height: 100%;
+	overflow: auto;
+	-moz-box-sizing: border-box; box-sizing: border-box;
+}
+#app-navigation li {
+	position: relative;
+	width: 100%;
+	-moz-box-sizing: border-box; box-sizing: border-box;
+	text-shadow: 0 1px 0 rgba(255,255,255,.9);
+}
+#app-navigation .active,
+#app-navigation .active a,
+#app-navigation li:hover > a {
+	background-color: #ddd;
+	text-shadow: 0 1px 0 rgba(255,255,255,.7);
+}
+
+/* special rules for first-level entries and folders */
+#app-navigation > ul > li {
+	background-color: #f8f8f8;
+}
+
+#app-navigation .with-icon a {
+	padding-left: 44px;
+	background-size: 16px 16px;
+	background-position: 14px center;
+	background-repeat: no-repeat;
+}
+
+#app-navigation li > a {
+	display: block;
+	width: 100%;
+	height: 44px;
+	padding: 12px;
+	overflow: hidden;
+	-moz-box-sizing: border-box; box-sizing: border-box;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	color: #333;
+}
+
+#app-navigation .collapse {
+	display: none; /* hide collapse button intially */
+}
+#app-navigation .collapsible > .collapse {
+	position: absolute;
+	height: 44px;
+	width: 44px;
+	margin: 0;
+	padding: 0;
+	background: none; background-image: url('../img/actions/triangle-s.svg');
+	background-size: 16px; background-repeat: no-repeat; background-position: center;
+	border: none;
+	border-radius: 0;
+	outline: none !important;
+	box-shadow: none;
+}
+#app-navigation .collapsible:hover > a {
+	background-image: none;
+}
+#app-navigation .collapsible:hover > .collapse {
+	display: block;
+}
+
+#app-navigation .collapsible .collapse {
+	-moz-transform: rotate(-90deg);
+	-webkit-transform: rotate(-90deg);
+	-ms-transform:rotate(-90deg);
+	-o-transform:rotate(-90deg);
+	transform: rotate(-90deg);
+}
+#app-navigation .collapsible.open .collapse {
+	-moz-transform: rotate(0);
+	-webkit-transform: rotate(0);
+	-ms-transform:rotate(0);
+	-o-transform:rotate(0);
+	transform: rotate(0);
+}
+
+/* Second level nesting for lists */
+#app-navigation > ul ul {
+	display: none;
+}
+#app-navigation > ul ul li > a {
+	padding-left: 32px;
+}
+#app-navigation > .with-icon ul li > a {
+	padding-left: 48px;
+	background-position: 24px center;
+}
+
+#app-navigation .open {
+	background-image: linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
+	background-image: -o-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
+	background-image: -moz-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
+	background-image: -webkit-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
+	background-image: -ms-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
+}
+
+#app-navigation > ul .open:hover {
+	-moz-box-shadow: inset 0 0 3px #ccc; -webkit-box-shadow: inset 0 0 3px #ccc; box-shadow: inset 0 0 3px #ccc;
+}
+
+#app-navigation > ul .open ul {
+	display: block;
+}
+
+
+/* counter and actions */
+#app-navigation .utils {
+	position: absolute;
+	right: 0;
+	top: 0;
+	bottom: 0;
+	font-size: 12px;
+}
+	#app-navigation .utils button,
+	#app-navigation .utils .counter {
+		width: 44px;
+		height: 44px;
+		padding-top: 12px;
+	}
+
+
+/* drag and drop */
+#app-navigation .drag-and-drop {
+	-moz-transition: padding-bottom 500ms ease 0s;
+	-o-transition: padding-bottom 500ms ease 0s;
+	-webkit-transition: padding-bottom 500ms ease 0s;
+	-ms-transition: padding-bottom 500ms ease 0s;
+	transition: padding-bottom 500ms ease 0s;
+	padding-bottom: 40px;
+}
+#app-navigation .personalblock > legend { /* TODO @Raydiation: still needed? */
+	padding: 10px 0; margin: 0;
+}
+#app-navigation .error {
+	color: #dd1144;
+}
+
+#app-navigation .app-navigation-separator {
+	border-bottom: 1px solid #ddd;
+}
+
+
+
+/* Part where the content will be loaded into */
+#app-content {
+	height: 100%;
+	overflow-y: auto;
+}
+
+/* settings area */
+#app-settings {
+	position: fixed;
+	width: 299px;
+	bottom: 0;
+	border-top: 1px solid #ccc;
+}
+#app-settings-header {
+	background-color: #eee;
+}
+#app-settings-content {
+	display: none;
+	padding: 10px;
+	background-color: #eee;
+}
+#app-settings.open #app-settings-content {
+	display: block;
+}
+
+.settings-button {
+	display: block;
+	height: 32px;
+	width: 100%;
+	padding: 0;
+	margin: 0;
+	background-color: transparent; background-image: url('../img/actions/settings.svg');
+	background-position: 10px center; background-repeat: no-repeat;
+	box-shadow: none;
+	border: 0;
+	border-radius: 0;
+}
+.settings-button:hover {
+	background-color: #ddd;
+}
+
+/* icons */
+.folder-icon, .delete-icon, .edit-icon, .progress-icon {
+	background-repeat: no-repeat;
+	background-position: center;
+}
+.folder-icon { background-image: url('../img/places/folder.svg'); }
+.delete-icon { background-image: url('../img/actions/delete.svg'); }
+.delete-icon:hover, .delete-icon:focus {
+	background-image: url('../img/actions/delete-hover.svg');
+}
+.edit-icon { background-image: url('../img/actions/rename.svg'); }
+.progress-icon {
+	background-image: url('../img/loading.gif');
+	background-size: 16px;
+	/* force show the loading icon, not only on hover */
+	-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+	filter:alpha(opacity=100);
+	opacity: 1 !important;
+	display: inline !important;
+}
+
+/* buttons */
+button.loading {
+	background-image: url('../img/loading.gif');
+	background-position: right 10px center; background-repeat: no-repeat;
+	background-size: 16px;
+	padding-right: 30px;
+}
+
diff --git a/core/css/fixes.css b/core/css/fixes.css
new file mode 100644
index 00000000000..3df60ad5b5c
--- /dev/null
+++ b/core/css/fixes.css
@@ -0,0 +1,46 @@
+/* ---- BROWSER-SPECIFIC FIXES ---- */
+
+/* remove dotted outlines in Firefox */
+::-moz-focus-inner {
+	border: 0;
+}
+
+.lte8 .delete-icon { background-image: url('../img/actions/delete.png'); }
+.lte8 .delete-icon:hover, .delete-icon:focus {
+	background-image: url('../img/actions/delete-hover.png');
+}
+
+/* IE8 needs background to be set to same color to make transparency look good. */
+.lte9 #body-login form input[type="text"] {
+	border: 1px solid lightgrey; /* use border to add 1px line between input fields */
+	background-color: white; /* don't change background on hover */
+}
+.lte9 #body-login form input[type="password"] {
+	/* leave out top border for 1px line between input fields*/
+	border-left: 1px solid lightgrey;
+	border-right: 1px solid lightgrey;
+	border-bottom: 1px solid lightgrey;
+	background-color: white; /* don't change background on hover */
+}
+.lte9 #body-login form label.infield {
+	background-color: white; /* don't change background on hover */
+	-ms-filter: "progid:DXImageTransform.Microsoft.Chroma(color='white')";
+}
+
+/* disable opacity of info text on gradient
+   since we cannot set a good backround color to use the filter&background hack as with the input labels */
+.lte9 #body-login p.info {
+	filter: initial;
+}
+
+/* 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/css/styles.css b/core/css/styles.css
index 8dc1bc2e6ac..85f65a2f427 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -502,6 +502,9 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
 #navigation:hover {
 	overflow-y: auto; /* show scrollbar only on hover */
 }
+#apps {
+	height: 100%;
+}
 #navigation a span {
 	display: block;
 	text-decoration: none;
@@ -546,9 +549,24 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
 		padding-top: 20px;
 	}
 
+/* Apps management as sticky footer, less obtrusive in the list */
+#navigation .wrapper {
+	min-height: 100%;
+	margin: 0 auto -72px;
+}
+#apps-management, #navigation .push {
+	height: 70px;
+}
 #apps-management {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
+	filter: alpha(opacity=60);
 	opacity: .6;
 }
+#apps-management .icon {
+	padding-bottom: 0;
+}
+
+
 
 
 /* USER MENU */
@@ -710,286 +728,3 @@ div.crumb:active {
 	opacity:.7;
 }
 
-
-
-/* ---- APP STYLING ---- */
-#app {
-	height: 100%;
-	width: 100%;
-}
-#app * {
-	-moz-box-sizing: border-box; box-sizing: border-box;
-}
-
-/* Navigation: folder like structure */
-#app-navigation {
-	width: 300px;
-	height: 100%;
-	float: left;
-	-moz-box-sizing: border-box; box-sizing: border-box;
-	background-color: #f8f8f8;
-	border-right: 1px solid #ccc;
-}
-#app-navigation > ul {
-	height: 100%;
-	overflow: auto;
-	-moz-box-sizing: border-box; box-sizing: border-box;
-}
-#app-navigation li {
-	position: relative;
-	width: 100%;
-	-moz-box-sizing: border-box; box-sizing: border-box;
-	text-shadow: 0 1px 0 rgba(255,255,255,.9);
-}
-#app-navigation .active,
-#app-navigation .active a,
-#app-navigation li:hover > a {
-	background-color: #ddd;
-	text-shadow: 0 1px 0 rgba(255,255,255,.7);
-}
-
-/* special rules for first-level entries and folders */
-#app-navigation > ul > li {
-	background-color: #f8f8f8;
-}
-
-#app-navigation .with-icon a {
-	padding-left: 44px;
-	background-size: 16px 16px;
-	background-position: 14px center;
-	background-repeat: no-repeat;
-}
-
-#app-navigation li > a {
-	display: block;
-	width: 100%;
-	height: 44px;
-	padding: 12px;
-	overflow: hidden;
-	-moz-box-sizing: border-box; box-sizing: border-box;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-	color: #333;
-}
-
-#app-navigation .collapse {
-	display: none; /* hide collapse button intially */
-}
-#app-navigation .collapsible > .collapse {
-	position: absolute;
-	height: 44px;
-	width: 44px;
-	margin: 0;
-	padding: 0;
-	background: none; background-image: url('../img/actions/triangle-s.svg');
-	background-size: 16px; background-repeat: no-repeat; background-position: center;
-	border: none;
-	border-radius: 0;
-	outline: none !important;
-	box-shadow: none;
-}
-#app-navigation .collapsible:hover > a {
-	background-image: none;
-}
-#app-navigation .collapsible:hover > .collapse {
-	display: block;
-}
-
-#app-navigation .collapsible .collapse {
-	-moz-transform: rotate(-90deg);
-	-webkit-transform: rotate(-90deg);
-	-ms-transform:rotate(-90deg);
-	-o-transform:rotate(-90deg);
-	transform: rotate(-90deg);
-}
-#app-navigation .collapsible.open .collapse {
-	-moz-transform: rotate(0);
-	-webkit-transform: rotate(0);
-	-ms-transform:rotate(0);
-	-o-transform:rotate(0);
-	transform: rotate(0);
-}
-
-/* Second level nesting for lists */
-#app-navigation > ul ul {
-	display: none;
-}
-#app-navigation > ul ul li > a {
-	padding-left: 32px;
-}
-#app-navigation > .with-icon ul li > a {
-	padding-left: 48px;
-	background-position: 24px center;
-}
-
-#app-navigation .open {
-	background-image: linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
-	background-image: -o-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
-	background-image: -moz-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
-	background-image: -webkit-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
-	background-image: -ms-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
-}
-
-#app-navigation > ul .open:hover {
-	-moz-box-shadow: inset 0 0 3px #ccc; -webkit-box-shadow: inset 0 0 3px #ccc; box-shadow: inset 0 0 3px #ccc;
-}
-
-#app-navigation > ul .open ul {
-	display: block;
-}
-
-
-/* counter and actions */
-#app-navigation .utils {
-	position: absolute;
-	right: 0;
-	top: 0;
-	bottom: 0;
-	font-size: 12px;
-}
-	#app-navigation .utils button,
-	#app-navigation .utils .counter {
-		width: 44px;
-		height: 44px;
-		padding-top: 12px;
-	}
-
-
-/* drag and drop */
-#app-navigation .drag-and-drop {
-	-moz-transition: padding-bottom 500ms ease 0s;
-	-o-transition: padding-bottom 500ms ease 0s;
-	-webkit-transition: padding-bottom 500ms ease 0s;
-	-ms-transition: padding-bottom 500ms ease 0s;
-	transition: padding-bottom 500ms ease 0s;
-	padding-bottom: 40px;
-}
-#app-navigation .personalblock > legend { /* TODO @Raydiation: still needed? */
-	padding: 10px 0; margin: 0;
-}
-#app-navigation .error {
-	color: #dd1144;
-}
-
-#app-navigation .app-navigation-separator {
-	border-bottom: 1px solid #ddd;
-}
-
-
-
-/* Part where the content will be loaded into */
-#app-content {
-	height: 100%;
-	overflow-y: auto;
-}
-
-/* settings area */
-#app-settings {
-	position: fixed;
-	width: 299px;
-	bottom: 0;
-	border-top: 1px solid #ccc;
-}
-#app-settings-header {
-	background-color: #eee;
-}
-#app-settings-content {
-	display: none;
-	padding: 10px;
-	background-color: #eee;
-}
-#app-settings.open #app-settings-content {
-	display: block;
-}
-
-.settings-button {
-	display: block;
-	height: 32px;
-	width: 100%;
-	padding: 0;
-	margin: 0;
-	background-color: transparent; background-image: url('../img/actions/settings.svg');
-	background-position: 10px center; background-repeat: no-repeat;
-	box-shadow: none;
-	border: 0;
-	border-radius: 0;
-}
-.settings-button:hover {
-	background-color: #ddd;
-}
-
-/* icons */
-.folder-icon, .delete-icon, .edit-icon, .progress-icon {
-	background-repeat: no-repeat;
-	background-position: center;
-}
-.folder-icon { background-image: url('../img/places/folder.svg'); }
-.delete-icon { background-image: url('../img/actions/delete.svg'); }
-.delete-icon:hover, .delete-icon:focus {
-	background-image: url('../img/actions/delete-hover.svg');
-}
-.edit-icon { background-image: url('../img/actions/rename.svg'); }
-.progress-icon {
-	background-image: url('../img/loading.gif');
-	background-size: 16px;
-	/* force show the loading icon, not only on hover */
-	-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
-	filter:alpha(opacity=100);
-	opacity: 1 !important;
-	display: inline !important;
-}
-
-/* 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;
-}
-.lte8 .delete-icon { background-image: url('../img/actions/delete.png'); }
-.lte8 .delete-icon:hover, .delete-icon:focus {
-	background-image: url('../img/actions/delete-hover.png');
-}
-
-/* IE8 needs background to be set to same color to make transparency look good. */
-.lte9 #body-login form input[type="text"] {
-	border: 1px solid lightgrey; /* use border to add 1px line between input fields */
-	background-color: white; /* don't change background on hover */
-}
-.lte9 #body-login form input[type="password"] {
-	/* leave out top border for 1px line between input fields*/
-	border-left: 1px solid lightgrey;
-	border-right: 1px solid lightgrey;
-	border-bottom: 1px solid lightgrey;
-	background-color: white; /* don't change background on hover */
-}
-.lte9 #body-login form label.infield {
-	background-color: white; /* don't change background on hover */
-	-ms-filter: "progid:DXImageTransform.Microsoft.Chroma(color='white')";
-}
-/* disable opacity of info text on gradient
-   sice we cannot set a good backround color to use the filter&background hack as with the input labels */
-.lte9 #body-login p.info {
-	filter: initial;
-}
-/* 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/l10n/ca.php b/core/l10n/ca.php
index abff5bbbdb4..c389ad01883 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -126,7 +126,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Acaba la configuració",
 "%s is available. Get more information on how to update." => "%s està disponible. Obtingueu més informació de com actualitzar.",
 "Log out" => "Surt",
-"More apps" => "Més aplicacions",
 "Automatic logon rejected!" => "L'ha rebutjat l'acceditació automàtica!",
 "If you did not change your password recently, your account may be compromised!" => "Se no heu canviat la contrasenya recentment el vostre compte pot estar compromès!",
 "Please change your password to secure your account again." => "Canvieu la contrasenya de nou per assegurar el vostre compte.",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 78614eef0e7..d104a9fbe80 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -1,6 +1,12 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s s vámi sdílí »%s«",
+"Turned on maintenance mode" => "Zapnut režim údržby",
+"Turned off maintenance mode" => "Vypnut režim údržby",
+"Updated database" => "Zaktualizována databáze",
+"Updating filecache, this may take really long..." => "Aktualizuji souborovou mezipaměť, toto může trvat opravdu dlouho...",
+"Updated filecache" => "Aktualizována souborová mezipaměť",
+"... %d%% done ..." => "... %d%% dokončeno ...",
 "Category type not provided." => "Nezadán typ kategorie.",
 "No category to add?" => "Žádná kategorie k přidání?",
 "This category already exists: %s" => "Kategorie již existuje: %s",
@@ -126,7 +132,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Dokončit nastavení",
 "%s is available. Get more information on how to update." => "%s je dostupná. Získejte více informací k postupu aktualizace.",
 "Log out" => "Odhlásit se",
-"More apps" => "Více aplikací",
 "Automatic logon rejected!" => "Automatické přihlášení odmítnuto!",
 "If you did not change your password recently, your account may be compromised!" => "Pokud jste v nedávné době neměnili své heslo, Váš účet může být kompromitován!",
 "Please change your password to secure your account again." => "Změňte, prosím, své heslo pro opětovné zabezpečení Vašeho účtu.",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 916975393b7..5a1fe65f441 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -132,7 +132,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Afslut opsætning",
 "%s is available. Get more information on how to update." => "%s er tilgængelig. Få mere information om, hvordan du opdaterer.",
 "Log out" => "Log ud",
-"More apps" => "Flere programmer",
 "Automatic logon rejected!" => "Automatisk login afvist!",
 "If you did not change your password recently, your account may be compromised!" => "Hvis du ikke har ændret din adgangskode for nylig, har nogen muligvis tiltvunget sig adgang til din konto!",
 "Please change your password to secure your account again." => "Skift adgangskode for at sikre din konto igen.",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 300edb9141d..655305488f3 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -132,7 +132,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Installation abschließen",
 "%s is available. Get more information on how to update." => "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
 "Log out" => "Abmelden",
-"More apps" => "Mehr Apps",
 "Automatic logon rejected!" => "Automatischer Login zurückgewiesen!",
 "If you did not change your password recently, your account may be compromised!" => "Wenn Du Dein Passwort nicht vor kurzem geändert hast, könnte Dein\nAccount kompromittiert sein!",
 "Please change your password to secure your account again." => "Bitte ändere Dein Passwort, um Deinen Account wieder zu schützen.",
diff --git a/core/l10n/de_AT.php b/core/l10n/de_AT.php
index c0e3e80f0a3..93c8e33f3e2 100644
--- a/core/l10n/de_AT.php
+++ b/core/l10n/de_AT.php
@@ -3,7 +3,6 @@ $TRANSLATIONS = array(
 "_%n minute ago_::_%n minutes ago_" => array("",""),
 "_%n hour ago_::_%n hours ago_" => array("",""),
 "_%n day ago_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("",""),
-"More apps" => "Mehr Apps"
+"_%n month ago_::_%n months ago_" => array("","")
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php
index d93158c62de..2dde9eb5367 100644
--- a/core/l10n/de_CH.php
+++ b/core/l10n/de_CH.php
@@ -126,7 +126,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Installation abschliessen",
 "%s is available. Get more information on how to update." => "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
 "Log out" => "Abmelden",
-"More apps" => "Mehr Apps",
 "Automatic logon rejected!" => "Automatische Anmeldung verweigert!",
 "If you did not change your password recently, your account may be compromised!" => "Wenn Sie Ihr Passwort nicht vor kurzem geändert haben, könnte Ihr\nAccount kompromittiert sein!",
 "Please change your password to secure your account again." => "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern.",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index d70dd6e99d9..1311a76d693 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -132,7 +132,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Installation abschließen",
 "%s is available. Get more information on how to update." => "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
 "Log out" => "Abmelden",
-"More apps" => "Mehr Apps",
 "Automatic logon rejected!" => "Automatische Anmeldung verweigert!",
 "If you did not change your password recently, your account may be compromised!" => "Wenn Sie Ihr Passwort nicht vor kurzem geändert haben, könnte Ihr\nAccount kompromittiert sein!",
 "Please change your password to secure your account again." => "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern.",
diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php
new file mode 100644
index 00000000000..3a42872366a
--- /dev/null
+++ b/core/l10n/en_GB.php
@@ -0,0 +1,146 @@
+<?php
+$TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s shared \"%s\" with you",
+"group" => "group",
+"Turned on maintenance mode" => "Turned on maintenance mode",
+"Turned off maintenance mode" => "Turned off maintenance mode",
+"Updated database" => "Updated database",
+"Updating filecache, this may take really long..." => "Updating filecache, this may take a really long time...",
+"Updated filecache" => "Updated filecache",
+"... %d%% done ..." => "... %d%% done ...",
+"Category type not provided." => "Category type not provided.",
+"No category to add?" => "No category to add?",
+"This category already exists: %s" => "This category already exists: %s",
+"Object type not provided." => "Object type not provided.",
+"%s ID not provided." => "%s ID not provided.",
+"Error adding %s to favorites." => "Error adding %s to favourites.",
+"No categories selected for deletion." => "No categories selected for deletion.",
+"Error removing %s from favorites." => "Error removing %s from favourites.",
+"Sunday" => "Sunday",
+"Monday" => "Monday",
+"Tuesday" => "Tuesday",
+"Wednesday" => "Wednesday",
+"Thursday" => "Thursday",
+"Friday" => "Friday",
+"Saturday" => "Saturday",
+"January" => "January",
+"February" => "February",
+"March" => "March",
+"April" => "April",
+"May" => "May",
+"June" => "June",
+"July" => "July",
+"August" => "August",
+"September" => "September",
+"October" => "October",
+"November" => "November",
+"December" => "December",
+"Settings" => "Settings",
+"seconds ago" => "seconds ago",
+"_%n minute ago_::_%n minutes ago_" => array("%n minute ago","%n minutes ago"),
+"_%n hour ago_::_%n hours ago_" => array("%n hour ago","%n hours ago"),
+"today" => "today",
+"yesterday" => "yesterday",
+"_%n day ago_::_%n days ago_" => array("%n day ago","%n days ago"),
+"last month" => "last month",
+"_%n month ago_::_%n months ago_" => array("%n month ago","%n months ago"),
+"months ago" => "months ago",
+"last year" => "last year",
+"years ago" => "years ago",
+"Choose" => "Choose",
+"Error loading file picker template" => "Error loading file picker template",
+"Yes" => "Yes",
+"No" => "No",
+"Ok" => "OK",
+"The object type is not specified." => "The object type is not specified.",
+"Error" => "Error",
+"The app name is not specified." => "The app name is not specified.",
+"The required file {file} is not installed!" => "The required file {file} is not installed!",
+"Shared" => "Shared",
+"Share" => "Share",
+"Error while sharing" => "Error whilst sharing",
+"Error while unsharing" => "Error whilst unsharing",
+"Error while changing permissions" => "Error whilst changing permissions",
+"Shared with you and the group {group} by {owner}" => "Shared with you and the group {group} by {owner}",
+"Shared with you by {owner}" => "Shared with you by {owner}",
+"Share with" => "Share with",
+"Share with link" => "Share with link",
+"Password protect" => "Password protect",
+"Password" => "Password",
+"Allow Public Upload" => "Allow Public Upload",
+"Email link to person" => "Email link to person",
+"Send" => "Send",
+"Set expiration date" => "Set expiration date",
+"Expiration date" => "Expiration date",
+"Share via email:" => "Share via email:",
+"No people found" => "No people found",
+"Resharing is not allowed" => "Resharing is not allowed",
+"Shared in {item} with {user}" => "Shared in {item} with {user}",
+"Unshare" => "Unshare",
+"can edit" => "can edit",
+"access control" => "access control",
+"create" => "create",
+"update" => "update",
+"delete" => "delete",
+"share" => "share",
+"Password protected" => "Password protected",
+"Error unsetting expiration date" => "Error unsetting expiration date",
+"Error setting expiration date" => "Error setting expiration date",
+"Sending ..." => "Sending ...",
+"Email sent" => "Email sent",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "The update was successful. Redirecting you to ownCloud now.",
+"%s password reset" => "%s password reset",
+"Use the following link to reset your password: {link}" => "Use the following link to reset your password: {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 ." => "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 .",
+"Request failed!<br>Did you make sure your email/username was right?" => "Request failed!<br>Did you make sure your email/username was correct?",
+"You will receive a link to reset your password via Email." => "You will receive a link to reset your password via Email.",
+"Username" => "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?" => "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" => "Yes, I really want to reset my password now",
+"Request reset" => "Request reset",
+"Your password was reset" => "Your password was reset",
+"To login page" => "To login page",
+"New password" => "New password",
+"Reset password" => "Reset password",
+"Personal" => "Personal",
+"Users" => "Users",
+"Apps" => "Apps",
+"Admin" => "Admin",
+"Help" => "Help",
+"Access forbidden" => "Access denied",
+"Cloud not found" => "Cloud not found",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!",
+"Edit categories" => "Edit categories",
+"Add" => "Add",
+"Security Warning" => "Security Warning",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Please update your PHP installation to use %s securely.",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "No secure random number generator is available, please enable the PHP OpenSSL extension.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Your data directory and files are probably accessible from the internet because the .htaccess file does not work.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>.",
+"Create an <strong>admin account</strong>" => "Create an <strong>admin account</strong>",
+"Advanced" => "Advanced",
+"Data folder" => "Data folder",
+"Configure the database" => "Configure the database",
+"will be used" => "will be used",
+"Database user" => "Database user",
+"Database password" => "Database password",
+"Database name" => "Database name",
+"Database tablespace" => "Database tablespace",
+"Database host" => "Database host",
+"Finish setup" => "Finish setup",
+"%s is available. Get more information on how to update." => "%s is available. Get more information on how to update.",
+"Log out" => "Log out",
+"Automatic logon rejected!" => "Automatic logon rejected!",
+"If you did not change your password recently, your account may be compromised!" => "If you did not change your password recently, your account may be compromised!",
+"Please change your password to secure your account again." => "Please change your password to secure your account again.",
+"Lost your password?" => "Lost your password?",
+"remember" => "remember",
+"Log in" => "Log in",
+"Alternative Logins" => "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!" => "Hey there,<br><br>just letting you know that %s shared \"%s\" with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!",
+"Updating ownCloud to version %s, this may take a while." => "Updating ownCloud to version %s, this may take a while."
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index d9e57503817..d9d007819d3 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -132,7 +132,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Lõpeta seadistamine",
 "%s is available. Get more information on how to update." => "%s on saadaval. Vaata lähemalt kuidas uuendada.",
 "Log out" => "Logi välja",
-"More apps" => "Rohkem rakendusi",
 "Automatic logon rejected!" => "Automaatne sisselogimine lükati tagasi!",
 "If you did not change your password recently, your account may be compromised!" => "Kui sa ei muutnud oma parooli hiljuti, siis võib su kasutajakonto olla ohustatud!",
 "Please change your password to secure your account again." => "Palun muuda parooli, et oma kasutajakonto uuesti turvata.",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 83b8fca1eab..ae241e93873 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -126,7 +126,6 @@ $TRANSLATIONS = array(
 "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",
-"More apps" => "App gehiago",
 "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!",
 "Please change your password to secure your account again." => "Mesedez aldatu zure pasahitza zure kontua berriz segurtatzeko.",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index dc603cf41de..7efeaa1fac2 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -126,7 +126,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Viimeistele asennus",
 "%s is available. Get more information on how to update." => "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan.",
 "Log out" => "Kirjaudu ulos",
-"More apps" => "Lisää sovelluksia",
 "Automatic logon rejected!" => "Automaattinen sisäänkirjautuminen hylättiin!",
 "If you did not change your password recently, your account may be compromised!" => "Jos et vaihtanut salasanaasi äskettäin, tilisi saattaa olla murrettu.",
 "Please change your password to secure your account again." => "Vaihda salasanasi suojataksesi tilisi uudelleen.",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 9db68bbbd05..56027e4cf1a 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -1,6 +1,12 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s compartiu «%s» con vostede",
+"Turned on maintenance mode" => "Modo de mantemento activado",
+"Turned off maintenance mode" => "Modo de mantemento desactivado",
+"Updated database" => "Base de datos actualizada",
+"Updating filecache, this may take really long..." => "Actualizando o ficheiro da caché, isto pode levar bastante tempo...",
+"Updated filecache" => "Ficheiro da caché actualizado",
+"... %d%% done ..." => "... %d%% feito ...",
 "Category type not provided." => "Non se indicou o tipo de categoría",
 "No category to add?" => "Sen categoría que engadir?",
 "This category already exists: %s" => "Esta categoría xa existe: %s",
@@ -126,7 +132,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Rematar a configuración",
 "%s is available. Get more information on how to update." => "%s está dispoñíbel. Obteña máis información sobre como actualizar.",
 "Log out" => "Desconectar",
-"More apps" => "Máis aplicativos",
 "Automatic logon rejected!" => "Rexeitouse a entrada automática",
 "If you did not change your password recently, your account may be compromised!" => "Se non fixo recentemente cambios de contrasinal é posíbel que a súa conta estea comprometida!",
 "Please change your password to secure your account again." => "Cambie de novo o seu contrasinal para asegurar a súa conta.",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index c9c6e1f7507..b197a67b116 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -122,7 +122,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "סיום התקנה",
 "%s is available. Get more information on how to update." => "%s זמינה להורדה. ניתן ללחוץ כדי לקבל מידע נוסף כיצד לעדכן.",
 "Log out" => "התנתקות",
-"More apps" => "יישומים נוספים",
 "Automatic logon rejected!" => "בקשת הכניסה האוטומטית נדחתה!",
 "If you did not change your password recently, your account may be compromised!" => "אם לא שינית את ססמתך לאחרונה, יתכן שחשבונך נפגע!",
 "Please change your password to secure your account again." => "נא לשנות את הססמה שלך כדי לאבטח את חשבונך מחדש.",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 8c09b4e90fb..63a7545d891 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -1,6 +1,12 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s ha condiviso «%s» con te",
+"Turned on maintenance mode" => "Modalità di manutenzione attivata",
+"Turned off maintenance mode" => "Modalità di manutenzione disattivata",
+"Updated database" => "Database aggiornato",
+"Updating filecache, this may take really long..." => "Aggiornamento della cache dei file in corso, potrebbe richiedere molto tempo...",
+"Updated filecache" => "Cache dei file aggiornata",
+"... %d%% done ..." => "... %d%% completato ...",
 "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",
@@ -126,7 +132,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Termina la configurazione",
 "%s is available. Get more information on how to update." => "%s è disponibile. Ottieni ulteriori informazioni sull'aggiornamento.",
 "Log out" => "Esci",
-"More apps" => "Altre applicazioni",
 "Automatic logon rejected!" => "Accesso automatico rifiutato.",
 "If you did not change your password recently, your account may be compromised!" => "Se non hai cambiato la password recentemente, il tuo account potrebbe essere compromesso.",
 "Please change your password to secure your account again." => "Cambia la password per rendere nuovamente sicuro il tuo account.",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 31d2f92eff2..2ab85f13d30 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -126,7 +126,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "セットアップを完了します",
 "%s is available. Get more information on how to update." => "%s が利用可能です。更新方法に関してさらに情報を取得して下さい。",
 "Log out" => "ログアウト",
-"More apps" => "他のアプリ",
 "Automatic logon rejected!" => "自動ログインは拒否されました！",
 "If you did not change your password recently, your account may be compromised!" => "最近パスワードを変更していない場合、あなたのアカウントは危険にさらされているかもしれません。",
 "Please change your password to secure your account again." => "アカウント保護の為、パスワードを再度の変更をお願いいたします。",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 84678c1c208..5db8f6c21a9 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -121,7 +121,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Baigti diegimą",
 "%s is available. Get more information on how to update." => "%s yra prieinama. Gaukite daugiau informacijos apie atnaujinimą.",
 "Log out" => "Atsijungti",
-"More apps" => "Daugiau programų",
 "Automatic logon rejected!" => "Automatinis prisijungimas atmestas!",
 "If you did not change your password recently, your account may be compromised!" => "Jei paskutinių metu nekeitėte savo slaptažodžio, Jūsų paskyra gali būti pavojuje!",
 "Please change your password to secure your account again." => "Prašome pasikeisti slaptažodį dar kartą, dėl paskyros saugumo.",
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index 6deb5dfda9f..ddfc6008983 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -126,7 +126,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Pabeigt iestatīšanu",
 "%s is available. Get more information on how to update." => "%s ir pieejams. Uzziniet vairāk kā atjaunināt.",
 "Log out" => "Izrakstīties",
-"More apps" => "Vairāk programmu",
 "Automatic logon rejected!" => "Automātiskā ierakstīšanās ir noraidīta!",
 "If you did not change your password recently, your account may be compromised!" => "Ja neesat pēdējā laikā mainījis paroli, iespējams, ka jūsu konts ir kompromitēts.",
 "Please change your password to secure your account again." => "Lūdzu, nomainiet savu paroli, lai atkal nodrošinātu savu kontu.",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 46375756de4..6a2d1a03a10 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -126,7 +126,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Installatie afronden",
 "%s is available. Get more information on how to update." => "%s is beschikbaar. Verkrijg meer informatie over het bijwerken.",
 "Log out" => "Afmelden",
-"More apps" => "Meer applicaties",
 "Automatic logon rejected!" => "Automatische aanmelding geweigerd!",
 "If you did not change your password recently, your account may be compromised!" => "Als je je wachtwoord niet onlangs heeft aangepast, kan je account overgenomen zijn!",
 "Please change your password to secure your account again." => "Wijzig je wachtwoord zodat je account weer beveiligd is.",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 9be10f535b7..1188e555316 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -125,7 +125,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Zakończ konfigurowanie",
 "%s is available. Get more information on how to update." => "%s jest dostępna. Dowiedz się więcej na temat aktualizacji.",
 "Log out" => "Wyloguj",
-"More apps" => "Więcej aplikacji",
 "Automatic logon rejected!" => "Automatyczne logowanie odrzucone!",
 "If you did not change your password recently, your account may be compromised!" => "Jeśli hasło było dawno niezmieniane, twoje konto może być zagrożone!",
 "Please change your password to secure your account again." => "Zmień swoje hasło, aby ponownie zabezpieczyć swoje konto.",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 8446e5270a7..8db5262e94b 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -126,7 +126,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Concluir configuração",
 "%s is available. Get more information on how to update." => "%s está disponível. Obtenha mais informações sobre como atualizar.",
 "Log out" => "Sair",
-"More apps" => "Mais aplicativos",
 "Automatic logon rejected!" => "Entrada Automática no Sistema Rejeitada!",
 "If you did not change your password recently, your account may be compromised!" => "Se você não mudou a sua senha recentemente, a sua conta pode estar comprometida!",
 "Please change your password to secure your account again." => "Por favor troque sua senha para tornar sua conta segura novamente.",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 8c29c8d26f6..503ca579ce7 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -126,7 +126,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Завершить установку",
 "%s is available. Get more information on how to update." => "%s доступно. Получить дополнительную информацию о порядке обновления.",
 "Log out" => "Выйти",
-"More apps" => "Ещё приложения",
 "Automatic logon rejected!" => "Автоматический вход в систему отключен!",
 "If you did not change your password recently, your account may be compromised!" => "Если Вы недавно не меняли свой пароль, то Ваша учетная запись может быть скомпрометирована!",
 "Please change your password to secure your account again." => "Пожалуйста, смените пароль, чтобы обезопасить свою учетную запись.",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 5fff18e7d6f..82745d617e9 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -1,6 +1,12 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s s Vami zdieľa »%s«",
+"Turned on maintenance mode" => "Mód údržby zapnutý",
+"Turned off maintenance mode" => "Mód údržby vypnutý",
+"Updated database" => "Databáza aktualizovaná",
+"Updating filecache, this may take really long..." => "Aktualizácia \"filecache\", toto môže trvať dlhšie...",
+"Updated filecache" => "\"Filecache\" aktualizovaná",
+"... %d%% done ..." => "... %d%% dokončených ...",
 "Category type not provided." => "Neposkytnutý typ kategórie.",
 "No category to add?" => "Žiadna kategória pre pridanie?",
 "This category already exists: %s" => "Kategória: %s už existuje.",
@@ -126,7 +132,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Dokončiť inštaláciu",
 "%s is available. Get more information on how to update." => "%s je dostupná. Získajte viac informácií k postupu aktualizáce.",
 "Log out" => "Odhlásiť",
-"More apps" => "Viac aplikácií",
 "Automatic logon rejected!" => "Automatické prihlásenie bolo zamietnuté!",
 "If you did not change your password recently, your account may be compromised!" => "V nedávnej dobe ste nezmenili svoje heslo, Váš účet môže byť kompromitovaný.",
 "Please change your password to secure your account again." => "Prosím, zmeňte svoje heslo pre opätovné zabezpečenie Vášho účtu",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index cda76a520b4..74d285a35a6 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -1,6 +1,12 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s delade »%s« med dig",
+"Turned on maintenance mode" => "Aktiverade underhållsläge",
+"Turned off maintenance mode" => "Deaktiverade underhållsläge",
+"Updated database" => "Uppdaterade databasen",
+"Updating filecache, this may take really long..." => "Uppdaterar filcache, det kan ta lång tid...",
+"Updated filecache" => "Uppdaterade filcache",
+"... %d%% done ..." => "... %d%% klart ...",
 "Category type not provided." => "Kategorityp inte angiven.",
 "No category to add?" => "Ingen kategori att lägga till?",
 "This category already exists: %s" => "Denna kategori finns redan: %s",
@@ -126,7 +132,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Avsluta installation",
 "%s is available. Get more information on how to update." => "%s är tillgänglig. Få mer information om hur du går tillväga för att uppdatera.",
 "Log out" => "Logga ut",
-"More apps" => "Fler appar",
 "Automatic logon rejected!" => "Automatisk inloggning inte tillåten!",
 "If you did not change your password recently, your account may be compromised!" => "Om du inte har ändrat ditt lösenord nyligen så kan ditt konto vara manipulerat!",
 "Please change your password to secure your account again." => "Ändra genast lösenord för att säkra ditt konto.",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index dde8a1bd97a..6dd54057950 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -126,7 +126,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Kurulumu tamamla",
 "%s is available. Get more information on how to update." => "%s mevcuttur. Güncelleştirme hakkında daha fazla bilgi alın.",
 "Log out" => "Çıkış yap",
-"More apps" => "Daha fazla Uygulama",
 "Automatic logon rejected!" => "Otomatik oturum açma reddedildi!",
 "If you did not change your password recently, your account may be compromised!" => "Yakın zamanda parolanızı değiştirmedi iseniz hesabınız riske girebilir.",
 "Please change your password to secure your account again." => "Hesabınızı korumak için lütfen parolanızı değiştirin.",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 5784d828c17..08d70dfee66 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -132,7 +132,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "安装完成",
 "%s is available. Get more information on how to update." => "%s 可用。获取更多关于如何升级的信息。",
 "Log out" => "注销",
-"More apps" => "更多应用",
 "Automatic logon rejected!" => "自动登录被拒绝！",
 "If you did not change your password recently, your account may be compromised!" => "如果您没有最近修改您的密码，您的帐户可能会受到影响！",
 "Please change your password to secure your account again." => "请修改您的密码，以保护您的账户安全。",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index e1493452d86..fabec7537d1 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -126,7 +126,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "完成設定",
 "%s is available. Get more information on how to update." => "%s 已經釋出，瞭解更多資訊以進行更新。",
 "Log out" => "登出",
-"More apps" => "更多 Apps",
 "Automatic logon rejected!" => "自動登入被拒！",
 "If you did not change your password recently, your account may be compromised!" => "如果您最近並未更改密碼，您的帳號可能已經遭到入侵！",
 "Please change your password to secure your account again." => "請更改您的密碼以再次取得您帳戶的控制權。",
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 3c1114492cb..1e0f4a75c3c 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -78,6 +78,7 @@
 
 		<nav><div id="navigation">
 			<ul id="apps" class="svg">
+				<div class="wrapper"><!-- for sticky footer of apps management -->
 				<?php foreach($_['navigation'] as $entry): ?>
 					<li data-id="<?php p($entry['id']); ?>">
 						<a href="<?php print_unescaped($entry['href']); ?>" title=""
@@ -89,15 +90,19 @@
 						</a>
 					</li>
 				<?php endforeach; ?>
+				<?php if(OC_User::isAdminUser(OC_User::getUser())): ?>
+					<div class="push"></div><!-- for for sticky footer of apps management -->
+				<?php endif; ?>
+				</div>
 
-				<!-- show "More apps" link to app administration directly in app navigation -->
+				<!-- show "More apps" link to app administration directly in app navigation, as sticky footer -->
 				<?php if(OC_User::isAdminUser(OC_User::getUser())): ?>
 					<li id="apps-management">
 						<a href="<?php print_unescaped(OC_Helper::linkToRoute('settings_apps').'?installed'); ?>" title=""
 							<?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
 							<img class="icon svg" src="<?php print_unescaped(OC_Helper::imagePath('settings', 'apps.svg')); ?>"/>
 							<span>
-								<?php p($l->t('More apps')); ?>
+								<?php p($l->t('Apps')); ?>
 							</span>
 						</a>
 					</li>