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
author: Jörn Friedrich Dreyer <jfd@butonic.de> 2012-08-25 00:05:07 +0200
committer: Jörn Friedrich Dreyer <jfd@butonic.de> 2012-08-25 00:05:07 +0200
commit: c8255a170c2d7449b4e7728edd2237eea71dca80 (patch)
tree: e5a3854ec472be9700064bc7b689b8adf7c7f692 /core
parent: 0c0ae928dcd483211a92303eb2b202453d02a86e (diff)
parent: 46d6fd15e4cc02d45079ffc688be0684e61f1434 (diff)
download: nextcloud-server-c8255a170c2d7449b4e7728edd2237eea71dca80.tar.gz
nextcloud-server-c8255a170c2d7449b4e7728edd2237eea71dca80.zip
133 files changed, 1655 insertions, 189 deletions
diff --git a/core/ajax/share.php b/core/ajax/share.php
new file mode 100644
index 00000000000..04294a36ac0
--- /dev/null
+++ b/core/ajax/share.php
@@ -0,0 +1,126 @@
+<?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::checkLoggedIn();
+if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSource'])) {
+	switch ($_POST['action']) {
+		case 'share':
+			if (isset($_POST['shareType']) && isset($_POST['shareWith']) && isset($_POST['permissions'])) {
+				try {
+					OCP\Share::shareItem($_POST['itemType'], $_POST['itemSource'], (int)$_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
+					// TODO May need to return private link
+					OC_JSON::success();
+				} catch (Exception $exception) {
+					OC_JSON::error(array('data' => array('message' => $exception->getMessage())));
+				}
+			}
+			break;
+		case 'unshare':
+			if (isset($_POST['shareType']) && isset($_POST['shareWith'])) {
+				$return = OCP\Share::unshare($_POST['itemType'], $_POST['itemSource'], $_POST['shareType'], $_POST['shareWith']);
+				($return) ? OC_JSON::success() : OC_JSON::error();
+			}
+			break;
+		case 'setPermissions':
+			if (isset($_POST['shareType']) && isset($_POST['shareWith']) && isset($_POST['permissions'])) {
+				$return = OCP\Share::setPermissions($_POST['itemType'], $_POST['itemSource'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
+				($return) ? OC_JSON::success() : OC_JSON::error();
+			}
+			break;
+	}
+} else if (isset($_GET['fetch'])) {
+	switch ($_GET['fetch']) {
+		case 'getItemsSharedStatuses':
+			if (isset($_GET['itemType'])) {
+				$return = OCP\Share::getItemsShared($_GET['itemType'], OCP\Share::FORMAT_STATUSES);
+				is_array($return) ? OC_JSON::success(array('data' => $return)) : OC_JSON::error();
+			}
+			break;
+		case 'getItem':
+			if (isset($_GET['itemType']) && isset($_GET['itemSource']) && isset($_GET['checkShares'])) {
+				$reshare = OCP\Share::getItemSharedWithBySource($_GET['itemType'], $_GET['itemSource'], OCP\Share::FORMAT_NONE, null, true);
+				if ($_GET['checkShares'] == "true") {
+					$shares = OCP\Share::getItemShared($_GET['itemType'], $_GET['itemSource']);
+				} else {
+					$shares = false;
+				}
+				OC_JSON::success(array('data' => array('reshare' => $reshare, 'shares' => $shares)));
+			}
+			break;
+		case 'getShareWith':
+			if (isset($_GET['search'])) {
+				$shareWith = array();
+				if (OC_App::isEnabled('contacts')) {
+					// TODO Add function to contacts to only get the 'fullname' column to improve performance
+					$ids = OC_Contacts_Addressbook::activeIds();
+					foreach ($ids as $id) {
+						$vcards = OC_Contacts_VCard::all($id);
+						foreach ($vcards as $vcard) {
+							$contact = $vcard['fullname'];
+							if (stripos($contact, $_GET['search']) !== false
+								&& (!isset($_GET['itemShares'])
+								|| !isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT])
+								|| !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT])
+								|| !in_array($contact, $_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT]))) {
+								$shareWith[] = array('label' => $contact, 'value' => array('shareType' => 5, 'shareWith' => $vcard['id']));
+							}
+						}
+					}
+				}
+				$count = 0;
+				$users = array();
+				$limit = 0;
+				$offset = 0;
+				while ($count < 4 && count($users) == $limit) {
+					$limit = 4 - $count;
+					$users = OC_User::getUsers($_GET['search'], $limit, $offset);
+					$offset += $limit;
+					foreach ($users as $user) {
+						if ((!isset($_GET['itemShares']) || !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_USER]) || !in_array($user, $_GET['itemShares'][OCP\Share::SHARE_TYPE_USER])) && $user != OC_User::getUser()) {
+							$shareWith[] = array('label' => $user, 'value' => array('shareType' => OCP\Share::SHARE_TYPE_USER, 'shareWith' => $user));
+							$count++;
+						}
+					}
+				}
+				$count = 0;
+				$groups = OC_Group::getUserGroups(OC_User::getUser());
+				foreach ($groups as $group) {
+					if ($count < 4) {
+						if (stripos($group, $_GET['search']) !== false
+							&& (!isset($_GET['itemShares'])
+							|| !isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])
+							|| !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])
+							|| !in_array($group, $_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP]))) {
+							$shareWith[] = array('label' => $group.' (group)', 'value' => array('shareType' => OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => $group));
+							$count++;
+						}
+					} else {
+						break;
+					}
+				}
+				OC_JSON::success(array('data' => $shareWith));
+			}
+			break;
+	}
+}
+
+?>
+\ No newline at end of file
diff --git a/core/ajax/translations.php b/core/ajax/translations.php
index a6433b1964a..2bd6b7ed634 100644
--- a/core/ajax/translations.php
+++ b/core/ajax/translations.php
@@ -29,4 +29,3 @@ $app = $_POST["app"];
 $l = OC_L10N::get( $app );
 
 OC_JSON::success(array('data' => $l->getTranslations()));
-?>
diff --git a/core/ajax/vcategories/add.php b/core/ajax/vcategories/add.php
index a58489228d8..e69f8bb726b 100644
--- a/core/ajax/vcategories/add.php
+++ b/core/ajax/vcategories/add.php
@@ -39,5 +39,3 @@ if($categories->hasCategory($category)) {
 }
 
 OC_JSON::success(array('data' => array('categories'=>$categories->categories())));
-
-?>
diff --git a/core/ajax/vcategories/delete.php b/core/ajax/vcategories/delete.php
index 75def433d30..a41fa083c38 100644
--- a/core/ajax/vcategories/delete.php
+++ b/core/ajax/vcategories/delete.php
@@ -34,5 +34,3 @@ if(is_null($categories)) {
 $vcategories = new OC_VCategories($app);
 $vcategories->delete($categories);
 OC_JSON::success(array('data' => array('categories'=>$vcategories->categories())));
-
-?>
diff --git a/core/ajax/vcategories/edit.php b/core/ajax/vcategories/edit.php
index 252b3d3454c..3e5540cbc22 100644
--- a/core/ajax/vcategories/edit.php
+++ b/core/ajax/vcategories/edit.php
@@ -31,5 +31,3 @@ $categories = $vcategories->categories();
 debug(print_r($categories, true));
 $tmpl->assign('categories',$categories);
 $tmpl->printpage();
-
-?>
diff --git a/core/css/share.css b/core/css/share.css
new file mode 100644
index 00000000000..a683a24a116
--- /dev/null
+++ b/core/css/share.css
@@ -0,0 +1,17 @@
+/* Copyright (c) 2011, Jan-Christoph Borchardt, http://jancborchardt.net
+ This file is licensed under the Affero General Public License version 3 or later.
+ See the COPYING-README file. */
+
+#dropdown { display:block;  position:absolute; z-index:500; width:16em; right:0; margin-right:7em; background:#eee; padding:1em;
+-moz-box-shadow:0 1px 1px #777; -webkit-box-shadow:0 1px 1px #777; box-shadow:0 1px 1px #777;
+-moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em;
+-moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
+#shareWithList { padding:0.5em; list-style-type: none; }
+#shareWithList li { padding-top:0.1em; }
+#dropdown label { font-weight:normal; }
+#dropdown input[type="checkbox"] { margin:0 0.2em 0 0.5em; }
+a.showCruds { display:inline; opacity:.5; }
+a.showCruds:hover { opacity:1; }
+a.unshare { float:right; display:inline; padding:.3em 0 0 .3em !important; opacity:.5; }
+a.unshare:hover { opacity:1; }
+#privateLink { border-top:1px solid #ddd; padding-top:0.5em; }
+\ No newline at end of file
diff --git a/core/css/styles.css b/core/css/styles.css
index 186c11b4ffe..dd6f9d4675d 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -3,7 +3,7 @@
  See the COPYING-README file. */
 
 html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section { margin:0; padding:0; border:0; outline:0; font-weight:inherit; font-size:100%; font-family:inherit; vertical-align:baseline; cursor:default; }
-html, body { height: 100%; }
+html, body { height: 100%; overflow: auto; }
 article, aside, dialog, figure, footer, header, hgroup, nav, section { display:block; }
 body { line-height:1.5; }
 table { border-collapse:separate; border-spacing:0; white-space:nowrap; }
@@ -16,7 +16,7 @@ body { background:#fefefe; font:normal .8em/1.6em "Lucida Grande", Arial, Verdan
 
 
 /* HEADERS */
-#body-user #header, #body-settings #header { position:fixed; top:0; z-index:100; width:100%; height:2.5em; padding:.5em; background:#1d2d44; -moz-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; -webkit-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; }
+#body-user #header, #body-settings #header { position:fixed; top:0; left:0; right:0; z-index:100; height:2.5em; line-height:2.5em; padding:.5em; background:#1d2d44; -moz-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; -webkit-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; }
 #body-login #header { margin: -2em auto 0; text-align:center; height:10em; padding:1em 0 .5em;
  -moz-box-shadow:0 0 1em rgba(0, 0, 0, .5); -webkit-box-shadow:0 0 1em rgba(0, 0, 0, .5); box-shadow:0 0 1em rgba(0, 0, 0, .5);
 background: #1d2d44; /* Old browsers */
@@ -28,8 +28,9 @@ background: -ms-linear-gradient(top, #35537a 0%,#1d2d42 100%); /* IE10+ */
 background: linear-gradient(top, #35537a 0%,#1d2d42 100%); /* W3C */
 filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d42',GradientType=0 ); /* IE6-9 */ }
 
-#owncloud { float:left; }
-
+#owncloud { float:left; vertical-align:middle; }
+.header-right { float:right; vertical-align:middle; padding:0 0.5em; }
+.header-right > * { vertical-align:middle; }
 
 /* INPUTS */
 input[type="text"], input[type="password"] { cursor:text; }
@@ -49,7 +50,7 @@ input[type="checkbox"] { width:auto; }
 #body-login input[type="text"], #body-login input[type="password"] { width: 13em; }
 #body-login input.login { width: auto; float: right; }
 #remember_login { margin:.8em .2em 0 1em; }
-.searchbox input[type="search"] { position:fixed; font-size:1.2em; top:.4em; right:3em; padding:.2em .5em .2em 1.5em; background:#fff url('../img/actions/search.svg') no-repeat .5em center; border:0; -moz-border-radius:1em; -webkit-border-radius:1em; border-radius:1em; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70);opacity:.7; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; }
+.searchbox input[type="search"] { font-size:1.2em; padding:.2em .5em .2em 1.5em; background:#fff url('../img/actions/search.svg') no-repeat .5em center; border:0; -moz-border-radius:1em; -webkit-border-radius:1em; border-radius:1em; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70);opacity:.7; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; }
 input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; }
 input[type="submit"].highlight{ background:#ffc100; border:1px solid #db0; text-shadow:#ffeedd 0 1px 0; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; }
 #select_all{ margin-top: .4em !important;}
@@ -101,19 +102,19 @@ label.infield { cursor: text !important; }
 #expand { position:relative; z-index:100; margin-bottom:-.5em; padding:.5em 10.1em .7em 1.2em; cursor:pointer; }
 #expand+span { position:absolute; z-index:99; margin:-1.7em 0 0 2.5em; font-size:1.2em; color:#666; text-shadow:#f8f8f8 0 1px 0; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; }
 #expand:hover+span, #expand+span:hover { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; cursor:pointer; }
-#logout { position:absolute; right:0; top:0; padding:1.2em 2em .55em 1.2em; }
-
 
 /* VARIOUS REUSABLE SELECTORS */
 .hidden { display:none; }
 .bold { font-weight: bold; }
+.center { text-align: center; }
 
-#notification { z-index:101; cursor:pointer; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position:fixed; left:50%; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
+#notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position:fixed; left:50%; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
+#notification span { cursor:pointer; font-weight:bold; margin-left:1em; }
 
 .action, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5; -webkit-transition:opacity 200ms; -moz-transition:opacity 200ms; -o-transition:opacity 200ms; transition:opacity 200ms; }
 .action { width: 16px; height: 16px; }
-#logout { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; }
-.action:hover, .selectedActions a:hover, #logout:hover { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
+.header-action { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; }
+.action:hover, .selectedActions a:hover, .header-action:hover { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
 
 table:not(.nostyle) tr { -webkit-transition:background-color 200ms; -moz-transition:background-color 200ms; -o-transition:background-color 200ms; transition:background-color 200ms; }
 tbody tr:hover, tr:active { background-color:#f8f8f8; }
@@ -134,11 +135,13 @@ div.jp-play-bar, div.jp-seek-bar { padding:0; }
 
 li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat; color: #FF3B3B; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; }
 .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { overflow: hidden; text-overflow: ellipsis; }
-.hint { background-image: url('/core/img/actions/info.png'); background-repeat:no-repeat; color: #777777; padding-left: 25px; background-position: 0 0.3em;}
+.hint { background-image: url('../img/actions/info.png'); background-repeat:no-repeat; color: #777777; padding-left: 25px; background-position: 0 0.3em;}
 .separator { display: inline; border-left: 1px solid #d3d3d3; border-right: 1px solid #fff; height: 10px; width:0px; margin: 4px; }
 
 a.bookmarklet { background-color: #ddd; border:1px solid #ccc; padding: 5px;padding-top: 0px;padding-bottom: 2px; text-decoration: none; margin-top: 5px }
 
+.exception{color: #000000;}
+.exception textarea{width:95%;height: 200px;background:#ffe;border:0;}
 
 /* ---- DIALOGS ---- */
 #dirtree {width: 100%;}
@@ -155,3 +158,14 @@ a.bookmarklet { background-color: #ddd; border:1px solid #ccc; padding: 5px;padd
 #categorylist li { background:#f8f8f8; padding:.3em .8em; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; -webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms; }
 #categorylist li:hover, li:active { background:#eee; }
 #category_addinput { width: 10em; }
+
+/* ---- APP SETTINGS ---- */
+.popup { background-color: white; border-radius: 10px 10px 10px 10px; box-shadow: 0 0 20px #888888; color: #333333; padding: 10px; position: fixed !important; z-index: 200; }
+.popup.topright { top: 7em; right: 1em; }
+.popup.bottomleft { bottom: 1em; left: 33em; }
+.popup .close { position:absolute; top: 0.2em; right:0.2em; height: 20px; width: 20px; background:url('../img/actions/delete.svg') no-repeat center; }
+.popup h2 { font-weight: bold; font-size: 1.2em; }
+.arrow { border-bottom: 10px solid white; border-left: 10px solid transparent; border-right: 10px solid transparent; display: block; height: 0; position: absolute; width: 0; z-index: 201; }
+.arrow.left { left: -13px; bottom: 1.2em; -webkit-transform: rotate(270deg); -moz-transform: rotate(270deg); -o-transform: rotate(270deg); -ms-transform: rotate(270deg); transform: rotate(270deg); }
+.arrow.up { top: -8px; right: 2em; }
+.arrow.down { -webkit-transform: rotate(180deg); -moz-transform: rotate(180deg); -o-transform: rotate(180deg); -ms-transform: rotate(180deg); transform: rotate(180deg); }
diff --git a/core/img/actions/add.png b/core/img/actions/add.png
index db1b1970f17..25d472b2dc4 100644
--- a/core/img/actions/add.png
+++ b/core/img/actions/add.png
diff --git a/core/img/actions/delete.png b/core/img/actions/delete.png
index bc0c782882d..fa8e18183ed 100644
--- a/core/img/actions/delete.png
+++ b/core/img/actions/delete.png
diff --git a/core/img/actions/download.png b/core/img/actions/download.png
index 14e88e14c0f..65954f941bb 100644
--- a/core/img/actions/download.png
+++ b/core/img/actions/download.png
diff --git a/core/img/actions/history.png b/core/img/actions/history.png
index b1e743651f8..1d138b8cd5a 100644
--- a/core/img/actions/history.png
+++ b/core/img/actions/history.png
diff --git a/core/img/actions/info.png b/core/img/actions/info.png
index 2257d144d11..37ccb356830 100644
--- a/core/img/actions/info.png
+++ b/core/img/actions/info.png
diff --git a/core/img/actions/logout.png b/core/img/actions/logout.png
index 74dcd33bee7..eb2ea766c31 100644
--- a/core/img/actions/logout.png
+++ b/core/img/actions/logout.png
diff --git a/core/img/actions/mail.png b/core/img/actions/mail.png
index 4d3192ef329..8e884fbc0ea 100644
--- a/core/img/actions/mail.png
+++ b/core/img/actions/mail.png
diff --git a/core/img/actions/pause-big.png b/core/img/actions/pause-big.png
index 9bcfd0406d8..1c4cf503b8d 100644
--- a/core/img/actions/pause-big.png
+++ b/core/img/actions/pause-big.png
diff --git a/core/img/actions/pause.png b/core/img/actions/pause.png
index ced8c43ab34..f74ed3a8619 100644
--- a/core/img/actions/pause.png
+++ b/core/img/actions/pause.png
diff --git a/core/img/actions/play-add.png b/core/img/actions/play-add.png
index 0c330d4ac44..0097f671aef 100644
--- a/core/img/actions/play-add.png
+++ b/core/img/actions/play-add.png
diff --git a/core/img/actions/play-big.png b/core/img/actions/play-big.png
index 3ccd36129ec..2da2426dcfc 100644
--- a/core/img/actions/play-big.png
+++ b/core/img/actions/play-big.png
diff --git a/core/img/actions/play-next.png b/core/img/actions/play-next.png
index 0c0ccc87cdc..08568b3dc0b 100644
--- a/core/img/actions/play-next.png
+++ b/core/img/actions/play-next.png
diff --git a/core/img/actions/play-previous.png b/core/img/actions/play-previous.png
index d98cedaa1e8..811cde46c15 100644
--- a/core/img/actions/play-previous.png
+++ b/core/img/actions/play-previous.png
diff --git a/core/img/actions/play.png b/core/img/actions/play.png
index a252a751554..adbef1e576d 100644
--- a/core/img/actions/play.png
+++ b/core/img/actions/play.png
diff --git a/core/img/actions/public.png b/core/img/actions/public.png
index 75d1366326b..9e56f2919fd 100644
--- a/core/img/actions/public.png
+++ b/core/img/actions/public.png
diff --git a/core/img/actions/rename.png b/core/img/actions/rename.png
index 9993a092df1..3af6840071b 100644
--- a/core/img/actions/rename.png
+++ b/core/img/actions/rename.png
diff --git a/core/img/actions/search.png b/core/img/actions/search.png
index bfedb80bb57..98e1d73ee34 100644
--- a/core/img/actions/search.png
+++ b/core/img/actions/search.png
diff --git a/core/img/actions/settings.png b/core/img/actions/settings.png
index 5b1607e59fc..8b3acb00a4f 100644
--- a/core/img/actions/settings.png
+++ b/core/img/actions/settings.png
diff --git a/core/img/actions/share.png b/core/img/actions/share.png
index 62c4627f317..099e4d6ab35 100644
--- a/core/img/actions/share.png
+++ b/core/img/actions/share.png
diff --git a/core/img/actions/shared.png b/core/img/actions/shared.png
index 073ff741685..6e112e75b44 100644
--- a/core/img/actions/shared.png
+++ b/core/img/actions/shared.png
diff --git a/core/img/actions/sound-off.png b/core/img/actions/sound-off.png
index 7900e500c90..2eddb00af0f 100644
--- a/core/img/actions/sound-off.png
+++ b/core/img/actions/sound-off.png
diff --git a/core/img/actions/sound.png b/core/img/actions/sound.png
index 838c9cee171..9349c94e7a4 100644
--- a/core/img/actions/sound.png
+++ b/core/img/actions/sound.png
diff --git a/core/img/actions/triangle-s.png b/core/img/actions/triangle-s.png
index d77d5db2caa..53590a2197b 100644
--- a/core/img/actions/triangle-s.png
+++ b/core/img/actions/triangle-s.png
diff --git a/core/img/actions/upload-white.png b/core/img/actions/upload-white.png
index 09dba9e9108..fd9bdccc240 100644
--- a/core/img/actions/upload-white.png
+++ b/core/img/actions/upload-white.png
diff --git a/core/img/actions/upload.png b/core/img/actions/upload.png
index 5744aad75a8..1d90165a552 100644
--- a/core/img/actions/upload.png
+++ b/core/img/actions/upload.png
diff --git a/core/img/breadcrumb-start.png b/core/img/breadcrumb-start.png
index a79d675454e..b0df5f44037 100644
--- a/core/img/breadcrumb-start.png
+++ b/core/img/breadcrumb-start.png
diff --git a/core/img/breadcrumb.png b/core/img/breadcrumb.png
index b124f349f56..84992be0d93 100644
--- a/core/img/breadcrumb.png
+++ b/core/img/breadcrumb.png
diff --git a/core/img/favicon-touch.png b/core/img/favicon-touch.png
index cfaaa4399ac..24770fb634f 100644
--- a/core/img/favicon-touch.png
+++ b/core/img/favicon-touch.png
diff --git a/core/img/favicon.png b/core/img/favicon.png
index c1b1cb65460..79b6795f6f6 100644
--- a/core/img/favicon.png
+++ b/core/img/favicon.png
diff --git a/core/img/filetypes/application-msexcel.png b/core/img/filetypes/application-msexcel.png
new file mode 100644
index 00000000000..abcd93689a0
--- /dev/null
+++ b/core/img/filetypes/application-msexcel.png
diff --git a/core/img/filetypes/application-mspowerpoint.png b/core/img/filetypes/application-mspowerpoint.png
new file mode 100644
index 00000000000..b4aaad9a45c
--- /dev/null
+++ b/core/img/filetypes/application-mspowerpoint.png
diff --git a/core/img/filetypes/application-msword.png b/core/img/filetypes/application-msword.png
new file mode 100644
index 00000000000..e8b230c59cb
--- /dev/null
+++ b/core/img/filetypes/application-msword.png
diff --git a/core/img/filetypes/application-sgf.png b/core/img/filetypes/application-sgf.png
index f171f5579e7..48996c54394 100644
--- a/core/img/filetypes/application-sgf.png
+++ b/core/img/filetypes/application-sgf.png
diff --git a/core/img/filetypes/application-vnd.oasis.opendocument.formula.png b/core/img/filetypes/application-vnd.oasis.opendocument.formula.png
index 4cefbb690d1..e0cf49542d4 100644
--- a/core/img/filetypes/application-vnd.oasis.opendocument.formula.png
+++ b/core/img/filetypes/application-vnd.oasis.opendocument.formula.png
diff --git a/core/img/filetypes/application-vnd.oasis.opendocument.graphics.png b/core/img/filetypes/application-vnd.oasis.opendocument.graphics.png
index 3d66cc97eb5..b326a0543a5 100644
--- a/core/img/filetypes/application-vnd.oasis.opendocument.graphics.png
+++ b/core/img/filetypes/application-vnd.oasis.opendocument.graphics.png
diff --git a/core/img/filetypes/application-vnd.oasis.opendocument.presentation.png b/core/img/filetypes/application-vnd.oasis.opendocument.presentation.png
index 46942cba285..7c6fd246840 100644
--- a/core/img/filetypes/application-vnd.oasis.opendocument.presentation.png
+++ b/core/img/filetypes/application-vnd.oasis.opendocument.presentation.png
diff --git a/core/img/filetypes/application-vnd.oasis.opendocument.spreadsheet.png b/core/img/filetypes/application-vnd.oasis.opendocument.spreadsheet.png
index abc38d4310c..8b0e85b0670 100644
--- a/core/img/filetypes/application-vnd.oasis.opendocument.spreadsheet.png
+++ b/core/img/filetypes/application-vnd.oasis.opendocument.spreadsheet.png
diff --git a/core/img/filetypes/application-vnd.oasis.opendocument.text.png b/core/img/filetypes/application-vnd.oasis.opendocument.text.png
index 06c1f30c8fa..48452eb3e86 100644
--- a/core/img/filetypes/application-vnd.oasis.opendocument.text.png
+++ b/core/img/filetypes/application-vnd.oasis.opendocument.text.png
diff --git a/core/img/filetypes/application-x-7z-compressed.png b/core/img/filetypes/application-x-7z-compressed.png
index 55dd0f75366..2cd08aebf95 100644
--- a/core/img/filetypes/application-x-7z-compressed.png
+++ b/core/img/filetypes/application-x-7z-compressed.png
diff --git a/core/img/filetypes/application-x-bzip-compressed-tar.png b/core/img/filetypes/application-x-bzip-compressed-tar.png
index 55dd0f75366..2cd08aebf95 100644
--- a/core/img/filetypes/application-x-bzip-compressed-tar.png
+++ b/core/img/filetypes/application-x-bzip-compressed-tar.png
diff --git a/core/img/filetypes/application-x-bzip.png b/core/img/filetypes/application-x-bzip.png
index 55dd0f75366..2cd08aebf95 100644
--- a/core/img/filetypes/application-x-bzip.png
+++ b/core/img/filetypes/application-x-bzip.png
diff --git a/core/img/filetypes/application-x-compressed-tar.png b/core/img/filetypes/application-x-compressed-tar.png
index 55dd0f75366..2cd08aebf95 100644
--- a/core/img/filetypes/application-x-compressed-tar.png
+++ b/core/img/filetypes/application-x-compressed-tar.png
diff --git a/core/img/filetypes/application-x-deb.png b/core/img/filetypes/application-x-deb.png
index 55dd0f75366..2cd08aebf95 100644
--- a/core/img/filetypes/application-x-deb.png
+++ b/core/img/filetypes/application-x-deb.png
diff --git a/core/img/filetypes/application-x-debian-package.png b/core/img/filetypes/application-x-debian-package.png
index eff1b7fc8c2..b3f6b7e5cf9 100644
--- a/core/img/filetypes/application-x-debian-package.png
+++ b/core/img/filetypes/application-x-debian-package.png
diff --git a/core/img/filetypes/application-x-gzip.png b/core/img/filetypes/application-x-gzip.png
index 55dd0f75366..2cd08aebf95 100644
--- a/core/img/filetypes/application-x-gzip.png
+++ b/core/img/filetypes/application-x-gzip.png
diff --git a/core/img/filetypes/application-x-lzma-compressed-tar.png b/core/img/filetypes/application-x-lzma-compressed-tar.png
index 55dd0f75366..2cd08aebf95 100644
--- a/core/img/filetypes/application-x-lzma-compressed-tar.png
+++ b/core/img/filetypes/application-x-lzma-compressed-tar.png
diff --git a/core/img/filetypes/application-x-rar.png b/core/img/filetypes/application-x-rar.png
index 55dd0f75366..2cd08aebf95 100644
--- a/core/img/filetypes/application-x-rar.png
+++ b/core/img/filetypes/application-x-rar.png
diff --git a/core/img/filetypes/application-x-rpm.png b/core/img/filetypes/application-x-rpm.png
index 55dd0f75366..2cd08aebf95 100644
--- a/core/img/filetypes/application-x-rpm.png
+++ b/core/img/filetypes/application-x-rpm.png
diff --git a/core/img/filetypes/application-x-tar.png b/core/img/filetypes/application-x-tar.png
index 55dd0f75366..2cd08aebf95 100644
--- a/core/img/filetypes/application-x-tar.png
+++ b/core/img/filetypes/application-x-tar.png
diff --git a/core/img/filetypes/application-x-tarz.png b/core/img/filetypes/application-x-tarz.png
index 55dd0f75366..2cd08aebf95 100644
--- a/core/img/filetypes/application-x-tarz.png
+++ b/core/img/filetypes/application-x-tarz.png
diff --git a/core/img/filetypes/application-zip.png b/core/img/filetypes/application-zip.png
index 55dd0f75366..2cd08aebf95 100644
--- a/core/img/filetypes/application-zip.png
+++ b/core/img/filetypes/application-zip.png
diff --git a/core/img/filetypes/flash.png b/core/img/filetypes/flash.png
index 5769120b1b6..9f5db634a4f 100644
--- a/core/img/filetypes/flash.png
+++ b/core/img/filetypes/flash.png
diff --git a/core/img/icon-error.png b/core/img/icon-error.png
index ed438a32fd8..1ce0be0fb2e 100644
--- a/core/img/icon-error.png
+++ b/core/img/icon-error.png
diff --git a/core/img/icon-sync.png b/core/img/icon-sync.png
index 99a43d4c69a..a3d09704246 100644
--- a/core/img/icon-sync.png
+++ b/core/img/icon-sync.png
diff --git a/core/img/icon.png b/core/img/icon.png
index 24a4b1c3e83..745b82584c6 100644
--- a/core/img/icon.png
+++ b/core/img/icon.png
diff --git a/core/img/logo-inverted.png b/core/img/logo-inverted.png
index d9fd119dc18..265a8871b45 100644
--- a/core/img/logo-inverted.png
+++ b/core/img/logo-inverted.png
diff --git a/core/img/logo-square.png b/core/img/logo-square.png
index 086d415db6d..b836de8f3be 100644
--- a/core/img/logo-square.png
+++ b/core/img/logo-square.png
diff --git a/core/img/logo-wide.png b/core/img/logo-wide.png
index ea10828db5e..702f1d97e5b 100644
--- a/core/img/logo-wide.png
+++ b/core/img/logo-wide.png
diff --git a/core/img/logo.png b/core/img/logo.png
index 8177c4cdba1..a84fe145bbd 100644
--- a/core/img/logo.png
+++ b/core/img/logo.png
diff --git a/core/img/places/file.png b/core/img/places/file.png
index 49790448897..63837a1af90 100644
--- a/core/img/places/file.png
+++ b/core/img/places/file.png
diff --git a/core/img/places/folder.png b/core/img/places/folder.png
index 3edbe257a34..46079e03e9e 100644
--- a/core/img/places/folder.png
+++ b/core/img/places/folder.png
diff --git a/core/img/places/home.png b/core/img/places/home.png
index b3fb9bbaf6f..c3dbd3e3538 100644
--- a/core/img/places/home.png
+++ b/core/img/places/home.png
diff --git a/core/img/places/music.png b/core/img/places/music.png
index 4c844425d64..85ee2474cd1 100644
--- a/core/img/places/music.png
+++ b/core/img/places/music.png
diff --git a/core/img/places/picture.png b/core/img/places/picture.png
index 980a7c69813..9abcd09722c 100644
--- a/core/img/places/picture.png
+++ b/core/img/places/picture.png
diff --git a/core/img/remoteStorage-big.png b/core/img/remoteStorage-big.png
index 7c429a6a738..f2254233031 100644
--- a/core/img/remoteStorage-big.png
+++ b/core/img/remoteStorage-big.png
diff --git a/core/js/backgroundjobs.js b/core/js/backgroundjobs.js
new file mode 100644
index 00000000000..4a558a66b4b
--- /dev/null
+++ b/core/js/backgroundjobs.js
@@ -0,0 +1,25 @@
+/**
+* ownCloud
+*
+* @author Jakob Sack
+* @copyright 2012 Jakob Sack owncloud@jakobsack.de
+*
+* 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/>.
+*
+*/
+
+// start worker once page has loaded
+$(document).ready(function(){
+	$.get( OC.webroot+'/cron.php' );
+});
diff --git a/core/js/eventsource.js b/core/js/eventsource.js
index 08259e02cae..e3ad7e3a671 100644
--- a/core/js/eventsource.js
+++ b/core/js/eventsource.js
@@ -40,6 +40,7 @@ OC.EventSource=function(src,data){
 			dataStr+=name+'='+encodeURIComponent(data[name])+'&';
 		}
 	}
+	dataStr+='requesttoken='+OC.EventSource.requesttoken;
 	if(!this.useFallBack && typeof EventSource !='undefined'){
 		this.source=new EventSource(src+'?'+dataStr);
 		this.source.onmessage=function(e){
diff --git a/core/js/js.js b/core/js/js.js
index dec6ea047c0..86e802cd348 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -31,7 +31,7 @@ t.cache={};
 
 OC={
 	webroot:oc_webroot,
-	appswebroot:oc_appswebroot,
+	appswebroots:oc_appswebroots,
 	currentUser:(typeof oc_current_user!=='undefined')?oc_current_user:false,
 	coreApps:['', 'admin','log','search','settings','core','3rdparty'],
 	/**
@@ -63,13 +63,12 @@ OC={
 				link+= file;
 			}
 		}else if(file.substring(file.length-3) != 'php' && !isCore){
-			link=OC.appswebroot;
-			link+='/';
-			link+='apps/';
-			link+=app+'/';
+			link=OC.appswebroots[app];
 			if(type){
-				link+=type+'/';
+				link+= '/'+type+'/';
 			}
+			if(link.substring(link.length-1) != '/')
+				link+='/';
 			link+=file;
 		}else{
 			link+='/';
@@ -83,7 +82,7 @@ OC={
 			if(type){
 				link+=type+'/';
 			}
-			link+=file;	
+			link+=file;
 		}
 		return link;
 	},
@@ -92,9 +91,9 @@ OC={
 	 * @param app the app id to which the image belongs
 	 * @param file the name of the image file
 	 * @return string
-	 * 
+	 *
 	 * if no extension is given for the image, it will automatically decide between .png and .svg based on what the browser supports
-	 */ 
+	 */
 	imagePath:function(app,file){
 		if(file.indexOf('.')==-1){//if no extension is given, use png or svg depending on browser support
 			file+=(SVGSupport())?'.svg':'.png';
@@ -106,7 +105,7 @@ OC={
 	 * @param app the app id to which the script belongs
 	 * @param script the filename of the script
 	 * @param ready event handeler to be called when the script is loaded
-	 * 
+	 *
 	 * if the script is already loaded, the event handeler will be called directly
 	 */
 	addScript:function(app,script,ready){
@@ -151,12 +150,68 @@ OC={
 		}
 	},
 	dialogs:OCdialogs,
-  mtime2date:function(mtime) {
-    mtime = parseInt(mtime);
-    var date = new Date(1000*mtime);
-    var ret = date.getDate()+'.'+(date.getMonth()+1)+'.'+date.getFullYear()+', '+date.getHours()+':'+date.getMinutes();
-    return ret;
-  }
+	mtime2date:function(mtime) {
+		mtime = parseInt(mtime);
+		var date = new Date(1000*mtime);
+		var ret = date.getDate()+'.'+(date.getMonth()+1)+'.'+date.getFullYear()+', '+date.getHours()+':'+date.getMinutes();
+		return ret;
+	},
+	/**
+	 * Opens a popup with the setting for an app.
+	 * @param appid String. The ID of the app e.g. 'calendar', 'contacts' or 'files'.
+	 * @param loadJS boolean or String. If true 'js/settings.js' is loaded. If it's a string
+	 * it will attempt to load a script by that name in the 'js' directory.
+	 * @param cache boolean. If true the javascript file won't be forced refreshed. Defaults to true.
+	 * @param scriptName String. The name of the PHP file to load. Defaults to 'settings.php' in
+	 * the root of the app directory hierarchy.
+	 */
+	appSettings:function(args) {
+		if(typeof args === 'undefined' || typeof args.appid === 'undefined') {
+			throw { name: 'MissingParameter', message: 'The parameter appid is missing' };
+		}
+		var props = {scriptName:'settings.php', cache:true};
+		$.extend(props, args);
+		var settings = $('#appsettings');
+		if(settings.length == 0) {
+			throw { name: 'MissingDOMElement', message: 'There has be be an element with id "appsettings" for the popup to show.' };
+		}
+		var popup = $('#appsettings_popup');
+		if(popup.length == 0) {
+			$('body').prepend('<div class="popup hidden" id="appsettings_popup"></div>');
+			popup = $('#appsettings_popup');
+			popup.addClass(settings.hasClass('topright') ? 'topright' : 'bottomleft');
+		}
+		if(popup.is(':visible')) {
+			popup.hide().remove();
+		} else {
+			var arrowclass = settings.hasClass('topright') ? 'up' : 'left';
+			var jqxhr = $.get(OC.filePath(props.appid, '', props.scriptName), function(data) {
+				popup.html(data).ready(function() {
+					popup.prepend('<span class="arrow '+arrowclass+'"></span><h2>'+t('core', 'Settings')+'</h2><a class="close svg"></a>').show();
+					popup.find('.close').bind('click', function() {
+						popup.remove();
+					})
+					if(typeof props.loadJS !== 'undefined') {
+						var scriptname;
+						if(props.loadJS === true) {
+							scriptname = 'settings.js';
+						} else if(typeof props.loadJS === 'string') {
+							scriptname = props.loadJS;
+						} else {
+							throw { name: 'InvalidParameter', message: 'The "loadJS" parameter must be either boolean or a string.' };
+						}
+						if(props.cache) {
+							$.ajaxSetup({cache: true});
+						}
+						$.getScript(OC.filePath(props.appid, 'js', scriptname))
+						.fail(function(jqxhr, settings, e) {
+							throw e;
+						});
+					}
+				}).show();
+			}, 'html');
+		}
+	}
 };
 OC.search.customResults={};
 OC.search.currentResult=-1;
@@ -203,7 +258,7 @@ if (!Array.prototype.filter) {
 		var len = this.length >>> 0;
 		if (typeof fun != "function")
 			throw new TypeError();
-		
+
 		var res = [];
 		var thisp = arguments[1];
 		for (var i = 0; i < len; i++) {
@@ -223,14 +278,14 @@ if (!Array.prototype.indexOf){
 	Array.prototype.indexOf = function(elt /*, from*/)
 	{
 		var len = this.length;
-		
+
 		var from = Number(arguments[1]) || 0;
 		from = (from < 0)
 		? Math.ceil(from)
 		: Math.floor(from);
 		if (from < 0)
 			from += len;
-		
+
 		for (; from < len; from++)
 		{
 			if (from in this &&
@@ -307,7 +362,7 @@ function replaceSVG(){
 
 /**
  * prototypal inharitence functions
- * 
+ *
  * usage:
  * MySubObject=object(MyObject)
  */
@@ -353,7 +408,7 @@ $(document).ready(function(){
 		fillWindow($('#rightcontent'));
 	});
 	$(window).trigger('resize');
-	
+
 	if(!SVGSupport()){ //replace all svg images with png images for browser that dont support svg
 		replaceSVG();
 	}else{
@@ -396,7 +451,7 @@ $(document).ready(function(){
 		}
 	});
 
-	// 'show password' checkbox	
+	// 'show password' checkbox
 	$('#pass2').showPassword();
 
 	//use infield labels
@@ -420,8 +475,9 @@ $(document).ready(function(){
 		}
 	}
 	// hide log in button etc. when form fields not filled
-	checkShowCredentials();
-	$('input#user, input#password').keyup(checkShowCredentials);
+	// commented out due to some browsers having issues with it
+	// checkShowCredentials();
+	// $('input#user, input#password').keyup(checkShowCredentials);
 
 	$('#settings #expand').keydown(function(event) {
 		if (event.which == 13 || event.which == 32) {
@@ -462,15 +518,15 @@ $(document).ready(function(){
 if (!Array.prototype.map){
 	Array.prototype.map = function(fun /*, thisp */){
 		"use strict";
-		
+
 		if (this === void 0 || this === null)
 			throw new TypeError();
-		
+
 		var t = Object(this);
 		var len = t.length >>> 0;
 		if (typeof fun !== "function")
 			throw new TypeError();
-		
+
 		var res = new Array(len);
 		var thisp = arguments[1];
 		for (var i = 0; i < len; i++){
@@ -478,16 +534,16 @@ if (!Array.prototype.map){
 				res[i] = fun.call(thisp, t[i], i, t);
 			}
 		}
-		
-	    return res;
+
+		return res;
 	};
 }
 
 /**
  * Filter Jquery selector by attribute value
  **/
-$.fn.filterAttr = function(attr_name, attr_value) {  
-   return this.filter(function() { return $(this).attr(attr_name) === attr_value; });
+$.fn.filterAttr = function(attr_name, attr_value) {
+	return this.filter(function() { return $(this).attr(attr_name) === attr_value; });
 };
 
 function humanFileSize(size) {
diff --git a/core/js/share.js b/core/js/share.js
new file mode 100644
index 00000000000..e765303a267
--- /dev/null
+++ b/core/js/share.js
@@ -0,0 +1,377 @@
+OC.Share={
+	SHARE_TYPE_USER:0,
+	SHARE_TYPE_GROUP:1,
+	SHARE_TYPE_PRIVATE_LINK:3,
+	SHARE_TYPE_EMAIL:4,
+	PERMISSION_CREATE:4,
+	PERMISSION_READ:1,
+	PERMISSION_UPDATE:2,
+	PERMISSION_DELETE:8,
+	PERMISSION_SHARE:16,
+	itemShares:[],
+	statuses:[],
+	droppedDown:false,
+	loadIcons:function(itemType) {
+		// Load all share icons
+		$.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getItemsSharedStatuses', itemType: itemType }, function(result) {
+			if (result && result.status === 'success') {
+				$.each(result.data, function(item, hasPrivateLink) {
+					// Private links override shared in terms of icon display
+					if (itemType != 'file' && itemType != 'folder') {
+						if (hasPrivateLink) {
+							var image = OC.imagePath('core', 'actions/public');
+						} else {
+							var image = OC.imagePath('core', 'actions/shared');
+						}
+						$('a.share[data-item="'+item+'"]').css('background', 'url('+image+') no-repeat center');
+					}
+					OC.Share.statuses[item] = hasPrivateLink;
+				});
+			}
+		});
+	},
+	loadItem:function(itemType, itemSource) {
+		var data = '';
+		if (typeof OC.Share.statuses[itemSource] === 'undefined') {
+			checkShares = false;
+		} else {
+			checkShares = true;
+		}
+		$.ajax({type: 'GET', url: OC.filePath('core', 'ajax', 'share.php'), data: { fetch: 'getItem', itemType: itemType, itemSource: itemSource, checkShares: checkShares }, async: false, success: function(result) {
+			if (result && result.status === 'success') {
+				data = result.data;
+			} else {
+				data = false;
+			}
+		}});
+		return data;
+	},
+	share:function(itemType, itemSource, shareType, shareWith, permissions, callback) {
+		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'share', itemType: itemType, itemSource: itemSource, shareType: shareType, shareWith: shareWith, permissions: permissions }, function(result) {
+			if (result && result.status === 'success') {
+				if (callback) {
+					callback(result.data);
+				}
+			} else {
+				OC.dialogs.alert(result.data.message, 'Error while sharing');
+			}
+		});
+	},
+	unshare:function(itemType, itemSource, shareType, shareWith, callback) {
+		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'unshare', itemType: itemType, itemSource: itemSource, shareType: shareType, shareWith: shareWith }, function(result) {
+			if (result && result.status === 'success') {
+				if (callback) {
+					callback();
+				}
+			} else {
+				OC.dialogs.alert('Error', 'Error while unsharing');
+			}
+		});
+	},
+	setPermissions:function(itemType, itemSource, shareType, shareWith, permissions) {
+		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setPermissions', itemType: itemType, itemSource: itemSource, shareType: shareType, shareWith: shareWith, permissions: permissions }, function(result) {
+			if (!result || result.status !== 'success') {
+				OC.dialogs.alert('Error', 'Error while changing permissions');
+			}
+		});
+	},
+	showDropDown:function(itemType, itemSource, appendTo, privateLink, possiblePermissions) {
+		var data = OC.Share.loadItem(itemType, itemSource);
+		var html = '<div id="dropdown" class="drop" data-item-type="'+itemType+'" data-item-source="'+itemSource+'">';
+		if (data.reshare) {
+			if (data.reshare.share_type == OC.Share.SHARE_TYPE_GROUP) {
+				html += 'Shared with you and the group '+data.reshare.share_with+' by '+data.reshare.uid_owner;
+			} else {
+				html += 'Shared with you by '+data.reshare.uid_owner;
+			}
+			html += '<br />';
+		}
+		html += '<input id="shareWith" type="text" placeholder="Share with" style="width:90%;"/>';
+		html += '<ul id="shareWithList">';
+		html += '</ul>';
+		if (privateLink) {
+			html += '<div id="privateLink">';
+			html += '<input type="checkbox" name="privateLinkCheckbox" id="privateLinkCheckbox" value="1" /><label for="privateLinkCheckbox">Share with private link</label>';
+			html += '<br />';
+			html += '<input id="privateLinkText" style="display:none; width:90%;" readonly="readonly" />';
+			html += '</div>';
+		}
+		html += '</div>';
+		$(html).appendTo(appendTo);
+		// Reset item shares
+		OC.Share.itemShares = [];
+		if (data.shares) {
+			$.each(data.shares, function(index, share) {
+				if (share.share_type == OC.Share.SHARE_TYPE_PRIVATE_LINK) {
+					OC.Share.showPrivateLink(item, share.share_with);
+				} else {
+					OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions);
+
+				}
+			});
+		}
+		$('#shareWith').autocomplete({minLength: 2, source: function(search, response) {
+// 			if (cache[search.term]) {
+// 				response(cache[search.term]);
+// 			} else {
+				$.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getShareWith', search: search.term, itemShares: OC.Share.itemShares }, function(result) {
+					if (result.status == 'success' && result.data.length > 0) {
+						response(result.data);
+					} else {
+						// Suggest sharing via email if valid email address
+						var pattern = new RegExp(/^[+a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/i);
+						if (pattern.test(search.term)) {
+							response([{label: 'Share via email: '+search.term, value: {shareType: OC.Share.SHARE_TYPE_EMAIL, shareWith: search.term}}]);
+						} else {
+							response(['No people found']);
+						}
+					}
+				});
+// 			}
+		},
+		focus: function(event, focused) {
+			event.preventDefault();
+		},
+		select: function(event, selected) {
+			var shareType = selected.item.value.shareType;
+			var shareWith = selected.item.value.shareWith;
+			$(this).val(shareWith);
+			// Default permissions are Read and Share
+			var permissions = OC.Share.PERMISSION_READ | OC.Share.PERMISSION_SHARE;
+			OC.Share.share($('#dropdown').data('item-type'), $('#dropdown').data('item-source'), shareType, shareWith, permissions, function() {
+				OC.Share.addShareWith(shareType, shareWith, permissions, possiblePermissions);
+				$('#shareWith').val('');
+			});
+			return false;
+		}
+		});
+		$('#dropdown').show('blind', function() {
+			OC.Share.droppedDown = true;
+		});
+		$('#shareWith').focus();
+	},
+	hideDropDown:function(callback) {
+		$('#dropdown').hide('blind', function() {
+			OC.Share.droppedDown = false;
+			$('#dropdown').remove();
+			if (typeof FileActions !== 'undefined') {
+				$('tr').removeClass('mouseOver');
+			}
+			if (callback) {
+				callback.call();
+			}
+		});
+	},
+	addShareWith:function(shareType, shareWith, permissions, possiblePermissions) {
+		if (!OC.Share.itemShares[shareType]) {
+			OC.Share.itemShares[shareType] = [];
+		}
+		OC.Share.itemShares[shareType].push(shareWith);
+		var editChecked = createChecked = updateChecked = deleteChecked = shareChecked = '';
+		if (permissions & OC.Share.PERMISSION_CREATE) {
+			createChecked = 'checked="checked"';
+			editChecked = 'checked="checked"';
+		}
+		if (permissions & OC.Share.PERMISSION_UPDATE) {
+			updateChecked = 'checked="checked"';
+			editChecked = 'checked="checked"';
+		}
+		if (permissions & OC.Share.PERMISSION_DELETE) {
+			deleteChecked = 'checked="checked"';
+			editChecked = 'checked="checked"';
+		}
+		if (permissions & OC.Share.PERMISSION_SHARE) {
+			shareChecked = 'checked="checked"';
+		}
+		var html = '<li style="clear: both;" data-share-type="'+shareType+'" data-share-with="'+shareWith+'">';
+		html += shareWith;
+		if (possiblePermissions & OC.Share.PERMISSION_CREATE || possiblePermissions & OC.Share.PERMISSION_UPDATE || possiblePermissions & OC.Share.PERMISSION_DELETE) {
+			if (editChecked == '') {
+				html += '<label style="display:none;">';
+			} else {
+				html += '<label>';
+			}
+			html += '<input type="checkbox" name="edit" class="permissions" '+editChecked+' />can edit</label>';
+		}
+		html += '<a href="#" class="showCruds" style="display:none;"><img class="svg" alt="Unshare" src="'+OC.imagePath('core', 'actions/triangle-s')+'"/></a>';
+		html += '<a href="#" class="unshare" style="display:none;"><img class="svg" alt="Unshare" src="'+OC.imagePath('core', 'actions/delete')+'"/></a>';
+		html += '<div class="cruds" style="display:none;">';
+			if (possiblePermissions & OC.Share.PERMISSION_CREATE) {
+				html += '<label><input type="checkbox" name="create" class="permissions" '+createChecked+' data-permissions="'+OC.Share.PERMISSION_CREATE+'" />create</label>';
+			}
+			if (possiblePermissions & OC.Share.PERMISSION_UPDATE) {
+				html += '<label><input type="checkbox" name="update" class="permissions" '+updateChecked+' data-permissions="'+OC.Share.PERMISSION_UPDATE+'" />update</label>';
+			}
+			if (possiblePermissions & OC.Share.PERMISSION_DELETE) {
+				html += '<label><input type="checkbox" name="delete" class="permissions" '+deleteChecked+' data-permissions="'+OC.Share.PERMISSION_DELETE+'" />delete</label>';
+			}
+			if (possiblePermissions & OC.Share.PERMISSION_SHARE) {
+				html += '<label><input type="checkbox" name="share" class="permissions" '+shareChecked+' data-permissions="'+OC.Share.PERMISSION_SHARE+'" />share</label>';
+			}
+		html += '</div>';
+		html += '</li>';
+		$(html).appendTo('#shareWithList');
+
+	},
+	showPrivateLink:function(item, token) {
+		$('#privateLinkCheckbox').attr('checked', true);
+		var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&token='+token;
+		if (token.indexOf('&path=') == -1) {
+			link += '&file=' + encodeURIComponent(item).replace(/%2F/g, '/');
+		} else {
+			// Disable checkbox if inside a shared parent folder
+			$('#privateLinkCheckbox').attr('disabled', 'true');
+		}
+		$('#privateLinkText').val(link);
+		$('#privateLinkText').show('blind', function() {
+			$('#privateLinkText').after('<br id="emailBreak" />');
+			$('#email').show();
+			$('#emailButton').show();
+		});
+	},
+	hidePrivateLink:function() {
+		$('#privateLinkText').hide('blind');
+		$('#emailBreak').remove();
+		$('#email').hide();
+		$('#emailButton').hide();
+	},
+	emailPrivateLink:function() {
+		var link = $('#privateLinkText').val();
+		var file = link.substr(link.lastIndexOf('/') + 1).replace(/%20/g, ' ');
+		$.post(OC.filePath('files_sharing', 'ajax', 'email.php'), { toaddress: $('#email').val(), link: link, file: file } );
+		$('#email').css('font-weight', 'bold');
+		$('#email').animate({ fontWeight: 'normal' }, 2000, function() {
+			$(this).val('');
+		}).val('Email sent');
+	},
+	dirname:function(path) {
+		return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');
+	}
+}
+
+$(document).ready(function() {
+
+	$('a.share').live('click', function(event) {
+		event.stopPropagation();
+		if ($(this).data('item-type') !== undefined && $(this).data('item') !== undefined) {
+			var itemType = $(this).data('item-type');
+			var itemSource = $(this).data('item');
+			var appendTo = $(this).parent().parent();
+			var privateLink = false;
+			var possiblePermissions = $(this).data('possible-permissions');
+			if ($(this).data('private-link') !== undefined && $(this).data('private-link') == true) {
+				privateLink = true;
+			}
+			if (OC.Share.droppedDown) {
+				if (itemSource != $('#dropdown').data('item')) {
+					OC.Share.hideDropDown(function () {
+						OC.Share.showDropDown(itemType, itemSource, appendTo, privateLink, possiblePermissions);
+					});
+				} else {
+					OC.Share.hideDropDown();
+				}
+			} else {
+				OC.Share.showDropDown(itemType, itemSource, appendTo, privateLink, possiblePermissions);
+			}
+		}
+	});
+
+	$(this).click(function(event) {
+		if (OC.Share.droppedDown && !($(event.target).hasClass('drop')) && $('#dropdown').has(event.target).length === 0) {
+			OC.Share.hideDropDown();
+		}
+	});
+
+	$('#shareWithList li').live('mouseenter', function(event) {
+		// Show permissions and unshare button
+		$(':hidden', this).filter(':not(.cruds)').show();
+	});
+
+	$('#shareWithList li').live('mouseleave', function(event) {
+		// Hide permissions and unshare button
+		if (!$('.cruds', this).is(':visible')) {
+			$('a', this).hide();
+			if (!$('input[name="edit"]', this).is(':checked')) {
+				$('input:[type=checkbox]', this).hide();
+				$('label', this).hide();
+			}
+		} else {
+			$('a.unshare', this).hide();
+		}
+	});
+
+	$('.showCruds').live('click', function() {
+		$(this).parent().find('.cruds').toggle();
+	});
+
+	$('.unshare').live('click', function() {
+		var li = $(this).parent();
+		var shareType = $(li).data('share-type');
+		var shareWith = $(li).data('share-with');
+		OC.Share.unshare($('#dropdown').data('item-type'), $('#dropdown').data('item-source'), shareType, shareWith, function() {
+			$(li).remove();
+			var index = OC.Share.itemShares[shareType].indexOf(shareWith);
+			OC.Share.itemShares[shareType].splice(index, 1);
+		});
+	});
+
+	$('.permissions').live('change', function() {
+		if ($(this).attr('name') == 'edit') {
+			var li = $(this).parent().parent()
+			var checkboxes = $('.permissions', li);
+			var checked = $(this).is(':checked');
+			// Check/uncheck Create, Update, and Delete checkboxes if Edit is checked/unck
+			$(checkboxes).filter('input[name="create"]').attr('checked', checked);
+			$(checkboxes).filter('input[name="update"]').attr('checked', checked);
+			$(checkboxes).filter('input[name="delete"]').attr('checked', checked);
+		} else {
+			var li = $(this).parent().parent().parent();
+			var checkboxes = $('.permissions', li);
+			// Uncheck Edit if Create, Update, and Delete are not checked
+			if (!$(this).is(':checked') && !$(checkboxes).filter('input[name="create"]').is(':checked') && !$(checkboxes).filter('input[name="update"]').is(':checked') && !$(checkboxes).filter('input[name="delete"]').is(':checked')) {
+				$(checkboxes).filter('input[name="edit"]').attr('checked', false);
+			// Check Edit if Create, Update, or Delete is checked
+			} else if (($(this).attr('name') == 'create' || $(this).attr('name') == 'update' || $(this).attr('name') == 'delete')) {
+				$(checkboxes).filter('input[name="edit"]').attr('checked', true);
+			}
+		}
+		var permissions = OC.Share.PERMISSION_READ;
+		$(checkboxes).filter(':not(input[name="edit"])').filter(':checked').each(function(index, checkbox) {
+			permissions |= $(checkbox).data('permissions');
+		});
+		OC.Share.setPermissions($('#dropdown').data('item-type'), $('#dropdown').data('item-source'), $(li).data('share-type'), $(li).data('share-with'), permissions);
+	});
+
+	$('#privateLinkCheckbox').live('change', function() {
+		var itemType = $('#dropdown').data('item-type');
+		var item = $('#dropdown').data('item');
+		if (this.checked) {
+			// Create a private link
+			OC.Share.share(itemType, item, OC.Share.SHARE_TYPE_PRIVATE_LINK, 0, 0, function(token) {
+				OC.Share.showPrivateLink(item, 'foo');
+				// Change icon
+				OC.Share.icons[item] = OC.imagePath('core', 'actions/public');
+			});
+		} else {
+			// Delete private link
+			OC.Share.unshare(item, 'public', function() {
+				OC.Share.hidePrivateLink();
+				// Change icon
+				if (OC.Share.itemUsers || OC.Share.itemGroups) {
+					OC.Share.icons[item] = OC.imagePath('core', 'actions/shared');
+				} else {
+					OC.Share.icons[item] = OC.imagePath('core', 'actions/share');
+				}
+			});
+		}
+	});
+
+	$('#privateLinkText').live('click', function() {
+		$(this).focus();
+		$(this).select();
+	});
+
+	$('#emailPrivateLink').live('submit', function() {
+		OC.Share.emailPrivateLink();
+	});
+});
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index 8a6ba6e9a78..4b694f33bd8 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Owncloud password reset" => "استرجاع كلمة السر",
+"Settings" => "تعديلات",
 "Use the following link to reset your password: {link}" => "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
 "You will receive a link to reset your password via Email." => "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.",
 "Requested" => "تم طلب",
@@ -29,7 +29,6 @@
 "Finish setup" => "انهاء التعديلات",
 "web services under your control" => "خدمات الوب تحت تصرفك",
 "Log out" => "الخروج",
-"Settings" => "تعديلات",
 "Lost your password?" => "هل نسيت كلمة السر؟",
 "remember" => "تذكر",
 "Log in" => "أدخل",
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index 46047a35350..19b32a700ba 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -1,4 +1,24 @@
 <?php $TRANSLATIONS = array(
+"This category already exists: " => "Категорията вече съществува:",
+"Settings" => "Настройки",
+"January" => "Януари",
+"February" => "Февруари",
+"March" => "Март",
+"April" => "Април",
+"May" => "Май",
+"June" => "Юни",
+"July" => "Юли",
+"August" => "Август",
+"September" => "Септември",
+"October" => "Октомври",
+"November" => "Ноември",
+"December" => "Декември",
+"Cancel" => "Отказ",
+"No" => "Не",
+"Yes" => "Да",
+"Ok" => "Добре",
+"No categories selected for deletion." => "Няма избрани категории за изтриване",
+"Error" => "Грешка",
 "You will receive a link to reset your password via Email." => "Ще получите връзка за нулиране на паролата Ви.",
 "Requested" => "Заявено",
 "Login failed!" => "Входа пропадна!",
@@ -12,7 +32,10 @@
 "Apps" => "Програми",
 "Admin" => "Админ",
 "Help" => "Помощ",
+"Access forbidden" => "Достъпът е забранен",
 "Cloud not found" => "облакът не намерен",
+"Edit categories" => "Редактиране на категориите",
+"Add" => "Добавяне",
 "Create an <strong>admin account</strong>" => "Създаване на <strong>админ профил</strong>",
 "Password" => "Парола",
 "Advanced" => "Разширено",
@@ -25,9 +48,9 @@
 "Database host" => "Хост за базата",
 "Finish setup" => "Завършване на настройките",
 "Log out" => "Изход",
-"Settings" => "Настройки",
 "Lost your password?" => "Забравена парола?",
 "remember" => "запомни",
+"Log in" => "Вход",
 "You are logged out." => "Вие излязохте.",
 "prev" => "пред.",
 "next" => "следващо"
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index baeb8bd55bb..9be2fe6adfc 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "No s'ha facilitat cap nom per l'aplicació.",
 "No category to add?" => "No voleu afegir cap categoria?",
 "This category already exists: " => "Aquesta categoria ja existeix:",
-"Owncloud password reset" => "Restableix la contrasenya d'Owncloud",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Arranjament",
+"January" => "Gener",
+"February" => "Febrer",
+"March" => "Març",
+"April" => "Abril",
+"May" => "Maig",
+"June" => "Juny",
+"July" => "Juliol",
+"August" => "Agost",
+"September" => "Setembre",
+"October" => "Octubre",
+"November" => "Novembre",
+"December" => "Desembre",
+"Cancel" => "Cancel·la",
+"No" => "No",
+"Yes" => "Sí",
+"Ok" => "D'acord",
+"No categories selected for deletion." => "No hi ha categories per eliminar.",
+"Error" => "Error",
 "ownCloud password reset" => "estableix de nou la contrasenya Owncloud",
 "Use the following link to reset your password: {link}" => "Useu l'enllaç següent per restablir la contrasenya: {link}",
 "You will receive a link to reset your password via Email." => "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya.",
@@ -36,7 +55,6 @@
 "Finish setup" => "Acaba la configuració",
 "web services under your control" => "controleu els vostres serveis web",
 "Log out" => "Surt",
-"Settings" => "Arranjament",
 "Lost your password?" => "Heu perdut la contrasenya?",
 "remember" => "recorda'm",
 "Log in" => "Inici de sessió",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 4ad9508f813..7daeb52e631 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Jméno aplikace nezadáno.",
 "No category to add?" => "Žádná kategorie k přidání?",
 "This category already exists: " => "Tato kategorie již existuje:",
-"Owncloud password reset" => "Reset hesla Owncloud",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Nastavení",
+"January" => "Leden",
+"February" => "Únor",
+"March" => "Březen",
+"April" => "Duben",
+"May" => "Květen",
+"June" => "Červen",
+"July" => "Červenec",
+"August" => "Srpen",
+"September" => "Září",
+"October" => "Říjen",
+"November" => "Listopad",
+"December" => "Prosinec",
+"Cancel" => "Zrušit",
+"No" => "Ne",
+"Yes" => "Ano",
+"Ok" => "Budiž",
+"No categories selected for deletion." => "Žádné kategorie nebyly vybrány ke smazání.",
+"Error" => "Chyba",
 "ownCloud password reset" => "Reset hesla pro ownCloud",
 "Use the following link to reset your password: {link}" => "Heslo vyresetujete použitím následujícího odkazu: {link}",
 "You will receive a link to reset your password via Email." => "Bude Vám zaslán odkaz pro obnovu hesla",
@@ -36,7 +55,6 @@
 "Finish setup" => "Dokončit instalaci",
 "web services under your control" => "webové služby pod Vaší kontrolou",
 "Log out" => "Odhlásit se",
-"Settings" => "Nastavení",
 "Lost your password?" => "Zapomenuté heslo?",
 "remember" => "zapamatovat si",
 "Log in" => "Login",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index f7b5b48f6fb..5e62b5b95db 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Applikationens navn ikke medsendt",
 "No category to add?" => "Ingen kategori at tilføje?",
 "This category already exists: " => "Denne kategori eksisterer allerede: ",
-"Owncloud password reset" => "Nulstil adgangskode til Owncloud",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Indstillinger",
+"January" => "Januar",
+"February" => "Februar",
+"March" => "Marts",
+"April" => "April",
+"May" => "Maj",
+"June" => "Juni",
+"July" => "Juli",
+"August" => "August",
+"September" => "September",
+"October" => "Oktober",
+"November" => "November",
+"December" => "December",
+"Cancel" => "Fortryd",
+"No" => "Nej",
+"Yes" => "Ja",
+"Ok" => "OK",
+"No categories selected for deletion." => "Ingen kategorier valgt",
+"Error" => "Fejl",
 "ownCloud password reset" => "Nulstil ownCloud kodeord",
 "Use the following link to reset your password: {link}" => "Anvend følgende link til at nulstille din adgangskode: {link}",
 "You will receive a link to reset your password via Email." => "Du vil modtage et link til at nulstille dit kodeord via email.",
@@ -36,7 +55,6 @@
 "Finish setup" => "Afslut opsætning",
 "web services under your control" => "Webtjenester under din kontrol",
 "Log out" => "Log ud",
-"Settings" => "Indstillinger",
 "Lost your password?" => "Mistet dit kodeord?",
 "remember" => "husk",
 "Log in" => "Log ind",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 9fcd5c84966..9ed2d617828 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -2,45 +2,63 @@
 "Application name not provided." => "Applikationsname nicht angegeben",
 "No category to add?" => "Keine Kategorie hinzuzufügen?",
 "This category already exists: " => "Kategorie existiert bereits:",
-"Owncloud password reset" => "ownCloud Passwort zurücksetzen",
-"ownCloud password reset" => "ownCloud Passwort zurücksetzen",
-"Use the following link to reset your password: {link}" => "Nutze folgenden Link, um dein Passwort zurückzusetzen: {link}",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Einstellungen",
+"January" => "Januar",
+"February" => "Februar",
+"March" => "März",
+"April" => "April",
+"May" => "Mai",
+"June" => "Juni",
+"July" => "Juli",
+"August" => "August",
+"September" => "September",
+"October" => "Oktober",
+"November" => "November",
+"December" => "Dezember",
+"Cancel" => "Abbrechen",
+"No" => "Nein",
+"Yes" => "Ja",
+"Ok" => "OK",
+"No categories selected for deletion." => "Keine Kategorien zum Löschen angegeben.",
+"Error" => "Fehler",
+"ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
+"Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
 "You will receive a link to reset your password via Email." => "Sie erhalten einen Link, um Ihr Passwort per E-Mail zurückzusetzen.",
 "Requested" => "Angefragt",
 "Login failed!" => "Login fehlgeschlagen!",
-"Username" => "Nutzername",
+"Username" => "Benutzername",
 "Request reset" => "Anfrage zurückgesetzt",
 "Your password was reset" => "Ihr Passwort wurde zurückgesetzt.",
 "To login page" => "Zur Login-Seite",
 "New password" => "Neues Passwort",
 "Reset password" => "Passwort zurücksetzen",
 "Personal" => "Persönlich",
-"Users" => "Nutzer",
+"Users" => "Benutzer",
 "Apps" => "Anwendungen",
-"Admin" => "Verwaltung",
+"Admin" => "Admin",
 "Help" => "Hilfe",
-"Access forbidden" => "Zugang verboten",
-"Cloud not found" => "Cloud nicht verfügbar",
-"Edit categories" => "Kategorien ändern",
+"Access forbidden" => "Zugriff verboten",
+"Cloud not found" => "Cloud nicht gefunden",
+"Edit categories" => "Kategorien bearbeiten",
 "Add" => "Hinzufügen",
-"Create an <strong>admin account</strong>" => "<strong>Admin-Konto</strong> anlegen",
+"Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
 "Password" => "Passwort",
 "Advanced" => "Erweitert",
 "Data folder" => "Datenverzeichnis",
 "Configure the database" => "Datenbank einrichten",
 "will be used" => "wird genutzt",
-"Database user" => "Datenbanknutzer",
-"Database password" => "Datenbankpasswort",
-"Database name" => "Datenbankname",
+"Database user" => "Datenbank-Benutzer",
+"Database password" => "Datenbank-Passwort",
+"Database name" => "Datenbank-Name",
 "Database host" => "Datenbank-Host",
 "Finish setup" => "Installation abschließen",
-"web services under your control" => "web services under your control",
+"web services under your control" => "Web-Services unter Ihrer Kontrolle",
 "Log out" => "Abmelden",
-"Settings" => "Einstellungen",
 "Lost your password?" => "Passwort vergessen?",
 "remember" => "merken",
 "Log in" => "Einloggen",
-"You are logged out." => "Abgemeldet",
+"You are logged out." => "Sie wurden abgemeldet.",
 "prev" => "Zurück",
 "next" => "Weiter"
 );
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 1adf14af967..d8f32fb51e0 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Δε προσδιορίστηκε όνομα εφαρμογής",
 "No category to add?" => "Δεν έχετε να προστέσθέσεται μια κα",
 "This category already exists: " => "Αυτή η κατηγορία υπάρχει ήδη",
-"Owncloud password reset" => "Επανέκδοση κωδικού για το Owncloud",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Ρυθμίσεις",
+"January" => "Ιανουάριος",
+"February" => "Φεβρουάριος",
+"March" => "Μάρτιος",
+"April" => "Απρίλιος",
+"May" => "Μάϊος",
+"June" => "Ιούνιος",
+"July" => "Ιούλιος",
+"August" => "Αύγουστος",
+"September" => "Σεπτέμβριος",
+"October" => "Οκτώβριος",
+"November" => "Νοέμβριος",
+"December" => "Δεκέμβριος",
+"Cancel" => "Ακύρωση",
+"No" => "Όχι",
+"Yes" => "Ναι",
+"Ok" => "Οκ",
+"No categories selected for deletion." => "Δεν επιλέχτηκαν κατηγορίες για διαγραφή",
+"Error" => "Σφάλμα",
 "ownCloud password reset" => "Επαναφορά κωδικού ownCloud",
 "Use the following link to reset your password: {link}" => "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}",
 "You will receive a link to reset your password via Email." => "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.",
@@ -36,7 +55,6 @@
 "Finish setup" => "Ολοκλήρωση εγκατάστασης",
 "web services under your control" => "Υπηρεσίες web υπό τον έλεγχό σας",
 "Log out" => "Αποσύνδεση",
-"Settings" => "Ρυθμίσεις",
 "Lost your password?" => "Ξεχάσατε τον κωδικό σας;",
 "remember" => "να με θυμάσαι",
 "Log in" => "Είσοδος",
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 0ae2aeac691..f5e5ca9d0e1 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -1,5 +1,28 @@
 <?php $TRANSLATIONS = array(
-"Owncloud password reset" => "La pasvorto de Owncloud estas restarigita",
+"Application name not provided." => "Nomo de aplikaĵo ne proviziiĝis.",
+"No category to add?" => "Ĉu neniu kategorio estas aldonota?",
+"This category already exists: " => "Ĉi tiu kategorio jam ekzistas: ",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Agordo",
+"January" => "Januaro",
+"February" => "Februaro",
+"March" => "Marto",
+"April" => "Aprilo",
+"May" => "Majo",
+"June" => "Junio",
+"July" => "Julio",
+"August" => "Aŭgusto",
+"September" => "Septembro",
+"October" => "Oktobro",
+"November" => "Novembro",
+"December" => "Decembro",
+"Cancel" => "Nuligi",
+"No" => "Ne",
+"Yes" => "Jes",
+"Ok" => "Akcepti",
+"No categories selected for deletion." => "Neniu kategorio elektiĝis por forigo.",
+"Error" => "Eraro",
+"ownCloud password reset" => "La pasvorto de ownCloud restariĝis.",
 "Use the following link to reset your password: {link}" => "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
 "You will receive a link to reset your password via Email." => "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.",
 "Requested" => "Petita",
@@ -15,7 +38,10 @@
 "Apps" => "Aplikaĵoj",
 "Admin" => "Administranto",
 "Help" => "Helpo",
+"Access forbidden" => "Aliro estas malpermesata",
 "Cloud not found" => "La nubo ne estas trovita",
+"Edit categories" => "Redakti kategoriojn",
+"Add" => "Aldoni",
 "Create an <strong>admin account</strong>" => "Krei <strong>administran konton</strong>",
 "Password" => "Pasvorto",
 "Advanced" => "Progresinta",
@@ -29,7 +55,6 @@
 "Finish setup" => "Fini la instalon",
 "web services under your control" => "TTT-servoj sub via kontrolo",
 "Log out" => "Elsaluti",
-"Settings" => "Agordo",
 "Lost your password?" => "Ĉu vi perdis vian pasvorton?",
 "remember" => "memori",
 "Log in" => "Ensaluti",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 2d6068ed5f8..8766228ba89 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -1,8 +1,27 @@
 <?php $TRANSLATIONS = array(
 "Application name not provided." => "Nombre de la aplicación no provisto.",
-"No category to add?" => "¿Ninguna categoría para agregar?",
+"No category to add?" => "¿Ninguna categoría para añadir?",
 "This category already exists: " => "Esta categoría ya existe: ",
-"Owncloud password reset" => "Restablecer contraseña de ownCloud",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Ajustes",
+"January" => "Enero",
+"February" => "Febrero",
+"March" => "Marzo",
+"April" => "Abril",
+"May" => "Mayo",
+"June" => "Junio",
+"July" => "Julio",
+"August" => "Agosto",
+"September" => "Septiembre",
+"October" => "Octubre",
+"November" => "Noviembre",
+"December" => "Diciembre",
+"Cancel" => "Cancelar",
+"No" => "No",
+"Yes" => "Sí",
+"Ok" => "Aceptar",
+"No categories selected for deletion." => "No hay categorías seleccionadas para borrar.",
+"Error" => "Fallo",
 "ownCloud password reset" => "Reiniciar contraseña de ownCloud",
 "Use the following link to reset your password: {link}" => "Utiliza el siguiente enlace para restablecer tu contraseña: {link}",
 "You will receive a link to reset your password via Email." => "Recibirás un enlace por correo electrónico para restablecer tu contraseña",
@@ -36,7 +55,6 @@
 "Finish setup" => "Completar la instalación",
 "web services under your control" => "servicios web bajo tu control",
 "Log out" => "Salir",
-"Settings" => "Ajustes",
 "Lost your password?" => "¿Has perdido tu contraseña?",
 "remember" => "recuérdame",
 "Log in" => "Entrar",
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 7ecfb278afd..734021605ca 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Rakenduse nime pole sisestatud.",
 "No category to add?" => "Pole kategooriat, mida lisada?",
 "This category already exists: " => "See kategooria on juba olemas: ",
-"Owncloud password reset" => "Owncloud parooli taastamine",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Seaded",
+"January" => "Jaanuar",
+"February" => "Veebruar",
+"March" => "Märts",
+"April" => "Aprill",
+"May" => "Mai",
+"June" => "Juuni",
+"July" => "Juuli",
+"August" => "August",
+"September" => "September",
+"October" => "Oktoober",
+"November" => "November",
+"December" => "Detsember",
+"Cancel" => "Loobu",
+"No" => "Ei",
+"Yes" => "Jah",
+"Ok" => "Ok",
+"No categories selected for deletion." => "Kustutamiseks pole kategooriat valitud.",
+"Error" => "Viga",
 "ownCloud password reset" => "ownCloud parooli taastamine",
 "Use the following link to reset your password: {link}" => "Kasuta järgnevat linki oma parooli taastamiseks: {link}",
 "You will receive a link to reset your password via Email." => "Sinu parooli taastamise link saadetakse sulle e-postile.",
@@ -36,7 +55,6 @@
 "Finish setup" => "Lõpeta seadistamine",
 "web services under your control" => "veebiteenused sinu kontrolli all",
 "Log out" => "Logi välja",
-"Settings" => "Seaded",
 "Lost your password?" => "Kaotasid oma parooli?",
 "remember" => "pea meeles",
 "Log in" => "Logi sisse",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 3159350183f..2e5a2c00e2a 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Aplikazioaren izena falta da",
 "No category to add?" => "Ez dago gehitzeko kategoriarik?",
 "This category already exists: " => "Kategoria hau dagoeneko existitzen da:",
-"Owncloud password reset" => "Owncloudeko pasahitza berrezarri",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Ezarpenak",
+"January" => "Urtarrila",
+"February" => "Otsaila",
+"March" => "Martxoa",
+"April" => "Apirila",
+"May" => "Maiatza",
+"June" => "Ekaina",
+"July" => "Uztaila",
+"August" => "Abuztua",
+"September" => "Iraila",
+"October" => "Urria",
+"November" => "Azaroa",
+"December" => "Abendua",
+"Cancel" => "Ezeztatu",
+"No" => "Ez",
+"Yes" => "Bai",
+"Ok" => "Ados",
+"No categories selected for deletion." => "Ez da ezabatzeko kategoriarik hautatu.",
+"Error" => "Errorea",
 "ownCloud password reset" => "ownCloud-en pasahitza berrezarri",
 "Use the following link to reset your password: {link}" => "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}",
 "You will receive a link to reset your password via Email." => "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez.",
@@ -36,7 +55,6 @@
 "Finish setup" => "Bukatu konfigurazioa",
 "web services under your control" => "web zerbitzuak zure kontrolpean",
 "Log out" => "Saioa bukatu",
-"Settings" => "Ezarpenak",
 "Lost your password?" => "Galdu duzu pasahitza?",
 "remember" => "gogoratu",
 "Log in" => "Hasi saioa",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index e3cc3feddd8..5fe98629ba2 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "نام برنامه پیدا نشد",
 "No category to add?" => "آیا گروه دیگری برای افزودن ندارید",
 "This category already exists: " => "این گروه از قبل اضافه شده",
-"Owncloud password reset" => "گذرواژه ابرهای شما تغییرکرد",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "تنظیمات",
+"January" => "ژانویه",
+"February" => "فبریه",
+"March" => "مارس",
+"April" => "آوریل",
+"May" => "می",
+"June" => "ژوئن",
+"July" => "جولای",
+"August" => "آگوست",
+"September" => "سپتامبر",
+"October" => "اکتبر",
+"November" => "نوامبر",
+"December" => "دسامبر",
+"Cancel" => "منصرف شدن",
+"No" => "نه",
+"Yes" => "بله",
+"Ok" => "قبول",
+"No categories selected for deletion." => "هیج دسته ای برای پاک شدن انتخاب نشده است",
+"Error" => "خطا",
 "ownCloud password reset" => "پسورد ابرهای شما تغییرکرد",
 "Use the following link to reset your password: {link}" => "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
 "You will receive a link to reset your password via Email." => "شما یک نامه الکترونیکی حاوی یک لینک جهت بازسازی گذرواژه دریافت خواهید کرد.",
@@ -36,7 +55,6 @@
 "Finish setup" => "اتمام نصب",
 "web services under your control" => "سرویس وب تحت کنترل شما",
 "Log out" => "خروج",
-"Settings" => "تنظیمات",
 "Lost your password?" => "آیا گذرواژه تان را به یاد نمی آورید؟",
 "remember" => "بیاد آوری",
 "Log in" => "ورود",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 6dc65ed4955..64bb4dca631 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -2,7 +2,25 @@
 "Application name not provided." => "Sovelluksen nimeä ei määritelty.",
 "No category to add?" => "Ei lisättävää luokkaa?",
 "This category already exists: " => "Tämä luokka on jo olemassa: ",
-"Owncloud password reset" => "Owncloud-salasanan nollaus",
+"Settings" => "Asetukset",
+"January" => "Tammikuu",
+"February" => "Helmikuu",
+"March" => "Maaliskuu",
+"April" => "Huhtikuu",
+"May" => "Toukokuu",
+"June" => "Kesäkuu",
+"July" => "Heinäkuu",
+"August" => "Elokuu",
+"September" => "Syyskuu",
+"October" => "Lokakuu",
+"November" => "Marraskuu",
+"December" => "Joulukuu",
+"Cancel" => "Peru",
+"No" => "Ei",
+"Yes" => "Kyllä",
+"Ok" => "Ok",
+"No categories selected for deletion." => "Luokkia ei valittu poistettavaksi.",
+"Error" => "Virhe",
 "ownCloud password reset" => "ownCloud-salasanan nollaus",
 "Use the following link to reset your password: {link}" => "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
 "You will receive a link to reset your password via Email." => "Saat sähköpostitse linkin nollataksesi salasanan.",
@@ -36,7 +54,6 @@
 "Finish setup" => "Viimeistele asennus",
 "web services under your control" => "verkkopalvelut hallinnassasi",
 "Log out" => "Kirjaudu ulos",
-"Settings" => "Asetukset",
 "Lost your password?" => "Unohditko salasanasi?",
 "remember" => "muista",
 "Log in" => "Kirjaudu sisään",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 8459fbbb664..43917917ad8 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Nom de l'application non fourni.",
 "No category to add?" => "Pas de catégorie à ajouter ?",
 "This category already exists: " => "Cette catégorie existe déjà : ",
-"Owncloud password reset" => "Réinitialisation de votre mot de passe Owncloud",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Paramètres",
+"January" => "Janvier",
+"February" => "Février",
+"March" => "Mars",
+"April" => "Avril",
+"May" => "Mai",
+"June" => "Juin",
+"July" => "Juillet",
+"August" => "Août",
+"September" => "Septembre",
+"October" => "Octobre",
+"November" => "Novembre",
+"December" => "Décembre",
+"Cancel" => "Annulé",
+"No" => "Non",
+"Yes" => "Oui",
+"Ok" => "Ok",
+"No categories selected for deletion." => "Aucune catégorie sélectionnée pour suppression",
+"Error" => "Erreur",
 "ownCloud password reset" => "Réinitialisation de votre mot de passe Owncloud",
 "Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}",
 "You will receive a link to reset your password via Email." => "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe",
@@ -29,14 +48,13 @@
 "Data folder" => "Répertoire des données",
 "Configure the database" => "Configurer la base de données",
 "will be used" => "sera utilisé",
-"Database user" => "Utilisateur de la base de données",
+"Database user" => "Utilisateur pour la base de données",
 "Database password" => "Mot de passe de la base de données",
 "Database name" => "Nom de la base de données",
 "Database host" => "Serveur de la base de données",
 "Finish setup" => "Terminer l'installation",
 "web services under your control" => "services web sous votre contrôle",
 "Log out" => "Se déconnecter",
-"Settings" => "Paramètres",
 "Lost your password?" => "Mot de passe perdu ?",
 "remember" => "se souvenir de moi",
 "Log in" => "Connexion",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 8d839a6ac6c..eeff78826f8 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Non se indicou o nome do aplicativo.",
 "No category to add?" => "Sen categoría que engadir?",
 "This category already exists: " => "Esta categoría xa existe: ",
-"Owncloud password reset" => "Restablecemento do contrasinal de Owncloud",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Preferencias",
+"January" => "Xaneiro",
+"February" => "Febreiro",
+"March" => "Marzo",
+"April" => "Abril",
+"May" => "Maio",
+"June" => "Xuño",
+"July" => "Xullo",
+"August" => "Agosto",
+"September" => "Setembro",
+"October" => "Outubro",
+"November" => "Novembro",
+"December" => "Nadal",
+"Cancel" => "Cancelar",
+"No" => "Non",
+"Yes" => "Si",
+"Ok" => "Ok",
+"No categories selected for deletion." => "Non hai categorías seleccionadas para eliminar.",
+"Error" => "Erro",
 "ownCloud password reset" => "Restablecer contrasinal de ownCloud",
 "Use the following link to reset your password: {link}" => "Use a seguinte ligazón para restablecer o contrasinal: {link}",
 "You will receive a link to reset your password via Email." => "Recibirá unha ligazón por correo electrónico para restablecer o contrasinal",
@@ -36,7 +55,6 @@
 "Finish setup" => "Rematar configuración",
 "web services under your control" => "servizos web baixo o seu control",
 "Log out" => "Desconectar",
-"Settings" => "Preferencias",
 "Lost your password?" => "Perdeu o contrasinal?",
 "remember" => "lembrar",
 "Log in" => "Conectar",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index 1929681e066..f0a18103a8f 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -2,7 +2,25 @@
 "Application name not provided." => "שם היישום לא סופק.",
 "No category to add?" => "אין קטגוריה להוספה?",
 "This category already exists: " => "קטגוריה זאת כבר קיימת: ",
-"Owncloud password reset" => "איפוס הססמה של ownCloud",
+"Settings" => "הגדרות",
+"January" => "ינואר",
+"February" => "פברואר",
+"March" => "מרץ",
+"April" => "אפריל",
+"May" => "מאי",
+"June" => "יוני",
+"July" => "יולי",
+"August" => "אוגוסט",
+"September" => "ספטמבר",
+"October" => "אוקטובר",
+"November" => "נובמבר",
+"December" => "דצמבר",
+"Cancel" => "ביטול",
+"No" => "לא",
+"Yes" => "כן",
+"Ok" => "בסדר",
+"No categories selected for deletion." => "לא נבחרו קטגוריות למחיקה",
+"Error" => "שגיאה",
 "ownCloud password reset" => "איפוס הססמה של ownCloud",
 "Use the following link to reset your password: {link}" => "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}",
 "You will receive a link to reset your password via Email." => "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
@@ -36,7 +54,6 @@
 "Finish setup" => "סיום התקנה",
 "web services under your control" => "שירותי רשת בשליטתך",
 "Log out" => "התנתקות",
-"Settings" => "הגדרות",
 "Lost your password?" => "שכחת את ססמתך?",
 "remember" => "שמירת הססמה",
 "Log in" => "כניסה",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index 92be8048045..d4e773afc1e 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Ime aplikacije nije pribavljeno.",
 "No category to add?" => "Nemate kategorija koje možete dodati?",
 "This category already exists: " => "Ova kategorija već postoji: ",
-"Owncloud password reset" => "ownCloud resetiranje lozinke",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Postavke",
+"January" => "Siječanj",
+"February" => "Veljača",
+"March" => "Ožujak",
+"April" => "Travanj",
+"May" => "Svibanj",
+"June" => "Lipanj",
+"July" => "Srpanj",
+"August" => "Kolovoz",
+"September" => "Rujan",
+"October" => "Listopad",
+"November" => "Studeni",
+"December" => "Prosinac",
+"Cancel" => "Odustani",
+"No" => "Ne",
+"Yes" => "Da",
+"Ok" => "U redu",
+"No categories selected for deletion." => "Nema odabranih kategorija za brisanje.",
+"Error" => "Pogreška",
 "ownCloud password reset" => "ownCloud resetiranje lozinke",
 "Use the following link to reset your password: {link}" => "Koristite ovaj link da biste poništili lozinku: {link}",
 "You will receive a link to reset your password via Email." => "Primit ćete link kako biste poništili zaporku putem e-maila.",
@@ -36,7 +55,6 @@
 "Finish setup" => "Završi postavljanje",
 "web services under your control" => "web usluge pod vašom kontrolom",
 "Log out" => "Odjava",
-"Settings" => "Postavke",
 "Lost your password?" => "Izgubili ste lozinku?",
 "remember" => "zapamtiti",
 "Log in" => "Prijava",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index fc1337d8def..dbfe2781d5f 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -2,45 +2,63 @@
 "Application name not provided." => "Alkalmazásnév hiányzik",
 "No category to add?" => "Nincs hozzáadandó kategória?",
 "This category already exists: " => "Ez a kategória már létezik",
-"Owncloud password reset" => "ownCloud jelszó-visszaállítás",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Beállítások",
+"January" => "Január",
+"February" => "Február",
+"March" => "Március",
+"April" => "Április",
+"May" => "Május",
+"June" => "Június",
+"July" => "Július",
+"August" => "Augusztus",
+"September" => "Szeptember",
+"October" => "Október",
+"November" => "November",
+"December" => "December",
+"Cancel" => "Mégse",
+"No" => "Nem",
+"Yes" => "Igen",
+"Ok" => "Ok",
+"No categories selected for deletion." => "Nincs törlésre jelölt kategória",
+"Error" => "Hiba",
 "ownCloud password reset" => "ownCloud jelszó-visszaállítás",
 "Use the following link to reset your password: {link}" => "Használja az alábbi linket a jelszó-visszaállításhoz: {link}",
 "You will receive a link to reset your password via Email." => "Egy e-mailben kap értesítést a jelszóváltoztatás módjáról.",
-"Requested" => "Kért",
+"Requested" => "Kérés elküldve",
 "Login failed!" => "Belépés sikertelen!",
-"Username" => "Felhasználói név",
+"Username" => "Felhasználónév",
 "Request reset" => "Visszaállítás igénylése",
-"Your password was reset" => "Jelszó megváltoztatásra került",
+"Your password was reset" => "Jelszó megváltoztatva",
 "To login page" => "A bejelentkező ablakhoz",
 "New password" => "Új jelszó",
-"Reset password" => "Jelszó beállítás",
+"Reset password" => "Jelszó-visszaállítás",
 "Personal" => "Személyes",
 "Users" => "Felhasználók",
 "Apps" => "Alkalmazások",
-"Admin" => "Adminisztráció",
+"Admin" => "Admin",
 "Help" => "Súgó",
 "Access forbidden" => "Hozzáférés tiltva",
-"Cloud not found" => "Nem talált felhő",
+"Cloud not found" => "A felhő nem található",
 "Edit categories" => "Kategóriák szerkesztése",
 "Add" => "Hozzáadás",
-"Create an <strong>admin account</strong>" => "<strong>Adminisztrációs fiók</strong> létrehozása",
+"Create an <strong>admin account</strong>" => "<strong>Rendszergazdafiók</strong> létrehozása",
 "Password" => "Jelszó",
-"Advanced" => "Fejlett",
-"Data folder" => "Adat könyvtár",
+"Advanced" => "Haladó",
+"Data folder" => "Adatkönyvtár",
 "Configure the database" => "Adatbázis konfigurálása",
 "will be used" => "használva lesz",
-"Database user" => "Adatbázis felhasználó",
+"Database user" => "Adatbázis felhasználónév",
 "Database password" => "Adatbázis jelszó",
 "Database name" => "Adatbázis név",
 "Database host" => "Adatbázis szerver",
-"Finish setup" => "Beállítások befejezése",
+"Finish setup" => "Beállítás befejezése",
 "web services under your control" => "webszolgáltatások az irányításod alatt",
 "Log out" => "Kilépés",
-"Settings" => "Beállítások",
 "Lost your password?" => "Elfelejtett jelszó?",
-"remember" => "emlékezni",
+"remember" => "emlékezzen",
 "Log in" => "Bejelentkezés",
-"You are logged out." => "Kilépés sikerült.",
+"You are logged out." => "Kilépett.",
 "prev" => "Előző",
 "next" => "Következő"
 );
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index 97e8dfc147b..e202daafa32 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "This category already exists: " => "Iste categoria jam existe:",
-"Owncloud password reset" => "Reinitialisation del contrasigno de Owncloud",
+"Settings" => "Configurationes",
 "ownCloud password reset" => "Reinitialisation del contrasigno de ownCLoud",
 "Requested" => "Requestate",
 "Login failed!" => "Initio de session fallite!",
@@ -31,7 +31,6 @@
 "Database host" => "Hospite de base de datos",
 "web services under your control" => "servicios web sub tu controlo",
 "Log out" => "Clauder le session",
-"Settings" => "Configurationes",
 "Lost your password?" => "Tu perdeva le contrasigno?",
 "remember" => "memora",
 "Log in" => "Aperir session",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index f9fa7d2bb9b..296e2d62a4a 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -2,7 +2,7 @@
 "Application name not provided." => "Nama aplikasi tidak diberikan.",
 "No category to add?" => "Tidak ada kategori yang akan ditambahkan?",
 "This category already exists: " => "Kategori ini sudah ada:",
-"Owncloud password reset" => "Reset password Owncloud",
+"Settings" => "Setelan",
 "ownCloud password reset" => "reset password ownCloud",
 "Use the following link to reset your password: {link}" => "Gunakan tautan berikut untuk mereset password anda: {link}",
 "You will receive a link to reset your password via Email." => "Anda akan mendapatkan link untuk mereset password anda lewat Email.",
@@ -36,7 +36,6 @@
 "Finish setup" => "Selesaikan instalasi",
 "web services under your control" => "web service dibawah kontrol anda",
 "Log out" => "Keluar",
-"Settings" => "Setelan",
 "Lost your password?" => "Lupa password anda?",
 "remember" => "selalu login",
 "Log in" => "Masuk",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index ce2352f0335..1c0bf94ca71 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Nome dell'applicazione non fornito.",
 "No category to add?" => "Nessuna categoria da aggiungere?",
 "This category already exists: " => "Questa categoria esiste già: ",
-"Owncloud password reset" => "Ripristino password di Owncloud",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Impostazioni",
+"January" => "Gennaio",
+"February" => "Febbraio",
+"March" => "Marzo",
+"April" => "Aprile",
+"May" => "Maggio",
+"June" => "Giugno",
+"July" => "Luglio",
+"August" => "Agosto",
+"September" => "Settembre",
+"October" => "Ottobre",
+"November" => "Novembre",
+"December" => "Dicembre",
+"Cancel" => "Annulla",
+"No" => "No",
+"Yes" => "Sì",
+"Ok" => "Ok",
+"No categories selected for deletion." => "Nessuna categoria selezionata per l'eliminazione.",
+"Error" => "Errore",
 "ownCloud password reset" => "Ripristino password di ownCloud",
 "Use the following link to reset your password: {link}" => "Usa il collegamento seguente per ripristinare la password: {link}",
 "You will receive a link to reset your password via Email." => "Riceverai un collegamento per ripristinare la tua password via email",
@@ -36,7 +55,6 @@
 "Finish setup" => "Termina la configurazione",
 "web services under your control" => "servizi web nelle tue mani",
 "Log out" => "Esci",
-"Settings" => "Impostazioni",
 "Lost your password?" => "Hai perso la password?",
 "remember" => "ricorda",
 "Log in" => "Accedi",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 50b8e9e616e..5f9b9da33a6 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "アプリケーション名は提供されていません。",
 "No category to add?" => "追加するカテゴリはありませんか？",
 "This category already exists: " => "このカテゴリはすでに存在します: ",
-"Owncloud password reset" => "Owncloud のパスワードをリセット",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "設定",
+"January" => "1月",
+"February" => "2月",
+"March" => "3月",
+"April" => "4月",
+"May" => "5月",
+"June" => "6月",
+"July" => "7月",
+"August" => "8月",
+"September" => "9月",
+"October" => "10月",
+"November" => "11月",
+"December" => "12月",
+"Cancel" => "キャンセル",
+"No" => "いいえ",
+"Yes" => "はい",
+"Ok" => "OK",
+"No categories selected for deletion." => "削除するカテゴリが選択されていません。",
+"Error" => "エラー",
 "ownCloud password reset" => "ownCloudのパスワードをリセットします",
 "Use the following link to reset your password: {link}" => "パスワードをリセットするには次のリンクをクリックして下さい: {link}",
 "You will receive a link to reset your password via Email." => "メールでパスワードをリセットするリンクが届きます。",
@@ -36,7 +55,6 @@
 "Finish setup" => "セットアップを完了します",
 "web services under your control" => "管理下にあるウェブサービス",
 "Log out" => "ログアウト",
-"Settings" => "設定",
 "Lost your password?" => "パスワードを忘れましたか？",
 "remember" => "パスワードを記憶する",
 "Log in" => "ログイン",
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index 44396b94f81..5a330581ff1 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "응용 프로그램의 이름이 규정되어 있지 않습니다. ",
 "No category to add?" => "추가할 카테고리가 없습니까?",
 "This category already exists: " => "이 카테고리는 이미 존재합니다:",
-"Owncloud password reset" => "Owncloud 암호 재설정",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "설정",
+"January" => "1월",
+"February" => "2월",
+"March" => "3월",
+"April" => "4월",
+"May" => "5월",
+"June" => "6월",
+"July" => "7월",
+"August" => "8월",
+"September" => "9월",
+"October" => "10월",
+"November" => "11월",
+"December" => "12월",
+"Cancel" => "취소",
+"No" => "아니오",
+"Yes" => "예",
+"Ok" => "승락",
+"No categories selected for deletion." => "삭제 카테고리를 선택하지 않았습니다.",
+"Error" => "에러",
 "ownCloud password reset" => "ownCloud 비밀번호 재설정",
 "Use the following link to reset your password: {link}" => "다음 링크를 사용하여 암호를 초기화할 수 있습니다: {link}",
 "You will receive a link to reset your password via Email." => "전자 우편으로 암호 재설정 링크를 보냈습니다.",
@@ -36,7 +55,6 @@
 "Finish setup" => "설치 완료",
 "web services under your control" => "내가 관리하는 웹 서비스",
 "Log out" => "로그아웃",
-"Settings" => "설정",
 "Lost your password?" => "암호를 잊으셨습니까?",
 "remember" => "기억하기",
 "Log in" => "로그인",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index dd942011384..eafdcc37370 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -2,7 +2,7 @@
 "Application name not provided." => "Numm vun der Applikatioun ass net uginn.",
 "No category to add?" => "Keng Kategorie fir bäizesetzen?",
 "This category already exists: " => "Des Kategorie existéiert schonn:",
-"Owncloud password reset" => "Owncloud Passwuert reset",
+"Settings" => "Astellungen",
 "ownCloud password reset" => "ownCloud Passwuert reset",
 "Use the following link to reset your password: {link}" => "Benotz folgende Link fir däi Passwuert ze reseten: {link}",
 "You will receive a link to reset your password via Email." => "Du kriss en Link fir däin Passwuert nei ze setzen via Email geschéckt.",
@@ -36,7 +36,6 @@
 "Finish setup" => "Installatioun ofschléissen",
 "web services under your control" => "Web Servicer ënnert denger Kontroll",
 "Log out" => "Ausloggen",
-"Settings" => "Astellungen",
 "Lost your password?" => "Passwuert vergiess?",
 "remember" => "verhalen",
 "Log in" => "Log dech an",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 5dedfffabd1..f36f697b67c 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -1,6 +1,27 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Nepateiktas programos pavadinimas.",
+"No category to add?" => "Nepridėsite jokios kategorijos?",
 "This category already exists: " => "Tokia kategorija jau yra:",
-"Owncloud password reset" => "Owncloud slaptažodžio atkūrimas",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Nustatymai",
+"January" => "Sausis",
+"February" => "Vasaris",
+"March" => "Kovas",
+"April" => "Balandis",
+"May" => "Gegužė",
+"June" => "Birželis",
+"July" => "Liepa",
+"August" => "Rugpjūtis",
+"September" => "Rugsėjis",
+"October" => "Spalis",
+"November" => "Lapkritis",
+"December" => "Gruodis",
+"Cancel" => "Atšaukti",
+"No" => "Ne",
+"Yes" => "Taip",
+"Ok" => "Gerai",
+"No categories selected for deletion." => "Trynimui nepasirinkta jokia kategorija.",
+"Error" => "Klaida",
 "ownCloud password reset" => "ownCloud slaptažodžio atkūrimas",
 "Use the following link to reset your password: {link}" => "Slaptažodio atkūrimui naudokite šią nuorodą: {link}",
 "You will receive a link to reset your password via Email." => "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį.",
@@ -34,7 +55,6 @@
 "Finish setup" => "Baigti diegimą",
 "web services under your control" => "jūsų valdomos web paslaugos",
 "Log out" => "Atsijungti",
-"Settings" => "Nustatymai",
 "Lost your password?" => "Pamiršote slaptažodį?",
 "remember" => "prisiminti",
 "Log in" => "Prisijungti",
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
new file mode 100644
index 00000000000..6435c501587
--- /dev/null
+++ b/core/l10n/lv.php
@@ -0,0 +1,35 @@
+<?php $TRANSLATIONS = array(
+"Settings" => "Iestatījumi",
+"Use the following link to reset your password: {link}" => "Izmantojiet šo linku lai mainītu paroli",
+"You will receive a link to reset your password via Email." => "Jūs savā epastā saņemsiet interneta saiti, caur kuru varēsiet atjaunot paroli.",
+"Requested" => "Obligāts",
+"Login failed!" => "Neizdevās ielogoties.",
+"Username" => "Lietotājvārds",
+"Request reset" => "Pieprasīt paroles maiņu",
+"Your password was reset" => "Jūsu parole tika nomainīta",
+"To login page" => "Uz ielogošanās lapu",
+"New password" => "Jauna parole",
+"Reset password" => "Mainīt paroli",
+"Personal" => "Personīgi",
+"Users" => "Lietotāji",
+"Apps" => "Aplikācijas",
+"Admin" => "Administrators",
+"Help" => "Palīdzība",
+"Cloud not found" => "Mākonis netika atrasts",
+"Password" => "Parole",
+"Data folder" => "Datu mape",
+"Configure the database" => "Nokonfigurēt datubāzi",
+"will be used" => "tiks izmantots",
+"Database user" => "Datubāzes lietotājs",
+"Database password" => "Datubāzes parole",
+"Database name" => "Datubāzes nosaukums",
+"Database host" => "Datubāzes mājvieta",
+"Finish setup" => "Pabeigt uzstādījumus",
+"Log out" => "Izlogoties",
+"Lost your password?" => "Aizmirsāt paroli?",
+"remember" => "atcerēties",
+"Log in" => "Ielogoties",
+"You are logged out." => "Jūs esat veiksmīgi izlogojies.",
+"prev" => "iepriekšējā",
+"next" => "nākamā"
+);
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index 7baac36f390..af49a04f11c 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Име за апликацијата не е доставено.",
 "No category to add?" => "Нема категорија да се додаде?",
 "This category already exists: " => "Оваа категорија веќе постои:",
-"Owncloud password reset" => "Ресетирање на Owncloud лозинка",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Поставки",
+"January" => "Јануари",
+"February" => "Февруари",
+"March" => "Март",
+"April" => "Април",
+"May" => "Мај",
+"June" => "Јуни",
+"July" => "Јули",
+"August" => "Август",
+"September" => "Септември",
+"October" => "Октомври",
+"November" => "Ноември",
+"December" => "Декември",
+"Cancel" => "Откажи",
+"No" => "Не",
+"Yes" => "Да",
+"Ok" => "Во ред",
+"No categories selected for deletion." => "Не е одбрана категорија за бришење.",
+"Error" => "Грешка",
 "ownCloud password reset" => "ресетирање на лозинка за ownCloud",
 "Use the following link to reset your password: {link}" => "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}",
 "You will receive a link to reset your password via Email." => "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка.",
@@ -36,7 +55,6 @@
 "Finish setup" => "Заврши го подесувањето",
 "web services under your control" => "веб сервиси под Ваша контрола",
 "Log out" => "Одјава",
-"Settings" => "Поставки",
 "Lost your password?" => "Ја заборавивте лозинката?",
 "remember" => "запамти",
 "Log in" => "Најава",
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index 5cf7a04b41d..25da7cd8622 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -1,5 +1,28 @@
 <?php $TRANSLATIONS = array(
-"Owncloud password reset" => "Penetapan kata laluan Owncloud",
+"Application name not provided." => "nama applikasi tidak disediakan",
+"No category to add?" => "Tiada kategori untuk di tambah?",
+"This category already exists: " => "Kategori ini telah wujud",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Tetapan",
+"January" => "Januari",
+"February" => "Februari",
+"March" => "Mac",
+"April" => "April",
+"May" => "Mei",
+"June" => "Jun",
+"July" => "Julai",
+"August" => "Ogos",
+"September" => "September",
+"October" => "Oktober",
+"November" => "November",
+"December" => "Disember",
+"Cancel" => "Batal",
+"No" => "Tidak",
+"Yes" => "Ya",
+"Ok" => "Ok",
+"No categories selected for deletion." => "tiada kategori dipilih untuk penghapusan",
+"Error" => "Ralat",
+"ownCloud password reset" => "Set semula kata lalaun ownCloud",
 "Use the following link to reset your password: {link}" => "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}",
 "You will receive a link to reset your password via Email." => "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel",
 "Requested" => "Meminta",
@@ -15,7 +38,9 @@
 "Apps" => "Aplikasi",
 "Admin" => "Admin",
 "Help" => "Bantuan",
+"Access forbidden" => "Larangan akses",
 "Cloud not found" => "Awan tidak dijumpai",
+"Edit categories" => "Edit kategori",
 "Add" => "Tambah",
 "Create an <strong>admin account</strong>" => "buat <strong>akaun admin</strong>",
 "Password" => "Kata laluan",
@@ -30,7 +55,6 @@
 "Finish setup" => "Setup selesai",
 "web services under your control" => "Perkhidmatan web di bawah kawalan anda",
 "Log out" => "Log keluar",
-"Settings" => "Tetapan",
 "Lost your password?" => "Hilang kata laluan?",
 "remember" => "ingat",
 "Log in" => "Log masuk",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 80b9da0e1e9..a8bfebb8a55 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -2,7 +2,25 @@
 "Application name not provided." => "Applikasjonsnavn ikke angitt.",
 "No category to add?" => "Ingen kategorier å legge til?",
 "This category already exists: " => "Denne kategorien finnes allerede:",
-"Owncloud password reset" => "OwnCloud passordtilbakestilling",
+"Settings" => "Innstillinger",
+"January" => "Januar",
+"February" => "Februar",
+"March" => "Mars",
+"April" => "April",
+"May" => "Mai",
+"June" => "Juni",
+"July" => "Juli",
+"August" => "August",
+"September" => "September",
+"October" => "Oktober",
+"November" => "November",
+"December" => "Desember",
+"Cancel" => "Avbryt",
+"No" => "Nei",
+"Yes" => "Ja",
+"Ok" => "Ok",
+"No categories selected for deletion." => "Ingen kategorier merket for sletting.",
+"Error" => "Feil",
 "ownCloud password reset" => "Tilbakestill ownCloud passord",
 "Use the following link to reset your password: {link}" => "Bruk følgende lenke for å tilbakestille passordet ditt: {link}",
 "You will receive a link to reset your password via Email." => "Du burde motta detaljer om å tilbakestille passordet ditt via epost.",
@@ -36,7 +54,6 @@
 "Finish setup" => "Fullfør oppsetting",
 "web services under your control" => "nettjenester under din kontroll",
 "Log out" => "Logg ut",
-"Settings" => "Innstillinger",
 "Lost your password?" => "Mistet passordet ditt?",
 "remember" => "husk",
 "Log in" => "Logg inn",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 0b804f4d176..874a710a759 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -2,7 +2,25 @@
 "Application name not provided." => "Applicatie naam niet gegeven.",
 "No category to add?" => "Geen categorie toevoegen?",
 "This category already exists: " => "De categorie bestaat al.",
-"Owncloud password reset" => "Reset je ownCloud wachtwoord",
+"Settings" => "Instellingen",
+"January" => "Januari",
+"February" => "Februari",
+"March" => "Maart",
+"April" => "April",
+"May" => "Mei",
+"June" => "Juni",
+"July" => "Juli",
+"August" => "Augustus",
+"September" => "September",
+"October" => "Oktober",
+"November" => "November",
+"December" => "December",
+"Cancel" => "Annuleren",
+"No" => "Nee",
+"Yes" => "Ja",
+"Ok" => "Ok",
+"No categories selected for deletion." => "Geen categorie geselecteerd voor verwijdering.",
+"Error" => "Fout",
 "ownCloud password reset" => "ownCloud wachtwoord herstellen",
 "Use the following link to reset your password: {link}" => "Gebruik de volgende link om je wachtwoord te resetten: {link}",
 "You will receive a link to reset your password via Email." => "U ontvangt een link om je wachtwoord opnieuw in te stellen via e-mail.",
@@ -36,7 +54,6 @@
 "Finish setup" => "Installatie afronden",
 "web services under your control" => "webdiensten die je beheerst",
 "Log out" => "Afmelden",
-"Settings" => "Instellingen",
 "Lost your password?" => "Uw wachtwoord vergeten?",
 "remember" => "onthoud gegevens",
 "Log in" => "Meld je aan",
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index aeb80517382..9dfce36049f 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Owncloud password reset" => "Owncloud Passord tilbakestilling",
+"Settings" => "Innstillingar",
 "Use the following link to reset your password: {link}" => "Bruk føljane link til å tilbakestille passordet ditt: {link}",
 "You will receive a link to reset your password via Email." => "Du vil få ei lenkje for å nullstilla passordet via epost.",
 "Requested" => "Førespurt",
@@ -29,7 +29,6 @@
 "Finish setup" => "Fullfør oppsettet",
 "web services under your control" => "Vev tjenester under din kontroll",
 "Log out" => "Logg ut",
-"Settings" => "Innstillingar",
 "Lost your password?" => "Gløymt passordet?",
 "remember" => "hugs",
 "Log in" => "Logg inn",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 3c6f28c856e..4eb5f1f9ae9 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Brak nazwy dla aplikacji",
 "No category to add?" => "Brak kategorii",
 "This category already exists: " => "Ta kategoria już istnieje",
-"Owncloud password reset" => "Resetowanie hasła",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Ustawienia",
+"January" => "Styczeń",
+"February" => "Luty",
+"March" => "Marzec",
+"April" => "Kwiecień",
+"May" => "Maj",
+"June" => "Czerwiec",
+"July" => "Lipiec",
+"August" => "Sierpień",
+"September" => "Wrzesień",
+"October" => "Październik",
+"November" => "Listopad",
+"December" => "Grudzień",
+"Cancel" => "Anuluj",
+"No" => "Nie",
+"Yes" => "Tak",
+"Ok" => "Ok",
+"No categories selected for deletion." => "Nie ma kategorii zaznaczonych do usunięcia.",
+"Error" => "Błąd",
 "ownCloud password reset" => "restart hasła",
 "Use the following link to reset your password: {link}" => "Proszę użyć tego odnośnika do zresetowania hasła: {link}",
 "You will receive a link to reset your password via Email." => "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.",
@@ -36,7 +55,6 @@
 "Finish setup" => "Zakończ konfigurowanie",
 "web services under your control" => "usługi internetowe pod kontrolą",
 "Log out" => "Wylogowuje użytkownika",
-"Settings" => "Ustawienia",
 "Lost your password?" => "Nie pamiętasz hasła?",
 "remember" => "Zapamiętanie",
 "Log in" => "Zaloguj",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 6f01d666f78..46d601e6ebf 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Nome da aplicação não foi fornecido.",
 "No category to add?" => "Nenhuma categoria adicionada?",
 "This category already exists: " => "Essa categoria já existe",
-"Owncloud password reset" => "Mudar senha do Owncloud",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Configurações",
+"January" => "Janeiro",
+"February" => "Fevereiro",
+"March" => "Março",
+"April" => "Abril",
+"May" => "Maio",
+"June" => "Junho",
+"July" => "Julho",
+"August" => "Agosto",
+"September" => "Setembro",
+"October" => "Outubro",
+"November" => "Novembro",
+"December" => "Dezembro",
+"Cancel" => "Cancelar",
+"No" => "Não",
+"Yes" => "Sim",
+"Ok" => "Ok",
+"No categories selected for deletion." => "Nenhuma categoria selecionada para deletar.",
+"Error" => "Erro",
 "ownCloud password reset" => "Redefinir senha ownCloud",
 "Use the following link to reset your password: {link}" => "Use o seguinte link para redefinir sua senha: {link}",
 "You will receive a link to reset your password via Email." => "Você receberá um link para redefinir sua senha via e-mail.",
@@ -36,7 +55,6 @@
 "Finish setup" => "Concluir configuração",
 "web services under your control" => "web services sob seu controle",
 "Log out" => "Sair",
-"Settings" => "Configurações",
 "Lost your password?" => "Esqueçeu sua senha?",
 "remember" => "lembrete",
 "Log in" => "Log in",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 55c4c96e5c5..29135f0d66d 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Nome da aplicação não definida.",
 "No category to add?" => "Nenhuma categoria para adicionar?",
 "This category already exists: " => "Esta categoria já existe:",
-"Owncloud password reset" => "Redefinir palavra-chave ownCloud",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Definições",
+"January" => "Janeiro",
+"February" => "Fevereiro",
+"March" => "Março",
+"April" => "Abril",
+"May" => "Maio",
+"June" => "Junho",
+"July" => "Julho",
+"August" => "Agosto",
+"September" => "Setembro",
+"October" => "Outubro",
+"November" => "Novembro",
+"December" => "Dezembro",
+"Cancel" => "Cancelar",
+"No" => "Não",
+"Yes" => "Sim",
+"Ok" => "Ok",
+"No categories selected for deletion." => "Nenhuma categoria seleccionar para eliminar",
+"Error" => "Erro",
 "ownCloud password reset" => "Reposição da password ownCloud",
 "Use the following link to reset your password: {link}" => "Use o seguinte endereço para repor a sua password: {link}",
 "You will receive a link to reset your password via Email." => "Vai receber um endereço para repor a sua password",
@@ -36,7 +55,6 @@
 "Finish setup" => "Acabar instalação",
 "web services under your control" => "serviços web sob o seu controlo",
 "Log out" => "Sair",
-"Settings" => "Definições",
 "Lost your password?" => "Esqueceu a sua password?",
 "remember" => "lembrar",
 "Log in" => "Entrar",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index b6170d8e96f..484a47727dc 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -2,7 +2,7 @@
 "Application name not provided." => "Numele aplicație nu este furnizat.",
 "No category to add?" => "Nici o categorie de adăugat?",
 "This category already exists: " => "Această categorie deja există:",
-"Owncloud password reset" => "Resetarea parolei ownCloud",
+"Settings" => "Configurări",
 "ownCloud password reset" => "Resetarea parolei ownCloud ",
 "Use the following link to reset your password: {link}" => "Folosește următorul link pentru a reseta parola: {link}",
 "You will receive a link to reset your password via Email." => "Vei primi un mesaj prin care vei putea reseta parola via email",
@@ -36,7 +36,6 @@
 "Finish setup" => "Finalizează instalarea",
 "web services under your control" => "servicii web controlate de tine",
 "Log out" => "Ieșire",
-"Settings" => "Configurări",
 "Lost your password?" => "Ai uitat parola?",
 "remember" => "amintește",
 "Log in" => "Autentificare",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index ff86f29b267..edb55577772 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Имя приложения не установлено.",
 "No category to add?" => "Нет категорий для добавления?",
 "This category already exists: " => "Эта категория уже существует: ",
-"Owncloud password reset" => "Сброс пароля OwnCloud",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Настройки",
+"January" => "Январь",
+"February" => "Февраль",
+"March" => "Март",
+"April" => "Апрель",
+"May" => "Май",
+"June" => "Июнь",
+"July" => "Июль",
+"August" => "Август",
+"September" => "Сентябрь",
+"October" => "Октябрь",
+"November" => "Ноябрь",
+"December" => "Декабрь",
+"Cancel" => "Отмена",
+"No" => "Нет",
+"Yes" => "Да",
+"Ok" => "Ок",
+"No categories selected for deletion." => "Нет категорий для удаления.",
+"Error" => "Ошибка",
 "ownCloud password reset" => "Сброс пароля ",
 "Use the following link to reset your password: {link}" => "Используйте следующую ссылку чтобы сбросить пароль: {link}",
 "You will receive a link to reset your password via Email." => "На ваш адрес Email выслана ссылка для сброса пароля.",
@@ -36,7 +55,6 @@
 "Finish setup" => "Завершить установку",
 "web services under your control" => "Сетевые службы под твоим контролем",
 "Log out" => "Выйти",
-"Settings" => "Настройки",
 "Lost your password?" => "Забыли пароль?",
 "remember" => "запомнить",
 "Log in" => "Войти",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index b09b4f56115..b6bff1e0497 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Meno aplikácie nezadané.",
 "No category to add?" => "Žiadna kategória pre pridanie?",
 "This category already exists: " => "Táto kategória už existuje:",
-"Owncloud password reset" => "Obnova Owncloud hesla",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Nastavenia",
+"January" => "Január",
+"February" => "Február",
+"March" => "Marec",
+"April" => "Apríl",
+"May" => "Máj",
+"June" => "Jún",
+"July" => "Júl",
+"August" => "August",
+"September" => "September",
+"October" => "Október",
+"November" => "November",
+"December" => "December",
+"Cancel" => "Zrušiť",
+"No" => "Nie",
+"Yes" => "Áno",
+"Ok" => "Ok",
+"No categories selected for deletion." => "Neboli vybrané žiadne kategórie pre odstránenie.",
+"Error" => "Chyba",
 "ownCloud password reset" => "Obnovenie hesla pre ownCloud",
 "Use the following link to reset your password: {link}" => "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}",
 "You will receive a link to reset your password via Email." => "Odkaz pre obnovenie hesla obdržíte E-mailom.",
@@ -36,7 +55,6 @@
 "Finish setup" => "Dokončiť inštaláciu",
 "web services under your control" => "webové služby pod vašou kontrolou",
 "Log out" => "Odhlásiť",
-"Settings" => "Nastavenia",
 "Lost your password?" => "Zabudli ste heslo?",
 "remember" => "zapamätať",
 "Log in" => "Prihlásiť sa",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 5cd8498ea25..2f998c95492 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Ime aplikacije ni bilo določeno.",
 "No category to add?" => "Ni kategorije za dodajanje?",
 "This category already exists: " => "Ta kategorija že obstaja:",
-"Owncloud password reset" => "Ponastavi ownCloud geslo",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Nastavitve",
+"January" => "januar",
+"February" => "februar",
+"March" => "marec",
+"April" => "april",
+"May" => "maj",
+"June" => "junij",
+"July" => "julij",
+"August" => "avgust",
+"September" => "september",
+"October" => "oktober",
+"November" => "november",
+"December" => "december",
+"Cancel" => "Prekliči",
+"No" => "Ne",
+"Yes" => "Da",
+"Ok" => "V redu",
+"No categories selected for deletion." => "Za izbris ni bila izbrana nobena kategorija.",
+"Error" => "Napaka",
 "ownCloud password reset" => "Ponastavitev gesla ownCloud",
 "Use the following link to reset your password: {link}" => "Uporabite sledečo povezavo za ponastavitev gesla: {link}",
 "You will receive a link to reset your password via Email." => "Na e-pošto boste prejeli povezavo s katero lahko ponastavite vaše geslo.",
@@ -36,7 +55,6 @@
 "Finish setup" => "Dokončaj namestitev",
 "web services under your control" => "spletne storitve pod vašim nadzorom",
 "Log out" => "Odjava",
-"Settings" => "Nastavitve",
 "Lost your password?" => "Ste pozabili vaše geslo?",
 "remember" => "Zapomni si me",
 "Log in" => "Prijava",
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index 6bd6275df4b..c2f2f07640e 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Owncloud password reset" => "Ресетовање лозинке за Оунклауд",
+"Settings" => "Подешавања",
 "Use the following link to reset your password: {link}" => "Овом везом ресетујте своју лозинку: {link}",
 "You will receive a link to reset your password via Email." => "Добићете везу за ресетовање лозинке путем е-поште.",
 "Requested" => "Захтевано",
@@ -29,7 +29,6 @@
 "Finish setup" => "Заврши подешавање",
 "web services under your control" => "веб сервиси под контролом",
 "Log out" => "Одјава",
-"Settings" => "Подешавања",
 "Lost your password?" => "Изгубили сте лозинку?",
 "remember" => "упамти",
 "Log in" => "Пријава",
diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php
index e240de011ee..8bc20cf1a6f 100644
--- a/core/l10n/sr@latin.php
+++ b/core/l10n/sr@latin.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Settings" => "Podešavanja",
 "You will receive a link to reset your password via Email." => "Dobićete vezu za resetovanje lozinke putem e-pošte.",
 "Requested" => "Zahtevano",
 "Login failed!" => "Nesupela prijava!",
@@ -25,7 +26,6 @@
 "Database host" => "Domaćin baze",
 "Finish setup" => "Završi podešavanje",
 "Log out" => "Odjava",
-"Settings" => "Podešavanja",
 "Lost your password?" => "Izgubili ste lozinku?",
 "remember" => "upamti",
 "You are logged out." => "Odjavljeni ste.",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index fd53952184b..25ba95558e7 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -1,20 +1,39 @@
 <?php $TRANSLATIONS = array(
-"Application name not provided." => "Programnamn har inte angetts",
+"Application name not provided." => "Programnamn har inte angetts.",
 "No category to add?" => "Ingen kategori att lägga till?",
 "This category already exists: " => "Denna kategori finns redan:",
-"Owncloud password reset" => "Owncloud lösenordsåterställning",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Inställningar",
+"January" => "Januari",
+"February" => "Februari",
+"March" => "Mars",
+"April" => "April",
+"May" => "Maj",
+"June" => "Juni",
+"July" => "Juli",
+"August" => "Augusti",
+"September" => "September",
+"October" => "Oktober",
+"November" => "November",
+"December" => "December",
+"Cancel" => "Avbryt",
+"No" => "Nej",
+"Yes" => "Ja",
+"Ok" => "Ok",
+"No categories selected for deletion." => "Inga kategorier valda för radering.",
+"Error" => "Fel",
 "ownCloud password reset" => "ownCloud lösenordsåterställning",
 "Use the following link to reset your password: {link}" => "Använd följande länk för att återställa lösenordet: {link}",
 "You will receive a link to reset your password via Email." => "Du får en länk att återställa ditt lösenord via e-post.",
 "Requested" => "Begärd",
-"Login failed!" => "Inloggning misslyckades!",
+"Login failed!" => "Misslyckad inloggning!",
 "Username" => "Användarnamn",
 "Request reset" => "Begär återställning",
 "Your password was reset" => "Ditt lösenord har återställts",
-"To login page" => "Till logga in sidan",
+"To login page" => "Till logginsidan",
 "New password" => "Nytt lösenord",
 "Reset password" => "Återställ lösenordet",
-"Personal" => "Personlig",
+"Personal" => "Personligt",
 "Users" => "Användare",
 "Apps" => "Program",
 "Admin" => "Admin",
@@ -29,18 +48,17 @@
 "Data folder" => "Datamapp",
 "Configure the database" => "Konfigurera databasen",
 "will be used" => "kommer att användas",
-"Database user" => "Databas-användare",
-"Database password" => "Lösenord för databasen",
-"Database name" => "Databasens namn",
+"Database user" => "Databasanvändare",
+"Database password" => "Lösenord till databasen",
+"Database name" => "Databasnamn",
 "Database host" => "Databasserver",
 "Finish setup" => "Avsluta installation",
 "web services under your control" => "webbtjänster under din kontroll",
 "Log out" => "Logga ut",
-"Settings" => "Inställningar",
 "Lost your password?" => "Glömt ditt lösenord?",
 "remember" => "kom ihåg",
 "Log in" => "Logga in",
-"You are logged out." => "Du är utloggad",
+"You are logged out." => "Du är utloggad.",
 "prev" => "föregående",
 "next" => "nästa"
 );
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 28283818561..8bd4d36524f 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "ยังไม่ได้ตั้งชื่อแอพพลิเคชั่น",
 "No category to add?" => "ไม่มีหมวดหมู่ที่ต้องการเพิ่ม?",
 "This category already exists: " => "หมวดหมู่นี้มีอยู่แล้ว: ",
-"Owncloud password reset" => "เปลี่ยนรหัสผ่านใน Owncloud",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "ตั้งค่า",
+"January" => "มกราคม",
+"February" => "กุมภาพันธ์",
+"March" => "มีนาคม",
+"April" => "เมษายน",
+"May" => "พฤษภาคม",
+"June" => "มิถุนายน",
+"July" => "กรกฏาคม",
+"August" => "สิงหาคม",
+"September" => "กันยายน",
+"October" => "ตุลาคม",
+"November" => "พฤศจิกายน",
+"December" => "ธันวาคม",
+"Cancel" => "ยกเลิก",
+"No" => "ไม่ตกลง",
+"Yes" => "ตกลง",
+"Ok" => "ตกลง",
+"No categories selected for deletion." => "ยังไม่ได้เลือกหมวดหมู่ที่ต้องการลบ",
+"Error" => "พบข้อผิดพลาด",
 "ownCloud password reset" => "รีเซ็ตรหัสผ่าน ownCloud",
 "Use the following link to reset your password: {link}" => "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
 "You will receive a link to reset your password via Email." => "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์",
@@ -36,7 +55,6 @@
 "Finish setup" => "ติดตั้งเรียบร้อยแล้ว",
 "web services under your control" => "web services under your control",
 "Log out" => "ออกจากระบบ",
-"Settings" => "ตั้งค่า",
 "Lost your password?" => "ลืมรหัสผ่าน?",
 "remember" => "จำรหัสผ่าน",
 "Log in" => "เข้าสู่ระบบ",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index fc0f791d595..e2d0d9b073d 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -2,7 +2,26 @@
 "Application name not provided." => "Uygulama adı verilmedi.",
 "No category to add?" => "Eklenecek kategori yok?",
 "This category already exists: " => "Bu kategori zaten mevcut: ",
-"Owncloud password reset" => "Owncloud parola sıfırlama",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Ayarlar",
+"January" => "Ocak",
+"February" => "Şubat",
+"March" => "Mart",
+"April" => "Nisan",
+"May" => "Mayıs",
+"June" => "Haziran",
+"July" => "Temmuz",
+"August" => "Ağustos",
+"September" => "Eylül",
+"October" => "Ekim",
+"November" => "Kasım",
+"December" => "Aralık",
+"Cancel" => "İptal",
+"No" => "Hayır",
+"Yes" => "Evet",
+"Ok" => "Tamam",
+"No categories selected for deletion." => "Silmek için bir kategori seçilmedi",
+"Error" => "Hata",
 "ownCloud password reset" => "ownCloud parola sıfırlama",
 "Use the following link to reset your password: {link}" => "Bu bağlantıyı kullanarak parolanızı sıfırlayın: {link}",
 "You will receive a link to reset your password via Email." => "Parolanızı sıfırlamak için bir bağlantı Eposta olarak gönderilecek.",
@@ -36,7 +55,6 @@
 "Finish setup" => "Kurulumu tamamla",
 "web services under your control" => "kontrolünüzdeki web servisleri",
 "Log out" => "Çıkış yap",
-"Settings" => "Ayarlar",
 "Lost your password?" => "Parolanızı mı unuttunuz?",
 "remember" => "hatırla",
 "Log in" => "Giriş yap",
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index 091a8c93293..4a10a9fc745 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Settings" => "Налаштування",
 "You will receive a link to reset your password via Email." => "Ви отримаєте посилання для скидання вашого паролю на e-mail.",
 "Username" => "Ім'я користувача",
 "Your password was reset" => "Ваш пароль був скинутий",
@@ -18,7 +19,6 @@
 "Finish setup" => "Завершити налаштування",
 "web services under your control" => "веб-сервіс під вашим контролем",
 "Log out" => "Вихід",
-"Settings" => "Налаштування",
 "Lost your password?" => "Забули пароль?",
 "remember" => "запам'ятати",
 "Log in" => "Вхід"
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
new file mode 100644
index 00000000000..4a4c97032fd
--- /dev/null
+++ b/core/l10n/vi.php
@@ -0,0 +1,64 @@
+<?php $TRANSLATIONS = array(
+"Application name not provided." => "Tên ứng dụng không tồn tại",
+"No category to add?" => "Không có danh mục được thêm?",
+"This category already exists: " => "Danh mục này đã được tạo :",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "Cài đặt",
+"January" => "Tháng 1",
+"February" => "Tháng 2",
+"March" => "Tháng 3",
+"April" => "Tháng 4",
+"May" => "Tháng 5",
+"June" => "Tháng 6",
+"July" => "Tháng 7",
+"August" => "Tháng 8",
+"September" => "Tháng 9",
+"October" => "Tháng 10",
+"November" => "Tháng 11",
+"December" => "Tháng 12",
+"Cancel" => "Hủy",
+"No" => "No",
+"Yes" => "Yes",
+"Ok" => "Ok",
+"No categories selected for deletion." => "Không có thể loại nào được chọn để xóa.",
+"Error" => "Lỗi",
+"ownCloud password reset" => "Khôi phục mật khẩu Owncloud ",
+"Use the following link to reset your password: {link}" => "Dùng đường dẫn sau để khôi phục lại mật khẩu : {link}",
+"You will receive a link to reset your password via Email." => "Vui lòng kiểm tra Email để khôi phục lại mật khẩu.",
+"Requested" => "Yêu cầu",
+"Login failed!" => "Bạn đã nhập sai mật khẩu hay tên người dùng !",
+"Username" => "Tên người dùng",
+"Request reset" => "Yêu cầu thiết lập lại ",
+"Your password was reset" => "Mật khẩu của bạn đã được khôi phục",
+"To login page" => "Trang đăng nhập",
+"New password" => "Mật khẩu mới",
+"Reset password" => "Khôi phục mật khẩu",
+"Personal" => "Cá nhân",
+"Users" => "Người sử dụng",
+"Apps" => "Ứng dụng",
+"Admin" => "Quản trị",
+"Help" => "Giúp đỡ",
+"Access forbidden" => "Truy cập bị cấm ",
+"Cloud not found" => "Không tìm thấy Clound",
+"Edit categories" => "Sửa thể loại",
+"Add" => "Thêm",
+"Create an <strong>admin account</strong>" => "Tạo một <strong>tài khoản quản trị</strong>",
+"Password" => "Mật khẩu",
+"Advanced" => "Nâng cao",
+"Data folder" => "Thư mục dữ liệu",
+"Configure the database" => "Cấu hình Cơ Sở Dữ Liệu",
+"will be used" => "được sử dụng",
+"Database user" => "Người dùng cơ sở dữ liệu",
+"Database password" => "Mật khẩu cơ sở dữ liệu",
+"Database name" => "Tên cơ sở dữ liệu",
+"Database host" => "Database host",
+"Finish setup" => "Cài đặt hoàn tất",
+"web services under your control" => "các dịch vụ web dưới sự kiểm soát của bạn",
+"Log out" => "Đăng xuất",
+"Lost your password?" => "Bạn quên mật khẩu ?",
+"remember" => "Nhớ",
+"Log in" => "Đăng nhập",
+"You are logged out." => "Bạn đã đăng xuất.",
+"prev" => "Lùi lại",
+"next" => "Kế tiếp"
+);
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
new file mode 100644
index 00000000000..770d2b6772d
--- /dev/null
+++ b/core/l10n/zh_CN.GB2312.php
@@ -0,0 +1,64 @@
+<?php $TRANSLATIONS = array(
+"Application name not provided." => "应用程序并没有被提供.",
+"No category to add?" => "没有分类添加了?",
+"This category already exists: " => "这个分类已经存在了:",
+"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"Settings" => "设置",
+"January" => "一月",
+"February" => "二月",
+"March" => "三月",
+"April" => "四月",
+"May" => "五月",
+"June" => "六月",
+"July" => "七月",
+"August" => "八月",
+"September" => "九月",
+"October" => "十月",
+"November" => "十一月",
+"December" => "十二月",
+"Cancel" => "取消",
+"No" => "否",
+"Yes" => "是",
+"Ok" => "好的",
+"No categories selected for deletion." => "没有选者要删除的分类.",
+"Error" => "错误",
+"ownCloud password reset" => "私有云密码重置",
+"Use the following link to reset your password: {link}" => "使用下面的链接来重置你的密码:{link}",
+"You will receive a link to reset your password via Email." => "你将会收到一个重置密码的链接",
+"Requested" => "请求",
+"Login failed!" => "登陆失败!",
+"Username" => "用户名",
+"Request reset" => "要求重置",
+"Your password was reset" => "你的密码已经被重置了",
+"To login page" => "转至登陆页面",
+"New password" => "新密码",
+"Reset password" => "重置密码",
+"Personal" => "个人的",
+"Users" => "用户",
+"Apps" => "应用程序",
+"Admin" => "管理",
+"Help" => "帮助",
+"Access forbidden" => "禁止访问",
+"Cloud not found" => "云 没有被找到",
+"Edit categories" => "编辑分类",
+"Add" => "添加",
+"Create an <strong>admin account</strong>" => "建立一个 <strong>管理帐户</strong>",
+"Password" => "密码",
+"Advanced" => "进阶",
+"Data folder" => "数据存放文件夹",
+"Configure the database" => "配置数据库",
+"will be used" => "将会使用",
+"Database user" => "数据库用户",
+"Database password" => "数据库密码",
+"Database name" => "数据库用户名",
+"Database host" => "数据库主机",
+"Finish setup" => "完成安装",
+"web services under your control" => "你控制下的网络服务",
+"Log out" => "注销",
+"Lost your password?" => "忘记密码?",
+"remember" => "备忘",
+"Log in" => "登陆",
+"You are logged out." => "你已经注销了",
+"prev" => "后退",
+"next" => "前进"
+);
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index e07add7cbb6..1f5216a2fff 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -2,7 +2,25 @@
 "Application name not provided." => "没有提供应用程序名称。",
 "No category to add?" => "没有可添加分类？",
 "This category already exists: " => "此分类已存在: ",
-"Owncloud password reset" => "重置 Owncloud 密码",
+"Settings" => "设置",
+"January" => "一月",
+"February" => "二月",
+"March" => "三月",
+"April" => "四月",
+"May" => "五月",
+"June" => "六月",
+"July" => "七月",
+"August" => "八月",
+"September" => "九月",
+"October" => "十月",
+"November" => "十一月",
+"December" => "十二月",
+"Cancel" => "取消",
+"No" => "否",
+"Yes" => "是",
+"Ok" => "好",
+"No categories selected for deletion." => "没有选择要删除的类别",
+"Error" => "错误",
 "ownCloud password reset" => "重置 ownCloud 密码",
 "Use the following link to reset your password: {link}" => "使用以下链接重置您的密码：{link}",
 "You will receive a link to reset your password via Email." => "您将会收到包含可以重置密码链接的邮件。",
@@ -36,7 +54,6 @@
 "Finish setup" => "安装完成",
 "web services under your control" => "由您掌控的网络服务",
 "Log out" => "注销",
-"Settings" => "设置",
 "Lost your password?" => "忘记密码？",
 "remember" => "记住",
 "Log in" => "登录",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index d958c628723..37c0d8cc9d1 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -2,7 +2,7 @@
 "Application name not provided." => "未提供應用程式名稱",
 "No category to add?" => "無分類添加?",
 "This category already exists: " => "此分類已經存在:",
-"Owncloud password reset" => "私有雲重設密碼",
+"Settings" => "設定",
 "ownCloud password reset" => "ownCloud 密碼重設",
 "Use the following link to reset your password: {link}" => "請循以下聯結重設你的密碼: （聯結） ",
 "You will receive a link to reset your password via Email." => "重設密碼的連結將會寄到你的電子郵件信箱",
@@ -36,7 +36,6 @@
 "Finish setup" => "完成設定",
 "web services under your control" => "網路服務已在你控制",
 "Log out" => "登出",
-"Settings" => "設定",
 "Lost your password?" => "忘記密碼?",
 "remember" => "記住",
 "Log in" => "登入",
diff --git a/core/lostpassword/index.php b/core/lostpassword/index.php
index b32b56fcb39..8f86fe23aad 100644
--- a/core/lostpassword/index.php
+++ b/core/lostpassword/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2010 Frank Karlitschek karlitschek@kde.org
+ * Copyright (c) 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.
@@ -19,10 +19,10 @@ if (isset($_POST['user'])) {
 		if (!empty($email) and isset($_POST['sectoken']) and isset($_SESSION['sectoken']) and ($_POST['sectoken']==$_SESSION['sectoken']) ) {
 			$link = OC_Helper::linkToAbsolute('core/lostpassword', 'resetpassword.php').'?user='.urlencode($_POST['user']).'&token='.$token;
 			$tmpl = new OC_Template('core/lostpassword', 'email');
-			$tmpl->assign('link', $link);
+			$tmpl->assign('link', $link, false);
 			$msg = $tmpl->fetchPage();
 			$l = OC_L10N::get('core');
-			$from = 'lostpassword-noreply@' . OC_Helper::serverHost();
+			$from = 'lostpassword-noreply@' . OCP\Util::getServerHost();
 			OC_MAIL::send($email,$_POST['user'],$l->t('ownCloud password reset'),$msg,$from,'ownCloud');
 			echo('sent');
 
diff --git a/core/lostpassword/resetpassword.php b/core/lostpassword/resetpassword.php
index 1c78d720947..33be9d7053b 100644
--- a/core/lostpassword/resetpassword.php
+++ b/core/lostpassword/resetpassword.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2010 Frank Karlitschek karlitschek@kde.org
+ * Copyright (c) 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/core/minimizer.php b/core/minimizer.php
new file mode 100644
index 00000000000..0abbca75027
--- /dev/null
+++ b/core/minimizer.php
@@ -0,0 +1,15 @@
+<?php
+session_write_close();
+
+OC_App::loadApps();
+
+if ($service == 'core.css'){
+	$minimizer = new OC_Minimizer_CSS();
+	$files = OC_TemplateLayout::findStylesheetFiles(OC_Util::$core_styles);
+	$minimizer->output($files, $service);
+}
+else if ($service == 'core.js'){
+	$minimizer = new OC_Minimizer_JS();
+	$files = OC_TemplateLayout::findJavascriptFiles(OC_Util::$core_scripts);
+	$minimizer->output($files, $service);
+}
diff --git a/core/strings.php b/core/strings.php
index 8c3f64ef14f..01ab3866089 100644
--- a/core/strings.php
+++ b/core/strings.php
@@ -7,4 +7,3 @@ $l->t("Users");
 $l->t("Apps");
 $l->t("Admin");
 $l->t("Help");
-?>
diff --git a/core/templates/404.php b/core/templates/404.php
index cd4f2b40bb2..13a81010343 100644
--- a/core/templates/404.php
+++ b/core/templates/404.php
@@ -10,6 +10,6 @@ if(!isset($_)){//also provide standalone error page
 <ul>
 	<li class='error'>
 		<?php echo $l->t( 'Cloud not found' ); ?><br/>
-		<p class='hint'><?php if(isset($_['file'])) echo htmlentities($_['file'])?></p>
+		<p class='hint'><?php if(isset($_['file'])) echo $_['file']?></p>
 	</li>
 </ul>
diff --git a/core/templates/exception.php b/core/templates/exception.php
new file mode 100644
index 00000000000..7f58ce252cf
--- /dev/null
+++ b/core/templates/exception.php
@@ -0,0 +1,30 @@
+<ul>
+	<li class='error'>
+		<details>
+		<summary class="error">We're sorry, but something went terribly wrong.<br></summary>
+		<p class="exception">
+		<?php
+		if($_['showsysinfo'] == true){
+			echo 'If you would like to support ownCloud\'s developers and report this error in our <a href="http://bugs.owncloud.org">Bugtracker</a>, please copy the following informations into the description. <br><br><textarea readonly>';
+			echo 'Message: '  . $_['message'] . "\n";
+			echo 'Error Code: '  . $_['code'] . "\n";
+			echo 'File: '  . $_['file'] . "\n";
+			echo 'Line: '  . $_['line'] . "\n\n";
+			echo 'PHP: '  . $_['sysinfo']['phpversion'] . "\n";
+			echo 'OS: '  . $_['sysinfo']['os'] . "\n";
+			echo 'OS Release: '  . $_['sysinfo']['osrelease'] . "\n";
+			echo 'OS Arch.: '  . $_['sysinfo']['osarchitecture'] . "\n";
+			echo 'PHP-Server-Interface: '  . $_['sysinfo']['phpserverinterface'] . "\n";
+			echo 'Protocol: '  . $_['sysinfo']['serverprotocol'] . "\n";
+			echo 'HTTPS: '  . $_['sysinfo']['https'] . "\n";
+			echo 'Request Method: '  . $_['sysinfo']['requestmethod'] . "\n";
+			echo 'Database: '  . $_['sysinfo']['database'] . "\n";
+			echo '</textarea>';
+		}else{
+			echo 'Your administrator has disabled systeminformations.';
+		}
+		?>
+		</p>
+		</details>
+	</li>
+</ul>
+\ No newline at end of file
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 7ba7abdbf12..4cdbfd16e52 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -4,13 +4,19 @@
 		<title>ownCloud</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
+		<?php if (!empty(OC_Util::$core_styles)): ?>
+		<link rel="stylesheet" href="<?php echo OC_Helper::linkToRemote('core.css', false) ?>" type="text/css" media="screen" />
+		<?php endif ?>
 		<?php foreach($_['cssfiles'] as $cssfile): ?>
 			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
 		<script type="text/javascript">
 			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
-			var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>';
+			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
 		</script>
+		<?php if (!empty(OC_Util::$core_scripts)): ?>
+		<script type="text/javascript" src="<?php echo OC_Helper::linkToRemote('core.js', false) ?>"></script>
+		<?php endif ?>
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
 		<?php endforeach; ?>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 25281c452a5..2abe4da8538 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -4,14 +4,20 @@
 		<title><?php echo isset($_['application']) && !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud <?php echo OC_User::getUser()?' ('.OC_User::getUser().') ':'' ?></title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
+		<?php if (!empty(OC_Util::$core_styles)): ?>
+		<link rel="stylesheet" href="<?php echo OC_Helper::linkToRemote('core.css', false) ?>" type="text/css" media="screen" />
+		<?php endif ?>
 		<?php foreach($_['cssfiles'] as $cssfile): ?>
 			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
 		<script type="text/javascript">
 			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
-			var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>';
+			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
 			var oc_current_user = '<?php echo OC_User::getUser() ?>';
 		</script>
+		<?php if (!empty(OC_Util::$core_scripts)): ?>
+		<script type="text/javascript" src="<?php echo OC_Helper::linkToRemote('core.js', false) ?>"></script>
+		<?php endif ?>
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
 		<?php endforeach; ?>
@@ -27,6 +33,7 @@
 		<script type="text/javascript">
 			$(function() {
 				requesttoken = '<?php echo $_['requesttoken']; ?>';
+				OC.EventSource.requesttoken=requesttoken;
 				$(document).bind('ajaxSend', function(elm, xhr, s){
 					if(requesttoken) {
 						xhr.setRequestHeader('requesttoken', requesttoken);
@@ -39,16 +46,16 @@
 	<body id="<?php echo $_['bodyid'];?>">
 		<header><div id="header">
 			<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a>
-			<form class="searchbox" action="#" method="post">
-				<input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])){echo htmlentities($_POST['query']);};?>" autocomplete="off" />
+			<a class="header-right header-action" id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true"><img class="svg" alt="<?php echo $l->t('Log out');?>" title="<?php echo $l->t('Log out');?>" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a>
+			<form class="searchbox header-right" action="#" method="post">
+				<input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])){echo OC_Util::sanitizeHTML($_POST['query']);};?>" autocomplete="off" x-webkit-speech />
 			</form>
-			<a id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true"><img class="svg" alt="<?php echo $l->t('Log out');?>" title="<?php echo $l->t('Log out');?>" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a>
 		</div></header>
 
 		<nav><div id="navigation">
 			<ul id="apps" class="svg">
 				<?php foreach($_['navigation'] as $entry): ?>
-					<li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>><?php echo $entry['name']; ?></a>
+					<li data-id="<?php echo $entry['id']; ?>"><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>><?php echo $entry['name']; ?></a>
 					</li>
 				<?php endforeach; ?>
 			</ul>
diff --git a/core/templates/login.php b/core/templates/login.php
index 56101157eda..2c9b766aa4d 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -1,17 +1,17 @@
 <!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]-->
 <form action="index.php" method="post">
 	<fieldset>
-		<?php if(!empty($_['redirect'])) { echo '<input type="hidden" name="redirect_url" value="'.htmlentities($_['redirect']).'" />'; } ?>
-		<?php if($_['error']): ?>
+		<?php if(!empty($_['redirect'])) { echo '<input type="hidden" name="redirect_url" value="'.$_['redirect'].'" />'; } ?>
+		<?php if($_['display_lostpassword']): ?>
 			<a href="./core/lostpassword/"><?php echo $l->t('Lost your password?'); ?></a>
 		<?php endif; ?>
 		<p class="infield">
 			<label for="user" class="infield"><?php echo $l->t( 'Username' ); ?></label>
-			<input type="text" name="user" id="user" value="<?php echo !empty($_POST['user'])?htmlentities($_POST['user'],ENT_COMPAT,'utf-8').'"':'" autofocus'; ?> autocomplete="on" required />
+			<input type="text" name="user" id="user" value="<?php echo $_['username']; ?>"<?php echo $_['user_autofocus']?' autofocus':''; ?> autocomplete="on" required />
 		</p>
 		<p class="infield">
 			<label for="password" class="infield"><?php echo $l->t( 'Password' ); ?></label>
-			<input type="password" name="password" id="password" value="" required <?php echo !empty($_POST['user'])?'autofocus':''; ?> />
+			<input type="password" name="password" id="password" value="" required<?php echo $_['user_autofocus']?'':' autofocus'; ?> />
 			<input type="hidden" name="sectoken" id="sectoken" value="<?php echo($_['sectoken']); ?>"  />
 		</p>
 		<input type="checkbox" name="remember_login" value="1" id="remember_login" /><label for="remember_login"><?php echo $l->t('remember'); ?></label>
author	Jörn Friedrich Dreyer <jfd@butonic.de>	2012-08-25 00:05:07 +0200
committer	Jörn Friedrich Dreyer <jfd@butonic.de>	2012-08-25 00:05:07 +0200
commit	c8255a170c2d7449b4e7728edd2237eea71dca80 (patch)
tree	e5a3854ec472be9700064bc7b689b8adf7c7f692 /core
parent	0c0ae928dcd483211a92303eb2b202453d02a86e (diff)
parent	46d6fd15e4cc02d45079ffc688be0684e61f1434 (diff)
download	nextcloud-server-c8255a170c2d7449b4e7728edd2237eea71dca80.tar.gz nextcloud-server-c8255a170c2d7449b4e7728edd2237eea71dca80.zip