Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support

Conflicts:
	3rdparty/Sabre/CardDAV/Plugin.php
	3rdparty/smb4php/smb.php
	apps/bookmarks/ajax/addBookmark.php
	apps/bookmarks/ajax/editBookmark.php
	apps/bookmarks/appinfo/migrate.php
	apps/calendar/ajax/calendar/edit.form.php
	apps/calendar/ajax/changeview.php
	apps/calendar/ajax/import/import.php
	apps/calendar/ajax/settings/guesstimezone.php
	apps/calendar/ajax/settings/setfirstday.php
	apps/calendar/ajax/settings/settimeformat.php
	apps/calendar/ajax/share/changepermission.php
	apps/calendar/ajax/share/share.php
	apps/calendar/ajax/share/unshare.php
	apps/calendar/appinfo/app.php
	apps/calendar/appinfo/remote.php
	apps/calendar/appinfo/update.php
	apps/calendar/appinfo/version
	apps/calendar/js/calendar.js
	apps/calendar/l10n/da.php
	apps/calendar/l10n/de.php
	apps/calendar/l10n/fi_FI.php
	apps/calendar/l10n/gl.php
	apps/calendar/l10n/he.php
	apps/calendar/l10n/hr.php
	apps/calendar/l10n/ja_JP.php
	apps/calendar/l10n/lb.php
	apps/calendar/l10n/lt_LT.php
	apps/calendar/l10n/nb_NO.php
	apps/calendar/l10n/pl.php
	apps/calendar/l10n/pt_PT.php
	apps/calendar/l10n/ro.php
	apps/calendar/l10n/ru.php
	apps/calendar/l10n/sv.php
	apps/calendar/l10n/zh_CN.php
	apps/calendar/l10n/zh_TW.php
	apps/calendar/lib/app.php
	apps/calendar/lib/calendar.php
	apps/calendar/lib/object.php
	apps/calendar/lib/share.php
	apps/calendar/templates/part.choosecalendar.rowfields.php
	apps/calendar/templates/part.import.php
	apps/calendar/templates/settings.php
	apps/contacts/ajax/activation.php
	apps/contacts/ajax/addressbook/delete.php
	apps/contacts/ajax/contact/add.php
	apps/contacts/ajax/contact/addproperty.php
	apps/contacts/ajax/contact/delete.php
	apps/contacts/ajax/contact/deleteproperty.php
	apps/contacts/ajax/contact/saveproperty.php
	apps/contacts/ajax/createaddressbook.php
	apps/contacts/ajax/cropphoto.php
	apps/contacts/ajax/currentphoto.php
	apps/contacts/ajax/importaddressbook.php
	apps/contacts/ajax/oc_photo.php
	apps/contacts/ajax/savecrop.php
	apps/contacts/ajax/selectaddressbook.php
	apps/contacts/ajax/updateaddressbook.php
	apps/contacts/ajax/uploadimport.php
	apps/contacts/ajax/uploadphoto.php
	apps/contacts/appinfo/migrate.php
	apps/contacts/appinfo/remote.php
	apps/contacts/css/contacts.css
	apps/contacts/import.php
	apps/contacts/index.php
	apps/contacts/js/contacts.js
	apps/contacts/l10n/ca.php
	apps/contacts/l10n/cs_CZ.php
	apps/contacts/l10n/da.php
	apps/contacts/l10n/de.php
	apps/contacts/l10n/el.php
	apps/contacts/l10n/eo.php
	apps/contacts/l10n/es.php
	apps/contacts/l10n/et_EE.php
	apps/contacts/l10n/eu.php
	apps/contacts/l10n/fa.php
	apps/contacts/l10n/fi_FI.php
	apps/contacts/l10n/fr.php
	apps/contacts/l10n/he.php
	apps/contacts/l10n/hr.php
	apps/contacts/l10n/hu_HU.php
	apps/contacts/l10n/ia.php
	apps/contacts/l10n/it.php
	apps/contacts/l10n/ja_JP.php
	apps/contacts/l10n/ko.php
	apps/contacts/l10n/lb.php
	apps/contacts/l10n/mk.php
	apps/contacts/l10n/nb_NO.php
	apps/contacts/l10n/nl.php
	apps/contacts/l10n/pl.php
	apps/contacts/l10n/pt_BR.php
	apps/contacts/l10n/pt_PT.php
	apps/contacts/l10n/ro.php
	apps/contacts/l10n/ru.php
	apps/contacts/l10n/sk_SK.php
	apps/contacts/l10n/sl.php
	apps/contacts/l10n/sv.php
	apps/contacts/l10n/th_TH.php
	apps/contacts/l10n/tr.php
	apps/contacts/l10n/zh_CN.php
	apps/contacts/l10n/zh_TW.php
	apps/contacts/lib/addressbook.php
	apps/contacts/lib/hooks.php
	apps/contacts/lib/vcard.php
	apps/contacts/photo.php
	apps/contacts/templates/part.contact.php
	apps/contacts/templates/part.contacts.php
	apps/contacts/templates/part.cropphoto.php
	apps/contacts/templates/part.importaddressbook.php
	apps/contacts/templates/part.selectaddressbook.php
	apps/contacts/thumbnail.php
	apps/files/ajax/download.php
	apps/files/ajax/newfile.php
	apps/files/ajax/timezone.php
	apps/files/appinfo/update.php
	apps/files/appinfo/version
	apps/files/index.php
	apps/files/js/fileactions.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files/l10n/ar.php
	apps/files/l10n/bg_BG.php
	apps/files/l10n/ca.php
	apps/files/l10n/cs_CZ.php
	apps/files/l10n/da.php
	apps/files/l10n/de.php
	apps/files/l10n/el.php
	apps/files/l10n/eo.php
	apps/files/l10n/es.php
	apps/files/l10n/et_EE.php
	apps/files/l10n/eu.php
	apps/files/l10n/fa.php
	apps/files/l10n/fi_FI.php
	apps/files/l10n/fr.php
	apps/files/l10n/gl.php
	apps/files/l10n/he.php
	apps/files/l10n/hr.php
	apps/files/l10n/hu_HU.php
	apps/files/l10n/ia.php
	apps/files/l10n/id.php
	apps/files/l10n/it.php
	apps/files/l10n/ja_JP.php
	apps/files/l10n/ko.php
	apps/files/l10n/lb.php
	apps/files/l10n/lt_LT.php
	apps/files/l10n/mk.php
	apps/files/l10n/ms_MY.php
	apps/files/l10n/nb_NO.php
	apps/files/l10n/nl.php
	apps/files/l10n/nn_NO.php
	apps/files/l10n/pl.php
	apps/files/l10n/pt_BR.php
	apps/files/l10n/pt_PT.php
	apps/files/l10n/ro.php
	apps/files/l10n/ru.php
	apps/files/l10n/sk_SK.php
	apps/files/l10n/sl.php
	apps/files/l10n/sr.php
	apps/files/l10n/sr@latin.php
	apps/files/l10n/sv.php
	apps/files/l10n/th_TH.php
	apps/files/l10n/tr.php
	apps/files/l10n/uk.php
	apps/files/l10n/zh_CN.php
	apps/files/l10n/zh_TW.php
	apps/files_archive/js/archive.js
	apps/files_encryption/lib/cryptstream.php
	apps/files_encryption/lib/proxy.php
	apps/files_encryption/tests/proxy.php
	apps/files_external/appinfo/app.php
	apps/files_external/lib/smb.php
	apps/files_external/lib/streamwrapper.php
	apps/files_external/tests/config.php
	apps/files_external/tests/smb.php
	apps/files_sharing/ajax/email.php
	apps/files_sharing/ajax/getitem.php
	apps/files_sharing/ajax/setpermissions.php
	apps/files_sharing/ajax/share.php
	apps/files_sharing/ajax/toggleresharing.php
	apps/files_sharing/ajax/unshare.php
	apps/files_sharing/ajax/userautocomplete.php
	apps/files_sharing/js/settings.js
	apps/files_sharing/js/share.js
	apps/files_sharing/lib_share.php
	apps/files_sharing/settings.php
	apps/files_sharing/sharedstorage.php
	apps/files_sharing/templates/settings.php
	apps/files_versions/ajax/rollbackVersion.php
	apps/files_versions/versions.php
	apps/gallery/ajax/thumbnail.php
	apps/gallery/appinfo/app.php
	apps/gallery/appinfo/update.php
	apps/gallery/appinfo/version
	apps/gallery/css/styles.css
	apps/gallery/index.php
	apps/gallery/js/pictures.js
	apps/gallery/l10n/ca.php
	apps/gallery/l10n/cs_CZ.php
	apps/gallery/l10n/de.php
	apps/gallery/l10n/el.php
	apps/gallery/l10n/es.php
	apps/gallery/l10n/fi_FI.php
	apps/gallery/l10n/fr.php
	apps/gallery/l10n/it.php
	apps/gallery/l10n/pl.php
	apps/gallery/l10n/pt_PT.php
	apps/gallery/l10n/ru.php
	apps/gallery/l10n/sl.php
	apps/gallery/l10n/sv.php
	apps/gallery/l10n/th_TH.php
	apps/gallery/l10n/tr.php
	apps/gallery/l10n/zh_CN.php
	apps/gallery/lib/album.php
	apps/gallery/lib/hooks_handlers.php
	apps/gallery/lib/managers.php
	apps/gallery/lib/photo.php
	apps/gallery/lib/tiles.php
	apps/gallery/lib/tiles_test.php
	apps/gallery/templates/index.php
	apps/media/lib_ampache.php
	apps/media/lib_collection.php
	apps/media/lib_media.php
	apps/remoteStorage/lib_remoteStorage.php
	apps/tasks/ajax/addtaskform.php
	apps/tasks/ajax/edittask.php
	apps/user_ldap/appinfo/update.php
	apps/user_ldap/group_ldap.php
	apps/user_ldap/lib_ldap.php
	apps/user_ldap/settings.php
	apps/user_ldap/templates/settings.php
	apps/user_ldap/user_ldap.php
	apps/user_migrate/appinfo/app.php
	apps/user_migrate/templates/settings.php
	apps/user_webfinger/host-meta.php
	config/config.sample.php
	core/js/js.js
	core/l10n/da.php
	core/l10n/de.php
	core/l10n/fi_FI.php
	core/l10n/gl.php
	core/l10n/he.php
	core/l10n/hr.php
	core/l10n/id.php
	core/l10n/ja_JP.php
	core/l10n/lb.php
	core/l10n/lt_LT.php
	core/l10n/nb_NO.php
	core/l10n/pl.php
	core/l10n/pt_PT.php
	core/l10n/ro.php
	core/l10n/ru.php
	core/l10n/sv.php
	core/lostpassword/index.php
	core/templates/layout.user.php
	core/templates/login.php
	db_structure.xml
	index.php
	l10n/af/calendar.po
	l10n/af/contacts.po
	l10n/af/core.po
	l10n/af/files.po
	l10n/af/settings.po
	l10n/ar/calendar.po
	l10n/ar/contacts.po
	l10n/ar/core.po
	l10n/ar/files.po
	l10n/ar/media.po
	l10n/ar/settings.po
	l10n/bg_BG/calendar.po
	l10n/bg_BG/contacts.po
	l10n/bg_BG/core.po
	l10n/bg_BG/files.po
	l10n/bg_BG/media.po
	l10n/bg_BG/settings.po
	l10n/ca/calendar.po
	l10n/ca/contacts.po
	l10n/ca/core.po
	l10n/ca/files.po
	l10n/ca/gallery.po
	l10n/ca/settings.po
	l10n/cs_CZ/calendar.po
	l10n/cs_CZ/contacts.po
	l10n/cs_CZ/core.po
	l10n/cs_CZ/files.po
	l10n/cs_CZ/gallery.po
	l10n/cs_CZ/settings.po
	l10n/da/calendar.po
	l10n/da/contacts.po
	l10n/da/core.po
	l10n/da/files.po
	l10n/da/settings.po
	l10n/de/calendar.po
	l10n/de/contacts.po
	l10n/de/core.po
	l10n/de/files.po
	l10n/de/gallery.po
	l10n/de/settings.po
	l10n/el/calendar.po
	l10n/el/contacts.po
	l10n/el/core.po
	l10n/el/files.po
	l10n/el/gallery.po
	l10n/el/settings.po
	l10n/eo/calendar.po
	l10n/eo/contacts.po
	l10n/eo/core.po
	l10n/eo/files.po
	l10n/eo/media.po
	l10n/eo/settings.po
	l10n/es/calendar.po
	l10n/es/contacts.po
	l10n/es/core.po
	l10n/es/files.po
	l10n/es/gallery.po
	l10n/es/settings.po
	l10n/et_EE/calendar.po
	l10n/et_EE/contacts.po
	l10n/et_EE/core.po
	l10n/et_EE/files.po
	l10n/et_EE/settings.po
	l10n/eu/calendar.po
	l10n/eu/contacts.po
	l10n/eu/core.po
	l10n/eu/files.po
	l10n/eu/settings.po
	l10n/fa/calendar.po
	l10n/fa/contacts.po
	l10n/fa/core.po
	l10n/fa/files.po
	l10n/fa/settings.po
	l10n/fi_FI/calendar.po
	l10n/fi_FI/contacts.po
	l10n/fi_FI/core.po
	l10n/fi_FI/files.po
	l10n/fi_FI/gallery.po
	l10n/fi_FI/settings.po
	l10n/fr/calendar.po
	l10n/fr/contacts.po
	l10n/fr/core.po
	l10n/fr/files.po
	l10n/fr/gallery.po
	l10n/fr/media.po
	l10n/fr/settings.po
	l10n/gl/calendar.po
	l10n/gl/contacts.po
	l10n/gl/core.po
	l10n/gl/files.po
	l10n/gl/settings.po
	l10n/he/calendar.po
	l10n/he/contacts.po
	l10n/he/core.po
	l10n/he/files.po
	l10n/he/settings.po
	l10n/hr/calendar.po
	l10n/hr/contacts.po
	l10n/hr/core.po
	l10n/hr/files.po
	l10n/hr/settings.po
	l10n/hu_HU/calendar.po
	l10n/hu_HU/contacts.po
	l10n/hu_HU/core.po
	l10n/hu_HU/files.po
	l10n/hu_HU/settings.po
	l10n/hy/calendar.po
	l10n/hy/contacts.po
	l10n/hy/core.po
	l10n/hy/files.po
	l10n/hy/settings.po
	l10n/ia/calendar.po
	l10n/ia/contacts.po
	l10n/ia/core.po
	l10n/ia/files.po
	l10n/ia/settings.po
	l10n/id/calendar.po
	l10n/id/contacts.po
	l10n/id/core.po
	l10n/id/files.po
	l10n/id/settings.po
	l10n/it/calendar.po
	l10n/it/contacts.po
	l10n/it/core.po
	l10n/it/files.po
	l10n/it/gallery.po
	l10n/it/settings.po
	l10n/ja_JP/calendar.po
	l10n/ja_JP/contacts.po
	l10n/ja_JP/core.po
	l10n/ja_JP/files.po
	l10n/ja_JP/settings.po
	l10n/ko/calendar.po
	l10n/ko/contacts.po
	l10n/ko/core.po
	l10n/ko/files.po
	l10n/ko/settings.po
	l10n/lb/calendar.po
	l10n/lb/contacts.po
	l10n/lb/core.po
	l10n/lb/files.po
	l10n/lb/settings.po
	l10n/lt_LT/calendar.po
	l10n/lt_LT/contacts.po
	l10n/lt_LT/core.po
	l10n/lt_LT/files.po
	l10n/lt_LT/settings.po
	l10n/mk/calendar.po
	l10n/mk/contacts.po
	l10n/mk/core.po
	l10n/mk/files.po
	l10n/mk/settings.po
	l10n/ms_MY/calendar.po
	l10n/ms_MY/contacts.po
	l10n/ms_MY/core.po
	l10n/ms_MY/files.po
	l10n/ms_MY/settings.po
	l10n/nb_NO/calendar.po
	l10n/nb_NO/contacts.po
	l10n/nb_NO/core.po
	l10n/nb_NO/files.po
	l10n/nb_NO/settings.po
	l10n/nl/calendar.po
	l10n/nl/contacts.po
	l10n/nl/core.po
	l10n/nl/files.po
	l10n/nl/settings.po
	l10n/nn_NO/calendar.po
	l10n/nn_NO/contacts.po
	l10n/nn_NO/core.po
	l10n/nn_NO/files.po
	l10n/nn_NO/settings.po
	l10n/pl/calendar.po
	l10n/pl/contacts.po
	l10n/pl/core.po
	l10n/pl/files.po
	l10n/pl/gallery.po
	l10n/pl/settings.po
	l10n/pt_BR/calendar.po
	l10n/pt_BR/contacts.po
	l10n/pt_BR/core.po
	l10n/pt_BR/files.po
	l10n/pt_BR/settings.po
	l10n/pt_PT/calendar.po
	l10n/pt_PT/contacts.po
	l10n/pt_PT/core.po
	l10n/pt_PT/files.po
	l10n/pt_PT/gallery.po
	l10n/pt_PT/settings.po
	l10n/ro/calendar.po
	l10n/ro/contacts.po
	l10n/ro/core.po
	l10n/ro/files.po
	l10n/ro/settings.po
	l10n/ru/calendar.po
	l10n/ru/contacts.po
	l10n/ru/core.po
	l10n/ru/files.po
	l10n/ru/gallery.po
	l10n/ru/settings.po
	l10n/sk_SK/calendar.po
	l10n/sk_SK/contacts.po
	l10n/sk_SK/core.po
	l10n/sk_SK/files.po
	l10n/sk_SK/settings.po
	l10n/sl/calendar.po
	l10n/sl/contacts.po
	l10n/sl/core.po
	l10n/sl/files.po
	l10n/sl/gallery.po
	l10n/sl/settings.po
	l10n/sr/calendar.po
	l10n/sr/contacts.po
	l10n/sr/core.po
	l10n/sr/files.po
	l10n/sr/settings.po
	l10n/sr@latin/calendar.po
	l10n/sr@latin/contacts.po
	l10n/sr@latin/core.po
	l10n/sr@latin/files.po
	l10n/sr@latin/settings.po
	l10n/sv/calendar.po
	l10n/sv/contacts.po
	l10n/sv/core.po
	l10n/sv/files.po
	l10n/sv/gallery.po
	l10n/sv/media.po
	l10n/sv/settings.po
	l10n/templates/bookmarks.pot
	l10n/templates/calendar.pot
	l10n/templates/contacts.pot
	l10n/templates/core.pot
	l10n/templates/files.pot
	l10n/templates/gallery.pot
	l10n/templates/media.pot
	l10n/templates/settings.pot
	l10n/th_TH/calendar.po
	l10n/th_TH/contacts.po
	l10n/th_TH/core.po
	l10n/th_TH/files.po
	l10n/th_TH/gallery.po
	l10n/th_TH/settings.po
	l10n/tr/calendar.po
	l10n/tr/contacts.po
	l10n/tr/core.po
	l10n/tr/files.po
	l10n/tr/gallery.po
	l10n/tr/settings.po
	l10n/uk/calendar.po
	l10n/uk/contacts.po
	l10n/uk/core.po
	l10n/uk/files.po
	l10n/uk/media.po
	l10n/uk/settings.po
	l10n/zh_CN/calendar.po
	l10n/zh_CN/contacts.po
	l10n/zh_CN/core.po
	l10n/zh_CN/files.po
	l10n/zh_CN/gallery.po
	l10n/zh_CN/settings.po
	l10n/zh_TW/calendar.po
	l10n/zh_TW/contacts.po
	l10n/zh_TW/core.po
	l10n/zh_TW/files.po
	l10n/zh_TW/settings.po
	lib/app.php
	lib/base.php
	lib/connector/sabre/file.php
	lib/connector/sabre/locks.php
	lib/connector/sabre/node.php
	lib/db.php
	lib/filecache.php
	lib/fileproxy/quota.php
	lib/files.php
	lib/filestorage/local.php
	lib/filesystemview.php
	lib/group/database.php
	lib/helper.php
	lib/installer.php
	lib/json.php
	lib/l10n.php
	lib/migrate.php
	lib/mimetypes.fixlist.php
	lib/ocs.php
	lib/preferences.php
	lib/public/json.php
	lib/public/util.php
	lib/template.php
	lib/user.php
	lib/user/database.php
	lib/util.php
	lib/vcategories.php
	ocs/providers.php
	settings/admin.php
	settings/ajax/lostpassword.php
	settings/ajax/removeuser.php
	settings/ajax/setbackgroundjobsmode.php
	settings/ajax/setlanguage.php
	settings/ajax/setquota.php
	settings/ajax/togglegroups.php
	settings/apps.php
	settings/css/settings.css
	settings/js/apps.js
	settings/js/users.js
	settings/l10n/bg_BG.php
	settings/l10n/ca.php
	settings/l10n/cs_CZ.php
	settings/l10n/da.php
	settings/l10n/de.php
	settings/l10n/el.php
	settings/l10n/eo.php
	settings/l10n/es.php
	settings/l10n/et_EE.php
	settings/l10n/eu.php
	settings/l10n/fa.php
	settings/l10n/fi_FI.php
	settings/l10n/fr.php
	settings/l10n/gl.php
	settings/l10n/he.php
	settings/l10n/hr.php
	settings/l10n/hu_HU.php
	settings/l10n/it.php
	settings/l10n/ja_JP.php
	settings/l10n/ko.php
	settings/l10n/lt_LT.php
	settings/l10n/mk.php
	settings/l10n/ms_MY.php
	settings/l10n/nb_NO.php
	settings/l10n/nl.php
	settings/l10n/nn_NO.php
	settings/l10n/pl.php
	settings/l10n/pt_BR.php
	settings/l10n/pt_PT.php
	settings/l10n/ru.php
	settings/l10n/sk_SK.php
	settings/l10n/sl.php
	settings/l10n/sv.php
	settings/l10n/th_TH.php
	settings/l10n/tr.php
	settings/l10n/zh_CN.php
	settings/personal.php
	settings/templates/admin.php
	settings/templates/users.php

76 files changed, 1408 insertions, 342 deletions

diff --git a/settings/admin.php b/settings/admin.php
index 5ef9daee18d..6909e02d14f 100644..100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -26,9 +26,10 @@ function compareEntries($a,$b){
 usort($entries, 'compareEntries');
 
 $tmpl->assign('loglevel',OC_Config::getValue( "loglevel", 2 ));
-$tmpl->assign('entries',OC_Util::sanitizeHTML($entries));
+$tmpl->assign('entries',$entries);
 $tmpl->assign('entriesremain', $entriesremain);
 $tmpl->assign('htaccessworking',$htaccessworking);
+$tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax'));
 $tmpl->assign('forms',array());
 foreach($forms as $form){
 	$tmpl->append('forms',$form);
diff --git a/settings/ajax/apps/ocs.php b/settings/ajax/apps/ocs.php
new file mode 100644
index 00000000000..082f1cfb922
--- /dev/null
+++ b/settings/ajax/apps/ocs.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+
+OC_JSON::checkAdminUser();
+
+$l = OC_L10N::get('core');
+
+if(OC_Config::getValue('appstoreenabled', true)==false){
+	OCP\JSON::success(array('type' => 'external', 'data' => array()));
+}
+
+$enabledApps=OC_App::getEnabledApps();
+
+if(is_null($enabledApps)) {
+	OCP\JSON::error(array('data' => array('message' => $l->t('Unable to load list from App Store'))));
+}
+
+$apps=array();
+
+// apps from external repo via OCS
+$catagoryNames=OC_OCSClient::getCategories();
+if(is_array($catagoryNames)){
+	$categories=array_keys($catagoryNames);
+	$page=0;
+	$externalApps=OC_OCSClient::getApplications($categories,$page);
+	foreach($externalApps as $app){
+		// show only external apps that aren't enabled yet
+		$local=false;
+		foreach($enabledApps as $a){
+			if($a == $app['name']) {
+				$local=true;
+			}
+		}
+
+		if(!$local) {
+			if($app['preview']=='') {
+				$pre='trans.png';
+			} else {
+				$pre=$app['preview'];
+			}
+			$apps[]=array(
+				'name'=>$app['name'],
+				'id'=>$app['id'],
+				'active'=>false,
+				'description'=>$app['description'],
+				'author'=>$app['personid'],
+				'license'=>$app['license'],
+				'preview'=>$pre,
+				'internal'=>false,
+				'internallabel'=>'3rd Party App',
+			);
+		}
+	}
+}
+
+OCP\JSON::success(array('type' => 'external', 'data' => $apps));
+
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index 388885b6fcb..c7cb6512331 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -10,7 +10,20 @@ $oldPassword=isset($_POST["oldpassword"])?$_POST["oldpassword"]:'';
 
 // Check if we are a user
 OC_JSON::checkLoggedIn();
-if( (!OC_Group::inGroup( OC_User::getUser(), 'admin' ) && ($username!=OC_User::getUser() || !OC_User::checkPassword($username,$oldPassword)))) {
+OCP\JSON::callCheck();
+
+$userstatus = null;
+if(OC_Group::inGroup(OC_User::getUser(), 'admin')){
+	$userstatus = 'admin';
+}
+if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)){
+	$userstatus = 'subadmin';
+}
+if(OC_User::getUser() == $username && OC_User::checkPassword($username,$oldPassword)){
+	$userstatus = 'user';
+}
+
+if(is_null($userstatus)){
 	OC_JSON::error( array( "data" => array( "message" => "Authentication error" )));
 	exit();
 }
@@ -22,5 +35,3 @@ if( OC_User::setPassword( $username, $password )){
 else{
 	OC_JSON::error(array("data" => array( "message" => "Unable to change password" )));
 }
-
-?>
diff --git a/settings/ajax/creategroup.php b/settings/ajax/creategroup.php
index a7fab1c45be..16cf57aebb7 100644
--- a/settings/ajax/creategroup.php
+++ b/settings/ajax/creategroup.php
@@ -10,6 +10,8 @@ if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' ))
 	exit();
 }
 
+OCP\JSON::callCheck();
+
 $groupname = $_POST["groupname"];
 
 // Does the group exist?
@@ -25,5 +27,3 @@ if( OC_Group::createGroup( $groupname )){
 else{
 	OC_JSON::error(array("data" => array( "message" => "Unable to add group" )));
 }
-
-?>
diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php
index 508b4bf94ca..eaca5b50745 100644
--- a/settings/ajax/createuser.php
+++ b/settings/ajax/createuser.php
@@ -5,14 +5,33 @@ require_once('../../lib/base.php');
 OCP\JSON::callCheck();
 
 // Check if we are a user
-if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
+if( !OC_User::isLoggedIn() || (!OC_Group::inGroup( OC_User::getUser(), 'admin' ) && !OC_SubAdmin::isSubAdmin(OC_User::getUser()))){
 	OC_JSON::error(array("data" => array( "message" => "Authentication error" )));
 	exit();
 }
+OCP\JSON::callCheck();
+
+$isadmin = OC_Group::inGroup(OC_User::getUser(),'admin')?true:false;
 
-$groups = array();
-if( isset( $_POST["groups"] )){
-	$groups = $_POST["groups"];
+if($isadmin){
+	$groups = array();
+	if( isset( $_POST["groups"] )){
+		$groups = $_POST["groups"];
+	}
+}else{
+	if(isset( $_POST["groups"] )){
+		$groups = array();
+		foreach($_POST["groups"] as $group){
+			if(OC_SubAdmin::isGroupAccessible(OC_User::getUser(), $group)){
+				$groups[] = $group;
+			}
+		}
+		if(count($groups) == 0){
+			$groups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
+		}
+	}else{
+		$groups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
+	}
 }
 $username = $_POST["username"];
 $password = $_POST["password"];
@@ -36,5 +55,3 @@ try {
 } catch (Exception $exception) {
 	OC_JSON::error(array("data" => array( "message" => $exception->getMessage())));
 }
-
-?>
diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php
index bd53a50210c..fe3922fa02b 100644
--- a/settings/ajax/enableapp.php
+++ b/settings/ajax/enableapp.php
@@ -6,8 +6,9 @@ OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
 OC_JSON::setContentTypeHeader();
 
-if(OC_App::enable($_POST['appid'])){
-	OC_JSON::success();
-}else{
+$appid = OC_App::enable($_POST['appid']);
+if($appid !== false) {
+	OC_JSON::success(array('data' => array('appid' => $appid)));
+} else {
 	OC_JSON::error();
 }
diff --git a/settings/ajax/lostpassword.php b/settings/ajax/lostpassword.php
index 976fdff245f..803a424854c 100644
--- a/settings/ajax/lostpassword.php
+++ b/settings/ajax/lostpassword.php
@@ -2,7 +2,6 @@
 
 // Init owncloud
 require_once('../../lib/base.php');
-
 OC_JSON::checkLoggedIn();
 OCP\JSON::callCheck();
 
@@ -16,5 +15,3 @@ if( isset( $_POST['email'] ) && filter_var( $_POST['email'], FILTER_VALIDATE_EMA
 }else{
 	OC_JSON::error(array("data" => array( "message" => $l->t("Invalid email") )));
 }
-
-?>
\ No newline at end of file
diff --git a/settings/ajax/openid.php b/settings/ajax/openid.php
index 58d071255c2..bf4ead06020 100644
--- a/settings/ajax/openid.php
+++ b/settings/ajax/openid.php
@@ -6,6 +6,7 @@ require_once('../../lib/base.php');
 $l=OC_L10N::get('settings');
 
 OC_JSON::checkLoggedIn();
+OCP\JSON::callCheck();
 OC_JSON::checkAppEnabled('user_openid');
 
 // Get data
@@ -16,5 +17,3 @@ if( isset( $_POST['identity'] ) ){
 }else{
 	OC_JSON::error(array("data" => array( "message" => $l->t("Invalid request") )));
 }
-
-?>
diff --git a/settings/ajax/removegroup.php b/settings/ajax/removegroup.php
index 19cbe51fd51..f8c2065956c 100644
--- a/settings/ajax/removegroup.php
+++ b/settings/ajax/removegroup.php
@@ -15,5 +15,3 @@ if( OC_Group::deleteGroup( $name )){
 else{
 	OC_JSON::error(array("data" => array( "message" => "Unable to delete group" )));
 }
-
-?>
diff --git a/settings/ajax/removeuser.php b/settings/ajax/removeuser.php
index 63388b3ca68..bfab13a68c8 100644
--- a/settings/ajax/removeuser.php
+++ b/settings/ajax/removeuser.php
@@ -3,11 +3,17 @@
 // Init owncloud
 require_once('../../lib/base.php');
 
-OC_JSON::checkAdminUser();
+OC_JSON::checkSubAdminUser();
 OCP\JSON::callCheck();
 
 $username = $_POST["username"];
 
+if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)){
+	$l = OC_L10N::get('core');
+	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
+	exit();
+}
+
 // Return Success story
 if( OC_User::deleteUser( $username )){
 	OC_JSON::success(array("data" => array( "username" => $username )));
@@ -15,5 +21,3 @@ if( OC_User::deleteUser( $username )){
 else{
 	OC_JSON::error(array("data" => array( "message" => "Unable to delete user" )));
 }
-
-?>
diff --git a/settings/ajax/setlanguage.php b/settings/ajax/setlanguage.php
index bc70d09ac92..54b103cd4fe 100644
--- a/settings/ajax/setlanguage.php
+++ b/settings/ajax/setlanguage.php
@@ -8,6 +8,7 @@ $l=OC_L10N::get('settings');
 OC_JSON::checkLoggedIn();
 OCP\JSON::callCheck();
 
+
 // Get data
 if( isset( $_POST['lang'] ) ){
 	$languageCodes=OC_L10N::findAvailableLanguages();
@@ -21,5 +22,3 @@ if( isset( $_POST['lang'] ) ){
 }else{
 	OC_JSON::error(array("data" => array( "message" => $l->t("Invalid request") )));
 }
-
-?>
diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index 44c2067824b..2a30b1d97e6 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -8,11 +8,17 @@
 // Init owncloud
 require_once('../../lib/base.php');
 
-OC_JSON::checkAdminUser();
+OC_JSON::checkSubAdminUser();
 OCP\JSON::callCheck();
 
 $username = isset($_POST["username"])?$_POST["username"]:'';
 
+if(($username == '' && !OC_Group::inGroup(OC_User::getUser(), 'admin')) || (!OC_Group::inGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username))){
+	$l = OC_L10N::get('core');
+	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
+	exit();
+}
+
 //make sure the quota is in the expected format
 $quota=$_POST["quota"];
 if($quota!='none' and $quota!='default'){
@@ -35,4 +41,3 @@ if($username){
 }
 OC_JSON::success(array("data" => array( "username" => $username ,'quota'=>$quota)));
 
-?>
diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php
index 02b2b6319a6..75cd0858bbc 100644
--- a/settings/ajax/togglegroups.php
+++ b/settings/ajax/togglegroups.php
@@ -3,7 +3,7 @@
 // Init owncloud
 require_once('../../lib/base.php');
 
-OC_JSON::checkAdminUser();
+OC_JSON::checkSubAdminUser();
 OCP\JSON::callCheck();
 
 $success = true;
@@ -11,7 +11,13 @@ $error = "add user to";
 $action = "add";
 
 $username = $_POST["username"];
-$group = htmlentities($_POST["group"]);
+$group = OC_Util::sanitizeHTML($_POST["group"]);
+
+if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && (!OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username) || !OC_SubAdmin::isGroupAccessible(OC_User::getUser(), $group))){
+	$l = OC_L10N::get('core');
+	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
+	exit();
+}
 
 if(!OC_Group::groupExists($group)){
 	OC_Group::createGroup($group);
@@ -38,5 +44,3 @@ if( $success ){
 else{
 	OC_JSON::error(array("data" => array( "message" => "Unable to $error group $group" )));
 }
-
-?>
diff --git a/settings/ajax/togglesubadmins.php b/settings/ajax/togglesubadmins.php
new file mode 100644
index 00000000000..42db8450302
--- /dev/null
+++ b/settings/ajax/togglesubadmins.php
@@ -0,0 +1,19 @@
+<?php
+
+// Init owncloud
+require_once('../../lib/base.php');
+
+OC_JSON::checkAdminUser();
+OCP\JSON::callCheck();
+
+$username = $_POST["username"];
+$group = OC_Util::sanitizeHTML($_POST["group"]);
+
+// Toggle group
+if(OC_SubAdmin::isSubAdminofGroup($username, $group)){
+	OC_SubAdmin::deleteSubAdmin($username, $group);
+}else{
+	OC_SubAdmin::createSubAdmin($username, $group);
+}
+
+OC_JSON::success();
\ No newline at end of file
diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php
new file mode 100644
index 00000000000..b89b8c55ef0
--- /dev/null
+++ b/settings/ajax/userlist.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Michael Gapczynski
+ * @copyright 2012 Michael Gapczynski mtgap@owncloud.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+require_once '../../lib/base.php';
+
+OC_JSON::callCheck();
+OC_JSON::checkSubAdminUser();
+if (isset($_GET['offset'])) {
+	$offset = $_GET['offset'];
+} else {
+	$offset = 0;
+}
+$users = array();
+if (OC_Group::inGroup(OC_User::getUser(), 'admin')) {
+	$batch = OC_User::getUsers('', 10, $offset);
+	foreach ($batch as $user) {
+		$users[] = array('name' => $user, 'groups' => join(', ', OC_Group::getUserGroups($user)), 'subadmin' => join(', ',OC_SubAdmin::getSubAdminsGroups($user)), 'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
+	}
+} else {
+	$groups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
+	$batch = OC_Group::usersInGroups($groups, '', 10, $offset);
+	foreach ($batch as $user) {
+		$users[] = array('name' => $user, 'groups' => join(', ', OC_Group::getUserGroups($user)), 'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
+	}
+}
+OC_JSON::success(array('data' => $users));
\ No newline at end of file
diff --git a/settings/appinfo/app.php b/settings/appinfo/app.php
deleted file mode 100644
index d18bcdbff0d..00000000000
--- a/settings/appinfo/app.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-OC_App::register( array( "id" => "settings", "name" => "Settings" ));
-OC_App::register( array( "order" => 1, "id" => "admin", "name" => "Administration" ));
-OC_App::register( array( "order" => 1, "id" => "help", "name" => "Help" ));
-
-?>
diff --git a/settings/apps.php b/settings/apps.php
index 341d9381dc8..6feede7741c 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -4,7 +4,7 @@
 * ownCloud
 *
 * @author Frank Karlitschek
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -47,6 +47,7 @@ foreach($registeredApps as $app){
 			$info['internallabel']='3rd Party App';
 		}
 		$info['preview']='trans.png';
+		$info['version']=OC_App::getAppVersion($app);
 		$apps[]=$info;
 	}
 }
@@ -59,41 +60,9 @@ function app_sort($a, $b){
 }
 usort($apps, 'app_sort');
 
-// apps from external repo via OCS
- $catagoryNames=OC_OCSClient::getCategories();
- if(is_array($catagoryNames)){
- 	$categories=array_keys($catagoryNames);
-	$page=0;
- 	$externalApps=OC_OCSClient::getApplications($categories,$page);
- 	foreach($externalApps as $app){
-		// show only external apps that are not exist yet
-		$local=false;
- 		foreach($apps as $a){
-			if($a['name']==$app['name']) $local=true;			
-		}
-
-		if(!$local) {
- 			if($app['preview']=='') $pre='trans.png'; else $pre=$app['preview'];
-	 		$apps[]=array(
- 				'name'=>$app['name'],
- 				'id'=>$app['id'],
- 				'active'=>false,
- 				'description'=>$app['description'],
- 				'author'=>$app['personid'],
- 				'license'=>$app['license'],
- 				'preview'=>$pre,
- 				'internal'=>false,
- 				'internallabel'=>'3rd Party App',
- 			);
-		}
- 	}
- }
-
-
-
 $tmpl = new OC_Template( "settings", "apps", "user" );
-$tmpl->assign('apps',$apps);
+$tmpl->assign('apps',$apps, false);
+$appid = (isset($_GET['appid'])?strip_tags($_GET['appid']):'');
+$tmpl->assign('appid',$appid);
 
 $tmpl->printPage();
-
-?>
diff --git a/settings/css/settings.css b/settings/css/settings.css
index f45fa9bc019..373b15bff68 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -22,14 +22,14 @@ form { display:inline; }
 table:not(.nostyle) th { height:2em; color:#999; }
 table:not(.nostyle) th, table:not(.nostyle) td { border-bottom:1px solid #ddd; padding:0 .5em; padding-left:.8em; text-align:left; font-weight:normal; }
 td.name, td.password { padding-left:.8em; }
-td.password>img, td.remove>img, td.quota>img { visibility:hidden; }
+td.password>img, td.remove>a, td.quota>img { visibility:hidden; }
 td.password, td.quota { width:12em; cursor:pointer; }
 td.password>span, td.quota>span { margin-right: 1.2em; color: #C7C7C7; }
 
 td.remove { width:1em; padding-right:1em; }
 tr:hover>td.password>span { margin:0; cursor:pointer; }
-tr:hover>td.remove>img, tr:hover>td.password>img, tr:hover>td.quota>img { visibility:visible; cursor:pointer; }
-tr:hover>td.remove>img { float:right; }
+tr:hover>td.remove>a, tr:hover>td.password>img, tr:hover>td.quota>img { visibility:visible; cursor:pointer; }
+tr:hover>td.remove>a { float:right; }
 li.selected { background-color:#ddd; }
 #content>table:not(.nostyle) { margin-top:3em; }
 table:not(.nostyle) { width:100%; }
@@ -43,16 +43,24 @@ div.quota>span { position:absolute; right:0em; white-space:nowrap; top: 0.7em }
 select.quota.active { background: #fff; }
 
 /* APPS */
+.appinfo { margin: 1em; }
+h3 { font-size: 1.4em; font-weight: bold; }
+ul.applist li { height: 2.2em; padding: 0.2em 0.2em 0.2em 0.8em !important; }
 li { color:#888; }
 li.active { color:#000; }
-small.externalapp { color:#FFF; background-color:#BBB; font-weight:bold; font-size:6pt; padding:4px; border-radius: 4px;}
-span.version { margin-left:3em; color:#ddd; }
+small.externalapp { color:#FFF; background-color:#BBB; font-weight:bold; font-size: 0.6em; margin: 0; padding: 0.1em 0.2em; border-radius: 4px;}
+small.externalapp.list { float: right; }
+span.version { margin-left:3em; margin-right:3em; color:#555; }
+
+.app { position: relative; display: inline-block; padding: 0.2em 0 0.2em 0 !important; text-overflow: hidden; overflow: hidden; white-space: nowrap; /*transition: .2s max-width linear; -o-transition: .2s max-width linear; -moz-transition: .2s max-width linear; -webkit-transition: .2s max-width linear; -ms-transition: .2s max-width linear;*/ }
+.app.externalapp { max-width: 12.5em; z-index: 100; }
+/* Transition to complete width! */
+.app:hover, .app:active { max-width: inherit; }
 
 /* LOG */
 #log { white-space:normal; }
-/* Don't show blank images */
-img[src=""] { display:none}
 
 /* ADMIN */
 span.securitywarning {color:#C33; font-weight:bold; }
-
+h3.settingsNotice { font-size: 1.2em; }
+.settingsNotice { font-weight:bold; padding: 0.5em 0; }
diff --git a/settings/help.php b/settings/help.php
index 48fcec32782..b1dc1c5be77 100644
--- a/settings/help.php
+++ b/settings/help.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2011, Frank Karlitschek karlitschek@kde.org
+ * 2012 Frank Karlitschek frank@owncloud.org
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
  */
@@ -25,5 +25,3 @@ $tmpl->assign( "kbe", $kbe );
 $tmpl->assign( "pagecount", $pagecount );
 $tmpl->assign( "page", $page );
 $tmpl->printPage();
-
-?>
diff --git a/settings/img/admin.png b/settings/img/admin.png
index c1e6d6b8a7f..13d653f92a8 100644
--- a/settings/img/admin.png
+++ b/settings/img/admin.png
diff --git a/settings/img/apps.png b/settings/img/apps.png
index 17f47d632b9..e9845d012be 100644
--- a/settings/img/apps.png
+++ b/settings/img/apps.png
diff --git a/settings/img/help.png b/settings/img/help.png
index 2257d144d11..37ccb356830 100644
--- a/settings/img/help.png
+++ b/settings/img/help.png
diff --git a/settings/img/log.png b/settings/img/log.png
index c84b3b29f19..b34a58f844c 100644
--- a/settings/img/log.png
+++ b/settings/img/log.png
diff --git a/settings/img/personal.png b/settings/img/personal.png
index 8204028f70e..8edc5a16cd6 100644
--- a/settings/img/personal.png
+++ b/settings/img/personal.png
diff --git a/settings/img/users.png b/settings/img/users.png
index f56e2442c9e..79ad3d667e1 100644
--- a/settings/img/users.png
+++ b/settings/img/users.png
diff --git a/settings/js/admin.js b/settings/js/admin.js
index 4f295ab6f5d..409594a4b94 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -3,5 +3,11 @@ $(document).ready(function(){
 		$.post(OC.filePath('settings','ajax','setloglevel.php'), { level: $(this).val() },function(){
 			OC.Log.reload();
 		} );
-	})
+	});
+
+	$('#backgroundjobs input').change(function(){
+		if($(this).attr('checked')){
+			$.post(OC.filePath('settings','ajax','setbackgroundjobsmode.php'), { mode: $(this).val() });
+		}
+	});
 });
\ No newline at end of file
diff --git a/settings/js/apps.js b/settings/js/apps.js
index f6e08b608bd..cfddf4a48a1 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -1,13 +1,108 @@
 /**
  * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
+ * Copyright (c) 2012, Thomas Tanghus <thomas@tanghus.net>
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
  */
 
+OC.Settings = OC.Settings || {};
+OC.Settings.Apps = OC.Settings.Apps || {
+	loadOCS:function() {
+		$.getJSON(OC.filePath('settings', 'ajax', 'apps/ocs.php'), function(jsondata) {
+			if(jsondata.status == 'success'){
+				var apps = jsondata.data;
+				$.each(apps, function(b, appdata) {
+					OC.Settings.Apps.insertApp(appdata);
+				});
+			} else {
+				OC.dialogs.alert(jsondata.data.message, t('core', 'Error'));
+			}
+		});
+	},
+	loadApp:function(app) {
+		var page = $('#rightcontent');
+		page.find('p.license').show();
+		page.find('span.name').text(app.name);
+		page.find('small.externalapp').text(app.internallabel);
+		if (app.version) {
+			page.find('span.version').text(app.version);
+		} else {
+			page.find('span.version').text('');
+		}
+		page.find('p.description').text(app.description);
+		page.find('img.preview').attr('src', app.preview);
+		page.find('small.externalapp').attr('style', 'visibility:visible');
+		page.find('span.author').text(app.author);
+		page.find('span.licence').text(app.licence);
+
+		page.find('input.enable').show();
+		page.find('input.enable').val((app.active) ? t('settings', 'Disable') : t('settings', 'Enable'));
+		page.find('input.enable').data('appid', app.id);
+		page.find('input.enable').data('active', app.active);
+		if (app.internal == false) {
+			page.find('p.appslink').show();
+			page.find('a').attr('href', 'http://apps.owncloud.com/content/show.php?content=' + app.id);
+		} else {
+			page.find('p.appslink').hide();
+		}
+	},
+	enableApp:function(appid, active, element) {
+		console.log('enableApp:', appid, active, element);
+		var appitem=$('#leftcontent li[data-id="'+appid+'"]');
+		appData = appitem.data('app');
+		appData.active = !active;
+		appitem.data('app', appData);
+		if(active) {
+			$.post(OC.filePath('settings','ajax','disableapp.php'),{appid:appid},function(result) {
+				if(!result || result.status!='success') {
+					OC.dialogs.alert('Error while disabling app','Error');
+				}
+				else {
+					element.data('active',false);
+					element.val(t('settings','Enable'));
+				}
+			},'json');
+			$('#leftcontent li[data-id="'+appid+'"]').removeClass('active');
+		} else {
+			$.post(OC.filePath('settings','ajax','enableapp.php'),{appid:appid},function(result) {
+				if(!result || result.status!='success') {
+					OC.dialogs.alert('Error while enabling app','Error');
+				}
+				else {
+					element.data('active',true);
+					element.val(t('settings','Disable'));
+				}
+			},'json');
+			$('#leftcontent li[data-id="'+appid+'"]').addClass('active');
+		}
+	},
+	insertApp:function(appdata) {
+		var applist = $('#leftcontent li');
+		var app =
+				$('<li data-id="' + appdata.id + '" data-type="external" data-installed="0">'
+				+ '<a class="app externalapp" href="' + OC.filePath('settings', 'apps', 'index.php') + '&appid=' + appdata.id+'">'
+				+ appdata.name+'</a><small class="externalapp list">3rd party</small></li>');
+		app.data('app', appdata);
+		var added = false;
+		applist.each(function() {
+			if(!parseInt($(this).data('installed')) && $(this).find('a').text().toLowerCase() > appdata.name.toLowerCase()) {
+				$(this).before(app);
+				added = true;
+				return false; // dang, remember this to get out of loop
+			}
+		});
+		if(!added) {
+			applist.last().after(app);
+		}
+		return app;
+	}
+}
+
 $(document).ready(function(){
 	$('#leftcontent li').each(function(index,li){
-		var app=$.parseJSON($(this).children('span').text());
+		var app = $.parseJSON($(this).children('span').text());
 		$(li).data('app',app);
+		$(this).find('span.hidden').remove();
 	});
 	$('#leftcontent li').keydown(function(event) {
 		if (event.which == 13 || event.which == 32) {
@@ -15,56 +110,33 @@ $(document).ready(function(){
 		}
 		return false;
 	});
-	$('#leftcontent li').click(function(){
-		var app=$(this).data('app');
-		$('#rightcontent p').show();
-		$('#rightcontent span.name').text(app.name);
-		$('#rightcontent small.externalapp').text(app.internallabel);
-		$('#rightcontent span.version').text(app.version);
-		$('#rightcontent p.description').text(app.description);
-		$('#rightcontent img.preview').attr('src',app.preview);
-		$('#rightcontent small.externalapp').attr('style','visibility:visible');
-		$('#rightcontent span.author').text(app.author);
-		$('#rightcontent span.licence').text(app.licence);
-		
-		$('#rightcontent input.enable').show();
-		$('#rightcontent input.enable').val((app.active)?t('settings','Disable'):t('settings','Enable'));
-		$('#rightcontent input.enable').data('appid',app.id);
-		$('#rightcontent input.enable').data('active',app.active);
+
+	$(document).on('click', '#leftcontent', function(event){
+		var tgt = $(event.target);
+		if (tgt.is('li') || tgt.is('a')) {
+			var item = tgt.is('li') ? $(tgt) : $(tgt).parent();
+			var app = item.data('app');
+			OC.Settings.Apps.loadApp(app);
+		}
 		return false;
 	});
 	$('#rightcontent input.enable').click(function(){
 		var element = $(this);
-		var app=$(this).data('appid');
+		var appid=$(this).data('appid');
 		var active=$(this).data('active');
-		if(app){
-			if(active){
-				$.post(OC.filePath('settings','ajax','disableapp.php'),{appid:app},function(result){
-					if(!result || result.status!='success'){
-						OC.dialogs.alert('Error while disabling app','Error');
-					}
-					else {
-						element.data('active',false);
-						element.val(t('settings','Enable'));
-						var appData=$('#leftcontent li[data-id="'+app+'"]');
-						appData.active=false;
-					}
-				},'json');
-				$('#leftcontent li[data-id="'+app+'"]').removeClass('active');
-			}else{
-				$.post(OC.filePath('settings','ajax','enableapp.php'),{appid:app},function(result){
-					if(!result || result.status!='success'){
-						OC.dialogs.alert('Error while enabling app','Error');
-					}
-					else {
-						element.data('active',true);
-						element.val(t('settings','Disable'));
-						var appData=$('#leftcontent li[data-id="'+app+'"]');
-						appData.active=true;
-					}
-				},'json');
-				$('#leftcontent li[data-id="'+app+'"]').addClass('active');
-			}
+		if(appid) {
+			OC.Settings.Apps.enableApp(appid, active, element);
 		}
 	});
+
+	if(appid) {
+		var item = $('#leftcontent li[data-id="'+appid+'"]');
+		if(item) {
+			item.trigger('click');
+			item.addClass('active');
+			$('#leftcontent').animate({scrollTop: $(item).offset().top-70}, 'slow','swing');
+		}
+	}
+
+	OC.Settings.Apps.loadOCS();
 });
diff --git a/settings/js/users.js b/settings/js/users.js
index 784f8b888cb..bf0bd108640 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -4,32 +4,205 @@
  * See the COPYING-README file.
  */
 
-$(document).ready(function(){
-	function setQuota(uid,quota,ready){
-		$.post(
-			OC.filePath('settings','ajax','setquota.php'),
-			{username:uid,quota:quota},
-			function(result){
-				if(ready){
-					ready(result.data.quota);
+UserList={
+	useUndo:true,
+	
+	/**
+	 * @brief Initiate user deletion process in UI
+	 * @param string uid the user ID to be deleted
+	 *
+	 * Does not actually delete the user; it sets them for
+	 * deletion when the current page is unloaded, at which point 
+	 * finishDelete() completes the process. This allows for 'undo'.
+	 */
+	do_delete:function( uid ) {
+		
+		UserList.deleteUid = uid;
+		
+		// Set undo flag
+		UserList.deleteCanceled = false;
+		
+		// Provide user with option to undo
+		$('#notification').html(t('users', 'deleted')+' '+uid+'<span class="undo">'+t('users', 'undo')+'</span>');
+		$('#notification').data('deleteuser',true);
+		$('#notification').fadeIn();
+			
+	},
+	
+	/**
+	 * @brief Delete a user via ajax
+	 * @param bool ready whether to use ready() upon completion
+	 *
+	 * Executes deletion via ajax of user identified by property deleteUid 
+	 * if 'undo' has not been used.  Completes the user deletion procedure 
+	 * and reflects success in UI.
+	 */
+	finishDelete:function( ready ){
+		
+		// Check deletion has not been undone
+		if( !UserList.deleteCanceled && UserList.deleteUid ){
+			
+			// Delete user via ajax
+			$.ajax({
+				type: 'POST',
+				url: OC.filePath('settings', 'ajax', 'removeuser.php'),
+				async: false,
+				data: { username: UserList.deleteUid },
+				success: function(result) {
+					if (result.status == 'success') {
+						// Remove undo option, & remove user from table
+						$('#notification').fadeOut();
+						$('tr').filterAttr('data-uid', UserList.deleteUid).remove();
+						UserList.deleteCanceled = true;
+						UserList.deleteFiles = null;
+						if (ready) {
+							ready();
+						}
+					}
 				}
+			});
+ 		}
+	},
+
+	add:function(username, groups, subadmin, quota, sort) {
+		var tr = $('tbody tr').first().clone();
+		tr.data('uid', username);
+		tr.find('td.name').text(username);
+		var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="Groups">');
+		groupsSelect.data('username', username);
+		groupsSelect.data('userGroups', groups);
+		tr.find('td.groups').empty();
+		if (tr.find('td.subadmins').length > 0) {
+			var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('files', 'Group Admin') + '">');
+			subadminSelect.data('username', username);
+			subadminSelect.data('userGroups', groups);
+			subadminSelect.data('subadmin', subadmin);
+			tr.find('td.subadmins').empty();
+		}
+		var allGroups = String($('#content table').data('groups')).split(', ');
+		$.each(allGroups, function(i, group) {
+			groupsSelect.append($('<option value="'+group+'">'+group+'</option>'));
+			if (typeof subadminSelect !== 'undefined' && group != 'admin') {
+				subadminSelect.append($('<option value="'+group+'">'+group+'</option>'));
 			}
-		);
-	}
-	
-	function applyMultiplySelect(element){
+		});
+		tr.find('td.groups').append(groupsSelect);
+		UserList.applyMultiplySelect(groupsSelect);
+		tr.find('td.subadmins').append(subadminSelect);
+		UserList.applyMultiplySelect(subadminSelect);
+		if (tr.find('td.remove img').length == 0 && OC.currentUser != username) {
+			tr.find('td.remove').append($('<img alt="Delete" title="'+t('settings','Delete')+'" class="svg action" src="'+OC.imagePath('core','actions/delete')+'"/>'));
+		} else if (OC.currentUser == username) {
+			tr.find('td.remove a').remove();
+		}
+		var quotaSelect = tr.find('select.quota-user');
+		if (quota == 'default') {
+			quotaSelect.find('option').attr('selected', null);
+			quotaSelect.find('option').first().attr('selected', 'selected');
+			quotaSelect.data('previous', 'default');
+		} else {
+			if (quotaSelect.find('option[value="'+quota+'"]').length > 0) {
+				quotaSelect.find('option[value="'+quota+'"]').attr('selected', 'selected');
+			} else {
+				quotaSelect.append('<option value="'+quota+'" selected="selected">'+quota+'</option>');
+			}
+		}
+		var added = false;
+		if (sort) {
+			username = username.toLowerCase();
+			$('tbody tr').each(function() {
+				if (username < $(this).data('uid').toLowerCase()) {
+					$(tr).insertBefore($(this));
+					added = true;
+					return false;
+				}
+			});
+		} 
+		if (!added) {
+			$(tr).appendTo('tbody');
+		}
+		return tr;
+	},
+
+	update:function() {
+		if (typeof UserList.offset === 'undefined') {
+			UserList.offset = $('tbody tr').length;
+		}
+		$.get(OC.filePath('settings', 'ajax', 'userlist.php'), { offset: UserList.offset }, function(result) {
+			if (result.status === 'success') {
+				$.each(result.data, function(index, user) {
+					var tr = UserList.add(user.name, user.groups, user.subadmin, user.quota, false);
+					UserList.offset++;
+					if (index == 9) {
+						$(tr).bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
+							$(this).unbind(event);
+							UserList.update();
+						});
+					}
+				});
+			}
+		});
+	},
+
+	applyMultiplySelect:function(element) {
 		var checked=[];
 		var user=element.data('username');
-		if(element.data('userGroups')){
-			checked=element.data('userGroups').split(', ');
+		if($(element).attr('class') == 'groupsselect'){
+			if(element.data('userGroups')){
+				checked=String(element.data('userGroups')).split(', ');
+			}
+			if(user){
+				var checkHandeler=function(group){
+					if(user==OC.currentUser && group=='admin'){
+						return false;
+					}
+					if(!isadmin && checked.length == 1 && checked[0] == group){
+						return false;
+					}
+					$.post(
+						OC.filePath('settings','ajax','togglegroups.php'),
+						{
+							username:user,
+							group:group
+						},
+						function(){}
+					);
+				};
+			}else{
+				checkHandeler=false;
+			}
+			var addGroup = function(group) {
+				$('select[multiple]').each(function(index, element) {
+					if ($(element).find('option[value="'+group +'"]').length == 0) {
+						$(element).append('<option value="'+group+'">'+group+'</option>');
+					}
+				})
+			};
+			var label;
+			if(isadmin){
+				label = t('files', 'add group');
+			}else{
+				label = null;
+			}
+			element.multiSelect({
+				createCallback:addGroup,
+				createText:label,
+				checked:checked,
+				oncheck:checkHandeler,
+				onuncheck:checkHandeler,
+				minWidth: 100,
+			});
 		}
-		if(user){
+		if($(element).attr('class') == 'subadminsselect'){
+			if(element.data('subadmin')){
+				checked=String(element.data('subadmin')).split(', ');
+			}
 			var checkHandeler=function(group){
-				if(user==OC.currentUser && group=='admin'){
+				if(group=='admin'){
 					return false;
 				}
 				$.post(
-					OC.filePath('settings','ajax','togglegroups.php'),
+					OC.filePath('settings','ajax','togglesubadmins.php'),
 					{
 						username:user,
 						group:group
@@ -37,39 +210,55 @@ $(document).ready(function(){
 					function(){}
 				);
 			};
-		}else{
-			checkHandeler=false;
+			
+			var addSubAdmin = function(group) {
+				$('select[multiple]').each(function(index, element) {
+					if ($(element).find('option[value="'+group +'"]').length == 0) {
+						$(element).append('<option value="'+group+'">'+group+'</option>');
+					}
+				})
+			};
+			element.multiSelect({
+				createCallback:addSubAdmin,
+				createText:null,
+				checked:checked,
+				oncheck:checkHandeler,
+				onuncheck:checkHandeler,
+				minWidth: 100,
+			});
 		}
-		var addGroup = function(group) {
-			$('select[multiple]').each(function(index, element) {
-				if ($(element).find('option[value="'+group +'"]').length == 0) {
-					$(element).append('<option value="'+group+'">'+group+'</option>');
-				}
-			})
-		};
-		element.multiSelect({
-			createCallback:addGroup,
-			createText:'add group',
-			checked:checked,
-			oncheck:checkHandeler,
-			onuncheck:checkHandeler,
-			minWidth: 100,
-		});
 	}
-	$('select[multiple]').each(function(index,element){
-		applyMultiplySelect($(element));
+}
+
+$(document).ready(function(){
+
+	$('tbody tr:last').bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
+		UserList.update();
 	});
-	
-	$('td.remove>img').live('click',function(event){
-		var uid=$(this).parent().parent().data('uid');
+
+	function setQuota(uid,quota,ready){
 		$.post(
-			OC.filePath('settings','ajax','removeuser.php'),
-			{username:uid},
+			OC.filePath('settings','ajax','setquota.php'),
+			{username:uid,quota:quota},
 			function(result){
-			
+				if(ready){
+					ready(result.data.quota);
+				}
 			}
 		);
-		$(this).parent().parent().remove();
+	}
+	
+	
+	$('select[multiple]').each(function(index,element){
+		UserList.applyMultiplySelect($(element));
+	});
+	
+	$('td.remove>a').live('click',function(event){
+		var row = $(this).parent().parent();
+		var uid = $(row).data('uid');
+		$(row).hide();
+		// Call function for handling delete/undo
+		UserList.do_delete(uid);
 	});
 	
 	$('td.password>img').live('click',function(event){
@@ -190,36 +379,28 @@ $(document).ready(function(){
 			function(result){
 				if(result.status!='success'){
 					OC.dialogs.alert(result.data.message, 'Error creating user');
-				}
-				else {
-					var tr=$('#content table tbody tr').first().clone();
-					tr.attr('data-uid',username);
-					tr.find('td.name').text(username);
-					var select=$('<select multiple="multiple" data-placehoder="Groups" title="Groups">');
-					select.data('username',username);
-					select.data('userGroups',groups.join(', '));
-					tr.find('td.groups').empty();
-					var allGroups=$('#content table').data('groups').split(', ');
-					for(var i=0;i<groups.length;i++){
-						if(allGroups.indexOf(groups[i])==-1){
-							allGroups.push(groups[i]);
-						}
-					}
-					$.each(allGroups,function(i,group){
-						select.append($('<option value="'+group+'">'+group+'</option>'));
-					});
-					tr.find('td.groups').append(select);
-					if(tr.find('td.remove img').length==0){
-						tr.find('td.remove').append($('<img alt="Delete" title="'+t('settings','Delete')+'" class="svg action" src="'+OC.imagePath('core','actions/delete')+'"/>'));
-					}
-					applyMultiplySelect(select);
-					$('#content table tbody').last().append(tr);
-
-					tr.find('select.quota-user option').attr('selected',null);
-					tr.find('select.quota-user option').first().attr('selected','selected');
-					tr.find('select.quota-user').data('previous','default');
+				} else {
+					UserList.add(username, result.data.groups, null, 'default', true);
 				}
 			}
 		);
 	});
+	// Handle undo notifications
+	$('#notification').hide();
+	$('#notification .undo').live('click', function() {
+		if($('#notification').data('deleteuser')) {
+			$('tbody tr').each(function(index, row) {
+				if ($(row).data('uid') == UserList.deleteUid) {
+					$(row).show();
+				}
+			});
+			UserList.deleteCanceled=true;
+			UserList.deleteFiles=null;
+		}
+		$('#notification').fadeOut();
+	});
+	UserList.useUndo=('onbeforeunload' in window)
+	$(window).bind('beforeunload', function (){
+		UserList.finishDelete(null);
+	});
 });
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 6e0c6e2fee4..4464f7596d3 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -1,27 +1,40 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Е-пощата е записана",
+"Invalid email" => "Неправилна е-поща",
 "OpenID Changed" => "OpenID е сменено",
 "Invalid request" => "Невалидна заявка",
 "Language changed" => "Езика е сменен",
+"Disable" => "Изключване",
+"Enable" => "Включване",
+"Saving..." => "Записване...",
 "Select an App" => "Изберете програма",
 "-licensed" => "-лицензирано",
 "by" => "от",
+"Documentation" => "Документация",
 "Ask a question" => "Задайте въпрос",
 "Problems connecting to help database." => "Проблеми при свързване с помощната база",
 "Go there manually." => "Отидете ръчно.",
 "Answer" => "Отговор",
 "You use" => "Вие ползвате",
 "of the available" => "от наличните",
+"Download" => "Изтегляне",
 "Your password got changed" => "Вашата парола е сменена",
 "Unable to change your password" => "Невъзможна промяна на паролата",
 "Current password" => "Текуща парола",
 "New password" => "Нова парола",
 "show" => "показва",
 "Change password" => "Промяна на парола",
+"Email" => "Е-поща",
+"Your email address" => "Адресът на е-пощата ви",
+"Fill in an email address to enable password recovery" => "Въведете е-поща за възстановяване на паролата",
 "Language" => "Език",
+"Help translate" => "Помощ за превода",
 "use this address to connect to your ownCloud in your file manager" => "ползвай този адрес за връзка с Вашия ownCloud във файловия мениджър",
 "Name" => "Име",
 "Password" => "Парола",
 "Groups" => "Групи",
 "Create" => "Ново",
+"Default Quota" => "Квота по подразбиране",
+"Quota" => "Квота",
 "Delete" => "Изтриване"
 );
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 56e67c1a134..7b95d6f9af1 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -1,12 +1,26 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "No s'ha pogut carregar la llista des de l'App Store",
+"Email saved" => "S'ha desat el correu electrònic",
+"Invalid email" => "El correu electrònic no és vàlid",
 "OpenID Changed" => "OpenID ha canviat",
 "Invalid request" => "Sol.licitud no vàlida",
+"Authentication error" => "Error d'autenticació",
 "Language changed" => "S'ha canviat l'idioma",
+"Error" => "Error",
+"Disable" => "Desactiva",
+"Enable" => "Activa",
+"Saving..." => "S'està desant...",
 "__language_name__" => "Català",
+"Security Warning" => "Avís de seguretat",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "executa una tasca en carregar cada pàgina",
+"cron.php is registered at a webcron service" => "cron.php està registrat en un servei web cron",
+"use systems cron service" => "usa el servei cron del sistema",
 "Log" => "Registre",
 "More" => "Més",
-"Add your App" => "Afegeiu la vostra aplicació",
+"Add your App" => "Afegiu la vostra aplicació",
 "Select an App" => "Seleccioneu una aplicació",
+"See application page at apps.owncloud.com" => "Mireu la pàgina d'aplicacions a apps.owncloud.com",
 "-licensed" => "- amb llicència",
 "by" => "de",
 "Documentation" => "Documentació",
@@ -37,6 +51,7 @@
 "Create" => "Crea",
 "Default Quota" => "Quota per defecte",
 "Other" => "Altre",
+"Group Admin" => "Grup Admin",
 "Quota" => "Quota",
 "Delete" => "Suprimeix"
 );
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index bef172a9f58..ed7378b80c4 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -1,12 +1,26 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Nepodařílo se stáhnout seznam z App Store",
+"Email saved" => "E-mail uložen",
+"Invalid email" => "Neplatný e-mail",
 "OpenID Changed" => "OpenID změněn",
 "Invalid request" => "Chybný dotaz",
+"Authentication error" => "Chyba autorizace",
 "Language changed" => "Jazyk byl změněn",
+"Error" => "Chyba",
+"Disable" => "Vypnout",
+"Enable" => "Zapnout",
+"Saving..." => "Ukládám...",
 "__language_name__" => "Česky",
+"Security Warning" => "Bezpečnostní upozornění",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "spustit jednu úlohu s každou nataženou stranou",
+"cron.php is registered at a webcron service" => "cron.php je registrován jako služba webcron",
+"use systems cron service" => "použijte systémovou službu cron",
 "Log" => "Log",
 "More" => "Více",
 "Add your App" => "Přidat vaší aplikaci",
 "Select an App" => "Vyberte aplikaci",
+"See application page at apps.owncloud.com" => "Více na stránce s aplikacemi na apps.owncloud.com",
 "-licensed" => "-licencováno",
 "by" => "podle",
 "Documentation" => "Dokumentace",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 4cd7abfc90c..f17fb11fa7e 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -1,12 +1,24 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Kunne ikke indlæse listen fra App Store",
+"Email saved" => "Email adresse gemt",
+"Invalid email" => "Ugyldig email adresse",
 "OpenID Changed" => "OpenID ændret",
 "Invalid request" => "Ugyldig forespørgsel",
+"Authentication error" => "Adgangsfejl",
 "Language changed" => "Sprog ændret",
+"Error" => "Fejl",
+"Disable" => "Deaktiver",
+"Enable" => "Aktiver",
+"Saving..." => "Gemmer...",
 "__language_name__" => "Dansk",
+"Security Warning" => "Sikkerhedsadvarsel",
+"Cron" => "Cron",
+"cron.php is registered at a webcron service" => "cron.php er tilmeldt en webcron tjeneste",
 "Log" => "Log",
 "More" => "Mere",
 "Add your App" => "Tilføj din App",
 "Select an App" => "Vælg en App",
+"See application page at apps.owncloud.com" => "Se applikationens side på apps.owncloud.com",
 "-licensed" => "-licenseret",
 "by" => "af",
 "Documentation" => "Dokumentation",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index d1659e4d181..791a75fd7ca 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -1,42 +1,57 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Liste der Apps im Store konnte nicht geladen werden.",
+"Email saved" => "E-Mail gespeichert",
+"Invalid email" => "Ungültige E-Mail",
 "OpenID Changed" => "OpenID geändert",
 "Invalid request" => "Ungültige Anfrage",
+"Authentication error" => "Anmeldungsfehler",
 "Language changed" => "Sprache geändert",
+"Error" => "Fehler",
+"Disable" => "Deaktivieren",
+"Enable" => "Aktivieren",
+"Saving..." => "Speichern...",
 "__language_name__" => "Deutsch",
+"Security Warning" => "Sicherheitshinweis",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "Führe eine Aufgabe pro geladener Seite aus.",
+"cron.php is registered at a webcron service" => "cron.php ist beim Webcron-Service registriert",
+"use systems cron service" => "Nutze System-Cron-Service",
 "Log" => "Log",
-"More" => "mehr",
-"Add your App" => "Füge deine App hinzu",
+"More" => "Mehr",
+"Add your App" => "Fügen Sie Ihre App hinzu",
 "Select an App" => "Wähle eine Anwendung aus",
+"See application page at apps.owncloud.com" => "Weitere Anwendungen auf apps.owncloud.com",
 "-licensed" => "-lizenziert",
 "by" => "von",
 "Documentation" => "Dokumentation",
-"Managing Big Files" => "große Dateien verwalten",
+"Managing Big Files" => "Große Dateien verwalten",
 "Ask a question" => "Stell eine Frage",
 "Problems connecting to help database." => "Probleme bei der Verbindung zur Hilfe-Datenbank.",
 "Go there manually." => "Datenbank direkt besuchen.",
 "Answer" => "Antwort",
-"You use" => "Du nutzt",
+"You use" => "Sie nutzen",
 "of the available" => "der verfügbaren",
-"Desktop and Mobile Syncing Clients" => "Desktop und mobile synchronierungs Clients",
+"Desktop and Mobile Syncing Clients" => "Desktop- und mobile Synchronierungs-Clients",
 "Download" => "Download",
-"Your password got changed" => "Dein Passwort wurde geändert.",
+"Your password got changed" => "Ihr Passwort wurde geändert.",
 "Unable to change your password" => "Passwort konnte nicht geändert werden",
 "Current password" => "Aktuelles Passwort",
 "New password" => "Neues Passwort",
 "show" => "zeigen",
 "Change password" => "Passwort ändern",
 "Email" => "E-Mail",
-"Your email address" => "Ihre E-Mail Adresse",
-"Fill in an email address to enable password recovery" => "Trage eine E-Mail Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
+"Your email address" => "Ihre E-Mail-Adresse",
+"Fill in an email address to enable password recovery" => "Tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
 "Language" => "Sprache",
-"Help translate" => "Hilf bei der Übersetzung!",
-"use this address to connect to your ownCloud in your file manager" => "Benutze diese Adresse, um deine ownCloud mit deinem Dateimanager zu verbinden.",
+"Help translate" => "Helfen Sie bei der Übersetzung",
+"use this address to connect to your ownCloud in your file manager" => "Benutzen Sie diese Adresse, um Ihr ownCloud mit deinem Dateimanager zu verbinden.",
 "Name" => "Name",
 "Password" => "Passwort",
 "Groups" => "Gruppen",
 "Create" => "Anlegen",
-"Default Quota" => "Standard Quota",
-"Other" => "andere",
+"Default Quota" => "Standard-Quota",
+"Other" => "Andere",
+"Group Admin" => "Gruppenadministrator",
 "Quota" => "Quota",
 "Delete" => "Löschen"
 );
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 3d063daa3bd..d7333fab2c9 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -1,12 +1,26 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Σφάλμα στην φόρτωση της λίστας από το App Store",
+"Email saved" => "Το Email αποθηκεύτηκε ",
+"Invalid email" => "Μη έγκυρο email",
 "OpenID Changed" => "Το OpenID άλλαξε",
 "Invalid request" => "Μη έγκυρο αίτημα",
+"Authentication error" => "Σφάλμα πιστοποίησης",
 "Language changed" => "Η γλώσσα άλλαξε",
+"Error" => "Σφάλμα",
+"Disable" => "Απενεργοποίηση",
+"Enable" => "Ενεργοποίηση",
+"Saving..." => "Αποθήκευση...",
 "__language_name__" => "__όνομα_γλώσσας__",
+"Security Warning" => "Προειδοποίηση Ασφαλείας",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "Εκτέλεση μίας εργασίας με κάθε σελίδα που φορτώνεται",
+"cron.php is registered at a webcron service" => "Το cron.php έχει καταχωρηθεί σε μια webcron υπηρεσία",
+"use systems cron service" => "Χρήση της υπηρεσίας cron του συστήματος",
 "Log" => "Αρχείο καταγραφής",
 "More" => "Περισσότερο",
 "Add your App" => "Πρόσθεσε τη δικιά σου εφαρμογή ",
 "Select an App" => "Επιλέξτε μια εφαρμογή",
+"See application page at apps.owncloud.com" => "Η σελίδα εφαρμογών στο apps.owncloud.com",
 "-licensed" => "-με άδεια",
 "by" => "από",
 "Documentation" => "Τεκμηρίωση",
@@ -37,6 +51,7 @@
 "Create" => "Δημιουργία",
 "Default Quota" => "Προεπιλεγμένο όριο",
 "Other" => "Άλλα",
+"Group Admin" => "Διαχειρηστής ομάδας",
 "Quota" => "Σύνολο χώρου",
 "Delete" => "Διαγραφή"
 );
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index c79817a2721..c0ad6ef1051 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -1,12 +1,26 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Ne eblis ŝargi liston el aplikaĵovendejo",
+"Email saved" => "La retpoŝtadreso konserviĝis",
+"Invalid email" => "Nevalida retpoŝtadreso",
 "OpenID Changed" => "La agordo de OpenID estas ŝanĝita",
 "Invalid request" => "Nevalida peto",
+"Authentication error" => "Aŭtentiga eraro",
 "Language changed" => "La lingvo estas ŝanĝita",
+"Error" => "Eraro",
+"Disable" => "Malkapabligi",
+"Enable" => "Kapabligi",
+"Saving..." => "Konservante...",
 "__language_name__" => "Esperanto",
-"Log" => "Registro",
+"Security Warning" => "Sekureca averto",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "lanĉi unu taskon po ĉiu paĝo ŝargita",
+"cron.php is registered at a webcron service" => "cron.php estas registrita kiel webcron-servilo",
+"use systems cron service" => "uzi la cron-servon de la sistemo",
+"Log" => "Protokolo",
 "More" => "Pli",
 "Add your App" => "Aldonu vian aplikaĵon",
 "Select an App" => "Elekti aplikaĵon",
+"See application page at apps.owncloud.com" => "Vidu la paĝon pri aplikaĵoj ĉe apps.owncloud.com",
 "-licensed" => "-permesila",
 "by" => "de",
 "Documentation" => "Dokumentaro",
@@ -37,6 +51,7 @@
 "Create" => "Krei",
 "Default Quota" => "Defaŭlta kvoto",
 "Other" => "Alia",
+"Group Admin" => "Grupadministranto",
 "Quota" => "Kvoto",
 "Delete" => "Forigi"
 );
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index c8ddb412ecf..8403b6d3883 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -1,12 +1,26 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Imposible cargar la lista desde el App Store",
+"Email saved" => "Correo guardado",
+"Invalid email" => "Correo no válido",
 "OpenID Changed" => "OpenID cambiado",
 "Invalid request" => "Solicitud no válida",
+"Authentication error" => "Error de autenticación",
 "Language changed" => "Idioma cambiado",
+"Error" => "Error",
+"Disable" => "Desactivar",
+"Enable" => "Activar",
+"Saving..." => "Guardando...",
 "__language_name__" => "Castellano",
+"Security Warning" => "Advertencia de seguridad",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "ejecutar una tarea con cada página cargada",
+"cron.php is registered at a webcron service" => "cron.php se registra en un servicio webcron",
+"use systems cron service" => "usar servicio cron del sistema",
 "Log" => "Registro",
 "More" => "Más",
 "Add your App" => "Añade tu aplicación",
 "Select an App" => "Seleccionar una aplicación",
+"See application page at apps.owncloud.com" => "Echa un vistazo a la web de aplicaciones apps.owncloud.com",
 "-licensed" => "-autorizado",
 "by" => "por",
 "Documentation" => "Documentación",
@@ -37,6 +51,7 @@
 "Create" => "Crear",
 "Default Quota" => "Cuota predeterminada",
 "Other" => "Otro",
+"Group Admin" => "Grupo admin",
 "Quota" => "Cuota",
 "Delete" => "Eliminar"
 );
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 75ba2b72f0b..4ab799a7f03 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Kiri on salvestatud",
+"Invalid email" => "Vigane e-post",
 "OpenID Changed" => "OpenID on muudetud",
 "Invalid request" => "Vigane päring",
 "Language changed" => "Keel on muudetud",
+"Disable" => "Lülita välja",
+"Enable" => "Lülita sisse",
+"Saving..." => "Salvestamine...",
 "__language_name__" => "Eesti",
 "Log" => "Logi",
 "More" => "Veel",
 "Add your App" => "Lisa oma rakendus",
 "Select an App" => "Vali programm",
+"See application page at apps.owncloud.com" => "Vaata rakenduste lehte aadressil apps.owncloud.com",
 "-licensed" => "-litsenseeritud",
 "by" => "kelle poolt",
 "Documentation" => "Dokumentatsioon",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 4ef58dd1126..1ead8b14b6f 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -1,11 +1,20 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Eposta gorde da",
+"Invalid email" => "Baliogabeko eposta",
 "OpenID Changed" => "OpenID aldatuta",
 "Invalid request" => "Baliogabeko eskaria",
+"Authentication error" => "Autentifikazio errorea",
 "Language changed" => "Hizkuntza aldatuta",
+"Disable" => "Ez-gaitu",
+"Enable" => "Gaitu",
+"Saving..." => "Gordetzen...",
 "__language_name__" => "Euskera",
+"Security Warning" => "Segurtasun abisua",
+"Log" => "Egunkaria",
 "More" => "Gehiago",
 "Add your App" => "Gehitu zure aplikazioa",
 "Select an App" => "Aukeratu programa bat",
+"See application page at apps.owncloud.com" => "Ikusi programen orria apps.owncloud.com en",
 "-licensed" => "lizentziarekin",
 "by" => " Egilea:",
 "Documentation" => "Dokumentazioa",
@@ -34,6 +43,7 @@
 "Password" => "Pasahitza",
 "Groups" => "Taldeak",
 "Create" => "Sortu",
+"Default Quota" => "Kuota lehentsia",
 "Other" => "Besteak",
 "Quota" => "Kuota",
 "Delete" => "Ezabatu"
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index 892de2d9ec0..5fe6df4d9d9 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -1,12 +1,20 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "ایمیل ذخیره شد",
+"Invalid email" => "ایمیل غیر قابل قبول",
 "OpenID Changed" => "OpenID تغییر کرد",
 "Invalid request" => "درخواست غیر قابل قبول",
 "Language changed" => "زبان تغییر کرد",
+"Error" => "خطا",
+"Disable" => "غیرفعال",
+"Enable" => "فعال",
+"Saving..." => "درحال ذخیره ...",
 "__language_name__" => "__language_name__",
+"Security Warning" => "اخطار امنیتی",
 "Log" => "کارنامه",
 "More" => "بیشتر",
 "Add your App" => "برنامه خود را بیافزایید",
 "Select an App" => "یک برنامه انتخاب کنید",
+"See application page at apps.owncloud.com" => "صفحه این اٌپ را در apps.owncloud.com ببینید",
 "-licensed" => "مجوزنامه",
 "by" => "به وسیله",
 "Documentation" => "مستندات",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 76964b30800..bfcf1a59dda 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -1,12 +1,23 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Sähköposti tallennettu",
+"Invalid email" => "Virheellinen sähköposti",
 "OpenID Changed" => "OpenID on vaihdettu",
 "Invalid request" => "Virheellinen pyyntö",
+"Authentication error" => "Todennusvirhe",
 "Language changed" => "Kieli on vaihdettu",
+"Error" => "Virhe",
+"Disable" => "Poista käytöstä",
+"Enable" => "Käytä",
+"Saving..." => "Tallennetaan...",
 "__language_name__" => "_kielen_nimi_",
+"Security Warning" => "Turvallisuusvaroitus",
+"Cron" => "Cron",
+"use systems cron service" => "käytä järjestelmän cron-palvelua",
 "Log" => "Loki",
 "More" => "Lisää",
 "Add your App" => "Lisää ohjelmasi",
 "Select an App" => "Valitse ohjelma",
+"See application page at apps.owncloud.com" => "Katso sovellussivu osoitteessa apps.owncloud.com",
 "-licensed" => "-lisenssöity",
 "by" => "henkilölle",
 "Documentation" => "Dokumentaatio",
@@ -16,7 +27,7 @@
 "Go there manually." => "Ohje löytyy sieltä.",
 "Answer" => "Vastaus",
 "You use" => "Olet käyttänyt",
-"of the available" => "käytettävissäsi on yhteensä",
+"of the available" => ", käytettävissäsi on yhteensä",
 "Desktop and Mobile Syncing Clients" => "Tietokoneen ja mobiililaitteiden synkronointisovellukset",
 "Download" => "Lataa",
 "Your password got changed" => "Salasanasi on vaihdettu",
@@ -27,7 +38,7 @@
 "Change password" => "Vaihda salasana",
 "Email" => "Sähköposti",
 "Your email address" => "Sähköpostiosoitteesi",
-"Fill in an email address to enable password recovery" => "Kirjoita sähköpostiosoitteesi alle, jotta unohdettu salasana voidaan palauttaa",
+"Fill in an email address to enable password recovery" => "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa",
 "Language" => "Kieli",
 "Help translate" => "Auta kääntämisessä",
 "use this address to connect to your ownCloud in your file manager" => "voit yhdistää tiedostonhallintasovelluksellasi ownCloudiin käyttämällä tätä osoitetta",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 7e9a92f6bbf..89516b1c7fc 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -1,12 +1,26 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Impossible de charger la liste depuis l'App Store",
+"Email saved" => "E-mail sauvegardé",
+"Invalid email" => "E-mail invalide",
 "OpenID Changed" => "Identifiant OpenID changé",
 "Invalid request" => "Requête invalide",
+"Authentication error" => "Erreur d'authentification",
 "Language changed" => "Langue changée",
+"Error" => "Erreur",
+"Disable" => "Désactiver",
+"Enable" => "Activer",
+"Saving..." => "Sauvegarde...",
 "__language_name__" => "Français",
+"Security Warning" => "Alertes de sécurité",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "exécuter une tâche pour chaque page chargée",
+"cron.php is registered at a webcron service" => "cron.php est enregistré comme un service webcron",
+"use systems cron service" => "utiliser le service cron du système ",
 "Log" => "Journaux",
 "More" => "Plus",
-"Add your App" => "Ajouter votre application",
+"Add your App" => "Ajoutez votre application",
 "Select an App" => "Sélectionner une Application",
+"See application page at apps.owncloud.com" => "Voir la page des applications à l'url apps.owncloud.com",
 "-licensed" => "sous licence",
 "by" => "par",
 "Documentation" => "Documentation",
@@ -16,7 +30,7 @@
 "Go there manually." => "S'y rendre manuellement.",
 "Answer" => "Réponse",
 "You use" => "Vous utilisez",
-"of the available" => "d'espace de stockage sur un total de",
+"of the available" => "de votre espace de stockage d'une taille totale de",
 "Desktop and Mobile Syncing Clients" => "Clients de synchronisation Mobile et Ordinateur",
 "Download" => "Télécharger",
 "Your password got changed" => "Votre mot de passe a été changé",
@@ -37,6 +51,7 @@
 "Create" => "Créer",
 "Default Quota" => "Quota par défaut",
 "Other" => "Autre",
+"Group Admin" => "Groupe Admin",
 "Quota" => "Quota",
 "Delete" => "Supprimer"
 );
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 0459d940b4d..67937e49214 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -1,12 +1,26 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Non se puido cargar a lista desde a App Store",
+"Email saved" => "Correo electrónico gardado",
+"Invalid email" => "correo electrónico non válido",
 "OpenID Changed" => "Mudou o OpenID",
 "Invalid request" => "Petición incorrecta",
+"Authentication error" => "Erro na autenticación",
 "Language changed" => "O idioma mudou",
+"Error" => "Erro",
+"Disable" => "Deshabilitar",
+"Enable" => "Habilitar",
+"Saving..." => "Gardando...",
 "__language_name__" => "Galego",
+"Security Warning" => "Aviso de seguridade",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "executar unha tarefa con cada páxina cargada",
+"cron.php is registered at a webcron service" => "cron.php está rexistrada como un servizo webcron",
+"use systems cron service" => "utilice o servizo cron do sistema",
 "Log" => "Conectar",
 "More" => "Máis",
 "Add your App" => "Engade o teu aplicativo",
 "Select an App" => "Escolla un Aplicativo",
+"See application page at apps.owncloud.com" => "Vexa a páxina do aplicativo en apps.owncloud.com",
 "-licensed" => "-licenciado",
 "by" => "por",
 "Documentation" => "Documentación",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index 39055c21398..17e803a3256 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "הדוא״ל נשמר",
+"Invalid email" => "דוא״ל לא חוקי",
 "OpenID Changed" => "OpenID השתנה",
 "Invalid request" => "בקשה לא חוקית",
 "Language changed" => "שפה השתנתה",
+"Disable" => "בטל",
+"Enable" => "הפעל",
+"Saving..." => "שומר..",
 "__language_name__" => "עברית",
 "Log" => "יומן",
 "More" => "עוד",
 "Add your App" => "הוספת היישום שלך",
 "Select an App" => "בחירת יישום",
+"See application page at apps.owncloud.com" => "צפה בעמוד הישום ב apps.owncloud.com",
 "-licensed" => "רשיון",
 "by" => "מאת",
 "Documentation" => "תיעוד",
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index 5f357a85d2f..6fb29ce79c9 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Email spremljen",
+"Invalid email" => "Neispravan email",
 "OpenID Changed" => "OpenID promijenjen",
 "Invalid request" => "Neispravan zahtjev",
 "Language changed" => "Jezik promijenjen",
+"Disable" => "Isključi",
+"Enable" => "Uključi",
+"Saving..." => "Spremanje...",
 "__language_name__" => "__ime_jezika__",
 "Log" => "dnevnik",
 "More" => "više",
 "Add your App" => "Dodajte vašu aplikaciju",
 "Select an App" => "Odaberite Aplikaciju",
+"See application page at apps.owncloud.com" => "Pogledajte stranicu s aplikacijama na apps.owncloud.com",
 "-licensed" => "-licencirano",
 "by" => "od",
 "Documentation" => "dokumentacija",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 7eb7772f6dd..4981f446548 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -1,12 +1,22 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Nem tölthető le a lista az App Store-ból",
+"Email saved" => "Email mentve",
+"Invalid email" => "Hibás email",
 "OpenID Changed" => "OpenID megváltozott",
 "Invalid request" => "Érvénytelen kérés",
+"Authentication error" => "Hitelesítési hiba",
 "Language changed" => "A nyelv megváltozott",
+"Error" => "Hiba",
+"Disable" => "Letiltás",
+"Enable" => "Engedélyezés",
+"Saving..." => "Mentés...",
 "__language_name__" => "__language_name__",
+"Security Warning" => "Biztonsági figyelmeztetés",
 "Log" => "Napló",
 "More" => "Tovább",
 "Add your App" => "App hozzáadása",
 "Select an App" => "Egy App kiválasztása",
+"See application page at apps.owncloud.com" => "Lásd apps.owncloud.com, alkalmazások oldal",
 "-licensed" => "-licencelt",
 "by" => ":",
 "Documentation" => "Dokumentáció",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index a4b255546a1..e33eddacb57 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -1,12 +1,26 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Impossibile caricare l'elenco dall'App Store",
+"Email saved" => "Email salvata",
+"Invalid email" => "Email non valida",
 "OpenID Changed" => "OpenID modificato",
 "Invalid request" => "Richiesta non valida",
+"Authentication error" => "Errore di autenticazione",
 "Language changed" => "Lingua modificata",
+"Error" => "Errore",
+"Disable" => "Disabilita",
+"Enable" => "Abilita",
+"Saving..." => "Salvataggio in corso...",
 "__language_name__" => "Italiano",
+"Security Warning" => "Avviso di sicurezza",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "esegui un'attività con ogni pagina caricata",
+"cron.php is registered at a webcron service" => "cron.php è registrato a un servizio webcron",
+"use systems cron service" => "usa il servizio cron di sistema",
 "Log" => "Registro",
 "More" => "Altro",
 "Add your App" => "Aggiungi la tua applicazione",
 "Select an App" => "Seleziona un'applicazione",
+"See application page at apps.owncloud.com" => "Vedere la pagina dell'applicazione su apps.owncloud.com",
 "-licensed" => "-rilasciato",
 "by" => "da",
 "Documentation" => "Documentazione",
@@ -27,7 +41,7 @@
 "Change password" => "Modifica password",
 "Email" => "Email",
 "Your email address" => "Il tuo indirizzo email",
-"Fill in an email address to enable password recovery" => "Inserici il tuo indirizzo email per abilitare il recupero della password",
+"Fill in an email address to enable password recovery" => "Inserisci il tuo indirizzo email per abilitare il recupero della password",
 "Language" => "Lingua",
 "Help translate" => "Migliora la traduzione",
 "use this address to connect to your ownCloud in your file manager" => "usa questo indirizzo per connetterti al tuo ownCloud dal gestore file",
@@ -37,6 +51,7 @@
 "Create" => "Crea",
 "Default Quota" => "Quota predefinita",
 "Other" => "Altro",
+"Group Admin" => "Gruppo di amministrazione",
 "Quota" => "Quote",
 "Delete" => "Elimina"
 );
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 69e56983744..93201a9dfe0 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -1,12 +1,26 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "アプリストアからリストをロードできません",
+"Email saved" => "メールアドレスを保存しました",
+"Invalid email" => "無効なメールアドレス",
 "OpenID Changed" => "OpenIDが変更されました",
 "Invalid request" => "無効なリクエストです",
+"Authentication error" => "認証エラー",
 "Language changed" => "言語が変更されました",
+"Error" => "エラー",
+"Disable" => "無効",
+"Enable" => "有効",
+"Saving..." => "保存中...",
 "__language_name__" => "Japanese (日本語)",
+"Security Warning" => "セキュリティ警告",
+"Cron" => "cron(自動定期実行)",
+"execute one task with each page loaded" => "ページを開く毎にタスクを1つ実行",
+"cron.php is registered at a webcron service" => "cron.phpをwebcronサービスに登録しました",
+"use systems cron service" => "システムのcronサービスを使用",
 "Log" => "ログ",
 "More" => "もっと",
 "Add your App" => "アプリを追加",
 "Select an App" => "アプリを選択してください",
+"See application page at apps.owncloud.com" => "apps.owncloud.com でアプリケーションのページを見てください",
 "-licensed" => "ライセンス",
 "by" => "@",
 "Documentation" => "ドキュメント",
@@ -37,6 +51,7 @@
 "Create" => "作成",
 "Default Quota" => "デフォルトのクォータサイズ",
 "Other" => "その他",
+"Group Admin" => "グループ管理者",
 "Quota" => "クオータ",
 "Delete" => "削除"
 );
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index a2c1210af6b..828426dc1d9 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "이메일 저장",
+"Invalid email" => "잘못된 이메일",
 "OpenID Changed" => "OpenID 변경됨",
 "Invalid request" => "잘못된 요청",
 "Language changed" => "언어가 변경되었습니다",
+"Disable" => "비활성화",
+"Enable" => "활성화",
+"Saving..." => "저장...",
 "__language_name__" => "한국어",
 "Log" => "로그",
 "More" => "더",
 "Add your App" => "앱 추가",
 "Select an App" => "프로그램 선택",
+"See application page at apps.owncloud.com" => "application page at apps.owncloud.com을 보시오.",
 "-licensed" => " 라이선스 사용",
 "by" => " by ",
 "Documentation" => "문서",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index 504217a9db5..e8076e293be 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -1,8 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Neįmanoma įkelti sąrašo iš Programų Katalogo",
+"Email saved" => "El. paštas išsaugotas",
+"Invalid email" => "Netinkamas el. paštas",
 "OpenID Changed" => "OpenID pakeistas",
 "Invalid request" => "Klaidinga užklausa",
 "Language changed" => "Kalba pakeista",
+"Error" => "Klaida",
+"Disable" => "Išjungti",
+"Enable" => "Įjungti",
+"Saving..." => "Saugoma..",
 "__language_name__" => "Kalba",
+"Security Warning" => "Saugumo įspėjimas",
+"Cron" => "Cron",
+"use systems cron service" => "naudoti sistemos cron servisą",
 "Log" => "Žurnalas",
 "More" => "Daugiau",
 "Add your App" => "Pridėti programėlę",
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
new file mode 100644
index 00000000000..9fa1ccdcfe3
--- /dev/null
+++ b/settings/l10n/lv.php
@@ -0,0 +1,49 @@
+<?php $TRANSLATIONS = array(
+"Email saved" => "Epasts tika saglabāts",
+"Invalid email" => "Nepareizs epasts",
+"OpenID Changed" => "OpenID nomainīts",
+"Invalid request" => "Nepareizs vaicājums",
+"Language changed" => "Valoda tika nomainīta",
+"Disable" => "Atvienot",
+"Enable" => "Pievienot",
+"Saving..." => "Saglabā...",
+"__language_name__" => "__valodas_nosaukums__",
+"Security Warning" => "Brīdinājums par drošību",
+"Log" => "Log",
+"More" => "Vairāk",
+"Add your App" => "Pievieno savu aplikāciju",
+"Select an App" => "Izvēlies aplikāciju",
+"See application page at apps.owncloud.com" => "Apskatie aplikāciju lapu - apps.owncloud.com",
+"-licensed" => "licenzēts",
+"by" => "no",
+"Documentation" => "Dokumentācija",
+"Managing Big Files" => "Rīkoties ar apjomīgiem failiem",
+"Ask a question" => "Uzdod jautajumu",
+"Problems connecting to help database." => "Problēmas ar datubāzes savienojumu",
+"Go there manually." => "Nokļūt tur pašrocīgi",
+"Answer" => "Atbildēt",
+"You use" => "Jūs iymantojat",
+"of the available" => "no pieejamajiem",
+"Desktop and Mobile Syncing Clients" => "Desktop un mobīlo ierīču sinhronizācijas rīks",
+"Download" => "Lejuplādēt",
+"Your password got changed" => "Jūsu parole tika nomainīta",
+"Unable to change your password" => "Nav iespējams nomainīt jūsu paroli",
+"Current password" => "Pašreizējā parole",
+"New password" => "Jauna parole",
+"show" => "parādīt",
+"Change password" => "Nomainīt paroli",
+"Email" => "Epasts",
+"Your email address" => "Jūsu epasta adrese",
+"Fill in an email address to enable password recovery" => "Ievadiet epasta adresi, lai vēlak būtu iespēja atgūt paroli, ja būs nepieciešamība",
+"Language" => "Valoda",
+"Help translate" => "Palīdzi tulkot",
+"use this address to connect to your ownCloud in your file manager" => "izmanto šo adresi lai ielogotos ownCloud no sava failu pārlūka",
+"Name" => "Vārds",
+"Password" => "Parole",
+"Groups" => "Grupas",
+"Create" => "Izveidot",
+"Default Quota" => "Apjoms pēc noklusējuma",
+"Other" => "Cits",
+"Quota" => "Apjoms",
+"Delete" => "Izdzēst"
+);
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index 4a61ba9d512..38e3cc6e09e 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Електронската пошта е снимена",
+"Invalid email" => "Неисправна електронска пошта",
 "OpenID Changed" => "OpenID сменето",
 "Invalid request" => "неправилно барање",
 "Language changed" => "Јазикот е сменет",
+"Disable" => "Оневозможи",
+"Enable" => "Овозможи",
+"Saving..." => "Снимам...",
 "__language_name__" => "__language_name__",
 "Log" => "Записник",
 "More" => "Повеќе",
 "Add your App" => "Додадете ја Вашата апликација",
 "Select an App" => "Избери аппликација",
+"See application page at apps.owncloud.com" => "Види ја страницата со апликации на apps.owncloud.com",
 "-licensed" => "-licensed",
 "by" => "од",
 "Documentation" => "Документација",
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index f0fba7a7c03..de2384a4ae2 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -1,23 +1,38 @@
 <?php $TRANSLATIONS = array(
-"OpenID Changed" => "OpenID ditukar",
+"Email saved" => "Emel disimpan",
+"Invalid email" => "Emel tidak sah",
+"OpenID Changed" => "OpenID diubah",
 "Invalid request" => "Permintaan tidak sah",
-"Language changed" => "Bahasa ditukar",
+"Authentication error" => "Ralat pengesahan",
+"Language changed" => "Bahasa diubah",
+"Disable" => "Nyahaktif",
+"Enable" => "Aktif",
+"Saving..." => "Simpan...",
 "__language_name__" => "_nama_bahasa_",
+"Security Warning" => "Amaran keselamatan",
+"Log" => "Log",
+"More" => "Lanjutan",
+"Add your App" => "Tambah apps anda",
 "Select an App" => "Pilih aplikasi",
+"See application page at apps.owncloud.com" => "Lihat halaman applikasi di apps.owncloud.com",
 "-licensed" => "-dilesen",
 "by" => "oleh",
+"Documentation" => "Dokumentasi",
+"Managing Big Files" => "Mengurus Fail Besar",
 "Ask a question" => "Tanya soalan",
 "Problems connecting to help database." => "Masalah menghubung untuk membantu pengkalan data",
 "Go there manually." => "Pergi ke sana secara manual",
 "Answer" => "Jawapan",
 "You use" => "Anda menggunakan",
 "of the available" => "yang tersedia",
-"Your password got changed" => "Kata laluan anda ditukar",
-"Unable to change your password" => "Gagal menukar kata laluan anda ",
-"Current password" => "Kata laluan terkini",
+"Desktop and Mobile Syncing Clients" => "Klien Selarian untuk Desktop dan Mobile",
+"Download" => "Muat turun",
+"Your password got changed" => "Kata laluan anda diubah",
+"Unable to change your password" => "Gagal mengubah kata laluan anda ",
+"Current password" => "Kata laluan semasa",
 "New password" => "Kata laluan baru",
 "show" => "Papar",
-"Change password" => "Tukar kata laluan",
+"Change password" => "Ubah kata laluan",
 "Email" => "Emel",
 "Your email address" => "Alamat emel anda",
 "Fill in an email address to enable password recovery" => "Isi alamat emel anda untuk membolehkan pemulihan kata laluan",
@@ -28,6 +43,8 @@
 "Password" => "Kata laluan ",
 "Groups" => "Kumpulan",
 "Create" => "Buat",
+"Default Quota" => "Kuota Lalai",
+"Other" => "Lain",
 "Quota" => "Kuota",
 "Delete" => "Padam"
 );
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 1379bb9c2ed..2a5188a9ccc 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -1,21 +1,29 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Epost lagret",
+"Invalid email" => "Ugyldig epost",
 "OpenID Changed" => "OpenID endret",
 "Invalid request" => "Ugyldig forespørsel",
 "Language changed" => "Språk endret",
+"Disable" => "Slå avBehandle ",
+"Enable" => "Slå på",
+"Saving..." => "Lagrer...",
 "__language_name__" => "__language_name__",
 "Log" => "Logg",
 "More" => "Mer",
 "Add your App" => "Legg til din App",
 "Select an App" => "Velg en app",
+"See application page at apps.owncloud.com" => "Se applikasjonens side på apps.owncloud.org",
 "-licensed" => "-lisensiert",
 "by" => "av",
 "Documentation" => "Dokumentasjon",
+"Managing Big Files" => "Håndtere store filer",
 "Ask a question" => "Still et spørsmål",
 "Problems connecting to help database." => "Problemer med å koble til hjelp-databasen",
 "Go there manually." => "Gå dit manuelt",
 "Answer" => "Svar",
 "You use" => "Du bruker",
 "of the available" => "av den tilgjengelige",
+"Desktop and Mobile Syncing Clients" => "Klienter for datamaskiner og mobile enheter",
 "Download" => "Last ned",
 "Your password got changed" => "Passordet ditt ble endret",
 "Unable to change your password" => "Kunne ikke endre passordet ditt",
@@ -34,6 +42,7 @@
 "Groups" => "Grupper",
 "Create" => "Opprett",
 "Default Quota" => "Standard Kvote",
+"Other" => "Annet",
 "Quota" => "Kvote",
 "Delete" => "Slett"
 );
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 939907ef710..a1db0f457f5 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "E-mail bewaard",
+"Invalid email" => "Ongeldige e-mail",
 "OpenID Changed" => "OpenID is aangepast",
 "Invalid request" => "Ongeldig verzoek",
 "Language changed" => "Taal aangepast",
+"Disable" => "Uitschakelen",
+"Enable" => "Inschakelen",
+"Saving..." => "Aan het bewaren.....",
 "__language_name__" => "Nederlands",
 "Log" => "Log",
 "More" => "Meer",
 "Add your App" => "Voeg je App toe",
 "Select an App" => "Selecteer een app",
+"See application page at apps.owncloud.com" => "Zie de applicatiepagina op apps.owncloud.com",
 "-licensed" => "-gelicentieerd",
 "by" => "door",
 "Documentation" => "Documentatie",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 87c9cecb24e..e5968bcd4a3 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -1,7 +1,14 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Klarer ikkje å laste inn liste fra App Store",
+"Email saved" => "E-postadresse lagra",
+"Invalid email" => "Ugyldig e-postadresse",
 "OpenID Changed" => "OpenID endra",
 "Invalid request" => "Ugyldig førespurnad",
+"Authentication error" => "Feil i autentisering",
 "Language changed" => "Språk endra",
+"Error" => "Feil",
+"Disable" => "Slå av",
+"Enable" => "Slå på",
 "__language_name__" => "Nynorsk",
 "Select an App" => "Vel ein applikasjon",
 "-licensed" => "-lisensiert",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index d9dac06c007..de9384a2440 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -1,12 +1,26 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Nie mogę załadować listy aplikacji",
+"Email saved" => "Email zapisany",
+"Invalid email" => "Niepoprawny email",
 "OpenID Changed" => "Zmieniono OpenID",
 "Invalid request" => "Nieprawidłowe żądanie",
+"Authentication error" => "Błąd uwierzytelniania",
 "Language changed" => "Język zmieniony",
+"Error" => "Błąd",
+"Disable" => "Wyłączone",
+"Enable" => "Włączone",
+"Saving..." => "Zapisywanie...",
 "__language_name__" => "Polski",
+"Security Warning" => "Ostrzeżenia bezpieczeństwa",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "wykonanie jednego zadania z każdej  załadowanej strony",
+"cron.php is registered at a webcron service" => "cron.php jest zarejestrowany w usłudze webcron",
+"use systems cron service" => "korzystaj z usługi systemowej cron",
 "Log" => "Log",
 "More" => "Więcej",
 "Add your App" => "Dodaj aplikacje",
 "Select an App" => "Zaznacz aplikacje",
+"See application page at apps.owncloud.com" => "Zobacz stronę aplikacji na apps.owncloud.com",
 "-licensed" => "-licencjonowany",
 "by" => "przez",
 "Documentation" => "Dokumentacja",
@@ -37,6 +51,7 @@
 "Create" => "Utwórz",
 "Default Quota" => "Domyślny udział",
 "Other" => "Inne",
+"Group Admin" => "Grupa Admin",
 "Quota" => "Udział",
 "Delete" => "Usuń"
 );
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 35cf507194a..e8154dfca7e 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Email gravado",
+"Invalid email" => "Email inválido",
 "OpenID Changed" => "Mudou OpenID",
 "Invalid request" => "Pedido inválido",
 "Language changed" => "Mudou Idioma",
+"Disable" => "Desabilitado",
+"Enable" => "Habilitado",
+"Saving..." => "Gravando...",
 "__language_name__" => "Português",
 "Log" => "Log",
 "More" => "Mais",
 "Add your App" => "Adicione seu Aplicativo",
 "Select an App" => "Selecione uma Aplicação",
+"See application page at apps.owncloud.com" => "Ver página do aplicativo em apps.owncloud.com",
 "-licensed" => "-licenciados",
 "by" => "por",
 "Documentation" => "Documentação",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index af7088daa12..af12c42de46 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -1,12 +1,26 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Incapaz de carregar a lista da App Store",
+"Email saved" => "Email guardado",
+"Invalid email" => "Email inválido",
 "OpenID Changed" => "OpenID alterado",
 "Invalid request" => "Pedido inválido",
+"Authentication error" => "Erro de autenticação",
 "Language changed" => "Idioma alterado",
+"Error" => "Erro",
+"Disable" => "Desativar",
+"Enable" => "Ativar",
+"Saving..." => "A guardar...",
 "__language_name__" => "__language_name__",
+"Security Warning" => "Aviso de Segurança",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "Executar uma tarefa com cada página carregada",
+"cron.php is registered at a webcron service" => "cron.php está registado num serviço webcron",
+"use systems cron service" => "usar o serviço cron do sistema",
 "Log" => "Log",
 "More" => "Mais",
 "Add your App" => "Adicione a sua aplicação",
 "Select an App" => "Selecione uma aplicação",
+"See application page at apps.owncloud.com" => "Ver a página da aplicação em apps.owncloud.com",
 "-licensed" => "-licenciado",
 "by" => "por",
 "Documentation" => "Documentação",
@@ -37,6 +51,7 @@
 "Create" => "Criar",
 "Default Quota" => "Quota por defeito",
 "Other" => "Outro",
+"Group Admin" => "Grupo Administrador",
 "Quota" => "Quota",
 "Delete" => "Apagar"
 );
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 4ab514815cb..949e9572c1c 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -1,12 +1,26 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Загрузка из App Store запрещена",
+"Email saved" => "Email сохранен",
+"Invalid email" => "Неправильный Email",
 "OpenID Changed" => "OpenID изменён",
 "Invalid request" => "Неверный запрос",
+"Authentication error" => "Ошибка авторизации",
 "Language changed" => "Язык изменён",
+"Error" => "Ошибка",
+"Disable" => "Отключить",
+"Enable" => "Включить",
+"Saving..." => "Сохранение...",
 "__language_name__" => "Русский ",
+"Security Warning" => "Предупреждение безопасности",
+"Cron" => "Задание",
+"execute one task with each page loaded" => "Запускать задание при загрузке каждой страницы",
+"cron.php is registered at a webcron service" => "cron.php зарегистрирован в webcron сервисе",
+"use systems cron service" => "использовать системные задания",
 "Log" => "Журнал",
 "More" => "Ещё",
 "Add your App" => "Добавить приложение",
 "Select an App" => "Выберите приложение",
+"See application page at apps.owncloud.com" => "Смотрите дополнения на apps.owncloud.com",
 "-licensed" => "-лицензия",
 "by" => "от",
 "Documentation" => "Документация",
@@ -37,6 +51,7 @@
 "Create" => "Создать",
 "Default Quota" => "Квота по умолчанию",
 "Other" => "Другое",
+"Group Admin" => "Группа Администраторы",
 "Quota" => "Квота",
 "Delete" => "Удалить"
 );
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index fe755aecb46..edf908ce097 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Email uložený",
+"Invalid email" => "Neplatný email",
 "OpenID Changed" => "OpenID zmenené",
 "Invalid request" => "Neplatná požiadavka",
 "Language changed" => "Jazyk zmenený",
+"Disable" => "Zakázať",
+"Enable" => "Povoliť",
+"Saving..." => "Ukladám...",
 "__language_name__" => "Slovensky",
 "Log" => "Záznam",
 "More" => "Viac",
 "Add your App" => "Pridať vašu aplikáciu",
 "Select an App" => "Vyberte aplikáciu",
+"See application page at apps.owncloud.com" => "Pozrite si stránku aplikácie na apps.owncloud.com",
 "-licensed" => "-licencované",
 "by" => "od",
 "Documentation" => "Dokumentácia",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 58afe21f45f..a2404d212b2 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -1,12 +1,26 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Ne morem naložiti seznama iz App Store",
+"Email saved" => "E-poštni naslov je bil shranjen",
+"Invalid email" => "Neveljaven e-poštni naslov",
 "OpenID Changed" => "OpenID je bil spremenjen",
 "Invalid request" => "Neveljaven zahtevek",
+"Authentication error" => "Napaka overitve",
 "Language changed" => "Jezik je bil spremenjen",
+"Error" => "Napaka",
+"Disable" => "Onemogoči",
+"Enable" => "Omogoči",
+"Saving..." => "Shranjevanje...",
 "__language_name__" => "__ime_jezika__",
+"Security Warning" => "Varnostno opozorilo",
+"Cron" => "Periodično opravilo",
+"execute one task with each page loaded" => "izvedi eno nalogo z vsako naloženo stranjo",
+"cron.php is registered at a webcron service" => "cron.php je vpisan na storitev webcron",
+"use systems cron service" => "uporabi sistemski servis za periodična opravila",
 "Log" => "Dnevnik",
 "More" => "Več",
 "Add your App" => "Dodajte vašo aplikacijo",
 "Select an App" => "Izberite aplikacijo",
+"See application page at apps.owncloud.com" => "Obiščite spletno stran aplikacije na apps.owncloud.com",
 "-licensed" => "-licencirana",
 "by" => "s strani",
 "Documentation" => "Dokumentacija",
@@ -37,6 +51,7 @@
 "Create" => "Ustvari",
 "Default Quota" => "Privzeta količinska omejitev",
 "Other" => "Drugo",
+"Group Admin" => "Administrator skupine",
 "Quota" => "Količinska omejitev",
 "Delete" => "Izbriši"
 );
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 40a370aabeb..7603b6b09f7 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -1,25 +1,39 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Kan inte ladda listan från App Store",
+"Email saved" => "E-post sparad",
+"Invalid email" => "Ogiltig e-post",
 "OpenID Changed" => "OpenID ändrat",
 "Invalid request" => "Ogiltig begäran",
+"Authentication error" => "Autentiseringsfel",
 "Language changed" => "Språk ändrades",
+"Error" => "Fel",
+"Disable" => "Deaktivera",
+"Enable" => "Aktivera",
+"Saving..." => "Sparar...",
 "__language_name__" => "__language_name__",
+"Security Warning" => "Säkerhetsvarning",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "utför en uppgift vid varje sidladdning",
+"cron.php is registered at a webcron service" => "cron.php är registrerad på en webcron-tjänst",
+"use systems cron service" => "använd systemets cron-tjänst",
 "Log" => "Logg",
 "More" => "Mera",
 "Add your App" => "Lägg till din applikation",
 "Select an App" => "Välj en App",
+"See application page at apps.owncloud.com" => "Se programsida på apps.owncloud.com",
 "-licensed" => "-licensierat",
 "by" => "av",
 "Documentation" => "Dokumentation",
 "Managing Big Files" => "Hantering av stora filer",
 "Ask a question" => "Ställ en fråga",
-"Problems connecting to help database." => "Problem med att ansluta till hjälp-databasen.",
-"Go there manually." => "Gå dit manuellt",
+"Problems connecting to help database." => "Problem med att ansluta till hjälpdatabasen.",
+"Go there manually." => "Gå dit manuellt.",
 "Answer" => "Svar",
 "You use" => "Du använder",
 "of the available" => "av tillgängliga",
 "Desktop and Mobile Syncing Clients" => "Synkroniseringsklienter för dator och mobil",
 "Download" => "Ladda ner",
-"Your password got changed" => "Ditt lösenord ändrades",
+"Your password got changed" => "Ditt lösenord har ändrats",
 "Unable to change your password" => "Kunde inte ändra ditt lösenord",
 "Current password" => "Nuvarande lösenord",
 "New password" => "Nytt lösenord",
@@ -37,6 +51,7 @@
 "Create" => "Skapa",
 "Default Quota" => "Förvald datakvot",
 "Other" => "Annat",
+"Group Admin" => "Gruppadministratör",
 "Quota" => "Kvot",
-"Delete" => "Ta bort"
+"Delete" => "Radera"
 );
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 5b744cb6be9..a062c374c6a 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -1,12 +1,26 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "ไม่สามารถโหลดรายการจาก App Store ได้",
+"Email saved" => "อีเมลถูกบันทึกแล้ว",
+"Invalid email" => "อีเมลไม่ถูกต้อง",
 "OpenID Changed" => "เปลี่ยนชื่อบัญชี OpenID แล้ว",
 "Invalid request" => "คำร้องขอไม่ถูกต้อง",
+"Authentication error" => "เกิดข้อผิดพลาดเกี่ยวกับสิทธิ์การเข้าใช้งาน",
 "Language changed" => "เปลี่ยนภาษาเรียบร้อยแล้ว",
+"Error" => "ข้อผิดพลาด",
+"Disable" => "ปิดใช้งาน",
+"Enable" => "เปิดใช้งาน",
+"Saving..." => "กำลังบันทึุกข้อมูล...",
 "__language_name__" => "ภาษาไทย",
+"Security Warning" => "คำเตือนเกี่ยวกับความปลอดภัย",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "ประมวลผลหนึ่งงานเมื่อโหลดหน้าเว็บแต่ละครั้ง",
+"cron.php is registered at a webcron service" => "cron.php ได้ถูกลงทะเบียนที่บริการ webcron",
+"use systems cron service" => "ใช้บริการ cron จากระบบ",
 "Log" => "บันทึกการเปลี่ยนแปลง",
 "More" => "เพิ่มเติม",
 "Add your App" => "เพิ่มแอปของคุณ",
 "Select an App" => "เลือก App",
+"See application page at apps.owncloud.com" => "ดูหน้าแอพพลิเคชั่นที่ apps.owncloud.com",
 "-licensed" => "-ได้รับอนุญาติแล้ว",
 "by" => "โดย",
 "Documentation" => "เอกสารคู่มือการใช้งาน",
@@ -37,6 +51,7 @@
 "Create" => "สร้าง",
 "Default Quota" => "โควต้าที่กำหนดไว้เริ่มต้น",
 "Other" => "อื่นๆ",
+"Group Admin" => "ผู้ดูแลกลุ่ม",
 "Quota" => "พื้นที่",
 "Delete" => "ลบ"
 );
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 01ad142a3db..8182236a2d8 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -1,12 +1,20 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Eposta kaydedildi",
+"Invalid email" => "Geçersiz eposta",
 "OpenID Changed" => "OpenID Değiştirildi",
 "Invalid request" => "Geçersiz istek",
+"Authentication error" => "Eşleşme hata",
 "Language changed" => "Dil değiştirildi",
+"Disable" => "Etkin değil",
+"Enable" => "Etkin",
+"Saving..." => "Kaydediliyor...",
 "__language_name__" => "__dil_adı__",
+"Security Warning" => "Güvenlik Uyarisi",
 "Log" => "Günlük",
 "More" => "Devamı",
 "Add your App" => "Uygulamanı Ekle",
 "Select an App" => "Bir uygulama seçin",
+"See application page at apps.owncloud.com" => "Uygulamanın sayfasına apps.owncloud.com adresinden bakın ",
 "-licensed" => "-lisanslı",
 "by" => "yapan",
 "Documentation" => "Dökümantasyon",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
new file mode 100644
index 00000000000..7331ff324c1
--- /dev/null
+++ b/settings/l10n/uk.php
@@ -0,0 +1,23 @@
+<?php $TRANSLATIONS = array(
+"OpenID Changed" => "OpenID змінено",
+"Invalid request" => "Помилковий запит",
+"Language changed" => "Мова змінена",
+"Select an App" => "Вибрати додаток",
+"-licensed" => "-ліцензовано",
+"by" => "по",
+"Ask a question" => "Запитати",
+"Problems connecting to help database." => "Проблема при з'єднані з базою допомоги",
+"You use" => "Ви використовуєте",
+"of the available" => "з доступної",
+"Your password got changed" => "Ваш пароль змінено",
+"Current password" => "Поточний пароль",
+"New password" => "Новий пароль",
+"show" => "показати",
+"Change password" => "Змінити пароль",
+"Language" => "Мова",
+"Name" => "Ім'я",
+"Password" => "Пароль",
+"Groups" => "Групи",
+"Create" => "Створити",
+"Delete" => "Видалити"
+);
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
new file mode 100644
index 00000000000..41e4441b1cb
--- /dev/null
+++ b/settings/l10n/vi.php
@@ -0,0 +1,48 @@
+<?php $TRANSLATIONS = array(
+"Email saved" => "Lưu email",
+"Invalid email" => "Email không hợp lệ",
+"OpenID Changed" => "Đổi OpenID",
+"Invalid request" => "Yêu cầu không hợp lệ",
+"Language changed" => "Ngôn ngữ đã được thay đổi",
+"Disable" => "Vô hiệu",
+"Enable" => "Cho phép",
+"Saving..." => "Đang tiến hành lưu ...",
+"__language_name__" => "__Ngôn ngữ___",
+"Log" => "Log",
+"More" => "nhiều hơn",
+"Add your App" => "Thêm ứng dụng của bạn",
+"Select an App" => "Chọn một ứng dụng",
+"See application page at apps.owncloud.com" => "Xem ứng dụng tại apps.owncloud.com",
+"-licensed" => "Giấy phép đã được cấp",
+"by" => "bởi",
+"Documentation" => "Tài liệu",
+"Managing Big Files" => "Quản lý tập tin lớn",
+"Ask a question" => "Đặt câu hỏi",
+"Problems connecting to help database." => "Vấn đề kết nối đến cơ sở dữ liệu.",
+"Go there manually." => "Đến bằng thủ công",
+"Answer" => "trả lời",
+"You use" => "Bạn sử dụng",
+"of the available" => "có sẵn",
+"Desktop and Mobile Syncing Clients" => "Đồng bộ dữ liệu",
+"Download" => "Tải về",
+"Your password got changed" => "Mật khẩu đã được thay đổi",
+"Unable to change your password" => "Không thể đổi mật khẩu",
+"Current password" => "Mật khẩu cũ",
+"New password" => "Mật khẩu mới ",
+"show" => "Hiện",
+"Change password" => "Đổi mật khẩu",
+"Email" => "Email",
+"Your email address" => "Email của bạn",
+"Fill in an email address to enable password recovery" => "Nhập địa chỉ email của bạn để khôi phục lại mật khẩu",
+"Language" => "Ngôn ngữ",
+"Help translate" => "Dịch ",
+"use this address to connect to your ownCloud in your file manager" => "sử dụng địa chỉ này để kết nối với ownCloud của bạn trong quản lý tập tin ",
+"Name" => "Tên",
+"Password" => "Mật khẩu",
+"Groups" => "Nhóm",
+"Create" => "Tạo",
+"Default Quota" => "Hạn ngạch mặt định",
+"Other" => "Khác",
+"Quota" => "Hạn ngạch",
+"Delete" => "Xóa"
+);
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
new file mode 100644
index 00000000000..faf125225ba
--- /dev/null
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -0,0 +1,53 @@
+<?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "不能从App Store 中加载列表",
+"Email saved" => "Email 保存了",
+"Invalid email" => "非法Email",
+"OpenID Changed" => "OpenID 改变了",
+"Invalid request" => "非法请求",
+"Authentication error" => "认证错误",
+"Language changed" => "语言改变了",
+"Error" => "错误",
+"Disable" => "禁用",
+"Enable" => "启用",
+"Saving..." => "保存中...",
+"__language_name__" => "Chinese",
+"Security Warning" => "安全警告",
+"Cron" => "定时",
+"Log" => "日志",
+"More" => "更多",
+"Add your App" => "添加你的应用程序",
+"Select an App" => "选择一个程序",
+"See application page at apps.owncloud.com" => "在owncloud.com上查看应用程序",
+"-licensed" => "-许可了",
+"by" => "由",
+"Documentation" => "文档",
+"Managing Big Files" => "管理大文件",
+"Ask a question" => "提一个问题",
+"Problems connecting to help database." => "连接到帮助数据库时的问题",
+"Go there manually." => "收到转到.",
+"Answer" => "回答",
+"You use" => "你使用",
+"of the available" => "可用的",
+"Desktop and Mobile Syncing Clients" => "桌面和移动同步客户端",
+"Download" => "下载",
+"Your password got changed" => "你的密码已经改变",
+"Unable to change your password" => "不能改变你的密码",
+"Current password" => "现在的密码",
+"New password" => "新密码",
+"show" => "展示",
+"Change password" => "改变密码",
+"Email" => "Email",
+"Your email address" => "你的email地址",
+"Fill in an email address to enable password recovery" => "输入一个邮箱地址以激活密码恢复功能",
+"Language" => "语言",
+"Help translate" => "帮助翻译",
+"use this address to connect to your ownCloud in your file manager" => "使用这个地址和你的文件管理器连接到你的ownCloud",
+"Name" => "名字",
+"Password" => "密码",
+"Groups" => "组",
+"Create" => "新建",
+"Default Quota" => "默认限额",
+"Other" => "其他的",
+"Quota" => "限额",
+"Delete" => "删除"
+);
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index d274b372ee9..410772e080c 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -1,12 +1,25 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "无法从应用商店载入列表",
+"Email saved" => "电子邮件已保存",
+"Invalid email" => "无效的电子邮件",
 "OpenID Changed" => "OpenID 已修改",
 "Invalid request" => "非法请求",
+"Authentication error" => "认证错误",
 "Language changed" => "语言已修改",
+"Error" => "错误",
+"Disable" => "禁用",
+"Enable" => "启用",
+"Saving..." => "正在保存",
 "__language_name__" => "简体中文",
+"Security Warning" => "安全警告",
+"Cron" => "计划任务",
+"execute one task with each page loaded" => "为每个装入的页面执行任务",
+"use systems cron service" => "实现系统 cron 服务",
 "Log" => "日志",
 "More" => "更多",
 "Add your App" => "添加应用",
 "Select an App" => "选择一个应用",
+"See application page at apps.owncloud.com" => "查看在 app.owncloud.com 的应用程序页面",
 "-licensed" => "-许可证",
 "by" => "由",
 "Documentation" => "文档",
@@ -37,6 +50,7 @@
 "Create" => "创建",
 "Default Quota" => "默认配额",
 "Other" => "其它",
+"Group Admin" => "组管理",
 "Quota" => "配额",
 "Delete" => "删除"
 );
diff --git a/settings/personal.php b/settings/personal.php
index eb45c1b3aa8..82626526d57 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -1,70 +1,68 @@
-<?php

-/**

- * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>

- * This file is licensed under the Affero General Public License version 3 or later.

- * See the COPYING-README file.

- */

-

-require_once('../lib/base.php');

-OC_Util::checkLoggedIn();

-

-// Highlight navigation entry

-OC_Util::addScript( 'settings', 'personal' );

-OC_Util::addStyle( 'settings', 'settings' );

-OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' );

-OC_Util::addStyle( '3rdparty', 'chosen' );

-OC_App::setActiveNavigationEntry( 'personal' );

-

-// calculate the disc space

-$rootInfo=OC_FileCache::get('');

-$sharedInfo=OC_FileCache::get('/Shared');

-if (!isset($sharedInfo['size'])) {

-	$sharedSize = 0;

-} else {

-	$sharedSize = $sharedInfo['size'];

-}

-$used=$rootInfo['size']-$sharedSize;

-$free=OC_Filesystem::free_space();

-$total=$free+$used;

-if($total==0) $total=1;  // prevent division by zero

-$relative=round(($used/$total)*10000)/100;

-

-$email=OC_Preferences::getValue(OC_User::getUser(), 'settings','email','');

-

-$lang=OC_Preferences::getValue( OC_User::getUser(), 'core', 'lang', OC_L10N::findLanguage() );

-$languageCodes=OC_L10N::findAvailableLanguages();

-sort ($languageCodes);

-

-//put the current language in the front

-unset($languageCodes[array_search($lang,$languageCodes)]);

-array_unshift($languageCodes,$lang);

-

-$languageNames=include 'languageCodes.php';

-$languages=array();

-foreach($languageCodes as $lang){

-	$l=OC_L10N::get('settings',$lang);

-	if(substr($l->t('__language_name__'),0,1)!='_'){//first check if the language name is in the translation file

-		$languages[]=array('code'=>$lang,'name'=>$l->t('__language_name__'));

-	}elseif(isset($languageNames[$lang])){

-		$languages[]=array('code'=>$lang,'name'=>$languageNames[$lang]);

-	}else{//fallback to language code

-		$languages[]=array('code'=>$lang,'name'=>$lang);

-	}

-}

-

-// Return template

-$tmpl = new OC_Template( 'settings', 'personal', 'user');

-$tmpl->assign('usage',OC_Helper::humanFileSize($used));

-$tmpl->assign('total_space',OC_Helper::humanFileSize($total));

-$tmpl->assign('usage_relative',$relative);

-$tmpl->assign('email',$email);

-$tmpl->assign('languages',$languages);

-

-$forms=OC_App::getForms('personal');

-$tmpl->assign('forms',array());

-foreach($forms as $form){

-	$tmpl->append('forms',$form);

-}

-$tmpl->printPage();

-

-?>
\ No newline at end of file
+<?php
+/**
+ * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+require_once('../lib/base.php');
+OC_Util::checkLoggedIn();
+
+// Highlight navigation entry
+OC_Util::addScript( 'settings', 'personal' );
+OC_Util::addStyle( 'settings', 'settings' );
+OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' );
+OC_Util::addStyle( '3rdparty', 'chosen' );
+OC_App::setActiveNavigationEntry( 'personal' );
+
+// calculate the disc space
+$rootInfo=OC_FileCache::get('');
+$sharedInfo=OC_FileCache::get('/Shared');
+if (!isset($sharedInfo['size'])) {
+	$sharedSize = 0;
+} else {
+	$sharedSize = $sharedInfo['size'];
+}
+$used=$rootInfo['size']-$sharedSize;
+$free=OC_Filesystem::free_space();
+$total=$free+$used;
+if($total==0) $total=1;  // prevent division by zero
+$relative=round(($used/$total)*10000)/100;
+
+$email=OC_Preferences::getValue(OC_User::getUser(), 'settings','email','');
+
+$lang=OC_Preferences::getValue( OC_User::getUser(), 'core', 'lang', OC_L10N::findLanguage() );
+$languageCodes=OC_L10N::findAvailableLanguages();
+sort ($languageCodes);
+
+//put the current language in the front
+unset($languageCodes[array_search($lang,$languageCodes)]);
+array_unshift($languageCodes,$lang);
+
+$languageNames=include 'languageCodes.php';
+$languages=array();
+foreach($languageCodes as $lang){
+	$l=OC_L10N::get('settings',$lang);
+	if(substr($l->t('__language_name__'),0,1)!='_'){//first check if the language name is in the translation file
+		$languages[]=array('code'=>$lang,'name'=>$l->t('__language_name__'));
+	}elseif(isset($languageNames[$lang])){
+		$languages[]=array('code'=>$lang,'name'=>$languageNames[$lang]);
+	}else{//fallback to language code
+		$languages[]=array('code'=>$lang,'name'=>$lang);
+	}
+}
+
+// Return template
+$tmpl = new OC_Template( 'settings', 'personal', 'user');
+$tmpl->assign('usage',OC_Helper::humanFileSize($used));
+$tmpl->assign('total_space',OC_Helper::humanFileSize($total));
+$tmpl->assign('usage_relative',$relative);
+$tmpl->assign('email',$email);
+$tmpl->assign('languages',$languages);
+
+$forms=OC_App::getForms('personal');
+$tmpl->assign('forms',array());
+foreach($forms as $form){
+	$tmpl->append('forms',$form);
+}
+$tmpl->printPage();
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 82ee7e84838..9ccab25516c 100644..100755
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -4,24 +4,37 @@
  * See the COPYING-README file.
  */
 $levels=array('Debug','Info','Warning','Error','Fatal');
-	
+?>
+
+<?php
+
 if(!$_['htaccessworking']) {
-	?>
-	<fieldset class="personalblock">
-		<legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
+?>
+<fieldset class="personalblock">
+	<legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
+
+	<span class="securitywarning">Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.</span>
 	
-		<span class="securitywarning">Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.</span>
-		
-	</fieldset>	
-	<?php	
+</fieldset>	
+<?php	
 }
 ?>
 
 
-
 <?php foreach($_['forms'] as $form){
 	echo $form;
 };?>
+
+<fieldset class="personalblock" id="backgroundjobs">
+	<legend><strong><?php echo $l->t('Cron');?></strong></legend>
+	<input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if( $_['backgroundjobs_mode'] == "ajax" ){ echo 'checked="checked"'; } ?>>
+	<label for="backgroundjobs_ajax" title="<?php echo $l->t("execute one task with each page loaded"); ?>">AJAX</label><br />
+	<input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron" <?php if( $_['backgroundjobs_mode'] == "webcron" ){ echo 'checked="checked"'; } ?>>
+	<label for="backgroundjobs_webcron" title="<?php echo $l->t("cron.php is registered at a webcron service"); ?>">Webcron</label><br />
+	<input type="radio" name="mode" value="cron" id="backgroundjobs_cron" <?php if( $_['backgroundjobs_mode'] == "cron" ){ echo 'checked="checked"'; } ?>>
+	<label for="backgroundjobs_cron" title="<?php echo $l->t("use systems cron service"); ?>">Cron</label><br />
+</fieldset>
+
 <fieldset class="personalblock">
 	<legend><strong><?php echo $l->t('Log');?></strong></legend>
 	Log level: <select name='loglevel' id='loglevel'>
@@ -55,3 +68,10 @@ if(!$_['htaccessworking']) {
 <?php endif; ?>
 
 </fieldset>
+
+
+<p class="personalblock">
+	<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?> (<?php echo(OC_Updater::ShowUpdatingHint()); ?>)<br />
+	Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="http://gitorious.org/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.
+</p>
+
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 7642ab7fb89..83d63b6b417 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -3,25 +3,31 @@
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
  */?>
-
+<script type='text/javascript'>
+	var appid = '<?php echo $_['appid']; ?>';
+</script>
 <div id="controls">
-	<a class="button" target="_blank" href="http://owncloud.org/dev/writing-apps/"><?php echo $l->t('Add your App');?></a>
+	<a class="button" target="_blank" href="http://owncloud.org/dev/apps/getting-started/"><?php echo $l->t('Add your App');?></a>
 </div>
-<ul id="leftcontent">
+<ul id="leftcontent" class="applist">
 	<?php foreach($_['apps'] as $app):?>
-	<li <?php if($app['active']) echo 'class="active"'?> data-id="<?php echo $app['id'] ?>">
-		<a href="?appid=<?php echo $app['id'] ?>"><?php  echo $app['name'] ?></a>
+	<li <?php if($app['active']) echo 'class="active"'?> data-id="<?php echo $app['id'] ?>"
+		data-type="<?php echo $app['internal'] ? 'internal' : 'external' ?>" data-installed="1">
+		<a class="app<?php if(!$app['internal']) echo ' externalapp' ?>" href="?appid=<?php echo $app['id'] ?>"><?php echo htmlentities($app['name']) ?></a>
 		<span class="hidden">
 			<?php OC_JSON::encodedPrint($app,false) ?>
 		</span>
-		<?php  if(!$app['internal']) echo '<small class="externalapp">3rd party</small>' ?>
+		<?php  if(!$app['internal']) echo '<small class="externalapp list">3rd party</small>' ?>
 	</li>
 	<?php endforeach;?>
 </ul>
 <div id="rightcontent">
+	<div class="appinfo">
 	<h3><strong><span class="name"><?php echo $l->t('Select an App');?></span></strong><span class="version"></span><small class="externalapp" style="visibility:hidden;"></small></h3>
 	<p class="description"></p>
 	<img src="" class="preview" />
-	<p class="hidden"><span class="licence"></span><?php echo $l->t('-licensed');?> <?php echo $l->t('by');?> <span class="author"></span></p>
+	<p class="appslink hidden"><a href="#" target="_blank"><?php echo $l->t('See application page at apps.owncloud.com');?></a></p>
+	<p class="license hidden"><span class="licence"></span><?php echo $l->t('-licensed');?> <?php echo $l->t('by');?> <span class="author"></span></p>
 	<input class="enable hidden" type="submit" />
+	</div>
 </div>
diff --git a/settings/templates/help.php b/settings/templates/help.php
index f9eb8615972..a53ec76d681 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -1,5 +1,5 @@
 <?php /**
- * Copyright (c) 2011, Frank Karlitschek karlitschek@kde.org
+ * 2012 Frank Karlitschek frank@owncloud.org
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
  */?>
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 014996a5b20..ee40120d724 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -55,10 +55,5 @@
 	echo $form;
 };?>
 
-<p class="personalblock">
-	<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?> (<?php echo(OC_Updater::ShowUpdatingHint()); ?>)<br />
-	Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="http://gitorious.org/owncloud" target="_blank">source code</a> is freely licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.
-</p>
-
 
 
diff --git a/settings/templates/users.php b/settings/templates/users.php
index ea3fe777ffe..5298237f679 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -1,20 +1,27 @@
-<?php /**
+<?php
+/**
  * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
  */
-
 $allGroups=array();
 foreach($_["groups"] as $group) {
-	$allGroups[]=$group['name'];
+	$allGroups[] = $group['name'];
 }
+$_['subadmingroups'] = $allGroups;
+$items = array_flip($_['subadmingroups']);
+unset($items['admin']);
+$_['subadmingroups'] = array_flip($items);
 ?>
-
+<script>
+var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
+</script>
 <div id="controls">
 	<form id="newuser">
-		<input id="newusername" placeholder="<?php echo $l->t('Name')?>" /> <input
+		<input id="newusername" type="text" placeholder="<?php echo $l->t('Name')?>" /> <input
 			type="password" id="newuserpassword"
 			placeholder="<?php echo $l->t('Password')?>" /> <select
+			class="groupsselect"
 			id="newusergroups" data-placeholder="groups"
 			title="<?php echo $l->t('Groups')?>" multiple="multiple">
 			<?php foreach($_["groups"] as $group): ?>
@@ -27,6 +34,7 @@ foreach($_["groups"] as $group) {
 	<div class="quota">
 		<span><?php echo $l->t('Default Quota');?>:</span>
 		<div class="quota-select-wrapper">
+			<?php if((bool) $_['isadmin']): ?>
 			<select class='quota'>
 				<?php foreach($_['quota_preset'] as $preset):?>
 				<?php if($preset!='default'):?>
@@ -48,16 +56,29 @@ foreach($_["groups"] as $group) {
 					...
 				</option>
 			</select> <input class='quota-other'></input>
+			<?php endif; ?>
+			<?php if((bool) !$_['isadmin']): ?>
+				<select class='quota' disabled="disabled">
+					<option selected="selected">
+				<?php echo $_['default_quota'];?>
+					</option>
+				</select>
+			<?php endif; ?>
 		</div>
 	</div>
 </div>
 
+<div id='notification'></div>
+
 <table data-groups="<?php echo implode(', ',$allGroups);?>">
 	<thead>
 		<tr>
 			<th id='headerName'><?php echo $l->t('Name')?></th>
 			<th id="headerPassword"><?php echo $l->t( 'Password' ); ?></th>
 			<th id="headerGroups"><?php echo $l->t( 'Groups' ); ?></th>
+			<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
+			<th id="headerSubAdmins"><?php echo $l->t('Group Admin'); ?></th>
+			<?php endif;?>
 			<th id="headerQuota"><?php echo $l->t( 'Quota' ); ?></th>
 			<th id="headerRemove">&nbsp;</th>
 		</tr>
@@ -68,9 +89,10 @@ foreach($_["groups"] as $group) {
 			<td class="name"><?php echo $user["name"]; ?></td>
 			<td class="password"><span>●●●●●●●</span> <img class="svg action"
 				src="<?php echo image_path('core','actions/rename.svg')?>"
-				alt="set new password" title="set new password" />
+				alt="set new password" title="set new password"/>
 			</td>
 			<td class="groups"><select
+				class="groupsselect"
 				data-username="<?php echo $user['name'] ;?>"
 				data-user-groups="<?php echo $user['groups'] ;?>"
 				data-placeholder="groups" title="<?php echo $l->t('Groups')?>"
@@ -82,6 +104,21 @@ foreach($_["groups"] as $group) {
 					<?php endforeach;?>
 			</select>
 			</td>
+			<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
+			<td class="subadmins"><select
+				class="subadminsselect"
+				data-username="<?php echo $user['name'] ;?>"
+				data-subadmin="<?php echo $user['subadmin'] ;?>"
+				data-placeholder="subadmins" title="<?php echo $l->t('Group Admin')?>"
+				multiple="multiple">
+					<?php foreach($_["subadmingroups"] as $group): ?>
+					<option value="<?php echo $group;?>">
+						<?php echo $group;?>
+					</option>
+					<?php endforeach;?>
+			</select>
+			</td>
+			<?php endif;?>
 			<td class="quota">
 				<div class="quota-select-wrapper">
 					<select class='quota-user'>
@@ -104,11 +141,19 @@ foreach($_["groups"] as $group) {
 					</select> <input class='quota-other'></input>
 				</div>
 			</td>
-			<td class="remove"><?php if($user['name']!=OC_User::getUser()):?> <img
-				alt="Delete" title="<?php echo $l->t('Delete')?>" class="svg action"
-				src="<?php echo image_path('core','actions/delete.svg') ?>" /> <?php endif;?>
+			<td class="remove">
+				<?php if($user['name']!=OC_User::getUser()):?> 
+					<a href="#" class="action delete" original-title="<?php echo $l->t('Delete')?>">
+						<img src="<?php echo image_path('core','actions/delete.svg') ?>" />
+					</a>
+				<?php endif;?>
 			</td>
 		</tr>
 		<?php endforeach; ?>
 	</tbody>
 </table>
+
+<!-- use a standard notification class / system for this message -->
+<?php if( $_["share_notice"] ):?>
+<h3 class="settingsNotice center"><?php echo $_["share_notice"]; ?></h3>
+<?php endif;?>	
\ No newline at end of file
diff --git a/settings/trans.png b/settings/trans.png
index e6920168bf2..ef57510d530 100644
--- a/settings/trans.png
+++ b/settings/trans.png
diff --git a/settings/users.php b/settings/users.php
index 96515a90ce4..6f39059757a 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -6,22 +6,35 @@
  */
 
 require_once('../lib/base.php');
-OC_Util::checkAdminUser();
+OC_Util::checkSubAdminUser();
 
 // We have some javascript foo!
 OC_Util::addScript( 'settings', 'users' );
 OC_Util::addScript( 'core', 'multiselect' );
+// TODO Move script to core
+OC_Util::addScript('contacts', 'jquery.inview');
 OC_Util::addStyle( 'settings', 'settings' );
 OC_App::setActiveNavigationEntry( 'core_users' );
 
 $users = array();
 $groups = array();
 
-foreach( OC_User::getUsers() as $i ){
-	$users[] = array( "name" => $i, "groups" => join( ", ", OC_Group::getUserGroups( $i ) ),'quota'=>OC_Preferences::getValue($i,'files','quota','default'));
+$isadmin = OC_Group::inGroup(OC_User::getUser(),'admin')?true:false;
+if($isadmin){
+	$accessiblegroups = OC_Group::getGroups();
+	$accessibleusers = OC_User::getUsers('', 30);
+	$subadmins = OC_SubAdmin::getAllSubAdmins();
+}else{
+	$accessiblegroups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
+	$accessibleusers = OC_Group::usersInGroups($accessiblegroups, '', 30);
+	$subadmins = false;
 }
 
-foreach( OC_Group::getGroups() as $i ){
+foreach($accessibleusers as $i){
+	$users[] = array( "name" => $i, "groups" => join( ", ", /*array_intersect(*/OC_Group::getUserGroups($i)/*, OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()))*/),'quota'=>OC_Preferences::getValue($i,'files','quota','default'),'subadmin'=>implode(', ',OC_SubAdmin::getSubAdminsGroups($i)));
+}
+
+foreach( $accessiblegroups as $i ){
 	// Do some more work here soon
 	$groups[] = array( "name" => $i );
 }
@@ -33,12 +46,21 @@ foreach($quotaPreset as &$preset){
 
 $defaultQuota=OC_Appconfig::getValue('files','default_quota','none');
 
+$shareNotice = '';
+
+if (\OC_App::isEnabled( "files_sharing" ) ) {
+
+	$shareNotice = 'Note: users may only share to groups that they belong to, and their members';
+	
+}
+
 $tmpl = new OC_Template( "settings", "users", "user" );
 $tmpl->assign( "users", $users );
 $tmpl->assign( "groups", $groups );
+$tmpl->assign( 'isadmin', (int) $isadmin);
+$tmpl->assign( 'subadmins', $subadmins);
+$tmpl->assign( 'numofgroups', count($accessiblegroups));
 $tmpl->assign( 'quota_preset', $quotaPreset);
 $tmpl->assign( 'default_quota', $defaultQuota);
+$tmpl->assign( 'share_notice', $shareNotice);
 $tmpl->printPage();
-
-?>
-